HSEARCH-5010 Add Lucene 10 to TCK test run

marko-bekhta · Nov 21, 2024 · b5aec70 · b5aec70
1 parent ab7e4b3
commit b5aec70
Show file tree

Hide file tree

Showing 22 changed files with 334 additions and 6 deletions.
diff --git a/bom/public/pom.xml b/bom/public/pom.xml
@@ -47,6 +47,11 @@
                 <artifactId>hibernate-search-backend-lucene</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.search</groupId>
+                <artifactId>hibernate-search-backend-lucene10</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
                 <artifactId>hibernate-search-mapper-pojo-base</artifactId>

diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
@@ -305,6 +305,11 @@
                 <artifactId>hibernate-search-backend-lucene</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.search</groupId>
+                <artifactId>hibernate-search-backend-lucene10</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
                 <artifactId>hibernate-search-mapper-pojo-base</artifactId>
@@ -565,11 +570,21 @@
                 <artifactId>hibernate-search-util-internal-integrationtest-backend-elasticsearch</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.search</groupId>
+                <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
                 <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.search</groupId>
+                <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene10</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
                 <artifactId>hibernate-search-util-internal-integrationtest-mapper-stub</artifactId>

diff --git a/integrationtest/backend/lucene/pom.xml b/integrationtest/backend/lucene/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.hibernate.search</groupId>
@@ -10,7 +10,8 @@
     <artifactId>hibernate-search-integrationtest-backend-lucene</artifactId>
 
     <name>Hibernate Search ITs - Backend - Lucene</name>
-    <description>Hibernate Search integration tests for the Lucene backend, running the Backend TCK in particular</description>
+    <description>Hibernate Search integration tests for the Lucene backend, running the Backend TCK in particular
+    </description>
 
     <properties>
         <surefire.module>lucene</surefire.module>
@@ -28,6 +29,11 @@
             <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene10</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-integrationtest-backend-tck</artifactId>
@@ -52,6 +58,40 @@
                             <dependenciesToScan>
                                 <dependency>${project.groupId}:hibernate-search-integrationtest-backend-tck</dependency>
                             </dependenciesToScan>
+                            <classpathDependencyExcludes>
+                                <classpathDependencyExclude>org.hibernate.search:hibernate-search-util-internal-integrationtest-backend-lucene10</classpathDependencyExclude>
+                            </classpathDependencyExcludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>it-10</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${test.lucene.skip}</skip>
+                            <!-- WARNING: When using <dependenciesToScan>, be sure to set the Maven property surefire.module -->
+                            <dependenciesToScan>
+                                <dependency>${project.groupId}:hibernate-search-integrationtest-backend-tck</dependency>
+                            </dependenciesToScan>
+                            <classpathDependencyExcludes>
+                                <classpathDependencyExclude>org.hibernate.search:hibernate-search-backend-lucene</classpathDependencyExclude>
+                                <classpathDependencyExclude>org.hibernate.search:hibernate-search-util-internal-integrationtest-backend-lucene</classpathDependencyExclude>
+                                <classpathDependencyExclude>org.apache.lucene:*</classpathDependencyExclude>
+                            </classpathDependencyExcludes>
+                            <additionalClasspathDependencies>
+                                <additionalClasspathDependency>
+                                    <groupId>org.hibernate.search</groupId>
+                                    <artifactId>hibernate-search-backend-lucene10</artifactId>
+                                    <version>${project.version}</version>
+                                </additionalClasspathDependency>
+                                <additionalClasspathDependency>
+                                    <groupId>org.hibernate.search</groupId>
+                                    <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene10</artifactId>
+                                    <version>${project.version}</version>
+                                </additionalClasspathDependency>
+                            </additionalClasspathDependencies>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...tegrationtest/backend/lucene/search/LuceneSearchTopDocsTotalHitCountOnMatchAllDocsIT.java b/...tegrationtest/backend/lucene/search/LuceneSearchTopDocsTotalHitCountOnMatchAllDocsIT.java
@@ -14,6 +14,7 @@
 import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.configuration.DefaultAnalysisDefinitions;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.extension.SearchSetupHelper;
+import org.hibernate.search.util.impl.integrationtest.backend.lucene.TotalHitsUtils;
 import org.hibernate.search.util.impl.integrationtest.mapper.stub.SimpleMappedIndex;
 import org.hibernate.search.util.impl.integrationtest.mapper.stub.StubMapperUtils;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
@@ -66,8 +67,8 @@ void matchAllDocs_sortByScoreDesc() {
 		assertThatResult( result ).hasTotalHitCount( DOCUMENT_COUNT );
 
 		TopDocs topDocs = result.topDocs();
-		assertThat( topDocs.totalHits.relation ).isEqualTo( TotalHits.Relation.EQUAL_TO );
-		assertThat( topDocs.totalHits.value ).isEqualTo( DOCUMENT_COUNT );
+		assertThat( TotalHitsUtils.relation( topDocs.totalHits ) ).isEqualTo( TotalHits.Relation.EQUAL_TO );
+		assertThat( TotalHitsUtils.value( topDocs.totalHits ) ).isEqualTo( DOCUMENT_COUNT );
 	}
 
 	private static class IndexBinding {
@@ -78,8 +79,7 @@ private static class IndexBinding {
 					"text",
 					f -> f.asString()
 							.analyzer( DefaultAnalysisDefinitions.ANALYZER_STANDARD_ENGLISH.name )
-			)
-					.toReference();
+			).toReference();
 		}
 	}
 }
diff --git a/pom.xml b/pom.xml
@@ -169,6 +169,7 @@
         <module>util/common</module>
         <module>engine</module>
         <module>backend/lucene</module>
+        <module>backend/lucene10</module>
         <module>backend/elasticsearch</module>
         <module>backend/elasticsearch-aws</module>
         <module>mapper/pojo-base</module>

diff --git a/util/internal/integrationtest/backend/lucene-common/pom.xml b/util/internal/integrationtest/backend/lucene-common/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    SPDX-License-Identifier: Apache-2.0
+    Copyright Red Hat Inc. and Hibernate Authors
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hibernate.search</groupId>
+        <artifactId>hibernate-search-util-internal-integrationtest</artifactId>
+        <version>8.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene-common</artifactId>
+
+    <name>Hibernate Search Utils - Internal - ITs - Lucene Common</name>
+    <description>Hibernate Search integration testing utilities for tests involving the Lucene backend</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-util-internal-integrationtest-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-backend-lucene</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
+
diff --git a/...t/backend/lucene/LuceneAnalysisUtils.java → ...t/backend/lucene/LuceneAnalysisUtils.java b/...t/backend/lucene/LuceneAnalysisUtils.java → ...t/backend/lucene/LuceneAnalysisUtils.java
diff --git a/...nd/lucene/LuceneBackendConfiguration.java → ...nd/lucene/LuceneBackendConfiguration.java b/...nd/lucene/LuceneBackendConfiguration.java → ...nd/lucene/LuceneBackendConfiguration.java
diff --git a/...e/LuceneTestIndexesPathConfiguration.java → ...e/LuceneTestIndexesPathConfiguration.java b/...e/LuceneTestIndexesPathConfiguration.java → ...e/LuceneTestIndexesPathConfiguration.java
diff --git a/...lucene/directory/OpenResourceTracker.java → ...lucene/directory/OpenResourceTracker.java b/...lucene/directory/OpenResourceTracker.java → ...lucene/directory/OpenResourceTracker.java
diff --git a/...directory/TrackingChecksumIndexInput.java → ...directory/TrackingChecksumIndexInput.java b/...directory/TrackingChecksumIndexInput.java → ...directory/TrackingChecksumIndexInput.java
diff --git a/...d/lucene/directory/TrackingDirectory.java → ...d/lucene/directory/TrackingDirectory.java b/...d/lucene/directory/TrackingDirectory.java → ...d/lucene/directory/TrackingDirectory.java
diff --git a/...ne/directory/TrackingDirectoryHolder.java → ...ne/directory/TrackingDirectoryHolder.java b/...ne/directory/TrackingDirectoryHolder.java → ...ne/directory/TrackingDirectoryHolder.java
diff --git a/.../directory/TrackingDirectoryProvider.java → .../directory/TrackingDirectoryProvider.java b/.../directory/TrackingDirectoryProvider.java → .../directory/TrackingDirectoryProvider.java
diff --git a/.../lucene/directory/TrackingIndexInput.java → .../lucene/directory/TrackingIndexInput.java b/.../lucene/directory/TrackingIndexInput.java → .../lucene/directory/TrackingIndexInput.java
diff --git a/...lucene/directory/TrackingIndexOutput.java → ...lucene/directory/TrackingIndexOutput.java b/...lucene/directory/TrackingIndexOutput.java → ...lucene/directory/TrackingIndexOutput.java
diff --git a/util/internal/integrationtest/backend/lucene/pom.xml b/util/internal/integrationtest/backend/lucene/pom.xml
@@ -27,6 +27,10 @@
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-backend-lucene</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene-common</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

diff --git a/...in/java/org/hibernate/search/util/impl/integrationtest/backend/lucene/TotalHitsUtils.java b/...in/java/org/hibernate/search/util/impl/integrationtest/backend/lucene/TotalHitsUtils.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.search.util.impl.integrationtest.backend.lucene;
+
+import org.apache.lucene.search.TotalHits;
+
+public final class TotalHitsUtils {
+	private TotalHitsUtils() {
+	}
+
+	public static long value(TotalHits totalHits) {
+		return totalHits.value;
+	}
+
+	public static TotalHits.Relation relation(TotalHits totalHits) {
+		return totalHits.relation;
+	}
+}
diff --git a/util/internal/integrationtest/backend/lucene10/pom.xml b/util/internal/integrationtest/backend/lucene10/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    SPDX-License-Identifier: Apache-2.0
+    Copyright Red Hat Inc. and Hibernate Authors
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hibernate.search</groupId>
+        <artifactId>hibernate-search-util-internal-integrationtest</artifactId>
+        <version>8.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene10</artifactId>
+
+    <name>Hibernate Search Utils - Internal - ITs - Lucene 10</name>
+    <description>Hibernate Search integration testing utilities for tests involving the Lucene backend</description>
+
+    <properties>
+        <java-version.main.release>21</java-version.main.release>
+        <version.org.apache.lucene>10.0.0</version.org.apache.lucene>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Lucene backend -->
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-core</artifactId>
+                <version>${version.org.apache.lucene}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-analysis-common</artifactId>
+                <version>${version.org.apache.lucene}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-queryparser</artifactId>
+                <version>${version.org.apache.lucene}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-join</artifactId>
+                <version>${version.org.apache.lucene}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-facet</artifactId>
+                <version>${version.org.apache.lucene}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-highlighter</artifactId>
+                <version>${version.org.apache.lucene}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.carrotsearch</groupId>
+                <artifactId>hppc</artifactId>
+                <version>${version.com.carrotsearch.hppc}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-util-internal-integrationtest-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-backend-lucene10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-util-internal-integrationtest-backend-lucene-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
+
diff --git a/...in/java/org/hibernate/search/util/impl/integrationtest/backend/lucene/TotalHitsUtils.java b/...in/java/org/hibernate/search/util/impl/integrationtest/backend/lucene/TotalHitsUtils.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.search.util.impl.integrationtest.backend.lucene;
+
+import org.apache.lucene.search.TotalHits;
+
+public final class TotalHitsUtils {
+	private TotalHitsUtils() {
+	}
+
+	public static long value(TotalHits totalHits) {
+		return totalHits.value();
+	}
+
+	public static TotalHits.Relation relation(TotalHits totalHits) {
+		return totalHits.relation();
+	}
+}