From c748415948ce423c08e6f7cc0e87d11787b16bab Mon Sep 17 00:00:00 2001 From: TotaJ Date: Fri, 31 Dec 2021 16:29:45 +0800 Subject: [PATCH] Fix fastcheck_single unstable. --- src/test/regress/expected/hw_cursor_part1.out | 19 +++++++++--------- src/test/regress/expected/hw_cursor_part2.out | 1 + src/test/regress/expected/hw_cursor_part3.out | 3 +-- src/test/regress/expected/hw_cursor_part4.out | 1 + src/test/regress/expected/hw_cursor_part5.out | 1 + src/test/regress/expected/hw_cursor_part6.out | 1 + src/test/regress/expected/hw_cursor_part7.out | 1 + src/test/regress/expected/hw_cursor_part8.out | 1 + src/test/regress/parallel_schedule0 | 3 +-- src/test/regress/sql/hw_cursor_part1.sql | 20 +++++++++---------- src/test/regress/sql/hw_cursor_part2.sql | 2 +- src/test/regress/sql/hw_cursor_part3.sql | 4 +--- src/test/regress/sql/hw_cursor_part4.sql | 2 +- src/test/regress/sql/hw_cursor_part5.sql | 2 +- src/test/regress/sql/hw_cursor_part6.sql | 2 +- src/test/regress/sql/hw_cursor_part7.sql | 2 +- src/test/regress/sql/hw_cursor_part8.sql | 2 +- 17 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/test/regress/expected/hw_cursor_part1.out b/src/test/regress/expected/hw_cursor_part1.out index bc15b6b95..317049334 100644 --- a/src/test/regress/expected/hw_cursor_part1.out +++ b/src/test/regress/expected/hw_cursor_part1.out @@ -2,6 +2,7 @@ create database pl_test_cursor_part1 DBCOMPATIBILITY 'pg'; \c pl_test_cursor_part1; create schema hw_cursor_part1; set current_schema = hw_cursor_part1; +set behavior_compat_options = 'skip_insert_gs_source'; create table company(name varchar(100), loc varchar(100), no integer); insert into company values ('macrosoft', 'usa', 001); insert into company values ('oracle', 'usa', 002); @@ -605,15 +606,15 @@ DECLARE CURSOR CURS1 IS SELECT * FROM TEST_TB order by 1; TEMP INTEGER:=0; BEGIN - if not CURS1%isopen then + if not CURS1%isopen then raise notice '%','curosr is open'; - end if; - FOR VARA IN CURS1 LOOP + end if; + FOR VARA IN CURS1 LOOP raise notice '%',CURS1%ROWCOUNT; - END LOOP; - if not CURS1%isopen then + END LOOP; + if not CURS1%isopen then raise notice '%','curosr is open'; - end if; + end if; END; / NOTICE: curosr is open @@ -686,10 +687,10 @@ BEGIN sqlstr := 'select first_name,phone_number,salary from staffs where section_id = :1'; OPEN my_cur FOR sqlstr USING '30'; - if (my_cur%isopen) then + if (my_cur%isopen) then raise notice '%','cursor is open'; - end if; - + end if; + FETCH my_cur INTO name, phone_number, salary; WHILE my_cur%FOUND LOOP raise notice '% # % # %',name,phone_number,salary; diff --git a/src/test/regress/expected/hw_cursor_part2.out b/src/test/regress/expected/hw_cursor_part2.out index 293c64a8b..831d6f7fc 100644 --- a/src/test/regress/expected/hw_cursor_part2.out +++ b/src/test/regress/expected/hw_cursor_part2.out @@ -5,6 +5,7 @@ create database pl_test_cursor_part2 DBCOMPATIBILITY 'pg'; \c pl_test_cursor_part2; create schema hw_cursor_part2; set current_schema = hw_cursor_part2; +set behavior_compat_options = 'skip_insert_gs_source'; create table t1(v1 int,v2 varchar2(100)); insert into t1 values (1,'abc1'); insert into t1 values (2,'abc2'); diff --git a/src/test/regress/expected/hw_cursor_part3.out b/src/test/regress/expected/hw_cursor_part3.out index 7ce85fb8f..3bf6e09e9 100644 --- a/src/test/regress/expected/hw_cursor_part3.out +++ b/src/test/regress/expected/hw_cursor_part3.out @@ -6,6 +6,7 @@ create database pl_test_cursor_part3 DBCOMPATIBILITY 'pg'; \c pl_test_cursor_part3; CREATE schema hw_cursor_part3; set current_schema = hw_cursor_part3; +set behavior_compat_options = 'skip_insert_gs_source'; create table t1(v1 int,v2 varchar2(100)); insert into t1 values (1,'abc1'); insert into t1 values (2,'abc2'); @@ -182,7 +183,6 @@ begin close cur; end; / -\set VERBOSITY terse call sp_testsp_delete(); NOTICE: test delete: sql%isopen=false NOTICE: test delete: sql%notfound=true @@ -195,7 +195,6 @@ NOTICE: test delete: sql%rowcount=3 (1 row) -\set VERBOSITY default create table JOINT_DEBUG_CURSOR_FUNC_TABLE_012(C_INT integer,C_CHAR char(10)) ; insert into JOINT_DEBUG_CURSOR_FUNC_TABLE_012 values(10,'hello'); insert into JOINT_DEBUG_CURSOR_FUNC_TABLE_012 values(10,'nihao'); diff --git a/src/test/regress/expected/hw_cursor_part4.out b/src/test/regress/expected/hw_cursor_part4.out index df7f3a275..cc7ec32b9 100644 --- a/src/test/regress/expected/hw_cursor_part4.out +++ b/src/test/regress/expected/hw_cursor_part4.out @@ -2,6 +2,7 @@ -------------------------------------------------------------------------------- CREATE schema hw_cursor_part4; set current_schema = hw_cursor_part4; +set behavior_compat_options = 'skip_insert_gs_source'; CREATE TABLE TBL(V1 INTEGER); INSERT INTO TBL VALUES(1); INSERT INTO TBL VALUES(2); diff --git a/src/test/regress/expected/hw_cursor_part5.out b/src/test/regress/expected/hw_cursor_part5.out index 61eca5e52..196512360 100644 --- a/src/test/regress/expected/hw_cursor_part5.out +++ b/src/test/regress/expected/hw_cursor_part5.out @@ -1,5 +1,6 @@ CREATE schema hw_cursor_part5; set current_schema = hw_cursor_part5; +set behavior_compat_options = 'skip_insert_gs_source'; CREATE TABLE TEST_TB(ID INTEGER); INSERT INTO TEST_TB VALUES(123); INSERT INTO TEST_TB VALUES(124); diff --git a/src/test/regress/expected/hw_cursor_part6.out b/src/test/regress/expected/hw_cursor_part6.out index ad171f7f9..c0069e0b6 100644 --- a/src/test/regress/expected/hw_cursor_part6.out +++ b/src/test/regress/expected/hw_cursor_part6.out @@ -1,5 +1,6 @@ CREATE schema hw_cursor_part6; set current_schema = hw_cursor_part6; +set behavior_compat_options = 'skip_insert_gs_source'; create table company(name varchar(100), loc varchar(100), no integer); insert into company values ('macrosoft', 'usa', 001); insert into company values ('oracle', 'usa', 002); diff --git a/src/test/regress/expected/hw_cursor_part7.out b/src/test/regress/expected/hw_cursor_part7.out index d183630a9..ce318a518 100644 --- a/src/test/regress/expected/hw_cursor_part7.out +++ b/src/test/regress/expected/hw_cursor_part7.out @@ -3,6 +3,7 @@ ------------------------------------------------------------------------------ create schema hw_cursor_part7; set current_schema = hw_cursor_part7; +set behavior_compat_options = 'skip_insert_gs_source'; create table t1(v1 int,v2 varchar2(100)); insert into t1 values (1,'abc1'); insert into t1 values (2,'abc2'); diff --git a/src/test/regress/expected/hw_cursor_part8.out b/src/test/regress/expected/hw_cursor_part8.out index 56019bf38..f777101b1 100644 --- a/src/test/regress/expected/hw_cursor_part8.out +++ b/src/test/regress/expected/hw_cursor_part8.out @@ -2,6 +2,7 @@ create database pl_test_cursor_part8 DBCOMPATIBILITY 'pg'; \c pl_test_cursor_part8; CREATE schema hw_cursor_part8; SET current_schema = hw_cursor_part8; +set behavior_compat_options = 'skip_insert_gs_source'; CREATE TABLE TEST_TB(ID INTEGER); INSERT INTO TEST_TB VALUES(123); INSERT INTO TEST_TB VALUES(124); diff --git a/src/test/regress/parallel_schedule0 b/src/test/regress/parallel_schedule0 index fd0c416e3..258bcc4af 100644 --- a/src/test/regress/parallel_schedule0 +++ b/src/test/regress/parallel_schedule0 @@ -542,8 +542,7 @@ test: hw_function_p_3 hw_function_p_4 test: create_c_function test: cstore_replication_table_delete -test: hw_cursor_part1 hw_cursor_part2 hw_cursor_part3 hw_cursor_part4 hw_cursor_part7 -#test: hw_cursor_part8 hw_cursor_part5 hw_cursor_part6 +test: hw_cursor_part1 hw_cursor_part2 hw_cursor_part3 hw_cursor_part4 hw_cursor_part7 hw_cursor_part8 hw_cursor_part5 hw_cursor_part6 test: vec_append_part1 vec_append_part2 vec_append_part3 test: vec_cursor_part1 vec_cursor_part2 test: vec_delete_part1 vec_delete_part2 diff --git a/src/test/regress/sql/hw_cursor_part1.sql b/src/test/regress/sql/hw_cursor_part1.sql index 0a363cc87..d545bf203 100644 --- a/src/test/regress/sql/hw_cursor_part1.sql +++ b/src/test/regress/sql/hw_cursor_part1.sql @@ -3,7 +3,7 @@ create database pl_test_cursor_part1 DBCOMPATIBILITY 'pg'; create schema hw_cursor_part1; set current_schema = hw_cursor_part1; - +set behavior_compat_options = 'skip_insert_gs_source'; create table company(name varchar(100), loc varchar(100), no integer); insert into company values ('macrosoft', 'usa', 001); @@ -474,15 +474,15 @@ DECLARE CURSOR CURS1 IS SELECT * FROM TEST_TB order by 1; TEMP INTEGER:=0; BEGIN - if not CURS1%isopen then + if not CURS1%isopen then raise notice '%','curosr is open'; - end if; - FOR VARA IN CURS1 LOOP + end if; + FOR VARA IN CURS1 LOOP raise notice '%',CURS1%ROWCOUNT; - END LOOP; - if not CURS1%isopen then + END LOOP; + if not CURS1%isopen then raise notice '%','curosr is open'; - end if; + end if; END; / @@ -537,10 +537,10 @@ BEGIN sqlstr := 'select first_name,phone_number,salary from staffs where section_id = :1'; OPEN my_cur FOR sqlstr USING '30'; - if (my_cur%isopen) then + if (my_cur%isopen) then raise notice '%','cursor is open'; - end if; - + end if; + FETCH my_cur INTO name, phone_number, salary; WHILE my_cur%FOUND LOOP raise notice '% # % # %',name,phone_number,salary; diff --git a/src/test/regress/sql/hw_cursor_part2.sql b/src/test/regress/sql/hw_cursor_part2.sql index e17436561..e50306268 100644 --- a/src/test/regress/sql/hw_cursor_part2.sql +++ b/src/test/regress/sql/hw_cursor_part2.sql @@ -5,7 +5,7 @@ create database pl_test_cursor_part2 DBCOMPATIBILITY 'pg'; \c pl_test_cursor_part2; create schema hw_cursor_part2; set current_schema = hw_cursor_part2; - +set behavior_compat_options = 'skip_insert_gs_source'; create table t1(v1 int,v2 varchar2(100)); insert into t1 values (1,'abc1'); insert into t1 values (2,'abc2'); diff --git a/src/test/regress/sql/hw_cursor_part3.sql b/src/test/regress/sql/hw_cursor_part3.sql index e4ec409ca..b1c999612 100644 --- a/src/test/regress/sql/hw_cursor_part3.sql +++ b/src/test/regress/sql/hw_cursor_part3.sql @@ -6,7 +6,7 @@ create database pl_test_cursor_part3 DBCOMPATIBILITY 'pg'; \c pl_test_cursor_part3; CREATE schema hw_cursor_part3; set current_schema = hw_cursor_part3; - +set behavior_compat_options = 'skip_insert_gs_source'; create table t1(v1 int,v2 varchar2(100)); insert into t1 values (1,'abc1'); insert into t1 values (2,'abc2'); @@ -160,9 +160,7 @@ begin close cur; end; / -\set VERBOSITY terse call sp_testsp_delete(); -\set VERBOSITY default create table JOINT_DEBUG_CURSOR_FUNC_TABLE_012(C_INT integer,C_CHAR char(10)) ; diff --git a/src/test/regress/sql/hw_cursor_part4.sql b/src/test/regress/sql/hw_cursor_part4.sql index 413134711..babf0c158 100644 --- a/src/test/regress/sql/hw_cursor_part4.sql +++ b/src/test/regress/sql/hw_cursor_part4.sql @@ -2,7 +2,7 @@ -------------------------------------------------------------------------------- CREATE schema hw_cursor_part4; set current_schema = hw_cursor_part4; - +set behavior_compat_options = 'skip_insert_gs_source'; CREATE TABLE TBL(V1 INTEGER); INSERT INTO TBL VALUES(1); INSERT INTO TBL VALUES(2); diff --git a/src/test/regress/sql/hw_cursor_part5.sql b/src/test/regress/sql/hw_cursor_part5.sql index 5d7109eee..52511c9a2 100644 --- a/src/test/regress/sql/hw_cursor_part5.sql +++ b/src/test/regress/sql/hw_cursor_part5.sql @@ -1,6 +1,6 @@ CREATE schema hw_cursor_part5; set current_schema = hw_cursor_part5; - +set behavior_compat_options = 'skip_insert_gs_source'; CREATE TABLE TEST_TB(ID INTEGER); INSERT INTO TEST_TB VALUES(123); INSERT INTO TEST_TB VALUES(124); diff --git a/src/test/regress/sql/hw_cursor_part6.sql b/src/test/regress/sql/hw_cursor_part6.sql index d9732370a..14054fd10 100644 --- a/src/test/regress/sql/hw_cursor_part6.sql +++ b/src/test/regress/sql/hw_cursor_part6.sql @@ -1,6 +1,6 @@ CREATE schema hw_cursor_part6; set current_schema = hw_cursor_part6; - +set behavior_compat_options = 'skip_insert_gs_source'; create table company(name varchar(100), loc varchar(100), no integer); insert into company values ('macrosoft', 'usa', 001); diff --git a/src/test/regress/sql/hw_cursor_part7.sql b/src/test/regress/sql/hw_cursor_part7.sql index 4aedd8a89..fbcf6b743 100644 --- a/src/test/regress/sql/hw_cursor_part7.sql +++ b/src/test/regress/sql/hw_cursor_part7.sql @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ create schema hw_cursor_part7; set current_schema = hw_cursor_part7; - +set behavior_compat_options = 'skip_insert_gs_source'; create table t1(v1 int,v2 varchar2(100)); insert into t1 values (1,'abc1'); insert into t1 values (2,'abc2'); diff --git a/src/test/regress/sql/hw_cursor_part8.sql b/src/test/regress/sql/hw_cursor_part8.sql index 6cb7d9838..e013423d0 100644 --- a/src/test/regress/sql/hw_cursor_part8.sql +++ b/src/test/regress/sql/hw_cursor_part8.sql @@ -2,7 +2,7 @@ create database pl_test_cursor_part8 DBCOMPATIBILITY 'pg'; \c pl_test_cursor_part8; CREATE schema hw_cursor_part8; SET current_schema = hw_cursor_part8; - +set behavior_compat_options = 'skip_insert_gs_source'; CREATE TABLE TEST_TB(ID INTEGER); INSERT INTO TEST_TB VALUES(123); INSERT INTO TEST_TB VALUES(124);