From 47a255f049891c663ea05be96d99595eb9725983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Wa=C5=9B?= <jan.was@starburstdata.com>
Date: Mon, 16 Oct 2023 11:39:28 +0200
Subject: [PATCH] Update dependencies

---
 pom.xml                                          | 16 ++++++++--------
 .../trino/storage/StoragePageSourceProvider.java |  8 +++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 41a88c9..a5a6b73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,17 +45,17 @@
         <air.check.fail-checkstyle>true</air.check.fail-checkstyle>
         <air.check.skip-checkstyle>false</air.check.skip-checkstyle>
 
-        <dep.trino.version>428</dep.trino.version>
-        <dep.airlift.version>235</dep.airlift.version>
+        <dep.trino.version>429</dep.trino.version>
+        <dep.airlift.version>237</dep.airlift.version>
         <dep.slice.version>2.2</dep.slice.version>
-        <dep.opentelemetry.version>1.30.1</dep.opentelemetry.version>
-        <dep.opentelemetry-instrumentation.version>1.30.0</dep.opentelemetry-instrumentation.version>
+        <dep.opentelemetry.version>1.31.0</dep.opentelemetry.version>
+        <dep.opentelemetry-instrumentation.version>1.31.0</dep.opentelemetry-instrumentation.version>
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
-        <dep.aws-sdk.version>1.12.561</dep.aws-sdk.version>
-        <dep.guava.version>32.1.2-jre</dep.guava.version>
+        <dep.aws-sdk.version>1.12.566</dep.aws-sdk.version>
+        <dep.guava.version>32.1.3-jre</dep.guava.version>
         <dep.guice.version>7.0.0</dep.guice.version>
         <dep.errorprone.version>2.22.0</dep.errorprone.version>
-        <dep.jackson.version>2.15.2</dep.jackson.version>
+        <dep.jackson.version>2.15.3</dep.jackson.version>
         <dep.testcontainers.version>1.19.1</dep.testcontainers.version>
         <dep.docker-java.version>3.3.3</dep.docker-java.version>
         <dep.testng.version>7.8.0</dep.testng.version>
@@ -78,7 +78,7 @@
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.14.8</version>
+                <version>1.14.9</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.jna</groupId>
diff --git a/src/main/java/org/ebyhr/trino/storage/StoragePageSourceProvider.java b/src/main/java/org/ebyhr/trino/storage/StoragePageSourceProvider.java
index 25f7122..f3344a7 100644
--- a/src/main/java/org/ebyhr/trino/storage/StoragePageSourceProvider.java
+++ b/src/main/java/org/ebyhr/trino/storage/StoragePageSourceProvider.java
@@ -14,6 +14,7 @@
 package org.ebyhr.trino.storage;
 
 import com.google.inject.Inject;
+import io.trino.spi.Page;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
@@ -29,8 +30,10 @@
 import org.ebyhr.trino.storage.operator.PluginFactory;
 
 import java.util.List;
+import java.util.stream.StreamSupport;
 
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
 import static org.ebyhr.trino.storage.StorageSplit.Mode.LIST;
 
 public class StoragePageSourceProvider
@@ -65,7 +68,10 @@ public ConnectorPageSource createPageSource(
         FilePlugin plugin = PluginFactory.create(schemaName);
 
         try {
-            return new FixedPageSource(plugin.getPagesIterator(tableName, path -> storageClient.getInputStream(session, path)));
+            Iterable<Page> iterable = plugin.getPagesIterator(tableName, path -> storageClient.getInputStream(session, path));
+            List<Page> pages = StreamSupport.stream(iterable.spliterator(), false)
+                    .collect(toList());
+            return new FixedPageSource(pages);
         }
         catch (UnsupportedOperationException ignored) {
             // Ignore it when a plugin doesn't implement getPagesIterator