You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ht...@apache.org on 2020/06/16 11:11:23 UTC

[asterixdb] 03/03: Merge "Merge commit '0163af68d0' from 'gerrit/mad-hatter'"

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 51c5b056662c8f260b2d477c699a67146e01ee7b
Merge: 64ae834 7e74c73
Author: Apache AsterixDB Gerrit <de...@asterixdb.apache.org>
AuthorDate: Tue Jun 16 10:33:05 2020 +0000

    Merge "Merge commit '0163af68d0' from 'gerrit/mad-hatter'"

 .../asterix/app/translator/QueryTranslator.java    |  14 +-
 .../aws/AwsS3ExternalDatasetOnePartitionTest.java  |   6 +-
 .../aws/AwsS3ExternalDatasetTest.java              | 154 ++++++++++++++----
 .../external_dataset.000.ddl.sqlpp                 |   2 +-
 .../bad-name-1/test.000.ddl.sqlpp}                 |   8 +-
 .../bad-name-1/test.099.ddl.sqlpp}                 |  19 +--
 .../bad-name-2/test.000.ddl.sqlpp}                 |   8 +-
 .../bad-name-2/test.099.ddl.sqlpp}                 |  19 +--
 .../bad-name-3/test.000.ddl.sqlpp}                 |   8 +-
 .../bad-name-3/test.099.ddl.sqlpp}                 |  19 +--
 .../both/test.000.ddl.sqlpp}                       |   8 +-
 .../both/test.099.ddl.sqlpp}                       |  19 +--
 .../exclude-1/test.000.ddl.sqlpp}                  |   7 +-
 .../exclude-1/test.001.query.sqlpp}                |  18 +--
 .../exclude-1/test.099.ddl.sqlpp}                  |  19 +--
 .../exclude-2/test.000.ddl.sqlpp}                  |   9 +-
 .../exclude-2/test.001.query.sqlpp}                |  18 +--
 .../exclude-2/test.099.ddl.sqlpp}                  |  19 +--
 .../exclude-3/test.000.ddl.sqlpp}                  |   8 +-
 .../exclude-3/test.001.query.sqlpp}                |  18 +--
 .../exclude-3/test.099.ddl.sqlpp}                  |  19 +--
 .../exclude-4/test.000.ddl.sqlpp}                  |   8 +-
 .../exclude-4/test.001.query.sqlpp}                |  18 +--
 .../exclude-4/test.099.ddl.sqlpp}                  |  19 +--
 .../exclude-5/test.000.ddl.sqlpp}                  |   8 +-
 .../exclude-5/test.001.query.sqlpp}                |  18 +--
 .../exclude-5/test.099.ddl.sqlpp}                  |  19 +--
 .../exclude-6/test.000.ddl.sqlpp}                  |   7 +-
 .../exclude-6/test.001.query.sqlpp}                |  18 +--
 .../exclude-6/test.099.ddl.sqlpp}                  |  19 +--
 .../exclude-all/test.000.ddl.sqlpp}                |   7 +-
 .../exclude-all/test.001.query.sqlpp}              |  18 +--
 .../exclude-all/test.099.ddl.sqlpp}                |  19 +--
 .../include-1/test.000.ddl.sqlpp}                  |   7 +-
 .../include-1/test.001.query.sqlpp}                |  18 +--
 .../include-1/test.099.ddl.sqlpp}                  |  19 +--
 .../include-10/test.000.ddl.sqlpp}                 |   8 +-
 .../include-10/test.001.query.sqlpp}               |  18 +--
 .../include-10/test.099.ddl.sqlpp}                 |  19 +--
 .../include-2/test.000.ddl.sqlpp}                  |   7 +-
 .../include-2/test.001.query.sqlpp}                |  18 +--
 .../include-2/test.002.query.sqlpp}                |  18 +--
 .../include-2/test.099.ddl.sqlpp}                  |  19 +--
 .../include-3/test.000.ddl.sqlpp}                  |  10 +-
 .../include-3/test.001.query.sqlpp}                |  18 +--
 .../include-3/test.099.ddl.sqlpp}                  |  19 +--
 .../include-4/test.000.ddl.sqlpp}                  |  10 +-
 .../include-4/test.001.query.sqlpp}                |  18 +--
 .../include-4/test.099.ddl.sqlpp}                  |  19 +--
 .../include-5/test.000.ddl.sqlpp}                  |   7 +-
 .../include-5/test.001.query.sqlpp}                |  18 +--
 .../include-5/test.099.ddl.sqlpp}                  |  19 +--
 .../include-6/test.000.ddl.sqlpp}                  |   7 +-
 .../include-6/test.001.query.sqlpp}                |  18 +--
 .../include-6/test.099.ddl.sqlpp}                  |  19 +--
 .../include-7/test.000.ddl.sqlpp}                  |   8 +-
 .../include-7/test.001.query.sqlpp}                |  18 +--
 .../include-7/test.099.ddl.sqlpp}                  |  19 +--
 .../include-8/test.000.ddl.sqlpp}                  |   8 +-
 .../include-8/test.001.query.sqlpp}                |  18 +--
 .../include-8/test.099.ddl.sqlpp}                  |  19 +--
 .../include-9/test.000.ddl.sqlpp}                  |   8 +-
 .../include-9/test.001.query.sqlpp}                |  18 +--
 .../include-9/test.099.ddl.sqlpp}                  |  19 +--
 .../include-all/test.000.ddl.sqlpp}                |   7 +-
 .../include-all/test.001.query.sqlpp}              |  18 +--
 .../include-all/test.099.ddl.sqlpp}                |  19 +--
 .../s3/include-exclude/exclude-1/result.001.adm    |   1 +
 .../s3/include-exclude/exclude-2/result.001.adm    |   1 +
 .../s3/include-exclude/exclude-3/result.001.adm    |   1 +
 .../s3/include-exclude/exclude-4/result.001.adm    |   1 +
 .../s3/include-exclude/exclude-5/result.001.adm    |   1 +
 .../s3/include-exclude/exclude-6/result.001.adm    |   1 +
 .../s3/include-exclude/exclude-all/result.001.adm  |   1 +
 .../s3/include-exclude/include-1/result.001.adm    |   1 +
 .../s3/include-exclude/include-2/result.001.adm    |   1 +
 .../s3/include-exclude/include-2/result.002.adm    |   4 +
 .../s3/include-exclude/include-3/result.001.adm    |   1 +
 .../s3/include-exclude/include-4/result.001.adm    |   1 +
 .../s3/include-exclude/include-5/result.001.adm    |   1 +
 .../s3/include-exclude/include-6/result.001.adm    |   1 +
 .../s3/include-exclude/include-7/result.001.adm    |   1 +
 .../s3/include-exclude/include-8/result.001.adm    |   1 +
 .../s3/include-exclude/include-9/result.001.adm    |   1 +
 .../runtimets/testsuite_external_dataset.xml       | 118 ++++++++++++++
 .../test/resources/runtimets/testsuite_sqlpp.xml   |  22 +--
 .../asterix/common/exceptions/ErrorCode.java       |  18 ++-
 .../src/main/resources/asx_errormsg/en.properties  |  18 ++-
 .../record/reader/aws/AwsS3InputStreamFactory.java | 113 ++++++-------
 .../external/util/ExternalDataConstants.java       |   2 +
 .../asterix/external/util/ExternalDataUtils.java   | 174 ++++++++++++++++++++-
 91 files changed, 681 insertions(+), 913 deletions(-)