From 1bcc61ebb4ecb6887214ded0e5bbb728593a55af Mon Sep 17 00:00:00 2001 From: exceptionfactory Date: Fri, 18 Oct 2024 15:07:22 -0500 Subject: [PATCH] NIFI-13898 Upgraded Lucene from 9.12.0 to 10.0.0 This closes #9420 - Adjusted TotalHits.value() references aligning with Lucene 10 changes Signed-off-by: Joseph Witt --- .../org/apache/nifi/provenance/index/lucene/QueryTask.java | 4 ++-- .../apache/nifi/provenance/lucene/TestSimpleIndexManager.java | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java index ea905252d5..24c5a633e3 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java @@ -179,7 +179,7 @@ public class QueryTask implements Runnable { private Tuple, Long> readDocuments(final TopDocs topDocs, final StoredFields storedFields) { // If no topDocs is supplied, just provide a Tuple that has no records and a hit count of 0. - if (topDocs == null || topDocs.totalHits.value == 0) { + if (topDocs == null || topDocs.totalHits.value() == 0) { return new Tuple<>(Collections. emptyList(), 0L); } @@ -210,7 +210,7 @@ public class QueryTask implements Runnable { final long fetchEventNanos = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - endConvert); logger.debug("Fetching {} events from Event Store took {} ms ({} events actually fetched)", eventIds.size(), fetchEventNanos, events.size()); - final long totalHits = topDocs.totalHits.value; + final long totalHits = topDocs.totalHits.value(); return new Tuple<>(events, totalHits); } diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java index 401c6d761b..32ea522118 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java @@ -97,7 +97,7 @@ public class TestSimpleIndexManager { final EventIndexSearcher searcher = mgr.borrowIndexSearcher(dir); final TopDocs topDocs = searcher.getIndexSearcher().search(new MatchAllDocsQuery(), 2); - assertEquals(2, topDocs.totalHits.value); + assertEquals(2, topDocs.totalHits.value()); mgr.returnIndexSearcher(searcher); } finally { FileUtils.deleteFile(dir, true); diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml index 883c8641a9..096e04741b 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml @@ -27,7 +27,7 @@ nifi-provenance-repository-nar - 9.12.0 + 10.0.0