Blueprint tree-primary-key: move the test to box_big suite.

Eliminate server start/stop/deploy cycle for blueprint
'tree-primary-key' tests. Move the tests to box_big suite.

Add coverage.

test/box/tarantool_tree_pk.cfg

-slab_alloc_arena = 0.1
-
-pid_file = "box.pid"
-
-logger="tee -a tarantool.log"
-
-primary_port = 33013
-#secondary_port = 33014
-admin_port = 33015
-
-rows_per_wal = 50
-
-space[0].enabled = 1
-space[0].index[0].type = "TREE"
-space[0].index[0].unique = 1
-space[0].index[0].key_field[0].fieldno = 0
-space[0].index[0].key_field[0].type = "NUM"
-

test/box/tree_pk.result

-insert into t0 values (1, 'tuple')
-Insert OK, 1 row affected
-save snapshot
----
-ok
-...
-insert into t0 values (2, 'tuple 2')
-Insert OK, 1 row affected
-save snapshot
----
-ok
-...
-insert into t0 values (3, 'tuple 3')
-Insert OK, 1 row affected
-select * from t0 where k0 = 1
-Found 1 tuple:
-[1, 'tuple']
-select * from t0 where k0 = 2
-Found 1 tuple:
-[2, 'tuple 2']
-select * from t0 where k0 = 3
-Found 1 tuple:
-[3, 'tuple 3']
-delete from t0 where k0 = 1
-Delete OK, 1 row affected
-delete from t0 where k0 = 2
-Delete OK, 1 row affected
-delete from t0 where k0 = 3
-Delete OK, 1 row affected

test/box/tree_pk.test

-# encoding: tarantool
-#
-
-
-# clean data and restart with appropriate config
-server.stop()
-server.deploy("box/tarantool_tree_pk.cfg")
-server.start()
-
-
-exec sql "insert into t0 values (1, 'tuple')"
-exec admin "save snapshot"
-exec sql "insert into t0 values (2, 'tuple 2')"
-exec admin "save snapshot"
-
-server.stop()
-server.start()
-
-exec sql "insert into t0 values (3, 'tuple 3')"
-exec sql "select * from t0 where k0 = 1"
-exec sql "select * from t0 where k0 = 2"
-exec sql "select * from t0 where k0 = 3"
-
-# Cleanup
-exec sql "delete from t0 where k0 = 1"
-exec sql "delete from t0 where k0 = 2"
-exec sql "delete from t0 where k0 = 3"
-
-# resore default suite config
-server.stop()
-server.deploy(self.suite_ini["config"])
-server.start()

test/box_big/sql.test

@@ -50,4 +50,18 @@ exec sql "select * from t0 where k0='Spears'"
 exec sql "select * from t0 where k1='Anything'"
 exec sql "select * from t0 where k1='Britney'"
 exec sql "delete from t0 where k0='Spears'"
+print """#
+# Test composite keys with trees
+#"""
+exec sql "insert into t1 values ('key1', 'part1', 'part2')"
+exec sql "insert into t1 values ('key2', 'part1', 'part2_a')"
+exec sql "insert into t1 values ('key3', 'part1', 'part2_b')"
+exec sql "select * from t1 where k0='key1'"
+exec sql "select * from t1 where k0='key2'"
+exec sql "select * from t1 where k0='key3'"
+exec sql "select * from t1 where k1='part1'"
+exec sql "delete from t1 where k0='key1'"
+exec sql "delete from t1 where k0='key2'"
+exec sql "delete from t1 where k0='key3'"
+
 # vim: syntax=python

test/box_big/tarantool.cfg

@@ -31,3 +31,15 @@ space[1].index[1].key_field[0].fieldno = 1
 space[1].index[1].key_field[0].type = "STR"
 space[1].index[1].key_field[1].fieldno = 2
 space[1].index[1].key_field[1].type = "STR"
+
+space[2].enabled = 1
+space[2].index[0].type = "TREE"
+space[2].index[0].unique = 1
+space[2].index[0].key_field[0].fieldno = 0
+space[2].index[0].key_field[0].type = "NUM"
+
+space[3].enabled = 1
+space[3].index[0].type = "TREE"
+space[3].index[0].unique = 1
+space[3].index[0].key_field[0].fieldno = 0
+space[3].index[0].key_field[0].type = "STR"

test/box_big/tree_pk.result

+insert into t2 values (1, 'tuple')
+Insert OK, 1 row affected
+save snapshot
+---
+ok
+...
+insert into t2 values (2, 'tuple 2')
+Insert OK, 1 row affected
+save snapshot
+---
+ok
+...
+insert into t2 values (3, 'tuple 3')
+Insert OK, 1 row affected
+select * from t2 where k0 = 1
+Found 1 tuple:
+[1, 'tuple']
+select * from t2 where k0 = 2
+Found 1 tuple:
+[2, 'tuple 2']
+select * from t2 where k0 = 3
+Found 1 tuple:
+[3, 'tuple 3']
+delete from t2 where k0 = 1
+Delete OK, 1 row affected
+delete from t2 where k0 = 2
+Delete OK, 1 row affected
+delete from t2 where k0 = 3
+Delete OK, 1 row affected
+insert into t3 values ('identifier', 'tuple')
+Insert OK, 1 row affected
+save snapshot
+---
+ok
+...
+insert into t3 values ('second', 'tuple 2')
+Insert OK, 1 row affected
+save snapshot
+---
+ok
+...
+insert into t3 values ('third', 'tuple 3')
+Insert OK, 1 row affected
+select * from t3 where k0 = 'identifier'
+Found 1 tuple:
+['identifier', 'tuple']
+select * from t3 where k0 = 'second'
+Found 1 tuple:
+['second', 'tuple 2']
+select * from t3 where k0 = 'third'
+Found 1 tuple:
+['third', 'tuple 3']
+delete from t3 where k0 = 'identifier'
+Delete OK, 1 row affected
+delete from t3 where k0 = 'second'
+Delete OK, 1 row affected
+delete from t3 where k0 = 'third'
+Delete OK, 1 row affected

test/box_big/tree_pk.test

+# encoding: tarantool
+#
+# integer keys
+exec sql "insert into t2 values (1, 'tuple')"
+exec admin "save snapshot"
+exec sql "insert into t2 values (2, 'tuple 2')"
+exec admin "save snapshot"
+
+exec sql "insert into t2 values (3, 'tuple 3')"
+exec sql "select * from t2 where k0 = 1"
+exec sql "select * from t2 where k0 = 2"
+exec sql "select * from t2 where k0 = 3"
+
+# Cleanup
+exec sql "delete from t2 where k0 = 1"
+exec sql "delete from t2 where k0 = 2"
+exec sql "delete from t2 where k0 = 3"
+# string keys
+exec sql "insert into t3 values ('identifier', 'tuple')"
+exec admin "save snapshot"
+exec sql "insert into t3 values ('second', 'tuple 2')"
+exec admin "save snapshot"
+
+exec sql "insert into t3 values ('third', 'tuple 3')"
+exec sql "select * from t3 where k0 = 'identifier'"
+exec sql "select * from t3 where k0 = 'second'"
+exec sql "select * from t3 where k0 = 'third'"
+
+# Cleanup
+exec sql "delete from t3 where k0 = 'identifier'"
+exec sql "delete from t3 where k0 = 'second'"
+exec sql "delete from t3 where k0 = 'third'"