Merge branch 'dev' into improvement-17057-checkIfDAG

Author: ruanwenjun

dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/src/main/java/org/apache/dolphinscheduler/plugin/doris/param/DorisDataSourceProcessor.java

@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.druid.sql.parser.SQLParserUtils;
 import com.google.auto.service.AutoService;
 
 @AutoService(DataSourceProcessor.class)
@@ -139,6 +140,14 @@ public DataSourceProcessor create() {
         return new DorisDataSourceProcessor();
     }
 
+    @Override
+    public List<String> splitAndRemoveComment(String sql) {
+        // Because doris is highly compatible with mysql syntax,
+        // a mysql-type implementation can be used for comments and statement split.
+        String cleanSQL = SQLParserUtils.removeComment(sql, com.alibaba.druid.DbType.mysql);
+        return SQLParserUtils.split(cleanSQL, com.alibaba.druid.DbType.mysql);
+    }
+
     private String transformOther(Map<String, String> paramMap) {
         if (MapUtils.isEmpty(paramMap)) {
             return null;

dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/src/test/java/org/apache/dolphinscheduler/plugin/doris/param/DorisDataSourceProcessorTest.java

@@ -137,4 +137,15 @@ public void splitAndRemoveComment() {
         Assertions.assertEquals("set enable_unique_key_partial_update = false", sqls.get(2));
     }
 
+    @Test
+    void testSplitAndRemoveCommentWithComments() {
+        String sql = "-- This is a comment\r\n" +
+                "select *, udfTest(p1) from table1 -- This is a comment\r\n;" +
+                "/*Annotation test*/select * from table2/*Annotation test*/";
+        List<String> result = dorisDatasourceProcessor.splitAndRemoveComment(sql);
+        Assertions.assertEquals(2, result.size());
+        Assertions.assertEquals("select *, udfTest(p1) from table1", result.get(0));
+        Assertions.assertEquals("select * from table2", result.get(1));
+    }
+
 }