From 7169ba21c4428604b19ecb7c6534729283a15e46 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 7 Dec 2020 13:36:46 -0800 Subject: [PATCH] more test fixes --- src/test/regress/expected/am_create.out | 2 +- src/test/regress/expected/upgrade_columnar_after.out | 4 ++-- src/test/regress/expected/upgrade_columnar_before.out | 6 +++--- src/test/regress/input/am_load.source | 6 +++--- src/test/regress/output/am_load.source | 6 +++--- src/test/regress/sql/am_create.sql | 2 +- src/test/regress/sql/upgrade_columnar_after.sql | 4 ++-- src/test/regress/sql/upgrade_columnar_before.sql | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/test/regress/expected/am_create.out b/src/test/regress/expected/am_create.out index 3e29d9c35..61695e3a2 100644 --- a/src/test/regress/expected/am_create.out +++ b/src/test/regress/expected/am_create.out @@ -1,5 +1,5 @@ -- --- Test the CREATE statements related to cstore. +-- Test the CREATE statements related to columnar. -- -- Create uncompressed table CREATE TABLE contestant (handle TEXT, birthdate DATE, rating INT, diff --git a/src/test/regress/expected/upgrade_columnar_after.out b/src/test/regress/expected/upgrade_columnar_after.out index 3f1219425..93b710f4d 100644 --- a/src/test/regress/expected/upgrade_columnar_after.out +++ b/src/test/regress/expected/upgrade_columnar_after.out @@ -101,7 +101,7 @@ SELECT * FROM matview ORDER BY a; (2 rows) -- test we retained options -SELECT * FROM cstore.options WHERE regclass = 'test_options_1'::regclass; +SELECT * FROM columnar.options WHERE regclass = 'test_options_1'::regclass; regclass | chunk_row_count | stripe_row_count | compression --------------------------------------------------------------------- test_options_1 | 1000 | 5000 | pglz @@ -121,7 +121,7 @@ SELECT count(*), sum(a), sum(b) FROM test_options_1; 10000 | 50005000 | 45010 (1 row) -SELECT * FROM cstore.options WHERE regclass = 'test_options_2'::regclass; +SELECT * FROM columnar.options WHERE regclass = 'test_options_2'::regclass; regclass | chunk_row_count | stripe_row_count | compression --------------------------------------------------------------------- test_options_2 | 2000 | 6000 | none diff --git a/src/test/regress/expected/upgrade_columnar_before.out b/src/test/regress/expected/upgrade_columnar_before.out index aa87b5e4d..807971150 100644 --- a/src/test/regress/expected/upgrade_columnar_before.out +++ b/src/test/regress/expected/upgrade_columnar_before.out @@ -115,9 +115,9 @@ SELECT :relfilenode_pre_alter <> :relfilenode_post_alter AS relfilenode_changed; -- -- Test that we retain options -- -SET cstore.stripe_row_count TO 5000; -SET cstore.chunk_row_count TO 1000; -SET cstore.compression TO 'pglz'; +SET columnar.stripe_row_count TO 5000; +SET columnar.chunk_row_count TO 1000; +SET columnar.compression TO 'pglz'; CREATE TABLE test_options_1(a int, b int) USING columnar; INSERT INTO test_options_1 SELECT i, floor(i/1000) FROM generate_series(1, 10000) i; CREATE TABLE test_options_2(a int, b int) USING columnar; diff --git a/src/test/regress/input/am_load.source b/src/test/regress/input/am_load.source index dbd9160d2..8795f2d61 100644 --- a/src/test/regress/input/am_load.source +++ b/src/test/regress/input/am_load.source @@ -1,5 +1,5 @@ -- --- Test loading data into cstore_fdw tables. +-- Test loading data into columnar tables. -- -- COPY with incorrect delimiter @@ -16,13 +16,13 @@ COPY contestant FROM '@abs_srcdir@/data/contestants.1.csv' WITH CSV; COPY contestant FROM PROGRAM 'cat @abs_srcdir@/data/contestants.2.csv' WITH CSV; -- COPY into compressed table -set cstore.compression = 'pglz'; +set columnar.compression = 'pglz'; COPY contestant_compressed FROM '@abs_srcdir@/data/contestants.1.csv' WITH CSV; -- COPY into uncompressed table from program COPY contestant_compressed FROM PROGRAM 'cat @abs_srcdir@/data/contestants.2.csv' WITH CSV; -set cstore.compression to default; +set columnar.compression to default; -- Test column list CREATE TABLE famous_constants (id int, name text, value real) diff --git a/src/test/regress/output/am_load.source b/src/test/regress/output/am_load.source index 6c80f9889..c24f74f67 100644 --- a/src/test/regress/output/am_load.source +++ b/src/test/regress/output/am_load.source @@ -1,5 +1,5 @@ -- --- Test loading data into cstore_fdw tables. +-- Test loading data into columnar tables. -- -- COPY with incorrect delimiter COPY contestant FROM '@abs_srcdir@/data/contestants.1.csv' @@ -15,12 +15,12 @@ COPY contestant FROM '@abs_srcdir@/data/contestants.1.csv' WITH CSV; -- COPY into uncompressed table from program COPY contestant FROM PROGRAM 'cat @abs_srcdir@/data/contestants.2.csv' WITH CSV; -- COPY into compressed table -set cstore.compression = 'pglz'; +set columnar.compression = 'pglz'; COPY contestant_compressed FROM '@abs_srcdir@/data/contestants.1.csv' WITH CSV; -- COPY into uncompressed table from program COPY contestant_compressed FROM PROGRAM 'cat @abs_srcdir@/data/contestants.2.csv' WITH CSV; -set cstore.compression to default; +set columnar.compression to default; -- Test column list CREATE TABLE famous_constants (id int, name text, value real) USING columnar; diff --git a/src/test/regress/sql/am_create.sql b/src/test/regress/sql/am_create.sql index bd16b6f0e..412bfe784 100644 --- a/src/test/regress/sql/am_create.sql +++ b/src/test/regress/sql/am_create.sql @@ -1,5 +1,5 @@ -- --- Test the CREATE statements related to cstore. +-- Test the CREATE statements related to columnar. -- diff --git a/src/test/regress/sql/upgrade_columnar_after.sql b/src/test/regress/sql/upgrade_columnar_after.sql index 646ad768c..99cfb0afd 100644 --- a/src/test/regress/sql/upgrade_columnar_after.sql +++ b/src/test/regress/sql/upgrade_columnar_after.sql @@ -31,11 +31,11 @@ SELECT * FROM test_alter_type ORDER BY a; SELECT * FROM matview ORDER BY a; -- test we retained options -SELECT * FROM cstore.options WHERE regclass = 'test_options_1'::regclass; +SELECT * FROM columnar.options WHERE regclass = 'test_options_1'::regclass; VACUUM VERBOSE test_options_1; SELECT count(*), sum(a), sum(b) FROM test_options_1; -SELECT * FROM cstore.options WHERE regclass = 'test_options_2'::regclass; +SELECT * FROM columnar.options WHERE regclass = 'test_options_2'::regclass; VACUUM VERBOSE test_options_2; SELECT count(*), sum(a), sum(b) FROM test_options_2; diff --git a/src/test/regress/sql/upgrade_columnar_before.sql b/src/test/regress/sql/upgrade_columnar_before.sql index 3222f9559..ac28a6e48 100644 --- a/src/test/regress/sql/upgrade_columnar_before.sql +++ b/src/test/regress/sql/upgrade_columnar_before.sql @@ -95,9 +95,9 @@ SELECT :relfilenode_pre_alter <> :relfilenode_post_alter AS relfilenode_changed; -- Test that we retain options -- -SET cstore.stripe_row_count TO 5000; -SET cstore.chunk_row_count TO 1000; -SET cstore.compression TO 'pglz'; +SET columnar.stripe_row_count TO 5000; +SET columnar.chunk_row_count TO 1000; +SET columnar.compression TO 'pglz'; CREATE TABLE test_options_1(a int, b int) USING columnar; INSERT INTO test_options_1 SELECT i, floor(i/1000) FROM generate_series(1, 10000) i;