external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5750 from citusdata/fix_test_ent 

Unblock enterprise regression test failures
pull/5556/head
Burak Velioglu 2022-03-02 14:45:37 +03:00 committed by GitHub
parent 43f798c476 98751058a9
commit 95fdbe1370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/regress/expected/distributed_triggers.out
View File

@ -386,7 +386,7 @@ ORDER BY shard_key_value, object_id, change_id;
-- Triggers (tables) which are not colocated -- Triggers (tables) which are not colocated
-- --
CREATE TABLE emptest ( CREATE TABLE emptest (
empname text NOT NULL, empname text NOT NULL PRIMARY KEY,
salary integer salary integer
); );
CREATE TABLE emptest_audit( CREATE TABLE emptest_audit(
@ -394,7 +394,8 @@ CREATE TABLE emptest_audit(
stamp timestamp NOT NULL, stamp timestamp NOT NULL,
userid text NOT NULL, userid text NOT NULL,
empname text NOT NULL, empname text NOT NULL,
salary integer salary integer,
PRIMARY KEY (empname, userid, stamp, operation, salary)
); );
SELECT create_distributed_table('emptest','empname',colocate_with :='none'); SELECT create_distributed_table('emptest','empname',colocate_with :='none');
create_distributed_table create_distributed_table
@ -477,6 +478,7 @@ CREATE TABLE record_op (
operation_type text not null, operation_type text not null,
stamp timestamp NOT NULL stamp timestamp NOT NULL
); );
ALTER TABLE record_op REPLICA IDENTITY FULL;
SELECT create_distributed_table('record_op', 'empname', colocate_with := 'emptest'); SELECT create_distributed_table('record_op', 'empname', colocate_with := 'emptest');
create_distributed_table create_distributed_table
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -654,7 +656,7 @@ PARTITION BY list (state_code);
ALTER TABLE sale ADD CONSTRAINT sale_pk PRIMARY KEY (state_code, sale_date); ALTER TABLE sale ADD CONSTRAINT sale_pk PRIMARY KEY (state_code, sale_date);
CREATE TABLE sale_newyork PARTITION OF sale FOR VALUES IN ('NY'); CREATE TABLE sale_newyork PARTITION OF sale FOR VALUES IN ('NY');
CREATE TABLE sale_california PARTITION OF sale FOR VALUES IN ('CA'); CREATE TABLE sale_california PARTITION OF sale FOR VALUES IN ('CA');
CREATE TABLE record_sale(operation_type text not null, product_sku text, state_code text); CREATE TABLE record_sale(operation_type text not null, product_sku text, state_code text, units integer, PRIMARY KEY(state_code, product_sku, operation_type, units));
SELECT create_distributed_table('sale', 'state_code'); SELECT create_distributed_table('sale', 'state_code');
create_distributed_table create_distributed_table
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -671,8 +673,8 @@ CREATE OR REPLACE FUNCTION record_sale()
RETURNS trigger RETURNS trigger
AS $$ AS $$
BEGIN BEGIN
INSERT INTO distributed_triggers.record_sale(operation_type, product_sku, state_code) INSERT INTO distributed_triggers.record_sale(operation_type, product_sku, state_code, units)
VALUES (TG_OP, NEW.product_sku, NEW.state_code); VALUES (TG_OP, NEW.product_sku, NEW.state_code, NEW.units);
RETURN NULL; RETURN NULL;
END; END;
$$ LANGUAGE plpgsql; $$ LANGUAGE plpgsql;
@ -697,7 +699,7 @@ TABLE sale ORDER BY state_code, sale_date;
02-03-2019 | NY | AZ-000A1 | 47 02-03-2019 | NY | AZ-000A1 | 47
(6 rows) (6 rows)
TABLE record_sale ORDER BY 1,2,3; SELECT operation_type, product_sku, state_code FROM record_sale ORDER BY 1,2,3;
operation_type | product_sku | state_code operation_type | product_sku | state_code
--------------------------------------------------------------------- ---------------------------------------------------------------------
INSERT | AZ-000A1 | CA INSERT | AZ-000A1 | CA

15
src/test/regress/sql/distributed_triggers.sql
View File

@ -218,7 +218,7 @@ ORDER BY shard_key_value, object_id, change_id;
-- Triggers (tables) which are not colocated -- Triggers (tables) which are not colocated
-- --
CREATE TABLE emptest ( CREATE TABLE emptest (
empname text NOT NULL, empname text NOT NULL PRIMARY KEY,
salary integer salary integer
); );
@ -227,7 +227,8 @@ CREATE TABLE emptest_audit(
stamp timestamp NOT NULL, stamp timestamp NOT NULL,
userid text NOT NULL, userid text NOT NULL,
empname text NOT NULL, empname text NOT NULL,
salary integer salary integer,
PRIMARY KEY (empname, userid, stamp, operation, salary)
); );
SELECT create_distributed_table('emptest','empname',colocate_with :='none'); SELECT create_distributed_table('emptest','empname',colocate_with :='none');
@ -282,6 +283,8 @@ CREATE TABLE record_op (
operation_type text not null, operation_type text not null,
stamp timestamp NOT NULL stamp timestamp NOT NULL
); );
ALTER TABLE record_op REPLICA IDENTITY FULL;
SELECT create_distributed_table('record_op', 'empname', colocate_with := 'emptest'); SELECT create_distributed_table('record_op', 'empname', colocate_with := 'emptest');
CREATE OR REPLACE FUNCTION record_emp() RETURNS TRIGGER AS $rec_audit$ CREATE OR REPLACE FUNCTION record_emp() RETURNS TRIGGER AS $rec_audit$
BEGIN BEGIN
@ -376,7 +379,7 @@ ALTER TABLE sale ADD CONSTRAINT sale_pk PRIMARY KEY (state_code, sale_date);
CREATE TABLE sale_newyork PARTITION OF sale FOR VALUES IN ('NY'); CREATE TABLE sale_newyork PARTITION OF sale FOR VALUES IN ('NY');
CREATE TABLE sale_california PARTITION OF sale FOR VALUES IN ('CA'); CREATE TABLE sale_california PARTITION OF sale FOR VALUES IN ('CA');
CREATE TABLE record_sale(operation_type text not null, product_sku text, state_code text); CREATE TABLE record_sale(operation_type text not null, product_sku text, state_code text, units integer, PRIMARY KEY(state_code, product_sku, operation_type, units));
SELECT create_distributed_table('sale', 'state_code'); SELECT create_distributed_table('sale', 'state_code');
SELECT create_distributed_table('record_sale', 'state_code', colocate_with := 'sale'); SELECT create_distributed_table('record_sale', 'state_code', colocate_with := 'sale');
@ -385,8 +388,8 @@ CREATE OR REPLACE FUNCTION record_sale()
RETURNS trigger RETURNS trigger
AS $$ AS $$
BEGIN BEGIN
INSERT INTO distributed_triggers.record_sale(operation_type, product_sku, state_code) INSERT INTO distributed_triggers.record_sale(operation_type, product_sku, state_code, units)
VALUES (TG_OP, NEW.product_sku, NEW.state_code); VALUES (TG_OP, NEW.product_sku, NEW.state_code, NEW.units);
RETURN NULL; RETURN NULL;
END; END;
$$ LANGUAGE plpgsql; $$ LANGUAGE plpgsql;
@ -403,7 +406,7 @@ INSERT INTO sale(sale_date,state_code,product_sku,units) VALUES
('2019-02-03', 'NY', 'AZ-000A1', 47); ('2019-02-03', 'NY', 'AZ-000A1', 47);
TABLE sale ORDER BY state_code, sale_date; TABLE sale ORDER BY state_code, sale_date;
TABLE record_sale ORDER BY 1,2,3; SELECT operation_type, product_sku, state_code FROM record_sale ORDER BY 1,2,3;
-- --
--Test ALTER TRIGGER --Test ALTER TRIGGER