Murtadha Hubail has submitted this change and it was merged. Change subject: ASTERIXDB-1472: Fix LSMRTreeWithAntiMatterTuples merge filter setting ......................................................................
ASTERIXDB-1472: Fix LSMRTreeWithAntiMatterTuples merge filter setting Change-Id: I742a6a0577c58963e3f1418caad0bfb27fbe2915 Reviewed-on: https://asterix-gerrit.ics.uci.edu/910 Reviewed-by: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Young-Seok Kim <[email protected]> --- M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Young-Seok Kim: Looks good to me, approved Jenkins: Looks good to me, but someone else must approve; Verified diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java index 36e0161..c9c0681 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java @@ -250,7 +250,7 @@ } if (component.getLSMComponentFilter() != null) { - List<ITupleReference> filterTuples = new ArrayList<ITupleReference>(); + List<ITupleReference> filterTuples = new ArrayList<>(); filterTuples.add(flushingComponent.getLSMComponentFilter().getMinTuple()); filterTuples.add(flushingComponent.getLSMComponentFilter().getMaxTuple()); filterManager.updateFilterInfo(component.getLSMComponentFilter(), filterTuples); @@ -303,13 +303,13 @@ cursor.close(); } if (component.getLSMComponentFilter() != null) { - List<ITupleReference> filterTuples = new ArrayList<ITupleReference>(); + List<ITupleReference> filterTuples = new ArrayList<>(); for (int i = 0; i < mergeOp.getMergingComponents().size(); ++i) { filterTuples.add(mergeOp.getMergingComponents().get(i).getLSMComponentFilter().getMinTuple()); filterTuples.add(mergeOp.getMergingComponents().get(i).getLSMComponentFilter().getMaxTuple()); } filterManager.updateFilterInfo(component.getLSMComponentFilter(), filterTuples); - filterManager.writeFilterInfo(component.getLSMComponentFilter(), component.getBTree()); + filterManager.writeFilterInfo(component.getLSMComponentFilter(), component.getRTree()); } bulkloader.end(); @@ -469,7 +469,7 @@ @Override public Set<String> getLSMComponentPhysicalFiles(ILSMComponent lsmComponent) { - Set<String> files = new HashSet<String>(); + Set<String> files = new HashSet<>(); RTree rtree = ((LSMRTreeDiskComponent) lsmComponent).getRTree(); files.add(rtree.getFileReference().getFile().getAbsolutePath()); return files; -- To view, visit https://asterix-gerrit.ics.uci.edu/910 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I742a6a0577c58963e3f1418caad0bfb27fbe2915 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Young-Seok Kim <[email protected]>
