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

Use cstore_table_size function to determine cstore table size (#1521) 

pg_table_size/pg_relation_size variants always return 0 for
cstore tables. We should be using cstore_table_size function
for cstore_tables.
pull/1523/head
Murat Tuncer 2017-07-27 09:02:07 -07:00 committed by GitHub
parent 32e16ffe02
commit 8729b7d55a
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,11 +86,16 @@ citus_total_relation_size(PG_FUNCTION_ARGS)
{ {
Oid relationId = PG_GETARG_OID(0); Oid relationId = PG_GETARG_OID(0);
uint64 totalRelationSize = 0; uint64 totalRelationSize = 0;
char *tableSizeFunction = PG_TOTAL_RELATION_SIZE_FUNCTION;
CheckCitusVersion(ERROR); CheckCitusVersion(ERROR);
totalRelationSize = DistributedTableSize(relationId, if (CStoreTable(relationId))
PG_TOTAL_RELATION_SIZE_FUNCTION); {
tableSizeFunction = CSTORE_TABLE_SIZE_FUNCTION;
}
totalRelationSize = DistributedTableSize(relationId, tableSizeFunction);
PG_RETURN_INT64(totalRelationSize); PG_RETURN_INT64(totalRelationSize);
} }
@ -105,10 +110,16 @@ citus_table_size(PG_FUNCTION_ARGS)
{ {
Oid relationId = PG_GETARG_OID(0); Oid relationId = PG_GETARG_OID(0);
uint64 tableSize = 0; uint64 tableSize = 0;
char *tableSizeFunction = PG_TABLE_SIZE_FUNCTION;
CheckCitusVersion(ERROR); CheckCitusVersion(ERROR);
tableSize = DistributedTableSize(relationId, PG_TABLE_SIZE_FUNCTION); if (CStoreTable(relationId))
{
tableSizeFunction = CSTORE_TABLE_SIZE_FUNCTION;
}
tableSize = DistributedTableSize(relationId, tableSizeFunction);
PG_RETURN_INT64(tableSize); PG_RETURN_INT64(tableSize);
} }
@ -123,10 +134,16 @@ citus_relation_size(PG_FUNCTION_ARGS)
{ {
Oid relationId = PG_GETARG_OID(0); Oid relationId = PG_GETARG_OID(0);
uint64 relationSize = 0; uint64 relationSize = 0;
char *tableSizeFunction = PG_RELATION_SIZE_FUNCTION;
CheckCitusVersion(ERROR); CheckCitusVersion(ERROR);
relationSize = DistributedTableSize(relationId, PG_RELATION_SIZE_FUNCTION); if (CStoreTable(relationId))
{
tableSizeFunction = CSTORE_TABLE_SIZE_FUNCTION;
}
relationSize = DistributedTableSize(relationId, tableSizeFunction);
PG_RETURN_INT64(relationSize); PG_RETURN_INT64(relationSize);
} }

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

@ -30,6 +30,7 @@
#define PG_TABLE_SIZE_FUNCTION "pg_table_size(%s)" #define PG_TABLE_SIZE_FUNCTION "pg_table_size(%s)"
#define PG_RELATION_SIZE_FUNCTION "pg_relation_size(%s)" #define PG_RELATION_SIZE_FUNCTION "pg_relation_size(%s)"
#define PG_TOTAL_RELATION_SIZE_FUNCTION "pg_total_relation_size(%s)" #define PG_TOTAL_RELATION_SIZE_FUNCTION "pg_total_relation_size(%s)"
#define CSTORE_TABLE_SIZE_FUNCTION "cstore_table_size(%s)"
#if (PG_VERSION_NUM < 100000) #if (PG_VERSION_NUM < 100000)
static inline void static inline void