NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commiteaa4070

committed

Don't use anonymous unions.

Commitcc5f813 introduced a languagefeature that is not acceptable to strict C89 compilers.Thomas MunroPer buildfarm.

1 parentfba3665 commiteaa4070Copy full SHA for eaa4070

File tree

1 file changed

+12

-12

lines changed

src/backend/utils/cache
- typcache.c

1 file changed

+12

-12

lines changed

`‎src/backend/utils/cache/typcache.c`

Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ typedef struct SharedRecordTableKey`
`172`	`172`	`{`
`173`	`173`	`TupleDesclocal_tupdesc;`
`174`	`174`	`dsa_pointershared_tupdesc;`
`175`		`-};`
	`175`	`+}u;`
`176`	`176`	`boolshared;`
`177`	`177`	`}SharedRecordTableKey;`
`178`	`178`
`@@ -209,14 +209,14 @@ shared_record_table_compare(const void a, const void b, size_t size,`
`209`	`209`	`TupleDesct2;`
`210`	`210`
`211`	`211`	`if (k1->shared)`
`212`		`-t1= (TupleDesc)dsa_get_address(area,k1->shared_tupdesc);`
	`212`	`+t1= (TupleDesc)dsa_get_address(area,k1->u.shared_tupdesc);`
`213`	`213`	`else`
`214`		`-t1=k1->local_tupdesc;`
	`214`	`+t1=k1->u.local_tupdesc;`
`215`	`215`
`216`	`216`	`if (k2->shared)`
`217`		`-t2= (TupleDesc)dsa_get_address(area,k2->shared_tupdesc);`
	`217`	`+t2= (TupleDesc)dsa_get_address(area,k2->u.shared_tupdesc);`
`218`	`218`	`else`
`219`		`-t2=k2->local_tupdesc;`
	`219`	`+t2=k2->u.local_tupdesc;`
`220`	`220`
`221`	`221`	`returnequalTupleDescs(t1,t2) ?0 :1;`
`222`	`222`	`}`
`@@ -232,9 +232,9 @@ shared_record_table_hash(const void a, size_t size, void arg)`
`232`	`232`	`TupleDesct;`
`233`	`233`
`234`	`234`	`if (k->shared)`
`235`		`-t= (TupleDesc)dsa_get_address(area,k->shared_tupdesc);`
	`235`	`+t= (TupleDesc)dsa_get_address(area,k->u.shared_tupdesc);`
`236`	`236`	`else`
`237`		`-t=k->local_tupdesc;`
	`237`	`+t=k->u.local_tupdesc;`
`238`	`238`
`239`	`239`	`returnhashTupleDesc(t);`
`240`	`240`	`}`
`@@ -1710,14 +1710,14 @@ SharedRecordTypmodRegistryInit(SharedRecordTypmodRegistry *registry,`
`1710`	`1710`
`1711`	`1711`	`/* Insert into the record table. */`
`1712`	`1712`	`record_table_key.shared= false;`
`1713`		`-record_table_key.local_tupdesc=tupdesc;`
	`1713`	`+record_table_key.u.local_tupdesc=tupdesc;`
`1714`	`1714`	`record_table_entry=dshash_find_or_insert(record_table,`
`1715`	`1715`	`&record_table_key,`
`1716`	`1716`	`&found);`
`1717`	`1717`	`if (!found)`
`1718`	`1718`	`{`
`1719`	`1719`	`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;`
`1721`	`1721`	`}`
`1722`	`1722`	`dshash_release_lock(record_table,record_table_entry);`
`1723`	`1723`	`}`
`@@ -2261,7 +2261,7 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)`
`2261`	`2261`
`2262`	`2262`	`/* Try to find a matching tuple descriptor in the record table. */`
`2263`	`2263`	`key.shared= false;`
`2264`		`-key.local_tupdesc=tupdesc;`
	`2264`	`+key.u.local_tupdesc=tupdesc;`
`2265`	`2265`	`record_table_entry= (SharedRecordTableEntry*)`
`2266`	`2266`	`dshash_find(CurrentSession->shared_record_table,&key, false);`
`2267`	`2267`	`if (record_table_entry)`
`@@ -2271,7 +2271,7 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)`
`2271`	`2271`	`record_table_entry);`
`2272`	`2272`	`result= (TupleDesc)`
`2273`	`2273`	`dsa_get_address(CurrentSession->area,`
`2274`		`-record_table_entry->key.shared_tupdesc);`
	`2274`	`+record_table_entry->key.u.shared_tupdesc);`
`2275`	`2275`	`Assert(result->tdrefcount==-1);`
`2276`	`2276`
`2277`	`2277`	`returnresult;`
`@@ -2342,7 +2342,7 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)`
`2342`	`2342`
`2343`	`2343`	`/* Store it and return it. */`
`2344`	`2344`	`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;`
`2346`	`2346`	`dshash_release_lock(CurrentSession->shared_record_table,`
`2347`	`2347`	`record_table_entry);`
`2348`	`2348`	`result= (TupleDesc)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commiteaa4070

File tree

1 file changed

1 file changed

`‎src/backend/utils/cache/typcache.c`

0 commit comments