From f23a9e2b72444aa0f07cd32a9ffd9832fd7e4c21 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Fri, 8 Aug 2014 13:11:59 +0300
Subject: [PATCH] tests for hints and changes in makefiles and configuration
 files to enable testing them through 'make testall'

---
 Documentation/internal/hint_syntax.pdf        | Bin 0 -> 3507 bytes
 .../routing/readwritesplit/test/makefile      |   3 +-
 .../readwritesplit/test/test_hints/Makefile   |  22 ++++++-
 .../test/test_hints/complex_tests             |  48 +++++++++++++++
 .../test/test_hints/error_tests               |  39 +++++++++++++
 .../test/test_hints/rwsplit_hints.sh          |  55 +++++++++++++-----
 .../test/test_hints/simple_tests              |  18 ++++++
 .../test/test_hints/stack_tests               |  50 ++++++++++++++++
 .../test/test_hints/syntax_check.sh           |  33 +++++++++++
 server/test/MaxScale_test.cnf                 |  49 ++++++++++++++--
 test.inc                                      |   5 ++
 11 files changed, 300 insertions(+), 22 deletions(-)
 create mode 100644 Documentation/internal/hint_syntax.pdf
 create mode 100644 server/modules/routing/readwritesplit/test/test_hints/complex_tests
 create mode 100644 server/modules/routing/readwritesplit/test/test_hints/error_tests
 create mode 100644 server/modules/routing/readwritesplit/test/test_hints/simple_tests
 create mode 100644 server/modules/routing/readwritesplit/test/test_hints/stack_tests
 create mode 100755 server/modules/routing/readwritesplit/test/test_hints/syntax_check.sh

diff --git a/Documentation/internal/hint_syntax.pdf b/Documentation/internal/hint_syntax.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..f90b80acc10d19d3b7729cb22ac584c699b4324f
GIT binary patch
literal 3507
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
WE=epZ0Y`?hfu#wTs;aBM8y5f!bAf#T

literal 0
HcmV?d00001

diff --git a/server/modules/routing/readwritesplit/test/makefile b/server/modules/routing/readwritesplit/test/makefile
index b4f9aec6b..b63030608 100644
--- a/server/modules/routing/readwritesplit/test/makefile
+++ b/server/modules/routing/readwritesplit/test/makefile
@@ -14,13 +14,13 @@ RET := -1
 cleantests:
 	- $(DEL) *.o 
 	- $(DEL) *~
-	-$(MAKE) -C test_hints cleantests
 
 
 testall: 
 	-$(MAKE) cleantests
 	-$(MAKE) DEBUG=Y buildtests
 	-$(MAKE) runtests
+	-$(MAKE) -C test_hints testall
 
 buildtests:
 
@@ -34,4 +34,3 @@ runtests:
 	./rwsplit.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD) 
 	@echo ""                        >> $(TESTLOG)
 	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
-	-$(MAKE) -C test_hints runtests
diff --git a/server/modules/routing/readwritesplit/test/test_hints/Makefile b/server/modules/routing/readwritesplit/test/test_hints/Makefile
index 08462da4a..f4b2d209d 100644
--- a/server/modules/routing/readwritesplit/test/test_hints/Makefile
+++ b/server/modules/routing/readwritesplit/test/test_hints/Makefile
@@ -16,7 +16,9 @@ RET := -1
 cleantests:
 	- $(DEL) *.o 
 	- $(DEL) *~
-
+	- $(DEL) *.sql
+	- $(DEL) *.output
+	- $(DEL) *.log
 
 testall: 
 	-$(MAKE) cleantests
@@ -27,11 +29,25 @@ buildtests:
 
 
 runtests:
-	@echo ""				>  $(TESTLOG)
+	@echo ""				>>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test Read/Write split router - hint routing"	>> $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
-	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD)
+	@echo "Running simple tests"	>> $(TESTLOG)
+	@echo ""                        >> $(TESTLOG)	
+	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) simple_tests
+	@echo ""                        >> $(TESTLOG)
+	@echo "Running syntax error tests"	>> $(TESTLOG)
+	@echo ""                        >> $(TESTLOG)	
+	./syntax_check.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) error_tests
+	@echo ""                        >> $(TESTLOG)
+	@echo "Running complex tests"	>> $(TESTLOG)
+	@echo ""                        >> $(TESTLOG)	
+	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) complex_tests
+	@echo ""                        >> $(TESTLOG)
+	@echo "Running stack tests"	>> $(TESTLOG)	
+	@echo ""                        >> $(TESTLOG)	
+	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) stack_tests
 	@echo ""                        >> $(TESTLOG)
 	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
diff --git a/server/modules/routing/readwritesplit/test/test_hints/complex_tests b/server/modules/routing/readwritesplit/test/test_hints/complex_tests
new file mode 100644
index 000000000..a8ac640f9
--- /dev/null
+++ b/server/modules/routing/readwritesplit/test/test_hints/complex_tests
@@ -0,0 +1,48 @@
+select @@server_id; -- maxscale begin route to master:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; -- maxscale end:
+select @@server_id; -- maxscale named1 prepare route to master:
+select @@server_id; -- maxscale named1 begin:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; -- maxscale end:
+select @@server_id; -- maxscale shorthand1 begin route to server server2:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id;:3001
+select @@server_id; -- maxscale end:
+select @@server_id; # maxscale begin route to master:3000
+select @@server_id;:3000
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; # maxscale end:
+select @@server_id; # maxscale named2 prepare route to master:
+select @@server_id; # maxscale named2 begin:3000
+select @@server_id;:3000
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; # maxscale end:
+select @@server_id; # maxscale shorthand2 begin route to server server2:3001
+select @@server_id;:3001
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id;:3001
+select @@server_id; # maxscale end:
+select @@server_id/* maxscale begin route to master */;:3000
+select @@server_id;:3000
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id;:3000
+select @@server_id/* maxscale end */;:
+select @@server_id/* maxscale named3 prepare route to master */;:
+select @@server_id/* maxscale named3 begin */;:3000
+select @@server_id;:3000
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id;:3000
+select @@server_id/* maxscale end */;:
+select @@server_id/* maxscale shorthand3 begin route to server server2 */; :3001
+select @@server_id;:3001
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id;:3001
+select @@server_id/* maxscale end */;:
diff --git a/server/modules/routing/readwritesplit/test/test_hints/error_tests b/server/modules/routing/readwritesplit/test/test_hints/error_tests
new file mode 100644
index 000000000..2decad100
--- /dev/null
+++ b/server/modules/routing/readwritesplit/test/test_hints/error_tests
@@ -0,0 +1,39 @@
+select @@server_id; -- maxscalemaxscale route to master:
+select @@server_id; -- master to route maxscale:
+select @@server_id; -- route to master:
+select @@server_id; -- maxscale to master:
+select @@server_id; -- maxscale route master:
+select @@server_id; -- maxscale route to:
+select @@server_id; -- maxscale begin master:
+select @@server_id; -- maxscale master route to master:
+select @@server_id; -- maxscale route to maxscale route to master:
+select @@server_id; -- maxscale maxscale route to master:
+select @@server_id; -- maxscale route to to server =):
+select @@server_id; -- maxscale route to maxscale server server1:
+select @@server_id; -- maxscale route to server1:
+select @@server_id; # maxscalemaxscale route to master:
+select @@server_id; # master to route maxscale:
+select @@server_id; # route to master:
+select @@server_id; # maxscale to master:
+select @@server_id; # maxscale route master:
+select @@server_id; # maxscale route to:
+select @@server_id; # maxscale begin master:
+select @@server_id; # maxscale master route to master:
+select @@server_id; # maxscale route to maxscale route to master:
+select @@server_id; # maxscale maxscale route to master:
+select @@server_id; # maxscale route to to server =):
+select @@server_id; # maxscale route to maxscale server server1:
+select @@server_id; # maxscale route to server1:
+select @@server_id; /* maxscalemaxscale route to master */;:
+select @@server_id; /* master to route maxscale */;:
+select @@server_id; /* route to master */;:
+select @@server_id; /* maxscale to master */;:
+select @@server_id; /* maxscale route master */;:
+select @@server_id; /* maxscale route to */;:
+select @@server_id; /* maxscale begin master */;:
+select @@server_id; /* maxscale master route to master */;:
+select @@server_id; /* maxscale route to maxscale route to master */;:
+select @@server_id; /* maxscale maxscale route to master */;:
+select @@server_id; /* maxscale route to to server =) */;:
+select @@server_id; /* maxscale route to maxscale server server1 */;:
+select @@server_id; /* maxscale route to server1 */;:
\ No newline at end of file
diff --git a/server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh b/server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh
index 50b4c6026..cdbfb335b 100755
--- a/server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh
+++ b/server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
-NARGS=6
+NARGS=7
 TLOG=$1
 THOST=$2
 TPORT=$3
 TMASTER_ID=$4
 TUSER=$5
 TPWD=$6
+TESTINPUT=$7
 
 if [ $# != $NARGS ] ;
 then
@@ -13,24 +14,52 @@ echo""
 echo "Wrong number of arguments, gave "$#" but "$NARGS" is required"
 echo "" 
 echo "Usage :" 
-echo "        rwsplit.sh <log filename> <host> <port> <master id> <user> <password>"
+echo "        rwsplit_hints.sh <log filename> <host> <port> <master id> <user> <password> <test file>"
 echo ""
 exit 1
 fi
 
-TESTINPUT=hints.txt
-QUERY="select @@server_id;"
-RUNCMD=mysql\ --host=$THOST\ -P$TPORT\ -u$TUSER\ -p$TPWD\ --unbuffered=true\ --disable-reconnect\ --silent\
+
+RUNCMD=mysql\ --host=$THOST\ -P$TPORT\ -u$TUSER\ -p$TPWD\ --unbuffered=true\ --disable-reconnect\ --silent\ --comment
+i=0
 
 while read -r LINE
 do
-TINPUT=`echo "$LINE"|awk '{split($0,a,":");print a[1]}'`
-TRETVAL=`echo "$LINE"|awk '{split($0,a,":");print a[2]}'`
-a=`$RUNCMD -e"$QUERY$TINPUT"`
-if [ "$a" != "$TRETVAL" ]; then 
-        echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
-else 
-        echo "$TINPUT PASSED">>$TLOG ; 
+TINPUT[$i]=`echo "$LINE"|awk '{split($0,a,":");print a[1]}'`
+TRETVAL[$i]=`echo "$LINE"|awk '{split($0,a,":");print a[2]}'`
+echo "${TINPUT[i]}" >> $TESTINPUT.sql
+i=$((i+1))
+done < $TESTINPUT
+
+`$RUNCMD < $TESTINPUT.sql > $TESTINPUT.output`
+
+x=0
+crash=1
+all_passed=1
+
+while read -r TOUTPUT
+do
+crash=0
+if [ "$TOUTPUT" != "${TRETVAL[x]}" -a "${TRETVAL[x]}" != "" ]
+then 
+    all_passed=0
+    echo "$TESTINPUT:$((x + 1)): ${TINPUT[x]} FAILED, return value $TOUTPUT when ${TRETVAL[x]} was expected">>$TLOG; 
+fi
+x=$((x+1))
+done < $TESTINPUT.output
+
+if [ $crash -eq 1 ]
+then
+    all_passed=0
+    for ((v=0;v<$i;v++))
+    do
+	echo "${TINPUT[v]} FAILED, nothing was returned">>$TLOG; 
+    done
 fi
 
-done < $TESTINPUT
+if [ $all_passed -eq 1 ]
+then
+    echo "Test set: PASSED">>$TLOG; 
+else
+    echo "Test set: FAILED">>$TLOG; 
+fi
diff --git a/server/modules/routing/readwritesplit/test/test_hints/simple_tests b/server/modules/routing/readwritesplit/test/test_hints/simple_tests
new file mode 100644
index 000000000..67dd1f57e
--- /dev/null
+++ b/server/modules/routing/readwritesplit/test/test_hints/simple_tests
@@ -0,0 +1,18 @@
+select @@server_id; -- maxscale route to master:3000
+select @@server_id; -- maxscale route to slave:
+select @@server_id; -- maxscale route to server server1:3000
+select @@server_id; -- maxscale route to server server2:3001
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id; -- maxscale route to server server4:3003
+select @@server_id; # maxscale route to master:3000
+select @@server_id; # maxscale route to slave:
+select @@server_id; # maxscale route to server server1:3000
+select @@server_id; # maxscale route to server server2:3001
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id; # maxscale route to server server4:3003
+select @@server_id/* maxscale route to master */;:3000
+select @@server_id/* maxscale route to slave */;:
+select @@server_id/* maxscale route to server server1 */;:3000
+select @@server_id/* maxscale route to server server2 */;:3001
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id/* maxscale route to server server4 */;:3003
diff --git a/server/modules/routing/readwritesplit/test/test_hints/stack_tests b/server/modules/routing/readwritesplit/test/test_hints/stack_tests
new file mode 100644
index 000000000..0d4d51e05
--- /dev/null
+++ b/server/modules/routing/readwritesplit/test/test_hints/stack_tests
@@ -0,0 +1,50 @@
+select @@server_id; -- maxscale stack_named1 prepare route to server server1:
+select @@server_id; -- maxscale stack_named2 prepare route to server server2:
+select @@server_id; -- maxscale stack_named3 prepare route to server server3:
+select @@server_id; -- maxscale stack_named4 prepare route to server server4:
+select @@server_id; -- maxscale stack_named1 begin:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale stack_named2 begin:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale stack_named3 begin:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale stack_named4 begin:3003
+select @@server_id;:3003
+select @@server_id; -- maxscale stack_shorthand1 begin route to server server1:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale stack_shorthand2 begin route to server server2:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale stack_shorthand3 begin route to server server3:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale stack_shorthand4 begin route to server server4:3003
+select @@server_id;:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale end:3003
+select @@server_id;:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id; -- maxscale end:
+select @@server_id; -- maxscale stack_shorthand1 begin:3000
+select @@server_id; -- maxscale stack_shorthand2 begin:3001
+select @@server_id; -- maxscale stack_shorthand3 begin:3002
+select @@server_id; -- maxscale stack_shorthand4 begin:3003
+select @@server_id; -- maxscale stack_named1 begin:3000
+select @@server_id; -- maxscale stack_named2 begin:3001
+select @@server_id; -- maxscale stack_named3 begin:3002
+select @@server_id; -- maxscale stack_named4 begin:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id; -- maxscale end:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id; -- maxscale end:
\ No newline at end of file
diff --git a/server/modules/routing/readwritesplit/test/test_hints/syntax_check.sh b/server/modules/routing/readwritesplit/test/test_hints/syntax_check.sh
new file mode 100755
index 000000000..595a3814e
--- /dev/null
+++ b/server/modules/routing/readwritesplit/test/test_hints/syntax_check.sh
@@ -0,0 +1,33 @@
+#! /bin/bash
+NARGS=7
+TLOG=$1
+THOST=$2
+TPORT=$3
+TMASTER_ID=$4
+TUSER=$5
+TPWD=$6
+TESTINPUT=$7
+
+if [ $# != $NARGS ] ;
+then
+echo""
+echo "Wrong number of arguments, gave "$#" but "$NARGS" is required"
+echo "" 
+echo "Usage :" 
+echo "        syntax_check.sh <log filename> <host> <port> <master id> <user> <password> <test file>"
+ echo ""
+exit 1
+fi
+
+./rwsplit_hints.sh dummy.log $THOST $TPORT $TMASTER_ID $TUSER $TPWD $TESTINPUT
+
+exp_count=`cat error_tests | grep -c '.*'`
+err_count=`tail -n $exp_count ../../../../../test/log/skygw_err*|grep -c 'Hint ignored'`
+
+if [ "$err_count" == "$exp_count" ]
+then
+    echo "Test set: PASSED">>$TLOG; 
+else
+    echo "Expected $exp_count ignored hints in the error log but found $err_count instead">>$TLOG
+    echo "Test set: FAILED">>$TLOG; 
+fi
diff --git a/server/test/MaxScale_test.cnf b/server/test/MaxScale_test.cnf
index 89f65b9a0..9fff8fa08 100644
--- a/server/test/MaxScale_test.cnf
+++ b/server/test/MaxScale_test.cnf
@@ -20,11 +20,13 @@ threads=1
 # 	user =<user name - must have slave replication and 
 #                          slave client privileges>
 # 	passwd=<password of the above user, plain text currently>
+#	monitor_interval=<sampling interval in milliseconds,
+#                          default value is 10000>
 
 [MySQL Monitor]
 type=monitor
 module=mysqlmon
-servers=server1,server2,server3
+servers=server1,server2,server3,server4
 user=maxuser
 passwd=maxpwd
 
@@ -36,25 +38,42 @@ passwd=maxpwd
 # 	servers=<server name>,<server name>,...
 # 	user=<User to fetch password inforamtion with>
 # 	passwd=<Password of the user, plain text currently>
+#	enable_root_user=<0 or 1, default is 0>
+#	version_string=<specific string for server handshake,
+#		default is the MariaDB embedded library version>
 #
 # Valid router modules currently are:
 # 	readwritesplit, readconnroute and debugcli
 
+
 [RW Split Router]
 type=service
 router=readwritesplit
-servers=server1,server2,server3
+servers=server1,server2,server3,server4
+max_slave_connections=90%
 user=maxuser
 passwd=maxpwd
 
+
+[RW Split Hint Router]
+type=service
+router=readwritesplit
+servers=server1,server2,server3,server4
+max_slave_connections=90%
+user=maxuser
+passwd=maxpwd
+filters=Hint
+
+
 [Read Connection Router]
 type=service
 router=readconnroute
-router_options=slave
-servers=server1,server2,server3
+router_options=master
+servers=server1
 user=maxuser
 passwd=maxpwd
 
+
 [HTTPD Router]
 type=service
 router=testroute
@@ -64,6 +83,12 @@ servers=server1,server2,server3
 type=service
 router=debugcli
 
+
+[Hint]
+type=filter
+module=hintfilter
+
+
 # Listener definitions for the services
 #
 # Valid options are:
@@ -71,6 +96,8 @@ router=debugcli
 # 	service=<name of service defined elsewhere>
 # 	protocol=<name of protocol module with which to listen>
 # 	port=<Listening port>
+#	address=<Address to bind to>
+#	socket=<Listening socket>
 
 [RW Split Listener]
 type=listener
@@ -78,17 +105,25 @@ service=RW Split Router
 protocol=MySQLClient
 port=4006
 
+[RW Split Hint Listener]
+type=listener
+service=RW Split Hint Router
+protocol=MySQLClient
+port=4009
+
 [Read Connection Listener]
 type=listener
 service=Read Connection Router
 protocol=MySQLClient
 port=4008
+#socket=/tmp/readconn.sock
 
 [Debug Listener]
 type=listener
 service=Debug Interface
 protocol=telnetd
 port=4442
+#address=127.0.0.1
 
 [HTTPD Listener]
 type=listener
@@ -115,3 +150,9 @@ type=server
 address=127.0.0.1
 port=3002
 protocol=MySQLBackend
+
+[server4]
+type=server
+address=127.0.0.1
+port=3003
+protocol=MySQLBackend
diff --git a/test.inc b/test.inc
index b020368d8..7c5e5c571 100644
--- a/test.inc
+++ b/test.inc
@@ -19,6 +19,11 @@ TPORT_RCONN     :=
 #
 TPORT_RW        :=
 #
+# port of read/write split router module with hints, for example:
+# TPORT_RW_HINT      := 4009
+#
+TPORT_RW_HINT        :=
+#
 # username of MaxScale user, for example:
 # TUSER         := maxuser
 #