Fix: Multi-ResultSet Ordering Issue and JDBC Driver Metadata Retrieval (

#630)

* fix: 修复多结果集jdbc返回时顺序错乱的问题

* fix: jdbc-meta get tables

linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobInfoResult.scala

@@ -27,9 +27,13 @@ import org.apache.linkis.ujes.client.request.{ResultSetListAction, UserAction}
 
 import org.apache.commons.beanutils.BeanUtils
 
+import java.io.File
+import java.nio.file.Files
 import java.util
 import java.util.Date
 
+import scala.util.matching.Regex
+
 @DWSHttpMessageResult("/api/rest_j/v\\d+/jobhistory/\\S+/get")
 class JobInfoResult extends DWSResult with UserAction with Status {
 
@@ -78,7 +82,10 @@ class JobInfoResult extends DWSResult with UserAction with Status {
         ujesClient.executeUJESJob(ResultSetListAction.builder().set(this).build()) match {
           case resultSetList: ResultSetListResult => resultSetList.getResultSetList
         }
-      resultSetList
+      val numberRegex: Regex = """(\d+)""".r
+      return resultSetList.sortBy { fileName =>
+        numberRegex.findFirstIn(fileName.split(File.separator).last).getOrElse("0").toInt
+      }
     }
     else if (resultSetList != null) resultSetList
     else if (isFailed) {

linkis-computation-governance/linkis-client/linkis-computation-client/src/test/java/org/apache/linkis/ujes/client/response/JobInfoResultTest.java

@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.ujes.client.response;
+
+import org.apache.linkis.governance.common.entity.task.RequestPersistTask;
+import org.apache.linkis.ujes.client.UJESClient;
+
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+
+class JobInfoResultTest {
+
+  /**
+   * verify single path returns
+   * check point 1: return one path
+   */
+  @Test
+  void shouldReturnResultSetWithOrder() {
+    String[] toBeReturned = new String[] {"hdfs://hdfs/path/test/mockFile_1.dolphi"};
+    String[] setList = getResultSetList(toBeReturned);
+    assertEquals(1, setList.length);
+    assertEquals("hdfs://hdfs/path/test/mockFile_1.dolphi", setList[0]);
+  }
+
+  /**
+   * verify empty path set
+   * check point 1: return empty path
+   */
+  @Test
+  void shouldReturnEmptyResultSet() {
+    String[] toBeReturned = new String[] {};
+    String[] setList = getResultSetList(toBeReturned);
+    assertEquals(0, setList.length);
+  }
+
+  /**
+   * verify multiple result set, sorted by file name with numbers
+   * check point 1: sort asc
+   * check point 2: sort by number, not ascii
+   */
+  @Test
+  void shouldReturnMultiResultSetWithOrder() {
+    String[] toBeReturned =
+        new String[] {
+          "/path/to/xxxx_1.txt",
+          "/some/path/xxxx_10.txt",
+          "/another/path/xxxx_0.txt",
+          "/another/path/xxxx_2.txt",
+          "/yet/another/path/xxxx_3.txt",
+        };
+    String[] setList = getResultSetList(toBeReturned);
+    assertIterableEquals(
+        Lists.newArrayList(
+            "/another/path/xxxx_0.txt",
+            "/path/to/xxxx_1.txt",
+            "/another/path/xxxx_2.txt",
+            "/yet/another/path/xxxx_3.txt",
+            "/some/path/xxxx_10.txt"),
+        Lists.newArrayList(setList));
+  }
+
+  private static String[] getResultSetList(String[] toBeReturned) {
+    JobInfoResult jobInfoResult = Mockito.spy(new JobInfoResult());
+
+    UJESClient ujesClient = Mockito.mock(UJESClient.class);
+    Mockito.doReturn("Succeed").when(jobInfoResult).getJobStatus();
+    RequestPersistTask persistTask = new RequestPersistTask();
+    persistTask.setUmUser("test");
+    persistTask.setResultLocation("mockPath");
+    Mockito.doReturn(persistTask).when(jobInfoResult).getRequestPersistTask();
+
+    ResultSetListResult t = Mockito.spy(new ResultSetListResult());
+    Mockito.when(ujesClient.executeUJESJob(any())).thenReturn(t);
+    Mockito.doReturn(toBeReturned).when(t).getResultSetList();
+
+    return jobInfoResult.getResultSetList(ujesClient);
+  }
+}

linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala

@@ -392,7 +392,7 @@ class UJESSQLDatabaseMetaData(ujesSQLConnection: LinkisSQLConnection)
             StringUtils.isNotBlank(tableNamePattern) && tableNamePattern.equalsIgnoreCase(tableName)
         ) {
           resultTables.add(resultTable)
-        } else {
+        } else if (StringUtils.isBlank(tableNamePattern)) {
           resultTables.add(resultTable)
         }
       }