You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2022/02/26 00:00:46 UTC

[asterixdb] 10/10: Merge branch 'gerrit/neo'

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 51543d9d28f13107514d900e0b3bb4e7b09ccc58
Merge: c1c5bec 55ef99b
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Feb 25 15:37:42 2022 -0500

    Merge branch 'gerrit/neo'
    
    Change-Id: Iae10a9a8b2f64117fd2272dcc80dc0d2d375ef0f

 .../apache/asterix/test/common/TestExecutor.java   |  32 +++-
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q1.sqlpp}    |  53 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q10.sqlpp}   |  54 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q11.sqlpp}   |  56 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q12.sqlpp}   |  53 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q13.sqlpp}   |  53 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q14.sqlpp}   |  48 ++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q15.sqlpp}   |  55 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q16.sqlpp}   |  54 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q17.sqlpp}   |  51 ++-----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q18.sqlpp}   |  50 ++-----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q19.sqlpp}   |  63 ++++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q2.sqlpp}    |  64 ++++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q20.sqlpp}   |  60 ++++----
 .../optimizerts/queries/ch2/ch2_q21.sqlpp          |  61 ++++++++
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q22.sqlpp}   |  56 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q3.sqlpp}    |  54 +++----
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q4.sqlpp}    |  51 ++-----
 .../resources/optimizerts/queries/ch2/ch2_q5.sqlpp |  56 +++++++
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q6.sqlpp}    |  48 ++----
 .../resources/optimizerts/queries/ch2/ch2_q7.sqlpp |  57 ++++++++
 .../resources/optimizerts/queries/ch2/ch2_q8.sqlpp |  63 ++++++++
 .../ch2/{ch2_q8_subquery.sqlpp => ch2_q9.sqlpp}    |  56 +++----
 .../resources/optimizerts/results/ch2/ch2_q1.plan  |  29 ++++
 .../resources/optimizerts/results/ch2/ch2_q10.plan |  59 ++++++++
 .../resources/optimizerts/results/ch2/ch2_q11.plan | 119 +++++++++++++++
 .../resources/optimizerts/results/ch2/ch2_q12.plan |  29 ++++
 .../resources/optimizerts/results/ch2/ch2_q13.plan |  53 +++++++
 .../resources/optimizerts/results/ch2/ch2_q14.plan |  34 +++++
 .../resources/optimizerts/results/ch2/ch2_q15.plan | 129 ++++++++++++++++
 .../resources/optimizerts/results/ch2/ch2_q16.plan |  65 +++++++++
 .../resources/optimizerts/results/ch2/ch2_q17.plan |  69 +++++++++
 .../resources/optimizerts/results/ch2/ch2_q18.plan |  50 +++++++
 .../resources/optimizerts/results/ch2/ch2_q19.plan |  34 +++++
 .../resources/optimizerts/results/ch2/ch2_q2.plan  | 162 +++++++++++++++++++++
 .../resources/optimizerts/results/ch2/ch2_q20.plan | 112 ++++++++++++++
 .../resources/optimizerts/results/ch2/ch2_q21.plan | 116 +++++++++++++++
 .../resources/optimizerts/results/ch2/ch2_q22.plan | 110 ++++++++++++++
 .../resources/optimizerts/results/ch2/ch2_q3.plan  |  56 +++++++
 .../resources/optimizerts/results/ch2/ch2_q4.plan  |  36 +++++
 .../resources/optimizerts/results/ch2/ch2_q5.plan  |  98 +++++++++++++
 .../resources/optimizerts/results/ch2/ch2_q6.plan  |  20 +++
 .../ch2/{ch2_q8_subquery.plan => ch2_q7.plan}      | 134 +++++++----------
 .../ch2/{ch2_q8_subquery.plan => ch2_q8.plan}      |   0
 .../resources/optimizerts/results/ch2/ch2_q9.plan  |  81 +++++++++++
 .../avg_mixed/avg_mixed.1.ddl.sqlpp                |  28 ++++
 .../avg_mixed/avg_mixed.2.update.sqlpp             |  30 ++++
 .../avg_mixed/avg_mixed.3.query.sqlpp              |  26 ++++
 .../avg_mixed/avg_mixed.4.query.sqlpp              |  31 ++++
 .../avg_mixed/avg_mixed.5.query.sqlpp              |  32 ++++
 .../query-ASTERIXDB-3016.1.ddl.sqlpp               |  28 ++++
 .../query-ASTERIXDB-3016.2.update.sqlpp            |  26 ++++
 .../query-ASTERIXDB-3016.3.query.sqlpp             |  27 ++++
 .../select_star_01/select_star_01.2.query.sqlpp    |  28 ++++
 .../aggregate-sql-sugar/avg_mixed/avg_mixed.3.adm  |   1 +
 .../aggregate-sql-sugar/avg_mixed/avg_mixed.4.adm  |   2 +
 .../aggregate-sql-sugar/avg_mixed/avg_mixed.5.adm  |   2 +
 .../query-ASTERIXDB-3016.3.adm                     |   1 +
 .../sql-compat/select_star_01/select_star_01.2.adm |   1 +
 .../test/resources/runtimets/testsuite_sqlpp.xml   |  13 ++
 .../asterix/common/config/StorageProperties.java   |   2 +-
 .../common/context/BaseOperationTracker.java       |  17 ++-
 .../rewrites/visitor/SqlCompatRewriteVisitor.java  |   6 +-
 .../std/AbstractAvgAggregateFunction.java          |  12 +-
 .../control/common/config/ConfigManager.java       |   1 -
 .../std/group/HashSpillableTableFactory.java       |  28 +++-
 .../ExternalGroupWriteOperatorNodePushable.java    |  14 +-
 .../std/structures/ISerializableTable.java         |   2 +-
 .../common/impls/LSMIndexPageWriteCallback.java    |   2 +-
 69 files changed, 2465 insertions(+), 738 deletions(-)