Add protocol to the SPI module-info

core/trino-main/src/main/java/io/trino/operator/OutputSpoolingOperatorFactory.java

@@ -27,9 +27,9 @@
 import io.trino.spi.Mergeable;
 import io.trino.spi.Page;
 import io.trino.spi.block.Block;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingContext;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingContext;
+import io.trino.spi.spool.SpoolingManager;
 import io.trino.sql.planner.Symbol;
 import io.trino.sql.planner.plan.OutputNode;
 import io.trino.sql.planner.plan.PlanNodeId;

core/trino-main/src/main/java/io/trino/server/PluginManager.java

@@ -41,14 +41,14 @@
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.spi.eventlistener.EventListenerFactory;
 import io.trino.spi.exchange.ExchangeManagerFactory;
-import io.trino.spi.protocol.SpoolingManagerFactory;
 import io.trino.spi.resourcegroups.ResourceGroupConfigurationManagerFactory;
 import io.trino.spi.security.CertificateAuthenticatorFactory;
 import io.trino.spi.security.GroupProviderFactory;
 import io.trino.spi.security.HeaderAuthenticatorFactory;
 import io.trino.spi.security.PasswordAuthenticatorFactory;
 import io.trino.spi.security.SystemAccessControlFactory;
 import io.trino.spi.session.SessionPropertyConfigurationManagerFactory;
+import io.trino.spi.spool.SpoolingManagerFactory;
 import io.trino.spi.type.ParametricType;
 import io.trino.spi.type.Type;
 

core/trino-main/src/main/java/io/trino/server/protocol/spooling/CoordinatorSegmentResource.java

@@ -20,8 +20,8 @@
 import io.trino.server.protocol.spooling.SpoolingConfig.SegmentRetrievalMode;
 import io.trino.server.security.ResourceSecurity;
 import io.trino.spi.HostAddress;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingManager;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;

core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpooledBlock.java

@@ -21,9 +21,9 @@
 import io.trino.spi.block.Block;
 import io.trino.spi.block.RowBlockBuilder;
 import io.trino.spi.block.SqlRow;
-import io.trino.spi.protocol.SpooledLocation;
-import io.trino.spi.protocol.SpooledLocation.CoordinatorLocation;
-import io.trino.spi.protocol.SpooledLocation.DirectLocation;
+import io.trino.spi.spool.SpooledLocation;
+import io.trino.spi.spool.SpooledLocation.CoordinatorLocation;
+import io.trino.spi.spool.SpooledLocation.DirectLocation;
 import io.trino.spi.type.RowType;
 import io.trino.sql.planner.Symbol;
 

core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingManagerBridge.java

@@ -17,10 +17,10 @@
 import io.airlift.slice.Slice;
 import io.trino.server.protocol.spooling.SpoolingConfig.SegmentRetrievalMode;
 import io.trino.spi.TrinoException;
-import io.trino.spi.protocol.SpooledLocation;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingContext;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpooledLocation;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingContext;
+import io.trino.spi.spool.SpoolingManager;
 import jakarta.ws.rs.ServiceUnavailableException;
 
 import javax.crypto.Cipher;
@@ -37,9 +37,9 @@
 import static io.airlift.slice.Slices.utf8Slice;
 import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.spi.StandardErrorCode.CONFIGURATION_INVALID;
-import static io.trino.spi.protocol.SpooledLocation.CoordinatorLocation;
-import static io.trino.spi.protocol.SpooledLocation.DirectLocation;
-import static io.trino.spi.protocol.SpooledLocation.coordinatorLocation;
+import static io.trino.spi.spool.SpooledLocation.CoordinatorLocation;
+import static io.trino.spi.spool.SpooledLocation.DirectLocation;
+import static io.trino.spi.spool.SpooledLocation.coordinatorLocation;
 import static java.util.Base64.getUrlDecoder;
 import static java.util.Base64.getUrlEncoder;
 import static java.util.Objects.requireNonNull;

core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingManagerRegistry.java

@@ -19,9 +19,9 @@
 import io.opentelemetry.api.trace.Tracer;
 import io.trino.server.ServerConfig;
 import io.trino.spi.classloader.ThreadContextClassLoader;
-import io.trino.spi.protocol.SpoolingManager;
-import io.trino.spi.protocol.SpoolingManagerContext;
-import io.trino.spi.protocol.SpoolingManagerFactory;
+import io.trino.spi.spool.SpoolingManager;
+import io.trino.spi.spool.SpoolingManagerContext;
+import io.trino.spi.spool.SpoolingManagerFactory;
 
 import java.io.File;
 import java.io.IOException;

core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingServerModule.java

@@ -24,7 +24,7 @@
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.trino.server.ServerConfig;
 import io.trino.server.protocol.spooling.SpoolingConfig.SegmentRetrievalMode;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpoolingManager;
 
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.airlift.jaxrs.JaxrsBinder.jaxrsBinder;

core/trino-main/src/main/java/io/trino/server/protocol/spooling/WorkerSegmentResource.java

@@ -15,8 +15,8 @@
 
 import com.google.inject.Inject;
 import io.trino.server.security.ResourceSecurity;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingManager;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;

core/trino-main/src/main/java/io/trino/sql/planner/LocalExecutionPlanner.java

@@ -179,7 +179,7 @@
 import io.trino.spi.function.table.TableFunctionProcessorProvider;
 import io.trino.spi.predicate.Domain;
 import io.trino.spi.predicate.NullableValue;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpoolingManager;
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.TypeOperators;

core/trino-spi/pom.xml

@@ -213,9 +213,17 @@
                                 <!-- Backwards incompatible changes since the previous release -->
                                 <!-- Any exclusions below can be deleted after each release -->
                                 <item>
-                                    <code>java.method.numberOfParametersChanged</code>
-                                    <old>method io.trino.spi.connector.RecordCursor io.trino.spi.connector.SystemTable::cursor(io.trino.spi.connector.ConnectorTransactionHandle, io.trino.spi.connector.ConnectorSession, io.trino.spi.predicate.TupleDomain&lt;java.lang.Integer&gt;, java.util.Set&lt;java.lang.Integer&gt;)</old>
-                                    <new>method io.trino.spi.connector.RecordCursor io.trino.spi.connector.SystemTable::cursor(io.trino.spi.connector.ConnectorTransactionHandle, io.trino.spi.connector.ConnectorSession, io.trino.spi.predicate.TupleDomain&lt;java.lang.Integer&gt;, java.util.Set&lt;java.lang.Integer&gt;, io.trino.spi.connector.ConnectorSplit)</new>
+                                    <ignore>true</ignore>
+                                    <code>java.method.returnTypeTypeParametersChanged</code>
+                                    <old>method java.lang.Iterable&lt;io.trino.spi.protocol.SpoolingManagerFactory&gt; io.trino.spi.Plugin::getSpoolingManagerFactories()</old>
+                                    <new>method java.lang.Iterable&lt;io.trino.spi.spool.SpoolingManagerFactory&gt; io.trino.spi.Plugin::getSpoolingManagerFactories()</new>
+                                    <justification>Spooling package renamed</justification>
+                                </item>
+                                <item>
+                                    <ignore>true</ignore>
+                                    <code>java.class.removed</code>
+                                    <old>interface io.trino.spi.protocol.SpoolingManager</old>
+                                    <justification>Spooling package renamed</justification>
                                 </item>
                             </differences>
                         </revapi.differences>

core/trino-spi/src/main/java/io/trino/spi/Plugin.java

@@ -18,14 +18,14 @@
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.spi.eventlistener.EventListenerFactory;
 import io.trino.spi.exchange.ExchangeManagerFactory;
-import io.trino.spi.protocol.SpoolingManagerFactory;
 import io.trino.spi.resourcegroups.ResourceGroupConfigurationManagerFactory;
 import io.trino.spi.security.CertificateAuthenticatorFactory;
 import io.trino.spi.security.GroupProviderFactory;
 import io.trino.spi.security.HeaderAuthenticatorFactory;
 import io.trino.spi.security.PasswordAuthenticatorFactory;
 import io.trino.spi.security.SystemAccessControlFactory;
 import io.trino.spi.session.SessionPropertyConfigurationManagerFactory;
+import io.trino.spi.spool.SpoolingManagerFactory;
 import io.trino.spi.type.ParametricType;
 import io.trino.spi.type.Type;
 

core/trino-spi/src/main/java/io/trino/spi/protocol/SpooledLocation.java → core/trino-spi/src/main/java/io/trino/spi/spool/SpooledLocation.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.protocol;
+package io.trino.spi.spool;
 
 import io.airlift.slice.Slice;
 import io.trino.spi.Experimental;

core/trino-spi/src/main/java/io/trino/spi/protocol/SpooledSegmentHandle.java → core/trino-spi/src/main/java/io/trino/spi/spool/SpooledSegmentHandle.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.protocol;
+package io.trino.spi.spool;
 
 import io.trino.spi.Experimental;
 

core/trino-spi/src/main/java/io/trino/spi/protocol/SpoolingContext.java → core/trino-spi/src/main/java/io/trino/spi/spool/SpoolingContext.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.protocol;
+package io.trino.spi.spool;
 
 import io.trino.spi.Experimental;
 import io.trino.spi.QueryId;

core/trino-spi/src/main/java/io/trino/spi/protocol/SpoolingManager.java → core/trino-spi/src/main/java/io/trino/spi/spool/SpoolingManager.java

@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.protocol;
+package io.trino.spi.spool;
 
 import io.airlift.slice.Slice;
-import io.trino.spi.protocol.SpooledLocation.DirectLocation;
+import io.trino.spi.spool.SpooledLocation.DirectLocation;
 
 import java.io.IOException;
 import java.io.InputStream;

core/trino-spi/src/main/java/io/trino/spi/protocol/SpoolingManagerContext.java → core/trino-spi/src/main/java/io/trino/spi/spool/SpoolingManagerContext.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.protocol;
+package io.trino.spi.spool;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;

core/trino-spi/src/main/java/io/trino/spi/protocol/SpoolingManagerFactory.java → core/trino-spi/src/main/java/io/trino/spi/spool/SpoolingManagerFactory.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.protocol;
+package io.trino.spi.spool;
 
 import io.trino.spi.Experimental;
 

core/trino-spi/src/main/java/module-info.java

@@ -34,6 +34,7 @@
     exports io.trino.spi.resourcegroups;
     exports io.trino.spi.security;
     exports io.trino.spi.session;
+    exports io.trino.spi.spool;
     exports io.trino.spi.statistics;
     exports io.trino.spi.transaction;
     exports io.trino.spi.type;

plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpooledSegmentHandle.java

@@ -15,8 +15,8 @@
 
 import io.azam.ulidj.ULID;
 import io.trino.filesystem.encryption.EncryptionKey;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingContext;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingContext;
 
 import java.time.Instant;
 import java.util.Optional;

plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingManager.java

@@ -26,12 +26,12 @@
 import io.trino.filesystem.TrinoInputFile;
 import io.trino.filesystem.TrinoOutputFile;
 import io.trino.filesystem.encryption.EncryptionKey;
-import io.trino.spi.protocol.SpooledLocation;
-import io.trino.spi.protocol.SpooledLocation.DirectLocation;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingContext;
-import io.trino.spi.protocol.SpoolingManager;
 import io.trino.spi.security.ConnectorIdentity;
+import io.trino.spi.spool.SpooledLocation;
+import io.trino.spi.spool.SpooledLocation.DirectLocation;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingContext;
+import io.trino.spi.spool.SpoolingManager;
 import io.trino.spooling.filesystem.encryption.EncryptionHeadersTranslator;
 import io.trino.spooling.filesystem.encryption.ExceptionMappingInputStream;
 
@@ -48,7 +48,7 @@
 import static io.airlift.slice.SizeOf.SIZE_OF_BYTE;
 import static io.airlift.slice.SizeOf.SIZE_OF_SHORT;
 import static io.trino.filesystem.encryption.EncryptionKey.randomAes256;
-import static io.trino.spi.protocol.SpooledLocation.coordinatorLocation;
+import static io.trino.spi.spool.SpooledLocation.coordinatorLocation;
 import static io.trino.spooling.filesystem.encryption.EncryptionHeadersTranslator.encryptionHeadersTranslator;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.time.Duration.between;

plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingManagerFactory.java

@@ -17,9 +17,9 @@
 import io.airlift.bootstrap.Bootstrap;
 import io.opentelemetry.api.OpenTelemetry;
 import io.trino.plugin.base.jmx.MBeanServerModule;
-import io.trino.spi.protocol.SpoolingManager;
-import io.trino.spi.protocol.SpoolingManagerContext;
-import io.trino.spi.protocol.SpoolingManagerFactory;
+import io.trino.spi.spool.SpoolingManager;
+import io.trino.spi.spool.SpoolingManagerContext;
+import io.trino.spi.spool.SpoolingManagerFactory;
 import org.weakref.jmx.guice.MBeanModule;
 
 import java.util.Map;

plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingModule.java

@@ -29,8 +29,8 @@
 import io.trino.filesystem.s3.S3FileSystemModule;
 import io.trino.filesystem.switching.SwitchingFileSystemFactory;
 import io.trino.filesystem.tracing.TracingFileSystemFactory;
-import io.trino.spi.protocol.SpoolingManager;
-import io.trino.spi.protocol.SpoolingManagerContext;
+import io.trino.spi.spool.SpoolingManager;
+import io.trino.spi.spool.SpoolingManagerContext;
 
 import java.util.Map;
 import java.util.concurrent.Executors;

plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingPlugin.java

@@ -14,7 +14,7 @@
 package io.trino.spooling.filesystem;
 
 import io.trino.spi.Plugin;
-import io.trino.spi.protocol.SpoolingManagerFactory;
+import io.trino.spi.spool.SpoolingManagerFactory;
 
 import java.util.List;
 

plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/TracingSpoolingManager.java

@@ -20,11 +20,11 @@
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.semconv.ExceptionAttributes;
-import io.trino.spi.protocol.SpooledLocation;
-import io.trino.spi.protocol.SpooledLocation.DirectLocation;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingContext;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpooledLocation;
+import io.trino.spi.spool.SpooledLocation.DirectLocation;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingContext;
+import io.trino.spi.spool.SpoolingManager;
 
 import java.io.IOException;
 import java.io.InputStream;

plugin/trino-spooling-filesystem/src/test/java/io/trino/spooling/filesystem/AbstractFileSystemSegmentPrunerTest.java

@@ -21,7 +21,7 @@
 import io.trino.filesystem.TrinoInputStream;
 import io.trino.filesystem.memory.MemoryFileSystem;
 import io.trino.spi.QueryId;
-import io.trino.spi.protocol.SpoolingContext;
+import io.trino.spi.spool.SpoolingContext;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

plugin/trino-spooling-filesystem/src/test/java/io/trino/spooling/filesystem/AbstractFileSystemSpoolingManagerTest.java

@@ -16,10 +16,10 @@
 import io.azam.ulidj.ULID;
 import io.trino.filesystem.encryption.EncryptionKey;
 import io.trino.spi.QueryId;
-import io.trino.spi.protocol.SpooledLocation;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingContext;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpooledLocation;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingContext;
+import io.trino.spi.spool.SpoolingManager;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 

plugin/trino-spooling-filesystem/src/test/java/io/trino/spooling/filesystem/TestFileSystemSpooledSegmentHandle.java

@@ -14,7 +14,7 @@
 package io.trino.spooling.filesystem;
 
 import io.trino.spi.QueryId;
-import io.trino.spi.protocol.SpoolingContext;
+import io.trino.spi.spool.SpoolingContext;
 import org.junit.jupiter.api.Test;
 
 import java.security.SecureRandom;

plugin/trino-spooling-filesystem/src/test/java/io/trino/spooling/filesystem/TestFileSystemSpoolingManagerLocalStack.java

@@ -17,7 +17,7 @@
 import io.trino.filesystem.s3.S3FileSystemConfig;
 import io.trino.filesystem.s3.S3FileSystemFactory;
 import io.trino.filesystem.s3.S3FileSystemStats;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpoolingManager;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.localstack.LocalStackContainer;
 import org.testcontainers.junit.jupiter.Container;

plugin/trino-spooling-filesystem/src/test/java/io/trino/spooling/filesystem/TestFileSystemSpoolingManagerMinio.java

@@ -17,7 +17,7 @@
 import io.trino.filesystem.s3.S3FileSystemConfig;
 import io.trino.filesystem.s3.S3FileSystemFactory;
 import io.trino.filesystem.s3.S3FileSystemStats;
-import io.trino.spi.protocol.SpoolingManager;
+import io.trino.spi.spool.SpoolingManager;
 import io.trino.testing.containers.Minio;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;

testing/trino-testing/src/main/java/io/trino/testing/LocalSpoolingManager.java

@@ -21,13 +21,13 @@
 import io.airlift.slice.Slice;
 import io.trino.client.JsonCodec;
 import io.trino.spi.Plugin;
-import io.trino.spi.protocol.SpooledLocation;
-import io.trino.spi.protocol.SpooledLocation.DirectLocation;
-import io.trino.spi.protocol.SpooledSegmentHandle;
-import io.trino.spi.protocol.SpoolingContext;
-import io.trino.spi.protocol.SpoolingManager;
-import io.trino.spi.protocol.SpoolingManagerContext;
-import io.trino.spi.protocol.SpoolingManagerFactory;
+import io.trino.spi.spool.SpooledLocation;
+import io.trino.spi.spool.SpooledLocation.DirectLocation;
+import io.trino.spi.spool.SpooledSegmentHandle;
+import io.trino.spi.spool.SpoolingContext;
+import io.trino.spi.spool.SpoolingManager;
+import io.trino.spi.spool.SpoolingManagerContext;
+import io.trino.spi.spool.SpoolingManagerFactory;
 import jakarta.annotation.PreDestroy;
 
 import java.io.IOException;