hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3430 优化gstrace_options、gaussdb_options、gsql_options、gsbasebackup_options、gsdump_options、gsloader_options测试用例

Browse Source 
Merge pull request !3430 from Ruixiang Li/optimizeFastCheck
This commit is contained in:
opengauss-bot
2023-05-09 01:46:32 +00:00
committed by Gitee
parent 4e9ba80d26 16833b27c7
commit afdc6a0ac3
9 changed files with 86 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/test/regress/input/gsbasebackup_options.source
View File

@ -1,15 +1,17 @@
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -p -D @abs_srcdir@/tmp_check/bktempdir/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -D @abs_srcdir@/tmp_check/bktempdir/ -p
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -p @portstring@d -D @abs_srcdir@/tmp_check/bktempdir/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -hlocalhost -p@portstring@ -D@abs_srcdir@/tmp_check/bktempdir/ 2>&1 |grep successfully
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -p @portstring@ -D @abs_srcdir@/tmp_check/bktempdir/ 2>&1 |grep successfully
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
--pre
\! mkdir @abs_srcdir@/tmp_check/bktempdir1/
\! mkdir @abs_srcdir@/tmp_check/bktempdir2/
\! mkdir @abs_srcdir@/tmp_check/bktempdir3/
\! mkdir @abs_srcdir@/tmp_check/bktempdir4/
--run
\! @abs_bindir@/gs_basebackup -h localhost -p -D @abs_srcdir@/tmp_check/bktempdir1/
\! @abs_bindir@/gs_basebackup -h localhost -D @abs_srcdir@/tmp_check/bktempdir2/ -p
\! @abs_bindir@/gs_basebackup -h localhost -p @portstring@d -D @abs_srcdir@/tmp_check/bktempdir3/
\! @abs_bindir@/gs_basebackup -hlocalhost -p@portstring@ -D @abs_srcdir@/tmp_check/bktempdir4/ 2>&1 |grep successfully
--post
\! rm -rf @abs_srcdir@/tmp_check/bktempdir1/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir2/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir3/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir4/

19
src/test/regress/input/gsdump_options.source
View File

@ -1,13 +1,12 @@
--prepare_test
create user gsqlbot2 password 'Gaussdba_Mpp';
create database gsqldb2 with encoding='UTF8' template=template0 owner gsqlbot2;
\c gsqldb2
grant all on schema public to gsqlbot2;
create user gsqlbot2gsdump password 'Gaussdba_Mpp';
create database gsqldb2gsdump with encoding='UTF8' template=template0 owner gsqlbot2gsdump;
\c gsqldb2gsdump
grant all on schema public to gsqlbot2gsdump;
GRANT CREATE ON SCHEMA public TO PUBLIC;
\! @abs_bindir@/gs_dump gsqldb2 -w -p -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2 -w -p -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2 -w -p @portstring@f -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2 -w -p 65534 -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2 -w -f@abs_srcdir@/tmp_check/dump1.sql -p@portstring@ 1>/dev/null 2>/dev/null;echo $?
\! @abs_bindir@/gs_dump gsqldb2 -w -f @abs_srcdir@/tmp_check/dump1.sql -p @portstring@ 1>/dev/null 2>/dev/null;echo $?
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p @portstring@f -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p 65534 -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -f@abs_srcdir@/tmp_check/dump1.sql -p @portstring@ 1>/dev/null 2>/dev/null;echo $?

14
src/test/regress/input/gsloader_options.source
View File

@ -1,8 +1,8 @@
--prepare_test
create user gsqlbot2 password 'Gaussdba_Mpp';
create database gsqldb2 with encoding='UTF8' template=template0 owner gsqlbot2;
\c gsqldb2
grant all on schema public to gsqlbot2;
create user gsqlbot2gsloader password 'Gaussdba_Mpp';
create database gsqldb2gsloader with encoding='UTF8' template=template0 owner gsqlbot2gsloader;
\c gsqldb2gsloader
grant all on schema public to gsqlbot2gsloader;
GRANT CREATE ON SCHEMA public TO PUBLIC;
CREATE TABLE loader_tbl (ID NUMBER, NAME VARCHAR2(20), CON VARCHAR2(20), DT DATE);
@ -25,8 +25,8 @@ CREATE TABLE loader_tbl (ID NUMBER, NAME VARCHAR2(20), CON VARCHAR2(20), DT DATE
\! echo "2,OK,b,2008-07-8" >> @abs_srcdir@/tmp_check/bktempdir/load_tbl.csv
\! echo "3,OK,c,2009-07-8" >> @abs_srcdir@/tmp_check/bktempdir/load_tbl.csv
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p -d gsqldb2
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p @portstring@d -d gsqldb2
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p@portstring@ -dgsqldb2
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p -d gsqldb2gsloader
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p @portstring@d -d gsqldb2gsloader
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p@portstring@ -dgsqldb2gsloader
\! rm -rf @abs_srcdir@/tmp_check/bktempdir

18
src/test/regress/input/gsql_options.source
View File

@ -1,12 +1,12 @@
--prepare_test
create user gsqlbot2 password 'Gaussdba_Mpp';
create database gsqldb2 with encoding='UTF8' template=template0 owner gsqlbot2;
\c gsqldb2
grant all on schema public to gsqlbot2;
create user gsqlbot2gsql password 'Gaussdba_Mpp';
create database gsqldb2gsql with encoding='UTF8' template=template0 owner gsqlbot2gsql;
\c gsqldb2gsql
grant all on schema public to gsqlbot2gsql;
GRANT CREATE ON SCHEMA public TO PUBLIC;
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -p -U gsqlbot2 -W Gaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -U gsqlbot2 -W Gaussdba_Mpp -p
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -p @portstring@s -U gsqlbot2 -W Gaussdba_Mpp
\! @abs_bindir@/gsql -hlocalhost -dgsqldb2 -p@portstring@ -Ugsqlbot2 -WGaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -p @portstring@ -U gsqlbot2 -W Gaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -p -U gsqlbot2gsql -W Gaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -U gsqlbot2gsql -W Gaussdba_Mpp -p
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -p @portstring@s -U gsqlbot2gsql -W Gaussdba_Mpp
\! @abs_bindir@/gsql -hlocalhost -dgsqldb2gsql -p@portstring@ -Ugsqlbot2gsql -WGaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -p @portstring@ -U gsqlbot2gsql -W Gaussdba_Mpp

31
src/test/regress/output/gsbasebackup_options.source
View File

@ -1,20 +1,19 @@
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -p -D @abs_srcdir@/tmp_check/bktempdir/
--pre
\! mkdir @abs_srcdir@/tmp_check/bktempdir1/
\! mkdir @abs_srcdir@/tmp_check/bktempdir2/
\! mkdir @abs_srcdir@/tmp_check/bktempdir3/
\! mkdir @abs_srcdir@/tmp_check/bktempdir4/
--run
\! @abs_bindir@/gs_basebackup -h localhost -p -D @abs_srcdir@/tmp_check/bktempdir1/
gs_basebackup: The option '-p' need a parameter.
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -D @abs_srcdir@/tmp_check/bktempdir/ -p
\! @abs_bindir@/gs_basebackup -h localhost -D @abs_srcdir@/tmp_check/bktempdir2/ -p
gs_basebackup: The option '-p' need a parameter.
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -p @portstring@d -D @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -p @portstring@d -D @abs_srcdir@/tmp_check/bktempdir3/
invalid port number "@portstring@d"
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -hlocalhost -p@portstring@ -D@abs_srcdir@/tmp_check/bktempdir/ 2>&1 |grep successfully
\! @abs_bindir@/gs_basebackup -hlocalhost -p@portstring@ -D @abs_srcdir@/tmp_check/bktempdir4/ 2>&1 |grep successfully
--?.*gs_basebackup: base backup successfully
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
\! mkdir @abs_srcdir@/tmp_check/bktempdir/
\! @abs_bindir@/gs_basebackup -h localhost -p @portstring@ -D @abs_srcdir@/tmp_check/bktempdir/ 2>&1 |grep successfully
--?.*gs_basebackup: base backup successfully
\! rm -rf @abs_srcdir@/tmp_check/bktempdir
--post
\! rm -rf @abs_srcdir@/tmp_check/bktempdir1/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir2/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir3/
\! rm -rf @abs_srcdir@/tmp_check/bktempdir4/

26
src/test/regress/output/gsdump_options.source
View File

@ -1,20 +1,16 @@
--prepare_test
create user gsqlbot2 password 'Gaussdba_Mpp';
--?.*
create database gsqldb2 with encoding='UTF8' template=template0 owner gsqlbot2;
--?.*
\c gsqldb2
grant all on schema public to gsqlbot2;
create user gsqlbot2gsdump password 'Gaussdba_Mpp';
create database gsqldb2gsdump with encoding='UTF8' template=template0 owner gsqlbot2gsdump;
\c gsqldb2gsdump
grant all on schema public to gsqlbot2gsdump;
GRANT CREATE ON SCHEMA public TO PUBLIC;
\! @abs_bindir@/gs_dump gsqldb2 -w -p -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p -f @abs_srcdir@/tmp_check/dump1.sql
gs_dump: The option '-p' requires a parameter.
\! @abs_bindir@/gs_dump gsqldb2 -w -p -f @abs_srcdir@/tmp_check/dump1.sql
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p -f @abs_srcdir@/tmp_check/dump1.sql
gs_dump: The option '-p' requires a parameter.
\! @abs_bindir@/gs_dump gsqldb2 -w -p @portstring@f -f @abs_srcdir@/tmp_check/dump1.sql
connection to database "gsqldb2" failed: invalid integer value "@portstring@f" for connection option "port"
\! @abs_bindir@/gs_dump gsqldb2 -w -p 65534 -f @abs_srcdir@/tmp_check/dump1.sql
connection to database "gsqldb2" failed: connect to server failed: No such file or directory
\! @abs_bindir@/gs_dump gsqldb2 -w -f@abs_srcdir@/tmp_check/dump1.sql -p@portstring@ 1>/dev/null 2>/dev/null;echo $?
0
\! @abs_bindir@/gs_dump gsqldb2 -w -f @abs_srcdir@/tmp_check/dump1.sql -p @portstring@ 1>/dev/null 2>/dev/null;echo $?
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p @portstring@f -f @abs_srcdir@/tmp_check/dump1.sql
connection to database "gsqldb2gsdump" failed: invalid integer value "@portstring@f" for connection option "port"
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -p 65534 -f @abs_srcdir@/tmp_check/dump1.sql
connection to database "gsqldb2gsdump" failed: connect to server failed: No such file or directory
\! @abs_bindir@/gs_dump gsqldb2gsdump -w -f@abs_srcdir@/tmp_check/dump1.sql -p @portstring@ 1>/dev/null 2>/dev/null;echo $?
0

16
src/test/regress/output/gsloader_options.source
View File

@ -1,10 +1,8 @@
--prepare_test
create user gsqlbot2 password 'Gaussdba_Mpp';
--?.*
create database gsqldb2 with encoding='UTF8' template=template0 owner gsqlbot2;
--?.*
\c gsqldb2
grant all on schema public to gsqlbot2;
create user gsqlbot2gsloader password 'Gaussdba_Mpp';
create database gsqldb2gsloader with encoding='UTF8' template=template0 owner gsqlbot2gsloader;
\c gsqldb2gsloader
grant all on schema public to gsqlbot2gsloader;
GRANT CREATE ON SCHEMA public TO PUBLIC;
CREATE TABLE loader_tbl (ID NUMBER, NAME VARCHAR2(20), CON VARCHAR2(20), DT DATE);
\! mkdir @abs_srcdir@/tmp_check/bktempdir
@ -24,10 +22,10 @@ CREATE TABLE loader_tbl (ID NUMBER, NAME VARCHAR2(20), CON VARCHAR2(20), DT DATE
\! echo "1,OK,a,2007-07-8" >> @abs_srcdir@/tmp_check/bktempdir/load_tbl.csv
\! echo "2,OK,b,2008-07-8" >> @abs_srcdir@/tmp_check/bktempdir/load_tbl.csv
\! echo "3,OK,c,2009-07-8" >> @abs_srcdir@/tmp_check/bktempdir/load_tbl.csv
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p -d gsqldb2
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p -d gsqldb2gsloader
ERROR: '-d' is not a valid port number
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p @portstring@d -d gsqldb2
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p @portstring@d -d gsqldb2gsloader
ERROR: '@portstring@d' is not a valid port number
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p@portstring@ -dgsqldb2
\! @abs_bindir@/gs_loader -W Gaussdba_Mpp control=@abs_srcdir@/tmp_check/bktempdir/loader_tbl.ctl data=@abs_srcdir@/tmp_check/bktempdir/load_tbl.csv -p@portstring@ -dgsqldb2gsloader
ERROR: unknown param:-p@portstring@
\! rm -rf @abs_srcdir@/tmp_check/bktempdir

18
src/test/regress/output/gsql_options.source
View File

@ -1,14 +1,14 @@
--prepare_test
create user gsqlbot2 password 'Gaussdba_Mpp';
create database gsqldb2 with encoding='UTF8' template=template0 owner gsqlbot2;
\c gsqldb2
grant all on schema public to gsqlbot2;
create user gsqlbot2gsql password 'Gaussdba_Mpp';
create database gsqldb2gsql with encoding='UTF8' template=template0 owner gsqlbot2gsql;
\c gsqldb2gsql
grant all on schema public to gsqlbot2gsql;
GRANT CREATE ON SCHEMA public TO PUBLIC;
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -p -U gsqlbot2 -W Gaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -p -U gsqlbot2gsql -W Gaussdba_Mpp
gsql: The option '-p' need a parameter.
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -U gsqlbot2 -W Gaussdba_Mpp -p
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -U gsqlbot2gsql -W Gaussdba_Mpp -p
gsql: The option '-p' need a parameter.
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -p @portstring@s -U gsqlbot2 -W Gaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -p @portstring@s -U gsqlbot2gsql -W Gaussdba_Mpp
failed to connect localhost:@portstring@s.
\! @abs_bindir@/gsql -hlocalhost -dgsqldb2 -p@portstring@ -Ugsqlbot2 -WGaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2 -p @portstring@ -U gsqlbot2 -W Gaussdba_Mpp
\! @abs_bindir@/gsql -hlocalhost -dgsqldb2gsql -p@portstring@ -Ugsqlbot2gsql -WGaussdba_Mpp
\! @abs_bindir@/gsql -h localhost -d gsqldb2gsql -p @portstring@ -U gsqlbot2gsql -W Gaussdba_Mpp

9
src/test/regress/parallel_schedule0
View File

@ -1052,13 +1052,8 @@ test: rename_table
# debug instrument
test: test_debug5
# fix echo infos
test: gstrace_options
test: gaussdb_options
test: gsql_options
test: gsbasebackup_options
test: gsdump_options
test: gsloader_options
# fix notice infos
test: gstrace_options gaussdb_options gsql_options gsbasebackup_options gsdump_options gsloader_options
# debug ceil(-0.5) -0
test: ceil_negtive_zero