TestUtils: read all blocks and sort them by handle before comparison. (…

…#5745) ref #5689
pingcap · Sep 1, 2022 · 5859c3d · 5859c3d
1 parent 94fcc24
commit 5859c3d
Show file tree

Hide file tree

Showing 3 changed files with 159 additions and 39 deletions.
diff --git a/dbms/src/Storages/DeltaMerge/tests/gtest_dm_delta_merge_store.cpp b/dbms/src/Storages/DeltaMerge/tests/gtest_dm_delta_merge_store.cpp
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({
@@ -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({