1
1
local argparse = require (' cartridge.argparse' )
2
2
local cartridge = require (' cartridge' )
3
- local ddl = require (' ddl' )
4
3
local errors = require (' errors' )
5
4
local membership = require (' membership' )
6
5
local pool = require (' cartridge.pool' )
7
6
local vshard = require (' vshard' )
8
7
9
8
local utils = require (' graphqlapi.utils' )
10
9
10
+ local ddl
11
+ local ok , rc = pcall (require , ' ddl-ee' )
12
+ if ok then
13
+ ddl = rc
14
+ else
15
+ ddl = require (' ddl' )
16
+ end
17
+
11
18
local _replicas = {}
12
19
13
20
local e_cluster_api = errors .new_class (' cluster API error' , { capture_stack = false })
@@ -31,7 +38,7 @@ local function get_servers()
31
38
table.insert (servers , { alias = alias , conn = conn })
32
39
else
33
40
connect_errors = connect_errors or {}
34
- table.insert (connect_errors , e_cluster_api :new (' instance \' %s\' error: %s' , alias , err ))
41
+ table.insert (connect_errors , e_cluster_api :new (' instance \' %s\' error: %s' , alias , err ))
35
42
end
36
43
end
37
44
return servers , connect_errors
@@ -47,7 +54,7 @@ local function get_masters()
47
54
table.insert (servers , { alias = alias , conn = conn })
48
55
else
49
56
connect_errors = connect_errors or {}
50
- table.insert (connect_errors , e_cluster_api :new (' instance \' %s\' error: %s' , alias , err ))
57
+ table.insert (connect_errors , e_cluster_api :new (' instance \' %s\' error: %s' , alias , err ))
51
58
end
52
59
end
53
60
return servers , connect_errors
@@ -72,7 +79,7 @@ local function get_storages_instances(mode, prefer_replica, balance)
72
79
_replicas [uuid ] = conn .peer_uuid
73
80
else
74
81
if prefer_replica == false and balance == false then
75
- conn = replicaset .master .next_by_priority .conn
82
+ conn = replicaset .master .next_by_priority .conn
76
83
_replicas [uuid ] = conn .peer_uuid
77
84
elseif prefer_replica == false and balance == true then
78
85
local prev_uuid = _replicas [uuid ] or replicaset .priority_list [1 ].uuid
@@ -168,7 +175,7 @@ local function get_servers_by_list(instances)
168
175
table.insert (servers , { replicaset_uuid = replicaset_uuid , alias = alias , conn = conn , })
169
176
else
170
177
connect_errors = connect_errors or {}
171
- table.insert (connect_errors , e_cluster_api :new (' instance \' %s\' error: %s' , alias , err ))
178
+ table.insert (connect_errors , e_cluster_api :new (' instance \' %s\' error: %s' , alias , err ))
172
179
end
173
180
end
174
181
end
@@ -179,7 +186,7 @@ local function get_existing_spaces()
179
186
local spaces = {}
180
187
local schema = ddl .get_schema ()
181
188
for space in pairs (schema .spaces ) do
182
- spaces [space ]= space
189
+ spaces [space ] = space
183
190
end
184
191
return spaces
185
192
end
0 commit comments