mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect format placeholders

Browse Source
This commit is contained in:
Peter Eisentraut 2023-02-24 08:02:48 +01:00
parent 4fc53819a4
commit 318b1c0cc1
3 changed files with 7 additions and 7 deletions
src/backend/statistics
dependencies.cmcv.cmvdistinct.c

4
src/backend/statistics/dependencies.c

@ -509,7 +509,7 @@ statext_dependencies_deserialize(bytea *data)
return NULL; return NULL;
if (VARSIZE_ANY_EXHDR(data) < SizeOfHeader) if (VARSIZE_ANY_EXHDR(data) < SizeOfHeader)
elog(ERROR, "invalid MVDependencies size %zd (expected at least %zd)", elog(ERROR, "invalid MVDependencies size %zu (expected at least %zu)",
VARSIZE_ANY_EXHDR(data), SizeOfHeader); VARSIZE_ANY_EXHDR(data), SizeOfHeader);
/* read the MVDependencies header */ /* read the MVDependencies header */
@ -541,7 +541,7 @@ statext_dependencies_deserialize(bytea *data)
min_expected_size = SizeOfItem(dependencies->ndeps); min_expected_size = SizeOfItem(dependencies->ndeps);
if (VARSIZE_ANY_EXHDR(data) < min_expected_size) if (VARSIZE_ANY_EXHDR(data) < min_expected_size)
elog(ERROR, "invalid dependencies size %zd (expected at least %zd)", elog(ERROR, "invalid dependencies size %zu (expected at least %zu)",
VARSIZE_ANY_EXHDR(data), min_expected_size); VARSIZE_ANY_EXHDR(data), min_expected_size);
/* allocate space for the MCV items */ /* allocate space for the MCV items */

6
src/backend/statistics/mcv.c

@ -1032,7 +1032,7 @@ statext_mcv_deserialize(bytea *data)
* header fields one by one, so we need to ignore struct alignment. * header fields one by one, so we need to ignore struct alignment.
*/ */
if (VARSIZE_ANY(data) < MinSizeOfMCVList) if (VARSIZE_ANY(data) < MinSizeOfMCVList)
elog(ERROR, "invalid MCV size %zd (expected at least %zu)", elog(ERROR, "invalid MCV size %zu (expected at least %zu)",
VARSIZE_ANY(data), MinSizeOfMCVList); VARSIZE_ANY(data), MinSizeOfMCVList);
/* read the MCV list header */ /* read the MCV list header */
@ -1093,7 +1093,7 @@ statext_mcv_deserialize(bytea *data)
* to do this check first, before accessing the dimension info. * to do this check first, before accessing the dimension info.
*/ */
if (VARSIZE_ANY(data) < expected_size) if (VARSIZE_ANY(data) < expected_size)
elog(ERROR, "invalid MCV size %zd (expected %zu)", elog(ERROR, "invalid MCV size %zu (expected %zu)",
VARSIZE_ANY(data), expected_size); VARSIZE_ANY(data), expected_size);
/* Now copy the array of type Oids. */ /* Now copy the array of type Oids. */
@ -1125,7 +1125,7 @@ statext_mcv_deserialize(bytea *data)
* check on size. * check on size.
*/ */
if (VARSIZE_ANY(data) != expected_size) if (VARSIZE_ANY(data) != expected_size)
elog(ERROR, "invalid MCV size %zd (expected %zu)", elog(ERROR, "invalid MCV size %zu (expected %zu)",
VARSIZE_ANY(data), expected_size); VARSIZE_ANY(data), expected_size);
/* /*

4
src/backend/statistics/mvdistinct.c

@ -261,7 +261,7 @@ statext_ndistinct_deserialize(bytea *data)
/* we expect at least the basic fields of MVNDistinct struct */ /* we expect at least the basic fields of MVNDistinct struct */
if (VARSIZE_ANY_EXHDR(data) < SizeOfHeader) if (VARSIZE_ANY_EXHDR(data) < SizeOfHeader)
elog(ERROR, "invalid MVNDistinct size %zd (expected at least %zd)", elog(ERROR, "invalid MVNDistinct size %zu (expected at least %zu)",
VARSIZE_ANY_EXHDR(data), SizeOfHeader); VARSIZE_ANY_EXHDR(data), SizeOfHeader);
/* initialize pointer to the data part (skip the varlena header) */ /* initialize pointer to the data part (skip the varlena header) */
@ -287,7 +287,7 @@ statext_ndistinct_deserialize(bytea *data)
/* what minimum bytea size do we expect for those parameters */ /* what minimum bytea size do we expect for those parameters */
minimum_size = MinSizeOfItems(ndist.nitems); minimum_size = MinSizeOfItems(ndist.nitems);
if (VARSIZE_ANY_EXHDR(data) < minimum_size) if (VARSIZE_ANY_EXHDR(data) < minimum_size)
elog(ERROR, "invalid MVNDistinct size %zd (expected at least %zd)", elog(ERROR, "invalid MVNDistinct size %zu (expected at least %zu)",
VARSIZE_ANY_EXHDR(data), minimum_size); VARSIZE_ANY_EXHDR(data), minimum_size);
/* /*