diff --git a/pom.xml b/pom.xml index d42bf32..23262e7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 170 + 176 pl.net.was @@ -50,22 +50,22 @@ false 4g - 455 - 261 + 459 + 268 2.3 - 1.41.0 - 2.7.0 + 1.42.1 + 2.8.0 ${dep.airlift.version} - 33.3.0-jre + 33.3.1-jre 7.0.0 - 2.31.0 - 2.17.2 - 2.12.7 - 5.11.0 + 2.32.0 + 2.18.0 + 2.13.0 + 5.11.1 2.0.16 3.26.3 - 1.5.7 + 1.5.8 3.2.5 5.14.0 diff --git a/trino-cloud-aws/pom.xml b/trino-cloud-aws/pom.xml index f7cff28..442c565 100644 --- a/trino-cloud-aws/pom.xml +++ b/trino-cloud-aws/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk bom - 2.27.16 + 2.28.11 pom import diff --git a/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsConnectorSplit.java b/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsConnectorSplit.java index 0057134..5672b66 100644 --- a/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsConnectorSplit.java +++ b/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsConnectorSplit.java @@ -49,12 +49,6 @@ public List getAddresses() return addresses; } - @Override - public Object getInfo() - { - return "AWS split"; - } - @JsonProperty("tableHandle") public AwsTableHandle getTableHandle() { diff --git a/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsMetadata.java b/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsMetadata.java index f617312..1e08fb5 100644 --- a/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsMetadata.java +++ b/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsMetadata.java @@ -350,6 +350,7 @@ public ConnectorInsertTableHandle beginInsert( public Optional finishInsert( ConnectorSession session, ConnectorInsertTableHandle insertHandle, + List sourceTableHandles, Collection fragments, Collection computedStatistics) { @@ -422,6 +423,6 @@ public Optional> applyFilter( awsTable, columnHandles.get(tableName), filterApplier.getSupportedFilters(), - constraint.getSummary()); + constraint); } } diff --git a/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/filters/FilterApplier.java b/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/filters/FilterApplier.java index 597bec0..0162b43 100644 --- a/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/filters/FilterApplier.java +++ b/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/filters/FilterApplier.java @@ -18,6 +18,7 @@ import io.trino.spi.TrinoException; import io.trino.spi.connector.ColumnHandle; import io.trino.spi.connector.ConnectorTableHandle; +import io.trino.spi.connector.Constraint; import io.trino.spi.connector.ConstraintApplicationResult; import io.trino.spi.predicate.Domain; import io.trino.spi.predicate.Range; @@ -57,10 +58,11 @@ default Optional> applyFilter( AwsTableHandle table, Map columns, Map supportedColumnFilters, - TupleDomain constraint) + Constraint constraint) { + TupleDomain summary = constraint.getSummary(); // the only reason not to use isNone is so the linter doesn't complain about not checking an Optional - if (constraint.isAll() || constraint.getDomains().isEmpty()) { + if (summary.isAll() || summary.getDomains().isEmpty()) { return Optional.empty(); } @@ -72,7 +74,7 @@ default Optional> applyFilter( FilterType supportedFilter = entry.getValue(); ColumnHandle column = columns.get(columnName); - TupleDomain newConstraint = normalizeConstraint((AwsColumnHandle) column, supportedFilter, constraint); + TupleDomain newConstraint = normalizeConstraint((AwsColumnHandle) column, supportedFilter, summary); if (newConstraint == null || newConstraint.getDomains().isEmpty()) { continue; } @@ -94,7 +96,7 @@ else if (!currentConstraint.getDomains().get().containsKey(column)) { } found = true; // remove from remaining constraints - constraint = constraint.filter( + summary = summary.filter( (columnHandle, tupleDomain) -> !columnHandle.equals(column)); } if (!found) { @@ -103,7 +105,8 @@ else if (!currentConstraint.getDomains().get().containsKey(column)) { return Optional.of(new ConstraintApplicationResult<>( table.cloneWithConstraint(currentConstraint), - constraint, + summary, + constraint.getExpression(), true)); }