Remove redundant analyzeColumns from IcebergTableHandle

core/trino-main/src/main/java/io/trino/json/ir/IrLiteral.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 
@@ -35,8 +36,8 @@ public record IrLiteral(Optional<Type> type, Object value)
         requireNonNull(value, "value is null"); // (boxed) native representation. No null values allowed.
     }
 
-    @Deprecated // For JSON deserialization only
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static IrLiteral fromJson(@JsonProperty("type") Type type, @JsonProperty("valueAsBlock") Block value)
     {
         checkArgument(value.getPositionCount() == 1);

core/trino-main/src/main/java/io/trino/sql/planner/Partitioning.java

@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.DoNotCall;
 import com.google.errorprone.annotations.Immutable;
 import io.trino.Session;
 import io.trino.metadata.Metadata;
@@ -59,8 +60,8 @@ public static Partitioning create(PartitioningHandle handle, List<Symbol> column
                 .collect(toImmutableList()));
     }
 
-    // Factory method for JSON serde only!
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static Partitioning jsonCreate(
             @JsonProperty("handle") PartitioningHandle handle,
             @JsonProperty("arguments") List<ArgumentBinding> arguments)

core/trino-main/src/main/java/io/trino/sql/planner/plan/StatisticAggregationsDescriptor.java

@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.statistics.ColumnStatisticMetadata;
 import io.trino.spi.statistics.TableStatisticType;
 
@@ -52,7 +53,7 @@ public StatisticAggregationsDescriptor(
     }
 
     @JsonCreator
-    @Deprecated // for JSON serialization only
+    @DoNotCall // for JSON serialization only
     public static <T> StatisticAggregationsDescriptor<T> fromJson(
             @JsonProperty("grouping") Map<String, T> grouping,
             @JsonProperty("tableStatistics") Map<TableStatisticType, T> tableStatistics,
@@ -84,8 +85,8 @@ public Map<ColumnStatisticMetadata, T> getColumnStatistics()
     }
 
     @JsonProperty
-    @Deprecated // for JSON serialization only
-    public List<ColumnStatisticAggregationsDescriptor<T>> getColumnStatisticsList()
+    @DoNotCall // for JSON serialization only
+    public final List<ColumnStatisticAggregationsDescriptor<T>> getColumnStatisticsList()
     {
         return columnStatistics.entrySet().stream()
                 .map(entry -> new ColumnStatisticAggregationsDescriptor<T>(entry.getKey(), entry.getValue()))

core/trino-main/src/main/java/io/trino/sql/planner/plan/TableScanNode.java

@@ -79,7 +79,7 @@ public static TableScanNode newInstance(
      * This constructor is for JSON deserialization only. Do not use.
      * It's marked as @Deprecated to help avoid usage, and not because we plan to remove it.
      */
-    @Deprecated
+    /* TODO @DoNotCall once it's applicable to constructors */
     @JsonCreator
     public TableScanNode(
             @JsonProperty("id") PlanNodeId id,

core/trino-main/src/main/java/io/trino/sql/relational/ConstantExpression.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.airlift.slice.Slice;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
@@ -33,6 +34,7 @@ public final class ConstantExpression
         extends RowExpression
 {
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static ConstantExpression fromJson(
             @JsonProperty Block value,
             @JsonProperty Type type)

core/trino-spi/src/main/java/io/trino/spi/SplitWeight.java

@@ -82,6 +82,7 @@ public String toString()
      * to avoid breakages that could arise if {@link SplitWeight#UNIT_VALUE} changes in the future.
      */
     @JsonCreator
+    // TODO Mark with @DoNotCall
     public static SplitWeight fromRawValue(long value)
     {
         return value == UNIT_VALUE ? STANDARD_WEIGHT : new SplitWeight(value);

core/trino-spi/src/main/java/io/trino/spi/function/FunctionDependencyDeclaration.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.Experimental;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
@@ -80,6 +81,7 @@ public Set<CastDependency> getCastDependencies()
     }
 
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static FunctionDependencyDeclaration fromJson(
             @JsonProperty Set<TypeSignature> typeDependencies,
             @JsonProperty Set<FunctionDependency> functionDependencies,

core/trino-spi/src/main/java/io/trino/spi/function/FunctionMetadata.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.Experimental;
 
 import java.util.ArrayList;
@@ -149,6 +150,7 @@ public boolean isDeprecated()
     }
 
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static FunctionMetadata fromJson(
             @JsonProperty FunctionId functionId,
             @JsonProperty Signature signature,

core/trino-spi/src/main/java/io/trino/spi/function/LongVariableConstraint.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.Experimental;
 
 import java.util.Objects;
@@ -71,13 +72,9 @@ public int hashCode()
         return Objects.hash(name, expression);
     }
 
-    /**
-     * This method is only visible for JSON deserialization.
-     *
-     * @deprecated use builder
-     */
-    @Deprecated
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
+    @Deprecated // Discourage usages in SPI consumers
     public static LongVariableConstraint fromJson(
             @JsonProperty("name") String name,
             @JsonProperty("expression") String expression)

core/trino-spi/src/main/java/io/trino/spi/function/Signature.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.Experimental;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
@@ -239,13 +240,9 @@ public Signature build()
         }
     }
 
-    /**
-     * This method is only visible for JSON deserialization.
-     *
-     * @deprecated use builder
-     */
-    @Deprecated
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
+    @Deprecated // Discourage usages in SPI consumers
     public static Signature fromJson(
             @JsonProperty("typeVariableConstraints") List<TypeVariableConstraint> typeVariableConstraints,
             @JsonProperty("longVariableConstraints") List<LongVariableConstraint> longVariableConstraints,

core/trino-spi/src/main/java/io/trino/spi/function/TypeVariableConstraint.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.Experimental;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeSignature;
@@ -208,13 +209,9 @@ public TypeVariableConstraint build()
         }
     }
 
-    /**
-     * This method is only visible for JSON deserialization.
-     *
-     * @deprecated use builder
-     */
-    @Deprecated
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
+    @Deprecated // Discourage usages in SPI consumers
     public static TypeVariableConstraint fromJson(
             @JsonProperty("name") String name,
             @JsonProperty("comparableRequired") boolean comparableRequired,

core/trino-spi/src/main/java/io/trino/spi/function/table/ScalarArgument.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.Experimental;
 import io.trino.spi.expression.ConnectorExpression;
 import io.trino.spi.predicate.NullableValue;
@@ -60,6 +61,7 @@ public Object getValue()
 
     // deserialization
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static ScalarArgument fromNullableValue(@JsonProperty("nullableValue") NullableValue nullableValue)
     {
         return new ScalarArgument(nullableValue.getType(), nullableValue.getValue());

core/trino-spi/src/main/java/io/trino/spi/predicate/NullableValue.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 
@@ -73,8 +74,8 @@ public static NullableValue asNull(Type type)
         return new NullableValue(type, null);
     }
 
-    // Jackson deserialization only
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static NullableValue fromSerializable(@JsonProperty("serializable") Serializable serializable)
     {
         Type type = serializable.getType();

core/trino-spi/src/main/java/io/trino/spi/predicate/SortedRangeSet.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.block.DictionaryBlock;
@@ -136,8 +137,9 @@ static SortedRangeSet all(Type type)
                         .build());
     }
 
-    @Deprecated // For JSON deserialization only
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
+    @Deprecated // Discourage usages in SPI consumers
     public static SortedRangeSet fromJson(
             @JsonProperty("type") Type type,
             @JsonProperty("inclusive") boolean[] inclusive,

core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.type.Type;
 
@@ -167,12 +168,9 @@ public static <T> TupleDomain<T> fromFixedValues(Map<T, NullableValue> fixedValu
                         })));
     }
 
-    /*
-     * This method is for JSON serialization only. Do not use.
-     * It's marked as @Deprecated to help avoid usage, and not because we plan to remove it.
-     */
-    @Deprecated
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
+    @Deprecated // Discourage usages in SPI consumers
     public static <T> TupleDomain<T> fromColumnDomains(@JsonProperty("columnDomains") Optional<List<ColumnDomain<T>>> columnDomains)
     {
         if (columnDomains.isEmpty()) {
@@ -182,12 +180,9 @@ public static <T> TupleDomain<T> fromColumnDomains(@JsonProperty("columnDomains"
                 .collect(toLinkedMap(ColumnDomain::getColumn, ColumnDomain::getDomain)));
     }
 
-    /*
-     * This method is for JSON serialization only. Do not use.
-     * It's marked as @Deprecated to help avoid usage, and not because we plan to remove it.
-     */
-    @Deprecated
     @JsonProperty
+    @DoNotCall // For JSON serialization only
+    @Deprecated // Discourage usages in SPI consumers
     public Optional<List<ColumnDomain<T>>> getColumnDomains()
     {
         return domains.map(map -> map.entrySet().stream()

core/trino-spi/src/main/java/io/trino/spi/statistics/ColumnStatisticMetadata.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.Experimental;
 import io.trino.spi.expression.FunctionName;
 
@@ -71,8 +72,8 @@ private ColumnStatisticMetadata(
         }
     }
 
-    @Deprecated // For JSON deserialization only
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static ColumnStatisticMetadata fromJson(
             @JsonProperty("columnName") String columnName,
             @JsonProperty("connectorAggregationId") String connectorAggregationId,

plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloSplitManager.java

@@ -33,9 +33,9 @@
 import io.trino.spi.connector.FixedSplitSource;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.TupleDomain;
-import io.trino.spi.predicate.TupleDomain.ColumnDomain;
 
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -89,11 +89,11 @@ public ConnectorSplitSource getSplits(
 
     private static Optional<Domain> getRangeDomain(String rowIdName, TupleDomain<ColumnHandle> constraint)
     {
-        if (constraint.getColumnDomains().isPresent()) {
-            for (ColumnDomain<ColumnHandle> cd : constraint.getColumnDomains().get()) {
-                AccumuloColumnHandle col = (AccumuloColumnHandle) cd.getColumn();
+        if (constraint.getDomains().isPresent()) {
+            for (Entry<ColumnHandle, Domain> columnDomain : constraint.getDomains().get().entrySet()) {
+                AccumuloColumnHandle col = (AccumuloColumnHandle) columnDomain.getKey();
                 if (col.getName().equals(rowIdName)) {
-                    return Optional.of(cd.getDomain());
+                    return Optional.of(columnDomain.getValue());
                 }
             }
         }
@@ -111,19 +111,19 @@ private static Optional<Domain> getRangeDomain(String rowIdName, TupleDomain<Col
     private static List<AccumuloColumnConstraint> getColumnConstraints(String rowIdName, TupleDomain<ColumnHandle> constraint)
     {
         ImmutableList.Builder<AccumuloColumnConstraint> constraintBuilder = ImmutableList.builder();
-        for (ColumnDomain<ColumnHandle> columnDomain : constraint.getColumnDomains().get()) {
-            AccumuloColumnHandle columnHandle = (AccumuloColumnHandle) columnDomain.getColumn();
+        constraint.getDomains().orElseThrow().forEach((handle, domain) -> {
+            AccumuloColumnHandle columnHandle = (AccumuloColumnHandle) handle;
 
             if (!columnHandle.getName().equals(rowIdName)) {
                 // Family and qualifier will exist for non-row ID columns
                 constraintBuilder.add(new AccumuloColumnConstraint(
                         columnHandle.getName(),
                         columnHandle.getFamily().get(),
                         columnHandle.getQualifier().get(),
-                        Optional.of(columnDomain.getDomain()),
+                        Optional.of(domain),
                         columnHandle.isIndexed()));
             }
-        }
+        });
 
         return constraintBuilder.build();
     }

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/QueryParameter.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.trino.spi.block.Block;
 import io.trino.spi.type.Type;
 
@@ -51,6 +52,7 @@ private QueryParameter(Optional<JdbcTypeHandle> jdbcType, Type type, Optional<Ob
     }
 
     @JsonCreator
+    @DoNotCall // For JSON deserialization only
     public static QueryParameter fromValueAsBlock(Optional<JdbcTypeHandle> jdbcType, Type type, Block valueBlock)
     {
         requireNonNull(type, "type is null");

plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/statistics/DeltaLakeColumnStatistics.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.DoNotCall;
 import io.airlift.slice.Slices;
 import io.airlift.stats.cardinality.HyperLogLog;
 
@@ -29,7 +30,8 @@ public class DeltaLakeColumnStatistics
     private final HyperLogLog ndvSummary;
 
     @JsonCreator
-    public static DeltaLakeColumnStatistics create(
+    @DoNotCall // For JSON deserialization only
+    public static DeltaLakeColumnStatistics fromJson(
             @JsonProperty("totalSizeInBytes") OptionalLong totalSizeInBytes,
             @JsonProperty("ndvSummary") String ndvSummaryBase64)
     {