From b760ec769c265e6a1392ddaa5fbd46e69a45c850 Mon Sep 17 00:00:00 2001 From: Sait Talha Nisanci Date: Fri, 27 Aug 2021 00:04:05 +0300 Subject: [PATCH] fixup! Introduces CopyFromState_compat macro --- src/backend/distributed/commands/local_multi_copy.c | 2 +- src/backend/distributed/commands/multi_copy.c | 4 ++-- src/backend/distributed/executor/multi_executor.c | 2 +- src/include/distributed/version_compat.h | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/backend/distributed/commands/local_multi_copy.c b/src/backend/distributed/commands/local_multi_copy.c index 2a4a30413..12b53e90a 100644 --- a/src/backend/distributed/commands/local_multi_copy.c +++ b/src/backend/distributed/commands/local_multi_copy.c @@ -211,7 +211,7 @@ DoLocalCopy(StringInfo buffer, Oid relationId, int64 shardId, CopyStmt *copyStat ParseState *pState = make_parsestate(NULL); (void) addRangeTableEntryForRelation(pState, shard, AccessShareLock, NULL, false, false); - CopyFromState_compat cstate = BeginCopyFrom_compat(pState, shard, NULL, NULL, false, + CopyFromState cstate = BeginCopyFrom_compat(pState, shard, NULL, NULL, false, ReadFromLocalBufferCallback, copyStatement->attlist, copyStatement->options); diff --git a/src/backend/distributed/commands/multi_copy.c b/src/backend/distributed/commands/multi_copy.c index 4437450e4..13cbda6a1 100644 --- a/src/backend/distributed/commands/multi_copy.c +++ b/src/backend/distributed/commands/multi_copy.c @@ -523,7 +523,7 @@ CopyToExistingShards(CopyStmt *copyStatement, QueryCompletionCompat *completionT } /* initialize copy state to read from COPY data source */ - CopyFromState_compat copyState = BeginCopyFrom_compat(NULL, + CopyFromState copyState = BeginCopyFrom_compat(NULL, copiedDistributedRelation, NULL, copyStatement->filename, @@ -621,7 +621,7 @@ CopyToNewShards(CopyStmt *copyStatement, QueryCompletionCompat *completionTag, O (ShardConnections *) palloc0(sizeof(ShardConnections)); /* initialize copy state to read from COPY data source */ - CopyFromState_compat copyState = BeginCopyFrom_compat(NULL, + CopyFromState copyState = BeginCopyFrom_compat(NULL, distributedRelation, NULL, copyStatement->filename, diff --git a/src/backend/distributed/executor/multi_executor.c b/src/backend/distributed/executor/multi_executor.c index 2863df26e..cdbafacc0 100644 --- a/src/backend/distributed/executor/multi_executor.c +++ b/src/backend/distributed/executor/multi_executor.c @@ -410,7 +410,7 @@ ReadFileIntoTupleStore(char *fileName, char *copyFormat, TupleDesc tupleDescript location); copyOptions = lappend(copyOptions, copyOption); - CopyFromState_compat copyState = BeginCopyFrom_compat(NULL, stubRelation, NULL, + CopyFromState copyState = BeginCopyFrom_compat(NULL, stubRelation, NULL, fileName, false, NULL, NULL, copyOptions); diff --git a/src/include/distributed/version_compat.h b/src/include/distributed/version_compat.h index c425a8075..797b6de28 100644 --- a/src/include/distributed/version_compat.h +++ b/src/include/distributed/version_compat.h @@ -41,7 +41,6 @@ FuncnameGetCandidates(a, b, c, d, e, f, g) #define expand_function_arguments_compat(a, b, c, d) expand_function_arguments(a, b, c, d) #define IsReindexWithParam_compat(reindex, param) IsReindexWithParam(reindex, param) -#define CopyFromState_compat CopyFromState #define BeginCopyFrom_compat(a, b, c, d, e, f, g, h) BeginCopyFrom(a, b, c, d, e, f, g, h) #define standard_ProcessUtility_compat(a, b, c, d, e, f, g, h) \ standard_ProcessUtility(a, b, c, d, e, f, g, h) @@ -77,7 +76,7 @@ ((strcmp(param, "concurrently") == 0) ? ((reindex)->concurrent) : \ ((strcmp(param, "verbose") == 0) ? ((reindex)->options == REINDEXOPT_VERBOSE) : \ false)) -#define CopyFromState_compat CopyState +#define CopyFromState CopyState #define BeginCopyFrom_compat(a, b, c, d, e, f, g, h) BeginCopyFrom(a, b, d, e, f, g, h) #define standard_ProcessUtility_compat(a, b, c, d, e, f, g, h) \ standard_ProcessUtility(a, b, d, e, f, g, h)