Skip to content

Commit 8126c3d

Browse files
ddl: rename sharding_metadata_cache
Rename sharding_metadata_cache to router_metadata_cache to distinct it from storage_metadata_hash. Part of #212
1 parent f72d416 commit 8126c3d

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
local fiber = require('fiber')
2+
3+
local router_metadata_cache = {}
4+
5+
router_metadata_cache.SHARDING_KEY_MAP_NAME = "sharding_key_as_index_obj_map"
6+
router_metadata_cache.SHARDING_FUNC_MAP_NAME = "sharding_func_map"
7+
router_metadata_cache[router_metadata_cache.SHARDING_KEY_MAP_NAME] = nil
8+
router_metadata_cache[router_metadata_cache.SHARDING_FUNC_MAP_NAME] = nil
9+
router_metadata_cache.fetch_lock = fiber.channel(1)
10+
router_metadata_cache.is_part_of_pk = {}
11+
12+
function router_metadata_cache.drop_caches()
13+
router_metadata_cache[router_metadata_cache.SHARDING_KEY_MAP_NAME] = nil
14+
router_metadata_cache[router_metadata_cache.SHARDING_FUNC_MAP_NAME] = nil
15+
if router_metadata_cache.fetch_lock ~= nil then
16+
router_metadata_cache.fetch_lock:close()
17+
end
18+
router_metadata_cache.fetch_lock = fiber.channel(1)
19+
router_metadata_cache.is_part_of_pk = {}
20+
end
21+
22+
return router_metadata_cache

crud/common/sharding/sharding_func.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local errors = require('errors')
22
local log = require('log')
33

44
local dev_checks = require('crud.common.dev_checks')
5-
local cache = require('crud.common.sharding.sharding_metadata_cache')
5+
local cache = require('crud.common.sharding.router_metadata_cache')
66
local utils = require('crud.common.utils')
77

88
local ShardingFuncError = errors.new_class('ShardingFuncError', {capture_stack = false})

crud/common/sharding/sharding_key.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local errors = require('errors')
22
local log = require('log')
33

44
local dev_checks = require('crud.common.dev_checks')
5-
local cache = require('crud.common.sharding.sharding_metadata_cache')
5+
local cache = require('crud.common.sharding.router_metadata_cache')
66
local utils = require('crud.common.utils')
77

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

crud/common/sharding/sharding_metadata.lua

Lines changed: 1 addition & 1 deletion
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.sharding_metadata_cache')
7+
local cache = require('crud.common.sharding.router_metadata_cache')
88
local storage_cache = require('crud.common.sharding.storage_metadata_cache')
99
local sharding_func = require('crud.common.sharding.sharding_func')
1010
local sharding_key = require('crud.common.sharding.sharding_key')

crud/common/sharding/sharding_metadata_cache.lua

Lines changed: 0 additions & 22 deletions
This file was deleted.

test/helper.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ end
334334

335335
function helpers.get_sharding_key_cache(cluster)
336336
return cluster.main_server.net_box:eval([[
337-
local sharding_metadata_cache = require('crud.common.sharding.sharding_metadata_cache')
337+
local sharding_metadata_cache = require('crud.common.sharding.router_metadata_cache')
338338
339339
return sharding_metadata_cache[sharding_metadata_cache.SHARDING_KEY_MAP_NAME]
340340
]])
@@ -362,7 +362,7 @@ end
362362
-- but not the cache itself
363363
function helpers.get_sharding_func_cache_size(cluster)
364364
return cluster.main_server.net_box:eval([[
365-
local sharding_metadata_cache = require('crud.common.sharding.sharding_metadata_cache')
365+
local sharding_metadata_cache = require('crud.common.sharding.router_metadata_cache')
366366
367367
local cache, err = sharding_metadata_cache[sharding_metadata_cache.SHARDING_FUNC_MAP_NAME]
368368
if cache == nil then

test/unit/sharding_metadata_test.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ local ffi = require('ffi')
33
local sharding_metadata_module = require('crud.common.sharding.sharding_metadata')
44
local sharding_key_module = require('crud.common.sharding.sharding_key')
55
local sharding_func_module = require('crud.common.sharding.sharding_func')
6-
local cache = require('crud.common.sharding.sharding_metadata_cache')
6+
local cache = require('crud.common.sharding.router_metadata_cache')
77
local utils = require('crud.common.utils')
88

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

0 commit comments

Comments
 (0)