pgpool2.git / summary / log / commit / refs
commit 7c613feac40c9fba7b69ee08a321f664d389eabb
Author: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Mon May 04 03:46:53 2020 +0000
Fix extended query tests.
Commit https://git.postgresql.org/gitweb/?p=pgpool2.git;a=commit;h=eee4c86c03546abe4e33396c808c8425c23a443c
broke extra scripts because it added Bind message log if log_per_node_statement is enabled.
Discussion: https://www.pgpool.net/pipermail/pgpool-hackers/2020-May/003611.html
.../extra_scripts/disable-load-balance-default-black-function.data | 2 +-
.../extended-query-test/extra_scripts/disable-load-balance-default.data | 2 +-
.../extra_scripts/disable-load-balance-off-black-function.data | 2 +-
.../extra_scripts/disable-load-balance-trans-black-function.data | 2 +-
src/test/extended-query-test/extra_scripts/disable-load-balance.data | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data
index dac272956..d6165cdc7 100755
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data
@@ -5,7 +5,7 @@
# Execute: 0 Parse: 0 Execute: 0
set 0 1 0 0 0 0 0 0 1 1 0 1 1
-grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |grep -v Bind|awk '{print $9}' | while read node
do
if [ $1 -ne $node ]
then
diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data
index 016dc2973..15c88b93d 100755
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data
@@ -4,7 +4,7 @@
# Parse: 1 Execute: 1 Parse: 1 Execute: 1 Parse: 1 Execute: 1
set 1 0 0 0 0 1 1 0 1 1
-grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |grep -v Bind|awk '{print $9}' | while read node
do
if [ $1 -ne $node ]
then
diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data
index d45ad3532..c8b43d3a2 100755
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data
@@ -5,7 +5,7 @@
# Execute: 1 Parse: 1 Execute: 1
set 0 1 0 0 1 1 1 1 1 1 1 1 1
-grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |grep -v Bind|awk '{print $9}' | while read node
do
if [ $1 -ne $node ]
then
diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data
index 7f7d5ff51..49886908f 100755
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data
@@ -5,7 +5,7 @@
# Execute: 0 Parse: 0 Execute: 0
set 0 1 0 0 0 0 0 0 1 1 0 0 0
-grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |grep -v Bind|awk '{print $9}' | while read node
do
if [ $1 -ne $node ]
then
diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance.data b/src/test/extended-query-test/extra_scripts/disable-load-balance.data
index 8d8ccdbf7..861bbdb88 100755
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance.data
@@ -4,7 +4,7 @@
# Parse: 1 Execute: 1 Parse: 0 Execute: 0 Parse: 0 Execute: 0
set 1 0 0 0 0 1 1 0 0 0 0
-grep "SELECT" $PGPOOLLOG | grep -v version |grep -v version|awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |grep -v Bind| awk '{print $9}' | while read node
do
if [ $1 -ne $node ]
then
[parent: eee4c86c0354]