resolve conflict

Signed-off-by: JaySon-Huang <[email protected]>

dbms/src/Common/FailPoint.cpp

@@ -21,54 +21,7 @@
 namespace DB
 {
 std::unordered_map<String, std::shared_ptr<FailPointChannel>> FailPointHelper::fail_point_wait_channels;
-<<<<<<< HEAD
 
-#define APPLY_FOR_FAILPOINTS_ONCE(M)                              \
-    M(exception_between_drop_meta_and_data)                       \
-    M(exception_between_alter_data_and_meta)                      \
-    M(exception_drop_table_during_remove_meta)                    \
-    M(exception_between_rename_table_data_and_metadata)           \
-    M(exception_between_create_database_meta_and_directory)       \
-    M(exception_before_rename_table_old_meta_removed)             \
-    M(exception_after_step_1_in_exchange_partition)               \
-    M(exception_before_step_2_rename_in_exchange_partition)       \
-    M(exception_after_step_2_in_exchange_partition)               \
-    M(exception_before_step_3_rename_in_exchange_partition)       \
-    M(exception_after_step_3_in_exchange_partition)               \
-    M(region_exception_after_read_from_storage_some_error)        \
-    M(region_exception_after_read_from_storage_all_error)         \
-    M(exception_before_dmfile_remove_encryption)                  \
-    M(exception_before_dmfile_remove_from_disk)                   \
-    M(force_enable_region_persister_compatible_mode)              \
-    M(force_disable_region_persister_compatible_mode)             \
-    M(force_triggle_background_merge_delta)                       \
-    M(force_triggle_foreground_flush)                             \
-    M(exception_before_mpp_register_non_root_mpp_task)            \
-    M(exception_before_mpp_register_tunnel_for_non_root_mpp_task) \
-    M(exception_during_mpp_register_tunnel_for_non_root_mpp_task) \
-    M(exception_before_mpp_non_root_task_run)                     \
-    M(exception_during_mpp_non_root_task_run)                     \
-    M(exception_before_mpp_register_root_mpp_task)                \
-    M(exception_before_mpp_register_tunnel_for_root_mpp_task)     \
-    M(exception_before_mpp_root_task_run)                         \
-    M(exception_during_mpp_root_task_run)                         \
-    M(exception_during_mpp_write_err_to_tunnel)                   \
-    M(exception_during_mpp_close_tunnel)                          \
-    M(exception_during_write_to_storage)                          \
-    M(force_set_sst_to_dtfile_block_size)                         \
-    M(force_set_sst_decode_rand)                                  \
-    M(exception_before_page_file_write_sync)                      \
-    M(force_set_segment_ingest_packs_fail)                        \
-    M(segment_merge_after_ingest_packs)                           \
-    M(force_formal_page_file_not_exists)                          \
-    M(force_legacy_or_checkpoint_page_file_exists)                \
-    M(exception_in_creating_set_input_stream)                     \
-    M(exception_when_read_from_log)                               \
-    M(exception_mpp_hash_build)                                   \
-    M(exception_before_drop_segment)                              \
-    M(exception_after_drop_segment)                               \
-    M(exception_between_schema_change_in_the_same_diff)
-=======
 #define APPLY_FOR_FAILPOINTS_ONCE(M)                                  \
     M(exception_between_drop_meta_and_data)                           \
     M(exception_between_alter_data_and_meta)                          \
@@ -118,7 +71,6 @@ std::unordered_map<String, std::shared_ptr<FailPointChannel>> FailPointHelper::f
     M(try_segment_logical_split)                                      \
     /* must perform logical split, otherwise throw exception */       \
     M(force_segment_logical_split)
->>>>>>> 7cf292fb77 (Fix fail to create three hops of ref pages (#5612))
 
 #define APPLY_FOR_FAILPOINTS(M)                              \
     M(skip_check_segment_update)                             \

dbms/src/Storages/DeltaMerge/Segment.cpp

@@ -903,7 +903,7 @@ std::optional<Segment::SplitInfo> Segment::prepareSplit(DMContext & dm_context,
                 (split_point_opt.has_value() ? split_point_opt->toRowKeyValueRef().toDebugString() : "no value"),
                 info());
 #ifdef FIU_ENABLE
-            RUNTIME_CHECK_MSG(!force_logical_split, "Can not perform logical split while failpoint `force_segment_logical_split` is true");
+            RUNTIME_CHECK(!force_logical_split, Exception, "Can not perform logical split while failpoint `force_segment_logical_split` is true");
 #endif
             return prepareSplitPhysical(dm_context, schema_snap, segment_snap, wbs);
         }

dbms/src/Storages/DeltaMerge/tests/gtest_segment.cpp

@@ -100,8 +100,6 @@ try
     randomSegmentTest(100);
 }
 CATCH
-<<<<<<< HEAD
-=======
 
 // run in CI weekly
 TEST_F(SegmentOperationTest, DISABLED_TestSegmentRandomForCI)
@@ -267,7 +265,7 @@ try
         new_seg_id = new_seg_id2_opt.value();
 
         const auto file_usage = storage_pool->getLogFileUsage();
-        LOG_DEBUG(log, "log valid size: {}", file_usage.total_valid_size);
+        LOG_FMT_DEBUG(log, "log valid size: {}", file_usage.total_valid_size);
     }
     for (const auto & [seg_id, seg] : segments)
     {
@@ -278,12 +276,11 @@ try
     }
     storage_pool->gc();
     const auto file_usage = storage_pool->getLogFileUsage();
-    LOG_DEBUG(log, "all removed, file usage: {}", file_usage.total_valid_size); // should be 0
+    LOG_FMT_DEBUG(log, "all removed, file usage: {}", file_usage.total_valid_size); // should be 0
 }
 CATCH
 
 
->>>>>>> 7cf292fb77 (Fix fail to create three hops of ref pages (#5612))
 } // namespace tests
 } // namespace DM
 } // namespace DB