From f054afe08c426c9a6ba432a34234b735184100a7 Mon Sep 17 00:00:00 2001
From: sjgllgh <sjgl_lgh@163.com>
Date: Fri, 22 Dec 2023 09:44:14 +0000
Subject: [PATCH] Fixed the bug that cannot read the s3 directory tree

---
 .../linkis/storage/fs/impl/S3FileSystem.java  | 47 ++++++++++++++-----
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java
index b8f6401b11..2293911e7f 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java
@@ -24,6 +24,7 @@
 import org.apache.linkis.storage.utils.StorageConfiguration;
 import org.apache.linkis.storage.utils.StorageUtils;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -38,10 +39,7 @@
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
-import com.amazonaws.services.s3.model.ListObjectsV2Result;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.amazonaws.services.s3.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -165,19 +163,29 @@ public List<FsPath> list(FsPath path) throws IOException {
   @Override
   public FsPathListWithError listPathWithError(FsPath path) throws IOException {
     try {
+      List<FsPath> rtn = new ArrayList();
       if (!StringUtils.isEmpty(path.getPath())) {
-        ListObjectsV2Result listObjectsV2Result = s3Client.listObjectsV2(bucket, path.getPath());
-        List<S3ObjectSummary> s3ObjectSummaries = listObjectsV2Result.getObjectSummaries();
-        if (s3ObjectSummaries != null) {
-          List<FsPath> rtn = new ArrayList();
-          String message = "";
-          for (S3ObjectSummary summary : s3ObjectSummaries) {
+        ListObjectsV2Request request = new ListObjectsV2Request();
+        request.withBucketName(bucket).withPrefix(buildPrefix(path.getPath())).withDelimiter("/");
+        ListObjectsV2Result result = s3Client.listObjectsV2(request);
+        List<S3ObjectSummary> fileSummaries = result.getObjectSummaries();
+        List<String> dirNames = result.getCommonPrefixes();
+        String message = "";
+        if (fileSummaries != null) {
+          for (S3ObjectSummary summary : fileSummaries) {
             if (isDir(summary, path.getPath()) || isInitFile(summary)) continue;
             FsPath newPath = new FsPath(buildPath(summary.getKey()));
             rtn.add(fillStorageFile(newPath, summary));
           }
-          return new FsPathListWithError(rtn, message);
         }
+        if (CollectionUtils.isNotEmpty(dirNames)) {
+          for (String dir : dirNames) {
+            FsPath dirPath = new FsPath(buildPath(dir));
+            dirPath.setIsdir(true);
+            rtn.add(dirPath);
+          }
+        }
+        return new FsPathListWithError(rtn, message);
       }
     } catch (AmazonS3Exception e) {
       throw new IOException("You have not permission to access path " + path.getPath());
@@ -189,8 +197,9 @@ public FsPathListWithError listPathWithError(FsPath path) throws IOException {
   @Override
   public boolean exists(FsPath dest) throws IOException {
     try {
-      int size = s3Client.listObjectsV2(bucket, dest.getPath()).getObjectSummaries().size();
-      return size > 0;
+      ListObjectsV2Request request = new ListObjectsV2Request();
+      request.withBucketName(bucket).withPrefix(buildPrefix(dest.getPath())).withDelimiter("/");
+      return !s3Client.listObjectsV2(request).getObjectSummaries().isEmpty();
     } catch (AmazonS3Exception e) {
       return false;
     }
@@ -344,6 +353,18 @@ public String buildPath(String path) {
     }
     return StorageUtils.S3_SCHEMA + "/" + path;
   }
+
+  public String buildPrefix(String path) {
+    String res = path;
+    if (path == null || "".equals(path)) return "";
+    if (path.startsWith("/")) {
+      res = path.replaceFirst("/", "");
+    }
+    if (!path.endsWith("/")) {
+      res = res + "/";
+    }
+    return res;
+  }
 }
 
 class S3OutputStream extends ByteArrayOutputStream {