From ea209bd11d7ee8a5c61d0cfe87ae47f663c54d97 Mon Sep 17 00:00:00 2001 From: naisila Date: Mon, 8 Aug 2022 22:39:33 +0300 Subject: [PATCH] Rename remaining regclass to relation in columnar.options --- src/test/regress/expected/columnar_pg15.out | 19 +++++++------------ src/test/regress/sql/columnar_pg15.sql | 6 +++--- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/test/regress/expected/columnar_pg15.out b/src/test/regress/expected/columnar_pg15.out index 499044fde..2ad95fcaf 100644 --- a/src/test/regress/expected/columnar_pg15.out +++ b/src/test/regress/expected/columnar_pg15.out @@ -6,11 +6,9 @@ SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15 \q \endif CREATE TABLE alter_am(i int); -CREATE TABLE INSERT INTO alter_am SELECT generate_series(1,1000000); -INSERT 0 1000000 -SELECT * FROM columnar.options WHERE regclass = 'alter_am'::regclass; - regclass | chunk_group_row_limit | stripe_row_limit | compression_level | compression +SELECT * FROM columnar.options WHERE relation = 'alter_am'::regclass; + relation | chunk_group_row_limit | stripe_row_limit | compression | compression_level --------------------------------------------------------------------- (0 rows) @@ -23,11 +21,10 @@ SELECT SUM(i) FROM alter_am; ALTER TABLE alter_am SET ACCESS METHOD columnar, SET (columnar.compression = pglz, fillfactor = 20); -ALTER TABLE -SELECT * FROM columnar.options WHERE regclass = 'alter_am'::regclass; - regclass | chunk_group_row_limit | stripe_row_limit | compression_level | compression +SELECT * FROM columnar.options WHERE relation = 'alter_am'::regclass; + relation | chunk_group_row_limit | stripe_row_limit | compression | compression_level --------------------------------------------------------------------- - alter_am | 10000 | 150000 | 3 | pglz + alter_am | 10000 | 150000 | pglz | 3 (1 row) SELECT SUM(i) FROM alter_am; @@ -37,10 +34,9 @@ SELECT SUM(i) FROM alter_am; (1 row) ALTER TABLE alter_am SET ACCESS METHOD heap; -ALTER TABLE -- columnar options should be gone -SELECT * FROM columnar.options WHERE regclass = 'alter_am'::regclass; - regclass | chunk_group_row_limit | stripe_row_limit | compression_level | compression +SELECT * FROM columnar.options WHERE relation = 'alter_am'::regclass; + relation | chunk_group_row_limit | stripe_row_limit | compression | compression_level --------------------------------------------------------------------- (0 rows) @@ -57,4 +53,3 @@ ALTER TABLE alter_am ERROR: ALTER TABLE cannot alter the access method after altering storage parameters HINT: Specify SET ACCESS METHOD before storage parameters, or use separate ALTER TABLE commands. DROP TABLE alter_am; -DROP TABLE diff --git a/src/test/regress/sql/columnar_pg15.sql b/src/test/regress/sql/columnar_pg15.sql index 86117910c..1a0f6afdd 100644 --- a/src/test/regress/sql/columnar_pg15.sql +++ b/src/test/regress/sql/columnar_pg15.sql @@ -10,20 +10,20 @@ CREATE TABLE alter_am(i int); INSERT INTO alter_am SELECT generate_series(1,1000000); -SELECT * FROM columnar.options WHERE regclass = 'alter_am'::regclass; +SELECT * FROM columnar.options WHERE relation = 'alter_am'::regclass; SELECT SUM(i) FROM alter_am; ALTER TABLE alter_am SET ACCESS METHOD columnar, SET (columnar.compression = pglz, fillfactor = 20); -SELECT * FROM columnar.options WHERE regclass = 'alter_am'::regclass; +SELECT * FROM columnar.options WHERE relation = 'alter_am'::regclass; SELECT SUM(i) FROM alter_am; ALTER TABLE alter_am SET ACCESS METHOD heap; -- columnar options should be gone -SELECT * FROM columnar.options WHERE regclass = 'alter_am'::regclass; +SELECT * FROM columnar.options WHERE relation = 'alter_am'::regclass; SELECT SUM(i) FROM alter_am; -- error: setting columnar options must happen after converting to columnar