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

Remove the global variable autoConverted, use parameter

talha_tes1
Ahmet Gedemenli 2021-10-19 13:04:36 +03:00
parent 91bc5158a4
commit c29c2d0263
5 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1223,7 +1223,7 @@ CreateCitusTableLike(TableConversionState *con)
} }
else if (IsCitusTableType(con->relationId, CITUS_LOCAL_TABLE)) else if (IsCitusTableType(con->relationId, CITUS_LOCAL_TABLE))
{ {
CreateCitusLocalTable(con->newRelationId, false); CreateCitusLocalTable(con->newRelationId, false, false);
/* /*
* creating Citus local table adds a shell table on top * creating Citus local table adds a shell table on top

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

@ -478,7 +478,7 @@ ExecuteCascadeOperationForRelationIdList(List *relationIdList,
{ {
if (!IsCitusTable(relationId)) if (!IsCitusTable(relationId))
{ {
CreateCitusLocalTable(relationId, cascadeViaForeignKeys); CreateCitusLocalTable(relationId, cascadeViaForeignKeys, true);
} }
break; break;

30
src/backend/distributed/commands/citus_add_local_table_to_metadata.c
View File

@ -79,7 +79,7 @@ static void DropDefaultExpressionsAndMoveOwnedSequenceOwnerships(Oid sourceRelat
static void DropDefaultColumnDefinition(Oid relationId, char *columnName); static void DropDefaultColumnDefinition(Oid relationId, char *columnName);
static void TransferSequenceOwnership(Oid ownedSequenceId, Oid targetRelationId, static void TransferSequenceOwnership(Oid ownedSequenceId, Oid targetRelationId,
char *columnName); char *columnName);
static void InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId); static void InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId, bool autoConverted);
static void FinalizeCitusLocalTableCreation(Oid relationId, List *dependentSequenceList); static void FinalizeCitusLocalTableCreation(Oid relationId, List *dependentSequenceList);
@ -87,8 +87,6 @@ PG_FUNCTION_INFO_V1(citus_add_local_table_to_metadata);
PG_FUNCTION_INFO_V1(create_citus_local_table); PG_FUNCTION_INFO_V1(create_citus_local_table);
PG_FUNCTION_INFO_V1(remove_local_tables_from_metadata); PG_FUNCTION_INFO_V1(remove_local_tables_from_metadata);
bool autoConverted = false;
/* /*
* citus_add_local_table_to_metadata creates a citus local table from the table with * citus_add_local_table_to_metadata creates a citus local table from the table with
@ -132,7 +130,7 @@ citus_add_local_table_to_metadata_internal(Oid relationId, bool cascadeViaForeig
"to 'off' to disable this behavior"))); "to 'off' to disable this behavior")));
} }
CreateCitusLocalTable(relationId, cascadeViaForeignKeys); CreateCitusLocalTable(relationId, cascadeViaForeignKeys, false);
} }
@ -192,7 +190,7 @@ remove_local_tables_from_metadata(PG_FUNCTION_ARGS)
* single placement is only allowed to be on the coordinator. * single placement is only allowed to be on the coordinator.
*/ */
void void
CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys) CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys, bool autoConverted)
{ {
/* /*
* These checks should be done before acquiring any locks on relation. * These checks should be done before acquiring any locks on relation.
@ -265,8 +263,6 @@ CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys)
char *relationName = get_rel_name(relationId); char *relationName = get_rel_name(relationId);
Oid relationSchemaId = get_rel_namespace(relationId); Oid relationSchemaId = get_rel_namespace(relationId);
autoConverted = true;
/* /*
* By acquiring AccessExclusiveLock, make sure that no modifications happen * By acquiring AccessExclusiveLock, make sure that no modifications happen
* on the relations. * on the relations.
@ -274,12 +270,10 @@ CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys)
CascadeOperationForFkeyConnectedRelations(relationId, lockMode, CascadeOperationForFkeyConnectedRelations(relationId, lockMode,
CASCADE_ADD_LOCAL_TABLE_TO_METADATA); CASCADE_ADD_LOCAL_TABLE_TO_METADATA);
autoConverted = false;
Oid shellRelationId = get_relname_relid(relationName, relationSchemaId); Oid shellRelationId = get_relname_relid(relationName, relationSchemaId);
/* mark the shell relation with autoConverted=false, as it was a user request */ /* mark the shell relation with autoConverted=false, as it was a user request */
UpdatePartitionAutoConverted(shellRelationId, autoConverted); UpdatePartitionAutoConverted(shellRelationId, false);
/* /*
* We converted every foreign key connected table in our subgraph * We converted every foreign key connected table in our subgraph
@ -350,7 +344,7 @@ CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys)
DropDefaultExpressionsAndMoveOwnedSequenceOwnerships(shardRelationId, DropDefaultExpressionsAndMoveOwnedSequenceOwnerships(shardRelationId,
shellRelationId); shellRelationId);
InsertMetadataForCitusLocalTable(shellRelationId, shardId); InsertMetadataForCitusLocalTable(shellRelationId, shardId, autoConverted);
/* /*
* Ensure that the sequences used in column defaults of the table * Ensure that the sequences used in column defaults of the table
@ -418,7 +412,7 @@ CreateCitusLocalTablePartitionOf(CreateStmt *createStatement, Oid relationId,
* again with the attach command * again with the attach command
*/ */
DropRelationForeignKeys(relationId, fKeyFlags); DropRelationForeignKeys(relationId, fKeyFlags);
CreateCitusLocalTable(relationId, false); CreateCitusLocalTable(relationId, false, false);
ExecuteAndLogUtilityCommand(attachCommand); ExecuteAndLogUtilityCommand(attachCommand);
} }
@ -449,16 +443,6 @@ ErrorIfAddingPartitionTableToMetadata(Oid relationId)
} }
/*
* SetAutoConverted is the setter function for variable autoConverted.
*/
void
SetAutoConverted(bool autoConvertedValue)
{
autoConverted = autoConvertedValue;
}
/* /*
* ErrorIfUnsupportedCreateCitusLocalTable errors out if we cannot create the * ErrorIfUnsupportedCreateCitusLocalTable errors out if we cannot create the
* citus local table from the relation. * citus local table from the relation.
@ -1115,7 +1099,7 @@ TransferSequenceOwnership(Oid sequenceId, Oid targetRelationId, char *targetColu
* pg_dist_partition, pg_dist_shard & pg_dist_placement. * pg_dist_partition, pg_dist_shard & pg_dist_placement.
*/ */
static void static void
InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId) InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId, bool autoConverted)
{ {
Assert(OidIsValid(citusLocalTableId)); Assert(OidIsValid(citusLocalTableId));
Assert(shardId != INVALID_SHARD_ID); Assert(shardId != INVALID_SHARD_ID);

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

@ -491,7 +491,7 @@ PreprocessAttachPartitionToCitusTable(Oid parentRelationId, Oid partitionRelatio
* cannot have non-inherited foreign keys. * cannot have non-inherited foreign keys.
*/ */
bool cascadeViaForeignKeys = false; bool cascadeViaForeignKeys = false;
CreateCitusLocalTable(partitionRelationId, cascadeViaForeignKeys); CreateCitusLocalTable(partitionRelationId, cascadeViaForeignKeys, true);
} }
else if (IsCitusTableType(parentRelationId, DISTRIBUTED_TABLE)) else if (IsCitusTableType(parentRelationId, DISTRIBUTED_TABLE))
{ {
@ -1289,9 +1289,7 @@ ConvertPostgresLocalTablesToCitusLocalTables(AlterTableStmt *alterTableStatement
} }
else else
{ {
SetAutoConverted(true); CreateCitusLocalTable(relationId, cascade, true);
CreateCitusLocalTable(relationId, cascade);
SetAutoConverted(false);
} }
} }
PG_CATCH(); PG_CATCH();

5
src/include/distributed/commands.h
View File

@ -534,15 +534,12 @@ extern void ExecuteForeignKeyCreateCommandList(List *ddlCommandList,
/* create_citus_local_table.c */ /* create_citus_local_table.c */
extern void SetAutoConverted(bool autoConvertedValue); extern void SetAutoConverted(bool autoConvertedValue);
extern void CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys); extern void CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys, bool autoConverted);
extern List * GetExplicitIndexOidList(Oid relationId); extern List * GetExplicitIndexOidList(Oid relationId);
extern bool ShouldPropagateSetCommand(VariableSetStmt *setStmt); extern bool ShouldPropagateSetCommand(VariableSetStmt *setStmt);
extern void PostprocessVariableSetStmt(VariableSetStmt *setStmt, const char *setCommand); extern void PostprocessVariableSetStmt(VariableSetStmt *setStmt, const char *setCommand);
/* create_citus_local_table.c */
extern void CreateCitusLocalTable(Oid relationId, bool cascade);
extern void CreateCitusLocalTablePartitionOf(CreateStmt *createStatement, extern void CreateCitusLocalTablePartitionOf(CreateStmt *createStatement,
Oid relationId, Oid parentRelationId); Oid relationId, Oid parentRelationId);