@@ -172,7 +172,7 @@ typedef struct SharedRecordTableKey
172172 {
173173 TupleDesc local_tupdesc ;
174174 dsa_pointer shared_tupdesc ;
175- };
175+ } u ;
176176 bool shared ;
177177} SharedRecordTableKey ;
178178
@@ -209,14 +209,14 @@ shared_record_table_compare(const void *a, const void *b, size_t size,
209209 TupleDesc t2 ;
210210
211211 if (k1 -> shared )
212- t1 = (TupleDesc ) dsa_get_address (area , k1 -> shared_tupdesc );
212+ t1 = (TupleDesc ) dsa_get_address (area , k1 -> u . shared_tupdesc );
213213 else
214- t1 = k1 -> local_tupdesc ;
214+ t1 = k1 -> u . local_tupdesc ;
215215
216216 if (k2 -> shared )
217- t2 = (TupleDesc ) dsa_get_address (area , k2 -> shared_tupdesc );
217+ t2 = (TupleDesc ) dsa_get_address (area , k2 -> u . shared_tupdesc );
218218 else
219- t2 = k2 -> local_tupdesc ;
219+ t2 = k2 -> u . local_tupdesc ;
220220
221221 return equalTupleDescs (t1 , t2 ) ? 0 : 1 ;
222222}
@@ -232,9 +232,9 @@ shared_record_table_hash(const void *a, size_t size, void *arg)
232232 TupleDesc t ;
233233
234234 if (k -> shared )
235- t = (TupleDesc ) dsa_get_address (area , k -> shared_tupdesc );
235+ t = (TupleDesc ) dsa_get_address (area , k -> u . shared_tupdesc );
236236 else
237- t = k -> local_tupdesc ;
237+ t = k -> u . local_tupdesc ;
238238
239239 return hashTupleDesc (t );
240240}
@@ -1710,14 +1710,14 @@ SharedRecordTypmodRegistryInit(SharedRecordTypmodRegistry *registry,
17101710
17111711 /* Insert into the record table. */
17121712 record_table_key .shared = false;
1713- record_table_key .local_tupdesc = tupdesc ;
1713+ record_table_key .u . local_tupdesc = tupdesc ;
17141714 record_table_entry = dshash_find_or_insert (record_table ,
17151715 & record_table_key ,
17161716 & found );
17171717 if (!found )
17181718 {
17191719 record_table_entry -> key .shared = true;
1720- record_table_entry -> key .shared_tupdesc = shared_dp ;
1720+ record_table_entry -> key .u . shared_tupdesc = shared_dp ;
17211721 }
17221722 dshash_release_lock (record_table , record_table_entry );
17231723 }
@@ -2261,7 +2261,7 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)
22612261
22622262 /* Try to find a matching tuple descriptor in the record table. */
22632263 key .shared = false;
2264- key .local_tupdesc = tupdesc ;
2264+ key .u . local_tupdesc = tupdesc ;
22652265 record_table_entry = (SharedRecordTableEntry * )
22662266 dshash_find (CurrentSession -> shared_record_table , & key , false);
22672267 if (record_table_entry )
@@ -2271,7 +2271,7 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)
22712271 record_table_entry );
22722272 result = (TupleDesc )
22732273 dsa_get_address (CurrentSession -> area ,
2274- record_table_entry -> key .shared_tupdesc );
2274+ record_table_entry -> key .u . shared_tupdesc );
22752275 Assert (result -> tdrefcount == -1 );
22762276
22772277 return result ;
@@ -2342,7 +2342,7 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)
23422342
23432343 /* Store it and return it. */
23442344 record_table_entry -> key .shared = true;
2345- record_table_entry -> key .shared_tupdesc = shared_dp ;
2345+ record_table_entry -> key .u . shared_tupdesc = shared_dp ;
23462346 dshash_release_lock (CurrentSession -> shared_record_table ,
23472347 record_table_entry );
23482348 result = (TupleDesc )
0 commit comments