Extract ICEBERG_LONG_TYPE constant

trinodb · Jul 17, 2023 · f87aafe · f87aafe
1 parent 8af0d22
commit f87aafe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/reader/ColumnReaders.java b/lib/trino-orc/src/main/java/io/trino/orc/reader/ColumnReaders.java
@@ -33,6 +33,7 @@
 public final class ColumnReaders
 {
     public static final String ICEBERG_BINARY_TYPE = "iceberg.binary-type";
+    public static final String ICEBERG_LONG_TYPE = "iceberg.long-type";
 
     private ColumnReaders() {}
 
@@ -47,7 +48,7 @@ public static ColumnReader createColumnReader(
     {
         if (type instanceof TimeType) {
             if (!type.equals(TIME_MICROS) || column.getColumnType() != LONG ||
-                    !"TIME".equals(column.getAttributes().get("iceberg.long-type"))) {
+                    !"TIME".equals(column.getAttributes().get(ICEBERG_LONG_TYPE))) {
                 throw invalidStreamType(column, type);
             }
             return new TimeColumnReader(type, column, memoryContext.newLocalMemoryContext(ColumnReaders.class.getSimpleName()));

diff --git a/lib/trino-orc/src/main/java/io/trino/orc/writer/ColumnWriters.java b/lib/trino-orc/src/main/java/io/trino/orc/writer/ColumnWriters.java
@@ -33,6 +33,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.trino.orc.metadata.OrcType.OrcTypeKind.LONG;
+import static io.trino.orc.reader.ColumnReaders.ICEBERG_LONG_TYPE;
 import static java.lang.Math.toIntExact;
 import static java.util.Objects.requireNonNull;
 
@@ -55,7 +56,7 @@ public static ColumnWriter createColumnWriter(
         if (type instanceof TimeType timeType) {
             checkArgument(timeType.getPrecision() == 6, "%s not supported for ORC writer", type);
             checkArgument(orcType.getOrcTypeKind() == LONG, "wrong ORC type %s for type %s", orcType, type);
-            checkArgument("TIME".equals(orcType.getAttributes().get("iceberg.long-type")), "wrong attributes %s for type %s", orcType.getAttributes(), type);
+            checkArgument("TIME".equals(orcType.getAttributes().get(ICEBERG_LONG_TYPE)), "wrong attributes %s for type %s", orcType.getAttributes(), type);
             return new TimeColumnWriter(columnId, type, compression, bufferSize, () -> new IntegerStatisticsBuilder(bloomFilterBuilder.get()));
         }
         switch (orcType.getOrcTypeKind()) {