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

Rename PartitionKey to DistPartitionKey 

PostgreSQL 10 adds a PartitionKey symbol which conflicts with ours.
pull/1439/head
Jason Petersen 2017-04-12 14:06:05 -06:00
parent 0d873b0758
commit a34e9e30d7
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/distributed/executor/multi_utility.c
View File

@ -1496,7 +1496,7 @@ ErrorIfUnsupportedIndexStmt(IndexStmt *createIndexStatement)
/* caller uses ShareLock for non-concurrent indexes, use the same lock here */ /* caller uses ShareLock for non-concurrent indexes, use the same lock here */
LOCKMODE lockMode = ShareLock; LOCKMODE lockMode = ShareLock;
Oid relationId = RangeVarGetRelid(relation, lockMode, missingOk); Oid relationId = RangeVarGetRelid(relation, lockMode, missingOk);
Var *partitionKey = PartitionKey(relationId); Var *partitionKey = DistPartitionKey(relationId);
char partitionMethod = PartitionMethod(relationId); char partitionMethod = PartitionMethod(relationId);
List *indexParameterList = NIL; List *indexParameterList = NIL;
ListCell *indexParameterCell = NULL; ListCell *indexParameterCell = NULL;
@ -1643,7 +1643,7 @@ ErrorIfUnsupportedAlterTableStmt(AlterTableStmt *alterTableStatement)
continue; continue;
} }
partitionColumn = PartitionKey(relationId); partitionColumn = DistPartitionKey(relationId);
tuple = SearchSysCacheAttName(relationId, alterColumnName); tuple = SearchSysCacheAttName(relationId, alterColumnName);
if (HeapTupleIsValid(tuple)) if (HeapTupleIsValid(tuple))
@ -1727,7 +1727,7 @@ ErrorIfUnsupportedAlterAddConstraintStmt(AlterTableStmt *alterTableStatement)
LOCKMODE lockmode = AlterTableGetLockLevel(alterTableStatement->cmds); LOCKMODE lockmode = AlterTableGetLockLevel(alterTableStatement->cmds);
Oid relationId = AlterTableLookupRelation(alterTableStatement, lockmode); Oid relationId = AlterTableLookupRelation(alterTableStatement, lockmode);
char distributionMethod = PartitionMethod(relationId); char distributionMethod = PartitionMethod(relationId);
Var *distributionColumn = PartitionKey(relationId); Var *distributionColumn = DistPartitionKey(relationId);
uint32 colocationId = TableColocationId(relationId); uint32 colocationId = TableColocationId(relationId);
Relation relation = relation_open(relationId, ExclusiveLock); Relation relation = relation_open(relationId, ExclusiveLock);
@ -2000,7 +2000,7 @@ ErrorIfUnsupportedForeignConstraint(Relation relation, char distributionMethod,
* Partition column must exist in both referencing and referenced side of the * Partition column must exist in both referencing and referenced side of the
* foreign key constraint. They also must be in same ordinal. * foreign key constraint. They also must be in same ordinal.
*/ */
referencedTablePartitionColumn = PartitionKey(referencedTableId); referencedTablePartitionColumn = DistPartitionKey(referencedTableId);
} }
else else
{ {

2
src/backend/distributed/master/master_delete_protocol.c
View File

@ -498,7 +498,7 @@ CheckDeleteCriteria(Node *deleteCriteria)
static void static void
CheckPartitionColumn(Oid relationId, Node *whereClause) CheckPartitionColumn(Oid relationId, Node *whereClause)
{ {
Var *partitionColumn = PartitionKey(relationId); Var *partitionColumn = DistPartitionKey(relationId);
ListCell *columnCell = NULL; ListCell *columnCell = NULL;
List *columnList = pull_var_clause_default(whereClause); List *columnList = pull_var_clause_default(whereClause);

6
src/backend/distributed/planner/multi_join_order.c
View File

@ -1526,7 +1526,7 @@ RightColumn(OpExpr *joinClause)
Var * Var *
PartitionColumn(Oid relationId, uint32 rangeTableId) PartitionColumn(Oid relationId, uint32 rangeTableId)
{ {
Var *partitionKey = PartitionKey(relationId); Var *partitionKey = DistPartitionKey(relationId);
Var *partitionColumn = NULL; Var *partitionColumn = NULL;
/* short circuit for reference tables */ /* short circuit for reference tables */
@ -1544,7 +1544,7 @@ PartitionColumn(Oid relationId, uint32 rangeTableId)
/* /*
* PartitionKey returns the partition key column for the given relation. Note * DistPartitionKey returns the partition key column for the given relation. Note
* that in the context of distributed join and query planning, the callers of * that in the context of distributed join and query planning, the callers of
* this function *must* set the partition key column's range table reference * this function *must* set the partition key column's range table reference
* (varno) to match the table's location in the query range table list. * (varno) to match the table's location in the query range table list.
@ -1553,7 +1553,7 @@ PartitionColumn(Oid relationId, uint32 rangeTableId)
* returns NULL when called for reference tables. * returns NULL when called for reference tables.
*/ */
Var * Var *
PartitionKey(Oid relationId) DistPartitionKey(Oid relationId)
{ {
DistTableCacheEntry *partitionEntry = DistributedTableCacheEntry(relationId); DistTableCacheEntry *partitionEntry = DistributedTableCacheEntry(relationId);
Node *variableNode = NULL; Node *variableNode = NULL;

4
src/backend/distributed/planner/multi_logical_optimizer.c
View File

@ -2845,7 +2845,7 @@ IsPartitionColumn(Expr *columnExpression, Query *query)
if (relationId != InvalidOid && column != NULL) if (relationId != InvalidOid && column != NULL)
{ {
Var *partitionColumn = PartitionKey(relationId); Var *partitionColumn = DistPartitionKey(relationId);
/* not all distributed tables have partition column */ /* not all distributed tables have partition column */
if (partitionColumn != NULL && column->varattno == partitionColumn->varattno) if (partitionColumn != NULL && column->varattno == partitionColumn->varattno)
@ -3119,7 +3119,7 @@ PartitionColumnOpExpressionList(Query *query)
Assert(rangeTableEntry->rtekind == RTE_RELATION); Assert(rangeTableEntry->rtekind == RTE_RELATION);
relationId = rangeTableEntry->relid; relationId = rangeTableEntry->relid;
partitionColumn = PartitionKey(relationId); partitionColumn = DistPartitionKey(relationId);
if (partitionColumn != NULL && if (partitionColumn != NULL &&
candidatePartitionColumn->varattno == partitionColumn->varattno) candidatePartitionColumn->varattno == partitionColumn->varattno)

6
src/backend/distributed/planner/relation_restriction_equivalence.c
View File

@ -278,7 +278,7 @@ FindTranslatedVar(List *appendRelList, Oid relationOid, Index relationRteIndex,
return NULL; return NULL;
} }
relationPartitionKey = PartitionKey(relationOid); relationPartitionKey = DistPartitionKey(relationOid);
translaterVars = targetAppendRelInfo->translated_vars; translaterVars = targetAppendRelInfo->translated_vars;
foreach(translatedVarCell, translaterVars) foreach(translatedVarCell, translaterVars)
@ -429,7 +429,7 @@ EquivalenceListContainsRelationsEquality(List *attributeEquivalenceList,
(RelationRestriction *) lfirst(relationRestrictionCell); (RelationRestriction *) lfirst(relationRestrictionCell);
int rteIdentity = GetRTEIdentity(relationRestriction->rte); int rteIdentity = GetRTEIdentity(relationRestriction->rte);
if (PartitionKey(relationRestriction->relationId) && if (DistPartitionKey(relationRestriction->relationId) &&
!bms_is_member(rteIdentity, commonRteIdentities)) !bms_is_member(rteIdentity, commonRteIdentities))
{ {
return false; return false;
@ -1114,7 +1114,7 @@ AddRteRelationToAttributeEquivalenceClass(AttributeEquivalenceClass **
return; return;
} }
relationPartitionKey = PartitionKey(relationId); relationPartitionKey = DistPartitionKey(relationId);
if (relationPartitionKey->varattno != varToBeAdded->varattno) if (relationPartitionKey->varattno != varToBeAdded->varattno)
{ {
return; return;

6
src/backend/distributed/utils/colocation_utils.c
View File

@ -126,7 +126,7 @@ MarkTablesColocated(Oid sourceRelationId, Oid targetRelationId)
uint32 shardCount = ShardIntervalCount(sourceRelationId); uint32 shardCount = ShardIntervalCount(sourceRelationId);
uint32 shardReplicationFactor = TableShardReplicationFactor(sourceRelationId); uint32 shardReplicationFactor = TableShardReplicationFactor(sourceRelationId);
Var *sourceDistributionColumn = PartitionKey(sourceRelationId); Var *sourceDistributionColumn = DistPartitionKey(sourceRelationId);
Oid sourceDistributionColumnType = InvalidOid; Oid sourceDistributionColumnType = InvalidOid;
/* reference tables has NULL distribution column */ /* reference tables has NULL distribution column */
@ -567,7 +567,7 @@ CheckDistributionColumnType(Oid sourceRelationId, Oid targetRelationId)
Oid targetDistributionColumnType = InvalidOid; Oid targetDistributionColumnType = InvalidOid;
/* reference tables have NULL distribution column */ /* reference tables have NULL distribution column */
sourceDistributionColumn = PartitionKey(sourceRelationId); sourceDistributionColumn = DistPartitionKey(sourceRelationId);
if (sourceDistributionColumn == NULL) if (sourceDistributionColumn == NULL)
{ {
sourceDistributionColumnType = InvalidOid; sourceDistributionColumnType = InvalidOid;
@ -578,7 +578,7 @@ CheckDistributionColumnType(Oid sourceRelationId, Oid targetRelationId)
} }
/* reference tables have NULL distribution column */ /* reference tables have NULL distribution column */
targetDistributionColumn = PartitionKey(targetRelationId); targetDistributionColumn = DistPartitionKey(targetRelationId);
if (targetDistributionColumn == NULL) if (targetDistributionColumn == NULL)
{ {
targetDistributionColumnType = InvalidOid; targetDistributionColumnType = InvalidOid;

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

@ -361,7 +361,7 @@ get_shard_id_for_distribution_column(PG_FUNCTION_ARGS)
inputDataType = get_fn_expr_argtype(fcinfo->flinfo, 1); inputDataType = get_fn_expr_argtype(fcinfo->flinfo, 1);
distributionValueString = DatumToString(inputDatum, inputDataType); distributionValueString = DatumToString(inputDatum, inputDataType);
distributionColumn = PartitionKey(relationId); distributionColumn = DistPartitionKey(relationId);
distributionDataType = distributionColumn->vartype; distributionDataType = distributionColumn->vartype;
distributionValueDatum = StringToDatum(distributionValueString, distributionValueDatum = StringToDatum(distributionValueString,

2
src/include/distributed/multi_join_order.h
View File

@ -90,7 +90,7 @@ extern OpExpr * DualPartitionJoinClause(List *applicableJoinClauses);
extern Var * LeftColumn(OpExpr *joinClause); extern Var * LeftColumn(OpExpr *joinClause);
extern Var * RightColumn(OpExpr *joinClause); extern Var * RightColumn(OpExpr *joinClause);
extern Var * PartitionColumn(Oid relationId, uint32 rangeTableId); extern Var * PartitionColumn(Oid relationId, uint32 rangeTableId);
extern Var * PartitionKey(Oid relationId); extern Var * DistPartitionKey(Oid relationId);
extern char PartitionMethod(Oid relationId); extern char PartitionMethod(Oid relationId);
extern char TableReplicationModel(Oid relationId); extern char TableReplicationModel(Oid relationId);