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

indent

pull/6763/head
Halil Ozan Akgul 2023-03-06 17:24:06 +03:00
parent 4ebac440f9
commit 01eb68a7c9
6 changed files with 84 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,8 @@ RebuildQueryStrings(Job *workerJob)
{ {
partitionColumnValue = workerJob->partitionKeyValue->constvalue; partitionColumnValue = workerJob->partitionKeyValue->constvalue;
partitionColumnType = workerJob->partitionKeyValue->consttype; partitionColumnType = workerJob->partitionKeyValue->consttype;
partitionColumnString = DatumToString(partitionColumnValue, partitionColumnType); partitionColumnString = DatumToString(partitionColumnValue,
partitionColumnType);
} }
task->partitionColumn = partitionColumnString; task->partitionColumn = partitionColumnString;
@ -402,7 +403,8 @@ SetTaskQueryIfShouldLazyDeparse(Task *task, Query *query)
return; return;
} }
SetTaskQueryString(task, AnnotateQuery(DeparseTaskQuery(task, query), task->partitionColumn, task->colocationId)); SetTaskQueryString(task, AnnotateQuery(DeparseTaskQuery(task, query),
task->partitionColumn, task->colocationId));
} }

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

@ -170,7 +170,8 @@ static int CompareInsertValuesByShardId(const void *leftElement,
static List * SingleShardTaskList(Query *query, uint64 jobId, static List * SingleShardTaskList(Query *query, uint64 jobId,
List *relationShardList, List *placementList, List *relationShardList, List *placementList,
uint64 shardId, bool parametersInQueryResolved, uint64 shardId, bool parametersInQueryResolved,
bool isLocalTableModification, char * partitionColumn, int colocationId); bool isLocalTableModification, char *partitionColumn,
int colocationId);
static bool RowLocksOnRelations(Node *node, List **rtiLockList); static bool RowLocksOnRelations(Node *node, List **rtiLockList);
static void ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job, static void ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job,
TaskAssignmentPolicyType TaskAssignmentPolicyType
@ -1961,7 +1962,8 @@ GenerateSingleShardRouterTaskList(Job *job, List *relationShardList,
{ {
partitionColumnValue = job->partitionKeyValue->constvalue; partitionColumnValue = job->partitionKeyValue->constvalue;
partitionColumnType = job->partitionKeyValue->consttype; partitionColumnType = job->partitionKeyValue->consttype;
partitionColumnString = DatumToString(partitionColumnValue, partitionColumnType); partitionColumnString = DatumToString(partitionColumnValue,
partitionColumnType);
} }
SetJobColocationId(job); SetJobColocationId(job);
@ -1970,7 +1972,8 @@ GenerateSingleShardRouterTaskList(Job *job, List *relationShardList,
relationShardList, placementList, relationShardList, placementList,
shardId, shardId,
job->parametersInJobQueryResolved, job->parametersInJobQueryResolved,
isLocalTableModification, partitionColumnString, job->colocationId); isLocalTableModification,
partitionColumnString, job->colocationId);
/* /*
* Queries to reference tables, or distributed tables with multiple replica's have * Queries to reference tables, or distributed tables with multiple replica's have
@ -2092,7 +2095,8 @@ static List *
SingleShardTaskList(Query *query, uint64 jobId, List *relationShardList, SingleShardTaskList(Query *query, uint64 jobId, List *relationShardList,
List *placementList, uint64 shardId, List *placementList, uint64 shardId,
bool parametersInQueryResolved, bool parametersInQueryResolved,
bool isLocalTableModification, char * partitionColumn, int colocationId) bool isLocalTableModification, char *partitionColumn,
int colocationId)
{ {
TaskType taskType = READ_TASK; TaskType taskType = READ_TASK;
char replicationModel = 0; char replicationModel = 0;

2
src/backend/distributed/shared_library_init.c
View File

@ -1903,7 +1903,7 @@ RegisterCitusConfigVariables(void)
PGC_USERSET, PGC_USERSET,
GUC_STANDARD, GUC_STANDARD,
NULL, NULL, NULL); NULL, NULL, NULL);
DefineCustomEnumVariable( DefineCustomEnumVariable(
"citus.multi_tenant_monitoring_log_level", "citus.multi_tenant_monitoring_log_level",
gettext_noop("Sets the level of multi tenant monitoring log messages"), gettext_noop("Sets the level of multi tenant monitoring log messages"),

116
src/backend/distributed/utils/attribute.c
View File

@ -44,8 +44,10 @@ const char *SharedMemoryNameForMultiTenantMonitor =
static shmem_startup_hook_type prev_shmem_startup_hook = NULL; static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
static void UpdatePeriodsIfNecessary(MultiTenantMonitor *monitor,TenantStats *tenantStats); static void UpdatePeriodsIfNecessary(MultiTenantMonitor *monitor,
static void ReduceScoreIfNecessary(MultiTenantMonitor *monitor, TenantStats *tenantStats, time_t updateTime); TenantStats *tenantStats);
static void ReduceScoreIfNecessary(MultiTenantMonitor *monitor, TenantStats *tenantStats,
time_t updateTime);
static void CreateMultiTenantMonitor(void); static void CreateMultiTenantMonitor(void);
static MultiTenantMonitor * CreateSharedMemoryForMultiTenantMonitor(void); static MultiTenantMonitor * CreateSharedMemoryForMultiTenantMonitor(void);
static MultiTenantMonitor * GetMultiTenantMonitor(void); static MultiTenantMonitor * GetMultiTenantMonitor(void);
@ -68,7 +70,7 @@ PG_FUNCTION_INFO_V1(citus_stats_tenants);
Datum Datum
citus_stats_tenants(PG_FUNCTION_ARGS) citus_stats_tenants(PG_FUNCTION_ARGS)
{ {
//CheckCitusVersion(ERROR); /*CheckCitusVersion(ERROR); */
/* /*
* We keep more than CitusStatsTenantsLimit tenants in our monitor. * We keep more than CitusStatsTenantsLimit tenants in our monitor.
@ -93,7 +95,9 @@ citus_stats_tenants(PG_FUNCTION_ARGS)
LWLockAcquire(&monitor->lock, LW_EXCLUSIVE); LWLockAcquire(&monitor->lock, LW_EXCLUSIVE);
monitor->periodStart = monitor->periodStart + ((monitoringTime-monitor->periodStart)/CitusStatsTenantsPeriod)*CitusStatsTenantsPeriod; monitor->periodStart = monitor->periodStart +
((monitoringTime - monitor->periodStart) / CitusStatsTenantsPeriod) *
CitusStatsTenantsPeriod;
int numberOfRowsToReturn = 0; int numberOfRowsToReturn = 0;
if (returnAllTenants) if (returnAllTenants)
@ -102,10 +106,10 @@ citus_stats_tenants(PG_FUNCTION_ARGS)
} }
else else
{ {
numberOfRowsToReturn = Min (monitor->tenantCount, CitusStatsTenantsLimit); numberOfRowsToReturn = Min(monitor->tenantCount, CitusStatsTenantsLimit);
} }
for (int i=0; i<numberOfRowsToReturn; i++) for (int i = 0; i < numberOfRowsToReturn; i++)
{ {
memset(values, 0, sizeof(values)); memset(values, 0, sizeof(values));
memset(isNulls, false, sizeof(isNulls)); memset(isNulls, false, sizeof(isNulls));
@ -119,8 +123,10 @@ citus_stats_tenants(PG_FUNCTION_ARGS)
values[1] = PointerGetDatum(cstring_to_text(tenantStats->tenantAttribute)); values[1] = PointerGetDatum(cstring_to_text(tenantStats->tenantAttribute));
values[2] = Int32GetDatum(tenantStats->selectsInThisPeriod); values[2] = Int32GetDatum(tenantStats->selectsInThisPeriod);
values[3] = Int32GetDatum(tenantStats->selectsInLastPeriod); values[3] = Int32GetDatum(tenantStats->selectsInLastPeriod);
values[4] = Int32GetDatum(tenantStats->selectsInThisPeriod + tenantStats->insertsInThisPeriod); values[4] = Int32GetDatum(tenantStats->selectsInThisPeriod +
values[5] = Int32GetDatum(tenantStats->selectsInLastPeriod + tenantStats->insertsInLastPeriod); tenantStats->insertsInThisPeriod);
values[5] = Int32GetDatum(tenantStats->selectsInLastPeriod +
tenantStats->insertsInLastPeriod);
values[6] = Int64GetDatum(tenantStats->score); values[6] = Int64GetDatum(tenantStats->score);
tuplestore_putvalues(tupleStore, tupleDescriptor, values, isNulls); tuplestore_putvalues(tupleStore, tupleDescriptor, values, isNulls);
@ -151,7 +157,7 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
{ {
/* TODO create a function to safely parse the tenant identifier from the query comment */ /* TODO create a function to safely parse the tenant identifier from the query comment */
/* query is attributed to a tenant */ /* query is attributed to a tenant */
char *tenantId = (char*)query_string + strlen(ATTRIBUTE_PREFIX); char *tenantId = (char *) query_string + strlen(ATTRIBUTE_PREFIX);
char *tenantEnd = tenantId; char *tenantEnd = tenantId;
while (true && tenantEnd[0] != '\0') while (true && tenantEnd[0] != '\0')
{ {
@ -165,7 +171,7 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
tenantEnd--; tenantEnd--;
colocationGroupId = 0; colocationGroupId = 0;
while(*tenantEnd != ',') while (*tenantEnd != ',')
{ {
colocationGroupId *= 10; colocationGroupId *= 10;
colocationGroupId += *tenantEnd - '0'; colocationGroupId += *tenantEnd - '0';
@ -180,10 +186,11 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
if (MultiTenantMonitoringLogLevel != CITUS_LOG_LEVEL_OFF) if (MultiTenantMonitoringLogLevel != CITUS_LOG_LEVEL_OFF)
{ {
ereport(NOTICE, (errmsg("attributing query to tenant: %s", quote_literal_cstr(tenantId)))); ereport(NOTICE, (errmsg("attributing query to tenant: %s",
quote_literal_cstr(tenantId))));
} }
attributeToTenant=(char *)malloc(strlen(tenantId)); attributeToTenant = (char *) malloc(strlen(tenantId));
strcpy(attributeToTenant, tenantId); strcpy(attributeToTenant, tenantId);
} }
else else
@ -191,7 +198,7 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
Assert(attributeToTenant == NULL); Assert(attributeToTenant == NULL);
} }
//DetachSegment(); /*DetachSegment(); */
attributeToTenantStart = clock(); attributeToTenantStart = clock();
} }
@ -201,7 +208,7 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
* AnnotateQuery annotates the query with tenant attributes. * AnnotateQuery annotates the query with tenant attributes.
*/ */
char * char *
AnnotateQuery (char * queryString, char * partitionColumn, int colocationId) AnnotateQuery(char *queryString, char *partitionColumn, int colocationId)
{ {
if (partitionColumn == NULL) if (partitionColumn == NULL)
{ {
@ -254,15 +261,17 @@ AttributeMetricsIfApplicable()
if (MultiTenantMonitoringLogLevel != CITUS_LOG_LEVEL_OFF) if (MultiTenantMonitoringLogLevel != CITUS_LOG_LEVEL_OFF)
{ {
ereport(NOTICE, (errmsg("attribute cpu counter (%f) to tenant: %s", cpu_time_used, ereport(NOTICE, (errmsg("attribute cpu counter (%f) to tenant: %s",
attributeToTenant))); cpu_time_used, attributeToTenant)));
} }
MultiTenantMonitor *monitor = GetMultiTenantMonitor(); MultiTenantMonitor *monitor = GetMultiTenantMonitor();
LWLockAcquire(&monitor->lock, LW_SHARED); LWLockAcquire(&monitor->lock, LW_SHARED);
monitor->periodStart = monitor->periodStart + ((queryTime-monitor->periodStart)/CitusStatsTenantsPeriod)*CitusStatsTenantsPeriod; monitor->periodStart = monitor->periodStart +
((queryTime - monitor->periodStart) / CitusStatsTenantsPeriod) *
CitusStatsTenantsPeriod;
int tenantIndex = FindTenantStats(monitor); int tenantIndex = FindTenantStats(monitor);
@ -270,7 +279,7 @@ AttributeMetricsIfApplicable()
{ {
tenantIndex = CreateTenantStats(monitor); tenantIndex = CreateTenantStats(monitor);
} }
TenantStats * tenantStats = &monitor->tenants[tenantIndex]; TenantStats *tenantStats = &monitor->tenants[tenantIndex];
LWLockAcquire(&tenantStats->lock, LW_EXCLUSIVE); LWLockAcquire(&tenantStats->lock, LW_EXCLUSIVE);
@ -288,17 +297,18 @@ AttributeMetricsIfApplicable()
/* /*
* After updating the score we might need to change the rank of the tenant in the monitor * After updating the score we might need to change the rank of the tenant in the monitor
*/ */
while(tenantIndex != 0 && monitor->tenants[tenantIndex-1].score < tenantStats->score) while (tenantIndex != 0 &&
monitor->tenants[tenantIndex - 1].score < tenantStats->score)
{ {
LWLockAcquire(&monitor->tenants[tenantIndex-1].lock, LW_EXCLUSIVE); LWLockAcquire(&monitor->tenants[tenantIndex - 1].lock, LW_EXCLUSIVE);
ReduceScoreIfNecessary(monitor, monitor->tenants[tenantIndex - 1], queryTime);
ReduceScoreIfNecessary(monitor, monitor->tenants[tenantIndex-1], queryTime);
TenantStats tempTenant = monitor->tenants[tenantIndex]; TenantStats tempTenant = monitor->tenants[tenantIndex];
monitor->tenants[tenantIndex] = monitor->tenants[tenantIndex - 1]; monitor->tenants[tenantIndex] = monitor->tenants[tenantIndex - 1];
monitor->tenants[tenantIndex - 1] = tempTenant; monitor->tenants[tenantIndex - 1] = tempTenant;
LWLockRelease(&monitor->tenants[tenantIndex-1].lock); LWLockRelease(&monitor->tenants[tenantIndex - 1].lock);
tenantIndex--; tenantIndex--;
} }
@ -307,13 +317,13 @@ AttributeMetricsIfApplicable()
{ {
tenantStats->selectCount++; tenantStats->selectCount++;
tenantStats->selectsInThisPeriod++; tenantStats->selectsInThisPeriod++;
tenantStats->totalSelectTime+=cpu_time_used; tenantStats->totalSelectTime += cpu_time_used;
} }
else if (attributeCommandType == CMD_INSERT) else if (attributeCommandType == CMD_INSERT)
{ {
tenantStats->insertCount++; tenantStats->insertCount++;
tenantStats->insertsInThisPeriod++; tenantStats->insertsInThisPeriod++;
tenantStats->totalInsertTime+=cpu_time_used; tenantStats->totalInsertTime += cpu_time_used;
} }
LWLockRelease(&tenantStats->lock); LWLockRelease(&tenantStats->lock);
@ -322,7 +332,7 @@ AttributeMetricsIfApplicable()
/* /*
* We keep up to CitusStatsTenantsLimit * 3 tenants instead of CitusStatsTenantsLimit, * We keep up to CitusStatsTenantsLimit * 3 tenants instead of CitusStatsTenantsLimit,
* so we don't lose data immediately after a tenant is out of top CitusStatsTenantsLimit * so we don't lose data immediately after a tenant is out of top CitusStatsTenantsLimit
* *
* Every time tenant count hits CitusStatsTenantsLimit * 3, we reduce it back to CitusStatsTenantsLimit * 2. * Every time tenant count hits CitusStatsTenantsLimit * 3, we reduce it back to CitusStatsTenantsLimit * 2.
*/ */
if (monitor->tenantCount >= CitusStatsTenantsLimit * 3) if (monitor->tenantCount >= CitusStatsTenantsLimit * 3)
@ -334,8 +344,9 @@ AttributeMetricsIfApplicable()
if (MultiTenantMonitoringLogLevel != CITUS_LOG_LEVEL_OFF) if (MultiTenantMonitoringLogLevel != CITUS_LOG_LEVEL_OFF)
{ {
ereport(NOTICE, (errmsg("total select count = %d, total CPU time = %f to tenant: %s", tenantStats->selectCount, tenantStats->totalSelectTime, ereport(NOTICE, (errmsg("total select count = %d, total CPU time = %f to tenant: %s",
tenantStats->tenantAttribute))); tenantStats->selectCount, tenantStats->totalSelectTime,
tenantStats->tenantAttribute)));
} }
} }
attributeToTenant = NULL; attributeToTenant = NULL;
@ -344,35 +355,37 @@ AttributeMetricsIfApplicable()
/* /*
* UpdatePeriodsIfNecessary moves the query counts to previous periods if a enough time has passed. * UpdatePeriodsIfNecessary moves the query counts to previous periods if a enough time has passed.
* *
* If 1 period has passed after the latest query, this function moves this period's counts to the last period * If 1 period has passed after the latest query, this function moves this period's counts to the last period
* and cleans this period's statistics. * and cleans this period's statistics.
* *
* If 2 or more periods has passed after the last query, this function cleans all both this and last period's * If 2 or more periods has passed after the last query, this function cleans all both this and last period's
* statistics. * statistics.
*/ */
static void static void
UpdatePeriodsIfNecessary(MultiTenantMonitor *monitor,TenantStats *tenantStats) UpdatePeriodsIfNecessary(MultiTenantMonitor *monitor, TenantStats *tenantStats)
{ {
/* /*
* If the last query in this tenant was before the start of current period * If the last query in this tenant was before the start of current period
* but there are some query count for this period we move them to the last period. * but there are some query count for this period we move them to the last period.
*/ */
if (tenantStats->lastQueryTime < monitor->periodStart && (tenantStats->insertsInThisPeriod || tenantStats->selectsInThisPeriod)) if (tenantStats->lastQueryTime < monitor->periodStart &&
(tenantStats->insertsInThisPeriod || tenantStats->selectsInThisPeriod))
{ {
tenantStats->insertsInLastPeriod = tenantStats->insertsInThisPeriod; tenantStats->insertsInLastPeriod = tenantStats->insertsInThisPeriod;
tenantStats->insertsInThisPeriod = 0; tenantStats->insertsInThisPeriod = 0;
tenantStats->selectsInLastPeriod = tenantStats->selectsInThisPeriod; tenantStats->selectsInLastPeriod = tenantStats->selectsInThisPeriod;
tenantStats->selectsInThisPeriod = 0; tenantStats->selectsInThisPeriod = 0;
} }
/* /*
* If the last query is more than two periods ago, we clean the last period counts too. * If the last query is more than two periods ago, we clean the last period counts too.
*/ */
if (tenantStats->lastQueryTime < monitor->periodStart - CitusStatsTenantsPeriod) if (tenantStats->lastQueryTime < monitor->periodStart - CitusStatsTenantsPeriod)
{ {
tenantStats->insertsInLastPeriod = 0; tenantStats->insertsInLastPeriod = 0;
tenantStats->selectsInLastPeriod = 0; tenantStats->selectsInLastPeriod = 0;
} }
} }
@ -381,21 +394,25 @@ UpdatePeriodsIfNecessary(MultiTenantMonitor *monitor,TenantStats *tenantStats)
/* /*
* ReduceScoreIfNecessary reduces the tenant score only if it is necessary. * ReduceScoreIfNecessary reduces the tenant score only if it is necessary.
* *
* We halve the tenants' scores after each period. This function checks the number of * We halve the tenants' scores after each period. This function checks the number of
* periods that passed after the lsat score reduction and reduces the score accordingly. * periods that passed after the lsat score reduction and reduces the score accordingly.
*/ */
static void static void
ReduceScoreIfNecessary(MultiTenantMonitor *monitor, TenantStats *tenantStats, time_t updateTime) ReduceScoreIfNecessary(MultiTenantMonitor *monitor, TenantStats *tenantStats,
time_t updateTime)
{ {
/* /*
* With each query we increase the score of tenant by ONE_QUERY_SCORE. * With each query we increase the score of tenant by ONE_QUERY_SCORE.
* After one period we halve the scores. * After one period we halve the scores.
* *
* Here we calculate how many periods passed after the last time we did score reduction * Here we calculate how many periods passed after the last time we did score reduction
* If the latest score reduction was in this period this number should be 0, * If the latest score reduction was in this period this number should be 0,
* if it was in the last period this number should be 1 and so on. * if it was in the last period this number should be 1 and so on.
*/ */
int periodCountAfterLastScoreReduction = (monitor->periodStart - tenantStats->lastScoreReduction + CitusStatsTenantsPeriod -1) / CitusStatsTenantsPeriod; int periodCountAfterLastScoreReduction = (monitor->periodStart -
tenantStats->lastScoreReduction +
CitusStatsTenantsPeriod - 1) /
CitusStatsTenantsPeriod;
/* /*
* This should not happen but let's make sure * This should not happen but let's make sure
@ -422,7 +439,7 @@ ReduceScoreIfNecessary(MultiTenantMonitor *monitor, TenantStats *tenantStats, ti
static void static void
CreateMultiTenantMonitor() CreateMultiTenantMonitor()
{ {
MultiTenantMonitor * monitor = CreateSharedMemoryForMultiTenantMonitor(); MultiTenantMonitor *monitor = CreateSharedMemoryForMultiTenantMonitor();
monitor->tenantCount = 0; monitor->tenantCount = 0;
monitor->periodStart = time(0); monitor->periodStart = time(0);
} }
@ -431,7 +448,7 @@ CreateMultiTenantMonitor()
/* /*
* CreateSharedMemoryForMultiTenantMonitor creates a dynamic shared memory segment for multi tenant monitor. * CreateSharedMemoryForMultiTenantMonitor creates a dynamic shared memory segment for multi tenant monitor.
*/ */
static MultiTenantMonitor* static MultiTenantMonitor *
CreateSharedMemoryForMultiTenantMonitor() CreateSharedMemoryForMultiTenantMonitor()
{ {
bool found = false; bool found = false;
@ -443,7 +460,7 @@ CreateSharedMemoryForMultiTenantMonitor()
return monitor; return monitor;
} }
char * trancheName = "Multi Tenant Monitor Tranche"; char *trancheName = "Multi Tenant Monitor Tranche";
monitor->namedLockTranche.trancheId = LWLockNewTrancheId(); monitor->namedLockTranche.trancheId = LWLockNewTrancheId();
@ -516,12 +533,14 @@ CreateTenantStats(MultiTenantMonitor *monitor)
strcpy(monitor->tenants[tenantIndex].tenantAttribute, attributeToTenant); strcpy(monitor->tenants[tenantIndex].tenantAttribute, attributeToTenant);
monitor->tenants[tenantIndex].colocationGroupId = colocationGroupId; monitor->tenants[tenantIndex].colocationGroupId = colocationGroupId;
char * trancheName = "Tenant Tranche"; char *trancheName = "Tenant Tranche";
monitor->tenants[tenantIndex].namedLockTranche.trancheId = LWLockNewTrancheId(); monitor->tenants[tenantIndex].namedLockTranche.trancheId = LWLockNewTrancheId();
LWLockRegisterTranche(monitor->tenants[tenantIndex].namedLockTranche.trancheId, trancheName); LWLockRegisterTranche(monitor->tenants[tenantIndex].namedLockTranche.trancheId,
LWLockInitialize(&monitor->tenants[tenantIndex].lock, monitor->tenants[tenantIndex].namedLockTranche.trancheId); trancheName);
LWLockInitialize(&monitor->tenants[tenantIndex].lock,
monitor->tenants[tenantIndex].namedLockTranche.trancheId);
monitor->tenantCount++; monitor->tenantCount++;
@ -535,10 +554,11 @@ CreateTenantStats(MultiTenantMonitor *monitor)
static int static int
FindTenantStats(MultiTenantMonitor *monitor) FindTenantStats(MultiTenantMonitor *monitor)
{ {
for(int i=0; i<monitor->tenantCount; i++) for (int i = 0; i < monitor->tenantCount; i++)
{ {
TenantStats * tenantStats = &monitor->tenants[i]; TenantStats *tenantStats = &monitor->tenants[i];
if (strcmp(tenantStats->tenantAttribute, attributeToTenant) == 0 && tenantStats->colocationGroupId == colocationGroupId) if (strcmp(tenantStats->tenantAttribute, attributeToTenant) == 0 &&
tenantStats->colocationGroupId == colocationGroupId)
{ {
return i; return i;
} }

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

@ -331,7 +331,7 @@ typedef struct Task
*/ */
bool cannotBeExecutedInTransction; bool cannotBeExecutedInTransction;
char * partitionColumn; char *partitionColumn;
int colocationId; int colocationId;
} Task; } Task;

4
src/include/distributed/utils/attribute.h
View File

@ -55,7 +55,7 @@ typedef struct MultiTenantMonitor
extern void CitusAttributeToEnd(QueryDesc *queryDesc); extern void CitusAttributeToEnd(QueryDesc *queryDesc);
extern void AttributeQueryIfAnnotated(const char *queryString, CmdType commandType); extern void AttributeQueryIfAnnotated(const char *queryString, CmdType commandType);
extern char * AnnotateQuery(char *queryString, char * partitionColumn, int colocationId); extern char * AnnotateQuery(char *queryString, char *partitionColumn, int colocationId);
extern void InitializeMultiTenantMonitorSMHandleManagement(void); extern void InitializeMultiTenantMonitorSMHandleManagement(void);
extern ExecutorEnd_hook_type prev_ExecutorEnd; extern ExecutorEnd_hook_type prev_ExecutorEnd;
@ -64,4 +64,4 @@ extern int MultiTenantMonitoringLogLevel;
extern int CitusStatsTenantsPeriod; extern int CitusStatsTenantsPeriod;
extern int CitusStatsTenantsLimit; extern int CitusStatsTenantsLimit;
#endif //CITUS_ATTRIBUTE_H #endif /*CITUS_ATTRIBUTE_H */