fix

Author: lxy-9602

src/paimon/common/defs.cpp

@@ -83,18 +83,14 @@ const char Options::BLOB_AS_DESCRIPTOR[] = "blob-as-descriptor";
 const char Options::GLOBAL_INDEX_ENABLED[] = "global-index.enabled";
 const char Options::GLOBAL_INDEX_EXTERNAL_PATH[] = "global-index.external-path";
 const char Options::SCAN_TAG_NAME[] = "scan.tag-name";
-<<<<<<< HEAD
 const char Options::WRITE_ONLY[] = "write-only";
 const char Options::COMPACTION_MIN_FILE_NUM[] = "compaction.min.file-num";
 const char Options::COMPACTION_FORCE_REWRITE_ALL_FILES[] = "compaction.force-rewrite-all-files";
-
-=======
 const char Options::COMPACTION_OPTIMIZATION_INTERVAL[] = "compaction.optimization-interval";
 const char Options::COMPACTION_TOTAL_SIZE_THRESHOLD[] = "compaction.total-size-threshold";
 const char Options::COMPACTION_INCREMENTAL_SIZE_THRESHOLD[] =
     "compaction.incremental-size-threshold";
 const char Options::COMPACT_OFFPEAK_START_HOUR[] = "compaction.offpeak.start.hour";
 const char Options::COMPACT_OFFPEAK_END_HOUR[] = "compaction.offpeak.end.hour";
 const char Options::COMPACTION_OFFPEAK_RATIO[] = "compaction.offpeak-ratio";
->>>>>>> e2d1a61 (feat(compaction): support universal compaction strategy)
 }  // namespace paimon

src/paimon/core/core_options_test.cpp

@@ -165,7 +165,7 @@ TEST(CoreOptionsTest, TestFromMap) {
         {Options::SCAN_TAG_NAME, "test-tag"},
         {Options::WRITE_ONLY, "true"},
         {Options::COMPACTION_MIN_FILE_NUM, "10"},
-        {Options::COMPACTION_FORCE_REWRITE_ALL_FILES, "true"}};
+        {Options::COMPACTION_FORCE_REWRITE_ALL_FILES, "true"},
         {Options::COMPACTION_OPTIMIZATION_INTERVAL, "2s"},
         {Options::COMPACTION_TOTAL_SIZE_THRESHOLD, "5 GB"},
         {Options::COMPACTION_INCREMENTAL_SIZE_THRESHOLD, "12 kB"},