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

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 dac27295663bdebe13922b3a7529661619e5b242..d6165cdc7f8b5b066fec07c7ba5de23ceeb622d3 100755 (executable)
--- 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 016dc2973e76f237f15497526795693688a02f0a..15c88b93d0ac1cd8d2cb9c1d38f6334c344ca91f 100755 (executable)
--- 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 d45ad3532182dac763549d45fe3efe1a1765841f..c8b43d3a21105ca535138570f99af98b6bb57a3b 100755 (executable)
--- 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 7f7d5ff51b7b39bd2d61d1fc79d89620c4109213..49886908f877a02729dfb27e69045fbb78be9cdb 100755 (executable)
--- 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 8d8ccdbf74b28c642f48bacadd00acd061f50a79..861bbdb8857f6b7cf64adc63189564896caf9fec 100755 (executable)
--- 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