Skip to content

Commit

Permalink
Remove deprecated page sink creation methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@losipiuk
losipiuk committed Nov 14, 2022
1 parent c3155ae commit 5a7f34e
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 66 deletions.
30 changes: 30 additions & 0 deletions core/trino-spi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,36 @@
<new>method void io.trino.spi.connector.ConnectorViewDefinition.ViewColumn::&lt;init&gt;(java.lang.String, io.trino.spi.type.TypeId, java.util.Optional&lt;java.lang.String&gt;)</new>
<justification>Add support for view column comments</justification>
</item>
<item>
<ignore>true</ignore>
<code>java.method.noLongerDefault</code>
<old>method io.trino.spi.connector.ConnectorPageSink io.trino.spi.connector.ConnectorPageSinkProvider::createPageSink(io.trino.spi.connector.ConnectorTransactionHandle, io.trino.spi.connector.ConnectorSession, io.trino.spi.connector.ConnectorInsertTableHandle, io.trino.spi.connector.ConnectorPageSinkId)</old>
<justification>Deprecated SPI removal</justification>
</item>
<item>
<ignore>true</ignore>
<code>java.method.noLongerDefault</code>
<old>method io.trino.spi.connector.ConnectorPageSink io.trino.spi.connector.ConnectorPageSinkProvider::createPageSink(io.trino.spi.connector.ConnectorTransactionHandle, io.trino.spi.connector.ConnectorSession, io.trino.spi.connector.ConnectorOutputTableHandle, io.trino.spi.connector.ConnectorPageSinkId)</old>
<justification>Deprecated SPI removal</justification>
</item>
<item>
<ignore>true</ignore>
<code>java.method.noLongerDefault</code>
<old>method io.trino.spi.connector.ConnectorPageSink io.trino.spi.connector.ConnectorPageSinkProvider::createPageSink(io.trino.spi.connector.ConnectorTransactionHandle, io.trino.spi.connector.ConnectorSession, io.trino.spi.connector.ConnectorOutputTableHandle, io.trino.spi.connector.ConnectorPageSinkId)</old>
<justification>Deprecated SPI removal</justification>
</item>
<item>
<ignore>true</ignore>
<code>java.method.nowAbstract</code>
<old>method io.trino.spi.connector.ConnectorPageSink io.trino.spi.connector.ConnectorPageSinkProvider::createPageSink(io.trino.spi.connector.ConnectorTransactionHandle, io.trino.spi.connector.ConnectorSession, io.trino.spi.connector.ConnectorInsertTableHandle, io.trino.spi.connector.ConnectorPageSinkId)</old>
<justification>Deprecated SPI removal</justification>
</item>
<item>
<ignore>true</ignore>
<code>java.method.nowAbstract</code>
<old>method io.trino.spi.connector.ConnectorPageSink io.trino.spi.connector.ConnectorPageSinkProvider::createPageSink(io.trino.spi.connector.ConnectorTransactionHandle, io.trino.spi.connector.ConnectorSession, io.trino.spi.connector.ConnectorOutputTableHandle, io.trino.spi.connector.ConnectorPageSinkId)</old>
<justification>Deprecated SPI removal</justification>
</item>
</differences>
</revapi.differences>
</analysisConfiguration>
Expand Down
38 changes: 4 additions & 34 deletions core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorPageSinkProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,47 +19,17 @@

public interface ConnectorPageSinkProvider
{
@Deprecated // TODO(Issue #14705): Remove
default ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorOutputTableHandle outputTableHandle)
{
throw new IllegalArgumentException("createPageSink not supported for outputTableHandle");
}

default ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorOutputTableHandle outputTableHandle, ConnectorPageSinkId pageSinkId)
{
return createPageSink(transactionHandle, session, outputTableHandle);
}

@Deprecated // TODO(Issue #14705): Remove
default ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorInsertTableHandle insertTableHandle)
{
throw new IllegalArgumentException("createPageSink not supported for insertTableHandle");
}

default ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorInsertTableHandle insertTableHandle, ConnectorPageSinkId pageSinkId)
{
return createPageSink(transactionHandle, session, insertTableHandle);
}
ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorOutputTableHandle outputTableHandle, ConnectorPageSinkId pageSinkId);

@Deprecated // TODO(Issue #14705): Remove
default ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle)
{
throw new IllegalArgumentException("createPageSink not supported for tableExecuteHandle");
}
ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorInsertTableHandle insertTableHandle, ConnectorPageSinkId pageSinkId);

default ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle, ConnectorPageSinkId pageSinkId)
{
return createPageSink(transactionHandle, session, tableExecuteHandle);
}

@Deprecated // TODO(Issue #14705): Remove
default ConnectorMergeSink createMergeSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorMergeTableHandle mergeHandle)
{
throw new TrinoException(NOT_SUPPORTED, "This connector does not support SQL MERGE operations");
throw new IllegalArgumentException("createPageSink not supported for tableExecuteHandle");
}

default ConnectorMergeSink createMergeSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorMergeTableHandle mergeHandle, ConnectorPageSinkId pageSinkId)
{
return createMergeSink(transactionHandle, session, mergeHandle);
throw new TrinoException(NOT_SUPPORTED, "This connector does not support SQL MERGE operations");
}
}
32 changes: 0 additions & 32 deletions .../main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorPageSinkProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ public ClassLoaderSafeConnectorPageSinkProvider(@ForClassLoaderSafe ConnectorPag
this.classLoader = requireNonNull(classLoader, "classLoader is null");
}

@Override
public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorOutputTableHandle outputTableHandle)
{
try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
return new ClassLoaderSafeConnectorPageSink(delegate.createPageSink(transactionHandle, session, outputTableHandle), classLoader);
}
}

@Override
public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorOutputTableHandle outputTableHandle, ConnectorPageSinkId pageSinkId)
{
Expand All @@ -58,14 +50,6 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
}
}

@Override
public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorInsertTableHandle insertTableHandle)
{
try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
return new ClassLoaderSafeConnectorPageSink(delegate.createPageSink(transactionHandle, session, insertTableHandle), classLoader);
}
}

@Override
public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorInsertTableHandle insertTableHandle, ConnectorPageSinkId pageSinkId)
{
Expand All @@ -74,14 +58,6 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
}
}

@Override
public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle)
{
try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
return new ClassLoaderSafeConnectorPageSink(delegate.createPageSink(transactionHandle, session, tableExecuteHandle), classLoader);
}
}

@Override
public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorTableExecuteHandle tableExecuteHandle, ConnectorPageSinkId pageSinkId)
{
Expand All @@ -90,14 +66,6 @@ public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHa
}
}

@Override
public ConnectorMergeSink createMergeSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorMergeTableHandle mergeHandle)
{
try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
return new ClassLoaderSafeConnectorMergeSink(delegate.createMergeSink(transactionHandle, session, mergeHandle), classLoader);
}
}

@Override
public ConnectorMergeSink createMergeSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session, ConnectorMergeTableHandle mergeHandle, ConnectorPageSinkId pageSinkId)
{
Expand Down

0 comments on commit 5a7f34e

Please sign in to comment.