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 d4ca9254a95dd18c34cad491186d9961a372f0af Merge: 866d4c8 c476a98 Author: Michael Blow <[email protected]> AuthorDate: Sun Jul 19 12:41:41 2020 -0400 Merge branch 'gerrit/mad-hatter' Change-Id: Iba32a467109f15093d9e0347b819c8e46066cd5d .../optimizer/rules/LoadRecordFieldsRule.java | 2 +- .../api/http/server/QueryServiceServlet.java | 7 +- .../message/ExecuteStatementRequestMessage.java | 2 +- .../asterix/hyracks/bootstrap/CCApplication.java | 3 + .../asterix/hyracks/bootstrap/NCApplication.java | 3 + .../org/apache/asterix/utils/RebalanceUtil.java | 8 +- .../org/apache/asterix/utils/RedactionUtil.java | 41 +++---- .../external_dataset/aws/WildCardToRegexTest.java | 97 +++++++++++++++++ .../optimizerts/queries/common-expr-01.sqlpp | 65 +++++++++++ .../optimizerts/results/common-expr-01.plan | 68 ++++++++++++ .../include-exclude/include-11/test.000.ddl.sqlpp | 35 +++--- .../include-11/test.001.query.sqlpp | 21 +--- .../include-exclude/include-11/test.099.ddl.sqlpp | 20 +--- .../include-exclude/include-12/test.000.ddl.sqlpp | 37 ++++--- .../include-12/test.001.query.sqlpp | 21 +--- .../include-exclude/include-12/test.099.ddl.sqlpp | 20 +--- .../s3/include-exclude/include-10/result.001.adm | 1 + .../s3/include-exclude/include-11/result.001.adm | 1 + .../s3/include-exclude/include-12/result.001.adm | 1 + .../runtimets/testsuite_external_dataset.xml | 11 +- .../record/reader/aws/AwsS3InputStreamFactory.java | 4 +- .../asterix/external/util/ExternalDataUtils.java | 119 ++++++++++++--------- .../evaluators/functions/StringEvaluatorUtils.java | 4 +- .../storage/am/common/build/IndexBuilder.java | 27 ++--- .../java/org/apache/hyracks/util/ILogRedactor.java | 8 ++ .../org/apache/hyracks/util/LogRedactionUtil.java | 9 ++ 26 files changed, 431 insertions(+), 204 deletions(-) diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java index 3eeed59,0f0620c..e80995c --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java @@@ -91,9 -86,7 +91,10 @@@ import org.apache.asterix.runtime.utils import org.apache.asterix.translator.IStatementExecutorFactory; import org.apache.asterix.translator.Receptionist; import org.apache.asterix.util.MetadataBuiltinFunctions; + import org.apache.asterix.utils.RedactionUtil; +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVParser; +import org.apache.commons.csv.CSVRecord; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.application.IServiceContext; import org.apache.hyracks.api.client.IHyracksClientConnection;
