Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
abdullah alamoudi has submitted this change and it was merged. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. [ASTERIXDB-1953][STO] Cleanup LSM File Managers - user model changes: no - storage format changes: no - interface changes: no Details: - use FileReference instead of String absolute path - user error codes Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1849 Sonar-Qube: JenkinsTested-by: Jenkins Integration-Tests: Jenkins BAD: Jenkins Reviewed-by: Ian Maxon --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java M hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndexFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndexFileManager.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-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java 17 files changed, 185 insertions(+), 313 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified; No violations found; No violations found; Verified diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java index 2e6c8a3..7dbade2 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java @@ -117,6 +117,10 @@ public static final int FILE_ALREADY_MAPPED = 81; public static final int FILE_ALREADY_EXISTS = 82; public static final int NO_INDEX_FOUND_WITH_RESOURCE_ID = 83; +public static final int FOUND_OVERLAPPING_LSM_FILES = 84; +public static final int FOUND_MULTIPLE_TRANSACTIONS = 85; +public static final int UNRECOGNIZED_INDEX_COMPONENT_FILE = 86; +public static final int UNEQUAL_NUM_FILTERS_TREES = 87; // Compilation error codes. public static final int RULECOLLECTION_NOT_INSTANCE_OF_LIST = 1; diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java index b48ba14..0375e9e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java @@ -86,4 +86,8 @@ public String getAbsolutePath() { return file.getAbsolutePath(); } + +public FileReference getChild(String name) { +return new FileReference(dev,
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Ian Maxon has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: BAD+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1451/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1451/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3273/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: BAD-1 BAD Compatibility Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1450/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1450/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/874/ (9/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/896/ (3/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/1069/ (8/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/5744/ (4/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/183/ (5/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/170/ (7/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3273/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/459/ (6/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/4265/ (2/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/803/ (1/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1849 to look at the new patch set (#2). Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. [ASTERIXDB-1953][STO] Cleanup LSM File Managers - user model changes: no - storage format changes: no - interface changes: no Details: - use FileReference instead of String absolute path - user error codes Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java M hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndexFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndexFileManager.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-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java 17 files changed, 185 insertions(+), 313 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/49/1849/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3272/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: BAD+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1449/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/192/ (10/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/873/ (9/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3272/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/1068/ (8/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/802/ (7/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/182/ (5/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/458/ (1/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/4264/ (2/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/169/ (6/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
abdullah alamoudi has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1849 Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. [ASTERIXDB-1953][STO] Cleanup LSM File Managers - user model changes: no - storage format changes: no - interface changes: no Details: - use FileReference instead of String absolute path - user error codes Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java M hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndexFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndexFileManager.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-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeFileManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java 17 files changed, 185 insertions(+), 313 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/49/1849/1 diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java index 8a91547..78bdc5d 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java @@ -116,6 +116,10 @@ public static final int CANNOT_CREATE_EXISTING_INDEX = 80; public static final int FILE_ALREADY_MAPPED = 81; public static final int FILE_ALREADY_EXISTS = 82; +public static final int FOUND_OVERLAPPING_LSM_FILES = 83; +public static final int FOUND_MULTIPLE_TRANSACTIONS = 84; +public static final int UNRECOGNIZED_INDEX_COMPONENT_FILE = 85; +public static final int UNEQUAL_NUM_FILTERS_TREES = 86; // Compilation error codes. public static final int RULECOLLECTION_NOT_INSTANCE_OF_LIST = 1; diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java index b48ba14..0375e9e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/FileReference.java @@ -86,4 +86,8 @@ public String getAbsolutePath() { return file.getAbsolutePath(); } + +public FileReference getChild(String name) { +return new FileReference(dev, path + File.separator + name); +} } diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties b/hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties index 9f983a7..89e0d01 100644 ---
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/5743/ (4/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-1953][STO] Cleanup LSM File Managers
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-1953][STO] Cleanup LSM File Managers .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/895/ (3/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/1849 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97bab76888790ca282ad9508ce8416f7c7a52fb7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-HasComments: No