Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HSEARCH-5010 Disable skipping in comparators #3828

Closed
wants to merge 2 commits into from
Closed

HSEARCH-5010 Disable skipping in comparators #3828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
714507e
HSEARCH-5010 Upgrade to Lucene 10.0-SNAPSHOT
marko-bekhta Nov 10, 2023
7dcdafc
HSEARCH-5010 Disable skipping in comparators
marko-bekhta Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...ibernate/search/backend/lucene/lowlevel/comparator/impl/DoubleValuesSourceComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.search.LeafFieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.comparators.DoubleComparator;

public class DoubleValuesSourceComparator extends DoubleComparator {

private final DoubleMultiValuesToSingleValuesSource source;

public DoubleValuesSourceComparator(int numHits, String field, Double missingValue, boolean reversed,
boolean enableSkipping, DoubleMultiValuesToSingleValuesSource source) {
super( numHits, field, missingValue, reversed, enableSkipping );
Pruning pruning, DoubleMultiValuesToSingleValuesSource source) {
super( numHits, field, missingValue, reversed, pruning );
this.source = source;
}

Expand All @@ -33,6 +34,7 @@ public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws I
private class DoubleValuesSourceLeafComparator extends DoubleLeafComparator {
DoubleValuesSourceLeafComparator(LeafReaderContext context) throws IOException {
super( context );
disableSkipping();
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...hibernate/search/backend/lucene/lowlevel/comparator/impl/FloatValuesSourceComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.search.LeafFieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.comparators.FloatComparator;

public class FloatValuesSourceComparator extends FloatComparator {

private final DoubleMultiValuesToSingleValuesSource source;

public FloatValuesSourceComparator(int numHits, String field, Float missingValue, boolean reversed, boolean enableSkipping,
public FloatValuesSourceComparator(int numHits, String field, Float missingValue, boolean reversed, Pruning pruning,
DoubleMultiValuesToSingleValuesSource source) {
super( numHits, field, missingValue, reversed, enableSkipping );
super( numHits, field, missingValue, reversed, pruning );
this.source = source;
}

Expand All @@ -33,6 +34,7 @@ public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws I
private class FloatValuesSourceLeafComparator extends FloatLeafComparator {
FloatValuesSourceLeafComparator(LeafReaderContext context) throws IOException {
super( context );
disableSkipping();
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...g/hibernate/search/backend/lucene/lowlevel/comparator/impl/IntValuesSourceComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.search.LeafFieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.comparators.IntComparator;

public class IntValuesSourceComparator extends IntComparator {

private final LongMultiValuesToSingleValuesSource source;

public IntValuesSourceComparator(int numHits, String field, Integer missingValue, boolean reversed, boolean enableSkipping,
public IntValuesSourceComparator(int numHits, String field, Integer missingValue, boolean reversed, Pruning pruning,
LongMultiValuesToSingleValuesSource source) {
super( numHits, field, missingValue, reversed, enableSkipping );
super( numHits, field, missingValue, reversed, pruning );
this.source = source;
}

Expand All @@ -33,6 +34,7 @@ public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws I
private class IntValuesSourceLeafComparator extends IntLeafComparator {
IntValuesSourceLeafComparator(LeafReaderContext context) throws IOException {
super( context );
disableSkipping();
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions .../hibernate/search/backend/lucene/lowlevel/comparator/impl/LongValuesSourceComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.search.LeafFieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.comparators.LongComparator;

public class LongValuesSourceComparator extends LongComparator {

private final LongMultiValuesToSingleValuesSource source;

public LongValuesSourceComparator(int numHits, String field, Long missingValue, boolean reversed, boolean enableSkipping,
public LongValuesSourceComparator(int numHits, String field, Long missingValue, boolean reversed, Pruning pruning,
LongMultiValuesToSingleValuesSource source) {
super( numHits, field, missingValue, reversed, enableSkipping );
super( numHits, field, missingValue, reversed, pruning );
this.source = source;
}

Expand All @@ -33,6 +34,7 @@ public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws I
private class LongValuesSourceLeafComparator extends LongLeafComparator {
LongValuesSourceLeafComparator(LeafReaderContext context) throws IOException {
super( context );
disableSkipping();
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions ...main/java/org/hibernate/search/backend/lucene/types/lowlevel/impl/LuceneDoubleDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.NumericUtils;

Expand Down Expand Up @@ -129,11 +130,11 @@ public IndexableField createSortedDocValuesField(String absoluteFieldPath, Doubl

@Override
public FieldComparator<Double> createFieldComparator(String fieldName, int numHits,
Double missingValue, boolean reversed, boolean enableSkipping, MultiValueMode multiValueMode,
Double missingValue, boolean reversed, Pruning pruning, MultiValueMode multiValueMode,
NestedDocsProvider nestedDocsProvider) {
DoubleMultiValuesToSingleValuesSource source = DoubleMultiValuesToSingleValuesSource
.fromDoubleField( fieldName, multiValueMode, nestedDocsProvider );
return new DoubleValuesSourceComparator( numHits, fieldName, missingValue, reversed, enableSkipping, source );
return new DoubleValuesSourceComparator( numHits, fieldName, missingValue, reversed, pruning, source );
}

}
5 changes: 3 additions & 2 deletions .../main/java/org/hibernate/search/backend/lucene/types/lowlevel/impl/LuceneFloatDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.NumericUtils;

Expand Down Expand Up @@ -129,11 +130,11 @@ public IndexableField createSortedDocValuesField(String absoluteFieldPath, Float

@Override
public FieldComparator<Float> createFieldComparator(String fieldName, int numHits,
Float missingValue, boolean reversed, boolean enableSkipping, MultiValueMode multiValueMode,
Float missingValue, boolean reversed, Pruning pruning, MultiValueMode multiValueMode,
NestedDocsProvider nestedDocsProvider) {
DoubleMultiValuesToSingleValuesSource source =
DoubleMultiValuesToSingleValuesSource.fromFloatField( fieldName, multiValueMode, nestedDocsProvider );
return new FloatValuesSourceComparator( numHits, fieldName, missingValue, reversed, enableSkipping, source );
return new FloatValuesSourceComparator( numHits, fieldName, missingValue, reversed, pruning, source );
}

}
5 changes: 3 additions & 2 deletions ...ain/java/org/hibernate/search/backend/lucene/types/lowlevel/impl/LuceneIntegerDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;

public class LuceneIntegerDomain implements LuceneNumericDomain<Integer> {
Expand Down Expand Up @@ -122,10 +123,10 @@ public IndexableField createSortedDocValuesField(String absoluteFieldPath, Integ

@Override
public FieldComparator<Integer> createFieldComparator(String fieldName, int numHits,
Integer missingValue, boolean reversed, boolean enableSkipping, MultiValueMode multiValueMode,
Integer missingValue, boolean reversed, Pruning pruning, MultiValueMode multiValueMode,
NestedDocsProvider nestedDocsProvider) {
LongMultiValuesToSingleValuesSource source =
LongMultiValuesToSingleValuesSource.fromIntField( fieldName, multiValueMode, nestedDocsProvider );
return new IntValuesSourceComparator( numHits, fieldName, missingValue, reversed, enableSkipping, source );
return new IntValuesSourceComparator( numHits, fieldName, missingValue, reversed, pruning, source );
}
}
5 changes: 3 additions & 2 deletions ...c/main/java/org/hibernate/search/backend/lucene/types/lowlevel/impl/LuceneLongDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;

public class LuceneLongDomain implements LuceneNumericDomain<Long> {
Expand Down Expand Up @@ -122,10 +123,10 @@ public IndexableField createSortedDocValuesField(String absoluteFieldPath, Long

@Override
public FieldComparator<Long> createFieldComparator(String fieldName, int numHits,
Long missingValue, boolean reversed, boolean enableSkipping, MultiValueMode multiValueMode,
Long missingValue, boolean reversed, Pruning pruning, MultiValueMode multiValueMode,
NestedDocsProvider nestedDocsProvider) {
LongMultiValuesToSingleValuesSource source =
LongMultiValuesToSingleValuesSource.fromLongField( fieldName, multiValueMode, nestedDocsProvider );
return new LongValuesSourceComparator( numHits, fieldName, missingValue, reversed, enableSkipping, source );
return new LongValuesSourceComparator( numHits, fieldName, missingValue, reversed, pruning, source );
}
}
3 changes: 2 additions & 1 deletion ...ain/java/org/hibernate/search/backend/lucene/types/lowlevel/impl/LuceneNumericDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;

public interface LuceneNumericDomain<E extends Number> {
Expand Down Expand Up @@ -54,6 +55,6 @@ Facets createRangeFacetCounts(String absoluteFieldPath,
IndexableField createSortedDocValuesField(String absoluteFieldPath, E numericValue);

FieldComparator<E> createFieldComparator(String absoluteFieldPath, int numHits,
E missingValue, boolean reversed, boolean enableSkipping, MultiValueMode multiValueMode,
E missingValue, boolean reversed, Pruning pruning, MultiValueMode multiValueMode,
NestedDocsProvider nestedDocsProvider);
}
5 changes: 3 additions & 2 deletions ...ckend/lucene/types/sort/comparatorsource/impl/LuceneGeoPointDistanceComparatorSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.hibernate.search.engine.spatial.GeoPoint;

import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;

public class LuceneGeoPointDistanceComparatorSource extends LuceneFieldComparatorSource {
Expand All @@ -29,11 +30,11 @@ public LuceneGeoPointDistanceComparatorSource(String nestedDocumentPath, GeoPoin
}

@Override
public FieldComparator<?> newComparator(String fieldname, int numHits, boolean enableSkipping, boolean reversed) {
public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
GeoPointDistanceMultiValuesToSingleValuesSource source = new GeoPointDistanceMultiValuesToSingleValuesSource(
fieldname, mode, nestedDocsProvider, center
);
// forcing to not skipping documents
return new DoubleValuesSourceComparator( numHits, fieldname, missingValue, reversed, false, source );
return new DoubleValuesSourceComparator( numHits, fieldname, missingValue, reversed, Pruning.NONE, source );
}
}
5 changes: 3 additions & 2 deletions ...h/backend/lucene/types/sort/comparatorsource/impl/LuceneNumericFieldComparatorSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.hibernate.search.backend.lucene.types.lowlevel.impl.LuceneNumericDomain;

import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;

public class LuceneNumericFieldComparatorSource<E extends Number> extends LuceneFieldComparatorSource {
Expand All @@ -27,8 +28,8 @@ public LuceneNumericFieldComparatorSource(String nestedDocumentPath, LuceneNumer
}

@Override
public FieldComparator<?> newComparator(String fieldname, int numHits, boolean enableSkipping, boolean reversed) {
return numericDomain.createFieldComparator( fieldname, numHits, missingValue, reversed, enableSkipping,
public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
return numericDomain.createFieldComparator( fieldname, numHits, missingValue, reversed, pruning,
sortMode, nestedDocsProvider );
}
}
5 changes: 3 additions & 2 deletions ...arch/backend/lucene/types/sort/comparatorsource/impl/LuceneTextFieldComparatorSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.comparators.TermOrdValComparator;
import org.apache.lucene.util.BytesRef;
Expand All @@ -33,7 +34,7 @@ public LuceneTextFieldComparatorSource(String nestedDocumentPath, Object missing
}

@Override
public FieldComparator<?> newComparator(String fieldname, int numHits, boolean enableSkipping, boolean reversed) {
public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
final boolean considerMissingHighest;
if ( SortMissingValue.MISSING_LOWEST.equals( missingValue ) ) {
considerMissingHighest = false;
Expand All @@ -53,7 +54,7 @@ else if ( SortMissingValue.MISSING_LAST.equals( missingValue ) ) {
TextMultiValuesToSingleValuesSource.fromField( fieldname, multiValueMode, nestedDocsProvider );

// forcing to not skipping documents
return new TermOrdValComparator( numHits, fieldname, considerMissingHighest, reversed, false ) {
return new TermOrdValComparator( numHits, fieldname, considerMissingHighest, reversed, Pruning.NONE ) {
@Override
protected SortedDocValues getSortedDocValues(LeafReaderContext context, String field) throws IOException {
SortedDocValues sortedDocValues = source.getValues( context );
Expand Down
2 changes: 1 addition & 1 deletion build/parents/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<!-- >>> Lucene -->
<!-- When upgrading Lucene, make sure to align the dependency to com.carrotsearch.hppc (see below) -->
<version.org.apache.lucene>9.8.0</version.org.apache.lucene>
<version.org.apache.lucene>10.0.0-SNAPSHOT</version.org.apache.lucene>
<javadoc.org.apache.lucene.tag>${parsed-version.org.apache.lucene.majorVersion}_${parsed-version.org.apache.lucene.minorVersion}_${parsed-version.org.apache.lucene.incrementalVersion}</javadoc.org.apache.lucene.tag>
<javadoc.org.apache.lucene.core.url>https://lucene.apache.org/core/${javadoc.org.apache.lucene.tag}/core/</javadoc.org.apache.lucene.core.url>
<javadoc.org.apache.lucene.analyzers-common.url>https://lucene.apache.org/core/${javadoc.org.apache.lucene.tag}/analyzers-common/</javadoc.org.apache.lucene.analyzers-common.url>
Expand Down
3 changes: 2 additions & 1 deletion ...v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.FieldComparatorSource;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SimpleFieldComparator;
import org.apache.lucene.search.Sort;
Expand Down Expand Up @@ -485,7 +486,7 @@ public String toString() {

public static class SumFieldComparatorSource 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 SumFieldComparator( numHits, "num1", "num2" );
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ibernate/search/util/impl/integrationtest/backend/lucene/directory/TrackingDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public IndexInput openInput(String name, IOContext context) throws IOException {
}

@Override
public ChecksumIndexInput openChecksumInput(String name, IOContext context) throws IOException {
return new TrackingChecksumIndexInput( delegate.openChecksumInput( name, context ), tracker );
public ChecksumIndexInput openChecksumInput(String name) throws IOException {
return new TrackingChecksumIndexInput( delegate.openChecksumInput( name ), tracker );
}

@Override
Expand Down
Loading