Update dependencies

nineinchnick · Sep 29, 2024 · ce3b97f · ce3b97f
1 parent 4f042bc
commit ce3b97f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>170</version>
+        <version>176</version>
     </parent>
 
     <groupId>pl.net.was</groupId>
@@ -50,22 +50,22 @@
         <air.check.skip-checkstyle>false</air.check.skip-checkstyle>
         <air.build.jvmsize>4g</air.build.jvmsize>
 
-        <dep.trino.version>455</dep.trino.version>
-        <dep.airlift.version>261</dep.airlift.version>
+        <dep.trino.version>459</dep.trino.version>
+        <dep.airlift.version>268</dep.airlift.version>
         <dep.slice.version>2.3</dep.slice.version>
         <!-- temporary: required to be in sync with version pulled by libraries-bom -->
-        <dep.opentelemetry.version>1.41.0</dep.opentelemetry.version>
-        <dep.opentelemetry-instrumentation.version>2.7.0</dep.opentelemetry-instrumentation.version>
+        <dep.opentelemetry.version>1.42.1</dep.opentelemetry.version>
+        <dep.opentelemetry-instrumentation.version>2.8.0</dep.opentelemetry-instrumentation.version>
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
-        <dep.guava.version>33.3.0-jre</dep.guava.version>
+        <dep.guava.version>33.3.1-jre</dep.guava.version>
         <dep.guice.version>7.0.0</dep.guice.version>
-        <dep.errorprone.version>2.31.0</dep.errorprone.version>
-        <dep.jackson.version>2.17.2</dep.jackson.version>
-        <dep.joda.version>2.12.7</dep.joda.version>
-        <dep.junit.version>5.11.0</dep.junit.version>
+        <dep.errorprone.version>2.32.0</dep.errorprone.version>
+        <dep.jackson.version>2.18.0</dep.jackson.version>
+        <dep.joda.version>2.13.0</dep.joda.version>
+        <dep.junit.version>5.11.1</dep.junit.version>
         <dep.slf4j.version>2.0.16</dep.slf4j.version>
         <dep.assertj-core.version>3.26.3</dep.assertj-core.version>
-        <dep.logback.version>1.5.7</dep.logback.version>
+        <dep.logback.version>1.5.8</dep.logback.version>
         <dep.plugin.surefire.version>3.2.5</dep.plugin.surefire.version>
         <dep.jna.version>5.14.0</dep.jna.version>
 

diff --git a/trino-cloud-aws/pom.xml b/trino-cloud-aws/pom.xml
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.27.16</version>
+                <version>2.28.11</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

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
@@ -49,12 +49,6 @@ public List<HostAddress> 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
@@ -350,6 +350,7 @@ public ConnectorInsertTableHandle beginInsert(
     public Optional<ConnectorOutputMetadata> finishInsert(
             ConnectorSession session,
             ConnectorInsertTableHandle insertHandle,
+            List<ConnectorTableHandle> sourceTableHandles,
             Collection<Slice> fragments,
             Collection<ComputedStatistics> computedStatistics)
     {
@@ -422,6 +423,6 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> 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
@@ -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<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
             AwsTableHandle table,
             Map<String, ColumnHandle> columns,
             Map<String, FilterType> supportedColumnFilters,
-            TupleDomain<ColumnHandle> constraint)
+            Constraint constraint)
     {
+        TupleDomain<ColumnHandle> 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<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(
             FilterType supportedFilter = entry.getValue();
             ColumnHandle column = columns.get(columnName);
 
-            TupleDomain<ColumnHandle> newConstraint = normalizeConstraint((AwsColumnHandle) column, supportedFilter, constraint);
+            TupleDomain<ColumnHandle> 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));
     }