fix: h2 udf problem (DataLinkDC#2850)

* fix: h2 udf problem Signed-off-by: licho <lecho.sun@gmail.com> * Spotless Apply --------- Signed-off-by: licho <lecho.sun@gmail.com> Co-authored-by: leechor <leechor@users.noreply.github.com>
hugh018 · Dec 29, 2023 · 878af99 · 878af99
1 parent 474df03
commit 878af99
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/StudioServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/StudioServiceImpl.java
@@ -101,7 +101,7 @@ public SelectResult getJobData(String jobId) {
     public LineageResult getLineage(StudioLineageDTO studioCADTO) {
         // TODO 添加ProcessStep
         if (Asserts.isNotNullString(studioCADTO.getDialect())
-                && !Dialect.FLINK_SQL.equalsVal(studioCADTO.getDialect())) {
+                && !Dialect.FLINK_SQL.isDialect(studioCADTO.getDialect())) {
             if (Asserts.isNull(studioCADTO.getDatabaseId())) {
                 log.error("Job's data source not selected!");
                 return null;
@@ -111,7 +111,7 @@ public LineageResult getLineage(StudioLineageDTO studioCADTO) {
                 log.error("Job's data source does not exist!");
                 return null;
             }
-            if (Dialect.DORIS.equalsVal(studioCADTO.getDialect())) {
+            if (Dialect.DORIS.isDialect(studioCADTO.getDialect())) {
                 return SQLLineageBuilder.getSqlLineage(studioCADTO.getStatement(), "mysql", dataBase.getDriverConfig());
             } else {
                 return SQLLineageBuilder.getSqlLineage(

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java
@@ -103,7 +103,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
@@ -552,13 +551,13 @@ public boolean saveOrUpdateTask(Task task) {
             }
             // to compiler udf
             if (Asserts.isNotNullString(task.getDialect())
-                    && Dialect.JAVA.equalsVal(task.getDialect())
+                    && Dialect.JAVA.isDialect(task.getDialect())
                     && Asserts.isNotNullString(task.getStatement())) {
                 CustomStringJavaCompiler compiler = new CustomStringJavaCompiler(task.getStatement());
                 task.setSavePointPath(compiler.getFullClassName());
-            } else if (Dialect.PYTHON.equalsVal(task.getDialect())) {
+            } else if (Dialect.PYTHON.isDialect(task.getDialect())) {
                 task.setSavePointPath(task.getName() + "." + UDFUtil.getPyUDFAttr(task.getStatement()));
-            } else if (Dialect.SCALA.equalsVal(task.getDialect())) {
+            } else if (Dialect.SCALA.isDialect(task.getDialect())) {
                 task.setSavePointPath(UDFUtil.getScalaFullClassName(task.getStatement()));
             }
             UdfCodePool.addOrUpdate(UDFUtils.taskToUDF(task));
@@ -633,15 +632,10 @@ public JobModelOverview getJobStreamingOrBatchModelOverview() {
 
     @Override
     public List<Task> getAllUDF() {
-        List<Task> tasks = list(new QueryWrapper<Task>()
-                .in("dialect", Dialect.JAVA, Dialect.SCALA, Dialect.PYTHON)
+        return list(new QueryWrapper<Task>()
+                .in("dialect", Dialect.JAVA.getValue(), Dialect.SCALA.getValue(), Dialect.PYTHON.getValue())
                 .eq("enabled", 1)
                 .isNotNull("save_point_path"));
-        return tasks.stream()
-                .peek(task -> {
-                    Assert.notNull(task, Status.TASK_NOT_EXIST.getMessage());
-                })
-                .collect(Collectors.toList());
     }
 
     @Override

diff --git a/dinky-admin/src/main/java/org/dinky/service/task/BaseTask.java b/dinky-admin/src/main/java/org/dinky/service/task/BaseTask.java
@@ -69,7 +69,7 @@ public static BaseTask getTask(TaskDTO taskDTO) {
             SupportDialect annotation = clazz.getAnnotation(SupportDialect.class);
             if (annotation != null) {
                 for (Dialect dialect : annotation.value()) {
-                    if (dialect.getValue().equalsIgnoreCase(taskDTO.getDialect())) {
+                    if (dialect.isDialect(taskDTO.getDialect())) {
                         return (BaseTask) ReflectUtil.newInstance(clazz, taskDTO);
                     }
                 }

diff --git a/dinky-admin/src/main/java/org/dinky/utils/UDFUtils.java b/dinky-admin/src/main/java/org/dinky/utils/UDFUtils.java
@@ -25,7 +25,6 @@
 
 import org.apache.flink.table.catalog.FunctionLanguage;
 
-/** @since 0.6.8 */
 public class UDFUtils extends UDFUtil {
 
     public static UDF taskToUDF(Task task) {

diff --git a/dinky-common/src/main/java/org/dinky/config/Dialect.java b/dinky-common/src/main/java/org/dinky/config/Dialect.java
@@ -58,7 +58,7 @@ public String getValue() {
         return value;
     }
 
-    public boolean equalsVal(String valueText) {
+    public boolean isDialect(String valueText) {
         return Asserts.isEqualsIgnoreCase(value, valueText);
     }