Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TestUtils: read all blocks and sort them by handle before comparison. #5745

Merged
merged 6 commits into from
Sep 1, 2022
Merged

TestUtils: read all blocks and sort them by handle before comparison. #5745

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9819cd3
TestUtils: Add new utils that support check inputstream with unordere…
JinheLin Aug 31, 2022
1119b76
Update comment.
JinheLin Sep 1, 2022
0011a27
Update dbms/src/TestUtils/InputStreamTestUtils.cpp
JinheLin Sep 1, 2022
db82f7e
Update dbms/src/TestUtils/InputStreamTestUtils.cpp
JinheLin Sep 1, 2022
be9359c
Merge branch 'master' into fix_test_utils
ti-chi-bot Sep 1, 2022
bdf80d1
Merge branch 'master' into fix_test_utils
ti-chi-bot Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions dbms/src/Storages/DeltaMerge/tests/gtest_dm_delta_merge_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_str_define.name, col_i8_define.name}),
createColumns({
Expand All @@ -275,7 +275,7 @@ try
// test readRaw
const auto & columns = store->getTableColumns();
BlockInputStreamPtr in = store->readRaw(*db_context, db_context->getSettingsRef(), columns, 1, /* keep_order= */ false)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_str_define.name, col_i8_define.name}),
createColumns({
Expand Down Expand Up @@ -439,7 +439,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_str_define.name, col_i8_define.name}),
createColumns({
Expand Down Expand Up @@ -488,7 +488,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand All @@ -515,7 +515,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -590,7 +590,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -665,7 +665,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand All @@ -686,7 +686,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -731,7 +731,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -761,7 +761,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -920,7 +920,7 @@ try
/* expected_block_size= */ 1024);
ASSERT_EQ(ins.size(), 1UL);
BlockInputStreamPtr in = ins[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, VERSION_COLUMN_NAME}),
createColumns({
Expand All @@ -946,7 +946,7 @@ try
/* expected_block_size= */ 1024);
ASSERT_EQ(ins.size(), 1UL);
BlockInputStreamPtr in = ins[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, VERSION_COLUMN_NAME}),
createColumns({
Expand Down Expand Up @@ -1069,7 +1069,7 @@ try
/* expected_block_size= */ 1024);
ASSERT_EQ(ins.size(), 1);
BlockInputStreamPtr in = ins[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, VERSION_COLUMN_NAME}),
createColumns({
Expand All @@ -1095,7 +1095,7 @@ try
/* expected_block_size= */ 1024);
ASSERT_EQ(ins.size(), 1);
BlockInputStreamPtr in = ins[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, VERSION_COLUMN_NAME}),
createColumns({
Expand Down Expand Up @@ -1173,7 +1173,7 @@ try
/* expected_block_size= */ 1024);
ASSERT_EQ(ins.size(), 1);
BlockInputStreamPtr in = ins[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, VERSION_COLUMN_NAME}),
createColumns({
Expand Down Expand Up @@ -1283,7 +1283,7 @@ try
BlockInputStreamPtr in = ins[0];

LOG_FMT_TRACE(&Poco::Logger::get(GET_GTEST_FULL_NAME), "start to check data of [1,{}]", num_rows_write_in_total);
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -1378,7 +1378,7 @@ try
ASSERT_EQ(col.column_id, col_id_ddl);
ASSERT_TRUE(col.type->equals(*col_type_after_ddl));
}
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_ddl}),
createColumns({
Expand Down Expand Up @@ -1463,7 +1463,7 @@ try
const Block head = in->getHeader();
ASSERT_FALSE(head.has(col_name_to_drop));
}
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -1551,7 +1551,7 @@ try
ASSERT_TRUE(col.type->equals(*col_type_to_add));
}
}
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_c1, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -1618,7 +1618,7 @@ try
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];

ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -1684,7 +1684,7 @@ try
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];

ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -1749,7 +1749,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -1814,7 +1814,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -1880,7 +1880,7 @@ try
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];

ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -1948,7 +1948,7 @@ try
num_rows_write,
MyDateTime(1999, 9, 9, 12, 34, 56, 0).toPackedUInt());

ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -2013,7 +2013,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -2106,7 +2106,7 @@ try
ASSERT_THROW(head.getByName(col_name_before_ddl), ::DB::Exception);
}

ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_after_ddl}),
createColumns({
Expand Down Expand Up @@ -2222,7 +2222,7 @@ try
// check old col name is not exist
ASSERT_THROW(head.getByName(col_name_before_ddl), ::DB::Exception);
}
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({col_name_after_ddl}),
createColumns({
Expand Down Expand Up @@ -2270,7 +2270,7 @@ try
// check old col name is not exist
ASSERT_THROW(head.getByName(col_name_before_ddl), ::DB::Exception);
}
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({col_name_after_ddl}),
createColumns({
Expand Down Expand Up @@ -2344,7 +2344,7 @@ try
/* keep_order= */ false,
/* is_fast_scan= */ false,
/* expected_block_size= */ 1024)[0];
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -2388,7 +2388,7 @@ try
/* expected_block_size= */ 1024)[0];

// FIXME!!!
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_name_to_add}),
createColumns({
Expand Down Expand Up @@ -2505,7 +2505,7 @@ try
std::transform(tmp.begin(), tmp.end(), std::back_inserter(res), [](Int64 v) { return genMockCommonHandle(v, rowkey_column_size); });
return res;
}();
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_i8_define.name, col_str_define.name}),
createColumns({
Expand All @@ -2526,7 +2526,7 @@ try
std::transform(tmp.begin(), tmp.end(), std::back_inserter(res), [](Int64 v) { return genMockCommonHandle(v, rowkey_column_size); });
return res;
}();
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name, col_i8_define.name, col_str_define.name}),
createColumns({
Expand Down Expand Up @@ -2607,7 +2607,7 @@ try
return res;
}();
ASSERT_EQ(common_handle_coldata.size(), 3 * num_write_rows);
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -2679,7 +2679,7 @@ try
return res;
}();
ASSERT_EQ(common_handle_coldata.size(), 3 * num_write_rows);
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -2708,7 +2708,7 @@ try
return res;
}();
ASSERT_EQ(common_handle_coldata.size(), 2 * num_write_rows);
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -2764,7 +2764,7 @@ try
return res;
}();
ASSERT_EQ(common_handle_coldata.size(), num_rows_write);
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -2801,7 +2801,7 @@ try
return res;
}();
ASSERT_EQ(common_handle_coldata.size(), num_rows_write - num_deleted_rows);
ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down Expand Up @@ -2865,7 +2865,7 @@ try

LOG_FMT_TRACE(&Poco::Logger::get(GET_GTEST_FULL_NAME), "start to check data of [1,{}]", num_rows_write_in_total);

ASSERT_INPUTSTREAM_COLS_UR(
ASSERT_UNORDERED_INPUTSTREAM_COLS_UR(
in,
Strings({DMTestEnv::pk_name}),
createColumns({
Expand Down
Loading