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 redundant TupleDomain conversions #11077

Closed
wants to merge 1 commit into from
Closed

Remove redundant TupleDomain conversions #11077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/CountQueryPageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public CountQueryPageSource(ElasticsearchClient client, ElasticsearchTableHandle
long count = client.count(
split.getIndex(),
split.getShard(),
buildSearchQuery(table.getConstraint().transformKeys(ElasticsearchColumnHandle.class::cast), table.getQuery()));
buildSearchQuery(table.getConstraint(), table.getQuery()));
readTimeNanos = System.nanoTime() - start;

if (table.getLimit().isPresent()) {
Expand Down
6 changes: 3 additions & 3 deletions ...rino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
return Optional.empty();
}

Map<ColumnHandle, Domain> supported = new HashMap<>();
Map<ElasticsearchColumnHandle, Domain> supported = new HashMap<>();
Map<ColumnHandle, Domain> unsupported = new HashMap<>();
if (constraint.getSummary().getDomains().isPresent()) {
for (Map.Entry<ColumnHandle, Domain> entry : constraint.getSummary().getDomains().get().entrySet()) {
Expand All @@ -519,8 +519,8 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
}
}

TupleDomain<ColumnHandle> oldDomain = handle.getConstraint();
TupleDomain<ColumnHandle> newDomain = oldDomain.intersect(TupleDomain.withColumnDomains(supported));
TupleDomain<ElasticsearchColumnHandle> oldDomain = handle.getConstraint();
TupleDomain<ElasticsearchColumnHandle> newDomain = oldDomain.intersect(TupleDomain.withColumnDomains(supported));
if (oldDomain.equals(newDomain)) {
return Optional.empty();
}
Expand Down
7 changes: 3 additions & 4 deletions ...o-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchTableHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ConnectorTableHandle;
import io.trino.spi.predicate.TupleDomain;

Expand All @@ -36,7 +35,7 @@ public enum Type
private final Type type;
private final String schema;
private final String index;
private final TupleDomain<ColumnHandle> constraint;
private final TupleDomain<ElasticsearchColumnHandle> constraint;
private final Optional<String> query;
private final OptionalLong limit;

Expand All @@ -56,7 +55,7 @@ public ElasticsearchTableHandle(
@JsonProperty("type") Type type,
@JsonProperty("schema") String schema,
@JsonProperty("index") String index,
@JsonProperty("constraint") TupleDomain<ColumnHandle> constraint,
@JsonProperty("constraint") TupleDomain<ElasticsearchColumnHandle> constraint,
@JsonProperty("query") Optional<String> query,
@JsonProperty("limit") OptionalLong limit)
{
Expand Down Expand Up @@ -87,7 +86,7 @@ public String getIndex()
}

@JsonProperty
public TupleDomain<ColumnHandle> getConstraint()
public TupleDomain<ElasticsearchColumnHandle> getConstraint()
{
return constraint;
}
Expand Down
2 changes: 1 addition & 1 deletion .../trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ScanQueryPageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public ScanQueryPageSource(
SearchResponse searchResponse = client.beginSearch(
split.getIndex(),
split.getShard(),
buildSearchQuery(table.getConstraint().transformKeys(ElasticsearchColumnHandle.class::cast), table.getQuery()),
buildSearchQuery(table.getConstraint(), table.getQuery()),
needAllFields ? Optional.empty() : Optional.of(requiredFields),
documentFields,
sort,
Expand Down
12 changes: 5 additions & 7 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/BackgroundHiveSplitLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import io.trino.plugin.hive.util.ResumableTask;
import io.trino.plugin.hive.util.ResumableTasks;
import io.trino.spi.TrinoException;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.DynamicFilter;
import io.trino.spi.predicate.TupleDomain;
Expand Down Expand Up @@ -147,7 +146,7 @@ public class BackgroundHiveSplitLoader

private final Table table;
private final AcidTransaction transaction;
private final TupleDomain<? extends ColumnHandle> compactEffectivePredicate;
private final TupleDomain<HiveColumnHandle> compactEffectivePredicate;
private final DynamicFilter dynamicFilter;
private final long dynamicFilteringWaitTimeoutMillis;
private final TypeManager typeManager;
Expand Down Expand Up @@ -192,7 +191,7 @@ public BackgroundHiveSplitLoader(
Table table,
AcidTransaction transaction,
Iterable<HivePartitionMetadata> partitions,
TupleDomain<? extends ColumnHandle> compactEffectivePredicate,
TupleDomain<HiveColumnHandle> compactEffectivePredicate,
DynamicFilter dynamicFilter,
Duration dynamicFilteringWaitTimeout,
TypeManager typeManager,
Expand Down Expand Up @@ -371,7 +370,6 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
String partitionName = hivePartition.getPartitionId();
Properties schema = getPartitionSchema(table, partition.getPartition());
List<HivePartitionKey> partitionKeys = getPartitionKeys(table, partition.getPartition());
TupleDomain<HiveColumnHandle> effectivePredicate = compactEffectivePredicate.transformKeys(HiveColumnHandle.class::cast);

List<HiveColumnHandle> partitionColumns = getPartitionKeyColumnHandles(table, typeManager);
BooleanSupplier partitionMatchSupplier =
Expand Down Expand Up @@ -412,7 +410,7 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
partitionName,
schema,
partitionKeys,
effectivePredicate,
compactEffectivePredicate,
partitionMatchSupplier,
s3SelectPushdownEnabled,
partition.getTableToPartitionMapping(),
Expand All @@ -429,7 +427,7 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
targetInputFormat,
schema,
partitionKeys,
effectivePredicate,
compactEffectivePredicate,
partitionMatchSupplier,
s3SelectPushdownEnabled,
partition.getTableToPartitionMapping(),
Expand Down Expand Up @@ -467,7 +465,7 @@ private ListenableFuture<Void> loadPartition(HivePartitionMetadata partition)
inputFormat,
schema,
partitionKeys,
effectivePredicate,
compactEffectivePredicate,
partitionMatchSupplier,
partition.getTableToPartitionMapping(),
bucketConversionRequiresWorkerParticipation ? bucketConversion : Optional.empty(),
Expand Down