From 49104e67750c5249563992369a42bbed7702417c Mon Sep 17 00:00:00 2001 From: prabatuty Date: Sat, 9 Apr 2011 06:57:55 +0000 Subject: [PATCH] exp changes and test case modification as we do not support mmap to shared memory switching for now --- test/durability/recovery/exp.testMMAP019.ksh | 5 ++++- test/durability/recovery/test016.ksh | 4 ++-- test/durability/recovery/testMMAP019.ksh | 15 +++++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/test/durability/recovery/exp.testMMAP019.ksh b/test/durability/recovery/exp.testMMAP019.ksh index 62ee0470..42926726 100644 --- a/test/durability/recovery/exp.testMMAP019.ksh +++ b/test/durability/recovery/exp.testMMAP019.ksh @@ -9,8 +9,9 @@ Server Started 1000 Durability Works Fine +I-Pass Test over Server Killed -DURABILITY=true and MMAP=false +DURABILITY=true and MMAP=true Server Started --------------------------------------------------------- COUNT(*) @@ -18,6 +19,7 @@ Server Started 1000 Durability Works Fine +II-Pass Test over Server Killed Server Started --------------------------------------------------------- @@ -26,3 +28,4 @@ Server Started 2000 Durability Works Fine +III-Pass Test over diff --git a/test/durability/recovery/test016.ksh b/test/durability/recovery/test016.ksh index 6d3fc839..cfa03c05 100755 --- a/test/durability/recovery/test016.ksh +++ b/test/durability/recovery/test016.ksh @@ -3,7 +3,7 @@ # set DURABILITY=true and MMAP=false in csql.conf # Start csqlserver. # Then create a table t1 in CSQL Client. -# Set MAX_SYS_DB_SIZE=10MB and MAX_DB_SIZE=100MB +# Set MAX_SYS_DB_SIZE=10MB and MAX_DB_SIZE=33554432 # Create a table say t1 having 10k record with no index. # Create a table say t1 having 10k record with UNIQUE HASH Index. # Create a table say t1 having 10k record with UNIQUE TREE Index. @@ -43,7 +43,7 @@ cp -f $REL_PATH/csql.conf /tmp echo SYS_DB_KEY=5555 >>/tmp/csql.conf echo USER_DB_KEY=7777 >>/tmp/csql.conf echo MAX_SYS_DB_SIZE=10485760 >>/tmp/csql.conf -echo MAX_DB_SIZE=104857600 >>/tmp/csql.conf +echo MAX_DB_SIZE=33554432 >>/tmp/csql.conf echo DURABILITY=true >>/tmp/csql.conf echo MMAP=false >>/tmp/csql.conf export CSQL_CONFIG_FILE=/tmp/csql.conf diff --git a/test/durability/recovery/testMMAP019.ksh b/test/durability/recovery/testMMAP019.ksh index bbb218bd..647a2aee 100755 --- a/test/durability/recovery/testMMAP019.ksh +++ b/test/durability/recovery/testMMAP019.ksh @@ -5,7 +5,7 @@ # Then create a table t1 with record size 20. # Insert 1k Records # kill the currently running Server. -# set DURABILITY to true and MMAP=false in csql.conf +# set DURABILITY to true and MMAP=true in csql.conf # Start csqlserver. # Insert another 1k Records. # All inserted records should be durable @@ -74,18 +74,19 @@ if [ $? -eq 0 ] echo Durability Works Fine fi rm -f before.sql after.sql +echo "I-Pass Test over" $CSQL_INSTALL_ROOT/bin/csqldump >before.sql kill -9 $pid ipcrm -M 4444 echo "Server Killed" -echo "DURABILITY=true and MMAP=false" +echo "DURABILITY=true and MMAP=true" echo SYS_DB_KEY=4444 >>/tmp/csql.conf echo USER_DB_KEY=6666 >>/tmp/csql.conf echo "DURABILITY=true" >>/tmp/csql.conf -echo "MMAP=false" >>/tmp/csql.conf +echo "MMAP=true" >>/tmp/csql.conf export CSQL_CONFIG_FILE=/tmp/csql.conf $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 & @@ -100,6 +101,7 @@ if [ $? -eq 0 ] echo Durability Works Fine fi rm -f before.sql after.sql +echo "II-Pass Test over" $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/ins_1000.sql >/dev/null 2>&1 @@ -108,12 +110,12 @@ if [ $? -ne 0 ] rm -f ${REL_PATH}/cre_t1.sql rm -f ${REL_PATH}/ins_1000.sql kill -9 $pid - ipcrm -M 4444 -M 6666 + ipcrm -M 4444 exit 1; fi $CSQL_INSTALL_ROOT/bin/csqldump >before.sql kill -9 $pid -ipcrm -M 4444 -M 6666 +ipcrm -M 4444 echo "Server Killed" $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 & pid=$! @@ -127,6 +129,7 @@ if [ $? -eq 0 ] echo Durability Works Fine fi rm -f before.sql after.sql +echo "III-Pass Test over" echo "DROP TABLE t1;" >drp.sql $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drp.sql >/dev/null 2>&1 @@ -135,5 +138,5 @@ rm -f ${REL_PATH}/sel.sql rm -f ${REL_PATH}/cre_t1.sql rm -f ${REL_PATH}/ins_1000.sql kill -9 $pid -ipcrm -M 4444 -M 6666 +ipcrm -M 4444 exit 0; -- 2.11.4.GIT