Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit50241eb

Browse files
authored
Merge pull request#25 from postgrespro/PGPRO-7397
Fix build due to new checks in PostgreSQL 16
2 parentsc356f2a +78e84fd commit50241eb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎vops.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ Datum vops_text_output(PG_FUNCTION_ARGS)
19241924
PG_FUNCTION_INFO_V1(vops_text_typmod_in);
19251925
Datumvops_text_typmod_in(PG_FUNCTION_ARGS)
19261926
{
1927-
ArrayType*arr= (ArrayType*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(0)));
1927+
ArrayType*arr= (ArrayType*)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
19281928
intn;
19291929
int32*typemods=ArrayGetIntegerTypmods(arr,&n);
19301930
intlen;
@@ -4418,7 +4418,7 @@ vops_substitute_tables_with_projections(char const* queryString, Query *query)
44184418
datum=SPI_getbinval(tuple,tupDesc,3,&isnull);
44194419
if (!isnull)
44204420
{
4421-
vectorColumns= (ArrayType*)DatumGetPointer(PG_DETOAST_DATUM(datum));
4421+
vectorColumns= (ArrayType*)PG_DETOAST_DATUM(datum);
44224422

44234423
/* Construct set of used vector columns */
44244424
deconstruct_array(vectorColumns,INT4OID,4, true,'i',&vectorAttnos,NULL,&nVectorColumns);
@@ -4431,7 +4431,7 @@ vops_substitute_tables_with_projections(char const* queryString, Query *query)
44314431
datum=SPI_getbinval(tuple,tupDesc,4,&isnull);
44324432
if (!isnull)
44334433
{
4434-
scalarColumns=isnull ?NULL : (ArrayType*)DatumGetPointer(PG_DETOAST_DATUM(datum));
4434+
scalarColumns=isnull ?NULL : (ArrayType*)PG_DETOAST_DATUM(datum);
44354435

44364436
/* Construct set of used scalar columns */
44374437
deconstruct_array(scalarColumns,INT4OID,4, true,'i',&scalarAttnos,NULL,&nScalarColumns);

‎vops.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#defineVOPS_SIZEOF_TEXT(width) (LONGALIGN(VARHDRSZ) + sizeof(vops_tile_hdr) + (width)*TILE_SIZE)
55
#defineVOPS_ELEM_SIZE(var) ((VARSIZE(var) - LONGALIGN(VARHDRSZ) - sizeof(vops_tile_hdr)) / TILE_SIZE)
6-
#defineVOPS_TEXT_TILE(val) ((vops_tile_hdr*)((char*)DatumGetTextP(val) + LONGALIGN(VARHDRSZ)))
7-
#defineVOPS_GET_TILE(val,tid) (((tid) == VOPS_TEXT) ? VOPS_TEXT_TILE(val) : (vops_tile_hdr*)DatumGetPointer(val))
6+
#defineVOPS_TEXT_TILE(val) ((vops_tile_hdr*)((char*) pg_detoast_datum(val) + LONGALIGN(VARHDRSZ)))
7+
#defineVOPS_GET_TILE(val,tid) (((tid) == VOPS_TEXT) ? VOPS_TEXT_TILE((struct varlena *) DatumGetPointer(val)) : (vops_tile_hdr*)DatumGetPointer(val))
88

99
typedefenum
1010
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp