Merge branch 'blueprint-multipart-primary-key'
Conflicts: mod/box/index.h mod/box/index.m mod/box/tree.m test/box/lua.result test/box/lua.test test/box_big/tarantool.cfg As part of the merge, revers int -> u32 type change for key_cardinality, done in the blueprint-multipart-primary-key branch (didn't notice during code review, but it breaks formatting in errcode.h). Merge new and old tests in box_big manually.
Showing
- core/tarantool_lua.m 8 additions, 0 deletionscore/tarantool_lua.m
- include/errcode.h 25 additions, 27 deletionsinclude/errcode.h
- mod/box/box.lua 174 additions, 26 deletionsmod/box/box.lua
- mod/box/box.m 35 additions, 46 deletionsmod/box/box.m
- mod/box/index.h 4 additions, 4 deletionsmod/box/index.h
- mod/box/index.m 78 additions, 75 deletionsmod/box/index.m
- mod/box/memcached.m 1 addition, 1 deletionmod/box/memcached.m
- mod/box/tree.m 12 additions, 4 deletionsmod/box/tree.m
- test/box/lua.result 113 additions, 9 deletionstest/box/lua.result
- test/box/lua.test 52 additions, 0 deletionstest/box/lua.test
- test/box/sql.result 3 additions, 3 deletionstest/box/sql.result
- test/box_big/hash.result 422 additions, 0 deletionstest/box_big/hash.result
- test/box_big/hash.test 267 additions, 0 deletionstest/box_big/hash.test
- test/box_big/lua.result 15 additions, 14 deletionstest/box_big/lua.result
- test/box_big/lua.test 13 additions, 13 deletionstest/box_big/lua.test
- test/box_big/tarantool.cfg 50 additions, 14 deletionstest/box_big/tarantool.cfg
- test/box_big/tree_pk.result 11 additions, 11 deletionstest/box_big/tree_pk.result
- test/box_big/tree_pk.test 11 additions, 11 deletionstest/box_big/tree_pk.test
- test/box_big/tree_pk_multipart.result 227 additions, 0 deletionstest/box_big/tree_pk_multipart.result
- test/box_big/tree_pk_multipart.test 109 additions, 0 deletionstest/box_big/tree_pk_multipart.test
Loading
Please register or sign in to comment