mirror of https://github.com/citusdata/citus.git
Fix style
Sait Talha Nisanci
parent
4eaae02549
commit
fb5e63ce57
|
|
@ -1935,7 +1935,6 @@ ColumnarProcessUtility(PlannedStmt *pstmt,
|
|||
DestReceiver *dest,
|
||||
QueryCompletionCompat *completionTag)
|
||||
{
|
||||
|
||||
#if PG_VERSION_NUM >= PG_VERSION_14
|
||||
if (readOnlyTree)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -251,7 +251,9 @@ GetDependencyCreateDDLCommands(const ObjectAddress *dependency)
|
|||
*/
|
||||
Assert(false);
|
||||
ereport(ERROR, (errmsg("unsupported object %s for distribution by citus",
|
||||
getObjectTypeDescription_compat(dependency, /* missingOk: */ false)),
|
||||
getObjectTypeDescription_compat(dependency,
|
||||
|
||||
/* missingOk: */ false)),
|
||||
errdetail(
|
||||
"citus tries to recreate an unsupported object on its workers"),
|
||||
errhint("please report a bug as this should not be happening")));
|
||||
|
|
|
|||
|
|
@ -212,9 +212,9 @@ DoLocalCopy(StringInfo buffer, Oid relationId, int64 shardId, CopyStmt *copyStat
|
|||
(void) addRangeTableEntryForRelation(pState, shard, AccessShareLock,
|
||||
NULL, false, false);
|
||||
CopyFromState cstate = BeginCopyFrom_compat(pState, shard, NULL, NULL, false,
|
||||
ReadFromLocalBufferCallback,
|
||||
copyStatement->attlist,
|
||||
copyStatement->options);
|
||||
ReadFromLocalBufferCallback,
|
||||
copyStatement->attlist,
|
||||
copyStatement->options);
|
||||
CopyFrom(cstate);
|
||||
EndCopyFrom(cstate);
|
||||
|
||||
|
|
|
|||
|
|
@ -524,13 +524,13 @@ CopyToExistingShards(CopyStmt *copyStatement, QueryCompletionCompat *completionT
|
|||
|
||||
/* initialize copy state to read from COPY data source */
|
||||
CopyFromState copyState = BeginCopyFrom_compat(NULL,
|
||||
copiedDistributedRelation,
|
||||
NULL,
|
||||
copyStatement->filename,
|
||||
copyStatement->is_program,
|
||||
NULL,
|
||||
copyStatement->attlist,
|
||||
copyStatement->options);
|
||||
copiedDistributedRelation,
|
||||
NULL,
|
||||
copyStatement->filename,
|
||||
copyStatement->is_program,
|
||||
NULL,
|
||||
copyStatement->attlist,
|
||||
copyStatement->options);
|
||||
|
||||
/* set up callback to identify error line number */
|
||||
errorCallback.callback = CopyFromErrorCallback;
|
||||
|
|
@ -622,13 +622,13 @@ CopyToNewShards(CopyStmt *copyStatement, QueryCompletionCompat *completionTag, O
|
|||
|
||||
/* initialize copy state to read from COPY data source */
|
||||
CopyFromState copyState = BeginCopyFrom_compat(NULL,
|
||||
distributedRelation,
|
||||
NULL,
|
||||
copyStatement->filename,
|
||||
copyStatement->is_program,
|
||||
NULL,
|
||||
copyStatement->attlist,
|
||||
copyStatement->options);
|
||||
distributedRelation,
|
||||
NULL,
|
||||
copyStatement->filename,
|
||||
copyStatement->is_program,
|
||||
NULL,
|
||||
copyStatement->attlist,
|
||||
copyStatement->options);
|
||||
|
||||
CopyOutState copyOutState = (CopyOutState) palloc0(sizeof(CopyOutStateData));
|
||||
copyOutState->delim = (char *) delimiterCharacter;
|
||||
|
|
|
|||
|
|
@ -411,8 +411,8 @@ ReadFileIntoTupleStore(char *fileName, char *copyFormat, TupleDesc tupleDescript
|
|||
copyOptions = lappend(copyOptions, copyOption);
|
||||
|
||||
CopyFromState copyState = BeginCopyFrom_compat(NULL, stubRelation, NULL,
|
||||
fileName, false, NULL,
|
||||
NULL, copyOptions);
|
||||
fileName, false, NULL,
|
||||
NULL, copyOptions);
|
||||
|
||||
while (true)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -75,8 +75,12 @@ citus_unmark_object_distributed(PG_FUNCTION_ARGS)
|
|||
{
|
||||
ereport(ERROR, (errmsg("object still exists"),
|
||||
errdetail("the %s \"%s\" still exists",
|
||||
getObjectTypeDescription_compat(&address, /* missingOk: */ false),
|
||||
getObjectIdentity_compat(&address, /* missingOk: */ false)),
|
||||
getObjectTypeDescription_compat(&address,
|
||||
|
||||
/* missingOk: */ false),
|
||||
getObjectIdentity_compat(&address,
|
||||
|
||||
/* missingOk: */ false)),
|
||||
errhint("drop the object via a DROP command")));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ typedef struct DDLJob
|
|||
} DDLJob;
|
||||
|
||||
|
||||
extern void multi_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
|
||||
extern void multi_ProcessUtility(PlannedStmt * pstmt, const char *queryString,
|
||||
#if PG_VERSION_NUM >= PG_VERSION_14
|
||||
bool readOnlyTree,
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -20,4 +20,5 @@
|
|||
/multi_mx_copy_data.out
|
||||
/multi_outer_join.out
|
||||
/multi_outer_join_reference.out
|
||||
/tablespace.out
|
||||
/worker_copy.out
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
CREATE TABLESPACE test_tablespace LOCATION '/home/talha/citus/src/test/regress/data/ts0';
|
||||
\c - - - :worker_1_port
|
||||
CREATE TABLESPACE test_tablespace LOCATION '/home/talha/citus/src/test/regress/data/ts1';
|
||||
\c - - - :worker_2_port
|
||||
CREATE TABLESPACE test_tablespace LOCATION '/home/talha/citus/src/test/regress/data/ts2';
|
||||
|
|
@ -20,4 +20,5 @@
|
|||
/multi_mx_copy_data.sql
|
||||
/multi_outer_join.sql
|
||||
/multi_outer_join_reference.sql
|
||||
/tablespace.sql
|
||||
/worker_copy.sql
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
CREATE TABLESPACE test_tablespace LOCATION '/home/talha/citus/src/test/regress/data/ts0';
|
||||
\c - - - :worker_1_port
|
||||
CREATE TABLESPACE test_tablespace LOCATION '/home/talha/citus/src/test/regress/data/ts1';
|
||||
\c - - - :worker_2_port
|
||||
CREATE TABLESPACE test_tablespace LOCATION '/home/talha/citus/src/test/regress/data/ts2';
|
||||
Loading…
Reference in New Issue