trinodb · ebyhr · Jul 16, 2025 · Jul 15, 2025
diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml
@@ -185,16 +185,6 @@
                     <skip>${trino.check.skip-revapi}</skip>
                     <ignoreSuggestionsFormat>xml</ignoreSuggestionsFormat>
                     <analysisConfiguration>
-                        <revapi.filter>
-                            <elements>
-                                <exclude>
-                                    <item>
-                                        <matcher>java</matcher>
-                                        <match>@io.trino.spi.Experimental(*) ^*;</match>
-                                    </item>
-                                </exclude>
-                            </elements>
-                        </revapi.filter>
                         <revapi.differences>
                             <ignore>true</ignore>
                             <differences>
@@ -664,6 +654,14 @@
                                     <old>method java.lang.String io.trino.spi.NodeManager::getEnvironment()</old>
                                     <justification>Unused</justification>
                                 </item>
+                                <item>
+                                    <code>java.class.removed</code>
+                                    <annotationType>@interface io.trino.spi.Experimental</annotationType>
+                                </item>
+                                <item>
+                                    <code>java.annotation.removed</code>
+                                    <annotationType>io.trino.spi.Experimental</annotationType>
+                                </item>
                             </differences>
                         </revapi.differences>
                     </analysisConfiguration>

diff --git a/core/trino-spi/src/main/java/io/trino/spi/Experimental.java b/core/trino-spi/src/main/java/io/trino/spi/Experimental.java
diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/IntArrayBlock.java
@@ -13,7 +13,6 @@
  */
 package io.trino.spi.block;
 
-import io.trino.spi.Experimental;
 import jakarta.annotation.Nullable;
 
 import java.util.Optional;
@@ -231,13 +230,11 @@ boolean[] getRawValueIsNull()
         return valueIsNull;
     }
 
-    @Experimental(eta = "2023-12-31")
     public int[] getRawValues()
     {
         return values;
     }
 
-    @Experimental(eta = "2023-12-31")
     public int getRawValuesOffset()
     {
         return arrayOffset;

diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/ValueBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/ValueBlock.java
@@ -13,8 +13,6 @@
  */
 package io.trino.spi.block;
 
-import io.trino.spi.Experimental;
-
 import java.util.Optional;
 
 public non-sealed interface ValueBlock
@@ -49,6 +47,5 @@ default int getUnderlyingValuePosition(int position)
      * Returns Optional.empty() when there are no NULLs in the Block.
      * The returned ByteArrayBlock must not contain NULL values.
      */
-    @Experimental(eta = "2025-01-01")
     Optional<ByteArrayBlock> getNulls();
 }
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/CatalogHandle.java b/core/trino-spi/src/main/java/io/trino/spi/connector/CatalogHandle.java
@@ -15,7 +15,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import io.trino.spi.Experimental;
 import io.trino.spi.catalog.CatalogName;
 
 import java.util.Objects;
@@ -28,7 +27,6 @@
 import static java.util.Locale.ROOT;
 import static java.util.Objects.requireNonNull;
 
-@Experimental(eta = "2023-02-01")
 public final class CatalogHandle
 {
     private static final int INSTANCE_SIZE = instanceSize(CatalogHandle.class);
@@ -169,7 +167,6 @@ public boolean isInternal()
         }
     }
 
-    @Experimental(eta = "2023-02-01")
     public static final class CatalogVersion
     {
         private static final int INSTANCE_SIZE = instanceSize(CatalogVersion.class);

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/Connector.java b/core/trino-spi/src/main/java/io/trino/spi/connector/Connector.java
@@ -13,7 +13,6 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Experimental;
 import io.trino.spi.function.FunctionProvider;
 import io.trino.spi.function.table.ConnectorTableFunction;
 import io.trino.spi.procedure.Procedure;
@@ -127,7 +126,6 @@ default Set<SystemTable> getSystemTables()
     /**
      * @return the set of procedures provided by this connector
      */
-    @Experimental(eta = "2022-10-31")
     default Optional<FunctionProvider> getFunctionProvider()
     {
         return Optional.empty();

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
@@ -14,7 +14,6 @@
 package io.trino.spi.connector;
 
 import io.airlift.slice.Slice;
-import io.trino.spi.Experimental;
 import io.trino.spi.RefreshType;
 import io.trino.spi.TrinoException;
 import io.trino.spi.expression.Call;
@@ -333,7 +332,6 @@ default Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession sessi
      * (e.g. for all relations that would be returned by {@link #listTables(ConnectorSession, Optional)}).
      * Redirected table names are included, but the comment for them is not.
      */
-    @Experimental(eta = "2024-01-01")
     default Iterator<RelationColumnsMetadata> streamRelationColumns(
             ConnectorSession session,
             Optional<String> schemaName,
@@ -372,7 +370,6 @@ default Iterator<RelationColumnsMetadata> streamRelationColumns(
      * (e.g. for all relations that would be returned by {@link #listTables(ConnectorSession, Optional)}).
      * Redirected table names are included, but the comment for them is not.
      */
-    @Experimental(eta = "2024-01-01")
     default Iterator<RelationCommentMetadata> streamRelationComments(ConnectorSession session, Optional<String> schemaName, UnaryOperator<Set<SchemaTableName>> relationFilter)
     {
         List<RelationCommentMetadata> materializedViews = getMaterializedViews(session, schemaName).entrySet().stream()
@@ -573,7 +570,7 @@ default void addColumn(ConnectorSession session, ConnectorTableHandle tableHandl
      *
      * @param parentPath path to a field within the column, without leaf field name.
      */
-    @Experimental(eta = "2023-06-01") // TODO add support for rows inside arrays and maps and for anonymous row fields
+    // TODO add support for rows inside arrays and maps and for anonymous row fields
     default void addField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support adding fields");
@@ -582,7 +579,6 @@ default void addField(ConnectorSession session, ConnectorTableHandle tableHandle
     /**
      * Set the specified column type
      */
-    @Experimental(eta = "2023-04-01")
     default void setColumnType(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, Type type)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting column types");
@@ -593,7 +589,6 @@ default void setColumnType(ConnectorSession session, ConnectorTableHandle tableH
      *
      * @param fieldPath path starting with column name. The path is always lower-cased. It cannot be an empty or a single element.
      */
-    @Experimental(eta = "2023-09-01")
     default void setFieldType(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, Type type)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting field types");
@@ -629,7 +624,7 @@ default void renameColumn(ConnectorSession session, ConnectorTableHandle tableHa
      * @param fieldPath path starting with column name.
      * @param target the new field name. The field position and nested level shouldn't be changed.
      */
-    @Experimental(eta = "2023-09-01") // TODO add support for rows inside arrays and maps and for anonymous row fields
+    // TODO add support for rows inside arrays and maps and for anonymous row fields
     default void renameField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> fieldPath, String target)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support renaming fields");
@@ -648,7 +643,7 @@ default void dropColumn(ConnectorSession session, ConnectorTableHandle tableHand
      *
      * @param fieldPath path to a field within the column, without leading column name.
      */
-    @Experimental(eta = "2023-05-01") // TODO add support for rows inside arrays and maps and for anonymous row fields
+    // TODO add support for rows inside arrays and maps and for anonymous row fields
     default void dropField(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnHandle column, List<String> fieldPath)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping fields");
@@ -667,7 +662,6 @@ default Optional<ConnectorTableLayout> getNewTableLayout(ConnectorSession sessio
      * If {@link Optional#empty()} is returned, the type will be used as is during table creation which may or may not be supported by the connector.
      * The effective type shall be a type that is cast-compatible with the input type.
      */
-    @Experimental(eta = "2024-01-31")
     default Optional<Type> getSupportedType(ConnectorSession session, Map<String, Object> tableProperties, Type type)
     {
         return Optional.empty();
@@ -975,7 +969,6 @@ default boolean isView(ConnectorSession session, SchemaTableName viewName)
     /**
      * Gets the view properties for the specified view.
      */
-    @Experimental(eta = "2024-06-01")
     default Map<String, Object> getViewProperties(ConnectorSession session, SchemaTableName viewName)
     {
         return Map.of();
@@ -1132,7 +1125,6 @@ default void dropLanguageFunction(ConnectorSession session, SchemaFunctionName n
     /**
      * Creates the specified branch.
      */
-    @Experimental(eta = "2025-12-31")
     default void createBranch(ConnectorSession session, ConnectorTableHandle tableHandle, String branch, Map<String, Object> properties)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating branches");
@@ -1141,7 +1133,6 @@ default void createBranch(ConnectorSession session, ConnectorTableHandle tableHa
     /**
      * Drops the specified branch.
      */
-    @Experimental(eta = "2025-12-31")
     default void dropBranch(ConnectorSession session, ConnectorTableHandle tableHandle, String branch)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support dropping branches");
@@ -1150,7 +1141,6 @@ default void dropBranch(ConnectorSession session, ConnectorTableHandle tableHand
     /**
      * Fast-forwards the specified branch.
      */
-    @Experimental(eta = "2025-12-31")
     default void fastForwardBranch(ConnectorSession session, ConnectorTableHandle tableHandle, String sourceBranch, String targetBranch)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support fast-forwarding branches");
@@ -1159,7 +1149,6 @@ default void fastForwardBranch(ConnectorSession session, ConnectorTableHandle ta
     /**
      * Get all branches.
      */
-    @Experimental(eta = "2025-12-31")
     default Collection<String> listBranches(ConnectorSession session, SchemaTableName tableName)
     {
         return List.of();
@@ -1168,7 +1157,6 @@ default Collection<String> listBranches(ConnectorSession session, SchemaTableNam
     /**
      * Does the specified branch exist.
      */
-    @Experimental(eta = "2025-12-31")
     default boolean branchExists(ConnectorSession session, SchemaTableName tableName, String branch)
     {
         return listBranches(session, tableName).contains(branch);

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitManager.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitManager.java
@@ -13,7 +13,6 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Experimental;
 import io.trino.spi.function.table.ConnectorTableFunctionHandle;
 
 public interface ConnectorSplitManager
@@ -28,7 +27,6 @@ default ConnectorSplitSource getSplits(
         throw new UnsupportedOperationException();
     }
 
-    @Experimental(eta = "2023-07-31")
     default ConnectorSplitSource getSplits(
             ConnectorTransactionHandle transaction,
             ConnectorSession session,

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableMetadata.java
@@ -13,8 +13,6 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Experimental;
-
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -48,7 +46,6 @@ public ConnectorTableMetadata(SchemaTableName table, List<ColumnMetadata> column
         this(table, columns, properties, comment, List.of());
     }
 
-    @Experimental(eta = "2023-03-31")
     public ConnectorTableMetadata(SchemaTableName table, List<ColumnMetadata> columns, Map<String, Object> properties, Optional<String> comment, List<String> checkConstraints)
     {
         requireNonNull(table, "table is null");
@@ -90,7 +87,6 @@ public Optional<String> getComment()
      *
      * @return List of string representation of a Trino SQL scalar expression that can refer to table columns by name and produces a result coercible to boolean
      */
-    @Experimental(eta = "2023-03-31")
     public List<String> getCheckConstraints()
     {
         return checkConstraints;

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableSchema.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableSchema.java
@@ -13,8 +13,6 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Experimental;
-
 import java.util.List;
 import java.util.StringJoiner;
 
@@ -31,7 +29,6 @@ public ConnectorTableSchema(SchemaTableName table, List<ColumnSchema> columns)
         this(table, columns, List.of());
     }
 
-    @Experimental(eta = "2023-03-31")
     public ConnectorTableSchema(SchemaTableName table, List<ColumnSchema> columns, List<String> checkConstraints)
     {
         requireNonNull(table, "table is null");
@@ -60,7 +57,6 @@ public List<ColumnSchema> getColumns()
      *
      * @return List of string representation of a Trino SQL scalar expression that can refer to table columns by name and produces a result coercible to boolean
      */
-    @Experimental(eta = "2023-03-31")
     public List<String> getCheckConstraints()
     {
         return checkConstraints;

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/RelationColumnsMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/RelationColumnsMetadata.java
@@ -13,16 +13,13 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Experimental;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
 import static io.trino.spi.connector.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
-@Experimental(eta = "2024-01-01")
 public record RelationColumnsMetadata(
         SchemaTableName name,
         Optional<List<ConnectorMaterializedViewDefinition.Column>> materializedViewColumns,

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/RelationCommentMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/RelationCommentMetadata.java
@@ -13,14 +13,11 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Experimental;
-
 import java.util.Optional;
 
 import static io.trino.spi.connector.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
-@Experimental(eta = "2024-01-01")
 public record RelationCommentMetadata(
         SchemaTableName name,
         boolean tableRedirected,

diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/Exchange.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/Exchange.java
@@ -14,13 +14,11 @@
 package io.trino.spi.exchange;
 
 import com.google.errorprone.annotations.ThreadSafe;
-import io.trino.spi.Experimental;
 
 import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
 
 @ThreadSafe
-@Experimental(eta = "2024-03-01")
 public interface Exchange
         extends Closeable
 {