Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread abdullah alamoudi (Code Review) 
abdullah alamoudi has submitted this change and it was merged.

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(-)

Approvals:
  abdullah alamoudi: Looks good to me, approved
  Jenkins: Verified; No violations found; ; Verified

Objections:
  Anon. E. Moose #1000171: 



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

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread abdullah alamoudi (Code Review) 
abdullah alamoudi has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Luo Chen 
Gerrit-Reviewer: Taewoo Kim 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Luo Chen (Code Review) 
Luo Chen has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Just out of curiosity...What the patch is used for? And why do we need a 
separate patch pre-rc?

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Luo Chen 
Gerrit-Reviewer: Taewoo Kim 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/4495/ 
: SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Luo Chen 
Gerrit-Reviewer: Taewoo Kim 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Anon. E. Moose (Code Review) 
Anon. E. Moose #1000171 has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1: Contrib-1

Analytics Compatibility Tests Failed Build 2902
: UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1: Contrib+1

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/2080/ : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/2080/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/4495/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/2137/ 
(11/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/2329/ (10/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/2115/
 (9/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/6991/ (2/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/1454/
 (5/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/1449/ 
(3/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/1440/ 
(8/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/1774/ 
(7/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-rebalance-cancellation/633/
 (6/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/5495/ (4/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Merge pre-rc changes to master
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/2054/ (1/11)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2129
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Merge pre-rc changes to master

2017-11-06 Thread Ian Maxon (Code Review) 
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