fixed formations

Author: ruslansenchukov

ice/src/main/java/com/altinity/ice/cli/internal/cmd/Insert.java

@@ -10,6 +10,7 @@
 package com.altinity.ice.cli.internal.cmd;
 
 import com.altinity.ice.cli.Main;
+import com.altinity.ice.cli.internal.http.MinioWildcard;
 import com.altinity.ice.cli.internal.iceberg.Partitioning;
 import com.altinity.ice.cli.internal.iceberg.RecordComparator;
 import com.altinity.ice.cli.internal.iceberg.SchemaEvolution;
@@ -85,8 +86,6 @@
 import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
 import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 import software.amazon.awssdk.utils.Lazy;
-import com.altinity.ice.cli.internal.http.MinioWildcard;
-
 
 public final class Insert {
 
@@ -108,33 +107,34 @@ public static void run(
     // Create transaction and pass it to updatePartitionAndSortOrderMetadata
     Transaction txn = table.newTransaction();
 
-try (FileIO tableIO = table.io()) {
-    Lazy<S3Client> s3ClientLazy = newS3Client(options, tableIO, table);
-    try {
+    try (FileIO tableIO = table.io()) {
+      Lazy<S3Client> s3ClientLazy = newS3Client(options, tableIO, table);
+      try {
         var filesExpanded =
             Arrays.stream(files)
                 .flatMap(
                     s -> {
-                        if (s.startsWith("s3://") && s.contains("*")) {
-                            var b = S3.bucketPath(s);
-                            return S3
-                                .listWildcard(s3ClientLazy.getValue(), b.bucket(), b.path(), -1)
-                                .stream();
-                        }
-
-                        // HTTP(S) wildcard for Minio & etc.
-                        if ((s.startsWith("http://") || s.startsWith("https://")) && s.contains("*")) {
-                            try {
-                                return MinioWildcard.listHTTPWildcard(s).stream();
-                            } catch (Exception e) {
-                                throw new RuntimeException("Failed to expand HTTP wildcard for " + s, e);
-                            }
+                      if (s.startsWith("s3://") && s.contains("*")) {
+                        var b = S3.bucketPath(s);
+                        return S3
+                            .listWildcard(s3ClientLazy.getValue(), b.bucket(), b.path(), -1)
+                            .stream();
+                      }
+
+                      // HTTP(S) wildcard for Minio & etc.
+                      if ((s.startsWith("http://") || s.startsWith("https://"))
+                          && s.contains("*")) {
+                        try {
+                          return MinioWildcard.listHTTPWildcard(s).stream();
+                        } catch (Exception e) {
+                          throw new RuntimeException("Failed to expand HTTP wildcard for " + s, e);
                         }
+                      }
 
-                        return Stream.of(s);
+                      return Stream.of(s);
                     })
                 .toList();
-                
+
         if (filesExpanded.isEmpty()) {
           throw new BadRequestException("No matching files found");
         }

ice/src/main/java/com/altinity/ice/cli/internal/http/MinioWildcard.java

@@ -8,7 +8,6 @@
  *     http://www.apache.org/licenses/LICENSE-2.0
  */
 
-
 package com.altinity.ice.cli.internal.http;
 
 import java.net.URI;
@@ -17,39 +16,36 @@
 import org.json.*;
 
 public final class MinioWildcard {
-    private static final HttpClient client = HttpClient.newHttpClient();
-
-    public static List<String> listHTTPWildcard(String urlWithStar) throws Exception {
-        URI uri = URI.create(urlWithStar);
-        String[] parts = uri.getPath().split("/", 3);
-        if (parts.length < 2)
-            throw new IllegalArgumentException("Bad MinIO URL: " + urlWithStar);
-
-        String bucket = parts[1];
-        String prefix = parts.length == 3 ? parts[2].replaceAll("\\*", "") : "";
-        String endpoint = uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort();
-
-        String listUrl = endpoint + "/" + bucket + "?list-type=2&prefix=" + prefix;
-        HttpRequest req = HttpRequest.newBuilder(URI.create(listUrl)).GET().build();
-        HttpResponse<String> resp = client.send(req, HttpResponse.BodyHandlers.ofString());
-        if (resp.statusCode() != 200)
-            throw new RuntimeException("MinIO listObjects error: " + resp.statusCode());
-
-        JSONObject xml = org.json.XML.toJSONObject(resp.body());
-        List<String> files = new ArrayList<>();
-        var result = xml.getJSONObject("ListBucketResult");
-        var contents = result.optJSONArray("Contents");
-        if (contents != null) {
-            for (int i = 0; i < contents.length(); i++) {
-                String key = contents.getJSONObject(i).getString("Key");
-                if (key.endsWith(".parquet"))
-                    files.add(endpoint + "/" + bucket + "/" + key);
-            }
-        } else {
-            var single = result.optJSONObject("Contents");
-            if (single != null)
-                files.add(endpoint + "/" + bucket + "/" + single.getString("Key"));
-        }
-        return files;
+  private static final HttpClient client = HttpClient.newHttpClient();
+
+  public static List<String> listHTTPWildcard(String urlWithStar) throws Exception {
+    URI uri = URI.create(urlWithStar);
+    String[] parts = uri.getPath().split("/", 3);
+    if (parts.length < 2) throw new IllegalArgumentException("Bad MinIO URL: " + urlWithStar);
+
+    String bucket = parts[1];
+    String prefix = parts.length == 3 ? parts[2].replaceAll("\\*", "") : "";
+    String endpoint = uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort();
+
+    String listUrl = endpoint + "/" + bucket + "?list-type=2&prefix=" + prefix;
+    HttpRequest req = HttpRequest.newBuilder(URI.create(listUrl)).GET().build();
+    HttpResponse<String> resp = client.send(req, HttpResponse.BodyHandlers.ofString());
+    if (resp.statusCode() != 200)
+      throw new RuntimeException("MinIO listObjects error: " + resp.statusCode());
+
+    JSONObject xml = org.json.XML.toJSONObject(resp.body());
+    List<String> files = new ArrayList<>();
+    var result = xml.getJSONObject("ListBucketResult");
+    var contents = result.optJSONArray("Contents");
+    if (contents != null) {
+      for (int i = 0; i < contents.length(); i++) {
+        String key = contents.getJSONObject(i).getString("Key");
+        if (key.endsWith(".parquet")) files.add(endpoint + "/" + bucket + "/" + key);
+      }
+    } else {
+      var single = result.optJSONObject("Contents");
+      if (single != null) files.add(endpoint + "/" + bucket + "/" + single.getString("Key"));
     }
+    return files;
+  }
 }