Use ByteStreams::NullOS and check catalog tests

cdouglas · Dec 16, 2024 · 8536297 · 8536297
1 parent 0399001
commit 8536297
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 30 deletions.
diff --git a/azure/src/main/java/org/apache/iceberg/azure/adlsv2/ADLSOutputFile.java b/azure/src/main/java/org/apache/iceberg/azure/adlsv2/ADLSOutputFile.java
@@ -28,7 +28,6 @@
 import com.azure.storage.file.datalake.options.FileParallelUploadOptions;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.UncheckedIOException;
 import java.util.function.Supplier;
 import org.apache.iceberg.azure.AzureProperties;
@@ -98,19 +97,7 @@ public CAS prepare(Supplier<InputStream> source) {
     final byte[] buffer = new byte[8192];
     try (InputStream in = source.get();
         FileChecksumOutputStream chk =
-            new FileChecksumOutputStream(
-                new OutputStream() {
-                  @Override
-                  public void write(int b) {
-                    // TODO: no NullOutputStream?
-                  }
-
-                  @Override
-                  public void write(byte[] b, int off, int len) {
-                    // do nothing
-                  }
-                },
-                checksum)) {
+            new FileChecksumOutputStream(ByteStreams.nullOutputStream(), checksum)) {
       ByteStreams.copy(in, chk);
     } catch (IOException e) {
       throw new UncheckedIOException(e);

diff --git a/azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSCatalogTest.java b/azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSCatalogTest.java
@@ -64,7 +64,7 @@ public static void initStorage() {
     uniqTestRun = UUID.randomUUID().toString();
     LOG.info("TEST RUN: {}", uniqTestRun);
     AzureSAS creds =
-        AzureSAS.readCreds(new File("/IdeaProjects/.cloud/azure/lstnsgym-20250228.json"));
+        AzureSAS.readCreds(new File("/home/chris/work/.cloud/azure/lstnsgym-20250228.json"));
     if (creds != null) {
       azureProperties = Maps.newHashMap();
       azureProperties.put(

diff --git a/azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSFileIOCatalogTransactionTests.java b/azure/src/test/java/org/apache/iceberg/azure/adlsv2/ADLSFileIOCatalogTransactionTests.java
@@ -61,7 +61,7 @@ public static void initStorage() throws IOException {
     uniqTestRun = UUID.randomUUID().toString();
     LOG.info("TEST RUN: {}", uniqTestRun);
     AzureSAS creds =
-        AzureSAS.readCreds(new File("/IdeaProjects/.cloud/azure/lstnsgym-20250228.json"));
+        AzureSAS.readCreds(new File("/home/chris/work/.cloud/azure/lstnsgym-20250228.json"));
     if (creds != null) {
       azureProperties = Maps.newHashMap();
       azureProperties.put(

diff --git a/gcp/src/main/java/org/apache/iceberg/gcp/gcs/GCSOutputFile.java b/gcp/src/main/java/org/apache/iceberg/gcp/gcs/GCSOutputFile.java
@@ -22,7 +22,6 @@
 import com.google.cloud.storage.Storage;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.UncheckedIOException;
 import java.util.function.Supplier;
 import org.apache.iceberg.exceptions.AlreadyExistsException;
@@ -89,19 +88,7 @@ public CAS prepare(Supplier<InputStream> source) {
     final byte[] buffer = new byte[8192];
     try (InputStream in = source.get();
         FileChecksumOutputStream chk =
-            new FileChecksumOutputStream(
-                new OutputStream() {
-                  @Override
-                  public void write(int b) {
-                    // TODO: no NullOutputStream?
-                  }
-
-                  @Override
-                  public void write(byte[] b, int off, int len) {
-                    // do nothing
-                  }
-                },
-                checksum)) {
+            new FileChecksumOutputStream(ByteStreams.nullOutputStream(), checksum)) {
       ByteStreams.copy(in, chk);
     } catch (IOException e) {
       throw new UncheckedIOException(e);