From d90734e365a753b019947b9c8db599719267ceb4 Mon Sep 17 00:00:00 2001 From: s7monk <“15512826113@163.com”> Date: Tue, 9 Jul 2024 14:17:27 +0800 Subject: [PATCH 1/2] commit. --- .../paimon/web/server/controller/SessionController.java | 5 +++-- .../paimon/web/server/service/impl/JobServiceImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SessionController.java b/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SessionController.java index cee6f61ad..fc761f3ef 100644 --- a/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SessionController.java +++ b/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SessionController.java @@ -18,6 +18,7 @@ package org.apache.paimon.web.server.controller; +import org.apache.paimon.web.gateway.enums.DeploymentMode; import org.apache.paimon.web.server.data.dto.SessionDTO; import org.apache.paimon.web.server.data.model.ClusterInfo; import org.apache.paimon.web.server.data.result.R; @@ -59,7 +60,7 @@ public R createSession() { } int uid = StpUtil.getLoginIdAsInt(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("type", "Flink"); + queryWrapper.eq("deployment_mode", DeploymentMode.FLINK_SQL_GATEWAY.getType()); List clusterInfos = clusterService.list(queryWrapper); for (ClusterInfo cluster : clusterInfos) { SessionDTO sessionDTO = new SessionDTO(); @@ -85,7 +86,7 @@ public R dropSession() { } int uid = StpUtil.getLoginIdAsInt(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("type", "Flink"); + queryWrapper.eq("deployment_mode", DeploymentMode.FLINK_SQL_GATEWAY.getType()); List clusterInfos = clusterService.list(queryWrapper); for (ClusterInfo cluster : clusterInfos) { SessionDTO sessionDTO = new SessionDTO(); diff --git a/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/JobServiceImpl.java b/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/JobServiceImpl.java index e69c4518b..ceb46c73c 100644 --- a/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/JobServiceImpl.java +++ b/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/JobServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.paimon.web.engine.flink.common.status.JobStatus; import org.apache.paimon.web.engine.flink.sql.gateway.model.SessionEntity; import org.apache.paimon.web.gateway.config.ExecutionConfig; +import org.apache.paimon.web.gateway.enums.DeploymentMode; import org.apache.paimon.web.gateway.enums.EngineType; import org.apache.paimon.web.gateway.provider.ExecutorFactoryProvider; import org.apache.paimon.web.server.context.LogContextHolder; @@ -302,8 +303,8 @@ public void refreshJobStatus(String taskType) { if (taskType.equals("Flink")) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("type", "Flink"); - List clusters = clusterService.list(); + queryWrapper.eq("deployment_mode", DeploymentMode.FLINK_SQL_GATEWAY.getType()); + List clusters = clusterService.list(queryWrapper); for (ClusterInfo cluster : clusters) { try { SessionEntity session = From b76b5d5e2f44925cbd4c9b4e0710452b1bc0d1d3 Mon Sep 17 00:00:00 2001 From: s7monk <“15512826113@163.com”> Date: Tue, 9 Jul 2024 15:47:09 +0800 Subject: [PATCH 2/2] commit. --- paimon-web-server/pom.xml | 8 ++++++++ .../paimon/web/server/controller/JobControllerTest.java | 1 + .../web/server/controller/SessionControllerTest.java | 1 + 3 files changed, 10 insertions(+) diff --git a/paimon-web-server/pom.xml b/paimon-web-server/pom.xml index ac5a99299..599ee71c7 100644 --- a/paimon-web-server/pom.xml +++ b/paimon-web-server/pom.xml @@ -37,6 +37,7 @@ under the License. 2.8.5 1.18.1 + 2.12 @@ -247,6 +248,13 @@ under the License. + + org.apache.flink + flink-table-planner_${scala.version} + ${flink.version} + test + + commons-cli commons-cli diff --git a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/JobControllerTest.java b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/JobControllerTest.java index eeeafdc4a..42155fa6a 100644 --- a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/JobControllerTest.java +++ b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/JobControllerTest.java @@ -113,6 +113,7 @@ public void before() throws Exception { .port(port) .enabled(true) .type("Flink") + .deploymentMode("flink-sql-gateway") .build(); boolean res = clusterService.save(cluster); assertTrue(res); diff --git a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SessionControllerTest.java b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SessionControllerTest.java index e49c0e6fd..9833e728b 100644 --- a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SessionControllerTest.java +++ b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SessionControllerTest.java @@ -123,6 +123,7 @@ public void testCreateSession() throws Exception { .port(port) .enabled(true) .type("Flink") + .deploymentMode("flink-sql-gateway") .build(); boolean res = clusterService.save(cluster); assertTrue(res);