@@ -15,7 +15,9 @@ local ipairs = ipairs
15
15
local tonumber = tonumber
16
16
local match = string.match
17
17
local char = string.char
18
-
18
+ local table_insert = table.insert
19
+ local string_find = string.find
20
+ local redis_crc = xmodem .redis_crc
19
21
20
22
local DEFAULT_SHARED_DICT_NAME = " redis_cluster_slot_locks"
21
23
local DEFAULT_MAX_REDIRECTION = 5
@@ -27,8 +29,8 @@ local DEFAULT_SEND_TIMEOUT = 1000
27
29
local DEFAULT_READ_TIMEOUT = 1000
28
30
29
31
local function parse_key (key_str )
30
- local left_tag_single_index = string.find (key_str , " {" , 0 )
31
- local right_tag_single_index = string.find (key_str , " }" , 0 )
32
+ local left_tag_single_index = string_find (key_str , " {" , 0 )
33
+ local right_tag_single_index = string_find (key_str , " }" , 0 )
32
34
if left_tag_single_index and right_tag_single_index then
33
35
-- parse hashtag
34
36
return key_str .sub (key_str , left_tag_single_index + 1 , right_tag_single_index - 1 )
@@ -56,7 +58,7 @@ local cluster_invalid_cmds = {
56
58
}
57
59
58
60
local function redis_slot (str )
59
- return xmodem . redis_crc (parse_key (str ))
61
+ return redis_crc (parse_key (str ))
60
62
end
61
63
62
64
local function check_auth (self , redis_client )
89
91
local function split (s , delimiter )
90
92
local result = {};
91
93
for m in (s .. delimiter ):gmatch (" (.-)" .. delimiter ) do
92
- table.insert (result , m );
94
+ table_insert (result , m );
93
95
end
94
96
return result ;
95
97
end
@@ -115,14 +117,14 @@ local function try_hosts_slots(self, serv_list)
115
117
if ok then break end
116
118
if err then
117
119
ngx .log (ngx .ERR ," unable to connect, attempt nr " , k , " : error: " , err )
118
- table.insert (errors , err )
120
+ table_insert (errors , err )
119
121
end
120
122
end
121
123
122
124
if ok then
123
125
local _ , autherr = check_auth (self , redis_client )
124
126
if autherr then
125
- table.insert (errors , autherr )
127
+ table_insert (errors , autherr )
126
128
return nil , errors
127
129
end
128
130
local slots_info
@@ -155,7 +157,7 @@ local function try_hosts_slots(self, serv_list)
155
157
slot_cache [self .config .name ] = slots
156
158
slot_cache [self .config .name .. " serv_list" ] = servers
157
159
else
158
- table.insert (errors , err )
160
+ table_insert (errors , err )
159
161
end
160
162
-- cache master nodes
161
163
local nodes_res , nerr = redis_client :cluster (" nodes" )
@@ -167,19 +169,19 @@ local function try_hosts_slots(self, serv_list)
167
169
local is_master = match (node_info [3 ], " master" ) ~= nil
168
170
if is_master then
169
171
local ip_port = split (split (node_info [2 ], " @" )[1 ], " :" )
170
- table.insert (master_nodes , {
172
+ table_insert (master_nodes , {
171
173
ip = ip_port [1 ],
172
174
port = tonumber (ip_port [2 ])
173
175
})
174
176
end
175
177
end
176
178
end
177
179
else
178
- table.insert (errors , nerr )
180
+ table_insert (errors , nerr )
179
181
end
180
182
release_connection (redis_client , config )
181
183
else
182
- table.insert (errors , err )
184
+ table_insert (errors , err )
183
185
end
184
186
if # errors == 0 then
185
187
return true , nil
@@ -502,7 +504,7 @@ local function _do_cmd_master(self, cmd, key, ...)
502
504
_ , err = redis_client [cmd ](redis_client , key , ... )
503
505
end
504
506
if err then
505
- table.insert (errors , err )
507
+ table_insert (errors , err )
506
508
end
507
509
release_connection (redis_client , self .config )
508
510
end
@@ -518,7 +520,7 @@ local function _do_cmd(self, cmd, key, ...)
518
520
if _reqs then
519
521
local args = { ... }
520
522
local t = { cmd = cmd , key = key , args = args }
521
- table.insert (_reqs , t )
523
+ table_insert (_reqs , t )
522
524
return
523
525
end
524
526
0 commit comments