From 94d506c20f962b2a3e5097f87510994de5f358be Mon Sep 17 00:00:00 2001 From: Abbas Date: Tue, 6 Sep 2011 19:55:00 +0500 Subject: A few fixes for regression test cases and a variable name change --- src/backend/pgxc/plan/planner.c | 8 +- src/test/regress/expected/create_misc_1.out | 157 --------------------------- src/test/regress/expected/transactions_1.out | 4 +- src/test/regress/output/create_misc_1.source | 157 +++++++++++++++++++++++++++ src/test/regress/sql/transactions.sql | 4 +- 5 files changed, 165 insertions(+), 165 deletions(-) delete mode 100644 src/test/regress/expected/create_misc_1.out create mode 100644 src/test/regress/output/create_misc_1.source diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c index 2515e3fd77..9f4b885d97 100644 --- a/src/backend/pgxc/plan/planner.c +++ b/src/backend/pgxc/plan/planner.c @@ -531,7 +531,7 @@ get_plan_nodes_insert(PlannerInfo *root, RemoteQuery *step) Query *query = root->parse; RangeTblEntry *rte; RelationLocInfo *rel_loc_info; - Const *constant = NULL; + Const *constExpr = NULL; ListCell *lc; Expr *eval_expr = NULL; @@ -703,14 +703,14 @@ get_plan_nodes_insert(PlannerInfo *root, RemoteQuery *step) return; } - constant = (Const *) checkexpr; + constExpr = (Const *) checkexpr; } } - if (constant == NULL) + if (constExpr == NULL) step->exec_nodes = GetRelationNodes(rel_loc_info, 0, InvalidOid, RELATION_ACCESS_INSERT); else - step->exec_nodes = GetRelationNodes(rel_loc_info, constant->constvalue, constant->consttype, RELATION_ACCESS_INSERT); + step->exec_nodes = GetRelationNodes(rel_loc_info, constExpr->constvalue, constExpr->consttype, RELATION_ACCESS_INSERT); if (eval_expr) pfree(eval_expr); diff --git a/src/test/regress/expected/create_misc_1.out b/src/test/regress/expected/create_misc_1.out deleted file mode 100644 index 3706e5aff2..0000000000 --- a/src/test/regress/expected/create_misc_1.out +++ /dev/null @@ -1,157 +0,0 @@ --- --- CREATE_MISC --- --- CLASS POPULATION --- (any resemblance to real life is purely coincidental) --- -INSERT INTO tenk2 SELECT * FROM tenk1; -COPY tenk2 FROM '/home/michael/bin/regress/data/tenk.data'; -SELECT * INTO TABLE onek2 FROM onek; -ERROR: INTO clause not yet supported -CREATE TABLE onek2 ( - unique1 int4, - unique2 int4, - two int4, - four int4, - ten int4, - twenty int4, - hundred int4, - thousand int4, - twothousand int4, - fivethous int4, - tenthous int4, - odd int4, - even int4, - stringu1 name, - stringu2 name, - string4 name -); -COPY onek2 FROM '/home/michael/bin/regress/data/onek.data'; -INSERT INTO fast_emp4000 SELECT * FROM slow_emp4000; -SELECT * - INTO TABLE Bprime - FROM tenk1 - WHERE unique2 < 1000; -ERROR: INTO clause not yet supported -INSERT INTO hobbies_r (name, person) - SELECT 'posthacking', p.name - FROM person* p - WHERE p.name = 'mike' or p.name = 'jeff'; -INSERT INTO hobbies_r (name, person) - SELECT 'basketball', p.name - FROM person p - WHERE p.name = 'joe' or p.name = 'sally'; -INSERT INTO hobbies_r (name) VALUES ('skywalking'); -INSERT INTO equipment_r (name, hobby) VALUES ('advil', 'posthacking'); -INSERT INTO equipment_r (name, hobby) VALUES ('peet''s coffee', 'posthacking'); -INSERT INTO equipment_r (name, hobby) VALUES ('hightops', 'basketball'); -INSERT INTO equipment_r (name, hobby) VALUES ('guts', 'skywalking'); -SELECT * - INTO TABLE ramp - FROM road - WHERE name ~ '.*Ramp'; -ERROR: INTO clause not yet supported -INSERT INTO ihighway - SELECT * - FROM road - WHERE name ~ 'I- .*'; -INSERT INTO shighway - SELECT * - FROM road - WHERE name ~ 'State Hwy.*'; -UPDATE shighway - SET surface = 'asphalt'; -INSERT INTO a_star (class, a) VALUES ('a', 1); -INSERT INTO a_star (class, a) VALUES ('a', 2); -INSERT INTO a_star (class) VALUES ('a'); -INSERT INTO b_star (class, a, b) VALUES ('b', 3, 'mumble'::text); -INSERT INTO b_star (class, a) VALUES ('b', 4); -INSERT INTO b_star (class, b) VALUES ('b', 'bumble'::text); -INSERT INTO b_star (class) VALUES ('b'); -INSERT INTO c_star (class, a, c) VALUES ('c', 5, 'hi mom'::name); -INSERT INTO c_star (class, a) VALUES ('c', 6); -INSERT INTO c_star (class, c) VALUES ('c', 'hi paul'::name); -INSERT INTO c_star (class) VALUES ('c'); -INSERT INTO d_star (class, a, b, c, d) - VALUES ('d', 7, 'grumble'::text, 'hi sunita'::name, '0.0'::float8); -INSERT INTO d_star (class, a, b, c) - VALUES ('d', 8, 'stumble'::text, 'hi koko'::name); -INSERT INTO d_star (class, a, b, d) - VALUES ('d', 9, 'rumble'::text, '1.1'::float8); -INSERT INTO d_star (class, a, c, d) - VALUES ('d', 10, 'hi kristin'::name, '10.01'::float8); -INSERT INTO d_star (class, b, c, d) - VALUES ('d', 'crumble'::text, 'hi boris'::name, '100.001'::float8); -INSERT INTO d_star (class, a, b) - VALUES ('d', 11, 'fumble'::text); -INSERT INTO d_star (class, a, c) - VALUES ('d', 12, 'hi avi'::name); -INSERT INTO d_star (class, a, d) - VALUES ('d', 13, '1000.0001'::float8); -INSERT INTO d_star (class, b, c) - VALUES ('d', 'tumble'::text, 'hi andrew'::name); -INSERT INTO d_star (class, b, d) - VALUES ('d', 'humble'::text, '10000.00001'::float8); -INSERT INTO d_star (class, c, d) - VALUES ('d', 'hi ginger'::name, '100000.000001'::float8); -INSERT INTO d_star (class, a) VALUES ('d', 14); -INSERT INTO d_star (class, b) VALUES ('d', 'jumble'::text); -INSERT INTO d_star (class, c) VALUES ('d', 'hi jolly'::name); -INSERT INTO d_star (class, d) VALUES ('d', '1000000.0000001'::float8); -INSERT INTO d_star (class) VALUES ('d'); -INSERT INTO e_star (class, a, c, e) - VALUES ('e', 15, 'hi carol'::name, '-1'::int2); -INSERT INTO e_star (class, a, c) - VALUES ('e', 16, 'hi bob'::name); -INSERT INTO e_star (class, a, e) - VALUES ('e', 17, '-2'::int2); -INSERT INTO e_star (class, c, e) - VALUES ('e', 'hi michelle'::name, '-3'::int2); -INSERT INTO e_star (class, a) - VALUES ('e', 18); -INSERT INTO e_star (class, c) - VALUES ('e', 'hi elisa'::name); -INSERT INTO e_star (class, e) - VALUES ('e', '-4'::int2); -INSERT INTO f_star (class, a, c, e, f) - VALUES ('f', 19, 'hi claire'::name, '-5'::int2, '(1,3),(2,4)'::polygon); -INSERT INTO f_star (class, a, c, e) - VALUES ('f', 20, 'hi mike'::name, '-6'::int2); -INSERT INTO f_star (class, a, c, f) - VALUES ('f', 21, 'hi marcel'::name, '(11,44),(22,55),(33,66)'::polygon); -INSERT INTO f_star (class, a, e, f) - VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon); -INSERT INTO f_star (class, c, e, f) - VALUES ('f', 'hi keith'::name, '-8'::int2, - '(1111,3333),(2222,4444)'::polygon); -INSERT INTO f_star (class, a, c) - VALUES ('f', 24, 'hi marc'::name); -INSERT INTO f_star (class, a, e) - VALUES ('f', 25, '-9'::int2); -INSERT INTO f_star (class, a, f) - VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); -INSERT INTO f_star (class, c, e) - VALUES ('f', 'hi allison'::name, '-10'::int2); -INSERT INTO f_star (class, c, f) - VALUES ('f', 'hi jeff'::name, - '(111111,333333),(222222,444444)'::polygon); -INSERT INTO f_star (class, e, f) - VALUES ('f', '-11'::int2, '(1111111,3333333),(2222222,4444444)'::polygon); -INSERT INTO f_star (class, a) VALUES ('f', 27); -INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::name); -INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); -INSERT INTO f_star (class, f) - VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon); -INSERT INTO f_star (class) VALUES ('f'); --- --- for internal portal (cursor) tests --- -CREATE TABLE iportaltest ( - i int4, - d float4, - p polygon -); -INSERT INTO iportaltest (i, d, p) - VALUES (1, 3.567, '(3.0,1.0),(4.0,2.0)'::polygon); -INSERT INTO iportaltest (i, d, p) - VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon); diff --git a/src/test/regress/expected/transactions_1.out b/src/test/regress/expected/transactions_1.out index 3cf5273814..cfbd1f13f1 100644 --- a/src/test/regress/expected/transactions_1.out +++ b/src/test/regress/expected/transactions_1.out @@ -564,7 +564,7 @@ insert into abc values (5); ERROR: current transaction is aborted, commands ignored until end of transaction block insert into abc values (10); ERROR: current transaction is aborted, commands ignored until end of transaction block -declare foo cursor for select * from abc; +declare foo cursor for select * from abc order by a; ERROR: current transaction is aborted, commands ignored until end of transaction block fetch from foo; ERROR: current transaction is aborted, commands ignored until end of transaction block @@ -579,7 +579,7 @@ create table abc (a int); insert into abc values (5); insert into abc values (10); insert into abc values (15); -declare foo cursor for select * from abc; +declare foo cursor for select * from abc order by a; fetch from foo; a --- diff --git a/src/test/regress/output/create_misc_1.source b/src/test/regress/output/create_misc_1.source new file mode 100644 index 0000000000..3e827fb2a4 --- /dev/null +++ b/src/test/regress/output/create_misc_1.source @@ -0,0 +1,157 @@ +-- +-- CREATE_MISC +-- +-- CLASS POPULATION +-- (any resemblance to real life is purely coincidental) +-- +INSERT INTO tenk2 SELECT * FROM tenk1; +COPY tenk2 FROM '@abs_srcdir@/data/tenk.data'; +SELECT * INTO TABLE onek2 FROM onek; +ERROR: INTO clause not yet supported +CREATE TABLE onek2 ( + unique1 int4, + unique2 int4, + two int4, + four int4, + ten int4, + twenty int4, + hundred int4, + thousand int4, + twothousand int4, + fivethous int4, + tenthous int4, + odd int4, + even int4, + stringu1 name, + stringu2 name, + string4 name +); +COPY onek2 FROM '@abs_srcdir@/data/onek.data'; +INSERT INTO fast_emp4000 SELECT * FROM slow_emp4000; +SELECT * + INTO TABLE Bprime + FROM tenk1 + WHERE unique2 < 1000; +ERROR: INTO clause not yet supported +INSERT INTO hobbies_r (name, person) + SELECT 'posthacking', p.name + FROM person* p + WHERE p.name = 'mike' or p.name = 'jeff'; +INSERT INTO hobbies_r (name, person) + SELECT 'basketball', p.name + FROM person p + WHERE p.name = 'joe' or p.name = 'sally'; +INSERT INTO hobbies_r (name) VALUES ('skywalking'); +INSERT INTO equipment_r (name, hobby) VALUES ('advil', 'posthacking'); +INSERT INTO equipment_r (name, hobby) VALUES ('peet''s coffee', 'posthacking'); +INSERT INTO equipment_r (name, hobby) VALUES ('hightops', 'basketball'); +INSERT INTO equipment_r (name, hobby) VALUES ('guts', 'skywalking'); +SELECT * + INTO TABLE ramp + FROM road + WHERE name ~ '.*Ramp'; +ERROR: INTO clause not yet supported +INSERT INTO ihighway + SELECT * + FROM road + WHERE name ~ 'I- .*'; +INSERT INTO shighway + SELECT * + FROM road + WHERE name ~ 'State Hwy.*'; +UPDATE shighway + SET surface = 'asphalt'; +INSERT INTO a_star (class, a) VALUES ('a', 1); +INSERT INTO a_star (class, a) VALUES ('a', 2); +INSERT INTO a_star (class) VALUES ('a'); +INSERT INTO b_star (class, a, b) VALUES ('b', 3, 'mumble'::text); +INSERT INTO b_star (class, a) VALUES ('b', 4); +INSERT INTO b_star (class, b) VALUES ('b', 'bumble'::text); +INSERT INTO b_star (class) VALUES ('b'); +INSERT INTO c_star (class, a, c) VALUES ('c', 5, 'hi mom'::name); +INSERT INTO c_star (class, a) VALUES ('c', 6); +INSERT INTO c_star (class, c) VALUES ('c', 'hi paul'::name); +INSERT INTO c_star (class) VALUES ('c'); +INSERT INTO d_star (class, a, b, c, d) + VALUES ('d', 7, 'grumble'::text, 'hi sunita'::name, '0.0'::float8); +INSERT INTO d_star (class, a, b, c) + VALUES ('d', 8, 'stumble'::text, 'hi koko'::name); +INSERT INTO d_star (class, a, b, d) + VALUES ('d', 9, 'rumble'::text, '1.1'::float8); +INSERT INTO d_star (class, a, c, d) + VALUES ('d', 10, 'hi kristin'::name, '10.01'::float8); +INSERT INTO d_star (class, b, c, d) + VALUES ('d', 'crumble'::text, 'hi boris'::name, '100.001'::float8); +INSERT INTO d_star (class, a, b) + VALUES ('d', 11, 'fumble'::text); +INSERT INTO d_star (class, a, c) + VALUES ('d', 12, 'hi avi'::name); +INSERT INTO d_star (class, a, d) + VALUES ('d', 13, '1000.0001'::float8); +INSERT INTO d_star (class, b, c) + VALUES ('d', 'tumble'::text, 'hi andrew'::name); +INSERT INTO d_star (class, b, d) + VALUES ('d', 'humble'::text, '10000.00001'::float8); +INSERT INTO d_star (class, c, d) + VALUES ('d', 'hi ginger'::name, '100000.000001'::float8); +INSERT INTO d_star (class, a) VALUES ('d', 14); +INSERT INTO d_star (class, b) VALUES ('d', 'jumble'::text); +INSERT INTO d_star (class, c) VALUES ('d', 'hi jolly'::name); +INSERT INTO d_star (class, d) VALUES ('d', '1000000.0000001'::float8); +INSERT INTO d_star (class) VALUES ('d'); +INSERT INTO e_star (class, a, c, e) + VALUES ('e', 15, 'hi carol'::name, '-1'::int2); +INSERT INTO e_star (class, a, c) + VALUES ('e', 16, 'hi bob'::name); +INSERT INTO e_star (class, a, e) + VALUES ('e', 17, '-2'::int2); +INSERT INTO e_star (class, c, e) + VALUES ('e', 'hi michelle'::name, '-3'::int2); +INSERT INTO e_star (class, a) + VALUES ('e', 18); +INSERT INTO e_star (class, c) + VALUES ('e', 'hi elisa'::name); +INSERT INTO e_star (class, e) + VALUES ('e', '-4'::int2); +INSERT INTO f_star (class, a, c, e, f) + VALUES ('f', 19, 'hi claire'::name, '-5'::int2, '(1,3),(2,4)'::polygon); +INSERT INTO f_star (class, a, c, e) + VALUES ('f', 20, 'hi mike'::name, '-6'::int2); +INSERT INTO f_star (class, a, c, f) + VALUES ('f', 21, 'hi marcel'::name, '(11,44),(22,55),(33,66)'::polygon); +INSERT INTO f_star (class, a, e, f) + VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon); +INSERT INTO f_star (class, c, e, f) + VALUES ('f', 'hi keith'::name, '-8'::int2, + '(1111,3333),(2222,4444)'::polygon); +INSERT INTO f_star (class, a, c) + VALUES ('f', 24, 'hi marc'::name); +INSERT INTO f_star (class, a, e) + VALUES ('f', 25, '-9'::int2); +INSERT INTO f_star (class, a, f) + VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); +INSERT INTO f_star (class, c, e) + VALUES ('f', 'hi allison'::name, '-10'::int2); +INSERT INTO f_star (class, c, f) + VALUES ('f', 'hi jeff'::name, + '(111111,333333),(222222,444444)'::polygon); +INSERT INTO f_star (class, e, f) + VALUES ('f', '-11'::int2, '(1111111,3333333),(2222222,4444444)'::polygon); +INSERT INTO f_star (class, a) VALUES ('f', 27); +INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::name); +INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); +INSERT INTO f_star (class, f) + VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon); +INSERT INTO f_star (class) VALUES ('f'); +-- +-- for internal portal (cursor) tests +-- +CREATE TABLE iportaltest ( + i int4, + d float4, + p polygon +); +INSERT INTO iportaltest (i, d, p) + VALUES (1, 3.567, '(3.0,1.0),(4.0,2.0)'::polygon); +INSERT INTO iportaltest (i, d, p) + VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon); diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql index 2788308e9c..dc33e7b694 100644 --- a/src/test/regress/sql/transactions.sql +++ b/src/test/regress/sql/transactions.sql @@ -342,7 +342,7 @@ savepoint x; create table abc (a int); insert into abc values (5); insert into abc values (10); -declare foo cursor for select * from abc; +declare foo cursor for select * from abc order by a; fetch from foo; rollback to x; @@ -356,7 +356,7 @@ create table abc (a int); insert into abc values (5); insert into abc values (10); insert into abc values (15); -declare foo cursor for select * from abc; +declare foo cursor for select * from abc order by a; fetch from foo; -- cgit v1.2.3