diff --git a/src/box/memtx_engine.cc b/src/box/memtx_engine.cc index b181c750e5fd8e9f4131ac06b434e4d506c9295a..c2630b7b704a247d576796c9ccaf8ba8ac54144c 100644 --- a/src/box/memtx_engine.cc +++ b/src/box/memtx_engine.cc @@ -1726,7 +1726,6 @@ memtx_tuple_new_raw_impl(struct tuple_format *format, const char *data, raw = (char *) tuple + data_offset; field_map_build(&builder, raw - field_map_size); memcpy(raw, data, tuple_len); - say_debug("%s(%zu) = %p", __func__, tuple_len, tuple); end: region_truncate(region, region_svp); return tuple; @@ -1744,7 +1743,6 @@ static void memtx_tuple_delete(struct tuple_format *format, struct tuple *tuple) { assert(tuple_is_unreferenced(tuple)); - say_debug("%s(%p)", __func__, tuple); MemtxAllocator<ALLOC>::free_tuple(tuple); tuple_format_unref(format); } diff --git a/src/box/tuple.c b/src/box/tuple.c index b52e0c0e310a7466af5be703e0b1126e975d956d..84f93a891487ff289886fb38f64dcfbd5e7c0257 100644 --- a/src/box/tuple.c +++ b/src/box/tuple.c @@ -136,7 +136,6 @@ runtime_tuple_new(struct tuple_format *format, const char *data, const char *end char *raw = (char *) tuple + data_offset; field_map_build(&builder, raw - field_map_size); memcpy(raw, data, data_len); - say_debug("%s(%zu) = %p", __func__, data_len, tuple); end: region_truncate(region, region_svp); return tuple; @@ -146,7 +145,6 @@ static void runtime_tuple_delete(struct tuple_format *format, struct tuple *tuple) { assert(format->vtab.tuple_delete == tuple_format_runtime_vtab.tuple_delete); - say_debug("%s(%p)", __func__, tuple); assert(tuple->local_refs == 0); assert(!tuple_has_flag(tuple, TUPLE_HAS_UPLOADED_REFS)); size_t total = tuple_size(tuple); @@ -357,9 +355,6 @@ tuple_arena_create(struct slab_arena *arena, struct quota *quota, " tuple arena", prealloc, arena_name); } } - - say_debug("tuple arena %s: addr %p size %zu flags %#x dontdump %d", - arena_name, arena->arena, prealloc, flags, dontdump); } void diff --git a/src/box/tuple.h b/src/box/tuple.h index d276cf93d2f1eaf94a153d18ea0de42cf9506550..b68d576b2e325b0ff486c9eef678c1f9b07c7671 100644 --- a/src/box/tuple.h +++ b/src/box/tuple.h @@ -728,7 +728,6 @@ tuple_new(struct tuple_format *format, const char *data, const char *end) static inline void tuple_delete(struct tuple *tuple) { - say_debug("%s(%p)", __func__, tuple); assert(tuple->local_refs == 0); assert(!tuple_has_flag(tuple, TUPLE_HAS_UPLOADED_REFS)); assert(!tuple_has_flag(tuple, TUPLE_IS_DIRTY)); diff --git a/src/box/vy_stmt.c b/src/box/vy_stmt.c index 4105b82d0362bcb426ab26efe564cfbb2afcd5b5..68aaab06690151086f9656eb0dee1d3879f68e74 100644 --- a/src/box/vy_stmt.c +++ b/src/box/vy_stmt.c @@ -98,7 +98,6 @@ vy_tuple_new(struct tuple_format *format, const char *data, const char *end) static void vy_tuple_delete(struct tuple_format *format, struct tuple *tuple) { - say_debug("%s(%p)", __func__, tuple); assert(tuple_is_unreferenced(tuple)); /* * Turn off formats referencing in worker threads to avoid @@ -181,8 +180,6 @@ vy_stmt_alloc(struct tuple_format *format, uint32_t data_offset, uint32_t bsize) diag_set(OutOfMemory, total_size, "malloc", "struct vy_stmt"); return NULL; } - say_debug("vy_stmt_alloc(format = %d data_offset = %u, bsize = %u) = %p", - format->id, data_offset, bsize, tuple); tuple_create(tuple, 1, tuple_format_id(format), data_offset, bsize, false); if (cord_is_main()) diff --git a/test/box-luatest/gh_3211_per_module_log_level_test.lua b/test/box-luatest/gh_3211_per_module_log_level_test.lua index 391eb0cc1cb7463d6afbb1637ab5c7680cf44b68..fe415fe3d37f5a95b00da9b88fc8225885993f0d 100644 --- a/test/box-luatest/gh_3211_per_module_log_level_test.lua +++ b/test/box-luatest/gh_3211_per_module_log_level_test.lua @@ -182,7 +182,6 @@ g2.test_tarantool_module = function(cg) end) find_in_log(cg, 'Lua debug message 1', true) find_in_log(cg, 'C debug message 1', false) - find_in_log(cg, 'tuple_new', false) -- printed during create_space() cg.server:exec(function() local log = require('log') @@ -195,7 +194,6 @@ g2.test_tarantool_module = function(cg) end) find_in_log(cg, 'Lua debug message 2', false) find_in_log(cg, 'C debug message 2', true) - find_in_log(cg, 'tuple_new', true) -- printed during create_space() -- Reset global log level to the default value ("info") and check -- that Tarantool C log level is still "debug". diff --git a/test/box-luatest/gh_6634_different_log_on_tuple_new_and_free_test.lua b/test/box-luatest/gh_6634_different_log_on_tuple_new_and_free_test.lua deleted file mode 100644 index ac1413ee59e3471ab6eb0c8ad642a7618dc2bc0e..0000000000000000000000000000000000000000 --- a/test/box-luatest/gh_6634_different_log_on_tuple_new_and_free_test.lua +++ /dev/null @@ -1,41 +0,0 @@ -local server = require('luatest.server') -local t = require('luatest') - -local g = t.group() - -g.before_all(function() - g.server = server:new{ - alias = 'default', - } - g.server:start() -end) - -g.after_all(function() - g.server:drop() -end) - -g.test_different_logs_on_new_and_free = function() - g.server:exec(function() - local s = box.schema.create_space('test') - s:create_index('pk') - box.cfg{log_level = 7} - s:replace{0, 0, 0, 0, 0, 0, 0} - box.cfg{log_level = 5} - end) - - local str = g.server:grep_log('memtx_tuple_new[%w_]*%(%d+%) = 0x%x+$', 1024) - local new_tuple_address = string.match(str, '0x%x+$') - new_tuple_address = string.sub(new_tuple_address, 3) - - g.server:exec(function() - box.cfg{log_level = 7} - box.space.test:replace{0, 1} - collectgarbage('collect') - box.cfg{log_level = 5} - end) - - str = g.server:grep_log('memtx_tuple_delete%w*%(0x%x+%)', 1024) - local deleted_tuple_address = string.match(str, '0x%x+%)') - deleted_tuple_address = string.sub(deleted_tuple_address, 3, -2) - t.assert_equals(new_tuple_address, deleted_tuple_address) -end