Deprecate io.trino.spi.connector.ConnectorSplit#getSplitInfo

This is no longer needed as toString suffices to print debug info on workers

Author: raunaqmorarka

core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaSplit.java

@@ -16,13 +16,12 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ConnectorSplit;
 
 import java.util.List;
-import java.util.Map;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
@@ -59,9 +58,11 @@ public List<HostAddress> getAddresses()
     }
 
     @Override
-    public Map<String, String> getSplitInfo()
+    public String toString()
     {
-        return ImmutableMap.of("addresses", addresses.stream().map(HostAddress::toString).collect(joining(",")));
+        return toStringHelper(this)
+                .add("addresses", addresses.stream().map(HostAddress::toString).collect(joining(",")))
+                .toString();
     }
 
     @Override

core/trino-main/src/main/java/io/trino/connector/system/SystemSplit.java

@@ -16,15 +16,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.SizeOf;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.predicate.TupleDomain;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
@@ -87,12 +85,6 @@ public Optional<String> getCatalogName()
         return catalogName;
     }
 
-    @Override
-    public Map<String, String> getSplitInfo()
-    {
-        return ImmutableMap.of("addresses", addresses.stream().map(HostAddress::toString).collect(joining(",")));
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {
@@ -106,7 +98,7 @@ public long getRetainedSizeInBytes()
     public String toString()
     {
         return toStringHelper(this)
-                .add("addresses", addresses)
+                .add("addresses", addresses.stream().map(HostAddress::toString).collect(joining(",")))
                 .toString();
     }
 }

core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java

@@ -13,7 +13,6 @@
  */
 package io.trino.execution;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -33,7 +32,6 @@
 import io.trino.execution.buffer.OutputBuffer;
 import io.trino.execution.executor.TaskExecutor;
 import io.trino.execution.executor.TaskHandle;
-import io.trino.metadata.Split;
 import io.trino.operator.Driver;
 import io.trino.operator.DriverContext;
 import io.trino.operator.DriverFactory;
@@ -817,7 +815,6 @@ public Span getPipelineSpan()
     private static class DriverSplitRunner
             implements SplitRunner
     {
-        private static final Joiner.MapJoiner JOINER = Joiner.on(";").withKeyValueSeparator("=");
         private final DriverSplitRunnerFactory driverSplitRunnerFactory;
         private final DriverContext driverContext;
 
@@ -895,7 +892,7 @@ public ListenableFuture<Void> processFor(Duration duration)
         @Override
         public String getInfo()
         {
-            return (partitionedSplit == null) ? "" : formatSplitInfo(partitionedSplit.getSplit());
+            return (partitionedSplit == null) ? "" : partitionedSplit.getSplit().toString();
         }
 
         @Override
@@ -916,11 +913,6 @@ private Optional<CatalogName> getCatalogName()
         {
             return partitionedSplit == null ? Optional.empty() : Optional.of(partitionedSplit.getSplit().getCatalogHandle().getCatalogName());
         }
-
-        private static String formatSplitInfo(Split split)
-        {
-            return split.getConnectorSplit().getClass().getSimpleName() + "{" + JOINER.join(split.getInfo()) + "}";
-        }
     }
 
     private static final class CheckTaskCompletionOnBufferFinish

core/trino-main/src/main/java/io/trino/metadata/Split.java

@@ -14,18 +14,14 @@
 package io.trino.metadata;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.collect.ImmutableMap;
 import io.trino.spi.HostAddress;
 import io.trino.spi.SplitWeight;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSplit;
 
 import java.util.List;
-import java.util.Map;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static java.util.Objects.requireNonNull;
@@ -58,12 +54,6 @@ public ConnectorSplit getConnectorSplit()
         return connectorSplit;
     }
 
-    @JsonIgnore
-    public Map<String, String> getInfo()
-    {
-        return firstNonNull(connectorSplit.getSplitInfo(), ImmutableMap.of());
-    }
-
     public List<HostAddress> getAddresses()
     {
         return connectorSplit.getAddresses();

core/trino-main/src/main/java/io/trino/operator/index/IndexSplit.java

@@ -18,7 +18,6 @@
 import io.trino.spi.connector.RecordSet;
 
 import java.util.List;
-import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
 
@@ -44,12 +43,6 @@ public List<HostAddress> getAddresses()
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public Map<String, String> getSplitInfo()
-    {
-        return Map.of();
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {

core/trino-main/src/main/java/io/trino/operator/table/SequenceFunction.java

@@ -16,7 +16,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import io.trino.spi.Page;
 import io.trino.spi.PageBuilder;
 import io.trino.spi.TrinoException;
@@ -41,6 +40,7 @@
 import java.math.BigInteger;
 import java.util.Map;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.slice.SizeOf.instanceSize;
@@ -194,12 +194,12 @@ public long getStop()
         }
 
         @Override
-        public Map<String, String> getSplitInfo()
+        public String toString()
         {
-            return ImmutableMap.<String, String>builder()
-                    .put("start", String.valueOf(start))
-                    .put("stop", String.valueOf(stop))
-                    .buildOrThrow();
+            return toStringHelper(this)
+                    .add("start", start)
+                    .add("stop", stop)
+                    .toString();
         }
 
         @Override

core/trino-main/src/main/java/io/trino/split/EmptySplit.java

@@ -15,12 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.collect.ImmutableMap;
 import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSplit;
 
-import java.util.Map;
-
 import static io.airlift.slice.SizeOf.instanceSize;
 import static java.util.Objects.requireNonNull;
 
@@ -38,12 +35,6 @@ public EmptySplit(
         this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
     }
 
-    @Override
-    public Map<String, String> getSplitInfo()
-    {
-        return ImmutableMap.of();
-    }
-
     @Override
     public long getRetainedSizeInBytes()
     {

core/trino-main/src/main/java/io/trino/split/RemoteSplit.java

@@ -18,8 +18,6 @@
 import io.trino.exchange.ExchangeInput;
 import io.trino.spi.connector.ConnectorSplit;
 
-import java.util.Map;
-
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static io.airlift.slice.SizeOf.instanceSize;
 import static java.util.Objects.requireNonNull;
@@ -43,12 +41,6 @@ public ExchangeInput getExchangeInput()
         return exchangeInput;
     }
 
-    @Override
-    public Map<String, String> getSplitInfo()
-    {
-        return Map.of("exchangeInput", exchangeInput.toString());
-    }
-
     @Override
     public String toString()
     {

core/trino-main/src/main/java/io/trino/testing/TestingSplit.java

@@ -16,16 +16,14 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import io.trino.spi.HostAddress;
 import io.trino.spi.connector.ConnectorSplit;
 
 import java.util.List;
-import java.util.Map;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
-import static java.util.stream.Collectors.joining;
 
 public class TestingSplit
         implements ConnectorSplit
@@ -74,12 +72,12 @@ public List<HostAddress> getAddresses()
     }
 
     @Override
-    public Map<String, String> getSplitInfo()
+    public String toString()
     {
-        return ImmutableMap.<String, String>builder()
-                .put("remotelyAccessible", String.valueOf(remotelyAccessible))
-                .put("addresses", addresses.stream().map(HostAddress::toString).collect(joining(",")))
-                .buildOrThrow();
+        return toStringHelper(this)
+                .add("remotelyAccessible", remotelyAccessible)
+                .add("addresses", addresses)
+                .toString();
     }
 
     @Override

core/trino-main/src/test/java/io/trino/connector/MockConnector.java

@@ -1105,12 +1105,6 @@ public enum MockConnectorSplit
     {
         MOCK_CONNECTOR_SPLIT;
 
-        @Override
-        public Map<String, String> getSplitInfo()
-        {
-            return ImmutableMap.of("info", "mock connector split");
-        }
-
         @Override
         public long getRetainedSizeInBytes()
         {

core/trino-main/src/test/java/io/trino/connector/TestingTableFunctions.java

@@ -16,7 +16,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.slice.Slice;
 import io.trino.spi.Page;
@@ -55,6 +54,7 @@
 import java.util.Optional;
 import java.util.stream.IntStream;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
@@ -1370,9 +1370,11 @@ public long getCount()
             }
 
             @Override
-            public Map<String, String> getSplitInfo()
+            public String toString()
             {
-                return ImmutableMap.of("count", String.valueOf(count));
+                return toStringHelper(this)
+                        .add("count", count)
+                        .toString();
             }
 
             @Override

core/trino-main/src/test/java/io/trino/execution/BenchmarkNodeScheduler.java

@@ -15,7 +15,6 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Multimap;
@@ -75,7 +74,6 @@
 import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
-import static java.util.stream.Collectors.joining;
 
 @SuppressWarnings("MethodMayBeStatic")
 @State(Scope.Thread)
@@ -265,12 +263,6 @@ public List<HostAddress> getAddresses()
             return hosts;
         }
 
-        @Override
-        public Map<String, String> getSplitInfo()
-        {
-            return ImmutableMap.of("addresses", hosts.stream().map(HostAddress::toString).collect(joining(",")));
-        }
-
         @Override
         public long getRetainedSizeInBytes()
         {