>From Ali Alsuliman <[email protected]>:

Ali Alsuliman has submitted this change. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20624?usp=email )

Change subject: [ASTERIXDB-3451][STO] Avoid unlocking twice when pin fails
......................................................................

[ASTERIXDB-3451][STO] Avoid unlocking twice when pin fails

- user model changes: no
- storage format changes: no
- interface changes: no

Ext-ref: MB-69637
Change-Id: I1abe2a7cfd24d19319c6606c76d479291e6638b4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18487
Reviewed-by: Murtadha Hubail <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Tested-by: Murtadha Hubail <[email protected]>
(cherry picked from commit 2b0ebf5835983340b8c80160b00166186784a245)
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20624
Reviewed-by: Ali Alsuliman <[email protected]>
Tested-by: Ian Maxon <[email protected]>
Reviewed-by: Ian Maxon <[email protected]>
---
M 
hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Ian Maxon: Looks good to me, approved; Verified
  Ali Alsuliman: Looks good to me, but someone else must approve

Objections:
  Anon. E. Moose #1000171: Violations found




diff --git 
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
 
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
index 1cbe31d..27b29be 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
@@ -130,10 +130,10 @@
             while (!ctx.getInteriorFrame().isLeaf()) {
                 // walk down the tree until we find the leaf
                 childPageId = 
ctx.getInteriorFrame().getChildPageId(ctx.getPred());
+                ICachedPage nextPage =
+                        
bufferCache.pin(BufferedFileHandle.getDiskPageId(getFileId(), childPageId), 
false);
                 bufferCache.unpin(currentPage);
-                pageId = childPageId;
-
-                currentPage = 
bufferCache.pin(BufferedFileHandle.getDiskPageId(getFileId(), childPageId), 
false);
+                currentPage = nextPage;
                 ctx.getInteriorFrame().setPage(currentPage);
             }


--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20624?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I1abe2a7cfd24d19319c6606c76d479291e6638b4
Gerrit-Change-Number: 20624
Gerrit-PatchSet: 3
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-Reviewer: Murtadha Hubail <[email protected]>
Gerrit-Reviewer: Peeyush Gupta <[email protected]>

Reply via email to