You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2021/01/12 17:27:14 UTC
[lucene-solr] 02/03: SOLR-14608: Fix precommit
This is an automated email from the ASF dual-hosted git repository.
jbernste pushed a commit to branch jira/SOLR-14608-export-merge
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 301a9d181a4fdcc91f811ebf19212b28187d8beb
Author: Joel Bernstein <jb...@apache.org>
AuthorDate: Fri Jan 8 12:40:59 2021 -0500
SOLR-14608: Fix precommit
---
solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java | 4 +++-
solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java | 5 +++--
.../src/java/org/apache/solr/handler/export/ExportWriterStream.java | 4 +++-
3 files changed, 9 insertions(+), 4 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 696013f..dd004f5 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
@@ -107,7 +107,9 @@ class ExportBuffers {
long startBufferWait = System.nanoTime();
exchangeBuffers();
long endBufferWait = System.nanoTime();
- log.debug("Waited for writer thread:"+Long.toString(((endBufferWait-startBufferWait)/1000000)));
+ if(log.isDebugEnabled()) {
+ log.debug("Waited for writer thread:{}", Long.toString(((endBufferWait - startBufferWait) / 1000000)));
+ }
} finally {
}
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 4cfb594..c2e4b55 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
@@ -74,7 +74,6 @@ import org.apache.solr.schema.StrField;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SortSpec;
import org.apache.solr.search.SyntaxError;
-import org.eclipse.jetty.util.IO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -419,7 +418,9 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
long startExchangeBuffers = System.nanoTime();
buffers.exchangeBuffers();
long endExchangeBuffers = System.nanoTime();
- log.debug("Waited for reader thread:"+Long.toString(((endExchangeBuffers-startExchangeBuffers)/1000000)));
+ if(log.isDebugEnabled()) {
+ log.debug("Waited for reader thread {}:", Long.toString(((endExchangeBuffers - startExchangeBuffers) / 1000000)));
+ }
} finally {
}
buffer = buffers.getOutputBuffer();
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java
index c83897d..3d0b3b1 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java
@@ -148,7 +148,9 @@ public class ExportWriterStream extends TupleStream implements Expressible {
long startExchangeBuffers = System.nanoTime();
exportBuffers.exchangeBuffers();
long endExchangeBuffers = System.nanoTime();
- log.debug("Waited for reader thread:"+Long.toString(((endExchangeBuffers-startExchangeBuffers)/1000000)));
+ if(log.isDebugEnabled()) {
+ log.debug("Waited for reader thread:{}", Long.toString(((endExchangeBuffers - startExchangeBuffers) / 1000000)));
+ }
exchanged = true;
} catch (TimeoutException e) {
log.debug("--- ews timeout loop");