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 53849efdd5ce5003a1cc03e8e13fc510609edee4 Merge: e5b632b 2ea7323 Author: Michael Blow <[email protected]> AuthorDate: Mon Oct 14 11:33:26 2019 -0400 Merge branch 'gerrit/mad-hatter' into 'master' Change-Id: I7e921b559f30adfab704143818dd7ee59e194eb4 .../rules/DisjunctivePredicateToJoinRule.java | 2 +- .../asterix/optimizer/rules/FuzzyJoinRule.java | 4 +- ...nlineLeftNtsInSubplanJoinFlatteningVisitor.java | 3 +- .../translator/LangExpressionToPlanTranslator.java | 19 ---- .../MessagingChannelInterfaceFactory.java | 5 + .../dataset_with_meta-1/dataset_with_meta-1.1.adm | 2 +- .../dataset_with_meta-2/dataset_with_meta-2.1.adm | 2 +- .../dataset_with_meta-3/dataset_with_meta-2.3.adm | 2 +- .../dataset_with_meta-4/dataset_with_meta-4.3.adm | 2 +- .../dataset_with_meta-5/dataset_with_meta-5.3.adm | 2 +- .../issue_251_dataset_hint_2.1.adm | 2 +- .../issue_251_dataset_hint_3.1.adm | 2 +- .../issue_251_dataset_hint_4.1.adm | 2 +- .../metadata/results/basic/meta02/meta02.1.adm | 2 +- .../metadata/results/basic/meta09/meta09.1.adm | 2 +- .../resources/optimizerts/queries/fj-dblp-csx.aql | 4 +- .../optimizerts/queries/fj-phase2-with-hints.aql | 2 +- .../queries/hints/broadcast_hint_1.sqlpp | 2 +- .../queries/hints/broadcast_hint_2.sqlpp | 2 +- .../queries/hints/broadcast_hint_3.sqlpp | 4 +- .../queries/joins/nested_query_with_bcast.sqlpp | 2 +- .../jaccard-similarity-join-dual-order.aql | 4 +- .../jaccard-similarity-join-right-ahead.aql | 4 +- .../queries/tpch/q12_shipping_broadcast.sqlpp | 2 +- .../queries/tpch/q12_shipping_broadcast_ps.sqlpp | 2 +- .../results/hints/broadcast_hint_3.plan | 4 +- .../results/joins/nested_query_with_bcast.plan | 6 +- .../fuzzyjoin/basic-1_2_1/basic-1_2_1.5.query.aql | 4 +- .../fuzzyjoin/basic-1_2_1/basic-1_2_1.6.query.aql | 4 +- .../fuzzyjoin/basic-1_2_1/basic-1_2_1.7.query.aql | 2 +- .../fuzzyjoin/basic-1_2_2/basic-1_2_2.3.query.aql | 4 +- .../fuzzyjoin/basic-1_2_2/basic-1_2_2.4.query.aql | 4 +- .../fuzzyjoin/basic-1_2_2/basic-1_2_2.5.query.aql | 4 +- .../fuzzyjoin/basic-1_2_2/basic-1_2_2.6.query.aql | 4 +- .../fuzzyjoin/basic-1_2_3/basic-1_2_3.3.query.aql | 8 +- .../fuzzyjoin/basic-1_2_4/basic-1_2_4.3.query.aql | 4 +- .../fuzzyjoin/basic-1_2_7/basic-1_2_7.3.query.aql | 8 +- .../fuzzyjoin/basic-1_3_1/basic-1_3_1.5.query.aql | 4 +- .../fuzzyjoin/basic-1_3_1/basic-1_3_1.6.query.aql | 4 +- .../dblp-2.1_5.3.1/dblp-2.1_5.3.1.3.query.aql | 2 +- .../fuzzyjoin/dblp-2.2/dblp-2.2.3.query.aql | 2 +- .../fuzzyjoin/dblp-2_5.2/dblp-2_5.2.3.query.aql | 2 +- .../dblp-2_5.3.1/dblp-2_5.3.1.3.query.aql | 2 +- .../fuzzyjoin/dblp-2_5.3/dblp-2_5.3.3.query.aql | 2 +- .../fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.aql | 4 +- .../dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.3.query.aql | 4 +- .../dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.aql | 4 +- .../dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.aql | 4 +- .../dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.aql | 4 +- .../dblp-csx-3_5.3/dblp-csx-3_5.3.3.query.aql | 4 +- .../dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.aql | 4 +- .../dblp-csx-3_5.4/dblp-csx-3_5.4.3.query.aql | 4 +- .../like_02.1.ddl.sqlpp} | 9 +- .../like_02.2.update.sqlpp} | 12 +- .../like_02.3.query.sqlpp} | 19 +++- .../like_02.4.query.sqlpp} | 6 +- .../like_02.5.ddl.sqlpp} | 4 +- .../like_03_negative.1.query.sqlpp} | 6 +- .../like_03_negative.2.query.sqlpp} | 6 +- .../regexp_contains.1.ddl.sqlpp} | 9 +- .../regexp_contains.2.update.sqlpp} | 13 ++- ...1.query.sqlpp => regexp_contains.3.query.sqlpp} | 0 .../regexp_contains.4.query.sqlpp} | 6 +- .../regexp_contains.5.ddl.sqlpp} | 4 +- .../regexp_contains_with_flag.1.ddl.sqlpp} | 9 +- .../regexp_contains_with_flag.2.update.sqlpp} | 16 ++- ...lpp => regexp_contains_with_flag.3.query.sqlpp} | 0 .../regexp_contains_with_flag.4.query.sqlpp} | 6 +- .../regexp_contains_with_flags.5.ddl.sqlpp} | 4 +- .../regexp_like.1.ddl.sqlpp} | 9 +- .../regexp_like.2.update.sqlpp} | 13 ++- ...ike.1.query.sqlpp => regexp_like.3.query.sqlpp} | 0 .../regexp_like.4.query.sqlpp} | 6 +- .../regexp_like.5.ddl.sqlpp} | 4 +- .../regexp_like_with_flag.1.ddl.sqlpp} | 9 +- .../regexp_like_with_flag.2.update.sqlpp} | 16 ++- ...y.sqlpp => regexp_like_with_flag.3.query.sqlpp} | 0 .../regexp_like_with_flag.4.query.sqlpp} | 6 +- .../regexp_like_with_flags.5.ddl.sqlpp} | 4 +- .../regexp_position.1.ddl.sqlpp} | 9 +- .../regexp_position.2.update.sqlpp} | 13 ++- ...1.query.sqlpp => regexp_position.3.query.sqlpp} | 0 .../regexp_position.4.query.sqlpp} | 6 +- .../regexp_position.5.ddl.sqlpp} | 4 +- .../regexp_position_with_flag.1.ddl.sqlpp} | 9 +- .../regexp_position_with_flag.2.update.sqlpp} | 16 ++- ...lpp => regexp_position_with_flag.3.query.sqlpp} | 0 .../regexp_position_with_flag.4.query.sqlpp} | 6 +- .../regexp_position_with_flags.5.ddl.sqlpp} | 4 +- ...ce.3.query.sqlpp => regexp_replace.1.ddl.sqlpp} | 9 +- .../regexp_replace/regexp_replace.1.query.sqlpp | 29 ----- ...5.query.sqlpp => regexp_replace.2.update.sqlpp} | 13 ++- .../regexp_replace/regexp_replace.3.query.sqlpp | 11 +- .../regexp_replace/regexp_replace.4.query.sqlpp | 6 +- ...ce.3.query.sqlpp => regexp_replace.5.ddl.sqlpp} | 4 +- .../regexp_replace/regexp_replace.6.query.sqlpp | 26 ----- .../regexp_replace_with_flag.1.ddl.sqlpp} | 9 +- .../regexp_replace_with_flag.2.update.sqlpp} | 16 ++- .../regexp_replace_with_flag.3.query.sqlpp} | 35 +++--- .../regexp_replace_with_flag.4.query.sqlpp} | 6 +- .../regexp_replace_with_flag.5.ddl.sqlpp} | 4 +- .../q12_shipping_broadcast.3.query.sqlpp | 2 +- .../runtimets/results/string/like_02/like_02.3.adm | 11 ++ .../runtimets/results/string/like_02/like_02.4.adm | 3 + .../string/regexp_contains/regexp_contains.3.adm | 15 +++ .../string/regexp_contains/regexp_contains.4.adm | 4 + .../regexp_contains_with_flag.3.adm | 1 + .../regexp_contains_with_flag.4.adm | 7 ++ .../{regexp_like.1.adm => regexp_like.3.adm} | 0 .../results/string/regexp_like/regexp_like.4.adm | 4 + .../regexp_like_with_flag.3.adm | 1 + .../regexp_like_with_flag.4.adm | 7 ++ ...regexp_position.1.adm => regexp_position.3.adm} | 0 .../string/regexp_position/regexp_position.4.adm | 4 + ..._flag.1.adm => regexp_position_with_flag.3.adm} | 0 .../regexp_position_with_flag.4.adm | 7 ++ .../string/regexp_replace/regexp_replace.1.adm | 1 - .../string/regexp_replace/regexp_replace.2.adm | 1 - .../string/regexp_replace/regexp_replace.3.adm | 6 +- .../string/regexp_replace/regexp_replace.4.adm | 5 +- .../string/regexp_replace/regexp_replace.5.adm | 1 - .../string/regexp_replace/regexp_replace.6.adm | 1 - .../regexp_replace_with_flag.3.adm | 16 +++ .../regexp_replace_with_flag.4.adm | 7 ++ .../test/resources/runtimets/testsuite_sqlpp.xml | 27 ++++- .../asterix/common/config/StorageProperties.java | 2 +- .../asterix/common/exceptions/ErrorCode.java | 1 + .../src/main/resources/asx_errormsg/en.properties | 1 + .../src/main/markdown/builtins/14_window.md | 122 ++++++++++++--------- .../asterix-doc/src/main/markdown/sqlpp/3_query.md | 39 ++++--- asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj | 23 ++-- .../lang/common/expression/OperatorExpr.java | 32 +----- .../CloneAndSubstituteVariablesVisitor.java | 2 +- .../asterix/lang/sqlpp/parser/SqlppHint.java | 2 +- .../lang/sqlpp/visitor/DeepCopyVisitor.java | 4 +- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 13 ++- .../functions/AbstractBinaryStringBoolEval.java | 4 +- .../functions/AbstractBinaryStringEval.java | 2 +- .../functions/StringContainsDescriptor.java | 4 +- .../functions/StringEndsWithDescriptor.java | 4 +- .../functions/StringEqualDescriptor.java | 4 +- .../evaluators/functions/StringEvaluatorUtils.java | 33 ++---- .../evaluators/functions/StringLikeDescriptor.java | 108 +++++++++++++----- .../functions/StringRegExpContainsDescriptor.java | 4 +- .../StringRegExpContainsWithFlagDescriptor.java | 2 +- .../functions/StringRegExpLikeDescriptor.java | 4 +- .../StringRegExpLikeWithFlagDescriptor.java | 2 +- .../functions/StringRegExpPositionDescriptor.java | 5 +- .../StringRegExpPositionWithFlagDescriptor.java | 4 +- .../functions/StringRegExpReplaceDescriptor.java | 2 +- .../functions/StringStartsWithDescriptor.java | 4 +- .../evaluators/functions/utils/RegExpMatcher.java | 53 ++++----- .../expressions/BroadcastExpressionAnnotation.java | 15 +-- .../visitors/BroadcastSideSwitchingVisitor.java | 108 ++++++++++++++++++ .../algebricks/rewriter/util/JoinUtils.java | 54 +++------ .../apache/hyracks/api/comm/IBufferFactory.java | 15 ++- .../hyracks/comm/channels/ReadBufferFactory.java | 7 ++ .../hyracks/control/cc/scheduler/FIFOJobQueue.java | 4 +- .../muxdemux/AbstractChannelReadInterface.java | 4 + .../muxdemux/AbstractChannelWriteInterface.java | 6 + .../protocols/muxdemux/ChannelControlBlock.java | 3 + .../muxdemux/FullFrameChannelReadInterface.java | 25 ++++- .../muxdemux/FullFrameChannelWriteInterface.java | 5 + .../protocols/muxdemux/MultiplexedConnection.java | 5 +- .../tests/FullFrameChannelReadInterfaceTest.java | 6 + ...hreadSafetyGuaranteedBy.java => GuardedBy.java} | 4 +- 166 files changed, 870 insertions(+), 620 deletions(-)
