Skip to content

HSEARCH-4534 Fix random failures for tests involving dynamic BigDecimal/BigInteger fields with Elasticsearch #2989

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

Merged
merged 3 commits into from
Apr 6, 2022
Merged

HSEARCH-4534 Fix random failures for tests involving dynamic BigDecimal/BigInteger fields with Elasticsearch #2989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a68d910
HSEARCH-4534 Use safer patterns for static data populated in @Paramet…
yrodiere Apr 6, 2022
471746e
HSEARCH-4534 Disable tests for dynamic BigDecimal fields on Elasticse…
yrodiere Apr 6, 2022
abb9419
HSEARCH-4534 Don't run FieldSortDynamicFieldIT for BigDecimal fields …
yrodiere Apr 6, 2022
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
5 changes: 3 additions & 2 deletions ...tegrationtest/backend/elasticsearch/testsupport/util/ElasticsearchTckBackendFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,10 @@ public boolean supportsValuesForDynamicField(Class<?> javaType) {
return ! dialect.hasBugForBigIntegerValuesForDynamicField();
}
else if ( BigDecimal.class.equals( javaType ) ) {
// For some reason, ES 5.6 sometimes fails to index BigDecimal values
// For some reason, ES 5.6 and 6.x sometimes fails to index BigDecimal values
// in dynamic fields.
// See https://hibernate.atlassian.net/browse/HSEARCH-4310.
// See https://hibernate.atlassian.net/browse/HSEARCH-4310,
// https://hibernate.atlassian.net/browse/HSEARCH-4310
return ! dialect.hasBugForBigDecimalValuesForDynamicField();
}
else {
Expand Down
7 changes: 5 additions & 2 deletions ...org/hibernate/search/integrationtest/backend/tck/search/sort/FieldSortDynamicFieldIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@
@RunWith(Parameterized.class)
public class FieldSortDynamicFieldIT<F> {

private static final List<FieldTypeDescriptor<?>> supportedFieldTypes = new ArrayList<>();
private static List<FieldTypeDescriptor<?>> supportedFieldTypes;

@Parameterized.Parameters(name = "{0}")
public static Object[][] parameters() {
supportedFieldTypes = new ArrayList<>();
List<Object[]> parameters = new ArrayList<>();
for ( FieldTypeDescriptor<?> fieldType : FieldTypeDescriptor.getAll() ) {
if ( fieldType.isFieldSortSupported() ) {
if ( fieldType.isFieldSortSupported()
&& TckConfiguration.get().getBackendFeatures()
.supportsValuesForDynamicField( fieldType.getJavaType() ) ) {
supportedFieldTypes.add( fieldType );
parameters.add( new Object[] { fieldType } );
}
Expand Down
3 changes: 2 additions & 1 deletion .../search/integrationtest/backend/tck/search/sort/FieldSortTypeCheckingAndConversionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@
@RunWith(Parameterized.class)
public class FieldSortTypeCheckingAndConversionIT<F> {

private static final List<FieldTypeDescriptor<?>> supportedFieldTypes = new ArrayList<>();
private static List<FieldTypeDescriptor<?>> supportedFieldTypes;

@Parameterized.Parameters(name = "{0}")
public static Object[][] parameters() {
supportedFieldTypes = new ArrayList<>();
List<Object[]> parameters = new ArrayList<>();
for ( FieldTypeDescriptor<?> fieldType : FieldTypeDescriptor.getAll() ) {
if ( fieldType.isFieldSortSupported() ) {
Expand Down
5 changes: 0 additions & 5 deletions ...ch/util/impl/integrationtest/backend/elasticsearch/dialect/Elasticsearch5TestDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ public boolean hasBugForSortMaxOnNegativeFloats() {
return true;
}

@Override
public boolean hasBugForBigDecimalValuesForDynamicField() {
return true;
}

@Override
public boolean supportMoreThan1024Terms() {
return false;
Expand Down
7 changes: 7 additions & 0 deletions ...h/util/impl/integrationtest/backend/elasticsearch/dialect/Elasticsearch68TestDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ public boolean zonedDateTimeDocValueHasUTCZoneId() {
return true;
}

@Override
public boolean hasBugForBigDecimalValuesForDynamicField() {
// See https://hibernate.atlassian.net/browse/HSEARCH-4310,
// https://hibernate.atlassian.net/browse/HSEARCH-4310
return true;
}

@Override
public boolean supportsSkipOrLimitingTotalHitCount() {
return false;
Expand Down