fix refactor and renames

moonshot/custom-path
Nils Dijk 2020-05-07 18:36:24 +02:00
parent 2e178d21d6
commit 84068f79b2
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
1 changed files with 4 additions and 4 deletions

View File

@ -127,7 +127,7 @@ CreateDistributedUnionPlan(PlannerInfo *root,
Task *sqlTask = CreateBasicTask(workerJob->jobId, i, SELECT_TASK, buf.data); Task *sqlTask = CreateBasicTask(workerJob->jobId, i, SELECT_TASK, buf.data);
sqlTask->anchorShardId = shardInterval->shardId; sqlTask->anchorShardId = shardInterval->shardId;
sqlTask->taskPlacementList = FinalizedShardPlacementList(shardInterval->shardId); sqlTask->taskPlacementList = ActiveShardPlacementList(shardInterval->shardId);
workerJob->taskList = lappend(workerJob->taskList, sqlTask); workerJob->taskList = lappend(workerJob->taskList, sqlTask);
i++; i++;
} }
@ -164,7 +164,7 @@ ShardIntervalListForRelationPartitionValue(Oid relationId, Expr *partitionValue)
/* prune shard list to target */ /* prune shard list to target */
Const *partitionValueConst = castNode(Const, partitionValue); Const *partitionValueConst = castNode(Const, partitionValue);
/* TODO assert the constant is of the correct value */ /* TODO assert the constant is of the correct value */
DistTableCacheEntry *cacheEntry = DistributedTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
return list_make1(FindShardInterval(partitionValueConst->constvalue, cacheEntry)); return list_make1(FindShardInterval(partitionValueConst->constvalue, cacheEntry));
} }
@ -223,7 +223,7 @@ PathBasedPlannerRelationHook(PlannerInfo *root,
Index restrictionIndex, Index restrictionIndex,
RangeTblEntry *rte) RangeTblEntry *rte)
{ {
if (!IsDistributedTable(rte->relid)) if (!IsCitusTable(rte->relid))
{ {
/* table accessed is not distributed, no paths to change */ /* table accessed is not distributed, no paths to change */
return; return;
@ -707,7 +707,7 @@ CanOptimizeAggPath(PlannerInfo *root, AggPath *apath)
Index rteIndex = targetVar->varno; Index rteIndex = targetVar->varno;
RangeTblEntry *rte = root->simple_rte_array[rteIndex]; RangeTblEntry *rte = root->simple_rte_array[rteIndex];
DistTableCacheEntry *cacheEntry = DistributedTableCacheEntry(rte->relid); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(rte->relid);
if (cacheEntry->partitionColumn == NULL) if (cacheEntry->partitionColumn == NULL)
{ {
/* a table that is not distributed by a particular column, reference table? */ /* a table that is not distributed by a particular column, reference table? */