This is an automated email from the ASF dual-hosted git repository.
szehon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 1e82c476df Flink: Fix config key typo in error message of
SplitComparators (#11482)
1e82c476df is described below
commit 1e82c476df58ba467342eec98cb02ec0e2c75bd1
Author: Mingliang Liu <[email protected]>
AuthorDate: Wed Nov 6 14:45:41 2024 -0800
Flink: Fix config key typo in error message of SplitComparators (#11482)
---
.../java/org/apache/iceberg/flink/source/split/SplitComparators.java | 4 +++-
.../source/assigner/TestFileSequenceNumberBasedSplitAssigner.java | 2 +-
.../java/org/apache/iceberg/flink/source/split/SplitComparators.java | 4 +++-
.../source/assigner/TestFileSequenceNumberBasedSplitAssigner.java | 2 +-
.../java/org/apache/iceberg/flink/source/split/SplitComparators.java | 4 +++-
.../source/assigner/TestFileSequenceNumberBasedSplitAssigner.java | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
index 56ee92014d..37bddfbb71 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
@@ -18,6 +18,7 @@
*/
package org.apache.iceberg.flink.source.split;
+import org.apache.iceberg.flink.FlinkReadOptions;
import org.apache.iceberg.flink.source.reader.SplitWatermarkExtractor;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
@@ -35,7 +36,8 @@ public class SplitComparators {
return (IcebergSourceSplit o1, IcebergSourceSplit o2) -> {
Preconditions.checkArgument(
o1.task().files().size() == 1 && o2.task().files().size() == 1,
- "Could not compare combined task. Please use 'split-open-file-cost'
to prevent combining multiple files to a split");
+ "Could not compare combined task. Please use '%s' to prevent
combining multiple files to a split",
+ FlinkReadOptions.SPLIT_FILE_OPEN_COST);
Long seq1 =
o1.task().files().iterator().next().file().fileSequenceNumber();
Long seq2 =
o2.task().files().iterator().next().file().fileSequenceNumber();
diff --git
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
index ff63ba8e58..2b65977fb2 100644
---
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
+++
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
@@ -43,7 +43,7 @@ public class TestFileSequenceNumberBasedSplitAssigner extends
SplitAssignerTestB
() -> assigner.onDiscoveredSplits(createSplits(4, 2, "2")),
"Multiple files in a split is not allowed")
.isInstanceOf(IllegalArgumentException.class)
- .hasMessageContaining("Please use 'split-open-file-cost'");
+ .hasMessageContaining("Please use 'split-file-open-cost'");
}
/** Test sorted splits */
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
index 56ee92014d..37bddfbb71 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
@@ -18,6 +18,7 @@
*/
package org.apache.iceberg.flink.source.split;
+import org.apache.iceberg.flink.FlinkReadOptions;
import org.apache.iceberg.flink.source.reader.SplitWatermarkExtractor;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
@@ -35,7 +36,8 @@ public class SplitComparators {
return (IcebergSourceSplit o1, IcebergSourceSplit o2) -> {
Preconditions.checkArgument(
o1.task().files().size() == 1 && o2.task().files().size() == 1,
- "Could not compare combined task. Please use 'split-open-file-cost'
to prevent combining multiple files to a split");
+ "Could not compare combined task. Please use '%s' to prevent
combining multiple files to a split",
+ FlinkReadOptions.SPLIT_FILE_OPEN_COST);
Long seq1 =
o1.task().files().iterator().next().file().fileSequenceNumber();
Long seq2 =
o2.task().files().iterator().next().file().fileSequenceNumber();
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
index ff63ba8e58..2b65977fb2 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
@@ -43,7 +43,7 @@ public class TestFileSequenceNumberBasedSplitAssigner extends
SplitAssignerTestB
() -> assigner.onDiscoveredSplits(createSplits(4, 2, "2")),
"Multiple files in a split is not allowed")
.isInstanceOf(IllegalArgumentException.class)
- .hasMessageContaining("Please use 'split-open-file-cost'");
+ .hasMessageContaining("Please use 'split-file-open-cost'");
}
/** Test sorted splits */
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
index 56ee92014d..37bddfbb71 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
@@ -18,6 +18,7 @@
*/
package org.apache.iceberg.flink.source.split;
+import org.apache.iceberg.flink.FlinkReadOptions;
import org.apache.iceberg.flink.source.reader.SplitWatermarkExtractor;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
@@ -35,7 +36,8 @@ public class SplitComparators {
return (IcebergSourceSplit o1, IcebergSourceSplit o2) -> {
Preconditions.checkArgument(
o1.task().files().size() == 1 && o2.task().files().size() == 1,
- "Could not compare combined task. Please use 'split-open-file-cost'
to prevent combining multiple files to a split");
+ "Could not compare combined task. Please use '%s' to prevent
combining multiple files to a split",
+ FlinkReadOptions.SPLIT_FILE_OPEN_COST);
Long seq1 =
o1.task().files().iterator().next().file().fileSequenceNumber();
Long seq2 =
o2.task().files().iterator().next().file().fileSequenceNumber();
diff --git
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
index ff63ba8e58..2b65977fb2 100644
---
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
+++
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
@@ -43,7 +43,7 @@ public class TestFileSequenceNumberBasedSplitAssigner extends
SplitAssignerTestB
() -> assigner.onDiscoveredSplits(createSplits(4, 2, "2")),
"Multiple files in a split is not allowed")
.isInstanceOf(IllegalArgumentException.class)
- .hasMessageContaining("Please use 'split-open-file-cost'");
+ .hasMessageContaining("Please use 'split-file-open-cost'");
}
/** Test sorted splits */
