Skip to content

Commit 14d39f2

Browse files
committed
Replace sharding methods in new directory sharding
Since this patch presents the implementation of support of DDL sharding function, the number of files associated with sharding will increase in the `common` folder. Therefore, a separate directory was created for files containing methods for working with sharding. Part of #237
1 parent 46c78c0 commit 14d39f2

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

crud.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local select = require('crud.select')
1212
local truncate = require('crud.truncate')
1313
local len = require('crud.len')
1414
local borders = require('crud.borders')
15-
local sharding_key = require('crud.common.sharding_key')
15+
local sharding_key = require('crud.common.sharding.sharding_key')
1616
local utils = require('crud.common.utils')
1717

1818
local crud = {}

crud/common/sharding.lua renamed to crud/common/sharding/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ local errors = require('errors')
44
local BucketIDError = errors.new_class("BucketIDError", {capture_stack = false})
55

66
local utils = require('crud.common.utils')
7-
local sharding_key_module = require('crud.common.sharding_key')
7+
local sharding_key_module = require('crud.common.sharding.sharding_key')
88

99
local sharding = {}
1010

crud/common/sharding_key.lua renamed to crud/common/sharding/sharding_key.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ local errors = require('errors')
44
local call = require('crud.common.call')
55
local const = require('crud.common.const')
66
local dev_checks = require('crud.common.dev_checks')
7-
local cache = require('crud.common.sharding_key_cache')
7+
local cache = require('crud.common.sharding.sharding_key_cache')
88
local utils = require('crud.common.utils')
99

1010
local ShardingKeyError = errors.new_class("ShardingKeyError", {capture_stack = false})

crud/delete.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local vshard = require('vshard')
55
local call = require('crud.common.call')
66
local utils = require('crud.common.utils')
77
local sharding = require('crud.common.sharding')
8-
local sharding_key_module = require('crud.common.sharding_key')
8+
local sharding_key_module = require('crud.common.sharding.sharding_key')
99
local dev_checks = require('crud.common.dev_checks')
1010
local schema = require('crud.common.schema')
1111

crud/get.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local vshard = require('vshard')
55
local call = require('crud.common.call')
66
local utils = require('crud.common.utils')
77
local sharding = require('crud.common.sharding')
8-
local sharding_key_module = require('crud.common.sharding_key')
8+
local sharding_key_module = require('crud.common.sharding.sharding_key')
99
local dev_checks = require('crud.common.dev_checks')
1010
local schema = require('crud.common.schema')
1111

crud/select/compat/select.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local sharding = require('crud.common.sharding')
77
local dev_checks = require('crud.common.dev_checks')
88
local common = require('crud.select.compat.common')
99
local schema = require('crud.common.schema')
10-
local sharding_key_module = require('crud.common.sharding_key')
10+
local sharding_key_module = require('crud.common.sharding.sharding_key')
1111

1212
local compare_conditions = require('crud.compare.conditions')
1313
local select_plan = require('crud.select.plan')

crud/select/compat/select_old.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local utils = require('crud.common.utils')
88
local sharding = require('crud.common.sharding')
99
local dev_checks = require('crud.common.dev_checks')
1010
local schema = require('crud.common.schema')
11-
local sharding_key_module = require('crud.common.sharding_key')
11+
local sharding_key_module = require('crud.common.sharding.sharding_key')
1212

1313
local compare_conditions = require('crud.compare.conditions')
1414
local select_plan = require('crud.select.plan')

crud/update.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local vshard = require('vshard')
55
local call = require('crud.common.call')
66
local utils = require('crud.common.utils')
77
local sharding = require('crud.common.sharding')
8-
local sharding_key_module = require('crud.common.sharding_key')
8+
local sharding_key_module = require('crud.common.sharding.sharding_key')
99
local dev_checks = require('crud.common.dev_checks')
1010
local schema = require('crud.common.schema')
1111

test/helper.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ end
325325

326326
function helpers.update_cache(cluster, space_name)
327327
return cluster.main_server.net_box:eval([[
328-
local sharding_key = require('crud.common.sharding_key')
328+
local sharding_key = require('crud.common.sharding.sharding_key')
329329
330330
local space_name = ...
331331
return sharding_key.update_cache(space_name)

test/unit/sharding_key_test.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
local t = require('luatest')
2-
local sharding_key_module = require('crud.common.sharding_key')
3-
local cache = require('crud.common.sharding_key_cache')
2+
local sharding_key_module = require('crud.common.sharding.sharding_key')
3+
local cache = require('crud.common.sharding.sharding_key_cache')
44
local utils = require('crud.common.utils')
55

66
local helpers = require('test.helper')

0 commit comments

Comments
 (0)