Replace sharding methods in new directory sharding

AnaNek · AnaNek · commit de58f4ef242b · 2022-01-31T12:01:10.000+03:00
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
diff --git a/crud/common/sharding/init.lua b/crud/common/sharding/init.lua
@@ -4,7 +4,7 @@ local errors = require('errors')
 local BucketIDError = errors.new_class("BucketIDError", {capture_stack = false})
 
 local utils = require('crud.common.utils')
-local sharding_key_module = require('crud.common.sharding_key')
+local sharding_key_module = require('crud.common.sharding.sharding_key')
 
 local sharding = {}
 
diff --git a/crud/common/sharding/sharding_key.lua b/crud/common/sharding/sharding_key.lua
@@ -4,7 +4,7 @@ local errors = require('errors')
 local call = require('crud.common.call')
 local const = require('crud.common.const')
 local dev_checks = require('crud.common.dev_checks')
-local cache = require('crud.common.sharding_key_cache')
+local cache = require('crud.common.sharding.sharding_key_cache')
 local utils = require('crud.common.utils')
 
 local ShardingKeyError = errors.new_class("ShardingKeyError", {capture_stack = false})
diff --git a/crud/common/sharding/sharding_key_cache.lua b/crud/common/sharding/sharding_key_cache.lua
diff --git a/crud/delete.lua b/crud/delete.lua
@@ -4,8 +4,8 @@ local vshard = require('vshard')
 
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
-local sharding_key_module = require('crud.common.sharding_key')
+local sharding = require('crud.common.sharding.init')
+local sharding_key_module = require('crud.common.sharding.sharding_key')
 local dev_checks = require('crud.common.dev_checks')
 local schema = require('crud.common.schema')
 
diff --git a/crud/get.lua b/crud/get.lua
@@ -4,8 +4,8 @@ local vshard = require('vshard')
 
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
-local sharding_key_module = require('crud.common.sharding_key')
+local sharding = require('crud.common.sharding.init')
+local sharding_key_module = require('crud.common.sharding.sharding_key')
 local dev_checks = require('crud.common.dev_checks')
 local schema = require('crud.common.schema')
 
diff --git a/crud/insert.lua b/crud/insert.lua
@@ -4,7 +4,7 @@ local vshard = require('vshard')
 
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
+local sharding = require('crud.common.sharding.init')
 local dev_checks = require('crud.common.dev_checks')
 local schema = require('crud.common.schema')
 
diff --git a/crud/replace.lua b/crud/replace.lua
@@ -4,7 +4,7 @@ local vshard = require('vshard')
 
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
+local sharding = require('crud.common.sharding.init')
 local dev_checks = require('crud.common.dev_checks')
 local schema = require('crud.common.schema')
 
diff --git a/crud/select/compat/select.lua b/crud/select/compat/select.lua
@@ -3,11 +3,11 @@ local errors = require('errors')
 local vshard = require('vshard')
 
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
+local sharding = require('crud.common.sharding.init')
 local dev_checks = require('crud.common.dev_checks')
 local common = require('crud.select.compat.common')
 local schema = require('crud.common.schema')
-local sharding_key_module = require('crud.common.sharding_key')
+local sharding_key_module = require('crud.common.sharding.sharding_key')
 
 local compare_conditions = require('crud.compare.conditions')
 local select_plan = require('crud.select.plan')
diff --git a/crud/select/compat/select_old.lua b/crud/select/compat/select_old.lua
@@ -5,10 +5,10 @@ local fun = require('fun')
 
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
+local sharding = require('crud.common.sharding.init')
 local dev_checks = require('crud.common.dev_checks')
 local schema = require('crud.common.schema')
-local sharding_key_module = require('crud.common.sharding_key')
+local sharding_key_module = require('crud.common.sharding.sharding_key')
 
 local compare_conditions = require('crud.compare.conditions')
 local select_plan = require('crud.select.plan')
diff --git a/crud/update.lua b/crud/update.lua
@@ -4,8 +4,8 @@ local vshard = require('vshard')
 
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
-local sharding_key_module = require('crud.common.sharding_key')
+local sharding = require('crud.common.sharding.init')
+local sharding_key_module = require('crud.common.sharding.sharding_key')
 local dev_checks = require('crud.common.dev_checks')
 local schema = require('crud.common.schema')
 
diff --git a/crud/upsert.lua b/crud/upsert.lua
@@ -4,7 +4,7 @@ local vshard = require('vshard')
 
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
-local sharding = require('crud.common.sharding')
+local sharding = require('crud.common.sharding.init')
 local dev_checks = require('crud.common.dev_checks')
 local schema = require('crud.common.schema')
 
diff --git a/test/helper.lua b/test/helper.lua
@@ -325,7 +325,7 @@ end
 
 function helpers.update_cache(cluster, space_name)
     return cluster.main_server.net_box:eval([[
-        local sharding_key = require('crud.common.sharding_key')
+        local sharding_key = require('crud.common.sharding.sharding_key')
 
         local space_name = ...
         return sharding_key.update_cache(space_name)
diff --git a/test/unit/sharding_key_test.lua b/test/unit/sharding_key_test.lua
@@ -1,6 +1,6 @@
 local t = require('luatest')
-local sharding_key_module = require('crud.common.sharding_key')
-local cache = require('crud.common.sharding_key_cache')
+local sharding_key_module = require('crud.common.sharding.sharding_key')
+local cache = require('crud.common.sharding.sharding_key_cache')
 local utils = require('crud.common.utils')
 
 local helpers = require('test.helper')
