Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 79D2817BF7 for ; Fri, 24 Apr 2015 18:47:10 +0000 (UTC) Received: (qmail 27046 invoked by uid 500); 24 Apr 2015 18:47:10 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 27013 invoked by uid 500); 24 Apr 2015 18:47:10 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 27004 invoked by uid 99); 24 Apr 2015 18:47:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 18:47:10 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=SPF_PASS,WEIRD_PORT X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 18:47:05 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 6116F2601C for ; Fri, 24 Apr 2015 18:45:30 +0000 (UTC) Received: (qmail 19100 invoked by uid 99); 24 Apr 2015 18:45:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 18:45:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 430DDE17DC; Fri, 24 Apr 2015 18:45:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: imaxon@apache.org To: commits@asterixdb.incubator.apache.org Date: Fri, 24 Apr 2015 18:46:37 -0000 Message-Id: In-Reply-To: <0a743a5c99b842bf8de294f7df7a3d2b@git.apache.org> References: <0a743a5c99b842bf8de294f7df7a3d2b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [70/85] [abbrv] incubator-asterixdb-hyracks git commit: Fix for issue 771 - removed FieldLengthIgnoring comparators and added field length check in Pointable comparator X-Virus-Checked: Checked by ClamAV on apache.org Fix for issue 771 - removed FieldLengthIgnoring comparators and added field length check in Pointable comparator Change-Id: Icac725fb54db21f1aa37ae0db545fbdebb651b14 Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/200 Reviewed-by: Young-Seok Kim Tested-by: Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/80490739 Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/80490739 Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/80490739 Branch: refs/heads/master Commit: 80490739d334e44e98efbf4c8da9aab47926f0cd Parents: 97a52d1 Author: Ildar Absalyamov Authored: Mon Feb 2 16:44:43 2015 -0800 Committer: Ian Maxon Committed: Wed Feb 4 18:17:45 2015 -0800 ---------------------------------------------------------------------- .../PointableBinaryComparatorFactory.java | 4 + .../data/std/primitive/DoublePointable.java | 21 +++--- .../storage/am/btree/util/BTreeUtils.java | 4 +- .../FieldLengthIgnoringMultiComparator.java | 79 -------------------- .../FieldLengthIgnoringSingleComparator.java | 37 --------- .../am/common/ophelpers/MultiComparator.java | 25 ------- .../storage/am/lsm/btree/impls/LSMBTree.java | 3 +- .../invertedindex/impls/LSMInvertedIndex.java | 2 +- .../InMemoryInvertedIndexOpContext.java | 4 +- .../ondisk/OnDiskInvertedIndex.java | 6 +- .../ondisk/OnDiskInvertedIndexOpContext.java | 2 +- .../search/InvertedListMerger.java | 2 +- 12 files changed, 25 insertions(+), 164 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/accessors/PointableBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/accessors/PointableBinaryComparatorFactory.java b/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/accessors/PointableBinaryComparatorFactory.java index 473b4f5..9773cfa 100644 --- a/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/accessors/PointableBinaryComparatorFactory.java +++ b/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/accessors/PointableBinaryComparatorFactory.java @@ -39,6 +39,10 @@ public class PointableBinaryComparatorFactory implements IBinaryComparatorFactor return new IBinaryComparator() { @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { + if (l1 == 0 && l2 != 0) + return -1; + if (l1 != 0 && l2 == 0) + return 1; p.set(b1, s1, l1); return ((IComparable) p).compareTo(b2, s2, l2); } http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/primitive/DoublePointable.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/primitive/DoublePointable.java b/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/primitive/DoublePointable.java index 7dae13b..438defc 100644 --- a/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/primitive/DoublePointable.java +++ b/hyracks/hyracks-data/hyracks-data-std/src/main/java/edu/uci/ics/hyracks/data/std/primitive/DoublePointable.java @@ -23,17 +23,16 @@ import edu.uci.ics.hyracks.data.std.api.IPointable; import edu.uci.ics.hyracks.data.std.api.IPointableFactory; public final class DoublePointable extends AbstractPointable implements IHashable, IComparable, INumeric { - private final static double machineEpsilon; - static { - float epsilon = 1.0f; + private final static double machineEpsilon; + static { + float epsilon = 1.0f; do { - epsilon /= 2.0f; - } - while ((float)(1.0 + (epsilon/2.0)) != 1.0); + epsilon /= 2.0f; + } while ((float) (1.0 + (epsilon / 2.0)) != 1.0); machineEpsilon = epsilon; - } - + } + public static final ITypeTraits TYPE_TRAITS = new ITypeTraits() { private static final long serialVersionUID = 1L; @@ -146,7 +145,7 @@ public final class DoublePointable extends AbstractPointable implements IHashabl return getDouble(); } - public static double getEpsilon() { - return machineEpsilon; - } + public static double getEpsilon() { + return machineEpsilon; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeUtils.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeUtils.java b/hyracks/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeUtils.java index f5b23aa..012c5b4 100644 --- a/hyracks/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeUtils.java +++ b/hyracks/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeUtils.java @@ -49,7 +49,7 @@ public class BTreeUtils { cmpFactories, typeTraits.length, file); return btree; } - + public static BTree createBTree(IBufferCache bufferCache, IFreePageManager freePageManager, IFileMapProvider fileMapProvider, ITypeTraits[] typeTraits, IBinaryComparatorFactory[] cmpFactories, BTreeLeafFrameType leafType, FileReference file) throws BTreeException { @@ -65,7 +65,7 @@ public class BTreeUtils { public static MultiComparator getSearchMultiComparator(IBinaryComparatorFactory[] cmpFactories, ITupleReference searchKey) { if (searchKey == null || cmpFactories.length == searchKey.getFieldCount()) { - return MultiComparator.createIgnoreFieldLength(cmpFactories); + return MultiComparator.create(cmpFactories); } IBinaryComparator[] newCmps = new IBinaryComparator[searchKey.getFieldCount()]; for (int i = 0; i < searchKey.getFieldCount(); i++) { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringMultiComparator.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringMultiComparator.java b/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringMultiComparator.java deleted file mode 100644 index a9b7efa..0000000 --- a/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringMultiComparator.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2009-2013 by The Regents of the University of California - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * you may obtain a copy of the License from - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package edu.uci.ics.hyracks.storage.am.common.ophelpers; - -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparator; -import edu.uci.ics.hyracks.dataflow.common.data.accessors.ITupleReference; - -/** - * MultiComparator that always passes 0 as a tuple's field length. This may speed up comparisons. - */ -public class FieldLengthIgnoringMultiComparator extends MultiComparator { - - public FieldLengthIgnoringMultiComparator(IBinaryComparator[] cmps) { - super(cmps); - } - - @Override - public int compare(ITupleReference tupleA, ITupleReference tupleB) { - for (int i = 0; i < cmps.length; i++) { - int cmp = cmps[i].compare(tupleA.getFieldData(i), tupleA.getFieldStart(i), 0, tupleB.getFieldData(i), - tupleB.getFieldStart(i), 0); - if (cmp != 0) { - return cmp; - } - } - return 0; - } - - @Override - public int selectiveFieldCompare(ITupleReference tupleA, ITupleReference tupleB, int[] fields) { - for (int j = 0; j < cmps.length; j++) { - int i = fields[j]; - int cmp = cmps[j].compare(tupleA.getFieldData(i), tupleA.getFieldStart(i), 0, tupleB.getFieldData(i), - tupleB.getFieldStart(i), 0); - if (cmp != 0) { - return cmp; - } - } - return 0; - } - - @Override - public int compare(ITupleReference tupleA, ITupleReference tupleB, int startFieldIndex) { - for (int i = 0; i < cmps.length; i++) { - int ix = startFieldIndex + i; - int cmp = cmps[i].compare(tupleA.getFieldData(ix), tupleA.getFieldStart(ix), 0, tupleB.getFieldData(ix), - tupleB.getFieldStart(ix), 0); - if (cmp != 0) { - return cmp; - } - } - return 0; - } - - @Override - public int fieldRangeCompare(ITupleReference tupleA, ITupleReference tupleB, int startFieldIndex, int numFields) { - for (int i = startFieldIndex; i < startFieldIndex + numFields; i++) { - int cmp = cmps[i].compare(tupleA.getFieldData(i), tupleA.getFieldStart(i), 0, tupleB.getFieldData(i), - tupleB.getFieldStart(i), 0); - if (cmp != 0) { - return cmp; - } - } - return 0; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringSingleComparator.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringSingleComparator.java b/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringSingleComparator.java deleted file mode 100644 index a342379..0000000 --- a/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/FieldLengthIgnoringSingleComparator.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2009-2013 by The Regents of the University of California - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * you may obtain a copy of the License from - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package edu.uci.ics.hyracks.storage.am.common.ophelpers; - -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparator; -import edu.uci.ics.hyracks.dataflow.common.data.accessors.ITupleReference; - -/** - * MultiComparator optimized for the special case where there is only a single comparator. - * Further speeds up comparisons by always passing 0 as the field's length. - */ -public class FieldLengthIgnoringSingleComparator extends MultiComparator { - private final IBinaryComparator cmp; - - protected FieldLengthIgnoringSingleComparator(IBinaryComparator[] cmps) { - super(cmps); - this.cmp = cmps[0]; - } - - public int compare(ITupleReference tupleA, ITupleReference tupleB) { - return cmp.compare(tupleA.getFieldData(0), tupleA.getFieldStart(0), 0, tupleB.getFieldData(0), - tupleB.getFieldStart(0), 0); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/MultiComparator.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/MultiComparator.java b/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/MultiComparator.java index bf93317..2c59a4e 100644 --- a/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/MultiComparator.java +++ b/hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/ophelpers/MultiComparator.java @@ -93,31 +93,6 @@ public class MultiComparator { } } - public static MultiComparator createIgnoreFieldLength(IBinaryComparatorFactory[] cmpFactories) { - IBinaryComparator[] cmps = new IBinaryComparator[cmpFactories.length]; - for (int i = 0; i < cmpFactories.length; i++) { - cmps[i] = cmpFactories[i].createBinaryComparator(); - } - if (cmps.length == 1) { - return new FieldLengthIgnoringSingleComparator(cmps); - } else { - return new FieldLengthIgnoringMultiComparator(cmps); - } - } - - public static MultiComparator createIgnoreFieldLength(IBinaryComparatorFactory[] cmpFactories, int startIndex, - int numCmps) { - IBinaryComparator[] cmps = new IBinaryComparator[numCmps]; - for (int i = startIndex; i < startIndex + numCmps; i++) { - cmps[i] = cmpFactories[i].createBinaryComparator(); - } - if (cmps.length == 1) { - return new FieldLengthIgnoringSingleComparator(cmps); - } else { - return new FieldLengthIgnoringMultiComparator(cmps); - } - } - public static MultiComparator create(IBinaryComparatorFactory[] cmpFactories, int startIndex, int numCmps) { IBinaryComparator[] cmps = new IBinaryComparator[numCmps]; for (int i = startIndex; i < startIndex + numCmps; i++) { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java index 22d25bb..18d4f49 100644 --- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java +++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java @@ -369,8 +369,7 @@ public class LSMBTree extends AbstractLSMIndex implements ITreeIndex { private boolean insert(ITupleReference tuple, LSMBTreeOpContext ctx) throws HyracksDataException, IndexException { ILSMComponent c = ctx.getComponentHolder().get(0); LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c; - MultiComparator comparator = MultiComparator.createIgnoreFieldLength(mutableComponent.getBTree() - .getComparatorFactories()); + MultiComparator comparator = MultiComparator.create(mutableComponent.getBTree().getComparatorFactories()); LSMBTreePointSearchCursor searchCursor = new LSMBTreePointSearchCursor(ctx); IIndexCursor memCursor = new BTreeRangeSearchCursor(ctx.currentMutableBTreeOpCtx.leafFrame, false); RangePredicate predicate = new RangePredicate(tuple, tuple, true, true, comparator, comparator); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java index 7d0d364..5aa7ed6 100644 --- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java +++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java @@ -432,7 +432,7 @@ public class LSMInvertedIndex extends AbstractLSMIndex implements IInvertedIndex ArrayList deletedKeysBTreeAccessors, List operationalComponents) { ICursorInitialState initState = null; PermutingTupleReference keysOnlyTuple = createKeysOnlyTupleReference(); - MultiComparator keyCmp = MultiComparator.createIgnoreFieldLength(invListCmpFactories); + MultiComparator keyCmp = MultiComparator.create(invListCmpFactories); // TODO: This check is not pretty, but it does the job. Come up with something more OO in the future. // Distinguish between regular searches and range searches (mostly used in merges). http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java index edbe240..bfc5978 100644 --- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java +++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java @@ -64,8 +64,8 @@ public class InMemoryInvertedIndexOpContext implements IIndexOperationContext { btreePred = new RangePredicate(null, null, true, true, null, null); btreeAccessor = (BTreeAccessor) btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); - btreeCmp = MultiComparator.createIgnoreFieldLength(btree.getComparatorFactories()); - tokenFieldsCmp = MultiComparator.createIgnoreFieldLength(tokenCmpFactories); + btreeCmp = MultiComparator.create(btree.getComparatorFactories()); + tokenFieldsCmp = MultiComparator.create(tokenCmpFactories); } break; } http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java index 1684cf0..56eda8c 100644 --- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java +++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java @@ -592,7 +592,7 @@ public class OnDiskInvertedIndex implements IInvertedIndex { IIndexAccessor btreeAccessor = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); IIndexCursor btreeCursor = btreeAccessor.createSearchCursor(false); - MultiComparator btreeCmp = MultiComparator.createIgnoreFieldLength(btree.getComparatorFactories()); + MultiComparator btreeCmp = MultiComparator.create(btree.getComparatorFactories()); RangePredicate rangePred = new RangePredicate(null, null, true, true, btreeCmp, btreeCmp); int[] fieldPermutation = new int[tokenTypeTraits.length]; for (int i = 0; i < tokenTypeTraits.length; i++) { @@ -603,7 +603,7 @@ public class OnDiskInvertedIndex implements IInvertedIndex { IInvertedIndexAccessor invIndexAccessor = (IInvertedIndexAccessor) createAccessor( NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); IInvertedListCursor invListCursor = invIndexAccessor.createInvertedListCursor(); - MultiComparator invListCmp = MultiComparator.createIgnoreFieldLength(invListCmpFactories); + MultiComparator invListCmp = MultiComparator.create(invListCmpFactories); try { // Search key for finding an inverted-list in the actual index. @@ -673,7 +673,7 @@ public class OnDiskInvertedIndex implements IInvertedIndex { public IBinaryComparatorFactory[] getTokenCmpFactories() { return tokenCmpFactories; } - + @Override public boolean hasMemoryComponents() { return true; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java index 509409f..c2a16cc 100644 --- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java +++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java @@ -37,7 +37,7 @@ public class OnDiskInvertedIndexOpContext implements IIndexOperationContext { // TODO: Ignore opcallbacks for now. btreeAccessor = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); btreeCursor = btreeAccessor.createSearchCursor(false); - searchCmp = MultiComparator.createIgnoreFieldLength(btree.getComparatorFactories()); + searchCmp = MultiComparator.create(btree.getComparatorFactories()); if (btree.getComparatorFactories().length > 1) { prefixSearchCmp = MultiComparator.create(btree.getComparatorFactories(), 0, 1); } http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/80490739/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/search/InvertedListMerger.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/search/InvertedListMerger.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/search/InvertedListMerger.java index 692a640..4cb207c 100644 --- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/search/InvertedListMerger.java +++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/search/InvertedListMerger.java @@ -39,7 +39,7 @@ public class InvertedListMerger { protected SearchResult newSearchResult; public InvertedListMerger(IHyracksCommonContext ctx, IInvertedIndex invIndex) throws HyracksDataException { - this.invListCmp = MultiComparator.createIgnoreFieldLength(invIndex.getInvListCmpFactories()); + this.invListCmp = MultiComparator.create(invIndex.getInvListCmpFactories()); this.prevSearchResult = new SearchResult(invIndex.getInvListTypeTraits(), ctx); this.newSearchResult = new SearchResult(prevSearchResult); }