You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2025/08/05 21:58:49 UTC
(couchdb) branch lucene-10 created (now 0c0a68e8d)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch lucene-10
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at 0c0a68e8d update to lucene 10
This branch includes the following new commits:
new a2d31fab1 Remove "9" from package and class names
new 0c0a68e8d update to lucene 10
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(couchdb) 01/02: Remove "9" from package and class names
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch lucene-10
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a2d31fab106d7c50e96511e90694685ba1479dc1
Author: Robert Newson <rn...@apache.org>
AuthorDate: Sat Nov 9 19:47:18 2024 +0000
Remove "9" from package and class names
---
.../org/apache/couchdb/nouveau/NouveauApplication.java | 6 +++---
.../org/apache/couchdb/nouveau/core/IndexManager.java | 8 ++++----
.../LuceneAnalyzerFactory.java} | 6 +++---
.../Lucene9Index.java => lucene/LuceneIndex.java} | 18 +++++++++---------
.../LuceneIndexSchema.java} | 14 +++++++-------
.../Lucene9Module.java => lucene/LuceneModule.java} | 8 ++++----
.../{lucene9 => lucene}/NouveauQueryParser.java | 2 +-
.../{lucene9 => lucene}/ParallelSearcherFactory.java | 2 +-
.../nouveau/{lucene9 => lucene}/QueryDeserializer.java | 2 +-
.../nouveau/{lucene9 => lucene}/QuerySerializer.java | 2 +-
.../SimpleAsciiFoldingAnalyzer.java | 2 +-
.../couchdb/nouveau/resources/AnalyzeResource.java | 4 ++--
.../apache/couchdb/nouveau/core/IndexManagerTest.java | 2 +-
.../LuceneAnalyzerFactoryTest.java} | 12 ++++++------
.../LuceneIndexTest.java} | 8 ++++----
.../{lucene9 => lucene}/NouveauQueryParserTest.java | 2 +-
.../{lucene9 => lucene}/QuerySerializationTest.java | 4 ++--
17 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java
index 7179eadc0..a6c202903 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java
@@ -24,8 +24,8 @@ import org.apache.couchdb.nouveau.core.IndexManager;
import org.apache.couchdb.nouveau.core.UserAgentFilter;
import org.apache.couchdb.nouveau.health.AnalyzeHealthCheck;
import org.apache.couchdb.nouveau.health.IndexHealthCheck;
-import org.apache.couchdb.nouveau.lucene9.Lucene9Module;
-import org.apache.couchdb.nouveau.lucene9.ParallelSearcherFactory;
+import org.apache.couchdb.nouveau.lucene.LuceneModule;
+import org.apache.couchdb.nouveau.lucene.ParallelSearcherFactory;
import org.apache.couchdb.nouveau.resources.AnalyzeResource;
import org.apache.couchdb.nouveau.resources.IndexResource;
import org.apache.couchdb.nouveau.tasks.CloseAllIndexesTask;
@@ -65,7 +65,7 @@ public class NouveauApplication extends Application<NouveauApplicationConfigurat
environment.lifecycle().manage(indexManager);
// Serialization classes
- environment.getObjectMapper().registerModule(new Lucene9Module());
+ environment.getObjectMapper().registerModule(new LuceneModule());
// AnalyzeResource
final AnalyzeResource analyzeResource = new AnalyzeResource();
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
index 85230d322..bfbd61460 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
@@ -35,8 +35,8 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Stream;
import org.apache.couchdb.nouveau.api.IndexDefinition;
-import org.apache.couchdb.nouveau.lucene9.Lucene9AnalyzerFactory;
-import org.apache.couchdb.nouveau.lucene9.Lucene9Index;
+import org.apache.couchdb.nouveau.lucene.LuceneAnalyzerFactory;
+import org.apache.couchdb.nouveau.lucene.LuceneIndex;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -379,7 +379,7 @@ public final class IndexManager implements Managed {
LOGGER.info("opening {}", name);
final Path path = indexPath(name);
final IndexDefinition indexDefinition = loadIndexDefinition(name);
- final Analyzer analyzer = Lucene9AnalyzerFactory.fromDefinition(indexDefinition);
+ final Analyzer analyzer = LuceneAnalyzerFactory.fromDefinition(indexDefinition);
final Directory dir = new DirectIODirectory(FSDirectory.open(path.resolve("9")));
final IndexWriterConfig config = new IndexWriterConfig(analyzer);
config.setUseCompoundFile(false);
@@ -387,7 +387,7 @@ public final class IndexManager implements Managed {
final long updateSeq = getSeq(writer, "update_seq");
final long purgeSeq = getSeq(writer, "purge_seq");
final SearcherManager searcherManager = new SearcherManager(writer, searcherFactory);
- return new Lucene9Index(analyzer, writer, updateSeq, purgeSeq, searcherManager);
+ return new LuceneIndex(analyzer, writer, updateSeq, purgeSeq, searcherManager);
}
private long getSeq(final IndexWriter writer, final String key) throws IOException {
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactory.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneAnalyzerFactory.java
similarity index 97%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactory.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneAnalyzerFactory.java
index 2bd47ed97..b95230cec 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactory.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneAnalyzerFactory.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response.Status;
@@ -60,9 +60,9 @@ import org.apache.lucene.analysis.sv.SwedishAnalyzer;
import org.apache.lucene.analysis.th.ThaiAnalyzer;
import org.apache.lucene.analysis.tr.TurkishAnalyzer;
-public final class Lucene9AnalyzerFactory {
+public final class LuceneAnalyzerFactory {
- private Lucene9AnalyzerFactory() {}
+ private LuceneAnalyzerFactory() {}
public static Analyzer fromDefinition(final IndexDefinition indexDefinition) {
final Analyzer defaultAnalyzer = newAnalyzer(indexDefinition.getDefaultAnalyzer());
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Index.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java
similarity index 98%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Index.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java
index dad3040f3..9dda62f89 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Index.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response.Status;
@@ -97,7 +97,7 @@ import org.apache.lucene.search.TopFieldCollectorManager;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
-public class Lucene9Index extends Index {
+public class LuceneIndex extends Index {
private static final Sort DEFAULT_SORT =
new Sort(SortField.FIELD_SCORE, new SortField("_id", SortField.Type.STRING));
@@ -106,9 +106,9 @@ public class Lucene9Index extends Index {
private final Analyzer analyzer;
private final IndexWriter writer;
private final SearcherManager searcherManager;
- private final Lucene9IndexSchema schema;
+ private final LuceneIndexSchema schema;
- public Lucene9Index(
+ public LuceneIndex(
final Analyzer analyzer,
final IndexWriter writer,
final long updateSeq,
@@ -537,22 +537,22 @@ public class Lucene9Index extends Index {
return result;
}
- private Lucene9IndexSchema initSchema(IndexWriter writer) {
+ private LuceneIndexSchema initSchema(IndexWriter writer) {
var commitData = writer.getLiveCommitData();
if (commitData == null) {
- return Lucene9IndexSchema.emptySchema();
+ return LuceneIndexSchema.emptySchema();
}
for (var entry : commitData) {
if (entry.getKey().equals("_schema")) {
- return Lucene9IndexSchema.fromString(entry.getValue());
+ return LuceneIndexSchema.fromString(entry.getValue());
}
}
- return Lucene9IndexSchema.emptySchema();
+ return LuceneIndexSchema.emptySchema();
}
@Override
public String toString() {
- return "Lucene9Index [analyzer=" + analyzer + ", writer=" + writer + ", searcherManager=" + searcherManager
+ return "LuceneIndex [analyzer=" + analyzer + ", writer=" + writer + ", searcherManager=" + searcherManager
+ "]";
}
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexSchema.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndexSchema.java
similarity index 91%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexSchema.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndexSchema.java
index 92cc5fc2e..ef335bf5a 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexSchema.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndexSchema.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response.Status;
@@ -32,7 +32,7 @@ import org.apache.couchdb.nouveau.api.StringField;
import org.apache.couchdb.nouveau.api.TextField;
import org.apache.lucene.queryparser.flexible.standard.config.PointsConfig;
-final class Lucene9IndexSchema {
+final class LuceneIndexSchema {
public enum Type {
STRING,
@@ -56,23 +56,23 @@ final class Lucene9IndexSchema {
private final ConcurrentMap<String, Type> map;
- private Lucene9IndexSchema(Map<String, Type> map) {
+ private LuceneIndexSchema(Map<String, Type> map) {
this.map = new ConcurrentHashMap<>(map);
this.map.put("_id", Type.STRING);
}
- public static Lucene9IndexSchema emptySchema() {
- return new Lucene9IndexSchema(new HashMap<String, Type>());
+ public static LuceneIndexSchema emptySchema() {
+ return new LuceneIndexSchema(new HashMap<String, Type>());
}
- public static Lucene9IndexSchema fromString(final String schemaStr) {
+ public static LuceneIndexSchema fromString(final String schemaStr) {
Objects.requireNonNull(schemaStr);
if (schemaStr.isEmpty()) {
return emptySchema();
}
var map = Arrays.stream(schemaStr.split(","))
.collect(Collectors.toMap(i -> i.split(":")[0], i -> Type.valueOf(i.split(":")[1])));
- return new Lucene9IndexSchema(map);
+ return new LuceneIndexSchema(map);
}
public void update(final Collection<Field> fields) {
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Module.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneModule.java
similarity index 82%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Module.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneModule.java
index 06102de84..35be8efe2 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Module.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneModule.java
@@ -11,16 +11,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.module.SimpleModule;
import org.apache.lucene.search.Query;
-public class Lucene9Module extends SimpleModule {
+public class LuceneModule extends SimpleModule {
- public Lucene9Module() {
- super("lucene9", Version.unknownVersion());
+ public LuceneModule() {
+ super("lucene", Version.unknownVersion());
// Query
addSerializer(Query.class, new QuerySerializer());
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParser.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/NouveauQueryParser.java
similarity index 98%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParser.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/NouveauQueryParser.java
index fc7acf509..d37ab3d37 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParser.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/NouveauQueryParser.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/ParallelSearcherFactory.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/ParallelSearcherFactory.java
similarity index 96%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/ParallelSearcherFactory.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/ParallelSearcherFactory.java
index 4553fa76b..bd9050af8 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/ParallelSearcherFactory.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/ParallelSearcherFactory.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import java.io.IOException;
import java.util.concurrent.Executor;
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QueryDeserializer.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QueryDeserializer.java
similarity index 99%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QueryDeserializer.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QueryDeserializer.java
index b0620e661..04a771cf5 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QueryDeserializer.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QueryDeserializer.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QuerySerializer.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java
similarity index 99%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QuerySerializer.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java
index 5e1d50871..2c88383a1 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QuerySerializer.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/SimpleAsciiFoldingAnalyzer.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/SimpleAsciiFoldingAnalyzer.java
similarity index 96%
rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/SimpleAsciiFoldingAnalyzer.java
rename to nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/SimpleAsciiFoldingAnalyzer.java
index 6b4c8c642..464b49d63 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/SimpleAsciiFoldingAnalyzer.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/SimpleAsciiFoldingAnalyzer.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
index 2ae8b78f1..d5249e205 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.couchdb.nouveau.api.AnalyzeRequest;
import org.apache.couchdb.nouveau.api.AnalyzeResponse;
-import org.apache.couchdb.nouveau.lucene9.Lucene9AnalyzerFactory;
+import org.apache.couchdb.nouveau.lucene.LuceneAnalyzerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -47,7 +47,7 @@ public final class AnalyzeResource {
public AnalyzeResponse analyzeText(@NotNull @Valid AnalyzeRequest request) throws IOException {
try {
final List<String> tokens =
- tokenize(Lucene9AnalyzerFactory.newAnalyzer(request.getAnalyzer()), request.getText());
+ tokenize(LuceneAnalyzerFactory.newAnalyzer(request.getAnalyzer()), request.getText());
return new AnalyzeResponse(tokens);
} catch (IllegalArgumentException e) {
throw new WebApplicationException(request.getAnalyzer() + " not a valid analyzer", Status.BAD_REQUEST);
diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java b/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
index a994cdd0c..d51422efd 100644
--- a/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
+++ b/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.couchdb.nouveau.api.IndexDefinition;
import org.apache.couchdb.nouveau.api.SearchRequest;
-import org.apache.couchdb.nouveau.lucene9.ParallelSearcherFactory;
+import org.apache.couchdb.nouveau.lucene.ParallelSearcherFactory;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactoryTest.java b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/LuceneAnalyzerFactoryTest.java
similarity index 95%
rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactoryTest.java
rename to nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/LuceneAnalyzerFactoryTest.java
index eb8e30e08..8094c269b 100644
--- a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactoryTest.java
+++ b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/LuceneAnalyzerFactoryTest.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -62,7 +62,7 @@ import org.apache.lucene.analysis.th.ThaiAnalyzer;
import org.apache.lucene.analysis.tr.TurkishAnalyzer;
import org.junit.jupiter.api.Test;
-public class Lucene9AnalyzerFactoryTest {
+public class LuceneAnalyzerFactoryTest {
@Test
public void testkeyword() throws Exception {
@@ -258,7 +258,7 @@ public class Lucene9AnalyzerFactoryTest {
public void testFieldAnalyzers() throws Exception {
final IndexDefinition indexDefinition =
new IndexDefinition("standard", Map.of("english", "english", "thai", "thai", "email", "email"));
- final Analyzer analyzer = Lucene9AnalyzerFactory.fromDefinition(indexDefinition);
+ final Analyzer analyzer = LuceneAnalyzerFactory.fromDefinition(indexDefinition);
assertThat(analyzer).isInstanceOf(PerFieldAnalyzerWrapper.class);
final Method m = PerFieldAnalyzerWrapper.class.getDeclaredMethod("getWrappedAnalyzer", String.class);
m.setAccessible(true);
@@ -270,12 +270,12 @@ public class Lucene9AnalyzerFactoryTest {
@Test
public void testUnknownAnalyzer() throws Exception {
- assertThrows(WebApplicationException.class, () -> Lucene9AnalyzerFactory.newAnalyzer("foo"));
+ assertThrows(WebApplicationException.class, () -> LuceneAnalyzerFactory.newAnalyzer("foo"));
}
private void assertAnalyzer(final String name, final Class<? extends Analyzer> clazz) throws Exception {
- assertThat(Lucene9AnalyzerFactory.newAnalyzer(name)).isInstanceOf(clazz);
- assertThat(Lucene9AnalyzerFactory.fromDefinition(new IndexDefinition(name, null)))
+ assertThat(LuceneAnalyzerFactory.newAnalyzer(name)).isInstanceOf(clazz);
+ assertThat(LuceneAnalyzerFactory.fromDefinition(new IndexDefinition(name, null)))
.isInstanceOf(clazz);
}
}
diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexTest.java b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/LuceneIndexTest.java
similarity index 97%
rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexTest.java
rename to nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/LuceneIndexTest.java
index 428e3eb6a..9206b83d9 100644
--- a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexTest.java
+++ b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/LuceneIndexTest.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -45,18 +45,18 @@ import org.apache.lucene.store.FSDirectory;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-public class Lucene9IndexTest {
+public class LuceneIndexTest {
protected final Index setup(final Path path) throws IOException {
final IndexDefinition indexDefinition = new IndexDefinition();
indexDefinition.setDefaultAnalyzer("standard");
- final Analyzer analyzer = Lucene9AnalyzerFactory.fromDefinition(indexDefinition);
+ final Analyzer analyzer = LuceneAnalyzerFactory.fromDefinition(indexDefinition);
final Directory dir = new DirectIODirectory(FSDirectory.open(path));
final IndexWriterConfig config = new IndexWriterConfig(analyzer);
config.setUseCompoundFile(false);
final IndexWriter writer = new IndexWriter(dir, config);
final SearcherManager searcherManager = new SearcherManager(writer, null);
- return new Lucene9Index(analyzer, writer, 0L, 0L, searcherManager);
+ return new LuceneIndex(analyzer, writer, 0L, 0L, searcherManager);
}
protected final void cleanup(final Index index) throws IOException {
diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParserTest.java b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/NouveauQueryParserTest.java
similarity index 98%
rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParserTest.java
rename to nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/NouveauQueryParserTest.java
index 0f4689b21..ab7c3dfdd 100644
--- a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParserTest.java
+++ b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/NouveauQueryParserTest.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/QuerySerializationTest.java b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/QuerySerializationTest.java
similarity index 97%
rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/QuerySerializationTest.java
rename to nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/QuerySerializationTest.java
index 555495a7a..9d20907c9 100644
--- a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/QuerySerializationTest.java
+++ b/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/QuerySerializationTest.java
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.couchdb.nouveau.lucene9;
+package org.apache.couchdb.nouveau.lucene;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -39,7 +39,7 @@ public class QuerySerializationTest {
@BeforeAll
public static void setup() {
mapper = new ObjectMapper();
- mapper.registerModule(new Lucene9Module());
+ mapper.registerModule(new LuceneModule());
}
@Test
(couchdb) 02/02: update to lucene 10
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch lucene-10
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 0c0a68e8dd21b1f67fb65e17e984b4759763ce29
Author: Robert Newson <rn...@apache.org>
AuthorDate: Mon May 5 20:50:52 2025 +0100
update to lucene 10
---
nouveau/build.gradle | 2 +-
.../src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java | 2 +-
.../main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java | 2 +-
.../src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java | 4 ++--
.../main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/nouveau/build.gradle b/nouveau/build.gradle
index 356295ee1..8e5bb84d2 100644
--- a/nouveau/build.gradle
+++ b/nouveau/build.gradle
@@ -23,7 +23,7 @@ dependencies {
implementation 'io.dropwizard.metrics:metrics-jersey2'
testImplementation 'io.dropwizard:dropwizard-testing'
- def luceneVersion = '9.12.1'
+ def luceneVersion = '10.2.2'
implementation group: 'org.apache.lucene', name: 'lucene-core', version: luceneVersion
implementation group: 'org.apache.lucene', name: 'lucene-queryparser', version: luceneVersion
implementation group: 'org.apache.lucene', name: 'lucene-analysis-common', version: luceneVersion
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
index bfbd61460..623963d81 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
@@ -380,7 +380,7 @@ public final class IndexManager implements Managed {
final Path path = indexPath(name);
final IndexDefinition indexDefinition = loadIndexDefinition(name);
final Analyzer analyzer = LuceneAnalyzerFactory.fromDefinition(indexDefinition);
- final Directory dir = new DirectIODirectory(FSDirectory.open(path.resolve("9")));
+ final Directory dir = new DirectIODirectory(FSDirectory.open(path.resolve("10")));
final IndexWriterConfig config = new IndexWriterConfig(analyzer);
config.setUseCompoundFile(false);
final IndexWriter writer = new IndexWriter(dir, config);
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java
index 0ee8fefa2..f20efe0c9 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java
@@ -32,7 +32,7 @@ public final class IndexHealthCheck extends HealthCheck {
@Override
protected Result check() throws Exception {
- final String name = "___test9";
+ final String name = "___test10";
try {
indexResource.deletePath(name, null);
} catch (IOException e) {
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java
index 9dda62f89..e62ffdb5a 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/LuceneIndex.java
@@ -290,8 +290,8 @@ public class LuceneIndex extends Index {
hits.add(new SearchHit(doc.get("_id"), after, fields));
}
- searchResults.setTotalHits(topDocs.totalHits.value);
- searchResults.setTotalHitsRelation(topDocs.totalHits.relation);
+ searchResults.setTotalHits(topDocs.totalHits.value());
+ searchResults.setTotalHitsRelation(topDocs.totalHits.relation());
searchResults.setHits(hits);
}
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java
index 2c88383a1..7e42ee6db 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene/QuerySerializer.java
@@ -65,8 +65,8 @@ class QuerySerializer extends StdSerializer<Query> {
for (final BooleanClause clause : booleanQuery.clauses()) {
gen.writeStartObject();
gen.writeFieldName("query");
- serialize(clause.getQuery(), gen, provider);
- gen.writeStringField("occur", clause.getOccur().name().toLowerCase());
+ serialize(clause.query(), gen, provider);
+ gen.writeStringField("occur", clause.occur().name().toLowerCase());
gen.writeEndObject();
}
gen.writeEndArray();