>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17796 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I7ad553442540fa98493601de3de933a09ccd85f2
---
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
2 files changed, 16 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/96/17796/1
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
index 5b0ca55..113a40a 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
@@ -342,14 +342,10 @@
@Override
public void frameCompleted() throws HyracksDataException {
-<<<<<<< HEAD (b9976e [ASTERIXDB-3261][COMP] Limit Costing Improvement)
- //TODO: mixed-frame vs frame-per-storage-partition
- appender.write(writer, true);
-=======
if (appender.getTupleCount() > 0) {
+ //TODO: mixed-frame vs frame-per-storage-partition
appender.write(writer, true);
}
->>>>>>> BRANCH (1fc8cb Merge branch 'gerrit/neo' into 'gerrit/trinity')
callback.frameCompleted();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17796
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I7ad553442540fa98493601de3de933a09ccd85f2
Gerrit-Change-Number: 17796
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
