Changes for Issue 1360

arjun12102019 · arjun12102019 · commit 014a0e04559a · 2024-05-06T18:16:03.000+05:30
diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DatabaseServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DatabaseServiceImpl.java
@@ -118,9 +118,10 @@ public DataResult<MetaSchema> queryDatabaseSchema(MetaDataQueryParam param) {
                             ThreadUtil.execute(() -> {
                                 try {
                                     database.setSchemas(metaData.schemas(connection, database.getName()));
-                                    countDownLatch.countDown();
                                 } catch (Exception e) {
                                     log.error("queryDatabaseSchema error", e);
+                                } finally{
+                                    countDownLatch.countDown();
                                 }
                             });
                         }
diff --git a/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/util/EasyStringUtils.java b/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/util/EasyStringUtils.java
@@ -26,7 +26,7 @@ public class EasyStringUtils {
      * @return modified job number
      */
     public static String cutUserId(String userId) {
-        if (!org.apache.commons.lang3.StringUtils.isNumeric(userId)) {
+        if (!StringUtils.isNumeric(userId)) {
             return userId;
         }
         int startIndex = 0;

Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,10 @@ public DataResult<MetaSchema> queryDatabaseSchema(MetaDataQueryParam param) {`
`118`	`118`	`ThreadUtil.execute(() -> {`
`119`	`119`	`try {`
`120`	`120`	`database.setSchemas(metaData.schemas(connection, database.getName()));`
`121`		`- countDownLatch.countDown();`
`122`	`121`	`} catch (Exception e) {`
`123`	`122`	`log.error("queryDatabaseSchema error", e);`
	`123`	`+ } finally{`
	`124`	`+ countDownLatch.countDown();`
`124`	`125`	`}`
`125`	`126`	`});`
`126`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class EasyStringUtils {`
`26`	`26`	`* @return modified job number`
`27`	`27`	`*/`
`28`	`28`	`public static String cutUserId(String userId) {`
`29`		`- if (!org.apache.commons.lang3.StringUtils.isNumeric(userId)) {`
	`29`	`+ if (!StringUtils.isNumeric(userId)) {`
`30`	`30`	`return userId;`
`31`	`31`	`}`
`32`	`32`	`int startIndex = 0;`