Skip to content

Commit ed6bb4c

Browse files
Add support for ddl-ee
1 parent 83ca476 commit ed6bb4c

File tree

2 files changed

+32
-18
lines changed

2 files changed

+32
-18
lines changed

examples/cartridge-simple/app/test_data.lua

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
local ddl = require('ddl')
1+
local ddl
2+
local ok, rc = pcall(require, 'ddl-ee')
3+
if ok then
4+
ddl = rc
5+
else
6+
ddl = require('ddl')
7+
end
8+
29
local log = require('log')
310

411
local function fill()
@@ -10,33 +17,33 @@ local function fill()
1017
is_local = false,
1118
temporary = false,
1219
format = {
13-
{name = 'customer_id', is_nullable = false, type = 'unsigned'},
14-
{name = 'bucket_id', is_nullable = false, type = 'unsigned'},
15-
{name = 'fullname', is_nullable = false, type = 'string'},
20+
{ name = 'customer_id', is_nullable = false, type = 'unsigned' },
21+
{ name = 'bucket_id', is_nullable = false, type = 'unsigned' },
22+
{ name = 'fullname', is_nullable = false, type = 'string' },
1623
},
17-
indexes = {{
24+
indexes = { {
1825
name = 'customer_id',
1926
type = 'TREE',
2027
unique = true,
2128
parts = {
22-
{path = 'customer_id', is_nullable = false, type = 'unsigned'}
29+
{ path = 'customer_id', is_nullable = false, type = 'unsigned' }
2330
}
2431
}, {
2532
name = 'bucket_id',
2633
type = 'TREE',
2734
unique = false,
2835
parts = {
29-
{path = 'bucket_id', is_nullable = false, type = 'unsigned'}
36+
{ path = 'bucket_id', is_nullable = false, type = 'unsigned' }
3037
}
3138
}, {
3239
name = 'fullname',
3340
type = 'TREE',
3441
unique = true,
3542
parts = {
36-
{path = 'fullname', is_nullable = false, type = 'string'}
43+
{ path = 'fullname', is_nullable = false, type = 'string' }
3744
}
38-
}},
39-
sharding_key = {'customer_id'},
45+
} },
46+
sharding_key = { 'customer_id' },
4047
}
4148
}
4249
}
@@ -53,8 +60,8 @@ local function fill()
5360

5461
if box.space['customer'] ~= nil then
5562
for id = 1, 250 do
56-
local bucket_id = ddl.bucket_id('customer', {id})
57-
crud.replace('customer', {id, bucket_id, 'Test Customer '..tostring(id)})
63+
local bucket_id = ddl.bucket_id('customer', { id })
64+
crud.replace('customer', { id, bucket_id, 'Test Customer ' .. tostring(id) })
5865
end
5966
end
6067
end

graphqlapi/cluster.lua

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
local argparse = require('cartridge.argparse')
22
local cartridge = require('cartridge')
3-
local ddl = require('ddl')
43
local errors = require('errors')
54
local membership = require('membership')
65
local pool = require('cartridge.pool')
76
local vshard = require('vshard')
87

98
local utils = require('graphqlapi.utils')
109

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+
1118
local _replicas = {}
1219

1320
local e_cluster_api = errors.new_class('cluster API error', { capture_stack = false })
@@ -31,7 +38,7 @@ local function get_servers()
3138
table.insert(servers, { alias = alias, conn = conn })
3239
else
3340
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))
3542
end
3643
end
3744
return servers, connect_errors
@@ -47,7 +54,7 @@ local function get_masters()
4754
table.insert(servers, { alias = alias, conn = conn })
4855
else
4956
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))
5158
end
5259
end
5360
return servers, connect_errors
@@ -72,7 +79,7 @@ local function get_storages_instances(mode, prefer_replica, balance)
7279
_replicas[uuid] = conn.peer_uuid
7380
else
7481
if prefer_replica == false and balance == false then
75-
conn = replicaset.master.next_by_priority.conn
82+
conn = replicaset.master.next_by_priority.conn
7683
_replicas[uuid] = conn.peer_uuid
7784
elseif prefer_replica == false and balance == true then
7885
local prev_uuid = _replicas[uuid] or replicaset.priority_list[1].uuid
@@ -168,7 +175,7 @@ local function get_servers_by_list(instances)
168175
table.insert(servers, { replicaset_uuid = replicaset_uuid, alias = alias, conn = conn, })
169176
else
170177
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))
172179
end
173180
end
174181
end
@@ -179,7 +186,7 @@ local function get_existing_spaces()
179186
local spaces = {}
180187
local schema = ddl.get_schema()
181188
for space in pairs(schema.spaces) do
182-
spaces[space]=space
189+
spaces[space] = space
183190
end
184191
return spaces
185192
end

0 commit comments

Comments
 (0)