(shardingsphere) branch master updated: Fix test cases (#31881)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new a846e6c4c4c Fix test cases (#31881)
a846e6c4c4c is described below

commit a846e6c4c4c11aebb589b3da24471a153984382e
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Jun 27 09:03:23 2024 +0800

    Fix test cases (#31881)
    
    * Fix ClasspathResourceDirectoryReaderTest
    
    * Fix ClasspathResourceDirectoryReaderTest
    
    * Fix ClasspathResourceDirectoryReaderTest
    
    * Fix test cases
---
 .../ClasspathResourceDirectoryReader.java          |  8 ++------
 .../inventory/column/ColumnValueReaderEngine.java  | 24 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git 
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/directory/ClasspathResourceDirectoryReader.java
 
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/directory/ClasspathResourceDirectoryReader.java
index e9c65f063f0..3cc69afdafe 100644
--- 
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/directory/ClasspathResourceDirectoryReader.java
+++ 
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/directory/ClasspathResourceDirectoryReader.java
@@ -81,13 +81,9 @@ public final class ClasspathResourceDirectoryReader {
         }
         if (JAR_URL_PROTOCOLS.contains(resourceUrl.getProtocol())) {
             JarFile jarFile = getJarFile(resourceUrl);
-            if (null == jarFile) {
-                return false;
-            }
-            return jarFile.getJarEntry(name).isDirectory();
-        } else {
-            return Paths.get(resourceUrl.toURI()).toFile().exists();
+            return null != jarFile && jarFile.getJarEntry(name).isDirectory();
         }
+        return Paths.get(resourceUrl.toURI()).toFile().isDirectory();
     }
     
     /**
diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java
index 4c293d371c2..33efde4677f 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java
@@ -65,13 +65,29 @@ public final class ColumnValueReaderEngine {
             case Types.BOOLEAN:
                 return resultSet.getBoolean(columnIndex);
             case Types.TINYINT:
-                return isSigned(metaData, columnIndex) ? 
resultSet.getByte(columnIndex) : resultSet.getShort(columnIndex);
+                if (isSigned(metaData, columnIndex)) {
+                    return resultSet.getByte(columnIndex);
+                } else {
+                    return resultSet.getShort(columnIndex);
+                }
             case Types.SMALLINT:
-                return isSigned(metaData, columnIndex) ? 
resultSet.getShort(columnIndex) : resultSet.getInt(columnIndex);
+                if (isSigned(metaData, columnIndex)) {
+                    return resultSet.getShort(columnIndex);
+                } else {
+                    return resultSet.getInt(columnIndex);
+                }
             case Types.INTEGER:
-                return isSigned(metaData, columnIndex) ? 
resultSet.getInt(columnIndex) : resultSet.getLong(columnIndex);
+                if (isSigned(metaData, columnIndex)) {
+                    return resultSet.getInt(columnIndex);
+                } else {
+                    return resultSet.getLong(columnIndex);
+                }
             case Types.BIGINT:
-                return isSigned(metaData, columnIndex) ? 
Long.valueOf(resultSet.getLong(columnIndex)) : 
resultSet.getBigDecimal(columnIndex);
+                if (isSigned(metaData, columnIndex)) {
+                    return resultSet.getLong(columnIndex);
+                } else {
+                    return resultSet.getBigDecimal(columnIndex);
+                }
             case Types.NUMERIC:
             case Types.DECIMAL:
                 return resultSet.getBigDecimal(columnIndex);