Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;

import java.util.List;
import java.util.Optional;

import static java.util.Objects.requireNonNull;

Expand All @@ -52,7 +50,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle tableHandle,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,15 @@
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ConnectorMetadata;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.ConnectorTableVersion;
import io.trino.spi.connector.ConnectorWritableTableHandle;
import io.trino.spi.connector.Constraint;
import io.trino.spi.connector.ConstraintApplicationResult;
import io.trino.spi.connector.RelationColumnsMetadata;
import io.trino.spi.connector.SchemaTableName;
import io.trino.spi.connector.SystemColumnHandle;
import io.trino.spi.connector.SystemTable;
import io.trino.spi.function.table.ConnectorTableFunctionHandle;
import io.trino.spi.predicate.TupleDomain;

import java.util.Iterator;
Expand Down Expand Up @@ -171,25 +168,6 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
return Optional.of(new ConstraintApplicationResult<>(table, constraint.getSummary(), constraint.getExpression(), false));
}

@Override
public Optional<ConnectorTableCredentials> getTableCredentials(ConnectorSession session, ConnectorTableHandle tableHandle)
{
SystemTable systemTable = checkAndGetTable(session, tableHandle);
return systemTable.getTableCredentials(session);
}

@Override
public Optional<ConnectorTableCredentials> getTableCredentials(ConnectorSession session, ConnectorWritableTableHandle tableHandle)
{
throw new TrinoException(NOT_SUPPORTED, "This connector does not support table credentials");
}

@Override
public Optional<ConnectorTableCredentials> getTableCredentials(ConnectorSession session, ConnectorTableFunctionHandle tableFunctionHandle)
{
throw new TrinoException(NOT_SUPPORTED, "This connector does not support table credentials");
}

private Constraint effectiveConstraint(TupleDomain<ColumnHandle> oldDomain, Constraint newConstraint, TupleDomain<ColumnHandle> effectiveDomain)
{
if (effectiveDomain.isNone() || newConstraint.predicate().isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@
import io.trino.spi.connector.ConnectorRecordSetProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
import io.trino.spi.connector.RecordPageSource;

import java.util.List;
import java.util.Optional;

import static java.util.Objects.requireNonNull;

Expand All @@ -46,7 +44,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1121,14 +1121,7 @@ private class MockConnectorPageSourceProvider
implements ConnectorPageSourceProvider
{
@Override
public ConnectorPageSource createPageSource(
ConnectorTransactionHandle transaction,
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
public ConnectorPageSource createPageSource(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorSplit split, ConnectorTableHandle table, List<ColumnHandle> columns, DynamicFilter dynamicFilter)
{
MockConnectorTableHandle handle = (MockConnectorTableHandle) table;
SchemaTableName tableName = handle.getTableName();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import io.trino.spi.connector.ConnectorPageSourceProviderFactory;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
Expand Down Expand Up @@ -55,7 +54,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ default ConnectorPageSource createPageSource(
/**
* @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
*
* @deprecated Implement {@link #createPageSource(ConnectorTransactionHandle, ConnectorSession, ConnectorSplit, ConnectorTableHandle, Optional, List, DynamicFilter)} instead.
*/
@Deprecated(forRemoval = true)
default ConnectorPageSource createPageSource(
ConnectorTransactionHandle transaction,
ConnectorSession session,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,4 @@ default Optional<ConnectorSplitSource> splitSource(ConnectorSession connectorSes
{
return Optional.empty();
}

/**
* Returns {@link ConnectorTableCredentials} if the system table requires credentials to access the data.
* <p>
* Implementing this method requires implementing {@link #splitSource(ConnectorSession, TupleDomain)} too.
* The credentials returned by this method will be passed to {@link ConnectorPageSourceProvider }
*/
default Optional<ConnectorTableCredentials> getTableCredentials(ConnectorSession session)
{
return Optional.empty();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ public ClassLoaderSafeConnectorPageSourceProvider(@ForClassLoaderSafe ConnectorP
this.classLoader = requireNonNull(classLoader, "classLoader is null");
}

@Override
public ConnectorPageSource createPageSource(ConnectorTransactionHandle transaction, ConnectorSession session, ConnectorSplit split, ConnectorTableHandle table, List<ColumnHandle> columns, DynamicFilter dynamicFilter)
{
try (ThreadContextClassLoader _ = new ThreadContextClassLoader(classLoader)) {
return delegate.createPageSource(transaction, session, split, table, columns, dynamicFilter);
}
}

@Override
public ConnectorPageSource createPageSource(
ConnectorTransactionHandle transaction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorSplitSource;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.RecordCursor;
Expand Down Expand Up @@ -124,12 +123,4 @@ public Optional<ConnectorSplitSource> splitSource(ConnectorSession connectorSess
return delegate.splitSource(connectorSession, constraint);
}
}

@Override
public Optional<ConnectorTableCredentials> getTableCredentials(ConnectorSession session)
{
try (ThreadContextClassLoader _ = new ThreadContextClassLoader(classLoader)) {
return delegate.getTableCredentials(session);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorRecordSetProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorSplitManager;
import io.trino.spi.connector.ConnectorSplitSource;
import io.trino.spi.connector.ConnectorTableExecuteHandle;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
import io.trino.spi.connector.RecordSet;
import io.trino.spi.connector.SystemTable;
import io.trino.spi.eventlistener.EventListener;
Expand All @@ -45,7 +42,6 @@

import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

Expand All @@ -68,8 +64,7 @@ public void test()
ClassLoaderSafeConnectorPageSinkProvider.class.getMethod("createPageSink", ConnectorTransactionHandle.class, ConnectorSession.class, ConnectorInsertTableHandle.class, ConnectorPageSinkId.class),
ClassLoaderSafeConnectorPageSinkProvider.class.getMethod("createPageSink", ConnectorTransactionHandle.class, ConnectorSession.class, ConnectorTableExecuteHandle.class, ConnectorPageSinkId.class),
ClassLoaderSafeConnectorPageSinkProvider.class.getMethod("createMergeSink", ConnectorTransactionHandle.class, ConnectorSession.class, ConnectorMergeTableHandle.class, ConnectorPageSinkId.class)));
testClassLoaderSafe(ConnectorPageSourceProvider.class, ClassLoaderSafeConnectorPageSourceProvider.class, ImmutableSet.of(
ClassLoaderSafeConnectorPageSourceProvider.class.getMethod("createPageSource", ConnectorTransactionHandle.class, ConnectorSession.class, ConnectorSplit.class, ConnectorTableHandle.class, List.class, DynamicFilter.class)));
testClassLoaderSafe(ConnectorPageSourceProvider.class, ClassLoaderSafeConnectorPageSourceProvider.class);
testClassLoaderSafe(ConnectorSplitManager.class, ClassLoaderSafeConnectorSplitManager.class);
testClassLoaderSafe(ConnectorNodePartitioningProvider.class, ClassLoaderSafeNodePartitioningProvider.class);
testClassLoaderSafe(ConnectorSplitSource.class, ClassLoaderSafeConnectorSplitSource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
Expand Down Expand Up @@ -66,7 +65,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void testGetPageSource()
{
ConnectorTransactionHandle transaction = new JdbcTransactionHandle();
JdbcPageSourceProvider pageSourceProvider = new JdbcPageSourceProvider(jdbcClient, executor, RetryPolicy.ofDefaults());
ConnectorPageSource pageSource = pageSourceProvider.createPageSource(transaction, SESSION, split, table, Optional.empty(), ImmutableList.of(textColumn, textShortColumn, valueColumn), DynamicFilter.EMPTY);
ConnectorPageSource pageSource = pageSourceProvider.createPageSource(transaction, SESSION, split, table, ImmutableList.of(textColumn, textShortColumn, valueColumn), DynamicFilter.EMPTY);
assertThat(pageSource).withFailMessage("pageSource is null").isNotNull();

Map<String, Long> data = new LinkedHashMap<>();
Expand Down Expand Up @@ -226,6 +226,6 @@ private ConnectorPageSource getCursor(JdbcTableHandle jdbcTableHandle, List<Colu

ConnectorTransactionHandle transaction = new JdbcTransactionHandle();
JdbcPageSourceProvider pageSourceProvider = new JdbcPageSourceProvider(jdbcClient, executor, RetryPolicy.ofDefaults());
return pageSourceProvider.createPageSource(transaction, SESSION, split, jdbcTableHandle, Optional.empty(), columns, DynamicFilter.EMPTY);
return pageSourceProvider.createPageSource(transaction, SESSION, split, jdbcTableHandle, columns, DynamicFilter.EMPTY);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
Expand Down Expand Up @@ -72,7 +71,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
Expand All @@ -47,7 +46,6 @@

import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
Expand All @@ -68,7 +66,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle tableHandle,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
Expand Down Expand Up @@ -153,7 +152,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit connectorSplit,
ConnectorTableHandle connectorTable,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@ private static ConnectorPageSource createTestingPageSource(
getSession(deltaLakeConfig),
split,
tableHandle.connectorHandle(),
Optional.empty(),
columns,
dynamicFilter);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
import io.trino.spi.type.TypeManager;

import java.util.List;
import java.util.Optional;

import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.trino.plugin.elasticsearch.ElasticsearchTableHandle.Type.QUERY;
Expand All @@ -52,7 +50,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
import net.datafaker.Faker;

import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.Random;
import java.util.random.RandomGeneratorFactory;

Expand Down Expand Up @@ -60,7 +58,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle table,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import io.trino.spi.connector.ConnectorPageSourceProvider;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorSplit;
import io.trino.spi.connector.ConnectorTableCredentials;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.connector.DynamicFilter;
Expand Down Expand Up @@ -108,7 +107,6 @@ public ConnectorPageSource createPageSource(
ConnectorSession session,
ConnectorSplit split,
ConnectorTableHandle tableHandle,
Optional<ConnectorTableCredentials> tableCredentials,
List<ColumnHandle> columns,
DynamicFilter dynamicFilter)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ private static ConnectorPageSource createPageSource(TrinoFileSystemFactory fileS
TESTING_TYPE_MANAGER,
config,
getDefaultHivePageSourceFactories(fileSystemFactory, config));
return provider.createPageSource(transaction, getHiveSession(config), split, table, Optional.empty(), ImmutableList.copyOf(getColumnHandles()), DynamicFilter.EMPTY);
return provider.createPageSource(transaction, getHiveSession(config), split, table, ImmutableList.copyOf(getColumnHandles()), DynamicFilter.EMPTY);
}

private static ConnectorPageSink createPageSink(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ private static ConnectorPageSource createTestingPageSource(HiveTransactionHandle
getSession(hiveConfig),
split,
tableHandle.connectorHandle(),
Optional.empty(),
ImmutableList.of(BUCKET_HIVE_COLUMN_HANDLE, PARTITION_HIVE_COLUMN_HANDLE),
dynamicFilter);
}
Expand Down
Loading