fix initialization of pgspHashKey structure #40
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SeleznevPavel
force-pushed
the
fix-clang-warning
branch
from
8029e61 to
e36578c
Compare
|
@rjuju can i ask you to do a review? |
rjuju
requested changes
Jan 17, 2025
| @@ -1216,6 +1216,8 @@ pgsp_store(char *plan, queryid_t queryId, | |||
|
|
|||
| Assert(plan != NULL && queryId != PGSP_NO_QUERYID); | |||
|
|
|||
| memset(&key, 0, sizeof(pgspHashKey)); | |||
There was a problem hiding this comment.
This should be ifdef'd for pg11+ as until pg10 it was still a uint32, since the rest of the code correctly handle the version change.
| @@ -1292,7 +1294,7 @@ pgsp_store(char *plan, queryid_t queryId, | |||
| /* shorten_plan is terminated by NUL */ | |||
| if (plan_storage == PLAN_STORAGE_SHMEM) | |||
| memcpy(SHMEM_PLAN_PTR(entry), shorten_plan, plan_len + 1); | |||
|
|
|||
There was a problem hiding this comment.
nit: you could just remove this line as there is another newline just after.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The size of the key used in the hash table is sizeof(pgspHashKey) = 24.
The hash is calculated for 24 bytes, but the key consists of Oid + Oid + queryid_t + uint32 = 4 + 4 + 8 + 4 = 20 bytes. Memory in pgsp_store is allocated on the stack, uninitialized and filled for 20 bytes, respectively, garbage remains in the remaining 4 bytes.
This leads to the fact that different hashes were obtained from the same key, so there was no query aggregation - each time a new entry was added to the hash table.