HSEARCH-5564 Add compatibility with Elasticsearch 9.3

Jenkinsfile

@@ -256,8 +256,9 @@ stage('Configure') {
 					new LocalElasticsearchBuildEnvironment(version: '8.18.7', condition: TestCondition.ON_DEMAND),
 					new LocalElasticsearchBuildEnvironment(version: '8.19.6', condition: TestCondition.AFTER_MERGE),
 					new LocalElasticsearchBuildEnvironment(version: '9.0.7', condition: TestCondition.ON_DEMAND),
-					new LocalElasticsearchBuildEnvironment(version: '9.1.5', condition: TestCondition.ON_DEMAND),
-					new LocalElasticsearchBuildEnvironment(version: '9.2.4', condition: TestCondition.BEFORE_MERGE, isDefault: true),
+                    new LocalElasticsearchBuildEnvironment(version: '9.1.5', condition: TestCondition.ON_DEMAND),
+                    new LocalElasticsearchBuildEnvironment(version: '9.2.4', condition: TestCondition.ON_DEMAND),
+					new LocalElasticsearchBuildEnvironment(version: '9.3.0', condition: TestCondition.BEFORE_MERGE, isDefault: true),
 					// IMPORTANT: Make sure to update the documentation for any newly supported Elasticsearch versions
 					//            See version.org.elasticsearch.compatible.expected.text
 					//            and version.org.elasticsearch.compatible.regularly-tested.text in POMs.

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java

@@ -213,7 +213,7 @@ else if ( minor == 0 ) {
 	}
 
 	private ElasticsearchProtocolDialect createProtocolDialectElasticV9(ElasticsearchVersion version, int minor) {
-		if ( minor > 2 ) {
+		if ( minor > 3 ) {
 			VersionLog.INSTANCE.unknownElasticsearchVersion( version );
 		}
 		return new Elasticsearch81ProtocolDialect();

backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java

@@ -341,10 +341,18 @@ public static List<? extends Arguments> params() {
 						ElasticsearchDistributionName.ELASTIC, "9.2.0", "9.2.0",
 						Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
 				),
-				successWithWarning(
+				success(
+						ElasticsearchDistributionName.ELASTIC, "9.3", "9.3.0",
+						Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
+				),
+				success(
 						ElasticsearchDistributionName.ELASTIC, "9.3.0", "9.3.0",
 						Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
 				),
+				successWithWarning(
+						ElasticsearchDistributionName.ELASTIC, "9.4.0", "9.4.0",
+						Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
+				),
 				success(
 						ElasticsearchDistributionName.OPENSEARCH, "1", "1.3.1",
 						OpenSearch1ModelDialect.class, Elasticsearch70ProtocolDialect.class

bom/platform-common/pom.xml

@@ -19,8 +19,8 @@
 
         <!-- These versions will be checked against the ones resolved by Maven for the project in the enforcer rule -->
         <version.bom.org.hibernate.orm>7.3.0.CR2</version.bom.org.hibernate.orm>
-        <version.bom.org.elasticsearch.client>9.2.4</version.bom.org.elasticsearch.client>
-        <version.bom.org.elasticsearch.java.client>9.2.4</version.bom.org.elasticsearch.java.client>
+        <version.bom.org.elasticsearch.client>9.3.0</version.bom.org.elasticsearch.client>
+        <version.bom.org.elasticsearch.java.client>9.3.0</version.bom.org.elasticsearch.java.client>
         <version.bom.org.opensearch.client>3.4.0</version.bom.org.opensearch.client>
         <version.bom.software.amazon.awssdk>2.41.2</version.bom.software.amazon.awssdk>
         <version.bom.io.smallrye>3.3.2</version.bom.io.smallrye>

build/container/search-backend/elastic.Dockerfile

@@ -5,4 +5,4 @@
 #  * update `version.org.elasticsearch.latest` property in a POM file.
 #  * update the tags for 'elasticsearch-current' and 'elasticsearch-next' builds in ci/dependency-update/Jenkinsfile
 #
-FROM docker.io/elastic/elasticsearch:9.2.4
+FROM docker.io/elastic/elasticsearch:9.3.0

build/parents/build/pom.xml

@@ -49,8 +49,8 @@
         <!-- >>> Elasticsearch -->
         <!-- The version of the Elasticsearch client used by Hibernate Search, independently of the version of the remote cluster -->
         <!-- Use the latest open-source version here. Currently, low-level clients are open-source even in 8.5+ -->
-        <version.org.elasticsearch.client>9.2.4</version.org.elasticsearch.client>
-        <version.org.elasticsearch.java.client>9.2.4</version.org.elasticsearch.java.client>
+        <version.org.elasticsearch.client>9.3.0</version.org.elasticsearch.client>
+        <version.org.elasticsearch.java.client>9.3.0</version.org.elasticsearch.java.client>
         <version.org.opensearch.client>3.4.0</version.org.opensearch.client>
         <!-- Various HTTP client versions that our own Elasticsearch client implementations depend on -->
         <version.org.apache.httpcomponents.client5>5.5.1</version.org.apache.httpcomponents.client5>
@@ -65,7 +65,7 @@
         <!-- The versions of Elasticsearch advertised as compatible with Hibernate Search -->
         <!-- Make sure to only mention tested versions here -->
         <!-- Make sure that 7.10 stays explicitly mentioned here, because that's the last open-source version -->
-        <version.org.elasticsearch.compatible.regularly-tested.text>7.10, 7.17, 8.18 or 9.2</version.org.elasticsearch.compatible.regularly-tested.text>
+        <version.org.elasticsearch.compatible.regularly-tested.text>7.10, 7.17, 8.18 or 9.3</version.org.elasticsearch.compatible.regularly-tested.text>
         <!-- These are the versions same as above, but pointing only to the major part (used in compatibility section of ES backend documentation
           as versions that Hibernate Search is compatible with. -->
         <!-- NOTE: Adding new major versions would require to update the compatibility table in `backend-elasticsearch-compatibility` section of `backend-elasticsearch.adoc`. -->

ci/dependency-update/Jenkinsfile

@@ -53,7 +53,7 @@ Map settings() {
 					updateProperties: [],
 					onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
 					// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
-					additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.2.5-SNAPSHOT',
+					additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.3.1-SNAPSHOT',
 					// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
 					skipSourceModifiedCheck: true
 			]
@@ -65,7 +65,7 @@ Map settings() {
 					updateProperties: [],
 					onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
 					// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
-					additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.3.0-SNAPSHOT',
+					additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.4.0-SNAPSHOT',
 					// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
 					skipSourceModifiedCheck: true
 			]

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

@@ -568,4 +568,16 @@ public <T> T aggregatedSumNullValue(Class<T> clazz) {
 		}
 		return super.aggregatedSumNullValue( clazz );
 	}
+
+	@Override
+	public boolean canHandleDeepNestedPredicate(FieldTypeDescriptor<?, ?> fieldTypeDescriptor) {
+		if ( ByteVectorFieldTypeDescriptor.INSTANCE.equals( fieldTypeDescriptor ) ) {
+			return isActualVersion(
+					es -> !es.isMatching( "9.3.0" ),
+					os -> true,
+					aoss -> true
+			);
+		}
+		return super.canHandleDeepNestedPredicate( fieldTypeDescriptor );
+	}
 }

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/AbstractPredicateInObjectFieldIT.java

@@ -5,6 +5,7 @@
 package org.hibernate.search.integrationtest.backend.tck.search.predicate;
 
 import static org.hibernate.search.util.impl.integrationtest.common.assertion.SearchResultAssert.assertThatQuery;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Collection;
 
@@ -82,6 +83,7 @@ void nestedX1_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 	void nestedX2_explicit(SimpleMappedIndex<IndexBinding> mainIndex,
 			SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
 			AbstractPredicateDataSet dataSet) {
+		assumeTrue( canHandleDeepNestedPredicate( dataSet ) );
 		assertThatQuery( mainIndex.query()
 				.where( f -> f.nested( mainIndex.binding().nested.absolutePath )
 						.add( f.nested( mainIndex.binding().nested.nested.absolutePath )
@@ -95,6 +97,7 @@ void nestedX2_explicit(SimpleMappedIndex<IndexBinding> mainIndex,
 	void nestedX2_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 			SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
 			AbstractPredicateDataSet dataSet) {
+		assumeTrue( canHandleDeepNestedPredicate( dataSet ) );
 		assertThatQuery( mainIndex.query()
 				.where( f -> predicate( f, mainIndex.binding().nested.nested, 0, dataSet ) )
 				.routing( dataSet.routingKey ) )
@@ -106,6 +109,7 @@ void nestedX2_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 	void nestedX2_explicit_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 			SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
 			AbstractPredicateDataSet dataSet) {
+		assumeTrue( canHandleDeepNestedPredicate( dataSet ) );
 		assertThatQuery( mainIndex.query()
 				.where( f -> f.nested( mainIndex.binding().nested.absolutePath )
 						.add( predicate( f, mainIndex.binding().nested.nested, 0, dataSet ) ) )
@@ -118,6 +122,7 @@ void nestedX2_explicit_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 	void nestedX3_explicitX2_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 			SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
 			AbstractPredicateDataSet dataSet) {
+		assumeTrue( canHandleDeepNestedPredicate( dataSet ) );
 		assertThatQuery( mainIndex.query()
 				.where( f -> f.nested( mainIndex.binding().nested.absolutePath )
 						.add( f.nested( mainIndex.binding().nested.nested.absolutePath )
@@ -131,6 +136,7 @@ void nestedX3_explicitX2_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 	void nestedX3_explicit_implicitX2(SimpleMappedIndex<IndexBinding> mainIndex,
 			SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
 			AbstractPredicateDataSet dataSet) {
+		assumeTrue( canHandleDeepNestedPredicate( dataSet ) );
 		assertThatQuery( mainIndex.query()
 				.where( f -> f.nested( mainIndex.binding().nested.absolutePath )
 						.add( predicate( f, mainIndex.binding().nested.nested.nested, 0, dataSet ) ) )
@@ -143,6 +149,7 @@ void nestedX3_explicit_implicitX2(SimpleMappedIndex<IndexBinding> mainIndex,
 	void nestedFlattenedNested_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 			SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
 			AbstractPredicateDataSet dataSet) {
+		assumeTrue( canHandleDeepNestedPredicate( dataSet ) );
 		assertThatQuery( mainIndex.query()
 				.where( f -> predicate( f, mainIndex.binding().nested.flattened.nested, 0, dataSet ) )
 				.routing( dataSet.routingKey ) )
@@ -159,6 +166,7 @@ void nestedFlattenedNested_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 	void multiIndex_missingNestedField_implicit(SimpleMappedIndex<IndexBinding> mainIndex,
 			SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
 			AbstractPredicateDataSet dataSet) {
+		assumeTrue( canHandleDeepNestedPredicate( dataSet ) );
 		StubMappingScope scope = mainIndex.createScope( missingFieldIndex );
 
 		// The "nested" predicate should not match anything in missingFieldIndex
@@ -183,6 +191,10 @@ void multiIndex_missingNestedField_implicit(SimpleMappedIndex<IndexBinding> main
 	protected abstract PredicateFinalStep predicate(SearchPredicateFactory f, ObjectFieldBinding objectFieldBinding,
 			int matchingDocOrdinal, AbstractPredicateDataSet dataSet);
 
+	protected boolean canHandleDeepNestedPredicate(AbstractPredicateDataSet dataSet) {
+		return true;
+	}
+
 	abstract static class AbstractObjectBinding {
 		final String absolutePath;
 		final SimpleFieldModelsByType field;

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/KnnPredicateBaseIT.java

@@ -168,6 +168,12 @@ protected PredicateFinalStep predicate(SearchPredicateFactory f, String fieldPat
 			return knnPredicateOptionsStep( f, fieldPath, matchingDocOrdinal,
 					dataSet.values.matchingArg( matchingDocOrdinal ) );
 		}
+
+		@Override
+		protected boolean canHandleDeepNestedPredicate(AbstractPredicateDataSet dataSet) {
+			return TckConfiguration.get().getBackendFeatures()
+					.canHandleDeepNestedPredicate( ( (DataSet<?, ?>) dataSet ).fieldType );
+		}
 	}
 
 	@Nested

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

@@ -230,4 +230,8 @@ public <U, R> R accumulatedNullValue(ProjectionCollector.Provider<U, R> collecto
 	public <T> T aggregatedSumNullValue(Class<T> clazz) {
 		return null;
 	}
+
+	public boolean canHandleDeepNestedPredicate(FieldTypeDescriptor<?, ?> fieldTypeDescriptor) {
+		return true;
+	}
 }

pom.xml

@@ -392,7 +392,7 @@
 
         <!-- Container images for various integration tests -->
         <!-- The latest version of Elasticsearch tested against by default -->
-        <version.org.elasticsearch.latest>9.2.4</version.org.elasticsearch.latest>
+        <version.org.elasticsearch.latest>9.3.0</version.org.elasticsearch.latest>
         <test.elasticsearch.version></test.elasticsearch.version>
         <test.elasticsearch.distribution>elastic</test.elasticsearch.distribution>