Review fixes for #1189

src/box/lua/tuple.lua

@@ -94,9 +94,6 @@ local tuple_iterator_t = ffi.typeof('box_tuple_iterator_t')
 local tuple_iterator_ref_t = ffi.typeof('box_tuple_iterator_t &')
 
 local function tuple_iterator(tuple)
-    if tuple == nil then
-        error("Invalid tuple for iterator")
-    end
     local it = builtin.box_tuple_iterator(tuple)
     if it == nil then
         box.error()
@@ -136,6 +133,7 @@ end;
 
 -- See http://www.lua.org/manual/5.2/manual.html#pdf-next
 local function tuple_next(tuple, pos)
+    tuple_check(tuple, "tuple:next(tuple[, pos])")
     if pos == nil then
         pos = 0
     end
@@ -148,6 +146,7 @@ end
 
 -- See http://www.lua.org/manual/5.2/manual.html#pdf-ipairs
 local function tuple_ipairs(tuple, pos)
+    tuple_check(tuple, "tuple:pairs(tuple[, pos])")
     local it = tuple_iterator(tuple)
     return fun.wrap(it, tuple, pos)
 end
@@ -236,12 +235,18 @@ end
 
 -- Set encode hooks for msgpackffi
 local function tuple_to_msgpack(buf, tuple)
-    local bsize = tuple:bsize()
+    assert(ffi.istype(tuple_t, tuple))
+    local bsize = builtin.box_tuple_bsize(tuple)
     buf:reserve(bsize)
     builtin.box_tuple_to_buf(tuple, buf.wpos, bsize)
     buf.wpos = buf.wpos + bsize
 end
 
+local function tuple_bsize(tuple)
+    tuple_check(tuple, "tuple:bsize()");
+    return tonumber(builtin.box_tuple_bsize(tuple))
+end
+
 msgpackffi.on_encode(const_tuple_ref_t, tuple_to_msgpack)
 
 
@@ -259,10 +264,7 @@ local methods = {
     ["totable"]     = tuple_totable;
     ["update"]      = tuple_update;
     ["upsert"]      = tuple_upsert;
-    ["bsize"]       = function(tuple)
-        tuple_check(tuple, "tuple:bsize()");
-        return tonumber(builtin.box_tuple_bsize(tuple))
-    end;
+    ["bsize"]       = tuple_bsize;
     ["__serialize"] = tuple_totable; -- encode hook for msgpack/yaml/json
 }
 

test/big/lua.result

+env = require('test_run')
+---
+...
+test_run = env.new()
+---
+...
+test_run:cmd("push filter ".."'\\.lua.*:[0-9]+: ' to '.lua...\"]:<line>: '")
+---
+- true
+...
 space = box.schema.space.create('tweedledum')
 ---
 ...
@@ -586,7 +596,7 @@ space.index['i1']:count()
 -- Test cases for #123: box.index.count does not check arguments properly
 space.index['i1']:count(function() end)
 ---
-- error: 'builtin/msgpackffi.lua:226: can not encode Lua type: ''function'''
+- error: 'builtin/msgpackffi.lua..."]:<line>: can not encode Lua type: ''function'''
 ...
 space:drop()
 ---
@@ -746,7 +756,7 @@ t:find(2, '2')
 ...
 t:find(89, '2')
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:130: error: invalid key to ''next'''
+- error: '[string "-- tuple.lua..."]:<line>: error: invalid key to ''next'''
 ...
 t:findall(4, '3')
 ---
@@ -940,4 +950,8 @@ space:drop()
 space = nil
 ---
 ...
+test_run:cmd("clear filter")
+---
+- true
+...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

test/big/lua.test.lua

+env = require('test_run')
+test_run = env.new()
+test_run:cmd("push filter ".."'\\.lua.*:[0-9]+: ' to '.lua...\"]:<line>: '")
+
 space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'str'}, unique = true })
 tmp = space:create_index('minmax', { type = 'tree', parts = {2, 'str', 3, 'str'}, unique = true })
@@ -350,4 +354,5 @@ index_random_test(space, 'secondary')
 space:drop()
 space = nil
 
+test_run:cmd("clear filter")
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

test/box/tuple.result

 -- box.tuple test
+env = require('test_run')
+---
+...
+test_run = env.new()
+---
+...
+test_run:cmd("push filter ".."'\\.lua.*:[0-9]+: ' to '.lua...\"]:<line>: '")
+---
+- true
+...
 -- Test box.tuple:slice()
 t=box.tuple.new{'0', '1', '2', '3', '4', '5', '6', '7'}
 ---
@@ -305,12 +315,12 @@ t:unpack(2, 1)
 ...
 t:totable(0)
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:162: tuple.totable: invalid second
+- error: '[string "-- tuple.lua..."]:<line>: tuple.totable: invalid second
     argument'
 ...
 t:totable(1, 0)
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:171: tuple.totable: invalid third
+- error: '[string "-- tuple.lua..."]:<line>: tuple.totable: invalid third
     argument'
 ...
 --
@@ -443,7 +453,7 @@ t:next(-1)
 ...
 t:next("fdsaf")
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:142: bad argument #2 to ''box_tuple_field''
+- error: '[string "-- tuple.lua..."]:<line>: bad argument #2 to ''box_tuple_field''
     (cannot convert ''string'' to ''unsigned int'')'
 ...
 box.tuple.new({'x', 'y', 'z'}):next()
@@ -612,7 +622,7 @@ r = {}
 ...
 for _state, val in t:pairs(10) do table.insert(r, val) end
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:130: error: invalid key to ''next'''
+- error: '[string "-- tuple.lua..."]:<line>: error: invalid key to ''next'''
 ...
 r
 ---
@@ -705,19 +715,19 @@ t:findall(1, 'xxxxx')
 ...
 t:find(100, 'a')
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:130: error: invalid key to ''next'''
+- error: '[string "-- tuple.lua..."]:<line>: error: invalid key to ''next'''
 ...
 t:findall(100, 'a')
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:130: error: invalid key to ''next'''
+- error: '[string "-- tuple.lua..."]:<line>: error: invalid key to ''next'''
 ...
 t:find(100, 'xxxxx')
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:130: error: invalid key to ''next'''
+- error: '[string "-- tuple.lua..."]:<line>: error: invalid key to ''next'''
 ...
 t:findall(100, 'xxxxx')
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:130: error: invalid key to ''next'''
+- error: '[string "-- tuple.lua..."]:<line>: error: invalid key to ''next'''
 ...
 ---
 -- Lua type coercion
@@ -811,12 +821,12 @@ t = box.tuple.new({'a', 'b', 'c', 'd', 'e'})
 ...
 t:update()
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:214: Usage: tuple:update({ {
+- error: '[string "-- tuple.lua..."]:<line>: Usage: tuple:update({ {
     op, field, arg}+ })'
 ...
 t:update(10)
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:214: Usage: tuple:update({ {
+- error: '[string "-- tuple.lua..."]:<line>: Usage: tuple:update({ {
     op, field, arg}+ })'
 ...
 t:update({})
@@ -913,26 +923,26 @@ t = box.tuple.new({1, 2, {}})
 ...
 t.bsize()
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:89: Usage: tuple:bsize()'
+- error: '[string "-- tuple.lua..."]:<line>: Usage: tuple:bsize()'
 ...
 t.find(9223372036854775807LL)
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:89: Usage: tuple:find([offset,
+- error: '[string "-- tuple.lua..."]:<line>: Usage: tuple:find([offset,
     ]val)'
 ...
 t.findall(9223372036854775807LL)
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:89: Usage: tuple:findall([offset,
+- error: '[string "-- tuple.lua..."]:<line>: Usage: tuple:findall([offset,
     ]val)'
 ...
 t.update()
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:89: Usage: tuple:update({ { op,
+- error: '[string "-- tuple.lua..."]:<line>: Usage: tuple:update({ { op,
     field, arg}+ })'
 ...
 t.upsert()
 ---
-- error: '[string "-- tuple.lua (internal file)..."]:89: Usage: tuple:upsert({ { op,
+- error: '[string "-- tuple.lua..."]:<line>: Usage: tuple:upsert({ { op,
     field, arg}+ })'
 ...
 t = nil
@@ -941,3 +951,7 @@ t = nil
 space:drop()
 ---
 ...
+test_run:cmd("clear filter")
+---
+- true
+...

test/box/tuple.test.lua

 -- box.tuple test
+env = require('test_run')
+test_run = env.new()
+test_run:cmd("push filter ".."'\\.lua.*:[0-9]+: ' to '.lua...\"]:<line>: '")
+
 -- Test box.tuple:slice()
 t=box.tuple.new{'0', '1', '2', '3', '4', '5', '6', '7'}
 t:slice(0)
@@ -301,3 +305,5 @@ t.upsert()
 t = nil
 
 space:drop()
+
+test_run:cmd("clear filter")