postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-17 11:03:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix planner distributed table count

Browse Source 
The check for a distributed hypertable was done after ht had been
changed to the compressed hypertable potentially leading to miscount
or even segfault when the cache lookup for the compressed hypertable
returned NULL.
This commit is contained in:
Sven Klemm 2023-09-25 10:01:38 +02:00 committed by Sven Klemm
parent d9e4a71af3
commit 727a0278fd
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.unreleased/pr_6113 Normal file
View File

@ -0,0 +1,3 @@
Fixes: #6113 Fix planner distributed table count
Thanks: @symbx for reporting a crash when selecting from empty hypertables

13
src/planner/planner.c
View File

@ -388,19 +388,18 @@ preprocess_query(Node *node, PreprocessQueryContext *context)
query->rowMarks == NIL && rte->inh)
rte_mark_for_expansion(rte);
if (hypertable_is_distributed(ht))
{
context->num_distributed_tables++;
}
if (TS_HYPERTABLE_HAS_COMPRESSION_TABLE(ht))
{
int compr_htid = ht->fd.compressed_hypertable_id;
/* Also warm the cache with the compressed
* companion hypertable */
ht = ts_hypertable_cache_get_entry_by_id(hcache, compr_htid);
Assert(ht != NULL);
}
if (hypertable_is_distributed(ht))
{
context->num_distributed_tables++;
ts_hypertable_cache_get_entry_by_id(hcache, compr_htid);
}
}
else