Move Mergeable interface to SPI

trinodb · Jul 2, 2021 · d159c6c · d159c6c
1 parent 851edb1
commit d159c6c
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/operator/ExchangeClientStatus.java b/core/trino-main/src/main/java/io/trino/operator/ExchangeClientStatus.java
@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import io.trino.util.Mergeable;
+import io.trino.spi.Mergeable;
 
 import java.util.List;
 

diff --git a/core/trino-main/src/main/java/io/trino/operator/HashCollisionsInfo.java b/core/trino-main/src/main/java/io/trino/operator/HashCollisionsInfo.java
@@ -15,7 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.trino.util.Mergeable;
+import io.trino.spi.Mergeable;
 
 public class HashCollisionsInfo
         implements Mergeable<HashCollisionsInfo>, OperatorInfo

diff --git a/core/trino-main/src/main/java/io/trino/operator/OperatorStats.java b/core/trino-main/src/main/java/io/trino/operator/OperatorStats.java
@@ -18,8 +18,8 @@
 import com.google.common.collect.ImmutableList;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.spi.Mergeable;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.util.Mergeable;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;

diff --git a/core/trino-main/src/main/java/io/trino/operator/PartitionedOutputOperator.java b/core/trino-main/src/main/java/io/trino/operator/PartitionedOutputOperator.java
@@ -24,14 +24,14 @@
 import io.trino.execution.buffer.PagesSerdeFactory;
 import io.trino.execution.buffer.SerializedPage;
 import io.trino.memory.context.LocalMemoryContext;
+import io.trino.spi.Mergeable;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RunLengthEncodedBlock;
 import io.trino.spi.predicate.NullableValue;
 import io.trino.spi.type.Type;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.util.Mergeable;
 
 import javax.annotation.Nullable;
 

diff --git a/core/trino-main/src/main/java/io/trino/operator/TableWriterOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableWriterOperator.java
@@ -24,6 +24,7 @@
 import io.trino.Session;
 import io.trino.memory.context.LocalMemoryContext;
 import io.trino.operator.OperationTimer.OperationTiming;
+import io.trino.spi.Mergeable;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
@@ -37,7 +38,6 @@
 import io.trino.sql.planner.plan.TableWriterNode;
 import io.trino.sql.planner.plan.TableWriterNode.WriterTarget;
 import io.trino.util.AutoCloseableCloser;
-import io.trino.util.Mergeable;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/core/trino-main/src/main/java/io/trino/operator/WindowInfo.java b/core/trino-main/src/main/java/io/trino/operator/WindowInfo.java
@@ -17,7 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import io.trino.operator.window.WindowPartition;
-import io.trino.util.Mergeable;
+import io.trino.spi.Mergeable;
 
 import javax.annotation.concurrent.Immutable;
 

diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeBufferInfo.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeBufferInfo.java
@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.operator.OperatorInfo;
-import io.trino.util.Mergeable;
+import io.trino.spi.Mergeable;
 
 public class LocalExchangeBufferInfo
         implements Mergeable<LocalExchangeBufferInfo>, OperatorInfo

diff --git a/core/trino-main/src/main/java/io/trino/operator/join/JoinOperatorInfo.java b/core/trino-main/src/main/java/io/trino/operator/join/JoinOperatorInfo.java
@@ -17,7 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.trino.operator.OperatorInfo;
 import io.trino.operator.join.LookupJoinOperatorFactory.JoinType;
-import io.trino.util.Mergeable;
+import io.trino.spi.Mergeable;
 
 import java.util.Optional;
 

diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStats.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanNodeStats.java
@@ -15,8 +15,8 @@
 
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
+import io.trino.spi.Mergeable;
 import io.trino.sql.planner.plan.PlanNodeId;
-import io.trino.util.Mergeable;
 
 import java.util.Map;
 import java.util.Set;

diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/WindowOperatorStats.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/WindowOperatorStats.java
@@ -15,7 +15,7 @@
 
 import io.trino.operator.WindowInfo;
 import io.trino.operator.WindowInfo.DriverWindowInfo;
-import io.trino.util.Mergeable;
+import io.trino.spi.Mergeable;
 
 class WindowOperatorStats
         implements Mergeable<WindowOperatorStats>

diff --git a/...rc/main/java/io/trino/util/Mergeable.java → ...src/main/java/io/trino/spi/Mergeable.java b/...rc/main/java/io/trino/util/Mergeable.java → ...src/main/java/io/trino/spi/Mergeable.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.util;
+package io.trino.spi;
 
 public interface Mergeable<T>
 {