From 94c24566bfec545622603f87f2c117838de9ac5c Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 6 Nov 2020 17:27:23 +0100 Subject: [PATCH] fix columnar tests --- src/test/regress/expected/am_drop.out | 9 ++++++--- src/test/regress/expected/am_trigger.out | 12 ++++++++++++ src/test/regress/expected/am_truncate.out | 2 ++ src/test/regress/expected/fdw_drop.out | 9 ++++++--- src/test/regress/expected/fdw_truncate.out | 2 ++ src/test/regress/sql/am_drop.sql | 6 +++--- src/test/regress/sql/fdw_drop.sql | 6 +++--- 7 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/test/regress/expected/am_drop.out b/src/test/regress/expected/am_drop.out index c173a8cf3..255a97693 100644 --- a/src/test/regress/expected/am_drop.out +++ b/src/test/regress/expected/am_drop.out @@ -37,14 +37,17 @@ SELECT :cstore_data_files_before_drop - count(*) FROM cstore.cstore_data_files; SELECT current_database() datname \gset CREATE DATABASE db_to_drop; +NOTICE: Citus partially supports CREATE DATABASE for distributed databases +DETAIL: Citus does not propagate CREATE DATABASE command to workers +HINT: You can manually create a database and its extensions on workers. \c db_to_drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset CREATE TABLE test_table(data int) USING cstore_tableam; -DROP EXTENSION cstore_fdw CASCADE; +DROP EXTENSION citus CASCADE; NOTICE: drop cascades to table test_table -- test database drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset CREATE TABLE test_table(data int) USING cstore_tableam; \c :datname diff --git a/src/test/regress/expected/am_trigger.out b/src/test/regress/expected/am_trigger.out index 53b2c9d9e..f289b7dad 100644 --- a/src/test/regress/expected/am_trigger.out +++ b/src/test/regress/expected/am_trigger.out @@ -50,16 +50,28 @@ ERROR: AFTER ROW triggers are not supported for columnstore access method HINT: Consider an AFTER STATEMENT trigger instead. insert into test_tr values(1); NOTICE: BEFORE STATEMENT INSERT +CONTEXT: PL/pgSQL function trs_before() line 3 at RAISE NOTICE: BEFORE ROW INSERT: (1) +CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE NOTICE: AFTER STATEMENT INSERT +CONTEXT: PL/pgSQL function trs_after() line 5 at RAISE NOTICE: (1) +CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE insert into test_tr values(2),(3),(4); NOTICE: BEFORE STATEMENT INSERT +CONTEXT: PL/pgSQL function trs_before() line 3 at RAISE NOTICE: BEFORE ROW INSERT: (2) +CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE NOTICE: BEFORE ROW INSERT: (3) +CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE NOTICE: BEFORE ROW INSERT: (4) +CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE NOTICE: AFTER STATEMENT INSERT +CONTEXT: PL/pgSQL function trs_after() line 5 at RAISE NOTICE: (2) +CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE NOTICE: (3) +CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE NOTICE: (4) +CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE drop table test_tr; diff --git a/src/test/regress/expected/am_truncate.out b/src/test/regress/expected/am_truncate.out index 1b0c2f5a5..cfa13bef5 100644 --- a/src/test/regress/expected/am_truncate.out +++ b/src/test/regress/expected/am_truncate.out @@ -226,6 +226,8 @@ INSERT INTO truncate_schema.truncate_tbl SELECT generate_series(1, 100); set cstore.compression to default; -- create a user that can not truncate CREATE USER truncate_user; +NOTICE: not propagating CREATE ROLE/USER commands to worker nodes +HINT: Connect to worker nodes directly to manually create all necessary users and roles. GRANT USAGE ON SCHEMA truncate_schema TO truncate_user; GRANT SELECT ON TABLE truncate_schema.truncate_tbl TO truncate_user; REVOKE TRUNCATE ON TABLE truncate_schema.truncate_tbl FROM truncate_user; diff --git a/src/test/regress/expected/fdw_drop.out b/src/test/regress/expected/fdw_drop.out index 98f3b2191..def073b20 100644 --- a/src/test/regress/expected/fdw_drop.out +++ b/src/test/regress/expected/fdw_drop.out @@ -37,17 +37,20 @@ SELECT :cstore_data_files_before_drop - count(*) FROM cstore.cstore_data_files; SELECT current_database() datname \gset CREATE DATABASE db_to_drop; +NOTICE: Citus partially supports CREATE DATABASE for distributed databases +DETAIL: Citus does not propagate CREATE DATABASE command to workers +HINT: You can manually create a database and its extensions on workers. \c db_to_drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; CREATE SERVER cstore_server FOREIGN DATA WRAPPER cstore_fdw; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset CREATE FOREIGN TABLE test_table(data int) SERVER cstore_server; -DROP EXTENSION cstore_fdw CASCADE; +DROP EXTENSION citus CASCADE; NOTICE: drop cascades to 2 other objects DETAIL: drop cascades to server cstore_server drop cascades to foreign table test_table -- test database drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; CREATE SERVER cstore_server FOREIGN DATA WRAPPER cstore_fdw; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset CREATE FOREIGN TABLE test_table(data int) SERVER cstore_server; diff --git a/src/test/regress/expected/fdw_truncate.out b/src/test/regress/expected/fdw_truncate.out index 134e011cb..a2c95da01 100644 --- a/src/test/regress/expected/fdw_truncate.out +++ b/src/test/regress/expected/fdw_truncate.out @@ -218,6 +218,8 @@ SELECT COUNT(*) FROM truncate_schema.truncate_tbl; INSERT INTO truncate_schema.truncate_tbl SELECT generate_series(1, 100); -- create a user that can not truncate CREATE USER truncate_user; +NOTICE: not propagating CREATE ROLE/USER commands to worker nodes +HINT: Connect to worker nodes directly to manually create all necessary users and roles. GRANT USAGE ON SCHEMA truncate_schema TO truncate_user; GRANT SELECT ON TABLE truncate_schema.truncate_tbl TO truncate_user; REVOKE TRUNCATE ON TABLE truncate_schema.truncate_tbl FROM truncate_user; diff --git a/src/test/regress/sql/am_drop.sql b/src/test/regress/sql/am_drop.sql index 080712881..7958a1407 100644 --- a/src/test/regress/sql/am_drop.sql +++ b/src/test/regress/sql/am_drop.sql @@ -36,15 +36,15 @@ SELECT current_database() datname \gset CREATE DATABASE db_to_drop; \c db_to_drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset CREATE TABLE test_table(data int) USING cstore_tableam; -DROP EXTENSION cstore_fdw CASCADE; +DROP EXTENSION citus CASCADE; -- test database drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset CREATE TABLE test_table(data int) USING cstore_tableam; diff --git a/src/test/regress/sql/fdw_drop.sql b/src/test/regress/sql/fdw_drop.sql index f89374a5a..3246ed016 100644 --- a/src/test/regress/sql/fdw_drop.sql +++ b/src/test/regress/sql/fdw_drop.sql @@ -36,16 +36,16 @@ SELECT current_database() datname \gset CREATE DATABASE db_to_drop; \c db_to_drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; CREATE SERVER cstore_server FOREIGN DATA WRAPPER cstore_fdw; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset CREATE FOREIGN TABLE test_table(data int) SERVER cstore_server; -DROP EXTENSION cstore_fdw CASCADE; +DROP EXTENSION citus CASCADE; -- test database drop -CREATE EXTENSION cstore_fdw; +CREATE EXTENSION citus; CREATE SERVER cstore_server FOREIGN DATA WRAPPER cstore_fdw; SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset