diff --git a/.github/workflows/flink.yml b/.github/workflows/flink.yml index b66bddf4279..ed36c44409d 100644 --- a/.github/workflows/flink.yml +++ b/.github/workflows/flink.yml @@ -87,8 +87,8 @@ jobs: export VELOX_DEPENDENCY_SOURCE=BUNDLED export fmt_SOURCE=BUNDLED export folly_SOURCE=BUNDLED - git clone -b feature/watermark-status-propagation https://github.com/bigo-sg/velox4j.git - cd velox4j && git reset --hard 6e2046f + git clone -b feat/flink-preset https://github.com/ggjh-159/velox4j.git + cd velox4j git apply $GITHUB_WORKSPACE/gluten-flink/patches/fix-velox4j.patch $GITHUB_WORKSPACE/build/mvn clean install -DskipTests -Dgpg.skip -Dspotless.skip=true cd .. diff --git a/gluten-flink/runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java b/gluten-flink/runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java index 6d1afaecd4c..cb4f5d9cc86 100644 --- a/gluten-flink/runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java +++ b/gluten-flink/runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java @@ -508,6 +508,9 @@ public static void runTaskManagerProcessSecurely(Configuration configuration) { StateChangelogStorageLoader.initialize(pluginManager); // --- Begin Gluten-specific code changes --- + Velox4j.configure( + io.github.zhztheplayer.velox4j.config.Preset.KEY, + io.github.zhztheplayer.velox4j.config.Preset.FLINK); Velox4j.initialize(); // --- End Gluten-specific code changes --- diff --git a/gluten-flink/ut/src/test/java/org/apache/gluten/table/runtime/stream/common/Velox4jEnvironment.java b/gluten-flink/ut/src/test/java/org/apache/gluten/table/runtime/stream/common/Velox4jEnvironment.java index b896819231e..b3265c83533 100644 --- a/gluten-flink/ut/src/test/java/org/apache/gluten/table/runtime/stream/common/Velox4jEnvironment.java +++ b/gluten-flink/ut/src/test/java/org/apache/gluten/table/runtime/stream/common/Velox4jEnvironment.java @@ -17,6 +17,7 @@ package org.apache.gluten.table.runtime.stream.common; import io.github.zhztheplayer.velox4j.Velox4j; +import io.github.zhztheplayer.velox4j.config.Preset; public class Velox4jEnvironment { private static class Holder { @@ -24,6 +25,7 @@ private static class Holder { } private Velox4jEnvironment() { + Velox4j.configure(Preset.KEY, Preset.FLINK); Velox4j.initialize(); }