From 875b8edbecbc875ad9714fd83e187b7ffa1c4e1f Mon Sep 17 00:00:00 2001 From: John Levey Date: Wed, 1 Jun 2022 10:16:21 +0200 Subject: [PATCH] Suppress warnings for MD5 and SHA1 hashing function usages --- .../io/trino/operator/scalar/VarbinaryFunctions.java | 9 +++++++-- .../raptor/legacy/storage/TestRaptorStorageManager.java | 6 ++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java b/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java index 2dd95830e743..4167e5bd57ba 100644 --- a/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java +++ b/core/trino-main/src/main/java/io/trino/operator/scalar/VarbinaryFunctions.java @@ -13,6 +13,7 @@ */ package io.trino.operator.scalar; +import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; import com.google.common.primitives.Ints; @@ -300,7 +301,9 @@ public static double fromIEEE754Binary64(@SqlType(StandardTypes.VARBINARY) Slice @SqlType(StandardTypes.VARBINARY) public static Slice md5(@SqlType(StandardTypes.VARBINARY) Slice slice) { - return computeHash(Hashing.md5(), slice); + @SuppressWarnings("deprecation") + HashFunction md5 = Hashing.md5(); + return computeHash(md5, slice); } @Description("Compute sha1 hash") @@ -308,7 +311,9 @@ public static Slice md5(@SqlType(StandardTypes.VARBINARY) Slice slice) @SqlType(StandardTypes.VARBINARY) public static Slice sha1(@SqlType(StandardTypes.VARBINARY) Slice slice) { - return computeHash(Hashing.sha1(), slice); + @SuppressWarnings("deprecation") + HashFunction sha1 = Hashing.sha1(); + return computeHash(sha1, slice); } @Description("Compute sha256 hash") diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestRaptorStorageManager.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestRaptorStorageManager.java index 0c38d010a569..60c69c030fe1 100644 --- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestRaptorStorageManager.java +++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/storage/TestRaptorStorageManager.java @@ -66,8 +66,6 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.google.common.hash.Hashing.md5; -import static com.google.common.io.Files.hash; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; import static io.airlift.concurrent.MoreFutures.getFutureValue; @@ -97,6 +95,7 @@ import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER; import static java.lang.String.format; import static java.nio.file.Files.createTempDirectory; +import static org.assertj.core.api.Assertions.assertThat; import static org.joda.time.DateTimeZone.UTC; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotEquals; @@ -626,9 +625,8 @@ public static RaptorStorageManager createRaptorStorageManager( } private static void assertFileEquals(File actual, File expected) - throws IOException { - assertEquals(hash(actual, md5()), hash(expected, md5())); + assertThat(actual).hasSameBinaryContentAs(expected); } private static void assertColumnStats(List list, long columnId, Object min, Object max)