This is an automated email from the ASF dual-hosted git repository. htowaileb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 048a3cdaeb70024afec2af576f051f8087c9a2ce Merge: 3f59cf49dc 40dd756a39 Author: Hussain Towaileb <[email protected]> AuthorDate: Sat Jul 9 14:46:54 2022 +0300 Merge branch 'gerrit/neo' Change-Id: I97080b91f6a2c96141b7712c906aa6479ee61c51 .../queries_sqlpp/objects/ObjectsQueries.xml | 8 +- .../object_concat/object_concat.4.query.sqlpp | 28 +++ ...nstructor-with-missing-field-name.1.query.sqlpp | 21 +++ ...nstructor-with-missing-field-name.2.query.sqlpp | 44 +++++ .../objects/object_concat/object_concat.4.adm | 1 + ...bject-constructor-with-missing-field-name.1.adm | 2 + ...bject-constructor-with-missing-field-name.2.adm | 3 + .../external/input/HDFSDataSourceFactory.java | 5 +- .../aws/parquet/AwsS3ParquetReaderFactory.java | 26 ++- .../org/apache/asterix/builders/RecordBuilder.java | 11 +- .../functions/records/RecordConcatEvalFactory.java | 18 +- asterixdb/asterix-server/pom.xml | 93 +++++----- asterixdb/pom.xml | 2 +- .../appended-resources/supplemental-models.xml | 148 +++++++-------- ...rumentation_opencensus-java_v0.28.0_LICENSE.txt | 202 --------------------- ...t.com_google_gson_gson-parent-2.8.9_LICENSE.txt | 202 --------------------- ..._googleapis_api-common-java_v2.2.1_LICENSE.txt} | 1 - ...nt.com_googleapis_gax-java_v2.18.2_LICENSE.txt} | 0 ...apis_google-api-java-client_v1.33.0_LICENSE.txt | 201 -------------------- ...is_google-auth-library-java_v1.7.0_LICENSE.txt} | 0 ...pis_google-http-java-client_v1.41.0_LICENSE.txt | 201 -------------------- ...is_google-oauth-java-client_v1.32.1_LICENSE.txt | 201 -------------------- ...ent.com_googleapis_java-core_v2.3.5_LICENSE.txt | 201 -------------------- ...ercontent.com_grpc_grpc-java_v1.47.0_NOTICE.txt | 62 +++++++ ...m_protocolbuffers_protobuf_v3.21.1_LICENSE.txt} | 0 25 files changed, 345 insertions(+), 1336 deletions(-) diff --cc asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/parquet/AwsS3ParquetReaderFactory.java index ff93a46460,4e3d1ec044..92b7a95e47 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/parquet/AwsS3ParquetReaderFactory.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/parquet/AwsS3ParquetReaderFactory.java @@@ -52,10 -58,20 +60,20 @@@ public class AwsS3ParquetReaderFactory putS3ConfToHadoopConf(configuration, path); //Configure Hadoop S3 input splits - JobConf conf = createHdfsConf(serviceCtx, configuration); - int numberOfPartitions = getPartitionConstraint().getLocations().length; - S3Utils.configureAwsS3HdfsJobConf(conf, configuration, numberOfPartitions); - configureHdfsConf(conf, configuration); + try { + JobConf conf = createHdfsConf(serviceCtx, configuration); + int numberOfPartitions = getPartitionConstraint().getLocations().length; - ExternalDataUtils.AwsS3.configureAwsS3HdfsJobConf(conf, configuration, numberOfPartitions); ++ S3Utils.configureAwsS3HdfsJobConf(conf, configuration, numberOfPartitions); + configureHdfsConf(conf, configuration); + } catch (SdkException | SdkBaseException ex) { + throw new RuntimeDataException(ErrorCode.EXTERNAL_SOURCE_ERROR, getMessageOrToString(ex)); + } catch (AlgebricksException ex) { + Throwable root = ExceptionUtils.getRootCause(ex); + if (root instanceof SdkException || root instanceof SdkBaseException) { + throw new RuntimeDataException(ErrorCode.EXTERNAL_SOURCE_ERROR, getMessageOrToString(root)); + } + throw ex; + } } @Override diff --cc asterixdb/asterix-server/pom.xml index 3963e034f0,53a773ee03..6c2a05adc3 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -342,55 -342,37 +342,55 @@@ </override> <override> <gavs> - <gav>com.google.cloud:google-cloud-core:2.3.5</gav> - <gav>com.google.cloud:google-cloud-core-http:2.3.5</gav> + <gav>com.google.cloud:google-cloud-core:2.8.0</gav> + <gav>com.google.cloud:google-cloud-core-http:2.8.0</gav> </gavs> - <url>https://raw.githubusercontent.com/googleapis/java-core/v2.3.5/LICENSE</url> + <url>https://raw.githubusercontent.com/googleapis/java-core/v2.8.0/LICENSE</url> </override> <override> - <gav>com.google.cloud:google-cloud-storage:2.3.0</gav> - <url>https://raw.githubusercontent.com/googleapis/java-storage/v2.3.0/LICENSE</url> + <gav>com.google.cloud:google-cloud-storage:2.9.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-storage/v2.9.0/LICENSE</url> </override> + <override> + <gavs> + <gav>io.opencensus:opencensus-proto:0.2.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/census-instrumentation/opencensus-proto/v0.2.0/LICENSE</url> + </override> <override> <gavs> - <gav>io.opencensus:opencensus-api:0.28.0</gav> - <gav>io.opencensus:opencensus-contrib-http-util:0.28.0</gav> + <gav>io.opencensus:opencensus-api:0.31.1</gav> + <gav>io.opencensus:opencensus-contrib-http-util:0.31.1</gav> </gavs> - <url>https://raw.githubusercontent.com/census-instrumentation/opencensus-java/v0.28.0/LICENSE</url> + <url>https://raw.githubusercontent.com/census-instrumentation/opencensus-java/v0.31.1/LICENSE</url> </override> + <override> + <gavs> + <gav>io.opencensus:opencensus-contrib-exemplar-util:0.31.0</gav> + <gav>io.opencensus:opencensus-contrib-grpc-metrics:0.31.0</gav> + <gav>io.opencensus:opencensus-contrib-resource-util:0.31.0</gav> + <gav>io.opencensus:opencensus-exporter-metrics-util:0.31.0</gav> + <gav>io.opencensus:opencensus-exporter-stats-stackdriver:0.31.0</gav> + <gav>io.opencensus:opencensus-impl-core:0.31.0</gav> + <gav>io.opencensus:opencensus-impl:0.31.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/census-instrumentation/opencensus-java/v0.31.0/LICENSE</url> + </override> <override> - <gav>com.google.api-client:google-api-client:1.33.0</gav> - <url>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.33.0/LICENSE</url> + <gav>com.google.api-client:google-api-client:1.35.1</gav> + <url>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.35.1/LICENSE</url> </override> <override> - <gav>com.google.api.grpc:proto-google-iam-v1:1.2.0</gav> - <url>https://raw.githubusercontent.com/googleapis/java-iam/v1.2.0/proto-google-iam-v1/LICENSE</url> + <gav>com.google.api.grpc:proto-google-iam-v1:1.4.1</gav> + <url>https://raw.githubusercontent.com/googleapis/java-iam/v1.4.1/proto-google-iam-v1/LICENSE</url> </override> <override> - <gav>com.google.api.grpc:proto-google-common-protos:2.7.1</gav> - <url>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.7.1/proto-google-common-protos/LICENSE</url> + <gav>com.google.api.grpc:proto-google-common-protos:2.9.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.9.0/proto-google-common-protos/LICENSE</url> </override> <override> - <gav>com.google.api:api-common:2.1.2</gav> - <url>https://raw.githubusercontent.com/googleapis/api-common-java/v2.1.2/LICENSE</url> + <gav>com.google.api:api-common:2.2.1</gav> + <url>https://raw.githubusercontent.com/googleapis/api-common-java/v2.2.1/LICENSE</url> </override> <override> <gavs> @@@ -419,24 -401,11 +419,28 @@@ <gav>com.google.j2objc:j2objc-annotations:1.3</gav> <url>https://raw.githubusercontent.com/google/j2objc/1.3/LICENSE</url> </override> + <override> + <gavs> + <gav>io.grpc:grpc-alts:1.43.2</gav> + <gav>io.grpc:grpc-api:1.43.2</gav> + <gav>io.grpc:grpc-auth:1.43.2</gav> + <gav>io.grpc:grpc-census:1.43.2</gav> - <gav>io.grpc:grpc-context:1.43.2</gav> + <gav>io.grpc:grpc-core:1.43.2</gav> + <gav>io.grpc:grpc-grpclb:1.43.2</gav> + <gav>io.grpc:grpc-protobuf-lite:1.43.2</gav> + <gav>io.grpc:grpc-protobuf:1.43.2</gav> + <gav>io.grpc:grpc-services:1.43.2</gav> + <gav>io.grpc:grpc-stub:1.43.2</gav> + <gav>io.grpc:grpc-xds:1.43.2</gav> + </gavs> + <url>https://raw.githubusercontent.com/grpc/grpc-java/v1.43.2/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.43.2/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.grpc:grpc-context:1.47.0</gav> + <url>https://raw.githubusercontent.com/grpc/grpc-java/v1.47.0/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.47.0/NOTICE.txt</noticeUrl> + </override> <override> <gav>org.mindrot:jbcrypt:0.4</gav> <url>http://www.mindrot.org/files/jBCrypt/LICENSE</url> @@@ -555,22 -462,17 +559,29 @@@ <aliasUrl>https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/raw/5d13925b57ace092ea5e1131c338f464d85545f4/LICENSE.txt</aliasUrl> <aliasUrl>https://raw.githubusercontent.com/google/auto/auto-value-1.9/LICENSE</aliasUrl> <aliasUrl>https://raw.githubusercontent.com/google/j2objc/1.3/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.7.1/proto-google-common-protos/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/java-iam/v1.2.0/proto-google-iam-v1/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/java-storage/v2.3.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.9.0/proto-google-common-protos/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-iam/v1.4.1/proto-google-iam-v1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-storage/v2.9.0/LICENSE</aliasUrl> <aliasUrl>http://repository.jboss.org/licenses/apache-2.0.txt</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/google-http-java-client/v1.42.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/census-instrumentation/opencensus-java/v0.31.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/census-instrumentation/opencensus-java/v0.31.1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/census-instrumentation/opencensus-proto/v0.2.0/LICENSE</aliasUrl> - <alisUrl>https://raw.githubusercontent.com/google/conscrypt/2.5.1/LICENSE</alisUrl> ++ <aliasUrl>https://raw.githubusercontent.com/google/conscrypt/2.5.1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/google/flogger/flogger-0.7.1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.32.2/LICENSE</aliasUrl> ++ <aliasUrl>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.35.1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/googleapis/master/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-core/v1.82.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-monitoring/1.82.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/GoogleCloudDataproc/hadoop-connectors/v2.2.6/LICENSE</aliasUrl> - <alisUrl>https://raw.githubusercontent.com/LMAX-Exchange/disruptor/3.4.2/LICENCE.txt</alisUrl> ++ <aliasUrl>https://raw.githubusercontent.com/LMAX-Exchange/disruptor/3.4.2/LICENCE.txt</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/perfmark/perfmark/v0.23.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.43.2/LICENSE</aliasUrl> ++ <aliasUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.47.0/LICENSE</aliasUrl> ++ <aliasUrl>https://raw.githubusercontent.com/googleapis/google-http-java-client/v1.42.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/google-oauth-java-client/v1.34.1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-core/v2.8.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/google/gson/gson-parent-2.9.0/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.35.1/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.47.0/LICENSE</aliasUrl> </aliasUrls> <metric>1</metric> </license> diff --cc asterixdb/pom.xml index 108765c144,4d9d182155..69452208a2 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -92,9 -92,8 +92,9 @@@ <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version> <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version> - <gcsjavasdk.version>2.3.0</gcsjavasdk.version> + <gcsjavasdk.version>2.9.0</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> + <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url>
