[BugFix] Fix list files when no files were found

Signed-off-by: wyb <[email protected]>
StarRocks · Dec 13, 2024 · 675f0de · 675f0de
1 parent 1300393
commit 675f0de
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/TableFunctionTable.java b/fe/fe-core/src/main/java/com/starrocks/catalog/TableFunctionTable.java
@@ -241,6 +241,9 @@ public List<List<String>> listFilesAndDirs() {
                     files.add(fileInfo);
                 }
             }
+            if (files.isEmpty()) {
+                ErrorReport.reportDdlException(ErrorCode.ERR_NO_FILES_FOUND, path);
+            }
             return files;
         } catch (StarRocksException e) {
             LOG.warn("failed to parse files", e);

diff --git a/fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.java b/fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.java
@@ -1203,7 +1203,7 @@ public List<FileStatus> listFileMeta(String path, Map<String, String> properties
         Path pathPattern = new Path(pathUri.getPath());
         try {
             FileStatus[] files = fileSystem.getDFSFileSystem().globStatus(pathPattern);
-            return Lists.newArrayList(files);
+            return files != null ? Lists.newArrayList(files) : Lists.newArrayList();
         } catch (FileNotFoundException e) {
             LOG.info("file not found: " + path, e);
             throw new StarRocksException("file not found: " + path, e);

diff --git a/test/sql/test_files/R/csv_format b/test/sql/test_files/R/csv_format
@@ -73,6 +73,17 @@ select path, size, is_dir from files(
     "aws.s3.secret_key" = "${oss_sk}",
     "aws.s3.endpoint" = "${oss_endpoint}");
 -- result:
+[REGEX].*failed to parse files: No files were found matching the pattern\(s\) or path\(s\).*
+-- !result
+
+select path, size, is_dir from files(
+    "path" = "oss://${oss_bucket}/test_files/csv_format/${uuid0}/xxxxxx",
+    "list_files_only" = "true",
+    "aws.s3.access_key" = "${oss_ak}",
+    "aws.s3.secret_key" = "${oss_sk}",
+    "aws.s3.endpoint" = "${oss_endpoint}");
+-- result:
+[REGEX].*failed to parse files: No files were found matching the pattern\(s\) or path\(s\).*
 -- !result
 
 shell: ossutil64 rm -rf oss://${oss_bucket}/test_files/csv_format/${uuid0}/ > /dev/null
diff --git a/test/sql/test_files/T/csv_format b/test/sql/test_files/T/csv_format
@@ -34,5 +34,12 @@ select path, size, is_dir from files(
     "aws.s3.secret_key" = "${oss_sk}",
     "aws.s3.endpoint" = "${oss_endpoint}");
 
+select path, size, is_dir from files(
+    "path" = "oss://${oss_bucket}/test_files/csv_format/${uuid0}/xxxxxx",
+    "list_files_only" = "true",
+    "aws.s3.access_key" = "${oss_ak}",
+    "aws.s3.secret_key" = "${oss_sk}",
+    "aws.s3.endpoint" = "${oss_endpoint}");
+
 -- clean
 shell: ossutil64 rm -rf oss://${oss_bucket}/test_files/csv_format/${uuid0}/ > /dev/null