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

Fix #6496 about citus index size 

I just enhanced the existing code to check if the relation is an index
belonging to a distributed table.
If so the shardId is appended to relation (index) name and the *_size
function are executed as before.

There is a change in an extern function:
  `extern StringInfo GenerateSizeQueryOnMultiplePlacements(...)`
It's possible to create a new function and deprecate this one later if
compatibility is an issue.
remotes/c2main/clean-6496
Cédric Villemain 2023-10-21 23:05:51 +02:00
parent 2c92cc08d7
commit 7d2eb738f0
3 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/backend/distributed/metadata/metadata_utility.c
View File

@ -24,6 +24,7 @@
#include "access/sysattr.h"
#include "access/xact.h"
#include "catalog/dependency.h"
#include "catalog/index.h"
#include "catalog/indexing.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_constraint.h"
@ -91,7 +92,7 @@ static GroupShardPlacement * TupleToGroupShardPlacement(TupleDesc tupleDesc,
static bool DistributedRelationSize(Oid relationId, SizeQueryType sizeQueryType,
bool failOnError, uint64 *relationSize);
static bool DistributedRelationSizeOnWorker(WorkerNode *workerNode,
Oid relationId,
Oid relationId, Oid indexId,
SizeQueryType sizeQueryType,
bool failOnError,
uint64 *relationSize);
@ -521,6 +522,11 @@ DistributedRelationSize(Oid relationId, SizeQueryType sizeQueryType,
{
int logLevel = WARNING;
/*
* By default we suppose we examine a table, not an index.
*/
Oid tableId = relationId;
if (failOnError)
{
logLevel = ERROR;
@ -548,7 +554,16 @@ DistributedRelationSize(Oid relationId, SizeQueryType sizeQueryType,
return false;
}
ErrorIfNotSuitableToGetSize(relationId);
/*
* If the relation is an index, update tableId and define indexId
*/
if (relation->rd_rel->relkind == RELKIND_INDEX)
{
indexId = relationId;
tableId = IndexGetRelation(relation->rd_id, false);
}
ErrorIfNotSuitableToGetSize(tableId);
table_close(relation, AccessShareLock);
@ -558,8 +573,8 @@ DistributedRelationSize(Oid relationId, SizeQueryType sizeQueryType,
{
uint64 relationSizeOnNode = 0;
bool gotSize = DistributedRelationSizeOnWorker(workerNode, relationId,
sizeQueryType,
bool gotSize = DistributedRelationSizeOnWorker(workerNode, tableId,
indexId, sizeQueryType,
failOnError, &relationSizeOnNode);
if (!gotSize)
{
@ -578,11 +593,11 @@ DistributedRelationSize(Oid relationId, SizeQueryType sizeQueryType,
/*
* DistributedRelationSizeOnWorker gets the workerNode and relationId to calculate
* size of that relation on the given workerNode by summing up the size of each
* shard placement.
* shard placement. If indexId is defined then the relation is an index.
*/
static bool
DistributedRelationSizeOnWorker(WorkerNode *workerNode, Oid relationId,
SizeQueryType sizeQueryType,
Oid indexId, SizeQueryType sizeQueryType,
bool failOnError, uint64 *relationSize)
{
int logLevel = WARNING;
@ -606,6 +621,7 @@ DistributedRelationSizeOnWorker(WorkerNode *workerNode, Oid relationId,
bool optimizePartitionCalculations = false;
StringInfo relationSizeQuery = GenerateSizeQueryOnMultiplePlacements(
shardIntervalsOnNode,
indexId,
sizeQueryType,
optimizePartitionCalculations);
@ -614,6 +630,15 @@ DistributedRelationSizeOnWorker(WorkerNode *workerNode, Oid relationId,
int queryResult = ExecuteOptionalRemoteCommand(connection, relationSizeQuery->data,
&result);
/*
* After this point, we don't need to keep relationId pointing to the table.
* So we swap with indexId if relevant, only for error log...
*/
if (indexId != InvalidOid)
{
relationId = indexId;
}
if (queryResult != 0)
{
ereport(logLevel, (errcode(ERRCODE_CONNECTION_FAILURE),
@ -749,6 +774,7 @@ ShardIntervalsOnWorkerGroup(WorkerNode *workerNode, Oid relationId)
*/
StringInfo
GenerateSizeQueryOnMultiplePlacements(List *shardIntervalList,
Oid indexId,
SizeQueryType sizeQueryType,
bool optimizePartitionCalculations)
{
@ -772,10 +798,20 @@ GenerateSizeQueryOnMultiplePlacements(List *shardIntervalList,
*/
continue;
}
/*
* We need to build the shard relation name, being an index or table ...
*/
Oid objectId = shardInterval->relationId;
if (indexId != InvalidOid)
{
objectId = indexId;
}
uint64 shardId = shardInterval->shardId;
Oid schemaId = get_rel_namespace(shardInterval->relationId);
Oid schemaId = get_rel_namespace(objectId);
char *schemaName = get_namespace_name(schemaId);
char *shardName = get_rel_name(shardInterval->relationId);
char *shardName = get_rel_name(objectId);
AppendShardIdToName(&shardName, shardId);
char *shardQualifiedName = quote_qualified_identifier(schemaName, shardName);

1
src/backend/distributed/operations/shard_transfer.c
View File

@ -793,6 +793,7 @@ ShardListSizeInBytes(List *shardList, char *workerNodeName, uint32
/* we skip child tables of a partitioned table if this boolean variable is true */
bool optimizePartitionCalculations = true;
StringInfo tableSizeQuery = GenerateSizeQueryOnMultiplePlacements(shardList,
InvalidOid,
TOTAL_RELATION_SIZE,
optimizePartitionCalculations);

1
src/include/distributed/metadata_utility.h
View File

@ -342,6 +342,7 @@ extern void LookupTaskPlacementHostAndPort(ShardPlacement *taskPlacement, char *
int *nodePort);
extern bool IsDummyPlacement(ShardPlacement *taskPlacement);
extern StringInfo GenerateSizeQueryOnMultiplePlacements(List *shardIntervalList,
Oid indexId,
SizeQueryType sizeQueryType,
bool optimizePartitionCalculations);
extern List * RemoveCoordinatorPlacementIfNotSingleNode(List *placementList);