This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit ae0b2eb2741b0a7ee1d005a88a098b5d6e786aa0 Merge: 9ffb423df3 3c796693ff Author: Michael Blow <[email protected]> AuthorDate: Sat Jun 7 10:53:19 2025 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Ext-ref: MB-67050 Change-Id: Iec17141cf62f40dd5ae9ab5da766ecf5f67df304 .../common/context/GlobalVirtualBufferCache.java | 2 +- .../org/apache/hyracks/api/util/InvokeUtil.java | 150 +++++++++++++++++++-- .../am/btree/impls/BTreeCountingSearchCursor.java | 4 +- .../am/btree/impls/BTreeRangeSearchCursor.java | 17 +-- .../hyracks/storage/am/btree/impls/DiskBTree.java | 2 +- .../am/btree/impls/DiskBTreePointSearchCursor.java | 1 - .../am/btree/impls/DiskBTreeRangeSearchCursor.java | 3 +- .../common/impls/TreeIndexDiskOrderScanCursor.java | 5 +- .../impls/MultitenantVirtualBufferCache.java | 2 +- .../am/lsm/common/impls/VirtualBufferCache.java | 2 +- .../impls/AbstractOnDiskInvertedListCursor.java | 1 + .../FixedSizeElementInvertedListScanCursor.java | 2 +- .../storage/common/buffercache/BufferCache.java | 34 ++--- .../storage/common/buffercache/CachedPage.java | 14 +- .../common/buffercache/DebugBufferCache.java | 2 +- .../storage/common/buffercache/IBufferCache.java | 3 +- .../storage/am/btree/StorageFileAccessTest.java | 38 +++--- .../am/lsm/btree/impl/TestVirtualBufferCache.java | 2 +- 18 files changed, 213 insertions(+), 71 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTreePointSearchCursor.java index 8fd9a96825,a1f04c6ee2..beadcf173b --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTreePointSearchCursor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTreePointSearchCursor.java @@@ -76,27 -69,8 +76,26 @@@ public class DiskBTreePointSearchCurso originalKeyCmp = initialState.getOriginalKeyComparator(); pageId = ((BTreeCursorInitialState) initialState).getPageId(); page = initialState.getPage(); - isPageDirty = false; frame.setPage(page); + setCursorToNextKey(searchPred); + } + + @Override + public int getLastPageId() { + return lastPageId; + } + + @Override + protected int getLowKeyIndex() throws HyracksDataException { + if (stateful) { + return frame.findTupleIndex(lowKey, frameTuple, lowKeyCmp, lastTupleIndex); + } else { + return super.getLowKeyIndex(); + } + } + @Override + public void setCursorToNextKey(ISearchPredicate searchPred) throws HyracksDataException { pred = (RangePredicate) searchPred; lowKeyCmp = pred.getLowKeyComparator(); lowKey = pred.getLowKey(); diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java index 959bb50387,f801025a7b..417879cfe5 --- 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 @@@ -69,13 -69,8 +69,13 @@@ public class MultitenantVirtualBufferCa return vbc.pin(dpid, newPage); } + @Override + 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) { vbc.unpin(page); } diff --cc hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java index c76c781d4e,88f3035503..05e5de8a04 --- 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 @@@ -83,13 -83,8 +83,13 @@@ public class DebugBufferCache implement return page; } + @Override + 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) { bufferCache.unpin(page); unpinCount.addAndGet(1); } diff --cc 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 e697b54d18,d7a83dce20..913a6c0651 --- 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 @@@ -100,13 -100,8 +100,13 @@@ public class TestVirtualBufferCache imp return page; } + @Override + 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) { vbc.unpin(page); }
