>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373
---
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/18/18018/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 050f9f7..cdf7ad7 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -583,15 +583,11 @@
@Override
public void merge(ILSMIOOperation operation) throws HyracksDataException {
-<<<<<<< HEAD (ac782e [ASTERIXDB-3322][FUN] Adapt external artifacts to DB)
if (LOGGER.isDebugEnabled()) {
MergeOperation mergeOp = (MergeOperation) operation;
- LOGGER.debug("Started a merge operation (number of merging
components {}) for index: {}",
+ LOGGER.debug("Started a merge operation (number of merging
components {}) for index {}",
mergeOp.getMergingComponents().size(), lsmIndex);
}
-=======
- LOGGER.debug("Started a merge operation for index {}", lsmIndex);
->>>>>>> BRANCH (1f82cd [NO ISSUE][OTH] Improve logging)
synchronized (opTracker) {
enterComponents(operation.getAccessor().getOpContext(),
LSMOperationType.MERGE);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018
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: I869ea2df850ce020a23e7c4beaf61aebda6ef373
Gerrit-Change-Number: 18018
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
