You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/07/07 14:47:52 UTC
[lucene-solr] branch master updated: SOLR-14537: Fix inner class
visibility, reduce diffs with branch_8x.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new f19057f SOLR-14537: Fix inner class visibility, reduce diffs with branch_8x.
f19057f is described below
commit f19057f5e55ba99da8344e1f8175714009e99e1b
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Jul 7 16:45:33 2020 +0200
SOLR-14537: Fix inner class visibility, reduce diffs with branch_8x.
---
solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java | 5 ++++-
solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java b/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
index c9d8f91..72382d2 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
@@ -240,7 +240,10 @@ class ExportBuffers {
}
}
- public static final class Buffer {
+ /**
+ * Buffer used for transporting documents from the filler to the writer thread.
+ */
+ static final class Buffer {
static final int EMPTY = -1;
static final int NO_MORE_DOCS = -2;
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
index ad403a3..8d07239 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
@@ -302,7 +302,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
return tupleStream;
}
- protected void identifyLowestSortingUnexportedDocs(List<LeafReaderContext> leaves, SortDoc sortDoc, SortQueue queue) throws IOException {
+ private void identifyLowestSortingUnexportedDocs(List<LeafReaderContext> leaves, SortDoc sortDoc, SortQueue queue) throws IOException {
Timer.Context timerContext = identifyLowestSortingDocTimer.time();
try {
queue.reset();
@@ -324,7 +324,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
- protected void transferBatchToBufferForOutput(SortQueue queue,
+ private void transferBatchToBufferForOutput(SortQueue queue,
List<LeafReaderContext> leaves,
ExportBuffers.Buffer destination) throws IOException {
Timer.Context timerContext = transferBatchToBufferTimer.time();