This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 02af7d50acc Fix compile errors for utils/datumstream
02af7d50acc is described below
commit 02af7d50acc9721b7c7aae1b7adfc281fae5cd52
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Oct 6 17:22:00 2025 +0800
Fix compile errors for utils/datumstream
---
src/backend/utils/datumstream/datumstream.c | 8 ++++----
src/backend/utils/datumstream/datumstreamblock.c | 14 ++++++--------
src/include/utils/datumstreamblock.h | 10 +++++-----
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/backend/utils/datumstream/datumstream.c
b/src/backend/utils/datumstream/datumstream.c
index d0ff5a185bf..474b5dd5fa8 100644
--- a/src/backend/utils/datumstream/datumstream.c
+++ b/src/backend/utils/datumstream/datumstream.c
@@ -628,7 +628,7 @@ create_datumstreamwrite(
/* errdetailArg
*/ (void *) acc,
/* errcontextCallback */
datumstreamwrite_context_callback,
/*
errcontextArg */ (void *) acc,
-
&acc->ao_write.relFileNode.node);
+
&acc->ao_write.relFileNode.locator);
return acc;
}
@@ -903,7 +903,7 @@ datumstreamwrite_block_orig(DatumStreamWrite * acc)
writesz = DatumStreamBlockWrite_Block(
&acc->blockWrite,
buffer,
-
&acc->ao_write.relFileNode.node);
+
&acc->ao_write.relFileNode.locator);
acc->ao_write.logicalBlockStartOffset =
BufferedAppendNextBufferPosition(&(acc->ao_write.bufferedAppend));
@@ -958,7 +958,7 @@ datumstreamwrite_block_dense(DatumStreamWrite * acc)
writesz = DatumStreamBlockWrite_Block(
&acc->blockWrite,
buffer,
-
&acc->ao_write.relFileNode.node);
+
&acc->ao_write.relFileNode.locator);
acc->ao_write.logicalBlockStartOffset =
BufferedAppendNextBufferPosition(&(acc->ao_write.bufferedAppend));
@@ -1096,7 +1096,7 @@ datumstreamwrite_lob(DatumStreamWrite * acc,
EncryptAOBLock((unsigned char *)encryptData,
encryptLen,
-
&acc->ao_write.relFileNode.node);
+
&acc->ao_write.relFileNode.locator);
*(uint16 *)content = 1;
memcpy(content + alignedHeaderSize, p, varLen);
diff --git a/src/backend/utils/datumstream/datumstreamblock.c
b/src/backend/utils/datumstream/datumstreamblock.c
index e102516ca80..c6d4249d96f 100755
--- a/src/backend/utils/datumstream/datumstreamblock.c
+++ b/src/backend/utils/datumstream/datumstreamblock.c
@@ -158,7 +158,7 @@ DatumStreamBlockRead_GetReadyOrig(
int32
rowCount,
bool
*hadToAdjustRowCount,
int32 *
adjustedRowCount,
- RelFileNode
*node)
+
RelFileLocator *node)
{
uint8 *p;
@@ -632,7 +632,7 @@ DatumStreamBlockRead_GetReadyDense(
int32
rowCount,
bool
*hadToAdjustRowCount,
int32 *
adjustedRowCount,
- RelFileNode
*node)
+
RelFileLocator *node)
{
uint8 *p;
@@ -3669,7 +3669,7 @@ static int64
DatumStreamBlockWrite_BlockOrig(
DatumStreamBlockWrite * dsw,
uint8 * buffer,
- RelFileNode
*node)
+ RelFileLocator
*node)
{
uint8 *p;
DatumStreamBlock_Orig block;
@@ -3803,7 +3803,7 @@ static int64
DatumStreamBlockWrite_BlockDense(
DatumStreamBlockWrite * dsw,
uint8 * buffer,
- RelFileNode
*node)
+ RelFileLocator
*node)
{
int64 writesz = 0;
uint8 *p = NULL;
@@ -4249,7 +4249,7 @@ int64
DatumStreamBlockWrite_Block(
DatumStreamBlockWrite *
dsw,
uint8 * buffer,
- RelFileNode *node)
+ RelFileLocator *node)
{
if (strncmp(dsw->eyecatcher, DatumStreamBlockWrite_Eyecatcher,
DatumStreamBlockWrite_EyecatcherLen) != 0)
elog(FATAL, "DatumStreamBlockWrite data structure not valid
(eyecatcher)");
@@ -4288,7 +4288,7 @@ DatumStreamBlockWrite_Init(
void *errdetailArg,
int (*errcontextCallback)
(void *errcontextArg),
void *errcontextArg,
- RelFileNode *relFileNode)
+ RelFileLocator *relFileNode)
{
memcpy(dsw->eyecatcher, DatumStreamBlockWrite_Eyecatcher,
DatumStreamBlockWrite_EyecatcherLen);
@@ -5238,8 +5238,6 @@ DatumStreamBlock_IntegrityCheckDense(
}
else
{
- DatumStreamBlock_Rle_Extension *rleExtension;
-
int32 actualNullOnCount;
int32 compressBitMapSize;
diff --git a/src/include/utils/datumstreamblock.h
b/src/include/utils/datumstreamblock.h
index 43b8d8eda90..96f6ecb1fe5 100755
--- a/src/include/utils/datumstreamblock.h
+++ b/src/include/utils/datumstreamblock.h
@@ -2073,7 +2073,7 @@ extern void DatumStreamBlockRead_GetReadyOrig(
int32
rowCount,
bool
*hadToAdjustRowCount,
int32 *
adjustedRowCount,
- RelFileNode
*node);
+
RelFileLocator *node);
extern void DatumStreamBlockRead_GetReadyDense(
DatumStreamBlockRead * dsr,
uint8 *
buffer,
@@ -2082,7 +2082,7 @@ extern void DatumStreamBlockRead_GetReadyDense(
int32
rowCount,
bool
*hadToAdjustRowCount,
int32 *
adjustedRowCount,
- RelFileNode
*node);
+
RelFileLocator *node);
inline static void
DatumStreamBlockRead_GetReady(
@@ -2093,7 +2093,7 @@ DatumStreamBlockRead_GetReady(
int32 rowCount,
bool
*hadToAdjustRowCount,
int32 *
adjustedRowCount,
- RelFileNode *node)
+ RelFileLocator *node)
{
if (dsr->datumStreamVersion == DatumStreamVersion_Original)
{
@@ -2167,7 +2167,7 @@ extern void DatumStreamBlockWrite_Init(
void *errdetailArg,
int (*errcontextCallback)
(void *errcontextArg),
void *errcontextArg,
- RelFileNode *relFileNode);
+ RelFileLocator *relFileNode);
extern void DatumStreamBlockWrite_Finish(
DatumStreamBlockWrite
* dsw);
@@ -2182,6 +2182,6 @@ extern void DatumStreamBlockWrite_GetReady(
extern int64 DatumStreamBlockWrite_Block(
DatumStreamBlockWrite *
dsw,
uint8 * buffer,
- RelFileNode *node);
+ RelFileLocator *node);
#endif /* DATUMSTREAMBLOCK_H */
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
