diff --git a/src/backend/distributed/commands/call.c b/src/backend/distributed/commands/call.c index 969c2d663..6d620301b 100644 --- a/src/backend/distributed/commands/call.c +++ b/src/backend/distributed/commands/call.c @@ -97,7 +97,7 @@ CallFuncExprRemotely(CallStmt *callStmt, DistObjectCacheEntry *procedure, return false; } - CitusTableCacheEntry *distTable = LookupCitusTableCacheEntry(colocatedRelationId); + CitusTableCacheEntry *distTable = GetCitusTableCacheEntry(colocatedRelationId); Var *partitionColumn = distTable->partitionColumn; if (partitionColumn == NULL) { diff --git a/src/backend/distributed/commands/create_distributed_table.c b/src/backend/distributed/commands/create_distributed_table.c index cdaae2a0e..60caa58a5 100644 --- a/src/backend/distributed/commands/create_distributed_table.c +++ b/src/backend/distributed/commands/create_distributed_table.c @@ -793,7 +793,7 @@ static void EnsureTableCanBeColocatedWith(Oid relationId, char replicationModel, Oid distributionColumnType, Oid sourceRelationId) { - CitusTableCacheEntry *sourceTableEntry = LookupCitusTableCacheEntry(sourceRelationId); + CitusTableCacheEntry *sourceTableEntry = GetCitusTableCacheEntry(sourceRelationId); char sourceDistributionMethod = sourceTableEntry->partitionMethod; char sourceReplicationModel = sourceTableEntry->replicationModel; Var *sourceDistributionColumn = ForceDistPartitionKey(sourceRelationId); diff --git a/src/backend/distributed/commands/function.c b/src/backend/distributed/commands/function.c index bd56d9025..cfe3df42f 100644 --- a/src/backend/distributed/commands/function.c +++ b/src/backend/distributed/commands/function.c @@ -410,7 +410,7 @@ static void EnsureFunctionCanBeColocatedWithTable(Oid functionOid, Oid distributionColumnType, Oid sourceRelationId) { - CitusTableCacheEntry *sourceTableEntry = LookupCitusTableCacheEntry(sourceRelationId); + CitusTableCacheEntry *sourceTableEntry = GetCitusTableCacheEntry(sourceRelationId); char sourceDistributionMethod = sourceTableEntry->partitionMethod; char sourceReplicationModel = sourceTableEntry->replicationModel; diff --git a/src/backend/distributed/commands/multi_copy.c b/src/backend/distributed/commands/multi_copy.c index 70ae222cb..0c5d52d0e 100644 --- a/src/backend/distributed/commands/multi_copy.c +++ b/src/backend/distributed/commands/multi_copy.c @@ -2018,7 +2018,7 @@ CitusCopyDestReceiverStartup(DestReceiver *dest, int operation, /* look up table properties */ Relation distributedRelation = heap_open(tableId, RowExclusiveLock); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(tableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(tableId); partitionMethod = cacheEntry->partitionMethod; copyDest->distributedRelation = distributedRelation; diff --git a/src/backend/distributed/commands/truncate.c b/src/backend/distributed/commands/truncate.c index 2eea9ddd5..d6cb6118c 100644 --- a/src/backend/distributed/commands/truncate.c +++ b/src/backend/distributed/commands/truncate.c @@ -189,7 +189,7 @@ LockTruncatedRelationMetadataInWorkers(TruncateStmt *truncateStatement) distributedRelationList = lappend_oid(distributedRelationList, relationId); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); Assert(cacheEntry != NULL); List *referencingTableList = cacheEntry->referencingRelationsViaForeignKey; diff --git a/src/backend/distributed/executor/insert_select_executor.c b/src/backend/distributed/executor/insert_select_executor.c index 507e31ab2..6663acc49 100644 --- a/src/backend/distributed/executor/insert_select_executor.c +++ b/src/backend/distributed/executor/insert_select_executor.c @@ -220,7 +220,7 @@ CoordinatorInsertSelectExecScanInternal(CustomScanState *node) char *distResultPrefix = distResultPrefixString->data; CitusTableCacheEntry *targetRelation = - LookupCitusTableCacheEntry(targetRelationId); + GetCitusTableCacheEntry(targetRelationId); int partitionColumnIndex = PartitionColumnIndex(insertTargetList, targetRelation->partitionColumn); @@ -484,7 +484,7 @@ TwoPhaseInsertSelectTaskList(Oid targetRelationId, Query *insertSelectQuery, RangeTblEntry *insertRte = ExtractResultRelationRTE(insertResultQuery); RangeTblEntry *selectRte = ExtractSelectRangeTableEntry(insertResultQuery); - CitusTableCacheEntry *targetCacheEntry = LookupCitusTableCacheEntry(targetRelationId); + CitusTableCacheEntry *targetCacheEntry = GetCitusTableCacheEntry(targetRelationId); int shardCount = targetCacheEntry->shardIntervalArrayLength; uint32 taskIdIndex = 1; uint64 jobId = INVALID_JOB_ID; @@ -895,7 +895,7 @@ CastExpr(Expr *expr, Oid sourceType, Oid targetType, Oid targetCollation, bool IsSupportedRedistributionTarget(Oid targetRelationId) { - CitusTableCacheEntry *tableEntry = LookupCitusTableCacheEntry(targetRelationId); + CitusTableCacheEntry *tableEntry = GetCitusTableCacheEntry(targetRelationId); /* only range and hash-distributed tables are currently supported */ if (tableEntry->partitionMethod != DISTRIBUTE_BY_HASH && diff --git a/src/backend/distributed/master/master_create_shards.c b/src/backend/distributed/master/master_create_shards.c index dffd07dd1..128957c18 100644 --- a/src/backend/distributed/master/master_create_shards.c +++ b/src/backend/distributed/master/master_create_shards.c @@ -106,7 +106,7 @@ void CreateShardsWithRoundRobinPolicy(Oid distributedTableId, int32 shardCount, int32 replicationFactor, bool useExclusiveConnections) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); bool colocatedShard = false; List *insertedShardPlacements = NIL; diff --git a/src/backend/distributed/master/master_metadata_utility.c b/src/backend/distributed/master/master_metadata_utility.c index fdc7c8299..196a33b97 100644 --- a/src/backend/distributed/master/master_metadata_utility.c +++ b/src/backend/distributed/master/master_metadata_utility.c @@ -246,7 +246,7 @@ DistributedTableSizeOnWorker(WorkerNode *workerNode, Oid relationId, char *sizeQ List * GroupShardPlacementsForTableOnGroup(Oid relationId, int32 groupId) { - CitusTableCacheEntry *distTableCacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *distTableCacheEntry = GetCitusTableCacheEntry(relationId); List *resultList = NIL; int shardIntervalArrayLength = distTableCacheEntry->shardIntervalArrayLength; @@ -284,7 +284,7 @@ GroupShardPlacementsForTableOnGroup(Oid relationId, int32 groupId) static List * ShardIntervalsOnWorkerGroup(WorkerNode *workerNode, Oid relationId) { - CitusTableCacheEntry *distTableCacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *distTableCacheEntry = GetCitusTableCacheEntry(relationId); List *shardIntervalList = NIL; int shardIntervalArrayLength = distTableCacheEntry->shardIntervalArrayLength; @@ -486,7 +486,7 @@ TableShardReplicationFactor(Oid relationId) List * LoadShardIntervalList(Oid relationId) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); List *shardList = NIL; for (int i = 0; i < cacheEntry->shardIntervalArrayLength; i++) @@ -511,7 +511,7 @@ LoadShardIntervalList(Oid relationId) int ShardIntervalCount(Oid relationId) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); int shardIntervalCount = 0; if (cacheEntry->isCitusTable) @@ -533,7 +533,7 @@ ShardIntervalCount(Oid relationId) List * LoadShardList(Oid relationId) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); List *shardList = NIL; for (int i = 0; i < cacheEntry->shardIntervalArrayLength; i++) diff --git a/src/backend/distributed/master/master_node_protocol.c b/src/backend/distributed/master/master_node_protocol.c index 022fa46c1..39983aecd 100644 --- a/src/backend/distributed/master/master_node_protocol.c +++ b/src/backend/distributed/master/master_node_protocol.c @@ -103,7 +103,7 @@ master_get_table_metadata(PG_FUNCTION_ARGS) CheckCitusVersion(ERROR); /* find partition tuple for partitioned relation */ - CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId); /* create tuple descriptor for return value */ TypeFuncClass resultTypeClass = get_call_result_type(fcinfo, NULL, diff --git a/src/backend/distributed/master/master_stage_protocol.c b/src/backend/distributed/master/master_stage_protocol.c index a5d47c105..c58573ae0 100644 --- a/src/backend/distributed/master/master_stage_protocol.c +++ b/src/backend/distributed/master/master_stage_protocol.c @@ -558,7 +558,7 @@ static List * RelationShardListForShardCreate(ShardInterval *shardInterval) { Oid relationId = shardInterval->relationId; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); List *referencedRelationList = cacheEntry->referencedRelationsViaForeignKey; List *referencingRelationList = cacheEntry->referencingRelationsViaForeignKey; int shardIndex = -1; diff --git a/src/backend/distributed/metadata/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c index e226f2caf..b1c80a1e2 100644 --- a/src/backend/distributed/metadata/metadata_cache.c +++ b/src/backend/distributed/metadata/metadata_cache.c @@ -191,8 +191,8 @@ static ScanKeyData DistObjectScanKey[3]; /* local function forward declarations */ static bool IsCitusTableViaCatalog(Oid relationId); static ShardCacheEntry * LookupShardCacheEntry(int64 shardId); -static CitusTableCacheEntry * LookupLookupCitusTableCacheEntry(Oid relationId); -static void BuildLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry); +static CitusTableCacheEntry * LookupCitusTableCacheEntry(Oid relationId); +static void BuildCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry); static void BuildCachedShardList(CitusTableCacheEntry *cacheEntry); static void PrepareWorkerNodeCache(void); static bool CheckInstalledVersion(int elevel); @@ -207,7 +207,7 @@ static void RegisterForeignKeyGraphCacheCallbacks(void); static void RegisterWorkerNodeCacheCallbacks(void); static void RegisterLocalGroupIdCacheCallbacks(void); static uint32 WorkerNodeHashCode(const void *key, Size keySize); -static void ResetLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry); +static void ResetCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry); static void CreateDistTableCache(void); static void CreateDistObjectCache(void); static void InvalidateForeignRelationGraphCacheCallback(Datum argument, Oid relationId); @@ -274,11 +274,11 @@ EnsureModificationsCanRun(void) bool IsCitusTable(Oid relationId) { - CitusTableCacheEntry *cacheEntry = LookupLookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); /* * If extension hasn't been created, or has the wrong version and the - * table isn't a distributed one, LookupLookupCitusTableCacheEntry() will return NULL. + * table isn't a distributed one, LookupCitusTableCacheEntry() will return NULL. */ if (!cacheEntry) { @@ -342,7 +342,7 @@ CitusTableList(void) Oid relationId = InvalidOid; foreach_oid(relationId, distTableOidList) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); Assert(cacheEntry->isCitusTable); distributedTableList = lappend(distributedTableList, cacheEntry); @@ -722,7 +722,7 @@ LookupShardCacheEntry(int64 shardId) Oid relationId = LookupShardRelation(shardId, false); /* trigger building the cache for the shard id */ - LookupLookupCitusTableCacheEntry(relationId); + LookupCitusTableCacheEntry(relationId); recheck = true; } @@ -745,8 +745,8 @@ LookupShardCacheEntry(int64 shardId) * reused. Reload the cache entries for both old and new relation * ID and then look up the shard entry again. */ - LookupLookupCitusTableCacheEntry(oldRelationId); - LookupLookupCitusTableCacheEntry(currentRelationId); + LookupCitusTableCacheEntry(oldRelationId); + LookupCitusTableCacheEntry(currentRelationId); recheck = true; } @@ -773,16 +773,16 @@ LookupShardCacheEntry(int64 shardId) /* - * CitusTableCacheEntry looks up a pg_dist_partition entry for a + * GetCitusTableCacheEntry looks up a pg_dist_partition entry for a * relation. * * Errors out if no relation matching the criteria could be found. */ CitusTableCacheEntry * -LookupCitusTableCacheEntry(Oid distributedRelationId) +GetCitusTableCacheEntry(Oid distributedRelationId) { CitusTableCacheEntry *cacheEntry = - LookupLookupCitusTableCacheEntry(distributedRelationId); + LookupCitusTableCacheEntry(distributedRelationId); if (cacheEntry && cacheEntry->isCitusTable) { @@ -806,11 +806,11 @@ LookupCitusTableCacheEntry(Oid distributedRelationId) /* - * LookupCitusTableCacheEntry returns the distributed table metadata for the + * GetCitusTableCacheEntry returns the distributed table metadata for the * passed relationId. For efficiency it caches lookups. */ static CitusTableCacheEntry * -LookupLookupCitusTableCacheEntry(Oid relationId) +LookupCitusTableCacheEntry(Oid relationId) { bool foundInCache = false; void *hashKey = (void *) &relationId; @@ -873,7 +873,7 @@ LookupLookupCitusTableCacheEntry(Oid relationId) } /* free the content of old, invalid, entries */ - ResetLookupCitusTableCacheEntry(cacheEntry); + ResetCitusTableCacheEntry(cacheEntry); } /* zero out entry, but not the key part */ @@ -889,7 +889,7 @@ LookupLookupCitusTableCacheEntry(Oid relationId) HOLD_INTERRUPTS(); /* actually fill out entry */ - BuildLookupCitusTableCacheEntry(cacheEntry); + BuildCitusTableCacheEntry(cacheEntry); /* and finally mark as valid */ cacheEntry->isValid = true; @@ -1004,10 +1004,10 @@ LookupDistObjectCacheEntry(Oid classid, Oid objid, int32 objsubid) /* * BuildCitusTableCacheEntry is a helper routine for - * LookupLookupCitusTableCacheEntry() for building the cache contents. + * LookupCitusTableCacheEntry() for building the cache contents. */ static void -BuildLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry) +BuildCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry) { MemoryContext oldContext = NULL; Datum datumArray[Natts_pg_dist_partition]; @@ -1119,7 +1119,7 @@ BuildLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry) /* - * BuildCachedShardList() is a helper routine for BuildLookupCitusTableCacheEntry() + * BuildCachedShardList() is a helper routine for BuildCitusTableCacheEntry() * building up the list of shards in a distributed relation. */ static void @@ -1201,7 +1201,7 @@ BuildCachedShardList(CitusTableCacheEntry *cacheEntry) * and we can safely wipe its entry, which will remove all corresponding * shard cache entries. */ - ResetLookupCitusTableCacheEntry(shardEntry->tableEntry); + ResetCitusTableCacheEntry(shardEntry->tableEntry); } } @@ -1288,7 +1288,7 @@ BuildCachedShardList(CitusTableCacheEntry *cacheEntry) } /* - * We set these here, so ResetLookupCitusTableCacheEntry() can see what has been + * We set these here, so ResetCitusTableCacheEntry() can see what has been * entered into DistShardCacheHash even if the following loop is interrupted * by throwing errors, etc. */ @@ -1315,7 +1315,7 @@ BuildCachedShardList(CitusTableCacheEntry *cacheEntry) /* * We should increment this only after we are sure this hasn't already - * been assigned to any other relations. ResetLookupCitusTableCacheEntry() + * been assigned to any other relations. ResetCitusTableCacheEntry() * depends on this. */ cacheEntry->shardIntervalArrayLength++; @@ -3246,7 +3246,7 @@ WorkerNodeHashCode(const void *key, Size keySize) * but does not free the entry itself. */ static void -ResetLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry) +ResetCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry) { if (cacheEntry->partitionKeyString != NULL) { @@ -3481,7 +3481,7 @@ FlushDistTableCache(void) while ((cacheEntry = (CitusTableCacheEntry *) hash_seq_search(&status)) != NULL) { - ResetLookupCitusTableCacheEntry(cacheEntry); + ResetCitusTableCacheEntry(cacheEntry); } hash_destroy(DistTableCacheHash); diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c index 80d5cdd27..0039842ae 100644 --- a/src/backend/distributed/metadata/metadata_sync.c +++ b/src/backend/distributed/metadata/metadata_sync.c @@ -222,7 +222,7 @@ ClusterHasKnownMetadataWorkers() bool ShouldSyncTableMetadata(Oid relationId) { - CitusTableCacheEntry *tableEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *tableEntry = GetCitusTableCacheEntry(relationId); bool hashDistributed = (tableEntry->partitionMethod == DISTRIBUTE_BY_HASH); bool streamingReplicated = @@ -466,7 +466,7 @@ MetadataCreateCommands(void) List * GetDistributedTableDDLEvents(Oid relationId) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); List *commandList = NIL; bool includeSequenceDefaults = true; diff --git a/src/backend/distributed/metadata/node_metadata.c b/src/backend/distributed/metadata/node_metadata.c index 025d6e81f..0e9fab79a 100644 --- a/src/backend/distributed/metadata/node_metadata.c +++ b/src/backend/distributed/metadata/node_metadata.c @@ -813,7 +813,7 @@ get_shard_id_for_distribution_column(PG_FUNCTION_ARGS) else if (distributionMethod == DISTRIBUTE_BY_HASH || distributionMethod == DISTRIBUTE_BY_RANGE) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); /* if given table is not reference table, distributionValue cannot be NULL */ if (PG_ARGISNULL(1)) diff --git a/src/backend/distributed/planner/distributed_planner.c b/src/backend/distributed/planner/distributed_planner.c index 9cc3fd709..c552da1f2 100644 --- a/src/backend/distributed/planner/distributed_planner.c +++ b/src/backend/distributed/planner/distributed_planner.c @@ -1897,7 +1897,7 @@ multi_relation_restriction_hook(PlannerInfo *root, RelOptInfo *relOptInfo, */ if (distributedTable) { - cacheEntry = LookupCitusTableCacheEntry(rte->relid); + cacheEntry = GetCitusTableCacheEntry(rte->relid); relationRestrictionContext->allReferenceTables &= (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE); @@ -2426,7 +2426,7 @@ IsLocalReferenceTableJoin(Query *parse, List *rangeTableList) continue; } - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry( + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry( rangeTableEntry->relid); if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) { @@ -2497,7 +2497,7 @@ UpdateReferenceTablesWithShard(Node *node, void *context) return false; } - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); if (cacheEntry->partitionMethod != DISTRIBUTE_BY_NONE) { return false; diff --git a/src/backend/distributed/planner/fast_path_router_planner.c b/src/backend/distributed/planner/fast_path_router_planner.c index f359065e3..cae742c5f 100644 --- a/src/backend/distributed/planner/fast_path_router_planner.c +++ b/src/backend/distributed/planner/fast_path_router_planner.c @@ -202,7 +202,7 @@ FastPathRouterQuery(Query *query, Node **distributionKeyValue) /* we don't want to deal with append/range distributed tables */ Oid distributedTableId = rangeTableEntry->relid; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_HASH || cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE)) { diff --git a/src/backend/distributed/planner/function_call_delegation.c b/src/backend/distributed/planner/function_call_delegation.c index ad2ef6ec3..a521b36ab 100644 --- a/src/backend/distributed/planner/function_call_delegation.c +++ b/src/backend/distributed/planner/function_call_delegation.c @@ -267,7 +267,7 @@ TryToDelegateFunctionCall(DistributedPlanningContext *planContext) return NULL; } - distTable = LookupCitusTableCacheEntry(colocatedRelationId); + distTable = GetCitusTableCacheEntry(colocatedRelationId); partitionColumn = distTable->partitionColumn; if (partitionColumn == NULL) { diff --git a/src/backend/distributed/planner/insert_select_planner.c b/src/backend/distributed/planner/insert_select_planner.c index 815bfbd6b..07e644e20 100644 --- a/src/backend/distributed/planner/insert_select_planner.c +++ b/src/backend/distributed/planner/insert_select_planner.c @@ -218,7 +218,7 @@ CreateDistributedInsertSelectPlan(Query *originalQuery, RangeTblEntry *insertRte = ExtractResultRelationRTE(originalQuery); RangeTblEntry *subqueryRte = ExtractSelectRangeTableEntry(originalQuery); Oid targetRelationId = insertRte->relid; - CitusTableCacheEntry *targetCacheEntry = LookupCitusTableCacheEntry(targetRelationId); + CitusTableCacheEntry *targetCacheEntry = GetCitusTableCacheEntry(targetRelationId); int shardCount = targetCacheEntry->shardIntervalArrayLength; RelationRestrictionContext *relationRestrictionContext = plannerRestrictionContext->relationRestrictionContext; @@ -426,7 +426,7 @@ RouterModifyTaskForShardInterval(Query *originalQuery, ShardInterval *shardInter uint64 shardId = shardInterval->shardId; Oid distributedTableId = shardInterval->relationId; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); PlannerRestrictionContext *copyOfPlannerRestrictionContext = palloc0( sizeof(PlannerRestrictionContext)); diff --git a/src/backend/distributed/planner/multi_join_order.c b/src/backend/distributed/planner/multi_join_order.c index 583804dc9..5f0633f00 100644 --- a/src/backend/distributed/planner/multi_join_order.c +++ b/src/backend/distributed/planner/multi_join_order.c @@ -1380,7 +1380,7 @@ PartitionColumn(Oid relationId, uint32 rangeTableId) Var * DistPartitionKey(Oid relationId) { - CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId); /* reference tables do not have partition column */ if (partitionEntry->partitionMethod == DISTRIBUTE_BY_NONE) @@ -1417,7 +1417,7 @@ char PartitionMethod(Oid relationId) { /* errors out if not a distributed table */ - CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId); char partitionMethod = partitionEntry->partitionMethod; @@ -1430,7 +1430,7 @@ char TableReplicationModel(Oid relationId) { /* errors out if not a distributed table */ - CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId); char replicationModel = partitionEntry->replicationModel; diff --git a/src/backend/distributed/planner/multi_physical_planner.c b/src/backend/distributed/planner/multi_physical_planner.c index a283b0738..de3ab87ad 100644 --- a/src/backend/distributed/planner/multi_physical_planner.c +++ b/src/backend/distributed/planner/multi_physical_planner.c @@ -1950,7 +1950,7 @@ BuildMapMergeJob(Query *jobQuery, List *dependentJobList, Var *partitionKey, else if (partitionType == SINGLE_HASH_PARTITION_TYPE || partitionType == RANGE_PARTITION_TYPE) { - CitusTableCacheEntry *cache = LookupCitusTableCacheEntry(baseRelationId); + CitusTableCacheEntry *cache = GetCitusTableCacheEntry(baseRelationId); uint32 shardCount = cache->shardIntervalArrayLength; ShardInterval **sortedShardIntervalArray = cache->sortedShardIntervalArray; @@ -2177,7 +2177,7 @@ QueryPushdownSqlTaskList(Query *query, uint64 jobId, List *prunedShardList = (List *) lfirst(prunedRelationShardCell); ListCell *shardIntervalCell = NULL; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) { continue; @@ -2309,7 +2309,7 @@ ErrorIfUnsupportedShardDistribution(Query *query) } else { - CitusTableCacheEntry *distTableEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *distTableEntry = GetCitusTableCacheEntry(relationId); if (distTableEntry->hasOverlappingShardInterval) { ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -2415,7 +2415,7 @@ QueryPushdownTaskCreate(Query *originalQuery, int shardIndex, Oid relationId = relationRestriction->relationId; ShardInterval *shardInterval = NULL; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) { /* reference table only has one shard */ @@ -2509,8 +2509,8 @@ QueryPushdownTaskCreate(Query *originalQuery, int shardIndex, bool CoPartitionedTables(Oid firstRelationId, Oid secondRelationId) { - CitusTableCacheEntry *firstTableCache = LookupCitusTableCacheEntry(firstRelationId); - CitusTableCacheEntry *secondTableCache = LookupCitusTableCacheEntry(secondRelationId); + CitusTableCacheEntry *firstTableCache = GetCitusTableCacheEntry(firstRelationId); + CitusTableCacheEntry *secondTableCache = GetCitusTableCacheEntry(secondRelationId); ShardInterval **sortedFirstIntervalArray = firstTableCache->sortedShardIntervalArray; ShardInterval **sortedSecondIntervalArray = @@ -3904,7 +3904,7 @@ bool ShardIntervalsOverlap(ShardInterval *firstInterval, ShardInterval *secondInterval) { CitusTableCacheEntry *intervalRelation = - LookupCitusTableCacheEntry(firstInterval->relationId); + GetCitusTableCacheEntry(firstInterval->relationId); Assert(intervalRelation->partitionMethod != DISTRIBUTE_BY_NONE); diff --git a/src/backend/distributed/planner/multi_router_planner.c b/src/backend/distributed/planner/multi_router_planner.c index f2dc90fa9..fde919af1 100644 --- a/src/backend/distributed/planner/multi_router_planner.c +++ b/src/backend/distributed/planner/multi_router_planner.c @@ -741,7 +741,7 @@ ModifyQuerySupported(Query *queryTree, Query *originalQuery, bool multiShardQuer if (rangeTableEntry->rtekind == RTE_SUBQUERY) { StringInfo errorHint = makeStringInfo(); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry( + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry( distributedTableId); char *partitionKeyString = cacheEntry->partitionKeyString; char *partitionColumnName = ColumnToColumnName(distributedTableId, @@ -1571,7 +1571,7 @@ RouterInsertTaskList(Query *query, bool parametersInQueryResolved, ListCell *modifyRouteCell = NULL; Oid distributedTableId = ExtractFirstCitusTableId(query); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); ErrorIfNoShardsExist(cacheEntry); @@ -1978,7 +1978,7 @@ SingleShardModifyTaskList(Query *query, uint64 jobId, List *relationShardList, RangeTblEntry *updateOrDeleteRTE = GetUpdateOrDeleteRTE(query); Assert(updateOrDeleteRTE != NULL); - CitusTableCacheEntry *modificationTableCacheEntry = LookupCitusTableCacheEntry( + CitusTableCacheEntry *modificationTableCacheEntry = GetCitusTableCacheEntry( updateOrDeleteRTE->relid); char modificationPartitionMethod = modificationTableCacheEntry->partitionMethod; @@ -2043,7 +2043,7 @@ SelectsFromDistributedTable(List *rangeTableList, Query *query) continue; } - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry( + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry( rangeTableEntry->relid); if (cacheEntry->partitionMethod != DISTRIBUTE_BY_NONE && (resultRangeTableEntry == NULL || resultRangeTableEntry->relid != @@ -2409,7 +2409,7 @@ TargetShardIntervalForFastPathQuery(Query *query, bool *isMultiShardQuery, if (inputDistributionKeyValue && !inputDistributionKeyValue->constisnull) { - CitusTableCacheEntry *cache = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cache = GetCitusTableCacheEntry(relationId); ShardInterval *shardInterval = FindShardInterval(inputDistributionKeyValue->constvalue, cache); if (shardInterval == NULL) @@ -2495,7 +2495,7 @@ TargetShardIntervalsForRestrictInfo(RelationRestrictionContext *restrictionConte (RelationRestriction *) lfirst(restrictionCell); Oid relationId = relationRestriction->relationId; Index tableId = relationRestriction->index; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); int shardCount = cacheEntry->shardIntervalArrayLength; List *baseRestrictionList = relationRestriction->relOptInfo->baserestrictinfo; List *restrictClauseList = get_all_actual_clauses(baseRestrictionList); @@ -2660,7 +2660,7 @@ static List * BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError) { Oid distributedTableId = ExtractFirstCitusTableId(query); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); char partitionMethod = cacheEntry->partitionMethod; uint32 rangeTableId = 1; List *modifyRouteList = NIL; @@ -2730,7 +2730,7 @@ BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError) { Datum partitionValue = partitionValueConst->constvalue; - cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + cacheEntry = GetCitusTableCacheEntry(distributedTableId); ShardInterval *shardInterval = FindShardInterval(partitionValue, cacheEntry); if (shardInterval != NULL) { diff --git a/src/backend/distributed/planner/shard_pruning.c b/src/backend/distributed/planner/shard_pruning.c index d62da1218..a6087342e 100644 --- a/src/backend/distributed/planner/shard_pruning.c +++ b/src/backend/distributed/planner/shard_pruning.c @@ -294,7 +294,7 @@ List * PruneShards(Oid relationId, Index rangeTableId, List *whereClauseList, Const **partitionValueConst) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); int shardCount = cacheEntry->shardIntervalArrayLength; char partitionMethod = cacheEntry->partitionMethod; ClauseWalkerContext context = { 0 }; diff --git a/src/backend/distributed/test/distributed_intermediate_results.c b/src/backend/distributed/test/distributed_intermediate_results.c index 8875eca3e..2f0f7994c 100644 --- a/src/backend/distributed/test/distributed_intermediate_results.c +++ b/src/backend/distributed/test/distributed_intermediate_results.c @@ -64,7 +64,7 @@ partition_task_list_results(PG_FUNCTION_ARGS) Job *job = distributedPlan->workerJob; List *taskList = job->taskList; - CitusTableCacheEntry *targetRelation = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *targetRelation = GetCitusTableCacheEntry(relationId); /* * Here SELECT query's target list should match column list of target relation, @@ -132,7 +132,7 @@ redistribute_task_list_results(PG_FUNCTION_ARGS) Job *job = distributedPlan->workerJob; List *taskList = job->taskList; - CitusTableCacheEntry *targetRelation = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *targetRelation = GetCitusTableCacheEntry(relationId); /* * Here SELECT query's target list should match column list of target relation, diff --git a/src/backend/distributed/test/foreign_key_relationship_query.c b/src/backend/distributed/test/foreign_key_relationship_query.c index 5a11c0dbc..1c70705ed 100644 --- a/src/backend/distributed/test/foreign_key_relationship_query.c +++ b/src/backend/distributed/test/foreign_key_relationship_query.c @@ -38,7 +38,7 @@ get_referencing_relation_id_list(PG_FUNCTION_ARGS) if (SRF_IS_FIRSTCALL()) { Oid relationId = PG_GETARG_OID(0); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); List *refList = cacheEntry->referencingRelationsViaForeignKey; /* create a function context for cross-call persistence */ @@ -89,7 +89,7 @@ get_referenced_relation_id_list(PG_FUNCTION_ARGS) if (SRF_IS_FIRSTCALL()) { Oid relationId = PG_GETARG_OID(0); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); List *refList = cacheEntry->referencedRelationsViaForeignKey; /* create a function context for cross-call persistence */ diff --git a/src/backend/distributed/test/prune_shard_list.c b/src/backend/distributed/test/prune_shard_list.c index d44320939..040ca28fc 100644 --- a/src/backend/distributed/test/prune_shard_list.c +++ b/src/backend/distributed/test/prune_shard_list.c @@ -241,7 +241,7 @@ SortedShardIntervalArray(Oid distributedTableId) { Oid shardIdTypeId = INT8OID; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); ShardInterval **shardIntervalArray = cacheEntry->sortedShardIntervalArray; int shardIdCount = cacheEntry->shardIntervalArrayLength; Datum *shardIdDatumArray = palloc0(shardIdCount * sizeof(Datum)); diff --git a/src/backend/distributed/transaction/relation_access_tracking.c b/src/backend/distributed/transaction/relation_access_tracking.c index d11f3dd19..e2a40677e 100644 --- a/src/backend/distributed/transaction/relation_access_tracking.c +++ b/src/backend/distributed/transaction/relation_access_tracking.c @@ -690,7 +690,7 @@ CheckConflictingRelationAccesses(Oid relationId, ShardPlacementAccessType access return; } - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE && cacheEntry->referencingRelationsViaForeignKey != NIL)) @@ -811,7 +811,7 @@ CheckConflictingParallelRelationAccesses(Oid relationId, ShardPlacementAccessTyp return; } - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_HASH && cacheEntry->referencedRelationsViaForeignKey != NIL)) { @@ -882,7 +882,7 @@ HoldsConflictingLockWithReferencedRelations(Oid relationId, ShardPlacementAccess ShardPlacementAccessType * conflictingAccessMode) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); Oid referencedRelation = InvalidOid; foreach_oid(referencedRelation, cacheEntry->referencedRelationsViaForeignKey) @@ -947,7 +947,7 @@ HoldsConflictingLockWithReferencingRelations(Oid relationId, ShardPlacementAcces ShardPlacementAccessType * conflictingAccessMode) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); bool holdsConflictingLocks = false; Assert(PartitionMethod(relationId) == DISTRIBUTE_BY_NONE); diff --git a/src/backend/distributed/utils/colocation_utils.c b/src/backend/distributed/utils/colocation_utils.c index 721b9cd49..21423bc66 100644 --- a/src/backend/distributed/utils/colocation_utils.c +++ b/src/backend/distributed/utils/colocation_utils.c @@ -546,10 +546,10 @@ GetNextColocationId() void CheckReplicationModel(Oid sourceRelationId, Oid targetRelationId) { - CitusTableCacheEntry *sourceTableEntry = LookupCitusTableCacheEntry(sourceRelationId); + CitusTableCacheEntry *sourceTableEntry = GetCitusTableCacheEntry(sourceRelationId); char sourceReplicationModel = sourceTableEntry->replicationModel; - CitusTableCacheEntry *targetTableEntry = LookupCitusTableCacheEntry(targetRelationId); + CitusTableCacheEntry *targetTableEntry = GetCitusTableCacheEntry(targetRelationId); char targetReplicationModel = targetTableEntry->replicationModel; if (sourceReplicationModel != targetReplicationModel) @@ -690,7 +690,7 @@ UpdateRelationColocationGroup(Oid distributedRelationId, uint32 colocationId) uint32 TableColocationId(Oid distributedTableId) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); return cacheEntry->colocationId; } @@ -836,7 +836,7 @@ ColocatedShardIntervalList(ShardInterval *shardInterval) Oid distributedTableId = shardInterval->relationId; List *colocatedShardList = NIL; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); char partitionMethod = cacheEntry->partitionMethod; /* @@ -864,7 +864,7 @@ ColocatedShardIntervalList(ShardInterval *shardInterval) foreach_oid(colocatedTableId, colocatedTableList) { CitusTableCacheEntry *colocatedTableCacheEntry = - LookupCitusTableCacheEntry(colocatedTableId); + GetCitusTableCacheEntry(colocatedTableId); /* * Since we iterate over co-located tables, shard count of each table should be @@ -966,7 +966,7 @@ ColocatedTableId(Oid colocationId) uint64 ColocatedShardIdInRelation(Oid relationId, int shardIndex) { - CitusTableCacheEntry *tableCacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *tableCacheEntry = GetCitusTableCacheEntry(relationId); return tableCacheEntry->sortedShardIntervalArray[shardIndex]->shardId; } diff --git a/src/backend/distributed/utils/reference_table_utils.c b/src/backend/distributed/utils/reference_table_utils.c index ec355c134..ebf5350dd 100644 --- a/src/backend/distributed/utils/reference_table_utils.c +++ b/src/backend/distributed/utils/reference_table_utils.c @@ -70,7 +70,7 @@ upgrade_to_reference_table(PG_FUNCTION_ARGS) "create_reference_table('%s');", relationName))); } - CitusTableCacheEntry *tableEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *tableEntry = GetCitusTableCacheEntry(relationId); if (tableEntry->partitionMethod == DISTRIBUTE_BY_NONE) { @@ -463,7 +463,7 @@ ReferenceTableOidList() Oid relationId = InvalidOid; foreach_oid(relationId, distTableOidList) { - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) { diff --git a/src/backend/distributed/utils/resource_lock.c b/src/backend/distributed/utils/resource_lock.c index 0494b3455..71f5221c5 100644 --- a/src/backend/distributed/utils/resource_lock.c +++ b/src/backend/distributed/utils/resource_lock.c @@ -361,7 +361,7 @@ SetLocktagForShardDistributionMetadata(int64 shardId, LOCKTAG *tag) { ShardInterval *shardInterval = LoadShardInterval(shardId); Oid citusTableId = shardInterval->relationId; - CitusTableCacheEntry *citusTable = LookupCitusTableCacheEntry(citusTableId); + CitusTableCacheEntry *citusTable = GetCitusTableCacheEntry(citusTableId); uint32 colocationId = citusTable->colocationId; if (colocationId == INVALID_COLOCATION_ID || @@ -390,7 +390,7 @@ LockReferencedReferenceShardDistributionMetadata(uint64 shardId, LOCKMODE lockMo { Oid relationId = RelationIdForShard(shardId); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); List *referencedRelationList = cacheEntry->referencedRelationsViaForeignKey; List *shardIntervalList = GetSortedReferenceShardIntervals(referencedRelationList); @@ -420,7 +420,7 @@ LockReferencedReferenceShardResources(uint64 shardId, LOCKMODE lockMode) { Oid relationId = RelationIdForShard(shardId); - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); /* * Note that referencedRelationsViaForeignKey contains transitively referenced diff --git a/src/backend/distributed/utils/shardinterval_utils.c b/src/backend/distributed/utils/shardinterval_utils.c index 26f305db7..6339f882d 100644 --- a/src/backend/distributed/utils/shardinterval_utils.c +++ b/src/backend/distributed/utils/shardinterval_utils.c @@ -239,7 +239,7 @@ ShardIndex(ShardInterval *shardInterval) Oid distributedTableId = shardInterval->relationId; Datum shardMinValue = shardInterval->minValue; - CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); + CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId); char partitionMethod = cacheEntry->partitionMethod; /* diff --git a/src/include/distributed/metadata_cache.h b/src/include/distributed/metadata_cache.h index a393dead4..4aa5e99fd 100644 --- a/src/include/distributed/metadata_cache.h +++ b/src/include/distributed/metadata_cache.h @@ -125,7 +125,7 @@ extern bool ReferenceTableShardId(uint64 shardId); extern ShardPlacement * FindShardPlacementOnGroup(int32 groupId, uint64 shardId); extern GroupShardPlacement * LoadGroupShardPlacement(uint64 shardId, uint64 placementId); extern ShardPlacement * LoadShardPlacement(uint64 shardId, uint64 placementId); -extern CitusTableCacheEntry * LookupCitusTableCacheEntry(Oid distributedRelationId); +extern CitusTableCacheEntry * GetCitusTableCacheEntry(Oid distributedRelationId); extern DistObjectCacheEntry * LookupDistObjectCacheEntry(Oid classid, Oid objid, int32 objsubid); extern int32 GetLocalGroupId(void);