You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ap...@apache.org on 2026/03/17 08:31:33 UTC

(camel) branch revert-21909-CAMEL-23141_upgrade_to_Lucene_10.x created (now d9cd9ae4e6a1)

This is an automated email from the ASF dual-hosted git repository.

apupier pushed a change to branch revert-21909-CAMEL-23141_upgrade_to_Lucene_10.x
in repository https://gitbox.apache.org/repos/asf/camel.git


      at d9cd9ae4e6a1 Revert "CAMEL-23141 update Lucene to 10.x"

This branch includes the following new commits:

     new b554f51de8e7 Revert "CAMEL-23141: Hoist storedFields() out of the search loop"
     new 0f0b7fb47aa6 Revert "CAMEL-23141 replace deprecated search method"
     new d9cd9ae4e6a1 Revert "CAMEL-23141 update Lucene to 10.x"

The 3 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.



(camel) 01/03: Revert "CAMEL-23141: Hoist storedFields() out of the search loop"

Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

apupier pushed a commit to branch revert-21909-CAMEL-23141_upgrade_to_Lucene_10.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b554f51de8e75c260cc755170e876b2be5c6eb83
Author: Aurélien Pupier <ap...@ibm.com>
AuthorDate: Tue Mar 17 09:31:23 2026 +0100

    Revert "CAMEL-23141: Hoist storedFields() out of the search loop"
    
    This reverts commit b42a6412abf64e976b3ecefe23e9c6db6c6a584b.
---
 .../main/java/org/apache/camel/component/lucene/LuceneSearcher.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
index ace00591c0bb..086f16585a99 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
@@ -25,7 +25,6 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.IndexSearcher;
@@ -70,9 +69,8 @@ public class LuceneSearcher {
         int numberOfHits = doSearch(searchPhrase, maxNumberOfHits, totalHitsThreshold);
         searchHits.setNumberOfHits(numberOfHits);
 
-        StoredFields storedFields = indexSearcher.getIndexReader().storedFields();
         for (ScoreDoc hit : hits) {
-            Document selectedDocument = storedFields.document(hit.doc);
+            Document selectedDocument = indexSearcher.getIndexReader().storedFields().document(hit.doc);
             Hit aHit = new Hit();
             if (returnLuceneDocs) {
                 aHit.setDocument(selectedDocument);


(camel) 03/03: Revert "CAMEL-23141 update Lucene to 10.x"

Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

apupier pushed a commit to branch revert-21909-CAMEL-23141_upgrade_to_Lucene_10.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d9cd9ae4e6a1dcad1a07243a6b83344cf6d9810f
Author: Aurélien Pupier <ap...@ibm.com>
AuthorDate: Tue Mar 17 09:31:23 2026 +0100

    Revert "CAMEL-23141 update Lucene to 10.x"
    
    This reverts commit cbf4174b594af275def8f491d0967e70ccff0bd9.
---
 .../main/java/org/apache/camel/component/lucene/LuceneSearcher.java | 6 ++----
 parent/pom.xml                                                      | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
index a71d71a98471..a354379edfe1 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
@@ -31,7 +31,6 @@ import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TopScoreDocCollector;
-import org.apache.lucene.search.TopScoreDocCollectorManager;
 import org.apache.lucene.store.NIOFSDirectory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,7 +69,7 @@ public class LuceneSearcher {
         searchHits.setNumberOfHits(numberOfHits);
 
         for (ScoreDoc hit : hits) {
-            Document selectedDocument = indexSearcher.getIndexReader().storedFields().document(hit.doc);
+            Document selectedDocument = indexSearcher.doc(hit.doc);
             Hit aHit = new Hit();
             if (returnLuceneDocs) {
                 aHit.setDocument(selectedDocument);
@@ -90,8 +89,7 @@ public class LuceneSearcher {
 
         QueryParser parser = new QueryParser("contents", analyzer);
         Query query = parser.parse(searchPhrase);
-        TopScoreDocCollector collector
-                = new TopScoreDocCollectorManager(maxNumberOfHits, totalHitsThreshold).newCollector();
+        TopScoreDocCollector collector = TopScoreDocCollector.create(maxNumberOfHits, totalHitsThreshold);
         indexSearcher.search(query, collector);
         hits = collector.topDocs().scoreDocs;
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 9ac89a7cc539..0648be456742 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -369,7 +369,7 @@
         <lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
         <log4j2-version>2.25.3</log4j2-version>
         <logback-version>1.5.32</logback-version>
-        <lucene-version>10.4.0</lucene-version>
+        <lucene-version>9.12.3</lucene-version>
         <lightcouch-version>0.2.0</lightcouch-version>
         <littleproxy-version>2.6.0</littleproxy-version>
         <lz4-java-version>1.10.4</lz4-java-version>


(camel) 02/03: Revert "CAMEL-23141 replace deprecated search method"

Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

apupier pushed a commit to branch revert-21909-CAMEL-23141_upgrade_to_Lucene_10.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 0f0b7fb47aa67d7c2c36415677555fe51097e2c5
Author: Aurélien Pupier <ap...@ibm.com>
AuthorDate: Tue Mar 17 09:31:23 2026 +0100

    Revert "CAMEL-23141 replace deprecated search method"
    
    This reverts commit a00ba33390a0f80b08711b02acefc7799e85e113.
---
 .../java/org/apache/camel/component/lucene/LuceneSearcher.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
index 086f16585a99..a71d71a98471 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
@@ -30,7 +30,7 @@ import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.TopScoreDocCollector;
 import org.apache.lucene.search.TopScoreDocCollectorManager;
 import org.apache.lucene.store.NIOFSDirectory;
 import org.slf4j.Logger;
@@ -90,10 +90,10 @@ public class LuceneSearcher {
 
         QueryParser parser = new QueryParser("contents", analyzer);
         Query query = parser.parse(searchPhrase);
-        TopScoreDocCollectorManager collectorManager
-                = new TopScoreDocCollectorManager(maxNumberOfHits, totalHitsThreshold);
-        TopDocs topDocs = indexSearcher.search(query, collectorManager);
-        hits = topDocs.scoreDocs;
+        TopScoreDocCollector collector
+                = new TopScoreDocCollectorManager(maxNumberOfHits, totalHitsThreshold).newCollector();
+        indexSearcher.search(query, collector);
+        hits = collector.topDocs().scoreDocs;
 
         LOG.trace("*** Search generated {} hits ***", hits.length);
         return hits.length;