>From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19904 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Ext-ref: MB-67050
Change-Id: Iec17141cf62f40dd5ae9ab5da766ecf5f67df304
---
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
M
hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
4 files changed, 15 insertions(+), 12 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/04/19904/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
index 11b3ddd..417879c 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
@@ -70,16 +70,12 @@
}
@Override
-<<<<<<< HEAD (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
public ICachedPage pin(long dpid, boolean newPage, boolean incrementStats)
throws HyracksDataException {
return vbc.pin(dpid, newPage);
}
@Override
- public void unpin(ICachedPage page) throws HyracksDataException {
-=======
public void unpin(ICachedPage page) {
->>>>>>> BRANCH (3c7966 [NO ISSUE][STO][MISC] Fixes to handling of interrupted
actio)
vbc.unpin(page);
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
index abae5a9..05e5de8 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
@@ -84,16 +84,12 @@
}
@Override
-<<<<<<< HEAD (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
public ICachedPage pin(long dpid, boolean newPage) throws
HyracksDataException {
return pin(dpid, newPage, true);
}
@Override
- public void unpin(ICachedPage page) throws HyracksDataException {
-=======
public void unpin(ICachedPage page) {
->>>>>>> BRANCH (3c7966 [NO ISSUE][STO][MISC] Fixes to handling of interrupted
actio)
bufferCache.unpin(page);
unpinCount.addAndGet(1);
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
index f7224fe..913a6c0 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
@@ -101,16 +101,12 @@
}
@Override
-<<<<<<< HEAD (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
public ICachedPage pin(long dpid, boolean newPage, boolean incrementStats)
throws HyracksDataException {
return pin(dpid, newPage);
}
@Override
- public void unpin(ICachedPage page) throws HyracksDataException {
-=======
public void unpin(ICachedPage page) {
->>>>>>> BRANCH (3c7966 [NO ISSUE][STO][MISC] Fixes to handling of interrupted
actio)
vbc.unpin(page);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19904
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: Iec17141cf62f40dd5ae9ab5da766ecf5f67df304
Gerrit-Change-Number: 19904
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
