Running VACUUM ANALYZE in all involved relations

timescale · Dec 3, 2024 · bd9401a · bd9401a
1 parent 12cc929
commit bd9401a
Show file tree

Hide file tree

Showing 7 changed files with 1,626 additions and 1,548 deletions.
diff --git a/test/expected/append-14.out b/test/expected/append-14.out
diff --git a/test/expected/append-15.out b/test/expected/append-15.out
diff --git a/test/expected/append-16.out b/test/expected/append-16.out
diff --git a/test/expected/append-17.out b/test/expected/append-17.out
diff --git a/test/runner_cleanup_output.sh b/test/runner_cleanup_output.sh
@@ -8,8 +8,7 @@ RUNNER=${1:-""}
 sed  -e '/<exclude_from_test>/,/<\/exclude_from_test>/d' \
      -e 's! Memory: [0-9]\{1,\}kB!!' \
      -e 's! Memory Usage: [0-9]\{1,\}kB!!' \
-     -e 's! Average  Peak Memory: [0-9]\{1,\}kB!!' \
-     -e 's! Heap Fetches: [0-9]\{1,\}! Heap Fetches: N!'| \
+     -e 's! Average  Peak Memory: [0-9]\{1,\}kB!!' | \
 grep -v 'DEBUG:  rehashing catalog cache id' | \
 grep -v 'DEBUG:  compacted fsync request queue from' | \
 grep -v 'DEBUG:  creating and filling new WAL file' | \

diff --git a/test/sql/include/append_load.sql b/test/sql/include/append_load.sql
@@ -40,6 +40,7 @@ INSERT INTO append_test VALUES ('2017-03-22T09:18:22', 23.5, 1, '{"a": 1, "b": 2
                                ('2017-05-22T09:18:22', 36.2, 2, '{"c": 3, "b": 2}'),
                                ('2017-05-22T09:18:23', 15.2, 2, '{"c": 3}'),
                                ('2017-08-22T09:18:22', 34.1, 3, '{"c": 4}');
+VACUUM (ANALYZE) append_test;
 
 -- Create another hypertable to join with
 CREATE TABLE join_test(time timestamptz, temp float, colorid integer);
@@ -48,25 +49,27 @@ SELECT create_hypertable('join_test', 'time', chunk_time_interval => 26280000000
 INSERT INTO join_test VALUES ('2017-01-22T09:18:22', 15.2, 1),
                              ('2017-02-22T09:18:22', 24.5, 2),
                              ('2017-08-22T09:18:22', 23.1, 3);
+VACUUM (ANALYZE) join_test;
 
 -- Create another table to join with which is not a hypertable.
 CREATE TABLE join_test_plain(time timestamptz, temp float, colorid integer, attr jsonb);
 
 INSERT INTO join_test_plain VALUES ('2017-01-22T09:18:22', 15.2, 1, '{"a": 1}'),
                              ('2017-02-22T09:18:22', 24.5, 2, '{"b": 2}'),
                              ('2017-08-22T09:18:22', 23.1, 3, '{"c": 3}');
+VACUUM (ANALYZE) join_test_plain;
 
 -- create hypertable with DATE time dimension
 CREATE TABLE metrics_date(time DATE NOT NULL);
 SELECT create_hypertable('metrics_date','time');
 INSERT INTO metrics_date SELECT generate_series('2000-01-01'::date, '2000-02-01'::date, '5m'::interval);
-ANALYZE metrics_date;
+VACUUM (ANALYZE) metrics_date;
 
 -- create hypertable with TIMESTAMP time dimension
 CREATE TABLE metrics_timestamp(time TIMESTAMP NOT NULL);
 SELECT create_hypertable('metrics_timestamp','time');
 INSERT INTO metrics_timestamp SELECT generate_series('2000-01-01'::date, '2000-02-01'::date, '5m'::interval);
-ANALYZE metrics_timestamp;
+VACUUM (ANALYZE) metrics_timestamp;
 
 -- create hypertable with TIMESTAMPTZ time dimension
 CREATE TABLE metrics_timestamptz(time TIMESTAMPTZ NOT NULL, device_id INT NOT NULL);
@@ -75,7 +78,7 @@ SELECT create_hypertable('metrics_timestamptz','time');
 INSERT INTO metrics_timestamptz SELECT generate_series('2000-01-01'::date, '2000-02-01'::date, '5m'::interval), 1;
 INSERT INTO metrics_timestamptz SELECT generate_series('2000-01-01'::date, '2000-02-01'::date, '5m'::interval), 2;
 INSERT INTO metrics_timestamptz SELECT generate_series('2000-01-01'::date, '2000-02-01'::date, '5m'::interval), 3;
-ANALYZE metrics_timestamptz;
+VACUUM (ANALYZE) metrics_timestamptz;
 
 -- create space partitioned hypertable
 CREATE TABLE metrics_space(time timestamptz NOT NULL, device_id int NOT NULL, v1 float, v2 float, v3 text);
@@ -87,7 +90,7 @@ FROM generate_series('2000-01-01'::timestamptz, '2000-01-14'::timestamptz, '5m':
   generate_series(1,10,1) g2(device_id)
 ORDER BY time, device_id;
 
-ANALYZE metrics_space;
+VACUUM (ANALYZE) metrics_space;
 
 -- test ChunkAppend projection #2661
 CREATE TABLE i2661 (
@@ -99,5 +102,4 @@ CREATE TABLE i2661 (
 SELECT create_hypertable('i2661', 'timestamp');
 
 INSERT INTO i2661 SELECT 1, 'speed', generate_series('2019-12-31 00:00:00', '2020-01-10 00:00:00', '2m'::interval), 0;
-ANALYZE i2661;
-
+VACUUM (ANALYZE) i2661;
diff --git a/test/sql/include/append_query.sql b/test/sql/include/append_query.sql
@@ -320,6 +320,7 @@ SELECT time, device_id
 FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time),
   generate_series(1,10,1) g2(device_id)
 ORDER BY time, device_id;
+VACUUM (ANALYZE) join_limit;
 
 -- get 2nd chunk oid
 SELECT tableoid AS "CHUNK_OID" FROM join_limit WHERE time > '2000-01-07' ORDER BY time LIMIT 1
@@ -353,7 +354,7 @@ CREATE TABLE i3030(time timestamptz NOT NULL, a int, b int);
 SELECT table_name FROM create_hypertable('i3030', 'time', create_default_indexes=>false);
 CREATE INDEX ON i3030(a,time);
 INSERT INTO i3030 (time,a) SELECT time, a FROM generate_series('2000-01-01'::timestamptz,'2000-01-01 3:00:00'::timestamptz,'1min'::interval) time, generate_series(1,30) a;
-ANALYZE i3030;
+VACUUM (ANALYZE) i3030;
 
 :PREFIX SELECT * FROM i3030 where time BETWEEN '2000-01-01'::text::timestamptz AND '2000-01-03'::text::timestamptz ORDER BY a,time LIMIT 1;
 DROP TABLE i3030;