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 d50138e6e6f Fix compile errors for aocs
d50138e6e6f is described below
commit d50138e6e6f5b9ceba7c63ae9c77f736e01aec41
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Sep 30 10:33:22 2025 +0800
Fix compile errors for aocs
---
src/backend/access/aocs/aocs_compaction.c | 8 ++--
src/backend/access/aocs/aocsam.c | 48 ++++++++--------------
src/backend/access/aocs/aocsam_handler.c | 21 +++++-----
src/backend/access/aocs/aocssegfiles.c | 23 +++++++----
.../access/appendonly/appendonly_compaction.c | 2 +-
src/backend/utils/datumstream/datumstream.c | 8 ++--
src/include/cdb/cdbaocsam.h | 2 +-
src/include/cdb/cdbappendonlystoragewrite.h | 2 +-
src/include/utils/datumstream.h | 8 ++--
9 files changed, 56 insertions(+), 66 deletions(-)
diff --git a/src/backend/access/aocs/aocs_compaction.c
b/src/backend/access/aocs/aocs_compaction.c
index e6ecea73de1..12df08f3d67 100644
--- a/src/backend/access/aocs/aocs_compaction.c
+++ b/src/backend/access/aocs/aocs_compaction.c
@@ -142,7 +142,7 @@ AOCSSegmentFileTruncateToEOF(Relation aorel, int segno,
AOCSVPInfo *vpinfo, AOVa
get_namespace_name(RelationGetNamespace(aorel)),
relname,
aorel->rd_id,
- aorel->rd_node.relNode,
+ aorel->rd_locator.relNumber,
j,
segno,
fileSegNo,
@@ -159,7 +159,7 @@ AOCSSegmentFileTruncateToEOF(Relation aorel, int segno,
AOCSVPInfo *vpinfo, AOVa
get_namespace_name(RelationGetNamespace(aorel)),
relname,
aorel->rd_id,
- aorel->rd_node.relNode,
+ aorel->rd_locator.relNumber,
j,
segno,
fileSegNo,
@@ -172,7 +172,7 @@ AOCSSegmentFileTruncateToEOF(Relation aorel, int segno,
AOCSVPInfo *vpinfo, AOVa
get_namespace_name(RelationGetNamespace(aorel)),
relname,
aorel->rd_id,
- aorel->rd_node.relNode,
+ aorel->rd_locator.relNumber,
j,
segno,
fileSegNo,
@@ -209,7 +209,7 @@ AOCSMoveTuple(TupleTableSlot *slot,
{
ExecInsertIndexTuples(resultRelInfo,
slot, estate, false,
false,
- NULL, NIL);
+ NULL, NIL, false);
ResetPerTupleExprContext(estate);
}
diff --git a/src/backend/access/aocs/aocsam.c b/src/backend/access/aocs/aocsam.c
index a3f2b597977..6d3c1f78447 100644
--- a/src/backend/access/aocs/aocsam.c
+++ b/src/backend/access/aocs/aocsam.c
@@ -82,7 +82,6 @@ open_datumstreamread_segfile(
int segNo = segInfo->segno;
char fn[MAXPGPATH];
int32 fileSegNo;
- RelFileNode node = rel->rd_node;
Oid relid = RelationGetRelid(rel);
/* Filenum for the column */
@@ -94,8 +93,7 @@ open_datumstreamread_segfile(
Assert(strlen(fn) + 1 <= MAXPGPATH);
Assert(ds);
- datumstreamread_open_file(ds, fn, e->eof, e->eof_uncompressed, node,
- fileSegNo,
segInfo->formatversion);
+ datumstreamread_open_file(ds, fn, e->eof,
e->eof_uncompressed,segInfo->formatversion);
}
/*
@@ -115,14 +113,13 @@ open_all_datumstreamread_segfiles(AOCSScanDesc scan,
AOCSFileSegInfo *segInfo)
AttrNumber *proj_atts = scan->columnScanInfo.proj_atts;
AttrNumber num_proj_atts =
scan->columnScanInfo.num_proj_atts;
AppendOnlyBlockDirectory *blockDirectory = scan->blockDirectory;
- char *basepath = relpathbackend(rel->rd_node, rel->rd_backend,
MAIN_FORKNUM);
+ char *basepath = relpathbackend(rel->rd_locator, rel->rd_backend,
MAIN_FORKNUM);
Assert(proj_atts);
for (AttrNumber i = 0; i < num_proj_atts; i++)
{
AttrNumber attno = proj_atts[i];
- RelationOpenSmgr(rel);
open_datumstreamread_segfile(basepath, rel, segInfo, ds[attno],
attno);
datumstreamread_block(ds[attno], blockDirectory, attno);
@@ -141,9 +138,9 @@ open_ds_write(Relation rel, DatumStreamWrite **ds,
TupleDesc relationTupleDesc,
{
int natts = RelationGetNumberOfAttributes(rel);
StdRdOptions **opts = RelationGetAttributeOptions(rel);
- RelFileNodeBackend rnode;
+ RelFileLocatorBackend rnode;
- rnode.node = rel->rd_node;
+ rnode.locator = rel->rd_locator;
rnode.backend = rel->rd_backend;
@@ -176,8 +173,6 @@ open_ds_write(Relation rel, DatumStreamWrite **ds,
TupleDesc relationTupleDesc,
clvl = opts[i]->compresslevel;
blksz = opts[i]->blocksize;
- RelationOpenSmgr(rel);
-
ds[i] = create_datumstreamwrite(ct,
clvl,
checksum,
@@ -188,7 +183,7 @@ open_ds_write(Relation rel, DatumStreamWrite **ds,
TupleDesc relationTupleDesc,
/* title */ titleBuf.data,
XLogIsNeeded() && RelationNeedsWAL(rel),
&rnode,
-
rel->rd_smgr->smgr_ao);
+
RelationGetSmgr(rel)->smgr_ao);
}
}
@@ -269,8 +264,6 @@ open_ds_read(Relation rel, DatumStreamRead **ds, TupleDesc
relationTupleDesc,
attno + 1,
NameStr(attr->attname));
- RelationOpenSmgr(rel);
-
ds[attno] = create_datumstreamread(ct,
clvl,
checksum,
@@ -279,8 +272,8 @@ open_ds_read(Relation rel, DatumStreamRead **ds, TupleDesc
relationTupleDesc,
RelationGetRelationName(rel),
RelationGetRelid(rel),
/* title */ titleBuf.data,
-
&rel->rd_node,
-
rel->rd_smgr->smgr_ao);
+
&rel->rd_locator,
+
RelationGetSmgr(rel)->smgr_ao);
}
}
@@ -980,7 +973,7 @@ aocs_getnext(AOCSScanDesc scan, ScanDirection direction,
TupleTableSlot *slot)
static void
OpenAOCSDatumStreams(AOCSInsertDesc desc)
{
- RelFileNodeBackend rnode;
+ RelFileLocatorBackend rnode;
char *basepath;
char fn[MAXPGPATH];
int32 fileSegNo;
@@ -1012,7 +1005,7 @@ OpenAOCSDatumStreams(AOCSInsertDesc desc)
desc->rowCount = seginfo->total_tupcount;
- rnode.node = desc->aoi_rel->rd_node;
+ rnode.locator = desc->aoi_rel->rd_locator;
rnode.backend = desc->aoi_rel->rd_backend;
basepath = relpath(rnode, MAIN_FORKNUM);
@@ -1474,7 +1467,6 @@ openFetchSegmentFile(AOCSFetchDesc aocsFetchDesc,
if (logicalEof == 0)
return false;
- RelationOpenSmgr(aocsFetchDesc->relation);
open_datumstreamread_segfile(aocsFetchDesc->basepath,
aocsFetchDesc->relation,
fsInfo,
datumStreamFetchDesc->datumStream,
@@ -1512,7 +1504,7 @@ aocs_fetch_init(Relation relation,
{
AOCSFetchDesc aocsFetchDesc;
int colno;
- char *basePath = relpathbackend(relation->rd_node,
relation->rd_backend, MAIN_FORKNUM);
+ char *basePath = relpathbackend(relation->rd_locator,
relation->rd_backend, MAIN_FORKNUM);
TupleDesc tupleDesc = RelationGetDescr(relation);
StdRdOptions **opts = RelationGetAttributeOptions(relation);
int segno;
@@ -1619,8 +1611,6 @@ aocs_fetch_init(Relation relation,
aocsFetchDesc->datumStreamFetchDesc[colno] =
(DatumStreamFetchDesc)
palloc0(sizeof(DatumStreamFetchDescData));
-
- RelationOpenSmgr(relation);
aocsFetchDesc->datumStreamFetchDesc[colno]->datumStream
=
create_datumstreamread(ct,
@@ -1631,7 +1621,8 @@ aocs_fetch_init(Relation relation,
relation->rd_rel->relname.data,
RelationGetRelid(relation),
/*
title */ titleBuf.data,
-
&relation->rd_node, relation->rd_smgr->smgr_ao);
+
&relation->rd_locator,
+
RelationGetSmgr(relation)->smgr_ao);
}
if (opts[colno])
@@ -1675,7 +1666,7 @@ aocs_fetch(AOCSFetchDesc aocsFetchDesc,
ereport(ERROR,
(errcode(ERRCODE_INTERNAL_ERROR),
errmsg("Row No. %ld in segment file No. %d is
out of scanning scope for target relfilenode %u.",
- rowNum, segmentFileNum,
aocsFetchDesc->relation->rd_node.relNode)));
+ rowNum, segmentFileNum,
aocsFetchDesc->relation->rd_locator.relNumber)));
/*
* if the rowNum is bigger than lastsequence, skip it.
@@ -2006,8 +1997,6 @@ aocs_begin_headerscan(Relation rel, int colno)
ao_attr.compressLevel = 0;
ao_attr.overflowSize = 0;
hdesc = palloc(sizeof(AOCSHeaderScanDescData));
-
- RelationOpenSmgr(rel);
AppendOnlyStorageRead_Init(&hdesc->ao_read,
NULL, //current
memory context
@@ -2016,7 +2005,7 @@ aocs_begin_headerscan(Relation rel, int colno)
RelationGetRelid(rel),
"ALTER TABLE ADD
COLUMN scan",
&ao_attr,
- &rel->rd_node,
rel->rd_smgr->smgr_ao);
+ &rel->rd_locator,
RelationGetSmgr(rel)->smgr_ao);
hdesc->colno = colno;
hdesc->relid = RelationGetRelid(rel);
@@ -2080,9 +2069,9 @@ aocs_addcol_init(Relation rel,
int iattr;
StringInfoData titleBuf;
bool checksum;
- RelFileNodeBackend rnode;
+ RelFileLocatorBackend rnode;
- rnode.node = rel->rd_node;
+ rnode.locator = rel->rd_locator;
rnode.backend = rel->rd_backend;
desc = palloc(sizeof(AOCSAddColumnDescData));
@@ -2117,7 +2106,6 @@ aocs_addcol_init(Relation rel,
ct = opts[iattr]->compresstype;
clvl = opts[iattr]->compresslevel;
blksz = opts[iattr]->blocksize;
- RelationOpenSmgr(rel);
desc->dsw[i] = create_datumstreamwrite(ct, clvl, checksum,
blksz,
attr, RelationGetRelationName(rel),
@@ -2125,7 +2113,7 @@ aocs_addcol_init(Relation rel,
titleBuf.data,
XLogIsNeeded() && RelationNeedsWAL(rel),
&rnode,
-
rel->rd_smgr->smgr_ao);
+
RelationGetSmgr(rel)->smgr_ao);
}
return desc;
}
@@ -2137,7 +2125,7 @@ void
aocs_addcol_newsegfile(AOCSAddColumnDesc desc,
AOCSFileSegInfo *seginfo,
char *basepath,
- RelFileNodeBackend relfilenode)
+ RelFileLocatorBackend relfilenode)
{
int32 fileSegNo;
char fn[MAXPGPATH];
diff --git a/src/backend/access/aocs/aocsam_handler.c
b/src/backend/access/aocs/aocsam_handler.c
index 504e9c0fb7a..58008e0777e 100644
--- a/src/backend/access/aocs/aocsam_handler.c
+++ b/src/backend/access/aocs/aocsam_handler.c
@@ -1137,7 +1137,7 @@ static TM_Result
aoco_tuple_update(Relation relation, ItemPointer otid, TupleTableSlot *slot,
CommandId cid, Snapshot snapshot, Snapshot
crosscheck,
bool wait, TM_FailureData *tmfd,
- LockTupleMode *lockmode, bool *update_indexes)
+ LockTupleMode *lockmode, TU_UpdateIndexes
*update_indexes)
{
AOCSInsertDesc insertDesc;
AOCSDeleteDesc deleteDesc;
@@ -1164,9 +1164,9 @@ aoco_tuple_update(Relation relation, ItemPointer otid,
TupleTableSlot *slot,
aocs_insert(insertDesc, slot);
- pgstat_count_heap_update(relation, false);
+ pgstat_count_heap_update(relation, false, false);
/* No HOT updates with AO tables. */
- *update_indexes = true;
+ *update_indexes = TU_All;
return result;
}
@@ -1309,7 +1309,7 @@ aoco_index_delete_tuples(Relation rel,
*/
static void
aoco_relation_set_new_filenode(Relation rel,
- const RelFileNode
*newrnode,
+ const RelFileLocator
*newrnode,
char persistence,
TransactionId
*freezeXid,
MultiXactId
*minmulti)
@@ -1329,7 +1329,7 @@ aoco_relation_set_new_filenode(Relation rel,
*
* Segment files will be created when / if needed.
*/
- srel = RelationCreateStorage(*newrnode, persistence, SMGR_AO, rel);
+ srel = RelationCreateStorage(*newrnode, persistence, true, SMGR_AO,
rel);
/*
* If required, set up an init fork for an unlogged table so that it can
@@ -1387,7 +1387,7 @@ aoco_relation_nontransactional_truncate(Relation rel)
}
static void
-aoco_relation_copy_data(Relation rel, const RelFileNode *newrnode)
+aoco_relation_copy_data(Relation rel, const RelFileLocator *newrnode)
{
SMgrRelation dstrel;
@@ -1396,7 +1396,6 @@ aoco_relation_copy_data(Relation rel, const RelFileNode
*newrnode)
* implementation
*/
dstrel = smgropen(*newrnode, rel->rd_backend, SMGR_AO, rel);
- RelationOpenSmgr(rel);
/*
* Create and copy all forks of the relation, and schedule unlinking of
@@ -1405,9 +1404,9 @@ aoco_relation_copy_data(Relation rel, const RelFileNode
*newrnode)
* NOTE: any conflict in relfilenode value will be caught in
* RelationCreateStorage().
*/
- RelationCreateStorage(*newrnode, rel->rd_rel->relpersistence, SMGR_AO,
rel);
+ RelationCreateStorage(*newrnode, rel->rd_rel->relpersistence, true,
SMGR_AO, rel);
- copy_append_only_data(rel->rd_node, *newrnode, rel->rd_smgr, dstrel,
rel->rd_backend, rel->rd_rel->relpersistence);
+ copy_append_only_data(rel->rd_locator, *newrnode, RelationGetSmgr(rel),
dstrel, rel->rd_backend, rel->rd_rel->relpersistence);
/*
* For append-optimized tables, no forks other than the main fork should
@@ -1416,7 +1415,7 @@ aoco_relation_copy_data(Relation rel, const RelFileNode
*newrnode)
*/
if (rel->rd_rel->relpersistence == RELPERSISTENCE_UNLOGGED)
{
- Assert (smgrexists(rel->rd_smgr, INIT_FORKNUM));
+ Assert (smgrexists(RelationGetSmgr(rel), INIT_FORKNUM));
/*
* INIT_FORK is empty, creating it is sufficient, no need to
copy
@@ -2581,7 +2580,7 @@ static TableAmRoutine ao_column_methods = {
.tuple_satisfies_snapshot = aoco_tuple_satisfies_snapshot,
.index_delete_tuples = aoco_index_delete_tuples,
- .relation_set_new_filenode = aoco_relation_set_new_filenode,
+ .relation_set_new_filelocator = aoco_relation_set_new_filenode,
.relation_nontransactional_truncate =
aoco_relation_nontransactional_truncate,
.relation_copy_data = aoco_relation_copy_data,
.relation_copy_for_cluster = aoco_relation_copy_for_cluster,
diff --git a/src/backend/access/aocs/aocssegfiles.c
b/src/backend/access/aocs/aocssegfiles.c
index aa06320ca41..36d551991d7 100644
--- a/src/backend/access/aocs/aocssegfiles.c
+++ b/src/backend/access/aocs/aocssegfiles.c
@@ -46,7 +46,6 @@
#include "cdb/cdbappendonlystorageread.h"
#include "cdb/cdbappendonlystoragewrite.h"
#include "utils/datumstream.h"
-#include "utils/int8.h"
#include "utils/fmgroids.h"
#include "access/aocssegfiles.h"
#include "access/aosegfiles.h"
@@ -577,6 +576,7 @@ MarkAOCSFileSegInfoAwaitingDrop(Relation prel, int segno)
TupleDesc tupdesc;
Snapshot appendOnlyMetaDataSnapshot;
Oid segrelid;
+ TU_UpdateIndexes updateIndexes = TU_All;
if (Debug_appendonly_print_compaction)
elog(LOG,
@@ -629,7 +629,7 @@ MarkAOCSFileSegInfoAwaitingDrop(Relation prel, int segno)
newtup = heap_modify_tuple(oldtup, tupdesc, d, null, repl);
- simple_heap_update(segrel, &oldtup->t_self, newtup);
+ simple_heap_update(segrel, &oldtup->t_self, newtup, &updateIndexes);
pfree(newtup);
@@ -665,6 +665,7 @@ ClearAOCSFileSegInfo(Relation prel, int segno)
AOCSVPInfo *vpinfo = create_aocs_vpinfo(nvp);
Oid segrelid;
Snapshot appendOnlyMetaDataSnapshot;
+ TU_UpdateIndexes updateIndexes = TU_All;
Assert(RelationStorageIsAoCols(prel));
@@ -736,7 +737,7 @@ ClearAOCSFileSegInfo(Relation prel, int segno)
newtup = heap_modify_tuple(oldtup, tupdesc, d, null, repl);
- simple_heap_update(segrel, &oldtup->t_self, newtup);
+ simple_heap_update(segrel, &oldtup->t_self, newtup, &updateIndexes);
pfree(newtup);
pfree(vpinfo);
@@ -765,6 +766,7 @@ UpdateAOCSFileSegInfo(AOCSInsertDesc idesc)
int nvp = RelationGetNumberOfAttributes(prel);
int i;
AOCSVPInfo *vpinfo = create_aocs_vpinfo(nvp);
+ TU_UpdateIndexes updateIndexes = TU_All;
segrel = heap_open(idesc->segrelid, RowExclusiveLock);
tupdesc = RelationGetDescr(segrel);
@@ -867,7 +869,7 @@ UpdateAOCSFileSegInfo(AOCSInsertDesc idesc)
{
elog(ERROR, "Unexpected compressed EOF for relation %s,
relfilenode %u, segment file %d coln %d. "
"EOF " INT64_FORMAT " to be updated cannot be
smaller than current EOF " INT64_FORMAT " in pg_aocsseg",
- RelationGetRelationName(prel),
prel->rd_node.relNode,
+ RelationGetRelationName(prel),
prel->rd_locator.relNumber,
idesc->cur_segno, i, idesc->ds[i]->eof,
oldvpinfo->entry[i].eof);
}
@@ -879,7 +881,7 @@ UpdateAOCSFileSegInfo(AOCSInsertDesc idesc)
{
elog(ERROR, "Unexpected EOF for relation %s,
relfilenode %u, segment file %d coln %d. "
"EOF " INT64_FORMAT " to be updated cannot be
smaller than current EOF " INT64_FORMAT " in pg_aocsseg",
- RelationGetRelationName(prel),
prel->rd_node.relNode,
+ RelationGetRelationName(prel),
prel->rd_locator.relNumber,
idesc->cur_segno, i,
idesc->ds[i]->eofUncompress, oldvpinfo->entry[i].eof_uncompressed);
}
}
@@ -895,7 +897,7 @@ UpdateAOCSFileSegInfo(AOCSInsertDesc idesc)
newtup = heap_modify_tuple(oldtup, tupdesc, d, null, repl);
- simple_heap_update(segrel, &oldtup->t_self, newtup);
+ simple_heap_update(segrel, &oldtup->t_self, newtup, &updateIndexes);
pfree(newtup);
pfree(vpinfo);
@@ -935,6 +937,7 @@ AOCSFileSegInfoAddVpe(Relation prel, int32 segno,
/* nvp is new columns + existing columns */
int i;
int j;
+ TU_UpdateIndexes updateIndexes = TU_All;
if (IS_UTILITY_BUT_NOT_SINGLENODE())
{
@@ -1038,7 +1041,7 @@ AOCSFileSegInfoAddVpe(Relation prel, int32 segno,
newtup = heap_modify_tuple(oldtup, tupdesc, d, null, repl);
- simple_heap_update(segrel, &oldtup->t_self, newtup);
+ simple_heap_update(segrel, &oldtup->t_self, newtup, &updateIndexes);
pfree(newtup);
pfree(newvpinfo);
@@ -1070,7 +1073,9 @@ AOCSFileSegInfoAddCount(Relation prel, int32 segno,
TupleDesc tupdesc;
Oid segrelid;
- GetAppendOnlyEntryAuxOids(prel,
+ TU_UpdateIndexes updateIndexes = TU_All;
+
+ GetAppendOnlyEntryAuxOids(prel,
&segrelid, NULL, NULL,
NULL, NULL);
@@ -1131,7 +1136,7 @@ AOCSFileSegInfoAddCount(Relation prel, int32 segno,
newtup = heap_modify_tuple(oldtup, tupdesc, d, null, repl);
- simple_heap_update(segrel, &oldtup->t_self, newtup);
+ simple_heap_update(segrel, &oldtup->t_self, newtup, &updateIndexes);
heap_freetuple(newtup);
diff --git a/src/backend/access/appendonly/appendonly_compaction.c
b/src/backend/access/appendonly/appendonly_compaction.c
index b8cae6ebf6c..e9eec1e4b2a 100644
--- a/src/backend/access/appendonly/appendonly_compaction.c
+++ b/src/backend/access/appendonly/appendonly_compaction.c
@@ -252,7 +252,7 @@ AppendOnlySegmentFileTruncateToEOF(Relation aorel, int
segno, int64 segeof, AOVa
get_namespace_name(RelationGetNamespace(aorel)),
relname,
aorel->rd_id,
- aorel->rd_locator.relNumber,
+、 aorel->rd_locator.relNumber,
segno,
segeof);
diff --git a/src/backend/utils/datumstream/datumstream.c
b/src/backend/utils/datumstream/datumstream.c
index 42f374d1498..d0ff5a185bf 100644
--- a/src/backend/utils/datumstream/datumstream.c
+++ b/src/backend/utils/datumstream/datumstream.c
@@ -496,7 +496,7 @@ create_datumstreamwrite(
Oid reloid,
char *title,
bool needsWAL,
- RelFileNodeBackend *rnode,
+ RelFileLocatorBackend *rnode,
const struct f_smgr_ao *smgrAO)
{
DatumStreamWrite *acc = palloc0(sizeof(DatumStreamWrite));
@@ -643,7 +643,7 @@ create_datumstreamread(
char *relname,
Oid reloid,
char *title,
- RelFileNode *relFileNode, const
struct f_smgr_ao *smgrAO)
+ RelFileLocator *relFileNode, const
struct f_smgr_ao *smgrAO)
{
DatumStreamRead *acc = palloc0(sizeof(DatumStreamRead));
@@ -805,7 +805,7 @@ destroy_datumstreamread(DatumStreamRead * ds)
void
datumstreamwrite_open_file(DatumStreamWrite *ds, char *fn, int64 eof, int64
eofUncompressed,
- RelFileNodeBackend
*relFileNode, int32 segmentFileNum, int version)
+ RelFileLocatorBackend
*relFileNode, int32 segmentFileNum, int version)
{
ds->eof = eof;
ds->eofUncompress = eofUncompressed;
@@ -840,7 +840,7 @@ datumstreamwrite_open_file(DatumStreamWrite *ds, char *fn,
int64 eof, int64 eofU
}
void
-datumstreamread_open_file(DatumStreamRead * ds, char *fn, int64 eof, int64
eofUncompressed, RelFileNode relFileNode, int32 segmentFileNum, int version)
+datumstreamread_open_file(DatumStreamRead * ds, char *fn, int64 eof, int64
eofUncompressed, int version)
{
ds->eof = eof;
ds->eofUncompress = eofUncompressed;
diff --git a/src/include/cdb/cdbaocsam.h b/src/include/cdb/cdbaocsam.h
index b4a4653bfd0..695700f06d4 100644
--- a/src/include/cdb/cdbaocsam.h
+++ b/src/include/cdb/cdbaocsam.h
@@ -385,7 +385,7 @@ extern AOCSAddColumnDesc aocs_addcol_init(
Relation rel, int num_newcols);
extern void aocs_addcol_newsegfile(
AOCSAddColumnDesc desc, AOCSFileSegInfo *seginfo, char
*basepath,
- RelFileNodeBackend relfilenode);
+ RelFileLocatorBackend relfilenode);
extern void aocs_addcol_closefiles(AOCSAddColumnDesc desc);
extern void aocs_addcol_endblock(AOCSAddColumnDesc desc, int64 firstRowNum);
extern void aocs_addcol_insert_datum(AOCSAddColumnDesc desc,
diff --git a/src/include/cdb/cdbappendonlystoragewrite.h
b/src/include/cdb/cdbappendonlystoragewrite.h
index 23a9c11e8ad..da5e1660ede 100755
--- a/src/include/cdb/cdbappendonlystoragewrite.h
+++ b/src/include/cdb/cdbappendonlystoragewrite.h
@@ -98,7 +98,7 @@ typedef struct AppendOnlyStorageWrite
*/
int64 startEof;
- RelFileNodeBackend relFileNode;
+ RelFileLocatorBackend relFileNode;
int32 segmentFileNum;
/*
diff --git a/src/include/utils/datumstream.h b/src/include/utils/datumstream.h
index 5210159d8b6..6966ce22cb3 100644
--- a/src/include/utils/datumstream.h
+++ b/src/include/utils/datumstream.h
@@ -262,7 +262,7 @@ extern DatumStreamWrite *create_datumstreamwrite(
Oid reloid,
char *title,
bool needsWAL,
- RelFileNodeBackend *rnode,
+ RelFileLocatorBackend *rnode,
const struct f_smgr_ao *smgrAO);
extern DatumStreamRead *create_datumstreamread(
@@ -274,7 +274,7 @@ extern DatumStreamRead *create_datumstreamread(
char *relname,
Oid reloid,
char *title,
- RelFileNode *relFileNode,
+ RelFileLocator *relFileNode,
const struct f_smgr_ao *smgrAO);
extern void datumstreamwrite_open_file(
@@ -282,7 +282,7 @@ extern void datumstreamwrite_open_file(
char *fn,
int64 eof,
int64 eofUncompressed,
- RelFileNodeBackend
*relFileNode,
+ RelFileLocatorBackend
*relFileNode,
int32 segmentFileNum,
int version);
@@ -291,8 +291,6 @@ extern void datumstreamread_open_file(
char *fn,
int64 eof,
int64 eofUncompressed,
- RelFileNode relFileNode,
- int32 segmentFileNum,
int version);
extern void datumstreamwrite_close_file(DatumStreamWrite * ds);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
