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

DistributedTableSize doesn't emit oid when erring out

pull/1707/head
Brian Cloutier 2017-10-12 17:29:49 -07:00 committed by Brian Cloutier
parent 2aec6eda49
commit 58cf15ceca
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,8 +169,13 @@ DistributedTableSize(Oid relationId, char *sizeQuery)
" blocks which contain multi-shard data modifications")));
}
/* try to open relation, will error out if the relation does not exist */
relation = relation_open(relationId, AccessShareLock);
relation = try_relation_open(relationId, AccessShareLock);
if (relation == NULL)
{
ereport(ERROR,
(errmsg("could not compute table size: relation does not exist")));
}
ErrorIfNotSuitableToGetSize(relationId);

2
src/test/regress/expected/isolation_drop_vs_all.out
View File

@ -174,7 +174,7 @@ step s1-drop: DROP TABLE drop_hash;
step s2-table-size: SELECT citus_total_relation_size('drop_hash'); <waiting ...>
step s1-commit: COMMIT;
step s2-table-size: <... completed>
error in steps s1-commit s2-table-size: ERROR: could not open relation with OID 23227
error in steps s1-commit s2-table-size: ERROR: could not compute table size: relation does not exist
step s2-commit: COMMIT;
step s1-select-count: SELECT COUNT(*) FROM drop_hash;
ERROR: relation "drop_hash" does not exist

2
src/test/regress/expected/isolation_drop_vs_all_0.out
View File

@ -174,7 +174,7 @@ step s1-drop: DROP TABLE drop_hash;
step s2-table-size: SELECT citus_total_relation_size('drop_hash'); <waiting ...>
step s1-commit: COMMIT;
step s2-table-size: <... completed>
error in steps s1-commit s2-table-size: ERROR: could not open relation with OID 22183
error in steps s1-commit s2-table-size: ERROR: could not compute table size: relation does not exist
step s2-commit: COMMIT;
step s1-select-count: SELECT COUNT(*) FROM drop_hash;
ERROR: relation "drop_hash" does not exist

6
src/test/regress/expected/multi_size_queries.out
View File

@ -8,11 +8,11 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1390000;
ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1390000;
-- Tests with invalid relation IDs
SELECT citus_table_size(1);
ERROR: could not open relation with OID 1
ERROR: could not compute table size: relation does not exist
SELECT citus_relation_size(1);
ERROR: could not open relation with OID 1
ERROR: could not compute table size: relation does not exist
SELECT citus_total_relation_size(1);
ERROR: could not open relation with OID 1
ERROR: could not compute table size: relation does not exist
-- Tests with non-distributed table
CREATE TABLE non_distributed_table (x int);
SELECT citus_table_size('non_distributed_table');