From 14369760a2ed2c92e4889b2b2a4fb1e7de02f2bd Mon Sep 17 00:00:00 2001 From: Konrad Dziedzic Date: Tue, 15 Mar 2022 09:43:11 +0100 Subject: [PATCH 1/2] Static import in IcebergMetadata --- .../src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java index 070205c665f0..3f30e98876d6 100644 --- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java +++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java @@ -125,6 +125,7 @@ import static io.trino.plugin.hive.util.HiveUtil.isStructuralType; import static io.trino.plugin.iceberg.ColumnIdentity.primitiveColumnIdentity; import static io.trino.plugin.iceberg.ExpressionConverter.toIcebergExpression; +import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR; import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA; import static io.trino.plugin.iceberg.IcebergSessionProperties.isProjectionPushdownEnabled; import static io.trino.plugin.iceberg.IcebergSessionProperties.isStatisticsEnabled; @@ -629,7 +630,7 @@ private void cleanExtraOutputFiles(HdfsContext hdfsContext, String queryId, Stri } } catch (IOException e) { - throw new TrinoException(IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR, + throw new TrinoException(ICEBERG_FILESYSTEM_ERROR, format("Could not clean up extraneous output files; remaining files: %s", filesToDelete), e); } } From 0ea885ecb136a50c62fdcf82dfa6ca76fff2c25c Mon Sep 17 00:00:00 2001 From: Konrad Dziedzic Date: Tue, 15 Mar 2022 10:13:31 +0100 Subject: [PATCH 2/2] Add toString to IcebergOptimizeHandle --- .../iceberg/procedure/IcebergOptimizeHandle.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java index 10c75744128d..5aec626a006b 100644 --- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java +++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; +import static com.google.common.base.MoreObjects.toStringHelper; import static java.util.Objects.requireNonNull; public class IcebergOptimizeHandle @@ -97,4 +98,18 @@ public boolean isRetriesEnabled() { return retriesEnabled; } + + @Override + public String toString() + { + return toStringHelper(this) + .add("schemaAsJson", schemaAsJson) + .add("partitionSpecAsJson", partitionSpecAsJson) + .add("tableColumns", tableColumns) + .add("fileFormat", fileFormat) + .add("tableStorageProperties", tableStorageProperties) + .add("maxScannedFileSize", maxScannedFileSize) + .add("retriesEnabled", retriesEnabled) + .toString(); + } }