This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 10e90fcbaf37ea1aa64cba689bdedf5b9681c7c3 Merge: b7cce6e2ea 70885c7998 Author: Michael Blow <[email protected]> AuthorDate: Wed Jan 31 12:38:59 2024 -0500 Merge branch 'gerrit/trinity' into 'master' Change-Id: I1d024c219be00fcc91c2d3f87973cb3e5942626a .../org/apache/asterix/external/util/aws/s3/S3Utils.java | 12 ++++++------ asterixdb/asterix-server/pom.xml | 7 +++++++ asterixdb/pom.xml | 2 +- .../src/main/appended-resources/supplemental-models.xml | 10 +++++----- ..._reactive-streams_reactive-streams-jvm_v1.0.4_LICENSE.txt | 7 +++++++ 5 files changed, 26 insertions(+), 12 deletions(-) diff --cc asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java index 650f823c52,ae32872b59..f028af3a5f --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java @@@ -433,14 -399,13 +433,14 @@@ public class S3Utils // Collect the paths to files only collectAndFilterFiles(listObjectsResponse.contents(), includeExcludeMatcher.getPredicate(), - includeExcludeMatcher.getMatchersList(), filesOnly); + includeExcludeMatcher.getMatchersList(), filesOnly, externalDataPrefix, evaluator, + warningCollector); // Mark the flag as done if done, otherwise, get the marker of the previous response for the next request - if (!listObjectsResponse.isTruncated()) { - break; - } else { + if (listObjectsResponse.isTruncated() != null && listObjectsResponse.isTruncated()) { newMarker = listObjectsResponse.nextContinuationToken(); + } else { + break; } } @@@ -476,14 -439,13 +476,14 @@@ // Collect the paths to files only collectAndFilterFiles(listObjectsResponse.contents(), includeExcludeMatcher.getPredicate(), - includeExcludeMatcher.getMatchersList(), filesOnly); + includeExcludeMatcher.getMatchersList(), filesOnly, externalDataPrefix, evaluator, + warningCollector); // Mark the flag as done if done, otherwise, get the marker of the previous response for the next request - if (!listObjectsResponse.isTruncated()) { - break; - } else { + if (listObjectsResponse.isTruncated() != null && listObjectsResponse.isTruncated()) { newMarker = listObjectsResponse.nextMarker(); + } else { + break; } } diff --cc asterixdb/pom.xml index 7d85da3fc1,ff4f38ace5..a1da969604 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -91,8 -88,7 +91,8 @@@ <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.22.1</log4j.version> - <awsjavasdk.version>2.20.135</awsjavasdk.version> + <awsjavasdk.version>2.23.3</awsjavasdk.version> + <awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version> <parquet.version>1.12.3</parquet.version> <hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
