Skip to content

Remove deprecated ConnectorMetadata.finishInsert without sourceTableHandles argument #23213

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

Merged
raunaqmorarka merged 2 commits into from
Sep 2, 2024
Merged

Remove deprecated ConnectorMetadata.finishInsert without sourceTableHandles argument #23213

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
8d45698
Implement non-deprecated ConnectorMetadata.finishInsert in connectors
ebyhr Aug 31, 2024
4e98626
Remove deprecated ConnectorMetadata.finishInsert
ebyhr Aug 31, 2024
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
12 changes: 0 additions & 12 deletions core/trino-main/src/main/java/io/trino/tracing/TracingConnectorMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,18 +687,6 @@ public boolean supportsMissingColumnsOnInsert()
}
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
{
Span span = startSpan("finishInsert");
if (span.isRecording()) {
span.setAttribute(TrinoAttributes.HANDLE, insertHandle.toString());
}
try (var _ = scopedSpan(span)) {
return delegate.finishInsert(session, insertHandle, fragments, computedStatistics);
}
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, List<ConnectorTableHandle> sourceTableHandles, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
{
Expand Down
7 changes: 6 additions & 1 deletion core/trino-main/src/test/java/io/trino/connector/MockConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,12 @@ public boolean supportsMissingColumnsOnInsert()
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
public Optional<ConnectorOutputMetadata> finishInsert(
ConnectorSession session,
ConnectorInsertTableHandle insertHandle,
List<ConnectorTableHandle> sourceTableHandles,
Collection<Slice> fragments,
Collection<ComputedStatistics> computedStatistics)
{
return Optional.empty();
}
Expand Down
14 changes: 1 addition & 13 deletions core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,17 +817,6 @@ default boolean supportsMissingColumnsOnInsert()
return false;
}

/**
* Finish insert query
*
* @deprecated use {@link #finishInsert(ConnectorSession, ConnectorInsertTableHandle, List, Collection, Collection)}
*/
@Deprecated
default Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
{
throw new TrinoException(GENERIC_INTERNAL_ERROR, "ConnectorMetadata beginInsert() is implemented without finishInsert()");
}

/**
* Finish insert query
*/
Expand All @@ -838,8 +827,7 @@ default Optional<ConnectorOutputMetadata> finishInsert(
Collection<Slice> fragments,
Collection<ComputedStatistics> computedStatistics)
{
// Delegate to deprecated SPI to not break existing connectors
return finishInsert(session, insertHandle, fragments, computedStatistics);
throw new TrinoException(GENERIC_INTERNAL_ERROR, "ConnectorMetadata beginInsert() is implemented without finishInsert()");
}

/**
Expand Down
8 changes: 0 additions & 8 deletions ...lkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,14 +611,6 @@ public boolean supportsMissingColumnsOnInsert()
}
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
{
try (ThreadContextClassLoader _ = new ThreadContextClassLoader(classLoader)) {
return delegate.finishInsert(session, insertHandle, fragments, computedStatistics);
}
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, List<ConnectorTableHandle> sourceTableHandles, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
{
Expand Down
7 changes: 6 additions & 1 deletion plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,12 @@ public ConnectorInsertTableHandle beginInsert(ConnectorSession session, Connecto
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
public Optional<ConnectorOutputMetadata> finishInsert(
ConnectorSession session,
ConnectorInsertTableHandle insertHandle,
List<ConnectorTableHandle> sourceTableHandles,
Collection<Slice> fragments,
Collection<ComputedStatistics> computedStatistics)
{
return Optional.empty();
}
Expand Down
6 changes: 0 additions & 6 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2169,12 +2169,6 @@ else if (isTransactional) {
return result;
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
{
throw new UnsupportedOperationException("This method is not supported because finishInsert with sourceTableHandles is implemented instead");
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(
ConnectorSession session,
Expand Down
9 changes: 7 additions & 2 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
return Optional.empty();
}

return finishInsert(session, icebergTableHandle, fragments, computedStatistics);
return finishInsert(session, icebergTableHandle, ImmutableList.of(), fragments, computedStatistics);
}
catch (AlreadyExistsException e) {
// May happen when table has been already created concurrently.
Expand Down Expand Up @@ -1171,7 +1171,12 @@ private static List<TrinoSortField> getSupportedSortFields(Schema schema, SortOr
}

@Override
public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session, ConnectorInsertTableHandle insertHandle, Collection<Slice> fragments, Collection<ComputedStatistics> computedStatistics)
public Optional<ConnectorOutputMetadata> finishInsert(
ConnectorSession session,
ConnectorInsertTableHandle insertHandle,
List<ConnectorTableHandle> sourceTableHandles,
Collection<Slice> fragments,
Collection<ComputedStatistics> computedStatistics)
{
List<CommitTaskData> commitTasks = fragments.stream()
.map(slice -> commitTaskCodec.fromJson(slice.getBytes()))
Expand Down