Skip to content

Commit 4a43283

Browse files
hussein-awalaRussellSpitzer
authored andcommitted
Revert "Core: Update TableMetadataParser to ensure all streams closed (#11220)" (#11621)
This reverts commit 2b55fef.
1 parent 0b74d50 commit 4a43283

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

core/src/main/java/org/apache/iceberg/TableMetadataParser.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ public static void write(TableMetadata metadata, OutputFile outputFile) {
122122
public static void internalWrite(
123123
TableMetadata metadata, OutputFile outputFile, boolean overwrite) {
124124
boolean isGzip = Codec.fromFileName(outputFile.location()) == Codec.GZIP;
125-
try (OutputStream os = overwrite ? outputFile.createOrOverwrite() : outputFile.create();
126-
OutputStream gos = isGzip ? new GZIPOutputStream(os) : os;
127-
OutputStreamWriter writer = new OutputStreamWriter(gos, StandardCharsets.UTF_8)) {
125+
OutputStream stream = overwrite ? outputFile.createOrOverwrite() : outputFile.create();
126+
try (OutputStream ou = isGzip ? new GZIPOutputStream(stream) : stream;
127+
OutputStreamWriter writer = new OutputStreamWriter(ou, StandardCharsets.UTF_8)) {
128128
JsonGenerator generator = JsonUtil.factory().createGenerator(writer);
129129
generator.useDefaultPrettyPrinter();
130130
toJson(metadata, generator);
@@ -275,9 +275,9 @@ public static TableMetadata read(FileIO io, String path) {
275275

276276
public static TableMetadata read(FileIO io, InputFile file) {
277277
Codec codec = Codec.fromFileName(file.location());
278-
try (InputStream is = file.newStream();
279-
InputStream gis = codec == Codec.GZIP ? new GZIPInputStream(is) : is) {
280-
return fromJson(file, JsonUtil.mapper().readValue(gis, JsonNode.class));
278+
try (InputStream is =
279+
codec == Codec.GZIP ? new GZIPInputStream(file.newStream()) : file.newStream()) {
280+
return fromJson(file, JsonUtil.mapper().readValue(is, JsonNode.class));
281281
} catch (IOException e) {
282282
throw new RuntimeIOException(e, "Failed to read file: %s", file);
283283
}

0 commit comments

Comments
 (0)