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 <[email protected]> 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();
