NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit56c7140

committed

Tweaks for SSI out-of-shared memory behavior.

If we call hash_search() with HASH_ENTER, it will bail out rather thanreturn NULL, so it's redundant to check for NULL again in the caller.Thus, in cases where we believe it's impossible for the hash table to runout of slots anyway, we can simplify the code slightly.On the flip side, in cases where it's theoretically possible to run out ofspace, we don't want to rely on dynahash.c to throw an error; instead,we pass HASH_ENTER_NULL and throw the error ourselves if a NULL comesback, so that we can provide a more descriptive error message.Kevin Grittner

1 parent73d9a90 commit56c7140Copy full SHA for 56c7140

File tree

1 file changed

-13

lines changed

src/backend/storage/lmgr
- predicate.c

1 file changed

-13

lines changed

`‎src/backend/storage/lmgr/predicate.c`

Lines changed: 5 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1604,12 +1604,7 @@ RegisterPredicateLockingXid(const TransactionId xid)`
`1604`	`1604`	`sxid= (SERIALIZABLEXID*)hash_search(SerializableXidHash,`
`1605`	`1605`	`&sxidtag,`
`1606`	`1606`	`HASH_ENTER,&found);`
`1607`		`-if (!sxid)`
`1608`		`-/* This should not be possible, based on allocation. */`
`1609`		`-ereport(ERROR,`
`1610`		`-(errcode(ERRCODE_OUT_OF_MEMORY),`
`1611`		`-errmsg("out of shared memory")));`
`1612`		`-`
	`1607`	`+Assert(sxid!=NULL);`
`1613`	`1608`	`Assert(!found);`
`1614`	`1609`
`1615`	`1610`	`/* Initialize the structure. */`
`@@ -2045,7 +2040,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,`
`2045`	`2040`	`target= (PREDICATELOCKTARGET*)`
`2046`	`2041`	`hash_search_with_hash_value(PredicateLockTargetHash,`
`2047`	`2042`	`targettag,targettaghash,`
`2048`		`-HASH_ENTER,&found);`
	`2043`	`+HASH_ENTER_NULL,&found);`
`2049`	`2044`	`if (!target)`
`2050`	`2045`	`ereport(ERROR,`
`2051`	`2046`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`@@ -2060,7 +2055,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,`
`2060`	`2055`	`lock= (PREDICATELOCK*)`
`2061`	`2056`	`hash_search_with_hash_value(PredicateLockHash,&locktag,`
`2062`	`2057`	`PredicateLockHashCodeFromTargetHashCode(&locktag,targettaghash),`
`2063`		`-HASH_ENTER,&found);`
	`2058`	`+HASH_ENTER_NULL,&found);`
`2064`	`2059`	`if (!lock)`
`2065`	`2060`	`ereport(ERROR,`
`2066`	`2061`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`@@ -3251,7 +3246,7 @@ ReleaseOneSerializableXact(SERIALIZABLEXACT *sxact, bool partial,`
`3251`	`3246`	`predlock=hash_search_with_hash_value(PredicateLockHash,&tag,`
`3252`	`3247`	`PredicateLockHashCodeFromTargetHashCode(&tag,`
`3253`	`3248`	`targettaghash),`
`3254`		`-HASH_ENTER,&found);`
	`3249`	`+HASH_ENTER_NULL,&found);`
`3255`	`3250`	`if (!predlock)`
`3256`	`3251`	`ereport(ERROR,`
`3257`	`3252`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`@@ -4301,10 +4296,7 @@ predicatelock_twophase_recover(TransactionId xid, uint16 info,`
`4301`	`4296`	`sxid= (SERIALIZABLEXID*)hash_search(SerializableXidHash,`
`4302`	`4297`	`&sxidtag,`
`4303`	`4298`	`HASH_ENTER,&found);`
`4304`		`-if (!sxid)`
`4305`		`-ereport(ERROR,`
`4306`		`-(errcode(ERRCODE_OUT_OF_MEMORY),`
`4307`		`-errmsg("out of shared memory")));`
	`4299`	`+Assert(sxid!=NULL);`
`4308`	`4300`	`Assert(!found);`
`4309`	`4301`	`sxid->myXact= (SERIALIZABLEXACT*)sxact;`
`4310`	`4302`

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!

Commit56c7140

File tree

1 file changed

1 file changed

`‎src/backend/storage/lmgr/predicate.c`

0 commit comments