This is an automated email from the ASF dual-hosted git repository.
luochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 5ef7e7d [NO ISSUE] Fix NPE during recovery of inverte index
5ef7e7d is described below
commit 5ef7e7d2a998a22f25e84a229a75335ca53b9639
Author: luochen <[email protected]>
AuthorDate: Wed Mar 18 14:40:45 2020 -0700
[NO ISSUE] Fix NPE during recovery of inverte index
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
Fix the NPE during the recovery of inverted index. Should use
btreeFactory instead of treeFactory.
Change-Id: I131fe03606e30eb37880e38ea5565d7b54d77cad
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5383
Contrib: Jenkins <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Reviewed-by: Luo Chen <[email protected]>
Reviewed-by: Murtadha Hubail <[email protected]>
---
.../am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java
index 3155801..83f6573 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java
@@ -149,9 +149,9 @@ public class LSMInvertedIndexFileManager extends
AbstractLSMIndexFileManager imp
} else if (currentDeletedKeysBTree.isWithin(lastDeletedKeysBTree)
&& currentDictBTree.isWithin(lastDictBTree) &&
currentBloomFilter.isWithin(lastBloomFilter)) {
// Invalid files are completely contained in last sequence.
- delete(treeFactory.getBufferCache(),
currentDeletedKeysBTree.getFileRef());
- delete(treeFactory.getBufferCache(),
currentDictBTree.getFileRef());
- delete(treeFactory.getBufferCache(),
currentBloomFilter.getFileRef());
+ delete(btreeFactory.getBufferCache(),
currentDeletedKeysBTree.getFileRef());
+ delete(btreeFactory.getBufferCache(),
currentDictBTree.getFileRef());
+ delete(btreeFactory.getBufferCache(),
currentBloomFilter.getFileRef());
} else {
// This scenario should not be possible.
throw
HyracksDataException.create(ErrorCode.FOUND_OVERLAPPING_LSM_FILES, baseDir);