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

Reorder checks to make them more actionable

velioglu/create_timeseries_table
Burak Velioglu 2021-08-22 22:39:54 +03:00
parent 20471d2a38
commit 993a2cbce9
No known key found for this signature in database
GPG Key ID: F6827E620F6549C6
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/backend/timeseries/create_timeseries_table.c
View File

@ -104,25 +104,12 @@ ErrorIfNotSuitableToConvertTimeseriesTable(Oid relationId, Interval *partitionIn
Interval *compressionThresholdInterval, Interval *compressionThresholdInterval,
Interval *retentionThresholdInterval) Interval *retentionThresholdInterval)
{ {
Relation pgPartitionedTableRelation; Relation pgPartitionedTableRelation = table_open(relationId, AccessShareLock);
PartitionKey partitionKey; PartitionKey partitionKey = RelationGetPartitionKey(pgPartitionedTableRelation);
if (!TableEmpty(relationId)) /* Table related checks */
{ if (!PartitionedTable(relationId) || partitionKey->strategy !=
ereport(ERROR, (errmsg("non-empty tables can not be converted to " PARTITION_STRATEGY_RANGE)
"timeseries table")));
}
if (!PartitionedTable(relationId))
{
ereport(ERROR, (errmsg("non-partitioned tables can not be converted "
"to timeseries table")));
}
pgPartitionedTableRelation = table_open(relationId, AccessShareLock);
partitionKey = RelationGetPartitionKey(pgPartitionedTableRelation);
if (partitionKey->strategy != PARTITION_STRATEGY_RANGE)
{ {
ereport(ERROR, (errmsg("table must be partitioned by range to convert " ereport(ERROR, (errmsg("table must be partitioned by range to convert "
"it to timeseries table"))); "it to timeseries table")));
@ -134,6 +121,13 @@ ErrorIfNotSuitableToConvertTimeseriesTable(Oid relationId, Interval *partitionIn
"convert it to timeseries table"))); "convert it to timeseries table")));
} }
if (!TableEmpty(relationId))
{
ereport(ERROR, (errmsg("table must be empty to convert it to "
"timeseries table")));
}
/* Timeseries parameter related checks */
if (!CheckIntervalAlignmentWithThresholds(partitionInterval, if (!CheckIntervalAlignmentWithThresholds(partitionInterval,
compressionThresholdInterval, compressionThresholdInterval,
retentionThresholdInterval)) retentionThresholdInterval))