Separate chunk skipping update test

Author: erimatnor

scripts/test_update_from_version.sh

@@ -12,7 +12,7 @@ FROM_VERSION=${FROM_VERSION:-$(grep '^previous_version ' version.config | awk '{
 TO_VERSION=${TO_VERSION:-$(grep '^version ' version.config | awk '{ print $3 }')}
 
 TEST_REPAIR=${TEST_REPAIR:-false}
-TEST_VERSION=${TEST_VERSION:-v8}
+TEST_VERSION=${TEST_VERSION:-v9}
 
 OUTPUT_DIR=${OUTPUT_DIR:-update_test/${FROM_VERSION}_to_${TO_VERSION}}
 PGDATA="${OUTPUT_DIR}/data"
@@ -135,5 +135,3 @@ if [ -f "${OUTPUT_DIR}/baseline_vs_updated.diff" ] || [ -f "${OUTPUT_DIR}/baseli
   echo "Update test for ${FROM_VERSION} -> ${TO_VERSION} failed"
   exit 1
 fi
-
-

scripts/test_updates.sh

@@ -87,14 +87,19 @@ if [ -n "${VERSIONS}" ]; then
   for version in ${VERSIONS}; do
     ts_minor_version=$(echo "${version}" | awk -F. '{print $2}')
 
-    TEST_VERSION=v8
-
     if [ "${ts_minor_version}" -ge 10 ]; then
       TEST_REPAIR=true
     else
       TEST_REPAIR=false
     fi
 
+
+    if [ "${ts_minor_version}" -ge 16 ]; then
+        TEST_VERSION=v9
+    else
+        TEST_VERSION=v8
+    fi
+
     export TEST_VERSION TEST_REPAIR
 
     FROM_VERSION=${version} "${SCRIPT_DIR}/test_update_from_version.sh"
@@ -115,4 +120,3 @@ else
 fi
 
 exit $FAIL_COUNT
-

test/sql/updates/cleanup.chunk_skipping.sql

@@ -0,0 +1,5 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+DROP TABLE skip;

test/sql/updates/cleanup.v7.sql

@@ -8,4 +8,3 @@
 \ir cleanup.continuous_aggs.v2.sql
 \ir cleanup.compression.sql
 \ir cleanup.policies.sql
-

test/sql/updates/cleanup.v8.sql

@@ -0,0 +1,6 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+\ir cleanup.v7.sql
+

test/sql/updates/cleanup.v9.sql

@@ -0,0 +1,6 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+\ir cleanup.v8.sql
+\ir cleanup.chunk_skipping.sql

test/sql/updates/post.chunk_skipping.sql

@@ -0,0 +1,11 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+-- Show chunk column stats after updating the extension. We need to
+-- exclude the rows with chunk_id = 0 because we cannot keep those on
+-- downgrade due to FK constraint. Showing them would mean a diff in
+-- the output. We can still test that 0 chunk_ids are converted to
+-- NULL values during upgrades, however.
+SELECT * FROM _timescaledb_catalog.chunk_column_stats
+WHERE chunk_id IS NULL OR chunk_id > 0 ORDER BY id;

test/sql/updates/post.compression.sql

@@ -25,18 +25,18 @@ SELECT * FROM compress ORDER BY time DESC, small_cardinality, large_cardinality,
 \x on
 WITH hypertables AS (
         SELECT ht.id hypertable_id,
-           ht.schema_name,
-           ht.table_name,
-           ht.compressed_hypertable_id
+	       ht.schema_name,
+	       ht.table_name,
+	       ht.compressed_hypertable_id
           FROM pg_class cl JOIN pg_namespace ns ON ns.oid = relnamespace
-      JOIN _timescaledb_catalog.hypertable ht ON relname = ht.table_name AND nspname = ht.schema_name
+	  JOIN _timescaledb_catalog.hypertable ht ON relname = ht.table_name AND nspname = ht.schema_name
     ),
     table_summary AS (
-    SELECT format('%I.%I', ht1.schema_name, ht1.table_name) AS hypertable_name,
-           format('%I.%I', ht2.schema_name, ht2.table_name) AS compressed_hypertable_name,
-           format('%I.%I', ch2.schema_name, ch2.table_name) AS compressed_chunk_name
-    FROM hypertables ht1
-    JOIN hypertables ht2 ON ht1.compressed_hypertable_id = ht2.hypertable_id
+	SELECT format('%I.%I', ht1.schema_name, ht1.table_name) AS hypertable_name,
+	       format('%I.%I', ht2.schema_name, ht2.table_name) AS compressed_hypertable_name,
+	       format('%I.%I', ch2.schema_name, ch2.table_name) AS compressed_chunk_name
+	FROM hypertables ht1
+	JOIN hypertables ht2 ON ht1.compressed_hypertable_id = ht2.hypertable_id
         JOIN _timescaledb_catalog.chunk ch2 ON ch2.hypertable_id = ht2.hypertable_id
     )
 SELECT hypertable_name,
@@ -49,10 +49,3 @@ SELECT hypertable_name,
   ORDER BY hypertable_name, compressed_hypertable_name, compressed_chunk_name;
 \x off
 
--- Show chunk column stats after updating the extension. We need to
--- exclude the rows with chunk_id = 0 because we cannot keep those on
--- downgrade due to FK constraint. Showing them would mean a diff in
--- the output. We can still test that 0 chunk_ids are converted to
--- NULL values during upgrades, however.
-SELECT * FROM _timescaledb_catalog.chunk_column_stats
-WHERE chunk_id IS NULL OR chunk_id > 0 ORDER BY id;

test/sql/updates/post.v9.sql

@@ -0,0 +1,6 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+\ir post.v8.sql
+\ir post.chunk_skipping.sql

test/sql/updates/pre.cleanup.sql

@@ -30,6 +30,7 @@ DROP TABLE IF EXISTS repair_test_extra;
 DROP TABLE IF EXISTS repair_test_timestamp;
 DROP TABLE IF EXISTS repair_test_date;
 DROP TABLE IF EXISTS compress;
+DROP TABLE IF EXISTS skip;
 DROP TABLE IF EXISTS devices;
 DROP TABLE IF EXISTS disthyper;
 DROP TABLE IF EXISTS policy_test_timestamptz;

test/sql/updates/setup.chunk_skipping.sql

@@ -0,0 +1,37 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+
+CREATE TABLE skip (
+      time                  TIMESTAMPTZ         NOT NULL,
+      updated_at            TIMESTAMPTZ         NOT NULL,
+      location              INT,
+      temp                  FLOAT
+    );
+    
+SELECT setseed(0.1);
+SELECT table_name FROM create_hypertable( 'skip', 'time');
+
+INSERT INTO skip
+SELECT g, g+interval '1 hour', ceil(random()*20), random()*30
+FROM generate_series('2018-12-01 00:00'::timestamp, '2018-12-31 00:00'::timestamp, '1 day') g;
+
+ALTER TABLE skip SET (timescaledb.compress, timescaledb.compress_segmentby='location');
+SELECT count(compress_chunk(ch, true)) FROM show_chunks('skip') ch;
+
+DO $$
+DECLARE
+  version text[] := (SELECT regexp_split_to_array(extversion,'(\.|-)') FROM pg_extension WHERE extname = 'timescaledb');
+BEGIN
+
+  -- Enable chunk skipping. Doing this after compression to have a
+  -- "special" chunk_id entry of 0. We check that this is changed to
+  -- NULL during upgrade.
+  IF version[1]::int >= 2 AND version[2]::int >= 17 AND (version[2]::int > 17 OR version[3]::int > 0) THEN
+     SET timescaledb.enable_chunk_skipping = true;
+  END IF;
+END
+$$;
+
+SELECT enable_chunk_skipping('skip', 'updated_at');

test/sql/updates/setup.compression.sql

@@ -29,33 +29,23 @@ INSERT INTO compress
 SELECT g, 'POR', g::text, 'lint', 94.0, 45, (3,4)::custom_type_for_compression, true
 FROM generate_series('2018-11-01 00:00'::timestamp, '2018-12-15 00:00'::timestamp, '1 day') g;
 
-SELECT regexp_split_to_array(extversion,'(\.|-)') FROM pg_extension WHERE extname = 'timescaledb';
-
 DO $$
 DECLARE
-  version text[] := (SELECT regexp_split_to_array(extversion,'(\.|-)') FROM pg_extension WHERE extname = 'timescaledb');
+  ts_minor int := (SELECT (string_to_array(extversion,'.'))[2]::int FROM pg_extension WHERE extname = 'timescaledb');
 BEGIN
 
   -- support for dropping columns on compressed hypertables was added in 2.10.0
   -- so we drop before compressing if the version is before 2.10.0
-  IF version[1]::int = 2 AND version[2]::int < 10 THEN
+  IF ts_minor < 10 THEN
     ALTER TABLE compress DROP COLUMN dropped;
   END IF;
 
   ALTER TABLE compress SET (timescaledb.compress, timescaledb.compress_segmentby='small_cardinality');
   PERFORM count(compress_chunk(ch, true)) FROM show_chunks('compress') ch;
 
-  IF version[1]::int >= 2 AND version[2]::int >= 10 THEN
+  IF ts_minor >= 10 THEN
     ALTER TABLE compress DROP COLUMN dropped;
   END IF;
-
-  -- Enable chunk skipping. Doing this after compression to have a
-  -- "special" chunk_id entry of 0. We check that this is changed to
-  -- NULL during upgrade.
-  IF version[1]::int >= 2 AND version[2]::int >= 17 AND (version[2]::int > 17 OR version[3]::int > 0) THEN
-     SET timescaledb.enable_chunk_skipping = true;
-  END IF;
-  PERFORM enable_chunk_skipping('compress', 'some_int');
 END
 $$;
 

test/sql/updates/setup.v9.sql

@@ -0,0 +1,6 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+\ir setup.v8.sql
+\ir setup.chunk_skipping.sql