This is an automated email from the ASF dual-hosted git repository. sivabalan pushed a commit to branch release-1.1.1 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 53b33839fb5d098f8a9ccb6960aa78dbbc766820 Author: Shuo Cheng <[email protected]> AuthorDate: Sat Nov 8 11:12:35 2025 +0800 feat: Support TIMELINE_SERVER_BASED markers for flink writer (#14202) Bumping release candidate number 2 --- docker/hoodie/hadoop/base/pom.xml | 2 +- docker/hoodie/hadoop/base_java11/pom.xml | 2 +- docker/hoodie/hadoop/datanode/pom.xml | 2 +- docker/hoodie/hadoop/historyserver/pom.xml | 2 +- docker/hoodie/hadoop/hive_base/pom.xml | 2 +- docker/hoodie/hadoop/namenode/pom.xml | 2 +- docker/hoodie/hadoop/pom.xml | 2 +- docker/hoodie/hadoop/prestobase/pom.xml | 2 +- docker/hoodie/hadoop/spark_base/pom.xml | 2 +- docker/hoodie/hadoop/sparkadhoc/pom.xml | 2 +- docker/hoodie/hadoop/sparkmaster/pom.xml | 2 +- docker/hoodie/hadoop/sparkworker/pom.xml | 2 +- docker/hoodie/hadoop/trinobase/pom.xml | 2 +- docker/hoodie/hadoop/trinocoordinator/pom.xml | 2 +- docker/hoodie/hadoop/trinoworker/pom.xml | 2 +- hudi-aws/pom.xml | 4 +-- hudi-cli/pom.xml | 2 +- hudi-client/hudi-client-common/pom.xml | 4 +-- .../org/apache/hudi/config/HoodieWriteConfig.java | 7 +++++ .../hudi/table/marker/WriteMarkersFactory.java | 2 +- .../hudi/table/marker/TestWriteMarkersFactory.java | 18 +++++++++++++ hudi-client/hudi-flink-client/pom.xml | 4 +-- hudi-client/hudi-java-client/pom.xml | 4 +-- hudi-client/hudi-spark-client/pom.xml | 4 +-- hudi-client/pom.xml | 2 +- hudi-common/pom.xml | 2 +- hudi-examples/hudi-examples-common/pom.xml | 2 +- hudi-examples/hudi-examples-flink/pom.xml | 2 +- hudi-examples/hudi-examples-java/pom.xml | 2 +- hudi-examples/hudi-examples-k8s/pom.xml | 2 +- hudi-examples/hudi-examples-spark/pom.xml | 2 +- hudi-examples/pom.xml | 2 +- hudi-flink-datasource/hudi-flink/pom.xml | 4 +-- .../org/apache/hudi/sink/TestWriteCopyOnWrite.java | 28 +++++++++++++++++++ .../apache/hudi/table/ITTestHoodieDataSource.java | 16 +++++++++++ .../apache/hudi/utils/TestFlinkWriteClients.java | 31 ++++++++++++++++++++++ hudi-flink-datasource/pom.xml | 4 +-- hudi-gcp/pom.xml | 2 +- hudi-hadoop-common/pom.xml | 2 +- hudi-hadoop-mr/pom.xml | 2 +- hudi-integ-test/pom.xml | 2 +- hudi-io/pom.xml | 2 +- hudi-kafka-connect/pom.xml | 4 +-- .../hudi-metaserver/hudi-metaserver-client/pom.xml | 2 +- .../hudi-metaserver/hudi-metaserver-server/pom.xml | 2 +- hudi-platform-service/hudi-metaserver/pom.xml | 4 +-- hudi-platform-service/pom.xml | 2 +- hudi-spark-datasource/hudi-spark-common/pom.xml | 4 +-- hudi-spark-datasource/hudi-spark/pom.xml | 4 +-- hudi-spark-datasource/hudi-spark3-common/pom.xml | 2 +- hudi-spark-datasource/hudi-spark3.3.x/pom.xml | 4 +-- hudi-spark-datasource/hudi-spark3.4.x/pom.xml | 4 +-- hudi-spark-datasource/hudi-spark3.5.x/pom.xml | 4 +-- hudi-spark-datasource/hudi-spark4-common/pom.xml | 2 +- hudi-spark-datasource/hudi-spark4.0.x/pom.xml | 4 +-- hudi-spark-datasource/pom.xml | 2 +- hudi-sync/hudi-adb-sync/pom.xml | 2 +- hudi-sync/hudi-datahub-sync/pom.xml | 2 +- hudi-sync/hudi-hive-sync/pom.xml | 2 +- hudi-sync/hudi-sync-common/pom.xml | 2 +- hudi-sync/pom.xml | 2 +- hudi-tests-common/pom.xml | 2 +- hudi-timeline-service/pom.xml | 2 +- hudi-utilities/pom.xml | 2 +- packaging/hudi-aws-bundle/pom.xml | 2 +- packaging/hudi-cli-bundle/pom.xml | 2 +- packaging/hudi-datahub-sync-bundle/pom.xml | 2 +- packaging/hudi-flink-bundle/pom.xml | 2 +- packaging/hudi-gcp-bundle/pom.xml | 2 +- packaging/hudi-hadoop-mr-bundle/pom.xml | 2 +- packaging/hudi-hive-sync-bundle/pom.xml | 2 +- packaging/hudi-integ-test-bundle/pom.xml | 2 +- packaging/hudi-kafka-connect-bundle/pom.xml | 2 +- packaging/hudi-metaserver-server-bundle/pom.xml | 2 +- packaging/hudi-presto-bundle/pom.xml | 2 +- packaging/hudi-spark-bundle/pom.xml | 2 +- packaging/hudi-timeline-server-bundle/pom.xml | 2 +- packaging/hudi-trino-bundle/pom.xml | 2 +- packaging/hudi-utilities-bundle/pom.xml | 2 +- packaging/hudi-utilities-slim-bundle/pom.xml | 2 +- pom.xml | 2 +- 81 files changed, 191 insertions(+), 91 deletions(-) diff --git a/docker/hoodie/hadoop/base/pom.xml b/docker/hoodie/hadoop/base/pom.xml index 7be3f38b516b..d17a0789e464 100644 --- a/docker/hoodie/hadoop/base/pom.xml +++ b/docker/hoodie/hadoop/base/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/base_java11/pom.xml b/docker/hoodie/hadoop/base_java11/pom.xml index ed1a14fa84ae..36b57963d003 100644 --- a/docker/hoodie/hadoop/base_java11/pom.xml +++ b/docker/hoodie/hadoop/base_java11/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/datanode/pom.xml b/docker/hoodie/hadoop/datanode/pom.xml index 8f8027dd616d..13b398030378 100644 --- a/docker/hoodie/hadoop/datanode/pom.xml +++ b/docker/hoodie/hadoop/datanode/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/historyserver/pom.xml b/docker/hoodie/hadoop/historyserver/pom.xml index a007be1db74f..534d0cd542b4 100644 --- a/docker/hoodie/hadoop/historyserver/pom.xml +++ b/docker/hoodie/hadoop/historyserver/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/hive_base/pom.xml b/docker/hoodie/hadoop/hive_base/pom.xml index 7e57422e7d9d..3feb5aa2b2eb 100644 --- a/docker/hoodie/hadoop/hive_base/pom.xml +++ b/docker/hoodie/hadoop/hive_base/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/namenode/pom.xml b/docker/hoodie/hadoop/namenode/pom.xml index 20b0776b899b..945283103ff1 100644 --- a/docker/hoodie/hadoop/namenode/pom.xml +++ b/docker/hoodie/hadoop/namenode/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/pom.xml b/docker/hoodie/hadoop/pom.xml index 7e356c2d49f8..dfaca0fed913 100644 --- a/docker/hoodie/hadoop/pom.xml +++ b/docker/hoodie/hadoop/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/docker/hoodie/hadoop/prestobase/pom.xml b/docker/hoodie/hadoop/prestobase/pom.xml index 95713c494422..86d010579654 100644 --- a/docker/hoodie/hadoop/prestobase/pom.xml +++ b/docker/hoodie/hadoop/prestobase/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/spark_base/pom.xml b/docker/hoodie/hadoop/spark_base/pom.xml index 964aaf5aecd5..8e0a380228bf 100644 --- a/docker/hoodie/hadoop/spark_base/pom.xml +++ b/docker/hoodie/hadoop/spark_base/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/sparkadhoc/pom.xml b/docker/hoodie/hadoop/sparkadhoc/pom.xml index 056f4453c03f..6f4aebf60f79 100644 --- a/docker/hoodie/hadoop/sparkadhoc/pom.xml +++ b/docker/hoodie/hadoop/sparkadhoc/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/sparkmaster/pom.xml b/docker/hoodie/hadoop/sparkmaster/pom.xml index 24ee5809eb5e..a7bbe32442b6 100644 --- a/docker/hoodie/hadoop/sparkmaster/pom.xml +++ b/docker/hoodie/hadoop/sparkmaster/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/sparkworker/pom.xml b/docker/hoodie/hadoop/sparkworker/pom.xml index 43cd52821529..d09e4eb6884e 100644 --- a/docker/hoodie/hadoop/sparkworker/pom.xml +++ b/docker/hoodie/hadoop/sparkworker/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/trinobase/pom.xml b/docker/hoodie/hadoop/trinobase/pom.xml index a3ebaea54d34..bf1f86565857 100644 --- a/docker/hoodie/hadoop/trinobase/pom.xml +++ b/docker/hoodie/hadoop/trinobase/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/trinocoordinator/pom.xml b/docker/hoodie/hadoop/trinocoordinator/pom.xml index 778d9ce8ba3f..436ed35ccc84 100644 --- a/docker/hoodie/hadoop/trinocoordinator/pom.xml +++ b/docker/hoodie/hadoop/trinocoordinator/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/trinoworker/pom.xml b/docker/hoodie/hadoop/trinoworker/pom.xml index 991eb3c35348..57ba9a6ae452 100644 --- a/docker/hoodie/hadoop/trinoworker/pom.xml +++ b/docker/hoodie/hadoop/trinoworker/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/hudi-aws/pom.xml b/hudi-aws/pom.xml index e9fdc0f3c668..e69f62563245 100644 --- a/hudi-aws/pom.xml +++ b/hudi-aws/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-aws</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-aws</name> <packaging>jar</packaging> diff --git a/hudi-cli/pom.xml b/hudi-cli/pom.xml index afb25d710390..7a3efd5a1109 100644 --- a/hudi-cli/pom.xml +++ b/hudi-cli/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-client/hudi-client-common/pom.xml b/hudi-client/hudi-client-common/pom.xml index e5381d6eaac2..a19f89bea085 100644 --- a/hudi-client/hudi-client-common/pom.xml +++ b/hudi-client/hudi-client-common/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-client-common</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-client-common</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java index 8b6f0e99c245..f6bc28b53e4f 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java @@ -54,6 +54,7 @@ import org.apache.hudi.common.table.log.block.HoodieLogBlock; import org.apache.hudi.common.table.marker.MarkerType; import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; +import org.apache.hudi.common.table.view.FileSystemViewStorageType; import org.apache.hudi.common.util.ConfigUtils; import org.apache.hudi.common.util.FileIOUtils; import org.apache.hudi.common.util.HoodieRecordUtils; @@ -1628,6 +1629,12 @@ public class HoodieWriteConfig extends HoodieConfig { return getBoolean(EMBEDDED_TIMELINE_SERVER_REUSE_ENABLED); } + public boolean isRemoteViewStorageType() { + FileSystemViewStorageType storageType = getViewStorageConfig().getStorageType(); + return storageType == FileSystemViewStorageType.REMOTE_ONLY + || storageType == FileSystemViewStorageType.REMOTE_FIRST; + } + public int getEmbeddedTimelineServerPort() { return Integer.parseInt(getStringOrDefault(EMBEDDED_TIMELINE_SERVER_PORT_NUM)); } diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/WriteMarkersFactory.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/WriteMarkersFactory.java index 790534680960..7a4a38fdb0b5 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/WriteMarkersFactory.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/WriteMarkersFactory.java @@ -47,7 +47,7 @@ public class WriteMarkersFactory { case DIRECT: return getDirectWriteMarkers(table, instantTime); case TIMELINE_SERVER_BASED: - if (!table.getConfig().isEmbeddedTimelineServerEnabled()) { + if (!table.getConfig().isEmbeddedTimelineServerEnabled() && !table.getConfig().isRemoteViewStorageType()) { LOG.warn("Timeline-server-based markers are configured as the marker type " + "but embedded timeline server is not enabled. Falling back to direct markers."); return getDirectWriteMarkers(table, instantTime); diff --git a/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/table/marker/TestWriteMarkersFactory.java b/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/table/marker/TestWriteMarkersFactory.java index f9f28ee4b759..3da4f44897e4 100644 --- a/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/table/marker/TestWriteMarkersFactory.java +++ b/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/table/marker/TestWriteMarkersFactory.java @@ -114,13 +114,31 @@ public class TestWriteMarkersFactory extends HoodieCommonTestHarness { HoodieTableVersion.SIX, true, DirectWriteMarkersV1.class); } + @Test + public void testTimelineServerBasedMarkersWithRemoteViewStorageType() { + // Fallback to direct markers should happen + testWriteMarkersFactory( + MarkerType.TIMELINE_SERVER_BASED, NON_HDFS_BASE_PATH, + HoodieTableVersion.current(), false, true, TimelineServerBasedWriteMarkers.class); + testWriteMarkersFactory( + MarkerType.TIMELINE_SERVER_BASED, NON_HDFS_BASE_PATH, + HoodieTableVersion.SIX, false, true, TimelineServerBasedWriteMarkersV1.class); + } + private void testWriteMarkersFactory( MarkerType markerTypeConfig, String basePath, HoodieTableVersion tableVersion, boolean isTimelineServerEnabled, Class<?> expectedWriteMarkersClass) { + testWriteMarkersFactory(markerTypeConfig, basePath, tableVersion, isTimelineServerEnabled, false, expectedWriteMarkersClass); + } + + private void testWriteMarkersFactory( + MarkerType markerTypeConfig, String basePath, HoodieTableVersion tableVersion, + boolean isTimelineServerEnabled, boolean isRemoteViewStorageType, Class<?> expectedWriteMarkersClass) { String instantTime = "001"; when(table.getConfig()).thenReturn(writeConfig); when(writeConfig.isEmbeddedTimelineServerEnabled()) .thenReturn(isTimelineServerEnabled); + when(writeConfig.isRemoteViewStorageType()).thenReturn(isRemoteViewStorageType); when(table.getMetaClient()).thenReturn(metaClient); when(metaClient.getStorage()).thenReturn(storage); when(storage.getFileSystem()).thenReturn(fileSystem); diff --git a/hudi-client/hudi-flink-client/pom.xml b/hudi-client/hudi-flink-client/pom.xml index a149de817b94..87d06519f8fc 100644 --- a/hudi-client/hudi-flink-client/pom.xml +++ b/hudi-client/hudi-flink-client/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink-client</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-flink-client</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-java-client/pom.xml b/hudi-client/hudi-java-client/pom.xml index 024297c666fe..e13605f564d1 100644 --- a/hudi-client/hudi-java-client/pom.xml +++ b/hudi-client/hudi-java-client/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-java-client</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-java-client</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-spark-client/pom.xml b/hudi-client/hudi-spark-client/pom.xml index 84ffb266903e..1ebfacc1b791 100644 --- a/hudi-client/hudi-spark-client/pom.xml +++ b/hudi-client/hudi-spark-client/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark-client</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-spark-client</name> <packaging>jar</packaging> diff --git a/hudi-client/pom.xml b/hudi-client/pom.xml index b298341bd2ad..af5c8bee2c29 100644 --- a/hudi-client/pom.xml +++ b/hudi-client/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-common/pom.xml b/hudi-common/pom.xml index 90b110d7f78a..e5a31ec4ba9b 100644 --- a/hudi-common/pom.xml +++ b/hudi-common/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/hudi-examples-common/pom.xml b/hudi-examples/hudi-examples-common/pom.xml index c46edb3531ac..6d5954d6db61 100644 --- a/hudi-examples/hudi-examples-common/pom.xml +++ b/hudi-examples/hudi-examples-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/hudi-examples-flink/pom.xml b/hudi-examples/hudi-examples-flink/pom.xml index bd65a82dcc84..24a3d0bbc68b 100644 --- a/hudi-examples/hudi-examples-flink/pom.xml +++ b/hudi-examples/hudi-examples-flink/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/hudi-examples-java/pom.xml b/hudi-examples/hudi-examples-java/pom.xml index 5989c6e1df86..fbf184ef98a3 100644 --- a/hudi-examples/hudi-examples-java/pom.xml +++ b/hudi-examples/hudi-examples-java/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/hudi-examples-k8s/pom.xml b/hudi-examples/hudi-examples-k8s/pom.xml index 59146a08e8f0..f3c179da7797 100644 --- a/hudi-examples/hudi-examples-k8s/pom.xml +++ b/hudi-examples/hudi-examples-k8s/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/hudi-examples-spark/pom.xml b/hudi-examples/hudi-examples-spark/pom.xml index e5628318e635..3d8f7a702622 100644 --- a/hudi-examples/hudi-examples-spark/pom.xml +++ b/hudi-examples/hudi-examples-spark/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/pom.xml b/hudi-examples/pom.xml index fdce25525890..f5331653a9f8 100644 --- a/hudi-examples/pom.xml +++ b/hudi-examples/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-flink-datasource/hudi-flink/pom.xml b/hudi-flink-datasource/hudi-flink/pom.xml index d8c2da06d71a..6724749a53ee 100644 --- a/hudi-flink-datasource/hudi-flink/pom.xml +++ b/hudi-flink-datasource/hudi-flink/pom.xml @@ -22,12 +22,12 @@ <parent> <artifactId>hudi-flink-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <packaging>jar</packaging> <properties> diff --git a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/TestWriteCopyOnWrite.java b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/TestWriteCopyOnWrite.java index c8e4dd4c6c06..eebcdd8c5c97 100644 --- a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/TestWriteCopyOnWrite.java +++ b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/TestWriteCopyOnWrite.java @@ -22,6 +22,8 @@ import org.apache.hudi.client.HoodieFlinkWriteClient; import org.apache.hudi.common.model.HoodieFailedWritesCleaningPolicy; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.WriteConcurrencyMode; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.marker.MarkerType; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; import org.apache.hudi.common.table.view.FileSystemViewStorageType; import org.apache.hudi.config.HoodieCleanConfig; @@ -34,7 +36,10 @@ import org.apache.hudi.index.HoodieIndex; import org.apache.hudi.io.FileGroupReaderBasedMergeHandle; import org.apache.hudi.io.HoodieWriteMergeHandle; import org.apache.hudi.sink.utils.TestWriteBase; +import org.apache.hudi.storage.StoragePath; +import org.apache.hudi.storage.StoragePathInfo; import org.apache.hudi.util.FlinkWriteClients; +import org.apache.hudi.util.StreamerUtil; import org.apache.hudi.utils.TestData; import org.apache.flink.configuration.Configuration; @@ -45,11 +50,13 @@ import org.junit.jupiter.params.provider.ValueSource; import java.io.IOException; import java.util.HashMap; +import java.util.List; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test cases for stream write. @@ -790,4 +797,25 @@ public class TestWriteCopyOnWrite extends TestWriteBase { .assertNextEvent() .end(); } + + @ParameterizedTest + @EnumSource(MarkerType.class) + public void testMarkType(MarkerType markerType) throws Exception { + conf.setString(HoodieWriteConfig.MARKERS_TYPE.key(), markerType.toString()); + TestHarness testHarness = + preparePipeline(conf) + .consume(TestData.DATA_SET_INSERT) + // no checkpoint, so the coordinator does not accept any events + .emptyEventBuffer() + .checkpoint(1) + .assertNextEvent(4, "par1,par2,par3,par4"); + HoodieTableMetaClient metaClient = StreamerUtil.createMetaClient(conf); + List<StoragePathInfo> files = metaClient.getStorage().listFiles(new StoragePath(metaClient.getTempFolderPath())); + if (markerType == MarkerType.DIRECT) { + assertTrue(files.stream().allMatch(f -> f.getPath().getName().endsWith("marker.CREATE"))); + } else { + assertTrue(files.stream().noneMatch(f -> f.getPath().getName().endsWith("marker.CREATE"))); + } + testHarness.checkpointComplete(1).checkWrittenData(EXPECTED1).end(); + } } diff --git a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java index d8f14601ed85..ebbbebb2d79b 100644 --- a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java +++ b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java @@ -27,6 +27,7 @@ import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.table.HoodieTableVersion; import org.apache.hudi.common.table.cdc.HoodieCDCSupplementalLoggingMode; +import org.apache.hudi.common.table.marker.MarkerType; import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.config.HoodieWriteConfig; @@ -2715,6 +2716,21 @@ public class ITTestHoodieDataSource { assertRowsEquals(rows, TestData.DATA_SET_SOURCE_INSERT); } + @ParameterizedTest + @EnumSource(value = HoodieTableType.class) + void testWriteWithTimelineServerBasedMarker(HoodieTableType tableType) { + String hoodieTableDDL = sql("t1") + .option(FlinkOptions.PATH, tempFile.getAbsolutePath()) + .option(FlinkOptions.TABLE_TYPE, tableType) + .option(HoodieWriteConfig.MARKERS_TYPE.key(), MarkerType.TIMELINE_SERVER_BASED.name()) + .end(); + batchTableEnv.executeSql(hoodieTableDDL); + + execInsertSql(batchTableEnv, TestSQL.INSERT_T1); + List<Row> rows = CollectionUtil.iteratorToList(batchTableEnv.executeSql("select * from t1").collect()); + assertRowsEquals(rows, TestData.DATA_SET_SOURCE_INSERT); + } + // ------------------------------------------------------------------------- // Utilities // ------------------------------------------------------------------------- diff --git a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/utils/TestFlinkWriteClients.java b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/utils/TestFlinkWriteClients.java index d823a01f5be1..245300445ca2 100644 --- a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/utils/TestFlinkWriteClients.java +++ b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/utils/TestFlinkWriteClients.java @@ -35,9 +35,14 @@ import org.apache.hudi.common.model.WriteConcurrencyMode; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.table.HoodieTableVersion; +import org.apache.hudi.common.table.marker.MarkerType; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.configuration.FlinkOptions; import org.apache.hudi.io.FileGroupReaderBasedMergeHandle; +import org.apache.hudi.table.HoodieTable; +import org.apache.hudi.table.marker.DirectWriteMarkers; +import org.apache.hudi.table.marker.TimelineServerBasedWriteMarkers; +import org.apache.hudi.table.marker.WriteMarkersFactory; import org.apache.hudi.util.FlinkWriteClients; import org.apache.hudi.util.StreamerUtil; @@ -52,6 +57,7 @@ import java.io.File; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -97,6 +103,31 @@ public class TestFlinkWriteClients { } } + @ParameterizedTest + @ValueSource(strings = {"", "DIRECT", "TIMELINE_SERVER_BASED"}) + void testMarkerType(String markerType) throws Exception { + // create table + StreamerUtil.initTableIfNotExists(conf); + // This is expected to be used by the driver, the client can then send requests for files view. + FlinkWriteClients.createWriteClient(conf); + + // do not set mark type to test the default behavior + if (!markerType.isEmpty()) { + conf.setString(HoodieWriteConfig.MARKERS_TYPE.key(), MarkerType.valueOf(markerType).name()); + } + // This is expected to be used by writer client + HoodieWriteConfig writeConfig = FlinkWriteClients.getHoodieClientConfig(conf, false, true); + try (HoodieFlinkWriteClient writeClient = new HoodieFlinkWriteClient(HoodieFlinkEngineContext.DEFAULT, writeConfig)) { + HoodieTable table = writeClient.getHoodieTable(); + String markerClass = WriteMarkersFactory.get(writeConfig.getMarkersType(), table, "001").getClass().getSimpleName(); + if (markerType.isEmpty() || markerType.equals("DIRECT")) { + assertEquals(DirectWriteMarkers.class.getSimpleName(), markerClass); + } else { + assertEquals(TimelineServerBasedWriteMarkers.class.getSimpleName(), markerClass); + } + } + } + @ParameterizedTest @ValueSource(booleans = {true, false}) void testRecordMergeConfigForEventTimeOrdering(boolean useLegacyConfig) throws Exception { diff --git a/hudi-flink-datasource/pom.xml b/hudi-flink-datasource/pom.xml index e02e4eb3b5ab..c2d8b2bc21ab 100644 --- a/hudi-flink-datasource/pom.xml +++ b/hudi-flink-datasource/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink-datasource</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <packaging>pom</packaging> <properties> diff --git a/hudi-gcp/pom.xml b/hudi-gcp/pom.xml index 5502968e2ce2..8893356a9e1c 100644 --- a/hudi-gcp/pom.xml +++ b/hudi-gcp/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/hudi-hadoop-common/pom.xml b/hudi-hadoop-common/pom.xml index 7cdf604111a7..bd804c3f79d5 100644 --- a/hudi-hadoop-common/pom.xml +++ b/hudi-hadoop-common/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-hadoop-mr/pom.xml b/hudi-hadoop-mr/pom.xml index e793ad35a596..cee4693f2af0 100644 --- a/hudi-hadoop-mr/pom.xml +++ b/hudi-hadoop-mr/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-integ-test/pom.xml b/hudi-integ-test/pom.xml index dc5539dd5cbe..aba1abdc0be0 100644 --- a/hudi-integ-test/pom.xml +++ b/hudi-integ-test/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>hudi-integ-test</artifactId> diff --git a/hudi-io/pom.xml b/hudi-io/pom.xml index 9ddcaba0f57b..83e9b2b11858 100644 --- a/hudi-io/pom.xml +++ b/hudi-io/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-kafka-connect/pom.xml b/hudi-kafka-connect/pom.xml index e4cf47ce5f41..f0db61b8fd36 100644 --- a/hudi-kafka-connect/pom.xml +++ b/hudi-kafka-connect/pom.xml @@ -19,13 +19,13 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-kafka-connect</artifactId> <description>Kafka Connect Sink Connector for Hudi</description> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <packaging>jar</packaging> <properties> diff --git a/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml b/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml index 89cef2b99fa6..b9c67a85a66c 100644 --- a/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml +++ b/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-metaserver</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml b/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml index 46aeb8244a90..68ab47d63bf6 100644 --- a/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml +++ b/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-metaserver</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-platform-service/hudi-metaserver/pom.xml b/hudi-platform-service/hudi-metaserver/pom.xml index 6309b587c8cb..a359590ed118 100644 --- a/hudi-platform-service/hudi-metaserver/pom.xml +++ b/hudi-platform-service/hudi-metaserver/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-platform-service</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-metaserver</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-metaserver</name> <packaging>pom</packaging> diff --git a/hudi-platform-service/pom.xml b/hudi-platform-service/pom.xml index 7fe1c4d8325e..cfe85742d75c 100644 --- a/hudi-platform-service/pom.xml +++ b/hudi-platform-service/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-spark-datasource/hudi-spark-common/pom.xml b/hudi-spark-datasource/hudi-spark-common/pom.xml index b9de3a68b52d..e2a7bb5e76c7 100644 --- a/hudi-spark-datasource/hudi-spark-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark-common/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark-common_${scala.binary.version}</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-spark-common_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark/pom.xml b/hudi-spark-datasource/hudi-spark/pom.xml index fd4523eef5fb..f8fff8ae0020 100644 --- a/hudi-spark-datasource/hudi-spark/pom.xml +++ b/hudi-spark-datasource/hudi-spark/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark_${scala.binary.version}</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-spark_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3-common/pom.xml b/hudi-spark-datasource/hudi-spark3-common/pom.xml index 7c0361f96ec1..1ea3d9724da7 100644 --- a/hudi-spark-datasource/hudi-spark3-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark3-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-spark-datasource/hudi-spark3.3.x/pom.xml b/hudi-spark-datasource/hudi-spark3.3.x/pom.xml index 584f54d72fcb..0726a090af8a 100644 --- a/hudi-spark-datasource/hudi-spark3.3.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.3.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.3.x_2.12</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-spark3.3.x_2.12</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3.4.x/pom.xml b/hudi-spark-datasource/hudi-spark3.4.x/pom.xml index 18d7d283befa..282c6085785f 100644 --- a/hudi-spark-datasource/hudi-spark3.4.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.4.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.4.x_2.12</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-spark3.4.x_2.12</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3.5.x/pom.xml b/hudi-spark-datasource/hudi-spark3.5.x/pom.xml index f155c6ed3ee7..f7cc43832bbc 100644 --- a/hudi-spark-datasource/hudi-spark3.5.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.5.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.5.x_${scala.binary.version}</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-spark3.5.x_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark4-common/pom.xml b/hudi-spark-datasource/hudi-spark4-common/pom.xml index fea32739c74b..877ccd1cec70 100644 --- a/hudi-spark-datasource/hudi-spark4-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark4-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-spark-datasource/hudi-spark4.0.x/pom.xml b/hudi-spark-datasource/hudi-spark4.0.x/pom.xml index aa7b191c7626..627ed92f7631 100644 --- a/hudi-spark-datasource/hudi-spark4.0.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark4.0.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark4.0.x_${scala.binary.version}</artifactId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <name>hudi-spark4.0.x_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/pom.xml b/hudi-spark-datasource/pom.xml index 89658cf25333..28463704bad4 100644 --- a/hudi-spark-datasource/pom.xml +++ b/hudi-spark-datasource/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-sync/hudi-adb-sync/pom.xml b/hudi-sync/hudi-adb-sync/pom.xml index d342defe22d3..3c6057b09239 100644 --- a/hudi-sync/hudi-adb-sync/pom.xml +++ b/hudi-sync/hudi-adb-sync/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/hudi-sync/hudi-datahub-sync/pom.xml b/hudi-sync/hudi-datahub-sync/pom.xml index cf738f989cc3..a3f1fee2c5b5 100644 --- a/hudi-sync/hudi-datahub-sync/pom.xml +++ b/hudi-sync/hudi-datahub-sync/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/hudi-sync/hudi-hive-sync/pom.xml b/hudi-sync/hudi-hive-sync/pom.xml index 505ea3690858..301369f92b6e 100644 --- a/hudi-sync/hudi-hive-sync/pom.xml +++ b/hudi-sync/hudi-hive-sync/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/hudi-sync/hudi-sync-common/pom.xml b/hudi-sync/hudi-sync-common/pom.xml index 5486d0b5a404..fe144128a21f 100644 --- a/hudi-sync/hudi-sync-common/pom.xml +++ b/hudi-sync/hudi-sync-common/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-sync/pom.xml b/hudi-sync/pom.xml index fc8fed7630e4..2a91d5626b5b 100644 --- a/hudi-sync/pom.xml +++ b/hudi-sync/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-tests-common/pom.xml b/hudi-tests-common/pom.xml index f346c24ac9ed..2c78d1dab4fc 100644 --- a/hudi-tests-common/pom.xml +++ b/hudi-tests-common/pom.xml @@ -18,7 +18,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-timeline-service/pom.xml b/hudi-timeline-service/pom.xml index e4dda5be8f04..0a4ce45a8a71 100644 --- a/hudi-timeline-service/pom.xml +++ b/hudi-timeline-service/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-utilities/pom.xml b/hudi-utilities/pom.xml index 23851d294b64..2cc07c3a77da 100644 --- a/hudi-utilities/pom.xml +++ b/hudi-utilities/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-aws-bundle/pom.xml b/packaging/hudi-aws-bundle/pom.xml index d55b40e959e8..ebd9392795fa 100644 --- a/packaging/hudi-aws-bundle/pom.xml +++ b/packaging/hudi-aws-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-cli-bundle/pom.xml b/packaging/hudi-cli-bundle/pom.xml index b79f26a579cf..1f242553efbf 100644 --- a/packaging/hudi-cli-bundle/pom.xml +++ b/packaging/hudi-cli-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-datahub-sync-bundle/pom.xml b/packaging/hudi-datahub-sync-bundle/pom.xml index a9a74b8a4b05..55c414fc5889 100644 --- a/packaging/hudi-datahub-sync-bundle/pom.xml +++ b/packaging/hudi-datahub-sync-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml index 23369ff7cb79..1c2047d1ab6b 100644 --- a/packaging/hudi-flink-bundle/pom.xml +++ b/packaging/hudi-flink-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-gcp-bundle/pom.xml b/packaging/hudi-gcp-bundle/pom.xml index c9b5726547bb..af5e27521f38 100644 --- a/packaging/hudi-gcp-bundle/pom.xml +++ b/packaging/hudi-gcp-bundle/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-hadoop-mr-bundle/pom.xml b/packaging/hudi-hadoop-mr-bundle/pom.xml index f7cef353f029..1fac2694600a 100644 --- a/packaging/hudi-hadoop-mr-bundle/pom.xml +++ b/packaging/hudi-hadoop-mr-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-hive-sync-bundle/pom.xml b/packaging/hudi-hive-sync-bundle/pom.xml index 5c196df5a26a..5ffd93a3e11d 100644 --- a/packaging/hudi-hive-sync-bundle/pom.xml +++ b/packaging/hudi-hive-sync-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml index b3ba77c5786b..9bbadeec4141 100644 --- a/packaging/hudi-integ-test-bundle/pom.xml +++ b/packaging/hudi-integ-test-bundle/pom.xml @@ -17,7 +17,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-kafka-connect-bundle/pom.xml b/packaging/hudi-kafka-connect-bundle/pom.xml index 3285283765f1..8f6dc49ce9a1 100644 --- a/packaging/hudi-kafka-connect-bundle/pom.xml +++ b/packaging/hudi-kafka-connect-bundle/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-metaserver-server-bundle/pom.xml b/packaging/hudi-metaserver-server-bundle/pom.xml index 73fbcca7be36..6c8949376977 100644 --- a/packaging/hudi-metaserver-server-bundle/pom.xml +++ b/packaging/hudi-metaserver-server-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-presto-bundle/pom.xml b/packaging/hudi-presto-bundle/pom.xml index 56fe63bd0c28..313d0cda9601 100644 --- a/packaging/hudi-presto-bundle/pom.xml +++ b/packaging/hudi-presto-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml index 4449ff221518..dce01e520247 100644 --- a/packaging/hudi-spark-bundle/pom.xml +++ b/packaging/hudi-spark-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml index 801a91b0eeb4..ed3ad50d1c0c 100644 --- a/packaging/hudi-timeline-server-bundle/pom.xml +++ b/packaging/hudi-timeline-server-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-trino-bundle/pom.xml b/packaging/hudi-trino-bundle/pom.xml index e7ab1d078e38..c3b97e309b21 100644 --- a/packaging/hudi-trino-bundle/pom.xml +++ b/packaging/hudi-trino-bundle/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml index 70fcde3ff392..3875f6043eed 100644 --- a/packaging/hudi-utilities-bundle/pom.xml +++ b/packaging/hudi-utilities-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-utilities-slim-bundle/pom.xml b/packaging/hudi-utilities-slim-bundle/pom.xml index 2725cfc3d270..2ee82e9f6962 100644 --- a/packaging/hudi-utilities-slim-bundle/pom.xml +++ b/packaging/hudi-utilities-slim-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 1b0bff958994..2a6f92bf24d7 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.hudi</groupId> <artifactId>hudi</artifactId> <packaging>pom</packaging> - <version>1.1.1-rc1</version> + <version>1.1.1-rc2</version> <description>Apache Hudi brings stream style processing on big data</description> <url>https://github.com/apache/hudi</url> <name>Hudi</name>
