pgpool2.git / summary / log / commit / refs
commit c2e22e7bbdf9026d46d4014c1849eda6408d8f9d
Author: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Sat Feb 25 01:31:55 2023 +0000
Test: simplify 001.load_balance test.
Previously we checked the version of psql, so that we could adapt the
change in psql: i.e. SHOW_ALL_RESULTS addition.
By doing:
\set SHOW_ALL_RESULTS off
in 7.sql, the test results are now identical PostgreSQL 15 and before.
As a result, expected*-pre15 files were removed.
.../tests/001.load_balance/expected/expected7-r | 6 +-
.../001.load_balance/expected/expected7-r-pre15 | 133 ---------------------
.../tests/001.load_balance/expected/expected7-s | 6 +-
.../001.load_balance/expected/expected7-s-pre15 | 113 -----------------
.../tests/001.load_balance/expected/expected8-s | 6 +-
.../001.load_balance/expected/expected8-s-pre15 | 113 -----------------
.../regression/tests/001.load_balance/sql/7.sql | 1 +
src/test/regression/tests/001.load_balance/test.sh | 31 ++---
8 files changed, 14 insertions(+), 395 deletions(-)
diff --git a/src/test/regression/tests/001.load_balance/expected/expected7-r b/src/test/regression/tests/001.load_balance/expected/expected7-r
index 91736f895..7dc29441f 100644
--- a/src/test/regression/tests/001.load_balance/expected/expected7-r
+++ b/src/test/regression/tests/001.load_balance/expected/expected7-r
@@ -1,3 +1,4 @@
+\set SHOW_ALL_RESULTS off
-- ordinary read only SELECT: load balance expected
SELECT 1;
NOTICE: DB node id: 1 statement: SELECT 1;
@@ -108,11 +109,6 @@ NOTICE: DB node id: 0 statement: END;
BEGIN\;SELECT 1\;ROLLBACK;
NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;ROLLBACK;
NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;ROLLBACK;
- ?column?
-----------
- 1
-(1 row)
-
-- ordinary read only SELECT: load balance expected
SELECT 1;
NOTICE: DB node id: 1 statement: SELECT 1;
diff --git a/src/test/regression/tests/001.load_balance/expected/expected7-r-pre15 b/src/test/regression/tests/001.load_balance/expected/expected7-r-pre15
deleted file mode 100644
index d36c1d085..000000000
--- a/src/test/regression/tests/001.load_balance/expected/expected7-r-pre15
+++ /dev/null
@@ -1,133 +0,0 @@
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 1 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- multi-statement query including BEGIN
-BEGIN\;SELECT 1;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- ordinary read only SELECT: load balance expected
-SELECT 2;
-NOTICE: DB node id: 1 statement: SELECT 2;
- ?column?
-----------
- 2
-(1 row)
-
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 1 statement: END;
-NOTICE: DB node id: 0 statement: END;
--- multi-statement query including BEGIN
-BEGIN\;SELECT 1;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- SAVEPOINT
-SAVEPOINT a;
-NOTICE: DB node id: 0 statement: SAVEPOINT a;
-NOTICE: DB node id: 1 statement: SAVEPOINT a;
--- PREPARE
-PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 0 statement: PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 1 statement: PREPARE foo AS SELECT 2;
--- EXECUTE
-EXECUTE foo;
-NOTICE: DB node id: 0 statement: EXECUTE foo;
-NOTICE: DB node id: 1 statement: EXECUTE foo;
- ?column?
-----------
- 2
-(1 row)
-
--- DEALLOCATE
-DEALLOCATE foo;
-NOTICE: DB node id: 0 statement: DEALLOCATE foo;
-NOTICE: DB node id: 1 statement: DEALLOCATE foo;
--- ROLLBACK TO
-ROLLBACK TO a;
-NOTICE: DB node id: 1 statement: ROLLBACK TO a;
-NOTICE: DB node id: 0 statement: ROLLBACK TO a;
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 1 statement: END;
-NOTICE: DB node id: 0 statement: END;
--- multi-statement query including BEGIN and INSERT
-DROP TABLE t1;
-NOTICE: DB node id: 0 statement: DROP TABLE t1;
-NOTICE: DB node id: 1 statement: DROP TABLE t1;
-CREATE TABLE t1(i INT);
-NOTICE: DB node id: 0 statement: CREATE TABLE t1(i INT);
-NOTICE: DB node id: 1 statement: CREATE TABLE t1(i INT);
-BEGIN\;INSERT INTO t1 VALUES(1);
-NOTICE: DB node id: 0 statement: BEGIN;INSERT INTO t1 VALUES(1);
-NOTICE: DB node id: 1 statement: BEGIN;INSERT INTO t1 VALUES(1);
--- SAVEPOINT
-SAVEPOINT a;
-NOTICE: DB node id: 0 statement: SAVEPOINT a;
-NOTICE: DB node id: 1 statement: SAVEPOINT a;
--- PREPARE
-PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 0 statement: PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 1 statement: PREPARE foo AS SELECT 2;
--- EXECUTE
-EXECUTE foo;
-NOTICE: DB node id: 0 statement: EXECUTE foo;
-NOTICE: DB node id: 1 statement: EXECUTE foo;
- ?column?
-----------
- 2
-(1 row)
-
--- DEALLOCATE
-DEALLOCATE foo;
-NOTICE: DB node id: 0 statement: DEALLOCATE foo;
-NOTICE: DB node id: 1 statement: DEALLOCATE foo;
--- ROLLBACK TO
-ROLLBACK TO a;
-NOTICE: DB node id: 1 statement: ROLLBACK TO a;
-NOTICE: DB node id: 0 statement: ROLLBACK TO a;
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 1 statement: END;
-NOTICE: DB node id: 0 statement: END;
--- multi-statement query including BEGIN and ROLLBACK
-BEGIN\;SELECT 1\;ROLLBACK;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;ROLLBACK;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;ROLLBACK;
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 1 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- multi-statement query including BEGIN and invalid query
-BEGIN\;SELECT 1\;FOO;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;FOO;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;FOO;
-ERROR: syntax error at or near "FOO"
-LINE 1: BEGIN;SELECT 1;FOO;
- ^
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 1 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
diff --git a/src/test/regression/tests/001.load_balance/expected/expected7-s b/src/test/regression/tests/001.load_balance/expected/expected7-s
index ba497a0e0..b1e3e5aef 100644
--- a/src/test/regression/tests/001.load_balance/expected/expected7-s
+++ b/src/test/regression/tests/001.load_balance/expected/expected7-s
@@ -1,3 +1,4 @@
+\set SHOW_ALL_RESULTS off
-- ordinary read only SELECT: load balance expected
SELECT 1;
NOTICE: DB node id: 1 statement: SELECT 1;
@@ -89,11 +90,6 @@ NOTICE: DB node id: 0 statement: END;
-- multi-statement query including BEGIN and ROLLBACK
BEGIN\;SELECT 1\;ROLLBACK;
NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;ROLLBACK;
- ?column?
-----------
- 1
-(1 row)
-
-- ordinary read only SELECT: load balance expected
SELECT 1;
NOTICE: DB node id: 1 statement: SELECT 1;
diff --git a/src/test/regression/tests/001.load_balance/expected/expected7-s-pre15 b/src/test/regression/tests/001.load_balance/expected/expected7-s-pre15
deleted file mode 100644
index d3b6b3cd5..000000000
--- a/src/test/regression/tests/001.load_balance/expected/expected7-s-pre15
+++ /dev/null
@@ -1,113 +0,0 @@
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 1 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- multi-statement query including BEGIN
-BEGIN\;SELECT 1;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- ordinary read only SELECT: load balance expected
-SELECT 2;
-NOTICE: DB node id: 1 statement: SELECT 2;
- ?column?
-----------
- 2
-(1 row)
-
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 0 statement: END;
--- multi-statement query including BEGIN
-BEGIN\;SELECT 1;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- SAVEPOINT
-SAVEPOINT a;
-NOTICE: DB node id: 0 statement: SAVEPOINT a;
--- PREPARE
-PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 0 statement: PREPARE foo AS SELECT 2;
--- EXECUTE
-EXECUTE foo;
-NOTICE: DB node id: 0 statement: EXECUTE foo;
- ?column?
-----------
- 2
-(1 row)
-
--- DEALLOCATE
-DEALLOCATE foo;
-NOTICE: DB node id: 0 statement: DEALLOCATE foo;
--- ROLLBACK TO
-ROLLBACK TO a;
-NOTICE: DB node id: 0 statement: ROLLBACK TO a;
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 0 statement: END;
--- multi-statement query including BEGIN and INSERT
-DROP TABLE t1;
-NOTICE: DB node id: 0 statement: DROP TABLE t1;
-CREATE TABLE t1(i INT);
-NOTICE: DB node id: 0 statement: CREATE TABLE t1(i INT);
-BEGIN\;INSERT INTO t1 VALUES(1);
-NOTICE: DB node id: 0 statement: BEGIN;INSERT INTO t1 VALUES(1);
--- SAVEPOINT
-SAVEPOINT a;
-NOTICE: DB node id: 0 statement: SAVEPOINT a;
--- PREPARE
-PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 0 statement: PREPARE foo AS SELECT 2;
--- EXECUTE
-EXECUTE foo;
-NOTICE: DB node id: 0 statement: EXECUTE foo;
- ?column?
-----------
- 2
-(1 row)
-
--- DEALLOCATE
-DEALLOCATE foo;
-NOTICE: DB node id: 0 statement: DEALLOCATE foo;
--- ROLLBACK TO
-ROLLBACK TO a;
-NOTICE: DB node id: 0 statement: ROLLBACK TO a;
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 0 statement: END;
--- multi-statement query including BEGIN and ROLLBACK
-BEGIN\;SELECT 1\;ROLLBACK;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;ROLLBACK;
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 1 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- multi-statement query including BEGIN and invalid query
-BEGIN\;SELECT 1\;FOO;
-NOTICE: DB node id: 0 statement: BEGIN;SELECT 1;FOO;
-ERROR: syntax error at or near "FOO"
-LINE 1: BEGIN;SELECT 1;FOO;
- ^
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 1 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
diff --git a/src/test/regression/tests/001.load_balance/expected/expected8-s b/src/test/regression/tests/001.load_balance/expected/expected8-s
index 99a18337f..cae157b28 100644
--- a/src/test/regression/tests/001.load_balance/expected/expected8-s
+++ b/src/test/regression/tests/001.load_balance/expected/expected8-s
@@ -1,3 +1,4 @@
+\set SHOW_ALL_RESULTS off
-- ordinary read only SELECT: load balance expected
SELECT 1;
NOTICE: DB node id: 0 statement: SELECT 1;
@@ -89,11 +90,6 @@ NOTICE: DB node id: 1 statement: END;
-- multi-statement query including BEGIN and ROLLBACK
BEGIN\;SELECT 1\;ROLLBACK;
NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;ROLLBACK;
- ?column?
-----------
- 1
-(1 row)
-
-- ordinary read only SELECT: load balance expected
SELECT 1;
NOTICE: DB node id: 0 statement: SELECT 1;
diff --git a/src/test/regression/tests/001.load_balance/expected/expected8-s-pre15 b/src/test/regression/tests/001.load_balance/expected/expected8-s-pre15
deleted file mode 100644
index b0f84d0ef..000000000
--- a/src/test/regression/tests/001.load_balance/expected/expected8-s-pre15
+++ /dev/null
@@ -1,113 +0,0 @@
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 0 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- multi-statement query including BEGIN
-BEGIN\;SELECT 1;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- ordinary read only SELECT: load balance expected
-SELECT 2;
-NOTICE: DB node id: 0 statement: SELECT 2;
- ?column?
-----------
- 2
-(1 row)
-
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 1 statement: END;
--- multi-statement query including BEGIN
-BEGIN\;SELECT 1;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- SAVEPOINT
-SAVEPOINT a;
-NOTICE: DB node id: 1 statement: SAVEPOINT a;
--- PREPARE
-PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 1 statement: PREPARE foo AS SELECT 2;
--- EXECUTE
-EXECUTE foo;
-NOTICE: DB node id: 1 statement: EXECUTE foo;
- ?column?
-----------
- 2
-(1 row)
-
--- DEALLOCATE
-DEALLOCATE foo;
-NOTICE: DB node id: 1 statement: DEALLOCATE foo;
--- ROLLBACK TO
-ROLLBACK TO a;
-NOTICE: DB node id: 1 statement: ROLLBACK TO a;
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 1 statement: END;
--- multi-statement query including BEGIN and INSERT
-DROP TABLE t1;
-NOTICE: DB node id: 1 statement: DROP TABLE t1;
-CREATE TABLE t1(i INT);
-NOTICE: DB node id: 1 statement: CREATE TABLE t1(i INT);
-BEGIN\;INSERT INTO t1 VALUES(1);
-NOTICE: DB node id: 1 statement: BEGIN;INSERT INTO t1 VALUES(1);
--- SAVEPOINT
-SAVEPOINT a;
-NOTICE: DB node id: 1 statement: SAVEPOINT a;
--- PREPARE
-PREPARE foo AS SELECT 2;
-NOTICE: DB node id: 1 statement: PREPARE foo AS SELECT 2;
--- EXECUTE
-EXECUTE foo;
-NOTICE: DB node id: 1 statement: EXECUTE foo;
- ?column?
-----------
- 2
-(1 row)
-
--- DEALLOCATE
-DEALLOCATE foo;
-NOTICE: DB node id: 1 statement: DEALLOCATE foo;
--- ROLLBACK TO
-ROLLBACK TO a;
-NOTICE: DB node id: 1 statement: ROLLBACK TO a;
--- tx started by multi-statement query ends
-END;
-NOTICE: DB node id: 1 statement: END;
--- multi-statement query including BEGIN and ROLLBACK
-BEGIN\;SELECT 1\;ROLLBACK;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;ROLLBACK;
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 0 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
--- multi-statement query including BEGIN and invalid query
-BEGIN\;SELECT 1\;FOO;
-NOTICE: DB node id: 1 statement: BEGIN;SELECT 1;FOO;
-ERROR: syntax error at or near "FOO"
-LINE 1: BEGIN;SELECT 1;FOO;
- ^
--- ordinary read only SELECT: load balance expected
-SELECT 1;
-NOTICE: DB node id: 0 statement: SELECT 1;
- ?column?
-----------
- 1
-(1 row)
-
diff --git a/src/test/regression/tests/001.load_balance/sql/7.sql b/src/test/regression/tests/001.load_balance/sql/7.sql
index fe7554289..3d79f5279 100644
--- a/src/test/regression/tests/001.load_balance/sql/7.sql
+++ b/src/test/regression/tests/001.load_balance/sql/7.sql
@@ -1,3 +1,4 @@
+\set SHOW_ALL_RESULTS off
-- ordinary read only SELECT: load balance expected
SELECT 1;
-- multi-statement query including BEGIN
diff --git a/src/test/regression/tests/001.load_balance/test.sh b/src/test/regression/tests/001.load_balance/test.sh
index 6f1e334d0..2854e4bf6 100755
--- a/src/test/regression/tests/001.load_balance/test.sh
+++ b/src/test/regression/tests/001.load_balance/test.sh
@@ -12,23 +12,12 @@ export PGDATABASE=test
# sleep time after reload in seconds
st=10
-# Get psql version
-PSQLVERSION=`$PSQL --version|awk '{print $3}'|sed 's/\..*//'`
-
# function to check the result
# argument is test case number.
function check_result
{
- if [ $PSQLVERSION -lt 15 ];then
- expected=../expected/expected$1$suffix-pre15
- if [ -f $expected ];then
- diff -c $expected result$1
- else
- diff -c ../expected/expected$1$suffix result$1
- fi
- else
- diff -c ../expected/expected$1$suffix result$1
- fi
+ diff -c ../expected/expected$1$suffix result$1
+
if [ $? = 0 ];then
echo "test$1 succeeded."
else
@@ -42,16 +31,16 @@ function check_result
for mode in s r i
do
- rm -fr $TESTDIR
- mkdir $TESTDIR
- cd $TESTDIR
+ rm -fr $TESTDIR
+ mkdir $TESTDIR
+ cd $TESTDIR
-# create test environment
- echo -n "creating test environment..."
- $PGPOOL_SETUP -m $mode -n 2 || exit 1
- echo "done."
+ # create test environment
+ echo -n "creating test environment..."
+ $PGPOOL_SETUP -m $mode -n 2 || exit 1
+ echo "done."
- source ./bashrc.ports
+ source ./bashrc.ports
# set expected file suffix
if [ $mode = 's' ];then
[parent: 7d4dde0cd2a9]