Skip to content

Commit f69570b

Browse files
committed
HSEARCH-5509 Update Elasticsearch client to 9.2.0
1 parent 4620f9b commit f69570b

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed

bom/platform-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<!-- These versions will be checked against the ones resolved by Maven for the project in the enforcer rule -->
2121
<version.bom.org.hibernate.orm>7.1.2.Final</version.bom.org.hibernate.orm>
22-
<version.bom.org.elasticsearch.client>9.1.5</version.bom.org.elasticsearch.client>
22+
<version.bom.org.elasticsearch.client>9.2.0</version.bom.org.elasticsearch.client>
2323
<version.bom.software.amazon.awssdk>2.35.7</version.bom.software.amazon.awssdk>
2424
<version.bom.io.smallrye>3.3.1</version.bom.io.smallrye>
2525
<version.bom.org.jboss.logging.processor>3.0.4.Final</version.bom.org.jboss.logging.processor>

build/parents/build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- >>> Elasticsearch -->
5050
<!-- The version of the Elasticsearch client used by Hibernate Search, independently of the version of the remote cluster -->
5151
<!-- Use the latest open-source version here. Currently, low-level clients are open-source even in 8.5+ -->
52-
<version.org.elasticsearch.client>9.1.5</version.org.elasticsearch.client>
52+
<version.org.elasticsearch.client>9.2.0</version.org.elasticsearch.client>
5353
<!-- Various HTTP client versions that our own Elasticsearch client implementations depend on -->
5454
<version.org.apache.httpcomponents.httpclient>4.5.14</version.org.apache.httpcomponents.httpclient>
5555
<version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>

integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/util/ElasticsearchTckBackendFeatures.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
import org.hibernate.search.engine.search.projection.ProjectionCollector;
3636
import org.hibernate.search.engine.spatial.GeoPoint;
3737
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.BigDecimalFieldTypeDescriptor;
38+
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.ByteVectorFieldTypeDescriptor;
3839
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.FieldTypeDescriptor;
3940
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.FloatFieldTypeDescriptor;
41+
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.FloatVectorFieldTypeDescriptor;
4042
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.GeoPointFieldTypeDescriptor;
4143
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.InstantFieldTypeDescriptor;
4244
import org.hibernate.search.integrationtest.backend.tck.testsupport.types.LocalDateFieldTypeDescriptor;
@@ -94,6 +96,17 @@ public boolean nonCanonicalRangeInAggregations() {
9496
return false;
9597
}
9698

99+
public boolean projectionPreservesNulls(FieldTypeDescriptor<?, ?> fieldType) {
100+
if ( ByteVectorFieldTypeDescriptor.INSTANCE.equals( fieldType )
101+
|| FloatVectorFieldTypeDescriptor.INSTANCE.equals( fieldType ) ) {
102+
return isActualVersion(
103+
esVersion -> esVersion.isLessThan( "9.2.0" ),
104+
osVersion -> true
105+
);
106+
}
107+
return projectionPreservesNulls();
108+
}
109+
97110
@Override
98111
public boolean fieldsProjectableByDefault() {
99112
return true;

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/FieldProjectionSingleValuedBaseIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void multi(TestedFieldStructure fieldStructure,
182182
Collections.singletonList( dataSet.getFieldValue( 2 ) ),
183183
Collections.singletonList( dataSet.getFieldValue( 3 ) ),
184184
// Empty document
185-
TckConfiguration.get().getBackendFeatures().projectionPreservesNulls()
185+
TckConfiguration.get().getBackendFeatures().projectionPreservesNulls( fieldType )
186186
? Collections.singletonList( null )
187187
: Collections.emptyList()
188188
);

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/util/TckBackendFeatures.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ public boolean projectionPreservesNulls() {
3636
return true;
3737
}
3838

39+
public boolean projectionPreservesNulls(FieldTypeDescriptor<?, ?> fieldType) {
40+
return projectionPreservesNulls();
41+
}
42+
3943
public abstract boolean fieldsProjectableByDefault();
4044

4145
public boolean supportsTotalHitsThresholdForScroll() {

0 commit comments

Comments
 (0)