Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3309
Change subject: Merge commit 'b7f029ec4f' from 'stabilization-f69489'
......................................................................
Merge commit 'b7f029ec4f' from 'stabilization-f69489'
Change-Id: I4acc556e906ca43a0ef8f1f778446a26bffb1c32
---
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/09/3309/1
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: newchange
Gerrit-Change-Id: I4acc556e906ca43a0ef8f1f778446a26bffb1c32
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
