Skip to content

Commit

Permalink
HSEARCH-4173 Test behavior of field-based projections when a field ex…
Browse files Browse the repository at this point in the history 
…ists in only one index

Signed-off-by: Yoann Rodière <yoann@hibernate.org>
  • Loading branch information
@yrodiere
yrodiere committed Mar 2, 2021
1 parent 8236e09 commit 8714c13
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 4 deletions.
34 changes: 32 additions & 2 deletions ...st/backend/tck/search/projection/DistanceSearchProjectionTypeCheckingAndConversionIT.java
View file
Expand Up @@ -55,6 +55,7 @@ public class DistanceSearchProjectionTypeCheckingAndConversionIT {

private static final String COMPATIBLE_INDEX_DOCUMENT_1 = "compatible_1";
private static final String RAW_FIELD_COMPATIBLE_INDEX_DOCUMENT_1 = "raw_field_compatible_1";
private static final String MISSING_FIELD_INDEX_DOCUMENT_1 = "missing_field_1";

@ClassRule
public static final SearchSetupHelper setupHelper = new SearchSetupHelper();
Expand All @@ -65,13 +66,15 @@ public class DistanceSearchProjectionTypeCheckingAndConversionIT {
SimpleMappedIndex.of( CompatibleIndexBinding::new ).name( "compatible" );
private static final SimpleMappedIndex<RawFieldCompatibleIndexBinding> rawFieldCompatibleIndex =
SimpleMappedIndex.of( RawFieldCompatibleIndexBinding::new ).name( "rawFieldCompatible" );
private static final SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex =
SimpleMappedIndex.of( MissingFieldIndexBinding::new ).name( "missingField" );
private static final SimpleMappedIndex<IncompatibleIndexBinding> incompatibleIndex =
SimpleMappedIndex.of( IncompatibleIndexBinding::new ).name( "incompatible" );

@BeforeClass
public static void setup() {
setupHelper.start()
.withIndexes( mainIndex, compatibleIndex, rawFieldCompatibleIndex, incompatibleIndex )
.withIndexes( mainIndex, compatibleIndex, rawFieldCompatibleIndex, missingFieldIndex, incompatibleIndex )
.setup();

initData();
Expand Down Expand Up @@ -203,6 +206,26 @@ public void multiIndex_withRawFieldCompatibleIndex() {
);
}

@Test
@TestForIssue(jiraKey = "HSEARCH-4173")
public void multiIndex_withMissingFieldIndex() {
StubMappingScope scope = mainIndex.createScope( missingFieldIndex );

assertThatQuery( scope.query()
.select( f -> f.distance( getFieldWithConverterPath(), CENTER_POINT_1 ) )
.where( f -> f.matchAll() )
.toQuery() )
.hits().asIs()
.usingElementComparator( TestComparators.APPROX_M_COMPARATOR )
.containsExactlyInAnyOrder(
getFieldDistance( 1 ),
getFieldDistance( 2 ),
getFieldDistance( 3 ),
null, // Empty document
null // From the "missing field" index
);
}

@Test
public void multiIndex_withIncompatibleIndex() {
StubMappingScope scope = mainIndex.createScope( incompatibleIndex );
Expand Down Expand Up @@ -284,7 +307,9 @@ private static void initData() {
BulkIndexer rawFieldCompatibleIndexer = rawFieldCompatibleIndex.bulkIndexer()
.add( RAW_FIELD_COMPATIBLE_INDEX_DOCUMENT_1,
document -> addFieldValue( document, rawFieldCompatibleIndex.binding().fieldWithConverterModel, 1 ) );
mainIndexer.join( compatibleIndexer, rawFieldCompatibleIndexer );
BulkIndexer missingFieldIndexer = missingFieldIndex.bulkIndexer()
.add( MISSING_FIELD_INDEX_DOCUMENT_1, document -> { } );
mainIndexer.join( compatibleIndexer, rawFieldCompatibleIndexer, missingFieldIndexer );
}

private static class IndexBinding {
Expand Down Expand Up @@ -389,6 +414,11 @@ public ValueWrapper convert(Object value, FromDocumentFieldValueConvertContext c
}
}

private static class MissingFieldIndexBinding {
MissingFieldIndexBinding(IndexSchemaElement root) {
}
}

private static class IncompatibleIndexBinding {
final ObjectBinding flattenedObject;

Expand Down
54 changes: 52 additions & 2 deletions ...ntest/backend/tck/search/projection/FieldSearchProjectionTypeCheckingAndConversionIT.java
View file
Expand Up @@ -67,6 +67,7 @@ public static Object[][] parameters() {

private static final String COMPATIBLE_INDEX_DOCUMENT_1 = "compatible_1";
private static final String RAW_FIELD_COMPATIBLE_INDEX_DOCUMENT_1 = "raw_field_compatible_1";
private static final String MISSING_FIELD_INDEX_DOCUMENT_1 = "missing_field_1";

@ClassRule
public static final SearchSetupHelper setupHelper = new SearchSetupHelper();
Expand All @@ -77,13 +78,15 @@ public static Object[][] parameters() {
SimpleMappedIndex.of( CompatibleIndexBinding::new ).name( "compatible" );
private static final SimpleMappedIndex<RawFieldCompatibleIndexBinding> rawFieldCompatibleIndex =
SimpleMappedIndex.of( RawFieldCompatibleIndexBinding::new ).name( "rawFieldCompatible" );
private static final SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex =
SimpleMappedIndex.of( MissingFieldIndexBinding::new ).name( "missingField" );
private static final SimpleMappedIndex<IncompatibleIndexBinding> incompatibleIndex =
SimpleMappedIndex.of( IncompatibleIndexBinding::new ).name( "incompatible" );

@BeforeClass
public static void setup() {
setupHelper.start()
.withIndexes( mainIndex, compatibleIndex, rawFieldCompatibleIndex, incompatibleIndex )
.withIndexes( mainIndex, compatibleIndex, rawFieldCompatibleIndex, missingFieldIndex, incompatibleIndex )
.setup();

initData();
Expand Down Expand Up @@ -361,6 +364,46 @@ public void multiIndex_withRawFieldCompatibleIndex_projectionConverterDisabled()
);
}

@Test
@TestForIssue(jiraKey = "HSEARCH-4173")
public void multiIndex_withMissingFieldIndex_projectionConverterEnabled() {
StubMappingScope scope = mainIndex.createScope( missingFieldIndex );

String fieldPath = getFieldWithConverterPath();

assertThatQuery( scope.query()
.select( f -> f.field( fieldPath, ValueWrapper.class ) )
.where( f -> f.matchAll() )
.toQuery() )
.hasHitsAnyOrder(
new ValueWrapper<F>( getFieldValue( 1 ) ),
new ValueWrapper<F>( getFieldValue( 2 ) ),
new ValueWrapper<F>( getFieldValue( 3 ) ),
new ValueWrapper<F>( null ), // Empty document
new ValueWrapper<F>( null ) // From the "missing field" index
);
}

@Test
@TestForIssue(jiraKey = "HSEARCH-4173")
public void multiIndex_withMissingFieldIndex_projectionConverterDisabled() {
StubMappingScope scope = mainIndex.createScope( missingFieldIndex );

String fieldPath = getFieldWithConverterPath();

assertThatQuery( scope.query()
.select( f -> f.field( fieldPath, fieldType.getJavaType(), ValueConvert.NO ) )
.where( f -> f.matchAll() )
.toQuery() )
.hasHitsAnyOrder(
getFieldValue( 1 ),
getFieldValue( 2 ),
getFieldValue( 3 ),
null, // Empty document
null // From the "missing field" index
);
}

@Test
public void multiIndex_withIncompatibleIndex_projectionConverterEnabled() {
StubMappingScope scope = mainIndex.createScope( incompatibleIndex );
Expand Down Expand Up @@ -459,7 +502,9 @@ private static void initData() {
.add( RAW_FIELD_COMPATIBLE_INDEX_DOCUMENT_1,
document -> rawFieldCompatibleIndex.binding().fieldWithConverterModels
.forEach( f -> addFieldValue( document, f, 1 ) ) );
mainIndexer.join( compatibleIndexer, rawFieldCompatibleIndexer );
BulkIndexer missingFieldIndexer = missingFieldIndex.bulkIndexer()
.add( MISSING_FIELD_INDEX_DOCUMENT_1, document -> { } );
mainIndexer.join( compatibleIndexer, rawFieldCompatibleIndexer, missingFieldIndexer );
}

private static class IndexBinding {
Expand Down Expand Up @@ -566,6 +611,11 @@ public ValueWrapper convert(Object value, FromDocumentFieldValueConvertContext c
}
}

private static class MissingFieldIndexBinding {
MissingFieldIndexBinding(IndexSchemaElement root) {
}
}

private static class IncompatibleIndexBinding {
final ObjectBinding flattenedObject;

Expand Down

0 comments on commit 8714c13

Please sign in to comment.