diff --git a/pom.xml b/pom.xml index 06a6489..17729e5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ 0-SNAPSHOT false 1.10.4 - 9.8.0 - 8.8.1 + 9.9.1 + 8.9.1 5.9.0 1.0.25 diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java index 0786e47..1bf25a5 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java @@ -147,7 +147,7 @@ public class DatabaseMapDictionary extends DatabaseMapDictionaryDeep extends ResourceIterable { for (int compIDX = 0; compIDX < sortFields.length; ++compIDX) { SortField sortField = sortFields[compIDX]; - comparators[compIDX] = sortField.getComparator(1, compIDX == 0); + comparators[compIDX] = sortField.getComparator(1, Pruning.NONE); reverseMul[compIDX] = sortField.getReverse() ? -1 : 1; } diff --git a/src/main/java/it/cavallium/dbengine/lucene/RandomFieldComparatorSource.java b/src/main/java/it/cavallium/dbengine/lucene/RandomFieldComparatorSource.java index 9c6cbe1..c06821b 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/RandomFieldComparatorSource.java +++ b/src/main/java/it/cavallium/dbengine/lucene/RandomFieldComparatorSource.java @@ -4,6 +4,7 @@ import it.cavallium.dbengine.utils.LFSR; import java.util.concurrent.ThreadLocalRandom; import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.FieldComparatorSource; +import org.apache.lucene.search.Pruning; public class RandomFieldComparatorSource extends FieldComparatorSource { @@ -14,7 +15,7 @@ public class RandomFieldComparatorSource extends FieldComparatorSource { } @Override - public FieldComparator newComparator(String fieldName, int numHits, boolean enableSkipping, boolean reversed) { + public FieldComparator newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) { return new RandomFieldComparator(rand.iterator(), numHits); } } diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/ShardIndexSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/ShardIndexSearcher.java index f721939..822b349 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/ShardIndexSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/ShardIndexSearcher.java @@ -119,7 +119,7 @@ public class ShardIndexSearcher extends IndexSearcher { throw new NoSuchElementException("node=" + nodeID); } for (Term term : terms) { - final TermStates ts = TermStates.build(s.getIndexReader().getContext(), term, true); + final TermStates ts = TermStates.build(s, term, true); if (ts.docFreq() > 0) { stats.put(term, s.termStatistics(term, ts.docFreq(), ts.totalTermFreq())); }