You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by pr...@apache.org on 2016/10/17 19:55:01 UTC

[11/50] [abbrv] asterixdb git commit: merge master

merge master


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/0725160a
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/0725160a
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/0725160a

Branch: refs/heads/ecarm002/interval_join_merge
Commit: 0725160aa57181e9f82896af1552e57d87728db9
Parents: 4f9e6a8 61ec128
Author: Preston Carman <pr...@apache.org>
Authored: Thu Jul 14 13:54:55 2016 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Jul 14 13:54:55 2016 -0700

----------------------------------------------------------------------
 asterixdb/asterix-app/pom.xml                   |  29 ++
 .../asterix/test/sqlpp/ParserTestExecutor.java  |  11 +-
 .../optimizerts/queries/query-issue697.aql      |   2 +-
 .../sum_null-with-pred.3.query.aql              |   2 +-
 .../sum_null-with-pred.3.query.aql              |   2 +-
 .../queries/boolean/not_01/not_01.3.query.aql   |   4 +-
 .../everysat_04/everysat_04.3.query.aql         |   8 +-
 .../somesat_06/somesat_06.3.query.aql           |   8 +-
 .../has-param1/has-param1.3.query.aql           |   2 +-
 .../substring-after-5.3.query.aql               |   2 +-
 .../substring-after-6.3.query.aql               |   2 +-
 .../tinysocial-suite.13.query.aql               |   2 +-
 .../q13_customer_distribution.3.query.aql       |   2 +-
 .../q16_parts_supplier_relationship.3.query.aql |   4 +-
 .../q13_customer_distribution.3.query.aql       |   2 +-
 .../q16_parts_supplier_relationship.3.query.aql |   4 +-
 .../single-line-definition.1.ddl.aql            |  31 +++
 .../single-line-definition.2.query.aql          |  28 ++
 .../single-line-definition.3.ddl.aql            |  27 ++
 .../udf18/udf18.3.query.aql                     |   2 +-
 .../queries_sqlpp/dapd/q2-6/q2-6.1.ddl.sqlpp    |  55 ++++
 .../queries_sqlpp/dapd/q2-6/q2-6.2.update.sqlpp |  19 ++
 .../queries_sqlpp/dapd/q2-6/q2-6.3.query.sqlpp  |  35 +++
 .../group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp  |  39 +++
 .../gby-expr-2/gby-expr-2.2.update.sqlpp        |  43 +++
 .../gby-expr-2/gby-expr-2.3.query.sqlpp         |  27 ++
 .../group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp  |  39 +++
 .../gby-expr-3/gby-expr-3.2.update.sqlpp        |  43 +++
 .../gby-expr-3/gby-expr-3.3.query.sqlpp         |  33 +++
 .../group-by/gby-expr/gby-expr.1.ddl.sqlpp      |  39 +++
 .../group-by/gby-expr/gby-expr.2.update.sqlpp   |  43 +++
 .../group-by/gby-expr/gby-expr.3.query.sqlpp    |  27 ++
 .../group-by/sugar-01-2/sugar-01-2.1.ddl.sqlpp  |  29 ++
 .../sugar-01-2/sugar-01-2.2.update.sqlpp        |  32 +++
 .../sugar-01-2/sugar-01-2.3.query.sqlpp         |  26 ++
 .../group-by/sugar-02-2/sugar-02-2.1.ddl.sqlpp  |  39 +++
 .../sugar-02-2/sugar-02-2.2.update.sqlpp        |  43 +++
 .../sugar-02-2/sugar-02-2.3.query.sqlpp         |  27 ++
 .../sugar-02-2/sugar-02-2.4.query.sqlpp         |  31 +++
 .../group-by/sugar-03-2/sugar-03-2.1.ddl.sqlpp  |  40 +++
 .../sugar-03-2/sugar-03-2.2.update.sqlpp        |  42 +++
 .../sugar-03-2/sugar-03-2.3.query.sqlpp         |  32 +++
 .../group-by/sugar-04-2/sugar-04-2.1.ddl.sqlpp  |  40 +++
 .../sugar-04-2/sugar-04-2.2.update.sqlpp        |  55 ++++
 .../sugar-04-2/sugar-04-2.3.query.sqlpp         |  31 +++
 .../group-by/sugar-05-2/sugar-05-2.1.ddl.sqlpp  |  35 +++
 .../sugar-05-2/sugar-05-2.2.update.sqlpp        |  59 ++++
 .../sugar-05-2/sugar-05-2.3.query.sqlpp         |  38 +++
 .../alias_negative/alias_negative.1.query.sqlpp |  24 ++
 .../q01_pricing_summary_report_2.1.ddl.sqlpp    |  47 ++++
 .../q01_pricing_summary_report_2.2.update.sqlpp |  24 ++
 .../q01_pricing_summary_report_2.3.query.sqlpp  |  43 +++
 .../single-line-definition.1.ddl.sqlpp          |  31 +++
 .../single-line-definition.2.query.sqlpp        |  30 ++
 .../single-line-definition.3.ddl.sqlpp          |  27 ++
 .../group-by/gby-expr-2/gby-expr-2.1.adm        |   1 +
 .../group-by/gby-expr-3/gby-expr-3.1.adm        |   1 +
 .../results/group-by/gby-expr/gby-expr.1.adm    |   1 +
 .../single-line-definition.1.adm                |   1 +
 .../src/test/resources/runtimets/testsuite.xml  |   5 +
 .../resources/runtimets/testsuite_sqlpp.xml     |  61 +++++
 .../asterix-lang-aql/src/main/javacc/AQL.jj     | 250 ++++++++++-------
 .../lang/common/clause/GroupbyClause.java       |  32 ++-
 .../asterix/lang/common/clause/LetClause.java   |  18 ++
 .../asterix/lang/common/clause/LimitClause.java |  27 +-
 .../lang/common/clause/OrderbyClause.java       |  20 ++
 .../lang/common/clause/UpdateClause.java        |  22 ++
 .../asterix/lang/common/clause/WhereClause.java |  31 ++-
 .../common/expression/AbstractAccessor.java     |  18 ++
 .../lang/common/expression/CallExpr.java        |  21 +-
 .../lang/common/expression/FieldAccessor.java   |  18 ++
 .../lang/common/expression/FieldBinding.java    |  24 ++
 .../expression/GbyVariableExpressionPair.java   |  22 ++
 .../asterix/lang/common/expression/IfExpr.java  |  25 ++
 .../lang/common/expression/IndexAccessor.java   |  36 ++-
 .../lang/common/expression/ListConstructor.java |  19 ++
 .../lang/common/expression/LiteralExpr.java     |  19 ++
 .../lang/common/expression/OperatorExpr.java    |  19 ++
 .../expression/OrderedListTypeDefinition.java   |  19 +-
 .../common/expression/QuantifiedExpression.java |  20 ++
 .../common/expression/RecordConstructor.java    |  18 ++
 .../common/expression/RecordTypeDefinition.java |  38 ++-
 .../lang/common/expression/TypeExpression.java  |   4 +-
 .../expression/TypeReferenceExpression.java     |  20 +-
 .../lang/common/expression/UnaryExpr.java       |  19 ++
 .../expression/UnorderedListTypeDefinition.java |  19 +-
 .../lang/common/expression/VariableExpr.java    |   8 +-
 .../lang/common/literal/DoubleLiteral.java      |  26 +-
 .../lang/common/literal/FalseLiteral.java       |  12 +-
 .../lang/common/literal/FloatLiteral.java       |  26 +-
 .../lang/common/literal/IntegerLiteral.java     |  27 +-
 .../lang/common/literal/LongIntegerLiteral.java |  26 +-
 .../lang/common/literal/MissingLiteral.java     |   8 +-
 .../lang/common/literal/NullLiteral.java        |  12 +-
 .../lang/common/literal/StringLiteral.java      |  24 ++
 .../lang/common/literal/TrueLiteral.java        |   3 +-
 .../lang/common/parser/ScopeChecker.java        |   7 +-
 .../ExpressionSubstitutionEnvironment.java      | 165 +++++++++++
 .../common/rewrites/LangRewritingContext.java   |   4 +-
 .../VariableSubstitutionEnvironment.java        |   2 +-
 .../lang/common/statement/DeleteStatement.java  |  22 ++
 .../lang/common/statement/InsertStatement.java  |  19 ++
 .../asterix/lang/common/statement/Query.java    |  25 +-
 .../lang/common/statement/UpdateStatement.java  |  19 ++
 .../lang/common/statement/UpsertStatement.java  |  16 ++
 .../lang/common/struct/AdmSplitInfo.java        |  37 ---
 .../asterix/lang/common/struct/Identifier.java  |  14 +-
 .../lang/common/struct/QuantifiedPair.java      |  15 +
 .../lang/common/struct/VarIdentifier.java       |   6 +-
 .../util/VariableCloneAndSubstitutionUtil.java  |  17 +-
 .../CloneAndSubstituteVariablesVisitor.java     |  72 +++--
 .../visitor/SubstituteExpressionVisitor.java    | 245 +++++++++++++++++
 .../clause/AbstractBinaryCorrelateClause.java   |  19 ++
 ...tractBinaryCorrelateWithConditionClause.java |  17 ++
 .../asterix/lang/sqlpp/clause/FromClause.java   |  19 +-
 .../asterix/lang/sqlpp/clause/FromTerm.java     |  26 +-
 .../asterix/lang/sqlpp/clause/HavingClause.java |  17 ++
 .../asterix/lang/sqlpp/clause/Projection.java   |  19 ++
 .../asterix/lang/sqlpp/clause/SelectBlock.java  |  67 ++++-
 .../asterix/lang/sqlpp/clause/SelectClause.java |  21 +-
 .../lang/sqlpp/clause/SelectElement.java        |  17 ++
 .../lang/sqlpp/clause/SelectRegular.java        |  17 ++
 .../lang/sqlpp/clause/SelectSetOperation.java   |  36 ++-
 .../sqlpp/expression/IndependentSubquery.java   |  17 ++
 .../lang/sqlpp/expression/SelectExpression.java |  46 +++-
 .../rewrites/SqlppFunctionBodyRewriter.java     |   6 +
 .../lang/sqlpp/rewrites/SqlppQueryRewriter.java |  37 ++-
 .../visitor/GenerateColumnNameVisitor.java      |  66 +++++
 .../visitor/InlineColumnAliasVisitor.java       |  47 ++--
 .../visitor/InlineWithExpressionVisitor.java    |  13 +-
 ...uteGroupbyExpressionWithVariableVisitor.java |  89 ++++++
 .../lang/sqlpp/struct/SetOperationInput.java    |  23 ++
 .../lang/sqlpp/struct/SetOperationRight.java    |  27 ++
 .../sqlpp/util/ExpressionToVariableUtil.java    |  65 ++++-
 .../lang/sqlpp/util/SqlppAstPrintUtil.java      |  14 +-
 .../lang/sqlpp/util/SqlppFormatPrintUtil.java   |   6 +-
 .../lang/sqlpp/util/SqlppRewriteUtil.java       |   4 +-
 .../lang/sqlpp/visitor/DeepCopyVisitor.java     |  30 +-
 ...SqlppCloneAndSubstituteVariablesVisitor.java |  98 ++++---
 .../sqlpp/visitor/SqlppFormatPrintVisitor.java  |   5 +-
 .../SqlppSubstituteExpressionsVisitor.java      | 272 +++++++++++++++++++
 .../AbstractSqlppExpressionScopingVisitor.java  |   4 +-
 .../AbstractSqlppSimpleExpressionVisitor.java   |   4 +-
 .../src/main/javacc/SQLPP.html                  |  16 +-
 .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj |  39 +--
 .../algebricks/rewriter/util/JoinUtils.java     |   4 +-
 146 files changed, 3890 insertions(+), 463 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/0725160a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/0725160a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
----------------------------------------------------------------------