Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused deprecated APIs in ConnectorSplitManager #8569

Merged
merged 2 commits into from
Jul 16, 2021
Merged

Remove unused deprecated APIs in ConnectorSplitManager #8569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40023b3
Remove unused deprecated APIs in ConnectorSplitManager
raunaqmorarka Jul 15, 2021
885419b
Remove unecessary default implementation in ConnectorPageSourceProvider
raunaqmorarka Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorPageSourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,11 @@ public interface ConnectorPageSourceProvider
* @param columns columns that should show up in the output page, in this order
* @param dynamicFilter optionally remove rows that don't satisfy this predicate
*/
default ConnectorPageSource createPageSource(
ConnectorPageSource createPageSource(
ConnectorTransactionHandle transaction,
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
throw new UnsupportedOperationException("createPageSource() must be implemented");
}
DynamicFilter dynamicFilter);
}
27 changes: 1 addition & 26 deletions core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorSplitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
*/
package io.trino.spi.connector;

import io.trino.spi.predicate.TupleDomain;

import java.util.function.Supplier;

public interface ConnectorSplitManager
{
@Deprecated
Expand All @@ -29,35 +25,14 @@ default ConnectorSplitSource getSplits(
throw new UnsupportedOperationException();
}

@Deprecated
default ConnectorSplitSource getSplits(
ConnectorTransactionHandle transaction,
ConnectorSession session,
ConnectorTableHandle table,
SplitSchedulingStrategy splitSchedulingStrategy)
{
throw new UnsupportedOperationException();
}

@Deprecated
default ConnectorSplitSource getSplits(
ConnectorTransactionHandle transaction,
ConnectorSession session,
ConnectorTableHandle table,
SplitSchedulingStrategy splitSchedulingStrategy,
Supplier<TupleDomain<ColumnHandle>> dynamicFilter)
{
return getSplits(transaction, session, table, splitSchedulingStrategy);
}

default ConnectorSplitSource getSplits(
ConnectorTransactionHandle transaction,
ConnectorSession session,
ConnectorTableHandle table,
SplitSchedulingStrategy splitSchedulingStrategy,
DynamicFilter dynamicFilter)
{
return getSplits(transaction, session, table, splitSchedulingStrategy, dynamicFilter::getCurrentPredicate);
throw new UnsupportedOperationException();
}

enum SplitSchedulingStrategy
Expand Down
20 changes: 0 additions & 20 deletions .../src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorSplitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,16 @@
package io.trino.plugin.base.classloader;

import io.trino.spi.classloader.ThreadContextClassLoader;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplitManager;
import io.trino.spi.connector.ConnectorSplitSource;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTableLayoutHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
import io.trino.spi.predicate.TupleDomain;

import javax.inject.Inject;

import java.util.function.Supplier;

import static java.util.Objects.requireNonNull;

public final class ClassLoaderSafeConnectorSplitManager
Expand All @@ -51,22 +47,6 @@ public ConnectorSplitSource getSplits(ConnectorTransactionHandle transactionHand
}
}

@Override
public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorTableHandle table, SplitSchedulingStrategy splitSchedulingStrategy)
{
try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
return delegate.getSplits(transaction, session, table, splitSchedulingStrategy);
}
}

@Override
public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorTableHandle table, SplitSchedulingStrategy splitSchedulingStrategy, Supplier<TupleDomain<ColumnHandle>> dynamicFilter)
{
try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
return delegate.getSplits(transaction, session, table, splitSchedulingStrategy, dynamicFilter);
}
}

@Override
public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorTableHandle table, SplitSchedulingStrategy splitSchedulingStrategy, DynamicFilter dynamicFilter)
{
Expand Down