Michael Blow has submitted this change and it was merged.
Change subject: Merge commit 'b7f029ec4f' from 'stabilization-f69489'
......................................................................
Merge commit 'b7f029ec4f' from 'stabilization-f69489'
Change-Id: I4acc556e906ca43a0ef8f1f778446a26bffb1c32
---
M asterixdb/asterix-app/src/test/resources/optimizerts/results/flwr/at07.plan
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java
2 files changed, 11 insertions(+), 15 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
Objections:
Jenkins: Violations found
diff --git
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/flwr/at07.plan
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/flwr/at07.plan
index b91aa81..3d6ce88 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
@@ -14,8 +14,8 @@
-- 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|
@@ -30,12 +30,11 @@
-- 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|
\ No newline at end of file
+ -- 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|
\ No newline at end of file
diff --git
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
index 8e1b2c5..f43d367 100644
---
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,11 +316,8 @@
}
}
break;
-<<<<<<< HEAD (af2f06 [NO ISSUE][FUN] Add Completed_Requests Function)
- case WINDOW:
-=======
case RUNNINGAGGREGATE:
->>>>>>> BRANCH (b7f029 [ASTERIXDB-2536][COMP] Do not push Select through
RunningAgg)
+ case WINDOW:
return false;
}
return true;
--
To view, visit https://asterix-gerrit.ics.uci.edu/3309
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4acc556e906ca43a0ef8f1f778446a26bffb1c32
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
