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 b2351dfeebac9eb6cee4edb8cfe067a1532c9fbd
Merge: 0f096f3 7ac75e7
Author: Apache AsterixDB Gerrit <[email protected]>
AuthorDate: Thu Jun 25 23:58:49 2020 +0000

    Merge "Merge commit 'c25c36d1b0' from 'gerrit/mad-hatter'"

 .../optimizer/rules/ConstantFoldingRule.java       |  4 ++-
 .../asterix/app/translator/QueryTranslator.java    | 18 +++++-----
 .../apache/asterix/test/common/TestExecutor.java   |  1 -
 .../test.000.ddl.sqlpp}                            | 35 ++++++++++----------
 .../test.001.query.sqlpp}                          | 22 ++-----------
 .../test.099.ddl.sqlpp}                            | 20 +-----------
 .../exclude-all-files/test.000.ddl.sqlpp}          | 35 ++++++++++----------
 .../exclude-all-files/test.001.query.sqlpp}        | 22 ++-----------
 .../exclude-all-files/test.099.ddl.sqlpp}          | 20 +-----------
 .../include-no-files/test.000.ddl.sqlpp}           | 35 ++++++++++----------
 .../include-no-files/test.001.query.sqlpp}         | 22 ++-----------
 .../include-no-files/test.099.ddl.sqlpp}           | 20 +-----------
 .../definition-points-to-nothing/result.001.adm    |  1 +
 .../exclude-all-files/result.001.adm               |  1 +
 .../include-no-files/result.001.adm                |  1 +
 .../runtimets/testsuite_external_dataset.xml       | 18 ++++++++++
 .../test/resources/runtimets/testsuite_sqlpp.xml   | 22 ++++++-------
 .../asterix/common/exceptions/ErrorCode.java       | 15 +++++----
 .../common/exceptions/NoOpWarningCollector.java}   | 28 ++++++++++------
 .../asterix/common/external/IAdapterFactory.java   |  6 ++--
 .../src/main/resources/asx_errormsg/en.properties  | 15 +++++----
 .../adapter/factory/GenericAdapterFactory.java     | 15 +++++----
 .../adapter/factory/LookupAdapterFactory.java      | 10 +++---
 .../external/api/IExternalDataSourceFactory.java   |  3 +-
 .../external/input/HDFSDataSourceFactory.java      |  4 ++-
 .../record/reader/aws/AwsS3InputStreamFactory.java | 17 +++++++---
 .../record/reader/aws/AwsS3ReaderFactory.java      |  5 +--
 .../reader/hdfs/HDFSLookupReaderFactory.java       |  4 ++-
 .../reader/http/HttpServerRecordReaderFactory.java |  4 ++-
 .../record/reader/rss/RSSRecordReaderFactory.java  |  4 ++-
 .../reader/stream/StreamRecordReaderFactory.java   |  7 ++--
 .../reader/twitter/TwitterRecordReaderFactory.java |  4 ++-
 .../stream/factory/LocalFSInputStreamFactory.java  |  4 ++-
 .../factory/SocketClientInputStreamFactory.java    |  4 ++-
 .../factory/SocketServerInputStreamFactory.java    |  4 ++-
 .../factory/TwitterFirehoseStreamFactory.java      |  4 ++-
 .../operators/FeedIntakeOperatorDescriptor.java    |  3 +-
 .../external/provider/AdapterFactoryProvider.java  | 15 +++++----
 .../provider/LookupReaderFactoryProvider.java      |  5 +--
 .../asterix/external/util/ExternalDataUtils.java   | 38 ++++++++++++++++++----
 .../apache/asterix/external/util/ParseUtil.java    |  5 +--
 .../reader/RecordWithPKTestReaderFactory.java      |  4 ++-
 .../record/reader/kv/KVTestReaderFactory.java      |  4 ++-
 .../library/adapter/TestTypedAdapterFactory.java   |  4 ++-
 .../metadata/declared/DatasetDataSource.java       |  5 +--
 .../declared/FunctionDataSourceFactory.java        |  3 +-
 .../metadata/declared/LoadableDataSource.java      |  2 +-
 .../metadata/declared/MetadataProvider.java        | 11 ++++---
 .../asterix/metadata/feeds/FeedMetadataUtil.java   | 12 ++++---
 .../metadata/utils/ExternalIndexingOperations.java |  3 +-
 .../api/HeuristicCompilerFactoryBuilder.java       |  2 +-
 .../algebricks/core/jobgen/impl/JobGenContext.java | 10 +++++-
 .../hyracks/api/exceptions/SourceLocation.java     | 18 +++++++---
 .../org/apache/hyracks/api/exceptions/Warning.java |  3 +-
 .../file/FieldCursorForDelimitedDataParser.java    |  4 +--
 55 files changed, 311 insertions(+), 294 deletions(-)

Reply via email to