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 46dcbea327430e50a9eadb62028e8f6df38b1a44
Merge: af2f063 b7f029e
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Apr 2 09:24:17 2019 -0400
Merge commit 'b7f029ec4f' from 'stabilization-f69489'
Change-Id: I4acc556e906ca43a0ef8f1f778446a26bffb1c32
.../resources/optimizerts/queries/flwr/at07.sqlpp | 49 ++++++++++++++++++++++
.../resources/optimizerts/results/flwr/at07.plan | 40 ++++++++++++++++++
.../queries_sqlpp/flwor/at07/at07.1.ddl.sqlpp | 46 ++++++++++++++++++++
.../queries_sqlpp/flwor/at07/at07.2.update.sqlpp | 27 ++++++++++++
.../queries_sqlpp/flwor/at07/at07.3.query.sqlpp | 31 ++++++++++++++
.../runtimets/results/flwor/at07/at07.3.adm | 1 +
.../test/resources/runtimets/testsuite_sqlpp.xml | 5 +++
.../core/algebra/util/OperatorPropertiesUtil.java | 1 +
8 files changed, 200 insertions(+)
diff --cc
asterixdb/asterix-app/src/test/resources/optimizerts/results/flwr/at07.plan
index 0000000,b91aa81..3d6ce88
mode 000000,100644..100644
---
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/flwr/at07.plan
+++
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/flwr/at07.plan
@@@ -1,0 -1,41 +1,40 @@@
+ -- DISTRIBUTE_RESULT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- SORT_MERGE_EXCHANGE [$#2(ASC) ] |PARTITIONED|
+ -- STABLE_SORT [$#2(ASC)] |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- NESTED_LOOP |PARTITIONED|
+ -- RANDOM_PARTITION_EXCHANGE |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- STREAM_SELECT |PARTITIONED|
+ -- RUNNING_AGGREGATE |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
- -- SORT_MERGE_EXCHANGE [$$84(ASC) ]
|PARTITIONED|
- -- STABLE_SORT [$$84(ASC)] |PARTITIONED|
++ -- SORT_MERGE_EXCHANGE [$$92(ASC) ]
|PARTITIONED|
++ -- STABLE_SORT [$$92(ASC)] |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
+ -- REPLICATE |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
+ -- DATASOURCE_SCAN
|PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE
|PARTITIONED|
+ -- BROADCAST_EXCHANGE |PARTITIONED|
+ -- AGGREGATE |UNPARTITIONED|
+ -- RANDOM_MERGE_EXCHANGE |PARTITIONED|
+ -- AGGREGATE |PARTITIONED|
- -- ASSIGN |PARTITIONED|
- -- STREAM_PROJECT |PARTITIONED|
- -- ASSIGN |PARTITIONED|
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- -- REPLICATE |PARTITIONED|
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- -- DATASOURCE_SCAN |PARTITIONED|
- -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
- -- EMPTY_TUPLE_SOURCE
|PARTITIONED|
++ -- STREAM_PROJECT |PARTITIONED|
++ -- ASSIGN |PARTITIONED|
++ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
++ -- REPLICATE |PARTITIONED|
++ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
++ -- DATASOURCE_SCAN |PARTITIONED|
++ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
++ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --cc
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java
index 8713106,3361bb5..f43d367
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java
@@@ -316,7 -316,7 +316,8 @@@ public class OperatorPropertiesUtil
}
}
break;
+ case RUNNINGAGGREGATE:
+ case WINDOW:
return false;
}
return true;
