Update TableMetadataParser.java

apache · Sep 27, 2024 · 4e94944 · 4e94944
1 parent 5739b3e
commit 4e94944
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/TableMetadataParser.java b/core/src/main/java/org/apache/iceberg/TableMetadataParser.java
@@ -124,13 +124,21 @@ public static void internalWrite(
     boolean isGzip = Codec.fromFileName(outputFile.location()) == Codec.GZIP;
     try (OutputStream os = overwrite ? outputFile.createOrOverwrite() : outputFile.create()) {
       if (isGzip) {
-        os = new GZIPOutputStream(os);
+        try (OutputStream gos = new GZIPOutputStream(os);
+             OutputStream osw = new OutputStreamWriter(gos, StandardCharsets.UTF_8)) {
+          JsonGenerator generator = JsonUtil.factory().createGenerator(os);
+          generator.useDefaultPrettyPrinter();
+          toJson(metadata, generator);
+          generator.flush();
+        }
+      } else {
+        try (OutputStream osw = new OutputStreamWriter(os, StandardCharsets.UTF_8)) {
+          JsonGenerator generator = JsonUtil.factory().createGenerator(os);
+          generator.useDefaultPrettyPrinter();
+          toJson(metadata, generator);
+          generator.flush();
+        }
       }
-      os = new OutputStreamWriter(os, StandardCharsets.UTF_8);
-      JsonGenerator generator = JsonUtil.factory().createGenerator(os);
-      generator.useDefaultPrettyPrinter();
-      toJson(metadata, generator);
-      generator.flush();
     } catch (IOException e) {
       throw new RuntimeIOException(e, "Failed to write json to file: %s", outputFile);
     }
@@ -279,7 +287,9 @@ public static TableMetadata read(FileIO io, InputFile file) {
     Codec codec = Codec.fromFileName(file.location());
     try (InputStream is = file.newStream()) {
       if (codec == Codec.GZIP) {
-        is = new GZIPInputStream(is);
+        try (InputStream gis = new GZIPInputStream(is)) {
+          return fromJson(file, JsonUtil.mapper().readValue(gis, JsonNode.class));
+        }
       }
       return fromJson(file, JsonUtil.mapper().readValue(is, JsonNode.class));
     } catch (IOException e) {