From db7171fb5776d158e0a34611a17e3726dc7f5d54 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Thu, 26 Jun 2014 16:44:18 +0400
Subject: [PATCH] Fix a bug in index definition (bootstrap.snap).
---
extra/schema_fill.lua | 2 +-
src/box/bootstrap.snap | Bin 1678 -> 1679 bytes
test/box/alter.result | 2 +-
test/lib/app_server.py | 4 ++++
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/extra/schema_fill.lua b/extra/schema_fill.lua
index 89a5c984ee..698c40bd1c 100644
--- a/extra/schema_fill.lua
+++ b/extra/schema_fill.lua
@@ -50,7 +50,7 @@ _index:insert{_priv.id, 0, 'primary', 'tree', 1, 3, 1, 'num', 2, 'str', 3, 'num'
-- owner index - to quickly find all privileges granted to a user
_index:insert{_priv.id, 1, 'owner', 'tree', 0, 1, 1, 'num'}
-- object index - to quickly find all grants on a given object
-_index:insert{_priv.id, 2, 'object', 'tree', 0, 1, 2, 'str', 3, 'num'}
+_index:insert{_priv.id, 2, 'object', 'tree', 0, 2, 2, 'str', 3, 'num'}
-- primary key: node id
_index:insert{_cluster.id, 0, 'primary', 'tree', 1, 1, 0, 'num'}
-- node uuid key: node uuid
diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap
index 08cd89aa368cb46a19b7fe52e1aa812db3bf1e1a..01826679a3620c1593c8ccb4aee510b82da0835d 100644
GIT binary patch
delta 263
zcmeC<?dPoz_Hzv2GSD+L;tEbJDoZW0Qb<WQH%Uq|OVqVYG)>esF-@}6O-f2h(KR(T
zwlGLaF*7qZvfv7H&dE>Cwo<4zv{EoKujS&px{G_Y4a2#^b*~>Uzgf?~pm^{=69W@7
zW0Sx+1_nj}#YxMPb4rU#Qj2b?B%7w1CZ(90>YACFNLc8a7$ha@T38sR>Ka)XS(+v%
zni{2=ns1!O&d7W~^ycIRjIrz>0}mWJFqwrZ8!T4DWDKG=uV7lt#IkLP_T$O^tm=$R
algn8zv8;aW+BMmiO;Upxe_Rz<`xXF&&s3@a
delta 262
zcmeC@?c=Qv_Hzv2GSD+L;tEbJDoZW0Qm`;hHB3rLGSoFswJ^~&NwcufO*Azz)-^OY
zG&eP}G&Z(OvE&MK&dE>Cwo<4zv{Epr<>I=!i+i;V!@1q|7nUqPR?onoc(9>~fr**1
zN#Gm<1EYZAq~*yurNt$wMK@K<l8r4=Q<773Eeui;#dS^0ERuDTjLnmEEmD$<Ee(@Q
zlZ*^ZH%@0~WN!F%Z1O_JSay(s2M#q%W@X9-ixo2&gXqmGnHDp#aNTkZoE*Ta&d4~q
Zg7p&1wH+<zCi}5TY7pa%s{(7^0su?<QxX6G
diff --git a/test/box/alter.result b/test/box/alter.result
index 0889df66ed..ef6754c69c 100644
--- a/test/box/alter.result
+++ b/test/box/alter.result
@@ -168,7 +168,7 @@ _index:select{}
- [304, 2, 'name', 'tree', 1, 1, 2, 'str']
- [312, 0, 'primary', 'tree', 1, 3, 1, 'num', 2, 'str', 3, 'num']
- [312, 1, 'owner', 'tree', 0, 1, 1, 'num']
- - [312, 2, 'object', 'tree', 0, 1, 2, 'str', 3, 'num']
+ - [312, 2, 'object', 'tree', 0, 2, 2, 'str', 3, 'num']
- [320, 0, 'primary', 'tree', 1, 1, 0, 'num']
- [320, 1, 'uuid', 'tree', 1, 1, 1, 'str']
...
diff --git a/test/lib/app_server.py b/test/lib/app_server.py
index 90be7aa125..22793a5c80 100644
--- a/test/lib/app_server.py
+++ b/test/lib/app_server.py
@@ -29,6 +29,10 @@ class AppServer(Server):
Server.__init__(self, ini)
self.testdir = os.path.abspath(os.curdir)
self.vardir = ini['vardir']
+ self.re_vardir_cleanup += [
+ "*.snap", "*.xlog", "*.inprogress",
+ "*.sup", "*.lua", "*.pid"]
+ self.cleanup()
self.builddir = ini['builddir']
self.debug = False
self.lua_libs = ini['lua_libs']
--
GitLab