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

Merge pull request #3592 from citusdata/rename-lookuplookup 

Rename LookupCitusTableCacheEntry to GetCitusTableCacheEntry, LookupLookupCitusTableCacheEntry back to LookupCitusTableCacheEntry
pull/3595/head
Philip Dubé 2020-03-08 14:20:24 +00:00 committed by GitHub
parent 70436ec279 7cdfa1daab
commit 426b8ff1a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/commands/call.c
View File

@ -97,7 +97,7 @@ CallFuncExprRemotely(CallStmt *callStmt, DistObjectCacheEntry *procedure,
return false; return false;
} }
CitusTableCacheEntry *distTable = LookupCitusTableCacheEntry(colocatedRelationId); CitusTableCacheEntry *distTable = GetCitusTableCacheEntry(colocatedRelationId);
Var *partitionColumn = distTable->partitionColumn; Var *partitionColumn = distTable->partitionColumn;
if (partitionColumn == NULL) if (partitionColumn == NULL)
{ {

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

@ -793,7 +793,7 @@ static void
EnsureTableCanBeColocatedWith(Oid relationId, char replicationModel, EnsureTableCanBeColocatedWith(Oid relationId, char replicationModel,
Oid distributionColumnType, Oid sourceRelationId) Oid distributionColumnType, Oid sourceRelationId)
{ {
CitusTableCacheEntry *sourceTableEntry = LookupCitusTableCacheEntry(sourceRelationId); CitusTableCacheEntry *sourceTableEntry = GetCitusTableCacheEntry(sourceRelationId);
char sourceDistributionMethod = sourceTableEntry->partitionMethod; char sourceDistributionMethod = sourceTableEntry->partitionMethod;
char sourceReplicationModel = sourceTableEntry->replicationModel; char sourceReplicationModel = sourceTableEntry->replicationModel;
Var *sourceDistributionColumn = ForceDistPartitionKey(sourceRelationId); Var *sourceDistributionColumn = ForceDistPartitionKey(sourceRelationId);

2
src/backend/distributed/commands/function.c
View File

@ -410,7 +410,7 @@ static void
EnsureFunctionCanBeColocatedWithTable(Oid functionOid, Oid distributionColumnType, EnsureFunctionCanBeColocatedWithTable(Oid functionOid, Oid distributionColumnType,
Oid sourceRelationId) Oid sourceRelationId)
{ {
CitusTableCacheEntry *sourceTableEntry = LookupCitusTableCacheEntry(sourceRelationId); CitusTableCacheEntry *sourceTableEntry = GetCitusTableCacheEntry(sourceRelationId);
char sourceDistributionMethod = sourceTableEntry->partitionMethod; char sourceDistributionMethod = sourceTableEntry->partitionMethod;
char sourceReplicationModel = sourceTableEntry->replicationModel; char sourceReplicationModel = sourceTableEntry->replicationModel;

2
src/backend/distributed/commands/multi_copy.c
View File

@ -2018,7 +2018,7 @@ CitusCopyDestReceiverStartup(DestReceiver *dest, int operation,
/* look up table properties */ /* look up table properties */
Relation distributedRelation = heap_open(tableId, RowExclusiveLock); Relation distributedRelation = heap_open(tableId, RowExclusiveLock);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(tableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(tableId);
partitionMethod = cacheEntry->partitionMethod; partitionMethod = cacheEntry->partitionMethod;
copyDest->distributedRelation = distributedRelation; copyDest->distributedRelation = distributedRelation;

2
src/backend/distributed/commands/truncate.c
View File

@ -189,7 +189,7 @@ LockTruncatedRelationMetadataInWorkers(TruncateStmt *truncateStatement)
distributedRelationList = lappend_oid(distributedRelationList, relationId); distributedRelationList = lappend_oid(distributedRelationList, relationId);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
Assert(cacheEntry != NULL); Assert(cacheEntry != NULL);
List *referencingTableList = cacheEntry->referencingRelationsViaForeignKey; List *referencingTableList = cacheEntry->referencingRelationsViaForeignKey;

6
src/backend/distributed/executor/insert_select_executor.c
View File

@ -220,7 +220,7 @@ CoordinatorInsertSelectExecScanInternal(CustomScanState *node)
char *distResultPrefix = distResultPrefixString->data; char *distResultPrefix = distResultPrefixString->data;
CitusTableCacheEntry *targetRelation = CitusTableCacheEntry *targetRelation =
LookupCitusTableCacheEntry(targetRelationId); GetCitusTableCacheEntry(targetRelationId);
int partitionColumnIndex = int partitionColumnIndex =
PartitionColumnIndex(insertTargetList, targetRelation->partitionColumn); PartitionColumnIndex(insertTargetList, targetRelation->partitionColumn);
@ -484,7 +484,7 @@ TwoPhaseInsertSelectTaskList(Oid targetRelationId, Query *insertSelectQuery,
RangeTblEntry *insertRte = ExtractResultRelationRTE(insertResultQuery); RangeTblEntry *insertRte = ExtractResultRelationRTE(insertResultQuery);
RangeTblEntry *selectRte = ExtractSelectRangeTableEntry(insertResultQuery); RangeTblEntry *selectRte = ExtractSelectRangeTableEntry(insertResultQuery);
CitusTableCacheEntry *targetCacheEntry = LookupCitusTableCacheEntry(targetRelationId); CitusTableCacheEntry *targetCacheEntry = GetCitusTableCacheEntry(targetRelationId);
int shardCount = targetCacheEntry->shardIntervalArrayLength; int shardCount = targetCacheEntry->shardIntervalArrayLength;
uint32 taskIdIndex = 1; uint32 taskIdIndex = 1;
uint64 jobId = INVALID_JOB_ID; uint64 jobId = INVALID_JOB_ID;
@ -895,7 +895,7 @@ CastExpr(Expr *expr, Oid sourceType, Oid targetType, Oid targetCollation,
bool bool
IsSupportedRedistributionTarget(Oid targetRelationId) IsSupportedRedistributionTarget(Oid targetRelationId)
{ {
CitusTableCacheEntry *tableEntry = LookupCitusTableCacheEntry(targetRelationId); CitusTableCacheEntry *tableEntry = GetCitusTableCacheEntry(targetRelationId);
/* only range and hash-distributed tables are currently supported */ /* only range and hash-distributed tables are currently supported */
if (tableEntry->partitionMethod != DISTRIBUTE_BY_HASH && if (tableEntry->partitionMethod != DISTRIBUTE_BY_HASH &&

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

@ -106,7 +106,7 @@ void
CreateShardsWithRoundRobinPolicy(Oid distributedTableId, int32 shardCount, CreateShardsWithRoundRobinPolicy(Oid distributedTableId, int32 shardCount,
int32 replicationFactor, bool useExclusiveConnections) int32 replicationFactor, bool useExclusiveConnections)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
bool colocatedShard = false; bool colocatedShard = false;
List *insertedShardPlacements = NIL; List *insertedShardPlacements = NIL;

10
src/backend/distributed/master/master_metadata_utility.c
View File

@ -246,7 +246,7 @@ DistributedTableSizeOnWorker(WorkerNode *workerNode, Oid relationId, char *sizeQ
List * List *
GroupShardPlacementsForTableOnGroup(Oid relationId, int32 groupId) GroupShardPlacementsForTableOnGroup(Oid relationId, int32 groupId)
{ {
CitusTableCacheEntry *distTableCacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *distTableCacheEntry = GetCitusTableCacheEntry(relationId);
List *resultList = NIL; List *resultList = NIL;
int shardIntervalArrayLength = distTableCacheEntry->shardIntervalArrayLength; int shardIntervalArrayLength = distTableCacheEntry->shardIntervalArrayLength;
@ -284,7 +284,7 @@ GroupShardPlacementsForTableOnGroup(Oid relationId, int32 groupId)
static List * static List *
ShardIntervalsOnWorkerGroup(WorkerNode *workerNode, Oid relationId) ShardIntervalsOnWorkerGroup(WorkerNode *workerNode, Oid relationId)
{ {
CitusTableCacheEntry *distTableCacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *distTableCacheEntry = GetCitusTableCacheEntry(relationId);
List *shardIntervalList = NIL; List *shardIntervalList = NIL;
int shardIntervalArrayLength = distTableCacheEntry->shardIntervalArrayLength; int shardIntervalArrayLength = distTableCacheEntry->shardIntervalArrayLength;
@ -486,7 +486,7 @@ TableShardReplicationFactor(Oid relationId)
List * List *
LoadShardIntervalList(Oid relationId) LoadShardIntervalList(Oid relationId)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
List *shardList = NIL; List *shardList = NIL;
for (int i = 0; i < cacheEntry->shardIntervalArrayLength; i++) for (int i = 0; i < cacheEntry->shardIntervalArrayLength; i++)
@ -511,7 +511,7 @@ LoadShardIntervalList(Oid relationId)
int int
ShardIntervalCount(Oid relationId) ShardIntervalCount(Oid relationId)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
int shardIntervalCount = 0; int shardIntervalCount = 0;
if (cacheEntry->isCitusTable) if (cacheEntry->isCitusTable)
@ -533,7 +533,7 @@ ShardIntervalCount(Oid relationId)
List * List *
LoadShardList(Oid relationId) LoadShardList(Oid relationId)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
List *shardList = NIL; List *shardList = NIL;
for (int i = 0; i < cacheEntry->shardIntervalArrayLength; i++) for (int i = 0; i < cacheEntry->shardIntervalArrayLength; i++)

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

@ -103,7 +103,7 @@ master_get_table_metadata(PG_FUNCTION_ARGS)
CheckCitusVersion(ERROR); CheckCitusVersion(ERROR);
/* find partition tuple for partitioned relation */ /* find partition tuple for partitioned relation */
CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId);
/* create tuple descriptor for return value */ /* create tuple descriptor for return value */
TypeFuncClass resultTypeClass = get_call_result_type(fcinfo, NULL, TypeFuncClass resultTypeClass = get_call_result_type(fcinfo, NULL,

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

@ -558,7 +558,7 @@ static List *
RelationShardListForShardCreate(ShardInterval *shardInterval) RelationShardListForShardCreate(ShardInterval *shardInterval)
{ {
Oid relationId = shardInterval->relationId; Oid relationId = shardInterval->relationId;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
List *referencedRelationList = cacheEntry->referencedRelationsViaForeignKey; List *referencedRelationList = cacheEntry->referencedRelationsViaForeignKey;
List *referencingRelationList = cacheEntry->referencingRelationsViaForeignKey; List *referencingRelationList = cacheEntry->referencingRelationsViaForeignKey;
int shardIndex = -1; int shardIndex = -1;

48
src/backend/distributed/metadata/metadata_cache.c
View File

@ -191,8 +191,8 @@ static ScanKeyData DistObjectScanKey[3];
/* local function forward declarations */ /* local function forward declarations */
static bool IsCitusTableViaCatalog(Oid relationId); static bool IsCitusTableViaCatalog(Oid relationId);
static ShardCacheEntry * LookupShardCacheEntry(int64 shardId); static ShardCacheEntry * LookupShardCacheEntry(int64 shardId);
static CitusTableCacheEntry * LookupLookupCitusTableCacheEntry(Oid relationId); static CitusTableCacheEntry * LookupCitusTableCacheEntry(Oid relationId);
static void BuildLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry); static void BuildCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry);
static void BuildCachedShardList(CitusTableCacheEntry *cacheEntry); static void BuildCachedShardList(CitusTableCacheEntry *cacheEntry);
static void PrepareWorkerNodeCache(void); static void PrepareWorkerNodeCache(void);
static bool CheckInstalledVersion(int elevel); static bool CheckInstalledVersion(int elevel);
@ -207,7 +207,7 @@ static void RegisterForeignKeyGraphCacheCallbacks(void);
static void RegisterWorkerNodeCacheCallbacks(void); static void RegisterWorkerNodeCacheCallbacks(void);
static void RegisterLocalGroupIdCacheCallbacks(void); static void RegisterLocalGroupIdCacheCallbacks(void);
static uint32 WorkerNodeHashCode(const void *key, Size keySize); static uint32 WorkerNodeHashCode(const void *key, Size keySize);
static void ResetLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry); static void ResetCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry);
static void CreateDistTableCache(void); static void CreateDistTableCache(void);
static void CreateDistObjectCache(void); static void CreateDistObjectCache(void);
static void InvalidateForeignRelationGraphCacheCallback(Datum argument, Oid relationId); static void InvalidateForeignRelationGraphCacheCallback(Datum argument, Oid relationId);
@ -274,11 +274,11 @@ EnsureModificationsCanRun(void)
bool bool
IsCitusTable(Oid relationId) IsCitusTable(Oid relationId)
{ {
CitusTableCacheEntry *cacheEntry = LookupLookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId);
/* /*
* If extension hasn't been created, or has the wrong version and the * 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) if (!cacheEntry)
{ {
@ -342,7 +342,7 @@ CitusTableList(void)
Oid relationId = InvalidOid; Oid relationId = InvalidOid;
foreach_oid(relationId, distTableOidList) foreach_oid(relationId, distTableOidList)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
Assert(cacheEntry->isCitusTable); Assert(cacheEntry->isCitusTable);
distributedTableList = lappend(distributedTableList, cacheEntry); distributedTableList = lappend(distributedTableList, cacheEntry);
@ -722,7 +722,7 @@ LookupShardCacheEntry(int64 shardId)
Oid relationId = LookupShardRelation(shardId, false); Oid relationId = LookupShardRelation(shardId, false);
/* trigger building the cache for the shard id */ /* trigger building the cache for the shard id */
LookupLookupCitusTableCacheEntry(relationId); LookupCitusTableCacheEntry(relationId);
recheck = true; recheck = true;
} }
@ -745,8 +745,8 @@ LookupShardCacheEntry(int64 shardId)
* reused. Reload the cache entries for both old and new relation * reused. Reload the cache entries for both old and new relation
* ID and then look up the shard entry again. * ID and then look up the shard entry again.
*/ */
LookupLookupCitusTableCacheEntry(oldRelationId); LookupCitusTableCacheEntry(oldRelationId);
LookupLookupCitusTableCacheEntry(currentRelationId); LookupCitusTableCacheEntry(currentRelationId);
recheck = true; 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. * relation.
* *
* Errors out if no relation matching the criteria could be found. * Errors out if no relation matching the criteria could be found.
*/ */
CitusTableCacheEntry * CitusTableCacheEntry *
LookupCitusTableCacheEntry(Oid distributedRelationId) GetCitusTableCacheEntry(Oid distributedRelationId)
{ {
CitusTableCacheEntry *cacheEntry = CitusTableCacheEntry *cacheEntry =
LookupLookupCitusTableCacheEntry(distributedRelationId); LookupCitusTableCacheEntry(distributedRelationId);
if (cacheEntry && cacheEntry->isCitusTable) 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. * passed relationId. For efficiency it caches lookups.
*/ */
static CitusTableCacheEntry * static CitusTableCacheEntry *
LookupLookupCitusTableCacheEntry(Oid relationId) LookupCitusTableCacheEntry(Oid relationId)
{ {
bool foundInCache = false; bool foundInCache = false;
void *hashKey = (void *) &relationId; void *hashKey = (void *) &relationId;
@ -873,7 +873,7 @@ LookupLookupCitusTableCacheEntry(Oid relationId)
} }
/* free the content of old, invalid, entries */ /* free the content of old, invalid, entries */
ResetLookupCitusTableCacheEntry(cacheEntry); ResetCitusTableCacheEntry(cacheEntry);
} }
/* zero out entry, but not the key part */ /* zero out entry, but not the key part */
@ -889,7 +889,7 @@ LookupLookupCitusTableCacheEntry(Oid relationId)
HOLD_INTERRUPTS(); HOLD_INTERRUPTS();
/* actually fill out entry */ /* actually fill out entry */
BuildLookupCitusTableCacheEntry(cacheEntry); BuildCitusTableCacheEntry(cacheEntry);
/* and finally mark as valid */ /* and finally mark as valid */
cacheEntry->isValid = true; cacheEntry->isValid = true;
@ -1004,10 +1004,10 @@ LookupDistObjectCacheEntry(Oid classid, Oid objid, int32 objsubid)
/* /*
* BuildCitusTableCacheEntry is a helper routine for * BuildCitusTableCacheEntry is a helper routine for
* LookupLookupCitusTableCacheEntry() for building the cache contents. * LookupCitusTableCacheEntry() for building the cache contents.
*/ */
static void static void
BuildLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry) BuildCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry)
{ {
MemoryContext oldContext = NULL; MemoryContext oldContext = NULL;
Datum datumArray[Natts_pg_dist_partition]; 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. * building up the list of shards in a distributed relation.
*/ */
static void static void
@ -1201,7 +1201,7 @@ BuildCachedShardList(CitusTableCacheEntry *cacheEntry)
* and we can safely wipe its entry, which will remove all corresponding * and we can safely wipe its entry, which will remove all corresponding
* shard cache entries. * 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 * entered into DistShardCacheHash even if the following loop is interrupted
* by throwing errors, etc. * by throwing errors, etc.
*/ */
@ -1315,7 +1315,7 @@ BuildCachedShardList(CitusTableCacheEntry *cacheEntry)
/* /*
* We should increment this only after we are sure this hasn't already * 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. * depends on this.
*/ */
cacheEntry->shardIntervalArrayLength++; cacheEntry->shardIntervalArrayLength++;
@ -3246,7 +3246,7 @@ WorkerNodeHashCode(const void *key, Size keySize)
* but does not free the entry itself. * but does not free the entry itself.
*/ */
static void static void
ResetLookupCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry) ResetCitusTableCacheEntry(CitusTableCacheEntry *cacheEntry)
{ {
if (cacheEntry->partitionKeyString != NULL) if (cacheEntry->partitionKeyString != NULL)
{ {
@ -3481,7 +3481,7 @@ FlushDistTableCache(void)
while ((cacheEntry = (CitusTableCacheEntry *) hash_seq_search(&status)) != NULL) while ((cacheEntry = (CitusTableCacheEntry *) hash_seq_search(&status)) != NULL)
{ {
ResetLookupCitusTableCacheEntry(cacheEntry); ResetCitusTableCacheEntry(cacheEntry);
} }
hash_destroy(DistTableCacheHash); hash_destroy(DistTableCacheHash);

4
src/backend/distributed/metadata/metadata_sync.c
View File

@ -222,7 +222,7 @@ ClusterHasKnownMetadataWorkers()
bool bool
ShouldSyncTableMetadata(Oid relationId) ShouldSyncTableMetadata(Oid relationId)
{ {
CitusTableCacheEntry *tableEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *tableEntry = GetCitusTableCacheEntry(relationId);
bool hashDistributed = (tableEntry->partitionMethod == DISTRIBUTE_BY_HASH); bool hashDistributed = (tableEntry->partitionMethod == DISTRIBUTE_BY_HASH);
bool streamingReplicated = bool streamingReplicated =
@ -466,7 +466,7 @@ MetadataCreateCommands(void)
List * List *
GetDistributedTableDDLEvents(Oid relationId) GetDistributedTableDDLEvents(Oid relationId)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
List *commandList = NIL; List *commandList = NIL;
bool includeSequenceDefaults = true; bool includeSequenceDefaults = true;

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

@ -813,7 +813,7 @@ get_shard_id_for_distribution_column(PG_FUNCTION_ARGS)
else if (distributionMethod == DISTRIBUTE_BY_HASH || else if (distributionMethod == DISTRIBUTE_BY_HASH ||
distributionMethod == DISTRIBUTE_BY_RANGE) distributionMethod == DISTRIBUTE_BY_RANGE)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
/* if given table is not reference table, distributionValue cannot be NULL */ /* if given table is not reference table, distributionValue cannot be NULL */
if (PG_ARGISNULL(1)) if (PG_ARGISNULL(1))

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

@ -1897,7 +1897,7 @@ multi_relation_restriction_hook(PlannerInfo *root, RelOptInfo *relOptInfo,
*/ */
if (distributedTable) if (distributedTable)
{ {
cacheEntry = LookupCitusTableCacheEntry(rte->relid); cacheEntry = GetCitusTableCacheEntry(rte->relid);
relationRestrictionContext->allReferenceTables &= relationRestrictionContext->allReferenceTables &=
(cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE); (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE);
@ -2426,7 +2426,7 @@ IsLocalReferenceTableJoin(Query *parse, List *rangeTableList)
continue; continue;
} }
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry( CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(
rangeTableEntry->relid); rangeTableEntry->relid);
if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE)
{ {
@ -2497,7 +2497,7 @@ UpdateReferenceTablesWithShard(Node *node, void *context)
return false; return false;
} }
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
if (cacheEntry->partitionMethod != DISTRIBUTE_BY_NONE) if (cacheEntry->partitionMethod != DISTRIBUTE_BY_NONE)
{ {
return false; return false;

2
src/backend/distributed/planner/fast_path_router_planner.c
View File

@ -202,7 +202,7 @@ FastPathRouterQuery(Query *query, Node **distributionKeyValue)
/* we don't want to deal with append/range distributed tables */ /* we don't want to deal with append/range distributed tables */
Oid distributedTableId = rangeTableEntry->relid; Oid distributedTableId = rangeTableEntry->relid;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_HASH || if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_HASH ||
cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE)) cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE))
{ {

2
src/backend/distributed/planner/function_call_delegation.c
View File

@ -267,7 +267,7 @@ TryToDelegateFunctionCall(DistributedPlanningContext *planContext)
return NULL; return NULL;
} }
distTable = LookupCitusTableCacheEntry(colocatedRelationId); distTable = GetCitusTableCacheEntry(colocatedRelationId);
partitionColumn = distTable->partitionColumn; partitionColumn = distTable->partitionColumn;
if (partitionColumn == NULL) if (partitionColumn == NULL)
{ {

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

@ -218,7 +218,7 @@ CreateDistributedInsertSelectPlan(Query *originalQuery,
RangeTblEntry *insertRte = ExtractResultRelationRTE(originalQuery); RangeTblEntry *insertRte = ExtractResultRelationRTE(originalQuery);
RangeTblEntry *subqueryRte = ExtractSelectRangeTableEntry(originalQuery); RangeTblEntry *subqueryRte = ExtractSelectRangeTableEntry(originalQuery);
Oid targetRelationId = insertRte->relid; Oid targetRelationId = insertRte->relid;
CitusTableCacheEntry *targetCacheEntry = LookupCitusTableCacheEntry(targetRelationId); CitusTableCacheEntry *targetCacheEntry = GetCitusTableCacheEntry(targetRelationId);
int shardCount = targetCacheEntry->shardIntervalArrayLength; int shardCount = targetCacheEntry->shardIntervalArrayLength;
RelationRestrictionContext *relationRestrictionContext = RelationRestrictionContext *relationRestrictionContext =
plannerRestrictionContext->relationRestrictionContext; plannerRestrictionContext->relationRestrictionContext;
@ -426,7 +426,7 @@ RouterModifyTaskForShardInterval(Query *originalQuery, ShardInterval *shardInter
uint64 shardId = shardInterval->shardId; uint64 shardId = shardInterval->shardId;
Oid distributedTableId = shardInterval->relationId; Oid distributedTableId = shardInterval->relationId;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
PlannerRestrictionContext *copyOfPlannerRestrictionContext = palloc0( PlannerRestrictionContext *copyOfPlannerRestrictionContext = palloc0(
sizeof(PlannerRestrictionContext)); sizeof(PlannerRestrictionContext));

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

@ -1380,7 +1380,7 @@ PartitionColumn(Oid relationId, uint32 rangeTableId)
Var * Var *
DistPartitionKey(Oid relationId) DistPartitionKey(Oid relationId)
{ {
CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId);
/* reference tables do not have partition column */ /* reference tables do not have partition column */
if (partitionEntry->partitionMethod == DISTRIBUTE_BY_NONE) if (partitionEntry->partitionMethod == DISTRIBUTE_BY_NONE)
@ -1417,7 +1417,7 @@ char
PartitionMethod(Oid relationId) PartitionMethod(Oid relationId)
{ {
/* errors out if not a distributed table */ /* errors out if not a distributed table */
CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId);
char partitionMethod = partitionEntry->partitionMethod; char partitionMethod = partitionEntry->partitionMethod;
@ -1430,7 +1430,7 @@ char
TableReplicationModel(Oid relationId) TableReplicationModel(Oid relationId)
{ {
/* errors out if not a distributed table */ /* errors out if not a distributed table */
CitusTableCacheEntry *partitionEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *partitionEntry = GetCitusTableCacheEntry(relationId);
char replicationModel = partitionEntry->replicationModel; char replicationModel = partitionEntry->replicationModel;

14
src/backend/distributed/planner/multi_physical_planner.c
View File

@ -1950,7 +1950,7 @@ BuildMapMergeJob(Query *jobQuery, List *dependentJobList, Var *partitionKey,
else if (partitionType == SINGLE_HASH_PARTITION_TYPE || partitionType == else if (partitionType == SINGLE_HASH_PARTITION_TYPE || partitionType ==
RANGE_PARTITION_TYPE) RANGE_PARTITION_TYPE)
{ {
CitusTableCacheEntry *cache = LookupCitusTableCacheEntry(baseRelationId); CitusTableCacheEntry *cache = GetCitusTableCacheEntry(baseRelationId);
uint32 shardCount = cache->shardIntervalArrayLength; uint32 shardCount = cache->shardIntervalArrayLength;
ShardInterval **sortedShardIntervalArray = cache->sortedShardIntervalArray; ShardInterval **sortedShardIntervalArray = cache->sortedShardIntervalArray;
@ -2177,7 +2177,7 @@ QueryPushdownSqlTaskList(Query *query, uint64 jobId,
List *prunedShardList = (List *) lfirst(prunedRelationShardCell); List *prunedShardList = (List *) lfirst(prunedRelationShardCell);
ListCell *shardIntervalCell = NULL; ListCell *shardIntervalCell = NULL;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE)
{ {
continue; continue;
@ -2309,7 +2309,7 @@ ErrorIfUnsupportedShardDistribution(Query *query)
} }
else else
{ {
CitusTableCacheEntry *distTableEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *distTableEntry = GetCitusTableCacheEntry(relationId);
if (distTableEntry->hasOverlappingShardInterval) if (distTableEntry->hasOverlappingShardInterval)
{ {
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@ -2415,7 +2415,7 @@ QueryPushdownTaskCreate(Query *originalQuery, int shardIndex,
Oid relationId = relationRestriction->relationId; Oid relationId = relationRestriction->relationId;
ShardInterval *shardInterval = NULL; ShardInterval *shardInterval = NULL;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE)
{ {
/* reference table only has one shard */ /* reference table only has one shard */
@ -2509,8 +2509,8 @@ QueryPushdownTaskCreate(Query *originalQuery, int shardIndex,
bool bool
CoPartitionedTables(Oid firstRelationId, Oid secondRelationId) CoPartitionedTables(Oid firstRelationId, Oid secondRelationId)
{ {
CitusTableCacheEntry *firstTableCache = LookupCitusTableCacheEntry(firstRelationId); CitusTableCacheEntry *firstTableCache = GetCitusTableCacheEntry(firstRelationId);
CitusTableCacheEntry *secondTableCache = LookupCitusTableCacheEntry(secondRelationId); CitusTableCacheEntry *secondTableCache = GetCitusTableCacheEntry(secondRelationId);
ShardInterval **sortedFirstIntervalArray = firstTableCache->sortedShardIntervalArray; ShardInterval **sortedFirstIntervalArray = firstTableCache->sortedShardIntervalArray;
ShardInterval **sortedSecondIntervalArray = ShardInterval **sortedSecondIntervalArray =
@ -3904,7 +3904,7 @@ bool
ShardIntervalsOverlap(ShardInterval *firstInterval, ShardInterval *secondInterval) ShardIntervalsOverlap(ShardInterval *firstInterval, ShardInterval *secondInterval)
{ {
CitusTableCacheEntry *intervalRelation = CitusTableCacheEntry *intervalRelation =
LookupCitusTableCacheEntry(firstInterval->relationId); GetCitusTableCacheEntry(firstInterval->relationId);
Assert(intervalRelation->partitionMethod != DISTRIBUTE_BY_NONE); Assert(intervalRelation->partitionMethod != DISTRIBUTE_BY_NONE);

16
src/backend/distributed/planner/multi_router_planner.c
View File

@ -741,7 +741,7 @@ ModifyQuerySupported(Query *queryTree, Query *originalQuery, bool multiShardQuer
if (rangeTableEntry->rtekind == RTE_SUBQUERY) if (rangeTableEntry->rtekind == RTE_SUBQUERY)
{ {
StringInfo errorHint = makeStringInfo(); StringInfo errorHint = makeStringInfo();
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry( CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(
distributedTableId); distributedTableId);
char *partitionKeyString = cacheEntry->partitionKeyString; char *partitionKeyString = cacheEntry->partitionKeyString;
char *partitionColumnName = ColumnToColumnName(distributedTableId, char *partitionColumnName = ColumnToColumnName(distributedTableId,
@ -1571,7 +1571,7 @@ RouterInsertTaskList(Query *query, bool parametersInQueryResolved,
ListCell *modifyRouteCell = NULL; ListCell *modifyRouteCell = NULL;
Oid distributedTableId = ExtractFirstCitusTableId(query); Oid distributedTableId = ExtractFirstCitusTableId(query);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
ErrorIfNoShardsExist(cacheEntry); ErrorIfNoShardsExist(cacheEntry);
@ -1978,7 +1978,7 @@ SingleShardModifyTaskList(Query *query, uint64 jobId, List *relationShardList,
RangeTblEntry *updateOrDeleteRTE = GetUpdateOrDeleteRTE(query); RangeTblEntry *updateOrDeleteRTE = GetUpdateOrDeleteRTE(query);
Assert(updateOrDeleteRTE != NULL); Assert(updateOrDeleteRTE != NULL);
CitusTableCacheEntry *modificationTableCacheEntry = LookupCitusTableCacheEntry( CitusTableCacheEntry *modificationTableCacheEntry = GetCitusTableCacheEntry(
updateOrDeleteRTE->relid); updateOrDeleteRTE->relid);
char modificationPartitionMethod = modificationTableCacheEntry->partitionMethod; char modificationPartitionMethod = modificationTableCacheEntry->partitionMethod;
@ -2043,7 +2043,7 @@ SelectsFromDistributedTable(List *rangeTableList, Query *query)
continue; continue;
} }
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry( CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(
rangeTableEntry->relid); rangeTableEntry->relid);
if (cacheEntry->partitionMethod != DISTRIBUTE_BY_NONE && if (cacheEntry->partitionMethod != DISTRIBUTE_BY_NONE &&
(resultRangeTableEntry == NULL || resultRangeTableEntry->relid != (resultRangeTableEntry == NULL || resultRangeTableEntry->relid !=
@ -2409,7 +2409,7 @@ TargetShardIntervalForFastPathQuery(Query *query, bool *isMultiShardQuery,
if (inputDistributionKeyValue && !inputDistributionKeyValue->constisnull) if (inputDistributionKeyValue && !inputDistributionKeyValue->constisnull)
{ {
CitusTableCacheEntry *cache = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cache = GetCitusTableCacheEntry(relationId);
ShardInterval *shardInterval = ShardInterval *shardInterval =
FindShardInterval(inputDistributionKeyValue->constvalue, cache); FindShardInterval(inputDistributionKeyValue->constvalue, cache);
if (shardInterval == NULL) if (shardInterval == NULL)
@ -2495,7 +2495,7 @@ TargetShardIntervalsForRestrictInfo(RelationRestrictionContext *restrictionConte
(RelationRestriction *) lfirst(restrictionCell); (RelationRestriction *) lfirst(restrictionCell);
Oid relationId = relationRestriction->relationId; Oid relationId = relationRestriction->relationId;
Index tableId = relationRestriction->index; Index tableId = relationRestriction->index;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
int shardCount = cacheEntry->shardIntervalArrayLength; int shardCount = cacheEntry->shardIntervalArrayLength;
List *baseRestrictionList = relationRestriction->relOptInfo->baserestrictinfo; List *baseRestrictionList = relationRestriction->relOptInfo->baserestrictinfo;
List *restrictClauseList = get_all_actual_clauses(baseRestrictionList); List *restrictClauseList = get_all_actual_clauses(baseRestrictionList);
@ -2660,7 +2660,7 @@ static List *
BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError) BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError)
{ {
Oid distributedTableId = ExtractFirstCitusTableId(query); Oid distributedTableId = ExtractFirstCitusTableId(query);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
char partitionMethod = cacheEntry->partitionMethod; char partitionMethod = cacheEntry->partitionMethod;
uint32 rangeTableId = 1; uint32 rangeTableId = 1;
List *modifyRouteList = NIL; List *modifyRouteList = NIL;
@ -2730,7 +2730,7 @@ BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError)
{ {
Datum partitionValue = partitionValueConst->constvalue; Datum partitionValue = partitionValueConst->constvalue;
cacheEntry = LookupCitusTableCacheEntry(distributedTableId); cacheEntry = GetCitusTableCacheEntry(distributedTableId);
ShardInterval *shardInterval = FindShardInterval(partitionValue, cacheEntry); ShardInterval *shardInterval = FindShardInterval(partitionValue, cacheEntry);
if (shardInterval != NULL) if (shardInterval != NULL)
{ {

2
src/backend/distributed/planner/shard_pruning.c
View File

@ -294,7 +294,7 @@ List *
PruneShards(Oid relationId, Index rangeTableId, List *whereClauseList, PruneShards(Oid relationId, Index rangeTableId, List *whereClauseList,
Const **partitionValueConst) Const **partitionValueConst)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
int shardCount = cacheEntry->shardIntervalArrayLength; int shardCount = cacheEntry->shardIntervalArrayLength;
char partitionMethod = cacheEntry->partitionMethod; char partitionMethod = cacheEntry->partitionMethod;
ClauseWalkerContext context = { 0 }; ClauseWalkerContext context = { 0 };

4
src/backend/distributed/test/distributed_intermediate_results.c
View File

@ -64,7 +64,7 @@ partition_task_list_results(PG_FUNCTION_ARGS)
Job *job = distributedPlan->workerJob; Job *job = distributedPlan->workerJob;
List *taskList = job->taskList; 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, * 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; Job *job = distributedPlan->workerJob;
List *taskList = job->taskList; 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, * Here SELECT query's target list should match column list of target relation,

4
src/backend/distributed/test/foreign_key_relationship_query.c
View File

@ -38,7 +38,7 @@ get_referencing_relation_id_list(PG_FUNCTION_ARGS)
if (SRF_IS_FIRSTCALL()) if (SRF_IS_FIRSTCALL())
{ {
Oid relationId = PG_GETARG_OID(0); Oid relationId = PG_GETARG_OID(0);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
List *refList = cacheEntry->referencingRelationsViaForeignKey; List *refList = cacheEntry->referencingRelationsViaForeignKey;
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */
@ -89,7 +89,7 @@ get_referenced_relation_id_list(PG_FUNCTION_ARGS)
if (SRF_IS_FIRSTCALL()) if (SRF_IS_FIRSTCALL())
{ {
Oid relationId = PG_GETARG_OID(0); Oid relationId = PG_GETARG_OID(0);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
List *refList = cacheEntry->referencedRelationsViaForeignKey; List *refList = cacheEntry->referencedRelationsViaForeignKey;
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */

2
src/backend/distributed/test/prune_shard_list.c
View File

@ -241,7 +241,7 @@ SortedShardIntervalArray(Oid distributedTableId)
{ {
Oid shardIdTypeId = INT8OID; Oid shardIdTypeId = INT8OID;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
ShardInterval **shardIntervalArray = cacheEntry->sortedShardIntervalArray; ShardInterval **shardIntervalArray = cacheEntry->sortedShardIntervalArray;
int shardIdCount = cacheEntry->shardIntervalArrayLength; int shardIdCount = cacheEntry->shardIntervalArrayLength;
Datum *shardIdDatumArray = palloc0(shardIdCount * sizeof(Datum)); Datum *shardIdDatumArray = palloc0(shardIdCount * sizeof(Datum));

8
src/backend/distributed/transaction/relation_access_tracking.c
View File

@ -690,7 +690,7 @@ CheckConflictingRelationAccesses(Oid relationId, ShardPlacementAccessType access
return; return;
} }
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE && if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE &&
cacheEntry->referencingRelationsViaForeignKey != NIL)) cacheEntry->referencingRelationsViaForeignKey != NIL))
@ -811,7 +811,7 @@ CheckConflictingParallelRelationAccesses(Oid relationId, ShardPlacementAccessTyp
return; return;
} }
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_HASH && if (!(cacheEntry->partitionMethod == DISTRIBUTE_BY_HASH &&
cacheEntry->referencedRelationsViaForeignKey != NIL)) cacheEntry->referencedRelationsViaForeignKey != NIL))
{ {
@ -882,7 +882,7 @@ HoldsConflictingLockWithReferencedRelations(Oid relationId, ShardPlacementAccess
ShardPlacementAccessType * ShardPlacementAccessType *
conflictingAccessMode) conflictingAccessMode)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
Oid referencedRelation = InvalidOid; Oid referencedRelation = InvalidOid;
foreach_oid(referencedRelation, cacheEntry->referencedRelationsViaForeignKey) foreach_oid(referencedRelation, cacheEntry->referencedRelationsViaForeignKey)
@ -947,7 +947,7 @@ HoldsConflictingLockWithReferencingRelations(Oid relationId, ShardPlacementAcces
ShardPlacementAccessType * ShardPlacementAccessType *
conflictingAccessMode) conflictingAccessMode)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
bool holdsConflictingLocks = false; bool holdsConflictingLocks = false;
Assert(PartitionMethod(relationId) == DISTRIBUTE_BY_NONE); Assert(PartitionMethod(relationId) == DISTRIBUTE_BY_NONE);

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

@ -546,10 +546,10 @@ GetNextColocationId()
void void
CheckReplicationModel(Oid sourceRelationId, Oid targetRelationId) CheckReplicationModel(Oid sourceRelationId, Oid targetRelationId)
{ {
CitusTableCacheEntry *sourceTableEntry = LookupCitusTableCacheEntry(sourceRelationId); CitusTableCacheEntry *sourceTableEntry = GetCitusTableCacheEntry(sourceRelationId);
char sourceReplicationModel = sourceTableEntry->replicationModel; char sourceReplicationModel = sourceTableEntry->replicationModel;
CitusTableCacheEntry *targetTableEntry = LookupCitusTableCacheEntry(targetRelationId); CitusTableCacheEntry *targetTableEntry = GetCitusTableCacheEntry(targetRelationId);
char targetReplicationModel = targetTableEntry->replicationModel; char targetReplicationModel = targetTableEntry->replicationModel;
if (sourceReplicationModel != targetReplicationModel) if (sourceReplicationModel != targetReplicationModel)
@ -690,7 +690,7 @@ UpdateRelationColocationGroup(Oid distributedRelationId, uint32 colocationId)
uint32 uint32
TableColocationId(Oid distributedTableId) TableColocationId(Oid distributedTableId)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
return cacheEntry->colocationId; return cacheEntry->colocationId;
} }
@ -836,7 +836,7 @@ ColocatedShardIntervalList(ShardInterval *shardInterval)
Oid distributedTableId = shardInterval->relationId; Oid distributedTableId = shardInterval->relationId;
List *colocatedShardList = NIL; List *colocatedShardList = NIL;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
char partitionMethod = cacheEntry->partitionMethod; char partitionMethod = cacheEntry->partitionMethod;
/* /*
@ -864,7 +864,7 @@ ColocatedShardIntervalList(ShardInterval *shardInterval)
foreach_oid(colocatedTableId, colocatedTableList) foreach_oid(colocatedTableId, colocatedTableList)
{ {
CitusTableCacheEntry *colocatedTableCacheEntry = CitusTableCacheEntry *colocatedTableCacheEntry =
LookupCitusTableCacheEntry(colocatedTableId); GetCitusTableCacheEntry(colocatedTableId);
/* /*
* Since we iterate over co-located tables, shard count of each table should be * Since we iterate over co-located tables, shard count of each table should be
@ -966,7 +966,7 @@ ColocatedTableId(Oid colocationId)
uint64 uint64
ColocatedShardIdInRelation(Oid relationId, int shardIndex) ColocatedShardIdInRelation(Oid relationId, int shardIndex)
{ {
CitusTableCacheEntry *tableCacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *tableCacheEntry = GetCitusTableCacheEntry(relationId);
return tableCacheEntry->sortedShardIntervalArray[shardIndex]->shardId; return tableCacheEntry->sortedShardIntervalArray[shardIndex]->shardId;
} }

4
src/backend/distributed/utils/reference_table_utils.c
View File

@ -70,7 +70,7 @@ upgrade_to_reference_table(PG_FUNCTION_ARGS)
"create_reference_table('%s');", relationName))); "create_reference_table('%s');", relationName)));
} }
CitusTableCacheEntry *tableEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *tableEntry = GetCitusTableCacheEntry(relationId);
if (tableEntry->partitionMethod == DISTRIBUTE_BY_NONE) if (tableEntry->partitionMethod == DISTRIBUTE_BY_NONE)
{ {
@ -463,7 +463,7 @@ ReferenceTableOidList()
Oid relationId = InvalidOid; Oid relationId = InvalidOid;
foreach_oid(relationId, distTableOidList) foreach_oid(relationId, distTableOidList)
{ {
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE) if (cacheEntry->partitionMethod == DISTRIBUTE_BY_NONE)
{ {

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

@ -361,7 +361,7 @@ SetLocktagForShardDistributionMetadata(int64 shardId, LOCKTAG *tag)
{ {
ShardInterval *shardInterval = LoadShardInterval(shardId); ShardInterval *shardInterval = LoadShardInterval(shardId);
Oid citusTableId = shardInterval->relationId; Oid citusTableId = shardInterval->relationId;
CitusTableCacheEntry *citusTable = LookupCitusTableCacheEntry(citusTableId); CitusTableCacheEntry *citusTable = GetCitusTableCacheEntry(citusTableId);
uint32 colocationId = citusTable->colocationId; uint32 colocationId = citusTable->colocationId;
if (colocationId == INVALID_COLOCATION_ID || if (colocationId == INVALID_COLOCATION_ID ||
@ -390,7 +390,7 @@ LockReferencedReferenceShardDistributionMetadata(uint64 shardId, LOCKMODE lockMo
{ {
Oid relationId = RelationIdForShard(shardId); Oid relationId = RelationIdForShard(shardId);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
List *referencedRelationList = cacheEntry->referencedRelationsViaForeignKey; List *referencedRelationList = cacheEntry->referencedRelationsViaForeignKey;
List *shardIntervalList = GetSortedReferenceShardIntervals(referencedRelationList); List *shardIntervalList = GetSortedReferenceShardIntervals(referencedRelationList);
@ -420,7 +420,7 @@ LockReferencedReferenceShardResources(uint64 shardId, LOCKMODE lockMode)
{ {
Oid relationId = RelationIdForShard(shardId); Oid relationId = RelationIdForShard(shardId);
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
/* /*
* Note that referencedRelationsViaForeignKey contains transitively referenced * Note that referencedRelationsViaForeignKey contains transitively referenced

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

@ -239,7 +239,7 @@ ShardIndex(ShardInterval *shardInterval)
Oid distributedTableId = shardInterval->relationId; Oid distributedTableId = shardInterval->relationId;
Datum shardMinValue = shardInterval->minValue; Datum shardMinValue = shardInterval->minValue;
CitusTableCacheEntry *cacheEntry = LookupCitusTableCacheEntry(distributedTableId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(distributedTableId);
char partitionMethod = cacheEntry->partitionMethod; char partitionMethod = cacheEntry->partitionMethod;
/* /*

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

@ -125,7 +125,7 @@ extern bool ReferenceTableShardId(uint64 shardId);
extern ShardPlacement * FindShardPlacementOnGroup(int32 groupId, uint64 shardId); extern ShardPlacement * FindShardPlacementOnGroup(int32 groupId, uint64 shardId);
extern GroupShardPlacement * LoadGroupShardPlacement(uint64 shardId, uint64 placementId); extern GroupShardPlacement * LoadGroupShardPlacement(uint64 shardId, uint64 placementId);
extern ShardPlacement * LoadShardPlacement(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 extern DistObjectCacheEntry * LookupDistObjectCacheEntry(Oid classid, Oid objid, int32
objsubid); objsubid);
extern int32 GetLocalGroupId(void); extern int32 GetLocalGroupId(void);