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

Remove space partition restriction from ordered append

Browse Source 
The initial support for space partitions for ordered append
only supported 1 space dimension. This patch removes that restriction
and supports an arbitrary amount of space partitions.
This commit is contained in:
Sven Klemm 2019-06-01 09:04:20 +02:00 committed by Sven Klemm
parent 94769854eb
commit a9a360bc5f
8 changed files with 366 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chunk_append/chunk_append.c
View File

@ -122,8 +122,6 @@ ts_chunk_append_path_create(PlannerInfo *root, RelOptInfo *rel, Hypertable *ht,
List *nested_children = NIL;
bool has_scan_childs = false;
Assert(ht->space->num_dimensions <= 2);
foreach (lc, nested_oids)
{
ListCell *lc_oid;
@ -229,7 +227,7 @@ ts_ordered_append_should_optimize(PlannerInfo *root, RelOptInfo *rel, Hypertable
* only do this optimization for queries with an ORDER BY clause,
* caller checked this, so only asserting
*/
Assert(ht->space->num_dimensions <= 2 && root->parse->sortClause != NIL);
Assert(root->parse->sortClause != NIL);
/* we only support direct column references here */
if (!IsA(tle->expr, Var))

6
src/hypertable_restrict_info.c
View File

@ -559,12 +559,6 @@ ts_hypertable_restrict_info_get_chunk_oids_ordered(HypertableRestrictInfo *hri,
List *chunk_oids = NIL;
int i;
/*
* ordered append is the only user of this function which checks for
* number of dimensions as well so we only assert here
*/
Assert(hri->num_dimensions == 1 || hri->num_dimensions == 2);
dri = hri->dimension_restriction[0];
Assert(NULL != dri);

8
src/plan_expand_hypertable.c
View File

@ -559,7 +559,7 @@ should_order_append(PlannerInfo *root, RelOptInfo *rel, Hypertable *ht, List *jo
* only do this optimization for hypertables with 1 dimension and queries
* with an ORDER BY clause
*/
if (ht->space->num_dimensions > 2 || root->parse->sortClause == NIL)
if (root->parse->sortClause == NIL)
return false;
return ts_ordered_append_should_optimize(root, rel, ht, join_conditions, reverse);
@ -664,7 +664,11 @@ get_chunk_oids(CollectQualCtx *ctx, PlannerInfo *root, RelOptInfo *rel, Hypertab
{
((TimescaleDBPrivate *) rel->fdw_private)->appends_ordered = true;
if (ht->space->num_dimensions == 2)
/*
* for space partitioning we need extra information about the
* time slices of the chunks
*/
if (ht->space->num_dimensions > 1)
nested_oids = &((TimescaleDBPrivate *) rel->fdw_private)->nested_oids;
}

143
test/expected/plan_ordered_append-10.out
View File

@ -174,6 +174,33 @@ INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'
INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 3, 2.5;
INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 3, 3, 3.5;
ANALYZE space2;
CREATE TABLE space3(time timestamptz NOT NULL, x int NOT NULL, y int NOT NULL, z int NOT NULL, value float);
SELECT create_hypertable('space3','time','x',number_partitions:=2);
create_hypertable
---------------------
(9,public,space3,t)
(1 row)
SELECT add_dimension('space3','y',number_partitions:=2);
add_dimension
------------------------
(14,public,space3,y,t)
(1 row)
SELECT add_dimension('space3','z',number_partitions:=2);
add_dimension
------------------------
(15,public,space3,z,t)
(1 row)
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 2, 1.5;
\ir :TEST_QUERY_NAME
-- This file and its contents are licensed under the Apache License 2.0.
-- Please see the included NOTICE for copyright information and
@ -240,7 +267,23 @@ ORDER BY ht.table_name, range_start, chunk;
space2 | _hyper_8_43_chunk | 947116800000000
space2 | _hyper_8_45_chunk | 947116800000000
space2 | _hyper_8_47_chunk | 947116800000000
(48 rows)
space3 | _hyper_9_50_chunk | -9223372036854775808
space3 | _hyper_9_52_chunk | -9223372036854775808
space3 | _hyper_9_54_chunk | -9223372036854775808
space3 | _hyper_9_56_chunk | -9223372036854775808
space3 | _hyper_9_58_chunk | -9223372036854775808
space3 | _hyper_9_60_chunk | -9223372036854775808
space3 | _hyper_9_62_chunk | -9223372036854775808
space3 | _hyper_9_64_chunk | 946512000000000
space3 | _hyper_9_49_chunk | 947116800000000
space3 | _hyper_9_51_chunk | 947116800000000
space3 | _hyper_9_53_chunk | 947116800000000
space3 | _hyper_9_55_chunk | 947116800000000
space3 | _hyper_9_57_chunk | 947116800000000
space3 | _hyper_9_59_chunk | 947116800000000
space3 | _hyper_9_61_chunk | 947116800000000
space3 | _hyper_9_63_chunk | 947116800000000
(64 rows)
-- test ASC for ordered chunks
:PREFIX SELECT
@ -1012,34 +1055,84 @@ ORDER BY device_id, time LIMIT 1;
(13 rows)
-- test hypertable with 2 space dimensions
-- does not use ordered append
:PREFIX SELECT
time, device_id, value
FROM space2
ORDER BY time DESC;
QUERY PLAN
----------------------------------------------------------------------------------------------------------
Merge Append (actual rows=116649 loops=1)
Sort Key: _hyper_8_31_chunk."time" DESC
-> Index Scan using _hyper_8_31_chunk_space2_time_idx on _hyper_8_31_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_32_chunk_space2_time_idx on _hyper_8_32_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_33_chunk_space2_time_idx on _hyper_8_33_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_34_chunk_space2_time_idx on _hyper_8_34_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_35_chunk_space2_time_idx on _hyper_8_35_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_36_chunk_space2_time_idx on _hyper_8_36_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_37_chunk_space2_time_idx on _hyper_8_37_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_38_chunk_space2_time_idx on _hyper_8_38_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_39_chunk_space2_time_idx on _hyper_8_39_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_40_chunk_space2_time_idx on _hyper_8_40_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_41_chunk_space2_time_idx on _hyper_8_41_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_42_chunk_space2_time_idx on _hyper_8_42_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_43_chunk_space2_time_idx on _hyper_8_43_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_44_chunk_space2_time_idx on _hyper_8_44_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_45_chunk_space2_time_idx on _hyper_8_45_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_46_chunk_space2_time_idx on _hyper_8_46_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_47_chunk_space2_time_idx on _hyper_8_47_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_48_chunk_space2_time_idx on _hyper_8_48_chunk (actual rows=6720 loops=1)
(20 rows)
QUERY PLAN
----------------------------------------------------------------------------------------------------------------
Custom Scan (ChunkAppend) (actual rows=116649 loops=1)
Hypertable: space2
-> Merge Append (actual rows=56169 loops=1)
Sort Key: _hyper_8_31_chunk."time" DESC
-> Index Scan using _hyper_8_31_chunk_space2_time_idx on _hyper_8_31_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_33_chunk_space2_time_idx on _hyper_8_33_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_35_chunk_space2_time_idx on _hyper_8_35_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_37_chunk_space2_time_idx on _hyper_8_37_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_39_chunk_space2_time_idx on _hyper_8_39_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_41_chunk_space2_time_idx on _hyper_8_41_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_43_chunk_space2_time_idx on _hyper_8_43_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_45_chunk_space2_time_idx on _hyper_8_45_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_47_chunk_space2_time_idx on _hyper_8_47_chunk (actual rows=6241 loops=1)
-> Merge Append (actual rows=60480 loops=1)
Sort Key: _hyper_8_32_chunk."time" DESC
-> Index Scan using _hyper_8_32_chunk_space2_time_idx on _hyper_8_32_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_34_chunk_space2_time_idx on _hyper_8_34_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_36_chunk_space2_time_idx on _hyper_8_36_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_38_chunk_space2_time_idx on _hyper_8_38_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_40_chunk_space2_time_idx on _hyper_8_40_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_42_chunk_space2_time_idx on _hyper_8_42_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_44_chunk_space2_time_idx on _hyper_8_44_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_46_chunk_space2_time_idx on _hyper_8_46_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_48_chunk_space2_time_idx on _hyper_8_48_chunk (actual rows=6720 loops=1)
(24 rows)
-- test hypertable with 3 space dimensions
:PREFIX SELECT
time
FROM space3
ORDER BY time DESC;
QUERY PLAN
---------------------------------------------------------------------------------------------------------------------
Custom Scan (ChunkAppend) (actual rows=103688 loops=1)
Hypertable: space3
-> Merge Append (actual rows=49928 loops=1)
Sort Key: _hyper_9_49_chunk."time" DESC
-> Index Only Scan using _hyper_9_49_chunk_space3_time_idx on _hyper_9_49_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_51_chunk_space3_time_idx on _hyper_9_51_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_53_chunk_space3_time_idx on _hyper_9_53_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_55_chunk_space3_time_idx on _hyper_9_55_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_57_chunk_space3_time_idx on _hyper_9_57_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_59_chunk_space3_time_idx on _hyper_9_59_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_61_chunk_space3_time_idx on _hyper_9_61_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_63_chunk_space3_time_idx on _hyper_9_63_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Merge Append (actual rows=53760 loops=1)
Sort Key: _hyper_9_50_chunk."time" DESC
-> Index Only Scan using _hyper_9_50_chunk_space3_time_idx on _hyper_9_50_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_52_chunk_space3_time_idx on _hyper_9_52_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_54_chunk_space3_time_idx on _hyper_9_54_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_56_chunk_space3_time_idx on _hyper_9_56_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_58_chunk_space3_time_idx on _hyper_9_58_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_60_chunk_space3_time_idx on _hyper_9_60_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_62_chunk_space3_time_idx on _hyper_9_62_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_64_chunk_space3_time_idx on _hyper_9_64_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
(38 rows)
-- test LATERAL with correlated query
-- only last chunk should be executed

143
test/expected/plan_ordered_append-11.out
View File

@ -174,6 +174,33 @@ INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'
INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 3, 2.5;
INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 3, 3, 3.5;
ANALYZE space2;
CREATE TABLE space3(time timestamptz NOT NULL, x int NOT NULL, y int NOT NULL, z int NOT NULL, value float);
SELECT create_hypertable('space3','time','x',number_partitions:=2);
create_hypertable
---------------------
(9,public,space3,t)
(1 row)
SELECT add_dimension('space3','y',number_partitions:=2);
add_dimension
------------------------
(14,public,space3,y,t)
(1 row)
SELECT add_dimension('space3','z',number_partitions:=2);
add_dimension
------------------------
(15,public,space3,z,t)
(1 row)
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 2, 1.5;
\ir :TEST_QUERY_NAME
-- This file and its contents are licensed under the Apache License 2.0.
-- Please see the included NOTICE for copyright information and
@ -240,7 +267,23 @@ ORDER BY ht.table_name, range_start, chunk;
space2 | _hyper_8_43_chunk | 947116800000000
space2 | _hyper_8_45_chunk | 947116800000000
space2 | _hyper_8_47_chunk | 947116800000000
(48 rows)
space3 | _hyper_9_50_chunk | -9223372036854775808
space3 | _hyper_9_52_chunk | -9223372036854775808
space3 | _hyper_9_54_chunk | -9223372036854775808
space3 | _hyper_9_56_chunk | -9223372036854775808
space3 | _hyper_9_58_chunk | -9223372036854775808
space3 | _hyper_9_60_chunk | -9223372036854775808
space3 | _hyper_9_62_chunk | -9223372036854775808
space3 | _hyper_9_64_chunk | 946512000000000
space3 | _hyper_9_49_chunk | 947116800000000
space3 | _hyper_9_51_chunk | 947116800000000
space3 | _hyper_9_53_chunk | 947116800000000
space3 | _hyper_9_55_chunk | 947116800000000
space3 | _hyper_9_57_chunk | 947116800000000
space3 | _hyper_9_59_chunk | 947116800000000
space3 | _hyper_9_61_chunk | 947116800000000
space3 | _hyper_9_63_chunk | 947116800000000
(64 rows)
-- test ASC for ordered chunks
:PREFIX SELECT
@ -1012,34 +1055,84 @@ ORDER BY device_id, time LIMIT 1;
(13 rows)
-- test hypertable with 2 space dimensions
-- does not use ordered append
:PREFIX SELECT
time, device_id, value
FROM space2
ORDER BY time DESC;
QUERY PLAN
----------------------------------------------------------------------------------------------------------
Merge Append (actual rows=116649 loops=1)
Sort Key: _hyper_8_31_chunk."time" DESC
-> Index Scan using _hyper_8_31_chunk_space2_time_idx on _hyper_8_31_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_32_chunk_space2_time_idx on _hyper_8_32_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_33_chunk_space2_time_idx on _hyper_8_33_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_34_chunk_space2_time_idx on _hyper_8_34_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_35_chunk_space2_time_idx on _hyper_8_35_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_36_chunk_space2_time_idx on _hyper_8_36_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_37_chunk_space2_time_idx on _hyper_8_37_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_38_chunk_space2_time_idx on _hyper_8_38_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_39_chunk_space2_time_idx on _hyper_8_39_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_40_chunk_space2_time_idx on _hyper_8_40_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_41_chunk_space2_time_idx on _hyper_8_41_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_42_chunk_space2_time_idx on _hyper_8_42_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_43_chunk_space2_time_idx on _hyper_8_43_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_44_chunk_space2_time_idx on _hyper_8_44_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_45_chunk_space2_time_idx on _hyper_8_45_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_46_chunk_space2_time_idx on _hyper_8_46_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_47_chunk_space2_time_idx on _hyper_8_47_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_48_chunk_space2_time_idx on _hyper_8_48_chunk (actual rows=6720 loops=1)
(20 rows)
QUERY PLAN
----------------------------------------------------------------------------------------------------------------
Custom Scan (ChunkAppend) (actual rows=116649 loops=1)
Hypertable: space2
-> Merge Append (actual rows=56169 loops=1)
Sort Key: _hyper_8_31_chunk."time" DESC
-> Index Scan using _hyper_8_31_chunk_space2_time_idx on _hyper_8_31_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_33_chunk_space2_time_idx on _hyper_8_33_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_35_chunk_space2_time_idx on _hyper_8_35_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_37_chunk_space2_time_idx on _hyper_8_37_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_39_chunk_space2_time_idx on _hyper_8_39_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_41_chunk_space2_time_idx on _hyper_8_41_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_43_chunk_space2_time_idx on _hyper_8_43_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_45_chunk_space2_time_idx on _hyper_8_45_chunk (actual rows=6241 loops=1)
-> Index Scan using _hyper_8_47_chunk_space2_time_idx on _hyper_8_47_chunk (actual rows=6241 loops=1)
-> Merge Append (actual rows=60480 loops=1)
Sort Key: _hyper_8_32_chunk."time" DESC
-> Index Scan using _hyper_8_32_chunk_space2_time_idx on _hyper_8_32_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_34_chunk_space2_time_idx on _hyper_8_34_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_36_chunk_space2_time_idx on _hyper_8_36_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_38_chunk_space2_time_idx on _hyper_8_38_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_40_chunk_space2_time_idx on _hyper_8_40_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_42_chunk_space2_time_idx on _hyper_8_42_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_44_chunk_space2_time_idx on _hyper_8_44_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_46_chunk_space2_time_idx on _hyper_8_46_chunk (actual rows=6720 loops=1)
-> Index Scan using _hyper_8_48_chunk_space2_time_idx on _hyper_8_48_chunk (actual rows=6720 loops=1)
(24 rows)
-- test hypertable with 3 space dimensions
:PREFIX SELECT
time
FROM space3
ORDER BY time DESC;
QUERY PLAN
---------------------------------------------------------------------------------------------------------------------
Custom Scan (ChunkAppend) (actual rows=103688 loops=1)
Hypertable: space3
-> Merge Append (actual rows=49928 loops=1)
Sort Key: _hyper_9_49_chunk."time" DESC
-> Index Only Scan using _hyper_9_49_chunk_space3_time_idx on _hyper_9_49_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_51_chunk_space3_time_idx on _hyper_9_51_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_53_chunk_space3_time_idx on _hyper_9_53_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_55_chunk_space3_time_idx on _hyper_9_55_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_57_chunk_space3_time_idx on _hyper_9_57_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_59_chunk_space3_time_idx on _hyper_9_59_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_61_chunk_space3_time_idx on _hyper_9_61_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Index Only Scan using _hyper_9_63_chunk_space3_time_idx on _hyper_9_63_chunk (actual rows=6241 loops=1)
Heap Fetches: 6241
-> Merge Append (actual rows=53760 loops=1)
Sort Key: _hyper_9_50_chunk."time" DESC
-> Index Only Scan using _hyper_9_50_chunk_space3_time_idx on _hyper_9_50_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_52_chunk_space3_time_idx on _hyper_9_52_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_54_chunk_space3_time_idx on _hyper_9_54_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_56_chunk_space3_time_idx on _hyper_9_56_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_58_chunk_space3_time_idx on _hyper_9_58_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_60_chunk_space3_time_idx on _hyper_9_60_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_62_chunk_space3_time_idx on _hyper_9_62_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
-> Index Only Scan using _hyper_9_64_chunk_space3_time_idx on _hyper_9_64_chunk (actual rows=6720 loops=1)
Heap Fetches: 6720
(38 rows)
-- test LATERAL with correlated query
-- only last chunk should be executed

127
test/expected/plan_ordered_append-9.6.out
View File

@ -174,6 +174,33 @@ INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'
INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 3, 2.5;
INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 3, 3, 3.5;
ANALYZE space2;
CREATE TABLE space3(time timestamptz NOT NULL, x int NOT NULL, y int NOT NULL, z int NOT NULL, value float);
SELECT create_hypertable('space3','time','x',number_partitions:=2);
create_hypertable
---------------------
(9,public,space3,t)
(1 row)
SELECT add_dimension('space3','y',number_partitions:=2);
add_dimension
------------------------
(14,public,space3,y,t)
(1 row)
SELECT add_dimension('space3','z',number_partitions:=2);
add_dimension
------------------------
(15,public,space3,z,t)
(1 row)
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 2, 1.5;
\ir :TEST_QUERY_NAME
-- This file and its contents are licensed under the Apache License 2.0.
-- Please see the included NOTICE for copyright information and
@ -240,7 +267,23 @@ ORDER BY ht.table_name, range_start, chunk;
space2 | _hyper_8_43_chunk | 947116800000000
space2 | _hyper_8_45_chunk | 947116800000000
space2 | _hyper_8_47_chunk | 947116800000000
(48 rows)
space3 | _hyper_9_50_chunk | -9223372036854775808
space3 | _hyper_9_52_chunk | -9223372036854775808
space3 | _hyper_9_54_chunk | -9223372036854775808
space3 | _hyper_9_56_chunk | -9223372036854775808
space3 | _hyper_9_58_chunk | -9223372036854775808
space3 | _hyper_9_60_chunk | -9223372036854775808
space3 | _hyper_9_62_chunk | -9223372036854775808
space3 | _hyper_9_64_chunk | 946512000000000
space3 | _hyper_9_49_chunk | 947116800000000
space3 | _hyper_9_51_chunk | 947116800000000
space3 | _hyper_9_53_chunk | 947116800000000
space3 | _hyper_9_55_chunk | 947116800000000
space3 | _hyper_9_57_chunk | 947116800000000
space3 | _hyper_9_59_chunk | 947116800000000
space3 | _hyper_9_61_chunk | 947116800000000
space3 | _hyper_9_63_chunk | 947116800000000
(64 rows)
-- test ASC for ordered chunks
:PREFIX SELECT
@ -990,34 +1033,68 @@ ORDER BY device_id, time LIMIT 1;
(12 rows)
-- test hypertable with 2 space dimensions
-- does not use ordered append
:PREFIX SELECT
time, device_id, value
FROM space2
ORDER BY time DESC;
QUERY PLAN
-------------------------------------------------------------------------------
Merge Append
Sort Key: _hyper_8_31_chunk."time" DESC
-> Index Scan using _hyper_8_31_chunk_space2_time_idx on _hyper_8_31_chunk
-> Index Scan using _hyper_8_32_chunk_space2_time_idx on _hyper_8_32_chunk
-> Index Scan using _hyper_8_33_chunk_space2_time_idx on _hyper_8_33_chunk
-> Index Scan using _hyper_8_34_chunk_space2_time_idx on _hyper_8_34_chunk
-> Index Scan using _hyper_8_35_chunk_space2_time_idx on _hyper_8_35_chunk
-> Index Scan using _hyper_8_36_chunk_space2_time_idx on _hyper_8_36_chunk
-> Index Scan using _hyper_8_37_chunk_space2_time_idx on _hyper_8_37_chunk
-> Index Scan using _hyper_8_38_chunk_space2_time_idx on _hyper_8_38_chunk
-> Index Scan using _hyper_8_39_chunk_space2_time_idx on _hyper_8_39_chunk
-> Index Scan using _hyper_8_40_chunk_space2_time_idx on _hyper_8_40_chunk
-> Index Scan using _hyper_8_41_chunk_space2_time_idx on _hyper_8_41_chunk
-> Index Scan using _hyper_8_42_chunk_space2_time_idx on _hyper_8_42_chunk
-> Index Scan using _hyper_8_43_chunk_space2_time_idx on _hyper_8_43_chunk
-> Index Scan using _hyper_8_44_chunk_space2_time_idx on _hyper_8_44_chunk
-> Index Scan using _hyper_8_45_chunk_space2_time_idx on _hyper_8_45_chunk
-> Index Scan using _hyper_8_46_chunk_space2_time_idx on _hyper_8_46_chunk
-> Index Scan using _hyper_8_47_chunk_space2_time_idx on _hyper_8_47_chunk
-> Index Scan using _hyper_8_48_chunk_space2_time_idx on _hyper_8_48_chunk
(20 rows)
QUERY PLAN
-------------------------------------------------------------------------------------
Custom Scan (ChunkAppend)
Hypertable: space2
-> Merge Append
Sort Key: _hyper_8_31_chunk."time" DESC
-> Index Scan using _hyper_8_31_chunk_space2_time_idx on _hyper_8_31_chunk
-> Index Scan using _hyper_8_33_chunk_space2_time_idx on _hyper_8_33_chunk
-> Index Scan using _hyper_8_35_chunk_space2_time_idx on _hyper_8_35_chunk
-> Index Scan using _hyper_8_37_chunk_space2_time_idx on _hyper_8_37_chunk
-> Index Scan using _hyper_8_39_chunk_space2_time_idx on _hyper_8_39_chunk
-> Index Scan using _hyper_8_41_chunk_space2_time_idx on _hyper_8_41_chunk
-> Index Scan using _hyper_8_43_chunk_space2_time_idx on _hyper_8_43_chunk
-> Index Scan using _hyper_8_45_chunk_space2_time_idx on _hyper_8_45_chunk
-> Index Scan using _hyper_8_47_chunk_space2_time_idx on _hyper_8_47_chunk
-> Merge Append
Sort Key: _hyper_8_32_chunk."time" DESC
-> Index Scan using _hyper_8_32_chunk_space2_time_idx on _hyper_8_32_chunk
-> Index Scan using _hyper_8_34_chunk_space2_time_idx on _hyper_8_34_chunk
-> Index Scan using _hyper_8_36_chunk_space2_time_idx on _hyper_8_36_chunk
-> Index Scan using _hyper_8_38_chunk_space2_time_idx on _hyper_8_38_chunk
-> Index Scan using _hyper_8_40_chunk_space2_time_idx on _hyper_8_40_chunk
-> Index Scan using _hyper_8_42_chunk_space2_time_idx on _hyper_8_42_chunk
-> Index Scan using _hyper_8_44_chunk_space2_time_idx on _hyper_8_44_chunk
-> Index Scan using _hyper_8_46_chunk_space2_time_idx on _hyper_8_46_chunk
-> Index Scan using _hyper_8_48_chunk_space2_time_idx on _hyper_8_48_chunk
(24 rows)
-- test hypertable with 3 space dimensions
:PREFIX SELECT
time
FROM space3
ORDER BY time DESC;
QUERY PLAN
------------------------------------------------------------------------------------------
Custom Scan (ChunkAppend)
Hypertable: space3
-> Merge Append
Sort Key: _hyper_9_49_chunk."time" DESC
-> Index Only Scan using _hyper_9_49_chunk_space3_time_idx on _hyper_9_49_chunk
-> Index Only Scan using _hyper_9_51_chunk_space3_time_idx on _hyper_9_51_chunk
-> Index Only Scan using _hyper_9_53_chunk_space3_time_idx on _hyper_9_53_chunk
-> Index Only Scan using _hyper_9_55_chunk_space3_time_idx on _hyper_9_55_chunk
-> Index Only Scan using _hyper_9_57_chunk_space3_time_idx on _hyper_9_57_chunk
-> Index Only Scan using _hyper_9_59_chunk_space3_time_idx on _hyper_9_59_chunk
-> Index Only Scan using _hyper_9_61_chunk_space3_time_idx on _hyper_9_61_chunk
-> Index Only Scan using _hyper_9_63_chunk_space3_time_idx on _hyper_9_63_chunk
-> Merge Append
Sort Key: _hyper_9_50_chunk."time" DESC
-> Index Only Scan using _hyper_9_50_chunk_space3_time_idx on _hyper_9_50_chunk
-> Index Only Scan using _hyper_9_52_chunk_space3_time_idx on _hyper_9_52_chunk
-> Index Only Scan using _hyper_9_54_chunk_space3_time_idx on _hyper_9_54_chunk
-> Index Only Scan using _hyper_9_56_chunk_space3_time_idx on _hyper_9_56_chunk
-> Index Only Scan using _hyper_9_58_chunk_space3_time_idx on _hyper_9_58_chunk
-> Index Only Scan using _hyper_9_60_chunk_space3_time_idx on _hyper_9_60_chunk
-> Index Only Scan using _hyper_9_62_chunk_space3_time_idx on _hyper_9_62_chunk
-> Index Only Scan using _hyper_9_64_chunk_space3_time_idx on _hyper_9_64_chunk
(22 rows)
-- test LATERAL with correlated query
-- only last chunk should be executed

15
test/sql/include/plan_ordered_append_load.sql
View File

@ -132,3 +132,18 @@ INSERT INTO space2 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'
ANALYZE space2;
CREATE TABLE space3(time timestamptz NOT NULL, x int NOT NULL, y int NOT NULL, z int NOT NULL, value float);
SELECT create_hypertable('space3','time','x',number_partitions:=2);
SELECT add_dimension('space3','y',number_partitions:=2);
SELECT add_dimension('space3','z',number_partitions:=2);
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 1, 2, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 1, 2, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 1, 1.5;
INSERT INTO space3 SELECT generate_series('2000-01-10'::timestamptz,'2000-01-01'::timestamptz,'-1m'::interval), 2, 2, 2, 1.5;

7
test/sql/include/plan_ordered_append_query.sql
View File

@ -256,12 +256,17 @@ FROM space
ORDER BY device_id, time LIMIT 1;
-- test hypertable with 2 space dimensions
-- does not use ordered append
:PREFIX SELECT
time, device_id, value
FROM space2
ORDER BY time DESC;
-- test hypertable with 3 space dimensions
:PREFIX SELECT
time
FROM space3
ORDER BY time DESC;
-- test LATERAL with correlated query
-- only last chunk should be executed
:PREFIX SELECT *