From d159c6c0af169389996addb0606d95e5c42ccb8b Mon Sep 17 00:00:00 2001
From: Roman Zeyde <zeyde@varada.io>
Date: Tue, 4 May 2021 13:13:04 +0300
Subject: [PATCH] Move Mergeable interface to SPI

---
 .../src/main/java/io/trino/operator/ExchangeClientStatus.java   | 2 +-
 .../src/main/java/io/trino/operator/HashCollisionsInfo.java     | 2 +-
 .../src/main/java/io/trino/operator/OperatorStats.java          | 2 +-
 .../main/java/io/trino/operator/PartitionedOutputOperator.java  | 2 +-
 .../src/main/java/io/trino/operator/TableWriterOperator.java    | 2 +-
 core/trino-main/src/main/java/io/trino/operator/WindowInfo.java | 2 +-
 .../io/trino/operator/exchange/LocalExchangeBufferInfo.java     | 2 +-
 .../src/main/java/io/trino/operator/join/JoinOperatorInfo.java  | 2 +-
 .../java/io/trino/sql/planner/planprinter/PlanNodeStats.java    | 2 +-
 .../io/trino/sql/planner/planprinter/WindowOperatorStats.java   | 2 +-
 .../src/main/java/io/trino/spi}/Mergeable.java                  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename core/{trino-main/src/main/java/io/trino/util => trino-spi/src/main/java/io/trino/spi}/Mergeable.java (97%)

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
index dac62e6a0f0e..b0266c0c0f1d 100644
--- 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
index 8c35a8f24835..2cb8045c8d92 100644
--- 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
index dccadc154e0e..9d975c15721b 100644
--- 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
index dfa0e24f4c1b..e11dd5109e46 100644
--- 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,6 +24,7 @@
 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;
@@ -31,7 +32,6 @@
 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
index 76ebd174277a..b1034d8d6c2f 100644
--- 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
index cae4812cd394..ceaf8933aad0 100644
--- 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
index dec16c49c7f9..72038de592ea 100644
--- 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
index 21f3b966f3a2..9668efd911de 100644
--- 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
index 629a0eeff8d1..ca643f007ca3 100644
--- 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
index 95cac8d41d71..1d81aff13833 100644
--- 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/core/trino-main/src/main/java/io/trino/util/Mergeable.java b/core/trino-spi/src/main/java/io/trino/spi/Mergeable.java
similarity index 97%
rename from core/trino-main/src/main/java/io/trino/util/Mergeable.java
rename to core/trino-spi/src/main/java/io/trino/spi/Mergeable.java
index b41f225223c7..e9c4d11de207 100644
--- a/core/trino-main/src/main/java/io/trino/util/Mergeable.java
+++ b/core/trino-spi/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>
 {