Fix some fail cases when enable TASN (#5086)

close #5085
pingcap · Jun 9, 2022 · 167d39f · 167d39f
1 parent 5b61ae7
commit 167d39f
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 86 deletions.
diff --git a/dbms/src/Flash/Management/tests/gtest_manual_compact.cpp b/dbms/src/Flash/Management/tests/gtest_manual_compact.cpp
@@ -14,7 +14,6 @@
 
 #include <Common/FailPoint.h>
 #include <Flash/Management/ManualCompact.h>
-#include <Poco/Logger.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/DeltaMerge/RowKeyRange.h>
 #include <Storages/DeltaMerge/tests/DMTestEnv.h>
@@ -48,7 +47,6 @@ class BasicManualCompactTest
 
     BasicManualCompactTest()
     {
-        log = &Poco::Logger::get(DB::base::TiFlashStorageTestBasic::getCurrentFullTestName());
         pk_type = GetParam();
     }
 
@@ -63,7 +61,7 @@ class BasicManualCompactTest
             setupStorage();
 
             // In tests let's only compact one segment.
-            db_context->setSetting("manual_compact_more_until_ms", UInt64(0));
+            db_context->setSetting("manual_compact_more_until_ms", Field(UInt64(0)));
 
             // Split into 4 segments, and prepare some delta data for first 3 segments.
             helper = std::make_unique<DM::tests::MultiSegmentTestUtil>(*db_context);
@@ -116,8 +114,6 @@ class BasicManualCompactTest
     std::unique_ptr<DB::Management::ManualCompactManager> manager;
 
     DM::tests::DMTestEnv::PkType pk_type;
-
-    [[maybe_unused]] Poco::Logger * log;
 };
 
 
@@ -315,7 +311,7 @@ CATCH
 TEST_P(BasicManualCompactTest, CompactMultiple)
 try
 {
-    db_context->setSetting("manual_compact_more_until_ms", UInt64(60 * 1000)); // Hope it's long enough!
+    db_context->setSetting("manual_compact_more_until_ms", Field(UInt64(60 * 1000))); // Hope it's long enough!
 
     auto request = ::kvrpcpb::CompactRequest();
     request.set_physical_table_id(TABLE_ID);

diff --git a/dbms/src/Storages/DeltaMerge/StoragePool.cpp b/dbms/src/Storages/DeltaMerge/StoragePool.cpp
@@ -624,8 +624,8 @@ PageId StoragePool::newDataPageIdForDTFile(StableDiskDelegator & delegator, cons
 
         auto existed_path = delegator.getDTFilePath(dtfile_id, /*throw_on_not_exist=*/false);
         fiu_do_on(FailPoints::force_set_dtfile_exist_when_acquire_id, {
-            static size_t fail_point_called = 0;
-            if (existed_path.empty() && fail_point_called % 10 == 0)
+            static std::atomic<UInt64> fail_point_called(0);
+            if (existed_path.empty() && fail_point_called.load() % 10 == 0)
             {
                 existed_path = "<mock for existed path>";
             }

diff --git a/dbms/src/Storages/DeltaMerge/tests/MultiSegmentTestUtil.h b/dbms/src/Storages/DeltaMerge/tests/MultiSegmentTestUtil.h
@@ -88,6 +88,7 @@ class MultiSegmentTestUtil : private boost::noncopyable
             // Check there is only one segment
             ASSERT_EQ(store->segments.size(), 1);
             const auto & [_key, seg] = *store->segments.begin();
+            (void)_key;
             ASSERT_EQ(seg->getDelta()->getRows(), n_avg_rows_per_segment * 4);
             ASSERT_EQ(seg->getStable()->getRows(), 0);
 
@@ -108,6 +109,7 @@ class MultiSegmentTestUtil : private boost::noncopyable
             auto segment_idx = 0;
             for (auto & [_key, seg] : store->segments)
             {
+                (void)_key;
                 LOG_FMT_INFO(log, "Segment #{}: Range = {}", segment_idx, seg->getRowKeyRange().toDebugString());
                 ASSERT_EQ(seg->getDelta()->getRows(), 0);
                 ASSERT_GT(seg->getStable()->getRows(), 0); // We don't check the exact rows of each segment.
@@ -147,6 +149,7 @@ class MultiSegmentTestUtil : private boost::noncopyable
         auto segment_idx = 0;
         for (auto & [_key, seg] : store->segments)
         {
+            (void)_key;
             ASSERT_EQ(seg->getDelta()->getRows(), expected_delta_rows[segment_idx]) << "Assert failed for segment #" << segment_idx;
             ASSERT_EQ(seg->getStable()->getRows(), expected_stable_rows[segment_idx]) << "Assert failed for segment #" << segment_idx;
             segment_idx++;

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
@@ -3564,7 +3564,6 @@ class DeltaMergeStoreMergeDeltaBySegmentTest
 public:
     DeltaMergeStoreMergeDeltaBySegmentTest()
     {
-        log = &Poco::Logger::get(DB::base::TiFlashStorageTestBasic::getCurrentFullTestName());
         std::tie(ps_ver, pk_type) = GetParam();
     }
 
@@ -3607,8 +3606,6 @@ class DeltaMergeStoreMergeDeltaBySegmentTest
 
     UInt64 ps_ver;
     DMTestEnv::PkType pk_type;
-
-    [[maybe_unused]] Poco::Logger * log;
 };
 
 INSTANTIATE_TEST_CASE_P(

diff --git a/dbms/src/Storages/Page/V3/tests/gtest_blob_store.cpp b/dbms/src/Storages/Page/V3/tests/gtest_blob_store.cpp
@@ -82,20 +82,23 @@ try
         stats.restoreByEntry(PageEntryV3{
             .file_id = file_id1,
             .size = 128,
+            .padded_size = 0,
             .tag = 0,
             .offset = 1024,
             .checksum = 0x4567,
         });
         stats.restoreByEntry(PageEntryV3{
             .file_id = file_id1,
             .size = 512,
+            .padded_size = 0,
             .tag = 0,
             .offset = 2048,
             .checksum = 0x4567,
         });
         stats.restoreByEntry(PageEntryV3{
             .file_id = file_id2,
             .size = 512,
+            .padded_size = 0,
             .tag = 0,
             .offset = 2048,
             .checksum = 0x4567,