Skip to content

Backport to 2.24.x: #8988: Don't ignore additional filters on same column when building scankeys #8992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2025
+142 −41
Merged

Backport to 2.24.x: #8988: Don't ignore additional filters on same column when building scankeys #8992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40b3f75
Don't ignore additional filters on same column when building scankeys
svenklemm Nov 27, 2025
6a112ee
Merge remote-tracking branch 'origin/2.24.x' into HEAD
timescale-automation Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .unreleased/pr_8988
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes: #8988 Don't ignore additional filters on same column when building scankeys
1 change: 0 additions & 1 deletion tsl/src/compression/compression_scankey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ build_index_scankeys(Relation index_rel, List *index_filters, int *num_scankeys)
filter->collation,
filter->opcode,
filter->value ? filter->value->constvalue : 0);
break;
}
}
}
Expand Down
75 changes: 75 additions & 0 deletions tsl/test/shared/expected/compression_dml.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,3 +933,78 @@ ROLLBACK;
DEALLOCATE prep;
DROP TABLE t8241 cascade;
RESET plan_cache_mode;
-- test multiple constraints on same column
BEGIN; EXPLAIN (analyze, buffers off, costs off, timing off, summary off) DELETE FROM metrics_compressed where device_id IS NOT NULL AND device_id = 1;ROLLBACK;
--- QUERY PLAN ---
Custom Scan (ModifyHypertable) (actual rows=0.00 loops=1)
Batches decompressed: 14
Tuples decompressed: 12076
-> Delete on metrics_compressed (actual rows=0.00 loops=1)
Delete on _hyper_X_X_chunk metrics_compressed_1
Delete on _hyper_X_X_chunk metrics_compressed_2
Delete on _hyper_X_X_chunk metrics_compressed_3
-> Append (actual rows=13674.00 loops=1)
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_1 (actual rows=3598.00 loops=1)
Filter: ((device_id IS NOT NULL) AND (device_id = 1))
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_2 (actual rows=5038.00 loops=1)
Filter: ((device_id IS NOT NULL) AND (device_id = 1))
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_3 (actual rows=5038.00 loops=1)
Filter: ((device_id IS NOT NULL) AND (device_id = 1))

BEGIN; EXPLAIN (analyze, buffers off, costs off, timing off, summary off) DELETE FROM metrics_compressed where device_id <> 1 AND device_id <> 2;ROLLBACK;
--- QUERY PLAN ---
Custom Scan (ModifyHypertable) (actual rows=0.00 loops=1)
Batches decompressed: 48
Tuples decompressed: 41022
-> Delete on metrics_compressed (actual rows=0.00 loops=1)
Delete on _hyper_X_X_chunk metrics_compressed_1
Delete on _hyper_X_X_chunk metrics_compressed_2
Delete on _hyper_X_X_chunk metrics_compressed_3
-> Append (actual rows=41022.00 loops=1)
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_1 (actual rows=10794.00 loops=1)
Filter: ((device_id <> 1) AND (device_id <> 2))
Rows Removed by Filter: 1598
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_2 (actual rows=15114.00 loops=1)
Filter: ((device_id <> 1) AND (device_id <> 2))
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_3 (actual rows=15114.00 loops=1)
Filter: ((device_id <> 1) AND (device_id <> 2))

BEGIN; EXPLAIN (analyze, buffers off, costs off, timing off, summary off) DELETE FROM metrics_compressed where device_id > 1 AND device_id < 3;ROLLBACK;
--- QUERY PLAN ---
Custom Scan (ModifyHypertable) (actual rows=0.00 loops=1)
Batches decompressed: 16
Tuples decompressed: 13674
-> Delete on metrics_compressed (actual rows=0.00 loops=1)
Delete on _hyper_X_X_chunk metrics_compressed_1
Delete on _hyper_X_X_chunk metrics_compressed_2
Delete on _hyper_X_X_chunk metrics_compressed_3
-> Append (actual rows=13674.00 loops=1)
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk metrics_compressed_1 (actual rows=3598.00 loops=1)
Index Cond: ((device_id > 1) AND (device_id < 3))
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_2 (actual rows=5038.00 loops=1)
Filter: ((device_id > 1) AND (device_id < 3))
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_3 (actual rows=5038.00 loops=1)
Filter: ((device_id > 1) AND (device_id < 3))

BEGIN; EXPLAIN (analyze, buffers off, costs off, timing off, summary off) DELETE FROM metrics_compressed where v3 IS NOT NULL AND device_id IS NOT NULL AND device_id = 1;ROLLBACK;
--- QUERY PLAN ---
Custom Scan (ModifyHypertable) (actual rows=0.00 loops=1)
Batches decompressed: 14
Tuples decompressed: 12076
-> Delete on metrics_compressed (actual rows=0.00 loops=1)
Delete on _hyper_X_X_chunk metrics_compressed_1
Delete on _hyper_X_X_chunk metrics_compressed_2
Delete on _hyper_X_X_chunk metrics_compressed_3
-> Append (actual rows=719.00 loops=1)
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_1 (actual rows=719.00 loops=1)
Filter: ((v3 IS NOT NULL) AND (device_id IS NOT NULL) AND (device_id = 1))
Rows Removed by Filter: 2879
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_2 (actual rows=0.00 loops=1)
Filter: ((v3 IS NOT NULL) AND (device_id IS NOT NULL) AND (device_id = 1))
Rows Removed by Filter: 5038
-> Seq Scan on _hyper_X_X_chunk metrics_compressed_3 (actual rows=0.00 loops=1)
Filter: ((v3 IS NOT NULL) AND (device_id IS NOT NULL) AND (device_id = 1))
Rows Removed by Filter: 5038

-- clean up dml artefacts to prevent plan switches on subsequent tests
VACUUM FULL ANALYZE metrics_compressed;
24 changes: 14 additions & 10 deletions tsl/test/shared/expected/transparent_decompress_chunk-15.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ ORDER BY time, device_id;
Append (actual rows=0.00 loops=1)
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id < 0)
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id < 0)
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id < 0)
Rows Removed by Filter: 18
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id < 0)

Expand Down Expand Up @@ -232,8 +233,9 @@ ORDER BY time, device_id;
-> Append (actual rows=0.00 loops=1)
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id IS NULL)
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id IS NULL)
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id IS NULL)
Rows Removed by Filter: 18
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id IS NULL)

Expand Down Expand Up @@ -694,9 +696,9 @@ SET enable_seqscan TO FALSE;
-> Index Scan Backward using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on _timescaledb_internal.compress_hyper_X_X_chunk (actual rows=2.00 loops=1)
Output: compress_hyper_X_X_chunk."time", compress_hyper_X_X_chunk._ts_meta_min_1, compress_hyper_X_X_chunk._ts_meta_max_1, compress_hyper_X_X_chunk.device_id, compress_hyper_X_X_chunk._ts_meta_count
Index Cond: (compress_hyper_X_X_chunk.device_id = 1)
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _timescaledb_internal._hyper_X_X_chunk (actual rows=1598.00 loops=1)
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_time_idx on _timescaledb_internal._hyper_X_X_chunk (actual rows=1598.00 loops=1)
Output: _hyper_X_X_chunk."time", _hyper_X_X_chunk.device_id
Index Cond: (_hyper_X_X_chunk.device_id = 1)
Filter: (_hyper_X_X_chunk.device_id = 1)

-- globs should not plan IndexOnlyScans
:PREFIX_VERBOSE SELECT * FROM :TEST_TABLE WHERE device_id = 1 ORDER BY device_id, time;
Expand Down Expand Up @@ -1229,8 +1231,9 @@ FROM generate_series('2000-01-01'::timestamptz, '2000-02-01'::timestamptz, '1d':
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk m1 (actual rows=0.00 loops=32)
Filter: (("time" = g."time") AND (device_id = $1))
Rows Removed by Filter: 50
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Index Cond: ((device_id = $1) AND (_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time"))
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Filter: ((_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time") AND (device_id = $1))
Rows Removed by Filter: 16
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk m1 (actual rows=0.00 loops=29)
Index Cond: ((device_id = $1) AND ("time" = g."time"))

Expand All @@ -1243,8 +1246,9 @@ FROM generate_series('2000-01-01'::timestamptz, '2000-02-01'::timestamptz, '1d':
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk m1 (actual rows=0.00 loops=32)
Filter: (("time" = g."time") AND (device_id = $1))
Rows Removed by Filter: 81
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Index Cond: ((device_id = $1) AND (_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time"))
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Filter: ((_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time") AND (device_id = $1))
Rows Removed by Filter: 16
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk m1 (actual rows=0.00 loops=27)
Index Cond: ((device_id = $1) AND ("time" = g."time"))

Expand Down
24 changes: 14 additions & 10 deletions tsl/test/shared/expected/transparent_decompress_chunk-16.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ ORDER BY time, device_id;
Append (actual rows=0.00 loops=1)
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id < 0)
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id < 0)
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id < 0)
Rows Removed by Filter: 18
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id < 0)

Expand Down Expand Up @@ -232,8 +233,9 @@ ORDER BY time, device_id;
-> Append (actual rows=0.00 loops=1)
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id IS NULL)
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id IS NULL)
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id IS NULL)
Rows Removed by Filter: 18
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id IS NULL)

Expand Down Expand Up @@ -694,9 +696,9 @@ SET enable_seqscan TO FALSE;
-> Index Scan Backward using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on _timescaledb_internal.compress_hyper_X_X_chunk (actual rows=2.00 loops=1)
Output: compress_hyper_X_X_chunk."time", compress_hyper_X_X_chunk._ts_meta_min_1, compress_hyper_X_X_chunk._ts_meta_max_1, compress_hyper_X_X_chunk.device_id, compress_hyper_X_X_chunk._ts_meta_count
Index Cond: (compress_hyper_X_X_chunk.device_id = 1)
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _timescaledb_internal._hyper_X_X_chunk (actual rows=1598.00 loops=1)
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_time_idx on _timescaledb_internal._hyper_X_X_chunk (actual rows=1598.00 loops=1)
Output: _hyper_X_X_chunk."time", _hyper_X_X_chunk.device_id
Index Cond: (_hyper_X_X_chunk.device_id = 1)
Filter: (_hyper_X_X_chunk.device_id = 1)

-- globs should not plan IndexOnlyScans
:PREFIX_VERBOSE SELECT * FROM :TEST_TABLE WHERE device_id = 1 ORDER BY device_id, time;
Expand Down Expand Up @@ -1229,8 +1231,9 @@ FROM generate_series('2000-01-01'::timestamptz, '2000-02-01'::timestamptz, '1d':
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk m1 (actual rows=0.00 loops=32)
Filter: (("time" = g."time") AND (device_id = $1))
Rows Removed by Filter: 50
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Index Cond: ((device_id = $1) AND (_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time"))
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Filter: ((_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time") AND (device_id = $1))
Rows Removed by Filter: 16
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk m1 (actual rows=0.00 loops=29)
Index Cond: ((device_id = $1) AND ("time" = g."time"))

Expand All @@ -1243,8 +1246,9 @@ FROM generate_series('2000-01-01'::timestamptz, '2000-02-01'::timestamptz, '1d':
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk m1 (actual rows=0.00 loops=32)
Filter: (("time" = g."time") AND (device_id = $1))
Rows Removed by Filter: 81
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Index Cond: ((device_id = $1) AND (_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time"))
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Filter: ((_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time") AND (device_id = $1))
Rows Removed by Filter: 16
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk m1 (actual rows=0.00 loops=27)
Index Cond: ((device_id = $1) AND ("time" = g."time"))

Expand Down
24 changes: 14 additions & 10 deletions tsl/test/shared/expected/transparent_decompress_chunk-17.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ ORDER BY time, device_id;
Append (actual rows=0.00 loops=1)
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id < 0)
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id < 0)
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id < 0)
Rows Removed by Filter: 18
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id < 0)

Expand Down Expand Up @@ -244,8 +245,9 @@ ORDER BY time, device_id;
Sort Method: quicksort
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id IS NULL)
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Index Cond: (device_id IS NULL)
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=1)
Filter: (device_id IS NULL)
Rows Removed by Filter: 18
-> Sort (actual rows=0.00 loops=1)
Sort Key: _hyper_X_X_chunk."time", _hyper_X_X_chunk.device_id
Sort Method: quicksort
Expand Down Expand Up @@ -760,9 +762,9 @@ SET enable_seqscan TO FALSE;
-> Index Scan Backward using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on _timescaledb_internal.compress_hyper_X_X_chunk (actual rows=2.00 loops=1)
Output: compress_hyper_X_X_chunk."time", compress_hyper_X_X_chunk._ts_meta_min_1, compress_hyper_X_X_chunk._ts_meta_max_1, compress_hyper_X_X_chunk.device_id, compress_hyper_X_X_chunk._ts_meta_count
Index Cond: (compress_hyper_X_X_chunk.device_id = 1)
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _timescaledb_internal._hyper_X_X_chunk (actual rows=1598.00 loops=1)
-> Index Scan using _hyper_X_X_chunk_metrics_compressed_time_idx on _timescaledb_internal._hyper_X_X_chunk (actual rows=1598.00 loops=1)
Output: _hyper_X_X_chunk."time", _hyper_X_X_chunk.device_id
Index Cond: (_hyper_X_X_chunk.device_id = 1)
Filter: (_hyper_X_X_chunk.device_id = 1)

-- globs should not plan IndexOnlyScans
:PREFIX_VERBOSE SELECT * FROM :TEST_TABLE WHERE device_id = 1 ORDER BY device_id, time;
Expand Down Expand Up @@ -1295,8 +1297,9 @@ FROM generate_series('2000-01-01'::timestamptz, '2000-02-01'::timestamptz, '1d':
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk m1 (actual rows=0.00 loops=32)
Filter: (("time" = g."time") AND (device_id = $1))
Rows Removed by Filter: 50
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Index Cond: ((device_id = $1) AND (_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time"))
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Filter: ((_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time") AND (device_id = $1))
Rows Removed by Filter: 16
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk m1 (actual rows=0.00 loops=29)
Index Cond: ((device_id = $1) AND ("time" = g."time"))

Expand All @@ -1309,8 +1312,9 @@ FROM generate_series('2000-01-01'::timestamptz, '2000-02-01'::timestamptz, '1d':
-> Custom Scan (ColumnarScan) on _hyper_X_X_chunk m1 (actual rows=0.00 loops=32)
Filter: (("time" = g."time") AND (device_id = $1))
Rows Removed by Filter: 81
-> Index Scan using compress_hyper_X_X_chunk_device_id__ts_meta_min_1__ts_meta_idx on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Index Cond: ((device_id = $1) AND (_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time"))
-> Seq Scan on compress_hyper_X_X_chunk (actual rows=0.00 loops=32)
Filter: ((_ts_meta_min_1 <= g."time") AND (_ts_meta_max_1 >= g."time") AND (device_id = $1))
Rows Removed by Filter: 16
-> Index Only Scan using _hyper_X_X_chunk_metrics_compressed_device_id_time_idx on _hyper_X_X_chunk m1 (actual rows=0.00 loops=27)
Index Cond: ((device_id = $1) AND ("time" = g."time"))

Expand Down
Loading
Loading