external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup! Introduces CopyFromState_compat macro

talha_testpg14
Sait Talha Nisanci 2021-08-27 00:04:05 +03:00
parent 1ed8c1d4e5
commit b760ec769c
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/commands/local_multi_copy.c
View File

@ -211,7 +211,7 @@ DoLocalCopy(StringInfo buffer, Oid relationId, int64 shardId, CopyStmt *copyStat
ParseState *pState = make_parsestate(NULL); ParseState *pState = make_parsestate(NULL);
(void) addRangeTableEntryForRelation(pState, shard, AccessShareLock, (void) addRangeTableEntryForRelation(pState, shard, AccessShareLock,
NULL, false, false); NULL, false, false);
CopyFromState_compat cstate = BeginCopyFrom_compat(pState, shard, NULL, NULL, false, CopyFromState cstate = BeginCopyFrom_compat(pState, shard, NULL, NULL, false,
ReadFromLocalBufferCallback, ReadFromLocalBufferCallback,
copyStatement->attlist, copyStatement->attlist,
copyStatement->options); copyStatement->options);

4
src/backend/distributed/commands/multi_copy.c
View File

@ -523,7 +523,7 @@ CopyToExistingShards(CopyStmt *copyStatement, QueryCompletionCompat *completionT
} }
/* initialize copy state to read from COPY data source */ /* initialize copy state to read from COPY data source */
CopyFromState_compat copyState = BeginCopyFrom_compat(NULL, CopyFromState copyState = BeginCopyFrom_compat(NULL,
copiedDistributedRelation, copiedDistributedRelation,
NULL, NULL,
copyStatement->filename, copyStatement->filename,
@ -621,7 +621,7 @@ CopyToNewShards(CopyStmt *copyStatement, QueryCompletionCompat *completionTag, O
(ShardConnections *) palloc0(sizeof(ShardConnections)); (ShardConnections *) palloc0(sizeof(ShardConnections));
/* initialize copy state to read from COPY data source */ /* initialize copy state to read from COPY data source */
CopyFromState_compat copyState = BeginCopyFrom_compat(NULL, CopyFromState copyState = BeginCopyFrom_compat(NULL,
distributedRelation, distributedRelation,
NULL, NULL,
copyStatement->filename, copyStatement->filename,

2
src/backend/distributed/executor/multi_executor.c
View File

@ -410,7 +410,7 @@ ReadFileIntoTupleStore(char *fileName, char *copyFormat, TupleDesc tupleDescript
location); location);
copyOptions = lappend(copyOptions, copyOption); copyOptions = lappend(copyOptions, copyOption);
CopyFromState_compat copyState = BeginCopyFrom_compat(NULL, stubRelation, NULL, CopyFromState copyState = BeginCopyFrom_compat(NULL, stubRelation, NULL,
fileName, false, NULL, fileName, false, NULL,
NULL, copyOptions); NULL, copyOptions);

3
src/include/distributed/version_compat.h
View File

@ -41,7 +41,6 @@
FuncnameGetCandidates(a, b, c, d, e, f, g) 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 expand_function_arguments_compat(a, b, c, d) expand_function_arguments(a, b, c, d)
#define IsReindexWithParam_compat(reindex, param) IsReindexWithParam(reindex, param) #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 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) \ #define standard_ProcessUtility_compat(a, b, c, d, e, f, g, h) \
standard_ProcessUtility(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, "concurrently") == 0) ? ((reindex)->concurrent) : \
((strcmp(param, "verbose") == 0) ? ((reindex)->options == REINDEXOPT_VERBOSE) : \ ((strcmp(param, "verbose") == 0) ? ((reindex)->options == REINDEXOPT_VERBOSE) : \
false)) 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 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) \ #define standard_ProcessUtility_compat(a, b, c, d, e, f, g, h) \
standard_ProcessUtility(a, b, d, e, f, g, h) standard_ProcessUtility(a, b, d, e, f, g, h)