Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2129
Change subject: Merge pre-rc changes to master
......................................................................
Merge pre-rc changes to master
Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
---
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
3 files changed, 0 insertions(+), 20 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/29/2129/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
index a220601..a7fbe06 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
@@ -57,14 +57,8 @@
// Flush will only be handled by last exiting thread.
if (opType == LSMOperationType.MODIFICATION &&
threadRefCount.decrementAndGet() == 0
&& index.hasFlushRequestForCurrentMutableComponent()) {
-<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor())
ILSMIndexAccessor accessor =
index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
-
accessor.scheduleFlush(NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback());
-=======
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE);
accessor.scheduleFlush(NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback(index));
->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory
compon)
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
index 3dc4f6b..9e9f78a 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
@@ -202,25 +202,15 @@
ILSMComponent component = operationalComponents.get(i);
if (component.getType() == LSMComponentType.MEMORY) {
includeMutableComponent = true;
-<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor())
IIndexAccessor invIndexAccessor =
component.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
-=======
- IIndexAccessor invIndexAccessor =
component.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory
compon)
indexAccessors.add(invIndexAccessor);
IIndexAccessor deletedKeysAccessor =
((LSMInvertedIndexMemoryComponent) component).getBuddyIndex()
.createAccessor(NoOpIndexAccessParameters.INSTANCE);
deletedKeysBTreeAccessors.add(deletedKeysAccessor);
} else {
-<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor())
IIndexAccessor invIndexAccessor =
component.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
-=======
- IIndexAccessor invIndexAccessor =
component.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory
compon)
indexAccessors.add(invIndexAccessor);
IIndexAccessor deletedKeysAccessor =
((LSMInvertedIndexDiskComponent) component).getBuddyIndex()
.createAccessor(NoOpIndexAccessParameters.INSTANCE);
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
index 5bb6435..1af6779 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
@@ -69,15 +69,11 @@
@Override
@Test
public void modificationCallbackTest() throws Exception {
-<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor())
IndexAccessParameters actx = new IndexAccessParameters(cb,
NoOpOperationCallback.INSTANCE);
ILSMIndexAccessor accessor = (ILSMIndexAccessor)
index.createAccessor(actx);
-=======
- ILSMIndexAccessor accessor = (ILSMIndexAccessor)
index.createAccessor(cb, NoOpOperationCallback.INSTANCE);
BlockingIOOperationCallbackWrapper ioOpCallback =
new BlockingIOOperationCallbackWrapper(((ILSMIndex)
index).getIOOperationCallback());
->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory
compon)
for (int j = 0; j < 2; j++) {
isFoundNull = true;
for (int i = 0; i < NUM_TUPLES; i++) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <ima...@apache.org>
