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

Fix style

talha_testpg14
Sait Talha Nisanci 2021-08-27 09:46:08 +03:00
parent 4eaae02549
commit fb5e63ce57
17 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/columnar/columnar_tableam.c
View File

@ -1935,7 +1935,6 @@ ColumnarProcessUtility(PlannedStmt *pstmt,
DestReceiver *dest,
QueryCompletionCompat *completionTag)
{
#if PG_VERSION_NUM >= PG_VERSION_14
if (readOnlyTree)
{

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

@ -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")));

6
src/backend/distributed/commands/function.c
View File

@ -1613,7 +1613,7 @@ PreprocessAlterFunctionDependsStmt(Node *node, const char *queryString,
* workers
*/
const char *functionName =
const char *functionName =
getObjectIdentity_compat(&address, /* missingOk: */ false);
ereport(ERROR, (errmsg("distrtibuted functions are not allowed to depend on an "
"extension"),
@ -1933,9 +1933,9 @@ ErrorIfFunctionDependsOnExtension(const ObjectAddress *functionAddress)
if (IsObjectAddressOwnedByExtension(functionAddress, &extensionAddress))
{
char *functionName =
char *functionName =
getObjectIdentity_compat(functionAddress, /* missingOk: */ false);
char *extensionName =
char *extensionName =
getObjectIdentity_compat(&extensionAddress, /* missingOk: */ false);
ereport(ERROR, (errmsg("unable to create a distributed function from functions "
"owned by an extension"),

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

@ -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);

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

@ -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;

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

@ -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)
{

8
src/backend/distributed/metadata/distobject.c
View File

@ -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")));
}

2
src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.2-1.sql generated
View File

@ -31,7 +31,7 @@ BEGIN
* Citus extension, so we create that dependency here.
* We are not using:
* ALTER EXENSION citus DROP/CREATE AGGREGATE array_cat_agg
* because we don't have an easy way to check if the aggregate
* because we don't have an easy way to check if the aggregate
* exists with anyarray type or anycompatiblearray type.
*/
INSERT INTO pg_depend

2
src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
View File

@ -31,7 +31,7 @@ BEGIN
* Citus extension, so we create that dependency here.
* We are not using:
* ALTER EXENSION citus DROP/CREATE AGGREGATE array_cat_agg
* because we don't have an easy way to check if the aggregate
* because we don't have an easy way to check if the aggregate
* exists with anyarray type or anycompatiblearray type.
*/
INSERT INTO pg_depend

2
src/backend/distributed/utils/function_utils.c
View File

@ -50,7 +50,7 @@ FunctionOidExtended(const char *schemaName, const char *functionName, int argume
argumentCount,
argumentList,
findVariadics,
findDefaults,
findDefaults,
false,
true);

2
src/include/distributed/commands/utility_hook.h
View File

@ -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

2
src/test/regress/Makefile
View File

@ -243,4 +243,4 @@ clean distclean maintainer-clean:
rm -f $(output_files) $(input_files)
rm -rf tmp_check/
all: create-tablespaces
all: create-tablespaces

1
src/test/regress/expected/.gitignore vendored
View File

@ -20,4 +20,5 @@
/multi_mx_copy_data.out
/multi_outer_join.out
/multi_outer_join_reference.out
/tablespace.out
/worker_copy.out

5
src/test/regress/expected/tablespace.out
View File

@ -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';

2
src/test/regress/input/tablespace.source
View File

@ -2,4 +2,4 @@ CREATE TABLESPACE test_tablespace LOCATION '@abs_srcdir@/data/ts0';
\c - - - :worker_1_port
CREATE TABLESPACE test_tablespace LOCATION '@abs_srcdir@/data/ts1';
\c - - - :worker_2_port
CREATE TABLESPACE test_tablespace LOCATION '@abs_srcdir@/data/ts2';
CREATE TABLESPACE test_tablespace LOCATION '@abs_srcdir@/data/ts2';

1
src/test/regress/sql/.gitignore vendored
View File

@ -20,4 +20,5 @@
/multi_mx_copy_data.sql
/multi_outer_join.sql
/multi_outer_join_reference.sql
/tablespace.sql
/worker_copy.sql

5
src/test/regress/sql/tablespace.sql
View File

@ -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';