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 2d4da74962c5b625cbcd4bddd12684d31aacfb32 Merge: cb90519 b10bda4 Author: Michael Blow <[email protected]> AuthorDate: Sat Mar 5 10:11:21 2022 -0500 Merge branch 'gerrit/neo' Change-Id: I9e39d970fddd4652f1c459b50c9abb51cb2d0137 .../asterix/translator/util/ValidateUtil.java | 38 +++++++++++++------ .../app/message/StorageCleanupRequestMessage.java | 7 +++- .../asterix/app/translator/QueryTranslator.java | 33 ++++++++++------ .../src/test/resources/metadata/testsuite.xml | 12 +++--- .../api/cluster_state_1/cluster_state_1.1.regexadm | 1 + .../cluster_state_1_full.1.regexadm | 1 + .../cluster_state_1_less.1.regexadm | 1 + .../test/resources/runtimets/testsuite_sqlpp.xml | 6 +-- .../asterix/common/config/ExternalProperties.java | 7 +++- .../reader/azure/blob/AzureBlobInputStream.java | 11 ++++-- .../azure/blob/AzureBlobInputStreamFactory.java | 9 ++++- .../azure/datalake/AzureDataLakeInputStream.java | 12 +++--- .../datalake/AzureDataLakeInputStreamFactory.java | 9 ++++- .../parquet/AzureBlobParquetReaderFactory.java | 4 +- .../parquet/AzureDataLakeParquetReaderFactory.java | 5 ++- .../input/stream/AbstractMultipleInputStream.java | 44 +++++++++++++--------- .../asterix/external/util/ExternalDataUtils.java | 30 +++++++++------ .../apache/asterix/lang/common/util/ViewUtil.java | 4 +- .../apache/asterix/metadata/utils/TypeUtil.java | 17 +++++---- 19 files changed, 163 insertions(+), 88 deletions(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm index 70092cf,1805e7a..d99f2e9 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm @@@ -8,8 -8,8 +8,9 @@@ "active\.memory\.global\.budget" : 67108864, "active\.stop\.timeout" : 3600, "active\.suspend\.timeout" : 3600, + "azure.request.timeout" : 120, "compiler\.arrayindex" : true, + "compiler.batch.lookup" : false, "compiler\.external\.field\.pushdown" : true, "compiler\.framesize" : 32768, "compiler\.groupmemory" : 163840, diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm index 3faac6f,743347a..479de3e --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm @@@ -8,8 -8,8 +8,9 @@@ "active\.memory\.global\.budget" : 67108864, "active\.stop\.timeout" : 3600, "active\.suspend\.timeout" : 3600, + "azure.request.timeout" : 120, "compiler\.arrayindex" : true, + "compiler.batch.lookup" : false, "compiler\.external\.field\.pushdown" : true, "compiler\.framesize" : 32768, "compiler\.groupmemory" : 163840, diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm index e42306c,4359bd9..3349f11 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm @@@ -8,8 -8,8 +8,9 @@@ "active\.memory\.global\.budget" : 67108864, "active\.stop\.timeout" : 3600, "active\.suspend\.timeout" : 3600, + "azure.request.timeout" : 120, "compiler\.arrayindex" : true, + "compiler.batch.lookup" : false, "compiler\.external\.field\.pushdown" : true, "compiler\.framesize" : 32768, "compiler\.groupmemory" : 163840,
