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

EnsureRelationCanBeDistributed

multi-column-distribution
Jelte Fennema 2021-06-08 10:07:49 +02:00
parent 5abead7f2c
commit 361acde19d
1 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/distributed/commands/create_distributed_table.c
View File

@ -99,7 +99,7 @@ static uint32 ColocationIdForNewTable(Oid relationId, Var *distributionColumn,
int shardCount, bool shardCountIsStrict, int shardCount, bool shardCountIsStrict,
char *colocateWithTableName, char *colocateWithTableName,
bool viaDeprecatedAPI); bool viaDeprecatedAPI);
static void EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn, static void EnsureRelationCanBeDistributed(Oid relationId, List *distributionColumnList,
char distributionMethod, uint32 colocationId, char distributionMethod, uint32 colocationId,
char replicationModel, bool viaDeprecatedAPI); char replicationModel, bool viaDeprecatedAPI);
static void EnsureTableCanBeColocatedWith(Oid relationId, char replicationModel, static void EnsureTableCanBeColocatedWith(Oid relationId, char replicationModel,
@ -525,7 +525,7 @@ CreateDistributedTable(Oid relationId, List *distributionColumnList,
colocateWithTableName, colocateWithTableName,
viaDeprecatedAPI); viaDeprecatedAPI);
EnsureRelationCanBeDistributed(relationId, linitial(distributionColumnList), EnsureRelationCanBeDistributed(relationId, distributionColumnList,
distributionMethod, distributionMethod,
colocationId, replicationModel, viaDeprecatedAPI); colocationId, replicationModel, viaDeprecatedAPI);
@ -1083,7 +1083,7 @@ ColocationIdForNewTable(Oid relationId, Var *distributionColumn,
* there will not be any change in the given relation. * there will not be any change in the given relation.
*/ */
static void static void
EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn, EnsureRelationCanBeDistributed(Oid relationId, List *distributionColumnList,
char distributionMethod, uint32 colocationId, char distributionMethod, uint32 colocationId,
char replicationModel, bool viaDeprecatedAPI) char replicationModel, bool viaDeprecatedAPI)
{ {
@ -1109,6 +1109,9 @@ EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn,
"... AS IDENTITY."))); "... AS IDENTITY.")));
} }
Var *distributionColumn = NULL;
foreach_ptr(distributionColumn, distributionColumnList)
{
/* verify target relation is not distributed by a generated columns */ /* verify target relation is not distributed by a generated columns */
if (distributionMethod != DISTRIBUTE_BY_NONE && if (distributionMethod != DISTRIBUTE_BY_NONE &&
DistributionColumnUsesGeneratedStoredColumn(relationDesc, distributionColumn)) DistributionColumnUsesGeneratedStoredColumn(relationDesc, distributionColumn))
@ -1131,7 +1134,8 @@ EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn,
errmsg("could not identify a hash function for type %s", errmsg("could not identify a hash function for type %s",
format_type_be(distributionColumn->vartype)), format_type_be(distributionColumn->vartype)),
errdatatype(distributionColumn->vartype), errdatatype(distributionColumn->vartype),
errdetail("Partition column types must have a hash function " errdetail(
"Partition column types must have a hash function "
"defined to use hash partitioning."))); "defined to use hash partitioning.")));
} }
@ -1146,7 +1150,8 @@ EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn,
else if (distributionMethod == DISTRIBUTE_BY_RANGE) else if (distributionMethod == DISTRIBUTE_BY_RANGE)
{ {
Oid btreeSupportFunction = SupportFunctionForColumn(distributionColumn, Oid btreeSupportFunction = SupportFunctionForColumn(distributionColumn,
BTREE_AM_OID, BTORDER_PROC); BTREE_AM_OID,
BTORDER_PROC);
if (btreeSupportFunction == InvalidOid) if (btreeSupportFunction == InvalidOid)
{ {
ereport(ERROR, ereport(ERROR,
@ -1154,10 +1159,12 @@ EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn,
errmsg("could not identify a comparison function for type %s", errmsg("could not identify a comparison function for type %s",
format_type_be(distributionColumn->vartype)), format_type_be(distributionColumn->vartype)),
errdatatype(distributionColumn->vartype), errdatatype(distributionColumn->vartype),
errdetail("Partition column types must have a comparison function " errdetail(
"Partition column types must have a comparison function "
"defined to use range partitioning."))); "defined to use range partitioning.")));
} }
} }
}
if (PartitionTable(relationId)) if (PartitionTable(relationId))
{ {
@ -1216,7 +1223,7 @@ EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn,
} }
ErrorIfUnsupportedConstraint(relation, distributionMethod, replicationModel, ErrorIfUnsupportedConstraint(relation, distributionMethod, replicationModel,
distributionColumn, colocationId); linitial(distributionColumnList), colocationId);
ErrorIfUnsupportedPolicy(relation); ErrorIfUnsupportedPolicy(relation);