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 2019/11/04 12:08:38 UTC
[asterixdb] 03/04: Merge branch 'stabilization-f69489' into
'mad-hatter'
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 fe51374f21cc03aebed5735ee21215b57e4ed52a
Merge: a9a59ba ff271b7
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Nov 1 21:13:20 2019 -0400
Merge branch 'stabilization-f69489' into 'mad-hatter'
Change-Id: I3bcf787f56d8e9288c48d619df31cad452837ef7
.../am/AbstractIntroduceAccessMethodRule.java | 2 +-
.../btree-index/btree-composite-key-03.sqlpp | 49 ++++++++++++++++++++++
.../btree-composite-key-non-enforced-03.sqlpp | 43 +++++++++++++++++++
.../btree-index/btree-composite-key-03.plan | 15 +++++++
.../btree-index/non-enforced-composite-key/11.plan | 2 +-
.../btree-composite-key-non-enforced-03.plan | 17 ++++++++
.../btree-index-composite-key-03.1.ddl.sqlpp | 44 +++++++++++++++++++
.../btree-index-composite-key-03.2.update.sqlpp | 26 ++++++++++++
.../btree-index-composite-key-03.3.query.sqlpp | 28 +++++++++++++
.../btree-index-composite-key-03.1.ddl.sqlpp | 39 +++++++++++++++++
.../btree-index-composite-key-03.2.update.sqlpp | 35 ++++++++++++++++
.../btree-index-composite-key-03.3.query.sqlpp | 27 ++++++++++++
.../btree-index-composite-key-03.3.adm | 1 +
.../btree-index-composite-key-03.3.adm | 1 +
.../test/resources/runtimets/testsuite_sqlpp.xml | 10 +++++
15 files changed, 337 insertions(+), 2 deletions(-)
diff --cc asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-composite-key-03.plan
index 0000000,eb0128b..04345b1
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-composite-key-03.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-composite-key-03.plan
@@@ -1,0 -1,15 +1,15 @@@
+ -- DISTRIBUTE_RESULT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- STREAM_SELECT |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- -- STABLE_SORT [$$23(ASC)] |PARTITIONED|
++ -- STABLE_SORT [$$24(ASC)] |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/optimizerts/results/nested-open-index/btree-index/non-enforced-composite-key/11.plan
index f43b2f5,813805c..af7f7c5
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/nested-open-index/btree-index/non-enforced-composite-key/11.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/nested-open-index/btree-index/non-enforced-composite-key/11.plan
@@@ -15,7 -15,7 +15,7 @@@
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- BTREE_SEARCH |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- -- STABLE_SORT [$$35(ASC)] |PARTITIONED|
- -- STABLE_SORT [$$33(ASC)] |PARTITIONED|
++ -- STABLE_SORT [$$34(ASC)] |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- STREAM_PROJECT |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/optimizerts/results/open-index-non-enforced/btree-composite-key-non-enforced/btree-composite-key-non-enforced-03.plan
index 0000000,7a2ab4c..1323261
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/open-index-non-enforced/btree-composite-key-non-enforced/btree-composite-key-non-enforced-03.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/open-index-non-enforced/btree-composite-key-non-enforced/btree-composite-key-non-enforced-03.plan
@@@ -1,0 -1,17 +1,17 @@@
+ -- DISTRIBUTE_RESULT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- STREAM_SELECT |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- -- STABLE_SORT [$$25(ASC)] |PARTITIONED|
++ -- STABLE_SORT [$$26(ASC)] |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|