You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by st...@apache.org on 2025/08/04 16:22:09 UTC
(iceberg) branch main updated (be55a5d4e7 -> 5d64360cc8)
This is an automated email from the ASF dual-hosted git repository.
stevenwu pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
from be55a5d4e7 Flink: Backport expose cleanExpiredMetadata for snapshot expiration (#13729)
new e227f330d2 Revert "Flink: disable flaky testRangeDistributionStatisticsMigration() (#13711)"
new 5d64360cc8 Flink: fix testRangeDistributionStatisticsMigration flakiness by adjusting the setup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 6 ++----
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 6 ++----
.../iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 6 ++----
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 6 ++----
.../iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 6 ++----
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 6 ++----
6 files changed, 12 insertions(+), 24 deletions(-)
(iceberg) 01/02: Revert "Flink: disable flaky testRangeDistributionStatisticsMigration() (#13711)"
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevenwu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
commit e227f330d2ae93c0ea0f938fd950df30bf5b138b
Author: Steven Wu <st...@gmail.com>
AuthorDate: Fri Aug 1 09:04:03 2025 -0700
Revert "Flink: disable flaky testRangeDistributionStatisticsMigration() (#13711)"
This reverts commit b7b56fd90c2178a5cc1a6b4314b63446b1c1c0ec.
---
.../apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 2 --
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 2 --
.../apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 2 --
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 2 --
.../apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 2 --
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 2 --
6 files changed, 12 deletions(-)
diff --git a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
index 5b8b4381f6..a75d9b61c7 100644
--- a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
+++ b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
@@ -53,7 +53,6 @@ import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -469,7 +468,6 @@ public class TestFlinkIcebergSinkDistributionMode extends TestFlinkIcebergSinkBa
/** Test migration from Map stats to Sketch stats */
@TestTemplate
- @Disabled("issue-11815: flaky test")
public void testRangeDistributionStatisticsMigration() throws Exception {
table
.updateProperties()
diff --git a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
index 5befb0ad3c..60706db38f 100644
--- a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
+++ b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
@@ -53,7 +53,6 @@ import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -484,7 +483,6 @@ public class TestFlinkIcebergSinkV2DistributionMode extends TestFlinkIcebergSink
/** Test migration from Map stats to Sketch stats */
@TestTemplate
- @Disabled("issue-11815: flaky test")
public void testRangeDistributionStatisticsMigration() throws Exception {
table
.updateProperties()
diff --git a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
index 5b8b4381f6..a75d9b61c7 100644
--- a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
+++ b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
@@ -53,7 +53,6 @@ import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -469,7 +468,6 @@ public class TestFlinkIcebergSinkDistributionMode extends TestFlinkIcebergSinkBa
/** Test migration from Map stats to Sketch stats */
@TestTemplate
- @Disabled("issue-11815: flaky test")
public void testRangeDistributionStatisticsMigration() throws Exception {
table
.updateProperties()
diff --git a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
index 5befb0ad3c..60706db38f 100644
--- a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
+++ b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
@@ -53,7 +53,6 @@ import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -484,7 +483,6 @@ public class TestFlinkIcebergSinkV2DistributionMode extends TestFlinkIcebergSink
/** Test migration from Map stats to Sketch stats */
@TestTemplate
- @Disabled("issue-11815: flaky test")
public void testRangeDistributionStatisticsMigration() throws Exception {
table
.updateProperties()
diff --git a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
index 5b8b4381f6..a75d9b61c7 100644
--- a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
+++ b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
@@ -53,7 +53,6 @@ import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -469,7 +468,6 @@ public class TestFlinkIcebergSinkDistributionMode extends TestFlinkIcebergSinkBa
/** Test migration from Map stats to Sketch stats */
@TestTemplate
- @Disabled("issue-11815: flaky test")
public void testRangeDistributionStatisticsMigration() throws Exception {
table
.updateProperties()
diff --git a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
index 5befb0ad3c..60706db38f 100644
--- a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
+++ b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
@@ -53,7 +53,6 @@ import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -484,7 +483,6 @@ public class TestFlinkIcebergSinkV2DistributionMode extends TestFlinkIcebergSink
/** Test migration from Map stats to Sketch stats */
@TestTemplate
- @Disabled("issue-11815: flaky test")
public void testRangeDistributionStatisticsMigration() throws Exception {
table
.updateProperties()
(iceberg) 02/02: Flink: fix testRangeDistributionStatisticsMigration flakiness by adjusting the setup
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevenwu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
commit 5d64360cc80f829cbd9330aefb772c7f09575bb1
Author: Steven Wu <st...@gmail.com>
AuthorDate: Fri Aug 1 11:05:54 2025 -0700
Flink: fix testRangeDistributionStatisticsMigration flakiness by adjusting the setup
---
.../iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 4 ++--
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 4 ++--
.../iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 4 ++--
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 4 ++--
.../iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java | 4 ++--
.../iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
index a75d9b61c7..04bc5da6a9 100644
--- a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
+++ b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
@@ -475,13 +475,13 @@ public class TestFlinkIcebergSinkDistributionMode extends TestFlinkIcebergSinkBa
.commit();
table.replaceSortOrder().asc("id").commit();
- int numOfCheckpoints = 4;
+ int numOfCheckpoints = 6;
List<List<Row>> rowsPerCheckpoint = Lists.newArrayListWithCapacity(numOfCheckpoints);
for (int checkpointId = 0; checkpointId < numOfCheckpoints; ++checkpointId) {
// checkpointId 2 would emit 11_000 records which is larger than
// the OPERATOR_SKETCH_SWITCH_THRESHOLD of 10_000.
// This should trigger the stats migration.
- int maxId = checkpointId < 1 ? 1_000 : 11_000;
+ int maxId = checkpointId < 2 ? 1_000 : 11_000;
List<Row> rows = Lists.newArrayListWithCapacity(maxId);
for (int j = 0; j < maxId; ++j) {
// fixed value "a" for the data (possible partition column)
diff --git a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
index 60706db38f..0feb4cc282 100644
--- a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
+++ b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
@@ -490,13 +490,13 @@ public class TestFlinkIcebergSinkV2DistributionMode extends TestFlinkIcebergSink
.commit();
table.replaceSortOrder().asc("id").commit();
- int numOfCheckpoints = 4;
+ int numOfCheckpoints = 6;
List<List<Row>> rowsPerCheckpoint = Lists.newArrayListWithCapacity(numOfCheckpoints);
for (int checkpointId = 0; checkpointId < numOfCheckpoints; ++checkpointId) {
// checkpointId 2 would emit 11_000 records which is larger than
// the OPERATOR_SKETCH_SWITCH_THRESHOLD of 10_000.
// This should trigger the stats migration.
- int maxId = checkpointId < 1 ? 1_000 : 11_000;
+ int maxId = checkpointId < 2 ? 1_000 : 11_000;
List<Row> rows = Lists.newArrayListWithCapacity(maxId);
for (int j = 0; j < maxId; ++j) {
// fixed value "a" for the data (possible partition column)
diff --git a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
index a75d9b61c7..04bc5da6a9 100644
--- a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
+++ b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
@@ -475,13 +475,13 @@ public class TestFlinkIcebergSinkDistributionMode extends TestFlinkIcebergSinkBa
.commit();
table.replaceSortOrder().asc("id").commit();
- int numOfCheckpoints = 4;
+ int numOfCheckpoints = 6;
List<List<Row>> rowsPerCheckpoint = Lists.newArrayListWithCapacity(numOfCheckpoints);
for (int checkpointId = 0; checkpointId < numOfCheckpoints; ++checkpointId) {
// checkpointId 2 would emit 11_000 records which is larger than
// the OPERATOR_SKETCH_SWITCH_THRESHOLD of 10_000.
// This should trigger the stats migration.
- int maxId = checkpointId < 1 ? 1_000 : 11_000;
+ int maxId = checkpointId < 2 ? 1_000 : 11_000;
List<Row> rows = Lists.newArrayListWithCapacity(maxId);
for (int j = 0; j < maxId; ++j) {
// fixed value "a" for the data (possible partition column)
diff --git a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
index 60706db38f..0feb4cc282 100644
--- a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
+++ b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
@@ -490,13 +490,13 @@ public class TestFlinkIcebergSinkV2DistributionMode extends TestFlinkIcebergSink
.commit();
table.replaceSortOrder().asc("id").commit();
- int numOfCheckpoints = 4;
+ int numOfCheckpoints = 6;
List<List<Row>> rowsPerCheckpoint = Lists.newArrayListWithCapacity(numOfCheckpoints);
for (int checkpointId = 0; checkpointId < numOfCheckpoints; ++checkpointId) {
// checkpointId 2 would emit 11_000 records which is larger than
// the OPERATOR_SKETCH_SWITCH_THRESHOLD of 10_000.
// This should trigger the stats migration.
- int maxId = checkpointId < 1 ? 1_000 : 11_000;
+ int maxId = checkpointId < 2 ? 1_000 : 11_000;
List<Row> rows = Lists.newArrayListWithCapacity(maxId);
for (int j = 0; j < maxId; ++j) {
// fixed value "a" for the data (possible partition column)
diff --git a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
index a75d9b61c7..04bc5da6a9 100644
--- a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
+++ b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkDistributionMode.java
@@ -475,13 +475,13 @@ public class TestFlinkIcebergSinkDistributionMode extends TestFlinkIcebergSinkBa
.commit();
table.replaceSortOrder().asc("id").commit();
- int numOfCheckpoints = 4;
+ int numOfCheckpoints = 6;
List<List<Row>> rowsPerCheckpoint = Lists.newArrayListWithCapacity(numOfCheckpoints);
for (int checkpointId = 0; checkpointId < numOfCheckpoints; ++checkpointId) {
// checkpointId 2 would emit 11_000 records which is larger than
// the OPERATOR_SKETCH_SWITCH_THRESHOLD of 10_000.
// This should trigger the stats migration.
- int maxId = checkpointId < 1 ? 1_000 : 11_000;
+ int maxId = checkpointId < 2 ? 1_000 : 11_000;
List<Row> rows = Lists.newArrayListWithCapacity(maxId);
for (int j = 0; j < maxId; ++j) {
// fixed value "a" for the data (possible partition column)
diff --git a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
index 60706db38f..0feb4cc282 100644
--- a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
+++ b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2DistributionMode.java
@@ -490,13 +490,13 @@ public class TestFlinkIcebergSinkV2DistributionMode extends TestFlinkIcebergSink
.commit();
table.replaceSortOrder().asc("id").commit();
- int numOfCheckpoints = 4;
+ int numOfCheckpoints = 6;
List<List<Row>> rowsPerCheckpoint = Lists.newArrayListWithCapacity(numOfCheckpoints);
for (int checkpointId = 0; checkpointId < numOfCheckpoints; ++checkpointId) {
// checkpointId 2 would emit 11_000 records which is larger than
// the OPERATOR_SKETCH_SWITCH_THRESHOLD of 10_000.
// This should trigger the stats migration.
- int maxId = checkpointId < 1 ? 1_000 : 11_000;
+ int maxId = checkpointId < 2 ? 1_000 : 11_000;
List<Row> rows = Lists.newArrayListWithCapacity(maxId);
for (int j = 0; j < maxId; ++j) {
// fixed value "a" for the data (possible partition column)