Exclude reference tables

update-dist-col-for-undistributed-tables
Ahmet Gedemenli 2022-02-17 11:05:37 +03:00
parent 141dc237ce
commit 7519e628e9
1 changed files with 27 additions and 18 deletions

View File

@ -402,9 +402,14 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
List *originalForeignKeyRecreationCommands = NIL;
if (IsCitusTableType(relationId, CITUS_LOCAL_TABLE))
{
/* save the column name to update the distribution column var later */
char *distributionColumnName =
ColumnToColumnName(relationId, nodeToString(distributionColumn));
char *distributionColumnName = NULL;
if (distributionMethod != DISTRIBUTE_BY_NONE)
{
/* save the column name to update the distribution column var later */
distributionColumnName =
ColumnToColumnName(relationId, nodeToString(distributionColumn));
}
/* store foreign key creation commands that relation is involved */
originalForeignKeyRecreationCommands =
@ -412,23 +417,27 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
INCLUDE_ALL_TABLE_TYPES);
relationId = DropFKeysAndUndistributeTable(relationId);
/*
* Because we create a new table when undistributing the table, attribute numbers
* might be changed, because of the dropped columns. To make sure we have the
* correct distribution column, we need to build it again, using the original
* column name that we have saved before.
*/
Relation relation = try_relation_open(relationId, ExclusiveLock);
if (relation == NULL)
/* exclude reference tables */
if (distributionMethod != DISTRIBUTE_BY_NONE)
{
ereport(ERROR, (errmsg("could not open the relation %u", relationId),
errdetail("When creating the distribution column.")));
/*
* Because we create a new table when undistributing the table, attribute
* numbers might be changed, because of the dropped columns. To make sure we
* have the correct distribution column, we need to build it again, using the
* original column name that we have saved before.
*/
Relation relation = try_relation_open(relationId, ExclusiveLock);
if (relation == NULL)
{
ereport(ERROR, (errmsg("could not open the relation %u", relationId),
errdetail("When creating the distribution column.")));
}
relation_close(relation, NoLock);
distributionColumn = BuildDistributionKeyFromColumnName(relation,
distributionColumnName);
}
relation_close(relation, NoLock);
distributionColumn = BuildDistributionKeyFromColumnName(relation,
distributionColumnName);
}
/*