Skip to content

Commit 7eb874c

Browse files
committed
Remove redundant changes
1 parent 2e4c7fa commit 7eb874c

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

crud/common/utils.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,9 @@ function utils.extract_jsonpath_keys(tuple, index_parts, condition_map)
180180

181181
-- We need this check (and also condition map) for composite
182182
-- jsonpath indexes. For example, we have to filtering values
183-
-- by partial jsonpath index - and we have to extract
184-
-- only this value (not full index values)
183+
-- by partial jsonpath index, but index is composite and fields
184+
-- are jsonpaths to the same space field. In this case, we
185+
-- have to extract only needed value, specified in condtion.
185186
if condition_map ~= nil then
186187
if condition_map[extracted_values[curr_jsonpath_ind]] then
187188
key[i] = extracted_values[curr_jsonpath_ind]

crud/select/filters.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,6 @@ function filters.gen_func(space, conditions, opts)
655655
scan_condition_num = opts.scan_condition_num,
656656
tarantool_iter = opts.tarantool_iter,
657657
})
658-
659658
if err ~= nil then
660659
return nil, GenFiltersError:new("Failed to generate filters for specified conditions: %s", err)
661660
end

crud/select/merger.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ local function decode_metainfo(buf)
9494
return res
9595
end
9696

97-
9897
--- Wait for a data chunk and request for the next data chunk.
9998
local function fetch_chunk(context, state)
10099
local net_box_opts = context.net_box_opts
@@ -170,7 +169,6 @@ local function new(replicasets, space_name, index_id, func_name, func_args, opts
170169
vshard_call_name = vshard_call_name,
171170
timeout = call_opts.timeout,
172171
}
173-
174172
local state = {future = future}
175173
local source = merger_lib.new_buffer_source(fetch_chunk, context, state)
176174
table.insert(merger_sources, source)

test/integration/select_test.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ pgroup:add('test_negative_first', function(g)
169169
id = 2, name = "Mary", last_name = "Brown",
170170
age = 22, city = "Los Angeles",
171171
}, {
172-
id = 3, name = "David", last_name = "Smith1",
172+
id = 3, name = "David", last_name = "Smith",
173173
age = 33, city = "Los Angeles",
174174
}, {
175175
id = 4, name = "William", last_name = "White",
176176
age = 44, city = "Chicago",
177177
}, {
178-
id = 5, name = "Jack", last_name = "Sparrow1",
178+
id = 5, name = "Jack", last_name = "Sparrow",
179179
age = 55, city = "London",
180180
}, {
181181
id = 6, name = "William", last_name = "Terner",

0 commit comments

Comments
 (0)