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 86fab3bc35ec8d3b693132312d112c67d58fe830 Merge: c573bc8354 77caf7e988 Author: Michael Blow <[email protected]> AuthorDate: Sat Jun 25 11:37:33 2022 -0400 Merge branch 'gerrit/mad-hatter' Change-Id: Idf4a1fa8a0258c7f74ee3776639eea11d20a35dd asterixdb/NOTICE | 2 +- .../runtimets/testsuite_external_dataset_s3.xml | 2 +- asterixdb/pom.xml | 2 +- .../appended-resources/supplemental-models.xml | 58 +++++++++++----------- ....com_netty_netty_netty-4.1.78.Final_NOTICE.txt} | 0 hyracks-fullstack/pom.xml | 17 ++++--- 6 files changed, 43 insertions(+), 38 deletions(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml index 29adec84c9,0000000000..0d6a700dae mode 100644,000000..100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml @@@ -1,336 -1,0 +1,336 @@@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + ! Licensed to the Apache Software Foundation (ASF) under one + ! or more contributor license agreements. See the NOTICE file + ! distributed with this work for additional information + ! regarding copyright ownership. The ASF licenses this file + ! to you under the Apache License, Version 2.0 (the + ! "License"); you may not use this file except in compliance + ! with the License. You may obtain a copy of the License at + ! + ! http://www.apache.org/licenses/LICENSE-2.0 + ! + ! Unless required by applicable law or agreed to in writing, + ! software distributed under the License is distributed on an + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ! KIND, either express or implied. See the License for the + ! specific language governing permissions and limitations + ! under the License. + !--> +<test-suite xmlns="urn:xml.testframework.asterix.apache.org" ResultOffsetPath="results" QueryOffsetPath="queries_sqlpp" QueryFileExtension=".sqlpp"> + <test-group name="aws-s3-external-dataset"> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/json/json"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/json/json</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/s3"> + <compilation-unit name="create-with-session-token"> + <output-dir compare="Text">create-with-session-token</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/json/gz"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/json/gz</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/json/mixed"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/json/mixed</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/csv/csv"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/csv/csv</output-dir> + </compilation-unit> + </test-case><test-case FilePath="external-dataset"> + <compilation-unit name="common/csv/gz"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/csv/gz</output-dir> + </compilation-unit> + </test-case><test-case FilePath="external-dataset"> + <compilation-unit name="common/csv/mixed"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/csv/mixed</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/tsv/tsv"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/tsv/tsv</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/tsv/gz"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/tsv/gz</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/tsv/mixed"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/tsv/mixed</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/empty-string-definition"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/empty-string-definition</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/over-1000-objects"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/over-1000-objects</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/malformed-json"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/malformed-json</output-dir> + <expected-error>Parsing error at malformed-data/duplicate-fields.json line 1 field 'field': Duplicate field 'field'</expected-error> + <expected-error>Parsing error at malformed-data/malformed-json.json line 1 field 'field': Unexpected character ('}' (code 125)): was expecting double-quote to start field name</expected-error> + <expected-error>Parsing error at malformed-data/malformed-json-2.json line 4 field 'array_f': Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error> + <expected-error>Parsing error at malformed-data/malformed-jsonl-1.json line 3 field 'field2': Unrecognized token 'truee': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error> + <expected-error>Parsing error at malformed-data/malformed-jsonl-2.json line 11 field 'array_f': Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/definition-does-not-exist"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/definition-does-not-exist</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/invalid-endpoint"> + <placeholder name="adapter" value="S3" /> + <placeholder name="serviceEndpoint" value="^invalid-endpoint^" /> + <output-dir compare="Text">common/invalid-endpoint</output-dir> + <expected-error>External source error. Invalid service endpoint ^invalid-endpoint^</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/bucket-does-not-exist"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/bucket-does-not-exist</output-dir> - <expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null, Extended Request ID: null)</expected-error> ++ <expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null)</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset" check-warnings="true"> + <compilation-unit name="common/no-files-returned/definition-points-to-nothing"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/no-files-returned/definition-points-to-nothing</output-dir> + <source-location>false</source-location> + <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> + <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset" check-warnings="true"> + <compilation-unit name="common/no-files-returned/exclude-all-files"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/no-files-returned/exclude-all-files</output-dir> + <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset" check-warnings="true"> + <compilation-unit name="common/no-files-returned/include-no-files"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/no-files-returned/include-no-files</output-dir> + <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/s3"> + <compilation-unit name="non-s3-region"> + <output-dir compare="Text">non-s3-region</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/s3"> + <compilation-unit name="anonymous_no_auth"> + <output-dir compare="Text">anonymous_no_auth</output-dir> + <expected-error>ASX3119: Parameter 'secretAccessKey' is required if 'accessKeyId' is provided</expected-error> + <expected-error>ASX3119: Parameter 'accessKeyId' is required if 'secretAccessKey' is provided</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/common"> + <compilation-unit name="query-with-limit-plan"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">query-with-limit-plan</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="s3-include-exclude"> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/bad-name-1"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/bad-name-1</output-dir> + <expected-error>Invalid format for property "exclude1"</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/bad-name-2"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/bad-name-2</output-dir> + <expected-error>Invalid format for property "exclude#"</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/bad-name-3"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/bad-name-3</output-dir> + <expected-error>Invalid format for property "exclude#hello"</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/both"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/both</output-dir> + <expected-error>The parameters "include" and "exclude" cannot be provided at the same time</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/exclude-all"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/exclude-all</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/exclude-1"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/exclude-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/exclude-2"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/exclude-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/exclude-3"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/exclude-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/exclude-4"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/exclude-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/exclude-5"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/exclude-5</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/exclude-6"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/exclude-6</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-all"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-all</output-dir> + <expected-error>Malformed input stream</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-1"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-2"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-3"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-4"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-5"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-5</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-6"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-6</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-7"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-7</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-8"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-8</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-9"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-9</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-10"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-10</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-11"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-11</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/include-exclude/include-12"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/include-exclude/include-12</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="bom"> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/byte_order_mark/json"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/byte_order_mark/json</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/byte_order_mark/csv"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/byte_order_mark/csv</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset"> + <compilation-unit name="common/byte_order_mark/tsv"> + <placeholder name="adapter" value="S3" /> + <output-dir compare="Text">common/byte_order_mark/tsv</output-dir> + </compilation-unit> + </test-case> + </test-group> +</test-suite> diff --cc asterixdb/pom.xml index ff4e478be9,2bec4b7013..f4bca0dabb --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -87,9 -83,7 +87,9 @@@ <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.17.1</log4j.version> - <awsjavasdk.version>2.17.116</awsjavasdk.version> + <awsjavasdk.version>2.17.218</awsjavasdk.version> + <azurejavasdk.version>12.12.0</azurejavasdk.version> + <parquet.version>1.8.2</parquet.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index 809ea27d56,b16967dad7..f5a0d1dd73 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -278,23 -254,11 +278,23 @@@ <project> <groupId>io.netty</groupId> <artifactId>netty-resolver</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.78.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.78.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.78.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> diff --cc hyracks-fullstack/pom.xml index ec1e1def8f,2016cde975..1214c57cb4 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -111,23 -111,13 +111,28 @@@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> - <version>4.1.73.Final</version> + <version>4.1.78.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-classes-epoll</artifactId> + <version>4.1.78.Final</version> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> + <version>4.1.73.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http2</artifactId> + <version>4.1.73.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> + <version>4.1.73.Final</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>
