Migrate @NotThreadSafe to Trino provided annotation

trinodb · Jul 6, 2023 · bd23db3 · bd23db3
1 parent 4350dec
commit bd23db3
Show file tree

Hide file tree

Showing 41 changed files with 78 additions and 66 deletions.
diff --git a/client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java b/client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java
@@ -13,8 +13,6 @@
  */
 package io.trino.client.auth.external;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Optional;
 import java.util.function.Supplier;
 
@@ -24,7 +22,7 @@
  * LocalKnownToken class keeps the token on its field
  * and it's designed to use it in fully serialized manner.
  */
-@NotThreadSafe
+// This class is not considered thread-safe.
 class LocalKnownToken
         implements KnownToken
 {

diff --git a/core/trino-main/src/main/java/io/trino/connector/CatalogStore.java b/core/trino-main/src/main/java/io/trino/connector/CatalogStore.java
@@ -13,7 +13,7 @@
  */
 package io.trino.connector;
 
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.annotation.NotThreadSafe;
 
 import java.util.Collection;
 import java.util.Map;

diff --git a/core/trino-main/src/main/java/io/trino/execution/SplitConcurrencyController.java b/core/trino-main/src/main/java/io/trino/execution/SplitConcurrencyController.java
@@ -14,8 +14,7 @@
 package io.trino.execution;
 
 import io.airlift.units.Duration;
-
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.annotation.NotThreadSafe;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;

diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java b/core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java
@@ -24,6 +24,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.event.SplitMonitor;
 import io.trino.execution.StateMachine.StateChangeListener;
 import io.trino.execution.buffer.BufferState;
@@ -44,7 +45,6 @@
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

diff --git a/...in/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java b/...in/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Split;
 import io.trino.spi.Node;
@@ -23,8 +24,6 @@
 import io.trino.sql.planner.NodePartitioningManager;
 import io.trino.sql.planner.PartitioningHandle;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

diff --git a/...rino-main/src/main/java/io/trino/execution/scheduler/MultiSourcePartitionedScheduler.java b/...rino-main/src/main/java/io/trino/execution/scheduler/MultiSourcePartitionedScheduler.java
@@ -18,15 +18,14 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.log.Logger;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.execution.RemoteTask;
 import io.trino.execution.TableExecuteContextManager;
 import io.trino.metadata.InternalNode;
 import io.trino.server.DynamicFilterService;
 import io.trino.split.SplitSource;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.ArrayDeque;
 import java.util.HashMap;
 import java.util.List;

diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java
@@ -17,11 +17,10 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.primitives.ImmutableIntArray;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.metadata.Split;
 import io.trino.sql.planner.plan.PlanNodeId;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;

diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java
@@ -19,6 +19,7 @@
 import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.airlift.units.DataSize;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.execution.QueryManagerConfig;
 import io.trino.execution.StageId;
 import io.trino.metadata.Split;
@@ -28,7 +29,6 @@
 import org.weakref.jmx.Managed;
 
 import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
 
 import java.util.Collection;
 import java.util.Comparator;

diff --git a/core/trino-main/src/main/java/io/trino/operator/DeduplicatingDirectExchangeBuffer.java b/core/trino-main/src/main/java/io/trino/operator/DeduplicatingDirectExchangeBuffer.java
@@ -29,6 +29,7 @@
 import io.airlift.slice.Slices;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.exchange.ExchangeManagerRegistry;
 import io.trino.execution.StageId;
 import io.trino.execution.TaskId;
@@ -45,7 +46,6 @@
 import io.trino.spi.exchange.ExchangeSourceOutputSelector;
 
 import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
 import javax.annotation.concurrent.ThreadSafe;
 
 import java.io.Closeable;

diff --git a/core/trino-main/src/main/java/io/trino/operator/OperationTimer.java b/core/trino-main/src/main/java/io/trino/operator/OperationTimer.java
@@ -13,7 +13,8 @@
  */
 package io.trino.operator;
 
-import javax.annotation.concurrent.NotThreadSafe;
+import io.trino.annotation.NotThreadSafe;
+
 import javax.annotation.concurrent.ThreadSafe;
 
 import java.lang.management.ManagementFactory;

diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/PartitioningExchanger.java b/core/trino-main/src/main/java/io/trino/operator/exchange/PartitioningExchanger.java
@@ -15,12 +15,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.PartitionFunction;
 import io.trino.spi.Page;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;

diff --git a/core/trino-main/src/main/java/io/trino/operator/index/IndexLoader.java b/core/trino-main/src/main/java/io/trino/operator/index/IndexLoader.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.units.DataSize;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.execution.ScheduledSplit;
 import io.trino.execution.SplitAssignment;
 import io.trino.metadata.Split;
@@ -37,7 +38,6 @@
 import io.trino.type.BlockTypeOperators.BlockPositionEqual;
 
 import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
 import javax.annotation.concurrent.ThreadSafe;
 
 import java.util.ArrayList;

diff --git a/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/index/IndexLookupSource.java
@@ -13,12 +13,11 @@
  */
 package io.trino.operator.index;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.join.LookupSource;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.operator.index.IndexSnapshot.UNLOADED_INDEX_KEY;
 import static java.util.Objects.requireNonNull;

diff --git a/core/trino-main/src/main/java/io/trino/operator/index/StreamingIndexedData.java b/core/trino-main/src/main/java/io/trino/operator/index/StreamingIndexedData.java
@@ -14,6 +14,7 @@
 package io.trino.operator.index;
 
 import com.google.common.collect.ImmutableList;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.Driver;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
@@ -22,8 +23,6 @@
 import io.trino.spi.type.Type;
 import io.trino.type.BlockTypeOperators.BlockPositionEqual;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;

diff --git a/core/trino-main/src/main/java/io/trino/operator/join/JoinFilterFunction.java b/core/trino-main/src/main/java/io/trino/operator/join/JoinFilterFunction.java
@@ -13,10 +13,9 @@
  */
 package io.trino.operator.join;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.spi.Page;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 @NotThreadSafe
 public interface JoinFilterFunction
 {

diff --git a/core/trino-main/src/main/java/io/trino/operator/join/LookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/LookupSource.java
@@ -13,11 +13,10 @@
  */
 package io.trino.operator.join;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.io.Closeable;
 
 @NotThreadSafe

diff --git a/core/trino-main/src/main/java/io/trino/operator/join/OuterLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/OuterLookupSource.java
@@ -13,11 +13,11 @@
  */
 package io.trino.operator.join;
 
+import io.trino.annotation.NotThreadSafe;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 
 import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
 import javax.annotation.concurrent.ThreadSafe;
 
 import java.util.function.Supplier;

diff --git a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSource.java
@@ -14,6 +14,7 @@
 package io.trino.operator.join;
 
 import com.google.common.io.Closer;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.InterpretedHashGenerator;
 import io.trino.operator.exchange.LocalPartitionGenerator;
 import io.trino.spi.Page;
@@ -23,7 +24,6 @@
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

diff --git a/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSourceFactory.java b/core/trino-main/src/main/java/io/trino/operator/join/PartitionedLookupSourceFactory.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.join.LookupSourceProvider.LookupSourceLease;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
@@ -25,7 +26,6 @@
 
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.NotThreadSafe;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSource.java b/core/trino-main/src/main/java/io/trino/operator/join/unspilled/PartitionedLookupSource.java
@@ -14,6 +14,7 @@
 package io.trino.operator.join.unspilled;
 
 import com.google.common.io.Closer;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.operator.InterpretedHashGenerator;
 import io.trino.operator.exchange.LocalPartitionGenerator;
 import io.trino.operator.join.LookupSource;
@@ -26,7 +27,6 @@
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

diff --git a/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java b/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java
@@ -14,6 +14,7 @@
 package io.trino.operator.project;
 
 import com.google.common.annotations.VisibleForTesting;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.array.ReferenceCountMap;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.DriverYieldSignal;
@@ -27,8 +28,6 @@
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.sql.gen.ExpressionProfiler;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;

diff --git a/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpiller.java b/core/trino-main/src/main/java/io/trino/spiller/FileSingleStreamSpiller.java
@@ -23,6 +23,7 @@
 import io.airlift.slice.OutputStreamSliceOutput;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceOutput;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.execution.buffer.PageDeserializer;
 import io.trino.execution.buffer.PageSerializer;
 import io.trino.execution.buffer.PagesSerdeFactory;
@@ -32,7 +33,6 @@
 import io.trino.spi.Page;
 import io.trino.spi.TrinoException;
 
-import javax.annotation.concurrent.NotThreadSafe;
 import javax.crypto.SecretKey;
 
 import java.io.Closeable;

diff --git a/core/trino-main/src/main/java/io/trino/spiller/GenericSpiller.java b/core/trino-main/src/main/java/io/trino/spiller/GenericSpiller.java
@@ -15,13 +15,12 @@
 
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.memory.context.AggregatedMemoryContext;
 import io.trino.operator.SpillContext;
 import io.trino.spi.Page;
 import io.trino.spi.type.Type;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;

diff --git a/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java b/core/trino-main/src/test/java/io/trino/split/MockSplitSource.java
@@ -17,13 +17,12 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import io.trino.annotation.NotThreadSafe;
 import io.trino.metadata.Split;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSplit;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml
@@ -455,6 +455,14 @@
                                     <old>method java.lang.invoke.MethodHandle io.trino.spi.function.ScalarFunctionAdapter::adapt(java.lang.invoke.MethodHandle, java.util.List&lt;io.trino.spi.type.Type&gt;, io.trino.spi.function.InvocationConvention, io.trino.spi.function.InvocationConvention)</old>
                                     <new>method java.lang.invoke.MethodHandle io.trino.spi.function.ScalarFunctionAdapter::adapt(java.lang.invoke.MethodHandle, io.trino.spi.type.Type, java.util.List&lt;io.trino.spi.type.Type&gt;, io.trino.spi.function.InvocationConvention, io.trino.spi.function.InvocationConvention)</new>
                                 </item>
+                                <item>
+                                    <ignore>true</ignore>
+                                    <code>java.annotation.removed</code>
+                                    <old>class io.trino.spi.block.LazyBlock</old>
+                                    <new>class io.trino.spi.block.LazyBlock</new>
+                                    <annotation>@javax.annotation.concurrent.NotThreadSafe</annotation>
+                                    <justification>Removal of javax.annotation.concurrent usage</justification>
+                                </item>
                             </differences>
                         </revapi.differences>
                     </analysisConfiguration>

diff --git a/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlock.java b/core/trino-spi/src/main/java/io/trino/spi/block/LazyBlock.java
@@ -17,7 +17,6 @@
 import io.airlift.slice.SliceOutput;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +31,7 @@
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 
-@NotThreadSafe
+// This class is not considered thread-safe.
 public class LazyBlock
         implements Block
 {