Added a timing test, minor modifications in 02

diff --git a/test/gils/Makefile.am b/test/gils/Makefile.am
index 55f2a79..04d6f59 100644 (file)
--- a/test/gils/Makefile.am
+++ b/test/gils/Makefile.am
@@ -6,7 +6,10 @@ dist-hook:
        -mkdir $(distdir)/records
        cp $(srcdir)/records/*.grs $(distdir)/records
 
-TESTS = test01.sh test04.sh test1.sh test2.sh
+TESTS = test01.sh test02.sh test03.sh test04.sh \
+        test1.sh test2.sh \
+       timing1.sh
+
 # FIXME:
 # test02.sh fails
 # test03.sh fails with a segfault

diff --git a/test/gils/test2.sh b/test/gils/test2.sh
index ef51666..7284db0 100755 (executable)
--- a/test/gils/test2.sh
+++ b/test/gils/test2.sh
@@ -65,6 +65,7 @@ mv records/esdd0002x.grs records/esdd0002.grs
 
 echo "indexing it..."
 ../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+sleep 1
 
 echo "search 6..."
 ../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1

diff --git a/test/gils/timing1.sh b/test/gils/timing1.sh
new file mode 100755 (executable)
index 0000000..c8ba247
--- /dev/null
+++ b/test/gils/timing1.sh
@@ -0,0 +1,120 @@
+# timing1.sh - tests that updates are reflected immediately
+# in the registers. Repeatedly modifies a record and counts hits.
+# Because of the timing aspect of this, if may fail at any time
+# or not at all. 
+
+echo "Testing timings of updates"
+echo "  init..."
+rm -f idx.log log
+rm -f records/esdd000[12].grs # these should not be here, will be created later
+../../index/zebraidx -l idx.log init || exit 1
+
+echo "  killing old server (if any)..."
+test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
+rm -f zebrasrv.pid
+rm -f srv.log
+
+echo "  starting server..."
+../../index/zebrasrv -S -c zebra2.cfg -l srv.log tcp:@:9901 &
+sleep 1
+test -f zebrasrv.pid || exit 1
+
+echo "  update 1..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "  search 1..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log || exit 1
+
+echo "making a test record..."
+cp records/esdd0006.grs records/esdd0002.grs
+
+echo "  indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "  search 2..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log || exit 1
+echo "  1a: modifying a test record (xyz)..."
+sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
+mv records/esdd0002x.grs records/esdd0002.grs
+
+echo "    indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "    search 3..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..."
+grep "^Result count: 9$" log || exit 1
+
+echo "  1b: modifying the test record back (utah)..."
+sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
+mv records/esdd0002x.grs records/esdd0002.grs
+
+echo "    indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "    search 4..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..."
+grep "^Result count: 10$" log || exit 1
+
+echo "  2a: modifying the test record (xyz)..."
+sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
+mv records/esdd0002x.grs records/esdd0002.grs
+
+echo "    indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "    search 5..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..."
+grep "^Result count: 9$" log || exit 1
+
+echo "  2b: modifying the test record back (utah)..."
+sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
+mv records/esdd0002x.grs records/esdd0002.grs
+
+echo "    indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "    search 6..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..."
+grep "^Result count: 10$" log || exit 1
+
+
+echo "  3a: modifying the test record (xyz)..."
+sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
+mv records/esdd0002x.grs records/esdd0002.grs
+
+echo "    indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "    search 7..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..."
+grep "^Result count: 9$" log || exit 1
+
+echo "  3b: modifying the test record back (utah)..."
+sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
+mv records/esdd0002x.grs records/esdd0002.grs
+
+echo "    indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "    search 8..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..."
+grep "^Result count: 10$" log || exit 1
+
+
+echo "stopping server..."
+test -f zebrasrv.pid || exit 1
+kill -9 `cat zebrasrv.pid` || exit 1
+rm -f idx.log log
+rm -f records/esdd000[12].grs 
+rm -f zebrasrv.pid
+rm -f srv.log
+
+echo ok