fix

lszskye · lszskye · commit 5849f0dd1ced · 2025-12-16T19:05:16.000+08:00
diff --git a/include/paimon/global_index/indexed_split.h b/include/paimon/global_index/indexed_split.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/paimon/table/source/split.h b/include/paimon/table/source/split.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/paimon/common/global_index/complete_index_score_batch_reader.cpp b/src/paimon/common/global_index/complete_index_score_batch_reader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/paimon/common/global_index/complete_index_score_batch_reader.h b/src/paimon/common/global_index/complete_index_score_batch_reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/paimon/common/global_index/complete_index_score_batch_reader_test.cpp b/src/paimon/common/global_index/complete_index_score_batch_reader_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/paimon/common/utils/range.cpp b/src/paimon/common/utils/range.cpp
@@ -85,41 +85,6 @@ std::vector<Range> Range::And(const std::vector<Range>& left, const std::vector<
 
     return results;
 }
-// std::vector<Range> MergeSortedAsPossible(const std::vector<Range>& ranges) {
-//     if (ranges.empty() || ranges.size() == 1) {
-//         return ranges;
-//     }
-//     std::vector<Range> results;
-//     Range current = ranges[0];
-
-//     for (size_t i = 1; i < ranges.size(); ++i) {
-//         Range next = ranges[i];
-//         // Try to merge current and next
-//         std::optional<Range> merged = Range::Union(current, next);
-//         if (merged) {
-//             // Merged successfully
-//             current = merged;
-//         } else {
-//             // Cannot merge: add current to result and move to next
-//             results.push_back(merged);
-//             current = next;
-//         }
-//     }
-//     // Add the last range
-//     results.push_back(current);
-//     return results;
-// }
-
-// std::optional<Range> Range::Union(const Range& left, const Range& right) {
-//     if (left.from <= right.from) {
-//         if (left.to + 1 >= right.from) {
-//             return Range(left.from, std::max(left.to, right.to));
-//         }
-//     } else if (right.to + 1 >= left.from) {
-//         return Range(right.from, std::max(left.to, right.to));
-//     }
-//     return std::nullopt;
-// }
 
 std::optional<Range> Range::Intersection(const Range& left, const Range& right) {
     int64_t start = std::max(left.from, right.from);
diff --git a/src/paimon/common/utils/range_test.cpp b/src/paimon/common/utils/range_test.cpp
@@ -109,7 +109,7 @@ TEST(RangeTest, TestSortAndMergeOverlap) {
         ASSERT_EQ(result, expected);
     }
     {
-        // test no overlap with adjacent = falese
+        // test no overlap with adjacent = false
         std::vector<Range> ranges = {Range(0, 10), Range(11, 20)};
         auto result = Range::SortAndMergeOverlap(ranges, /*adjacent=*/false);
         std::vector<Range> expected = {Range(0, 10), Range(11, 20)};
diff --git a/src/paimon/core/global_index/indexed_split_impl.h b/src/paimon/core/global_index/indexed_split_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/paimon/core/global_index/indexed_split_test.cpp b/src/paimon/core/global_index/indexed_split_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/paimon/core/table/source/data_split_impl.cpp b/src/paimon/core/table/source/data_split_impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/paimon/core/table/source/split.cpp b/src/paimon/core/table/source/split.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-present Alibaba Inc.
+ * Copyright 2025-present Alibaba Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/inte/data_evolution_table_test.cpp b/test/inte/data_evolution_table_test.cpp
@@ -1498,7 +1498,7 @@ TEST_P(DataEvolutionTableTest, TestScanAndReadWithIndex) {
     }
     {
         // f2 has bitmap index, data evolution scan will ignore index => not empty plan
-        // data evolution split read will also ignore index => empty read batch
+        // data evolution split read will also ignore index => not empty read batch
         auto predicate = PredicateBuilder::Equal(/*field_index=*/2, /*field_name=*/"f2",
                                                  FieldType::INT, Literal(203));
         auto expected_array = std::dynamic_pointer_cast<arrow::StructArray>(
@@ -1559,7 +1559,7 @@ TEST_P(DataEvolutionTableTest, TestScanAndReadWithIndex) {
     {
         // test row id with predicate
         std::vector<Range> row_ranges = {Range(4l, 5l)};
-        // row id = {4, 5},data evolution split read will ignore bitmap index
+        // row id = {4, 5}, data evolution split read will ignore bitmap index
         auto predicate = PredicateBuilder::Equal(/*field_index=*/2, /*field_name=*/"f2",
                                                  FieldType::INT, Literal(204));
         CheckScanResult(table_path, /*predicate=*/predicate, /*row_ranges=*/row_ranges,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2024-present Alibaba Inc.`
	`2`	`+ * Copyright 2025-present Alibaba Inc.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ TEST(RangeTest, TestSortAndMergeOverlap) {`
`109`	`109`	`ASSERT_EQ(result, expected);`
`110`	`110`	`}`
`111`	`111`	`{`
`112`		`- // test no overlap with adjacent = falese`
	`112`	`+ // test no overlap with adjacent = false`
`113`	`113`	`std::vector<Range> ranges = {Range(0, 10), Range(11, 20)};`
`114`	`114`	`auto result = Range::SortAndMergeOverlap(ranges, /adjacent=/false);`
`115`	`115`	`std::vector<Range> expected = {Range(0, 10), Range(11, 20)};`