10527663440

Committed 23 Aug 2024 02:41PM UTC coverage: 85.891% (-0.01%) from 85.901%

Build # 10527663440

Build Type

push

github

Committed by

sergepetrenko

Commit Message

memtx: do not pass pagination key to MVCC

Currently, when starting an iterator in memtx tree on a range request,
we pass key from `start_data` to memtx MVCC. The problem is `start_data`
can contain pagination key that is extracted with `cmp_def`, but MVCC
performs all comparisons with `key_def`. Fortunately, first parts of
`cmp_def` is actually `key_def` of the index, so let's crop `start_data`
by passing `part_count` not greater than `key_def->part_count` to MVCC.

Closes #10448

NO_DOC=bugfix

(cherry picked from commit 0dca0076c)

Run Details

62994 of 114229 branches covered (55.15%)

2 of 2 new or added lines in 1 file covered. (100.0%)

37 existing lines in 10 files now uncovered.

93867 of 109286 relevant lines covered (85.89%)

2990226.08 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

81.82

/src/lua/minifio.c

/*
 * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright 2010-2023, Tarantool AUTHORS, please see AUTHORS file.
 */
#include "lua/minifio.h"

#include <string.h>
#include <unistd.h>
#include <lua.h>
#include <lauxlib.h>

#include "trivia/util.h"
#include "diag.h"
#include "lua/utils.h"
#include "lua/error.h"

static char *main_script = NULL;

void
minifio_set_script(const char *script)
{
        if (script == NULL) {
                free(main_script);
                main_script = NULL;
                return;
        }
        size_t len = strlen(script);
        main_script = xrealloc(main_script, len + 1);
        memcpy(main_script, script, len + 1);
}

/**
 * Push nil and an error with strerror() based message.
 */
static int
luaT_minifio_pushsyserror(struct lua_State *L)
{
        /*
         * It is used in functions exposed into the fio module,
         * so use "fio" diagnostics instead of "minifio".
         */
        diag_set(SystemError, "fio");
        return luaT_push_nil_and_error(L);
}

/**
 * minifio.cwd() -- get current working directory.
 */
static int
lbox_minifio_cwd(struct lua_State *L)
{
        char *buf = (char *)lua_newuserdata(L, PATH_MAX);
        if (!buf) {
                errno = ENOMEM;
                return luaT_minifio_pushsyserror(L);
        }
        if (getcwd(buf, PATH_MAX) == NULL)
                return luaT_minifio_pushsyserror(L);
        lua_pushstring(L, buf);
        lua_remove(L, -2);
        return 1;
}

/**
 * minifio.script() -- get path of the main script.
 *
 * Important: the path is returned verbatim as provided in the
 * process'es arguments and should be interpreted relatively to
 * current working directory *at tarantool startup*.
 *
 * The current working directory may be changed later and it'll
 * make the path value invalid. Note that the directory may be
 * changed implicitly by calling box.cfg().
 */
static int
lbox_minifio_script(struct lua_State *L)
{
        if (main_script == NULL) {
                lua_pushnil(L);
                return 1;
        }
        lua_pushstring(L, main_script);
        return 1;
}

void
tarantool_lua_minifio_init(struct lua_State *L)
{
        static const struct luaL_Reg minifio_methods[] = {
                {"cwd", lbox_minifio_cwd},
                {"script", lbox_minifio_script},
                {NULL, NULL}
        };

        /*
         * The loaders.builtin loader is not in effect yet.
         * Set the minifio module into package.loaded manually.
         */
        lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
        luaT_newmodule(L, "internal.minifio", minifio_methods);
        lua_setfield(L, -2, "internal.minifio");
        lua_pop(L, 1); /* _LOADED */
}

1	/*
2	* SPDX-License-Identifier: BSD-2-Clause
3	*
4	* Copyright 2010-2023, Tarantool AUTHORS, please see AUTHORS file.
5	*/
6	#include "lua/minifio.h"
7
8	#include <string.h>
9	#include <unistd.h>
10	#include <lua.h>
11	#include <lauxlib.h>
12
13	#include "trivia/util.h"
14	#include "diag.h"
15	#include "lua/utils.h"
16	#include "lua/error.h"
17
18	static char *main_script = NULL;
19
20	void
21	minifio_set_script(const char *script)	4,012✔
22	{
23	if (script == NULL) {	4,012✔
24	free(main_script);	44✔
25	main_script = NULL;	44✔
26	return;	44✔
27	}
28	size_t len = strlen(script);	3,968✔
29	main_script = xrealloc(main_script, len + 1);	3,968!
30	memcpy(main_script, script, len + 1);	3,968✔
31	}
32
33	/**
34	* Push nil and an error with strerror() based message.
35	*/
36	static int
UNCOV 37	luaT_minifio_pushsyserror(struct lua_State *L)	×
38	{
39	/*
40	* It is used in functions exposed into the fio module,
41	* so use "fio" diagnostics instead of "minifio".
42	*/
UNCOV 43	diag_set(SystemError, "fio");	×
UNCOV 44	return luaT_push_nil_and_error(L);	×
45	}
46
47	/**
48	* minifio.cwd() -- get current working directory.
49	*/
50	static int
51	lbox_minifio_cwd(struct lua_State *L)	1,838,950✔
52	{
53	char buf = (char )lua_newuserdata(L, PATH_MAX);	1,838,950✔
54	if (!buf) {	1,838,950!
55	errno = ENOMEM;	×
56	return luaT_minifio_pushsyserror(L);	×
57	}
58	if (getcwd(buf, PATH_MAX) == NULL)	1,838,950!
UNCOV 59	return luaT_minifio_pushsyserror(L);	×
60	lua_pushstring(L, buf);	1,838,950✔
61	lua_remove(L, -2);	1,838,950✔
62	return 1;	1,838,950✔
63	}
64
65	/**
66	* minifio.script() -- get path of the main script.
67	*
68	* Important: the path is returned verbatim as provided in the
69	* process'es arguments and should be interpreted relatively to
70	* current working directory at tarantool startup.
71	*
72	* The current working directory may be changed later and it'll
73	* make the path value invalid. Note that the directory may be
74	* changed implicitly by calling box.cfg().
75	*/
76	static int
77	lbox_minifio_script(struct lua_State *L)	4,012✔
78	{
79	if (main_script == NULL) {	4,012✔
80	lua_pushnil(L);	44✔
81	return 1;	44✔
82	}
83	lua_pushstring(L, main_script);	3,968✔
84	return 1;	3,968✔
85	}
86
87	void
88	tarantool_lua_minifio_init(struct lua_State *L)	4,012✔
89	{
90	static const struct luaL_Reg minifio_methods[] = {
91	{"cwd", lbox_minifio_cwd},
92	{"script", lbox_minifio_script},
93	{NULL, NULL}
94	};
95
96	/*
97	* The loaders.builtin loader is not in effect yet.
98	* Set the minifio module into package.loaded manually.
99	*/
100	lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");	4,012✔
101	luaT_newmodule(L, "internal.minifio", minifio_methods);	4,012✔
102	lua_setfield(L, -2, "internal.minifio");	4,012✔
103	lua_pop(L, 1); /* _LOADED */	4,012✔
104	}	4,012✔

tarantool / tarantool / 10527663440

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous