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 2020/01/03 14:52:00 UTC
[lucene-solr] 02/04: SOLR-14130: Fix precommit
This is an automated email from the ASF dual-hosted git repository.
jbernste pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 600326c3181d2f8b254f7fb8186c37e4de42f38e
Author: Joel Bernstein <jb...@apache.org>
AuthorDate: Thu Jan 2 15:11:58 2020 -0500
SOLR-14130: Fix precommit
---
.../src/java/org/apache/solr/util/SolrLogPostTool.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java b/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java
index adee013..aee5ffa 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java
@@ -17,6 +17,7 @@
package org.apache.solr.util;
import java.io.*;
+import java.nio.charset.Charset;
import java.util.List;
import java.util.ArrayList;
import java.net.URLDecoder;
@@ -69,7 +70,7 @@ public class SolrLogPostTool {
LineNumberReader bufferedReader = null;
try {
- bufferedReader = new LineNumberReader(new FileReader(file));
+ bufferedReader = new LineNumberReader(new InputStreamReader(new FileInputStream(file), Charset.defaultCharset()));
LogRecordReader recordReader = new LogRecordReader(bufferedReader);
SolrInputDocument doc = null;
String fileName = file.getName();
@@ -461,33 +462,33 @@ public class SolrLogPostTool {
for(String pair : pairs) {
String[] parts = pair.split("=");
if(parts.length == 2 && parts[0].equals("q")) {
- String dq = URLDecoder.decode(parts[1]);
+ String dq = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("q_s", dq);
doc.addField("q_t", dq);
}
if(parts[0].equals("rows")) {
- String dr = URLDecoder.decode(parts[1]);
+ String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("rows_i", dr);
}
if(parts[0].equals("distrib")) {
- String dr = URLDecoder.decode(parts[1]);
+ String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("distrib_s", dr);
}
if(parts[0].equals("isShard")) {
- String dr = URLDecoder.decode(parts[1]);
+ String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("isShard_s", dr);
}
if(parts[0].equals("wt")) {
- String dr = URLDecoder.decode(parts[1]);
+ String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("wt_s", dr);
}
if(parts[0].equals("facet")) {
- String dr = URLDecoder.decode(parts[1]);
+ String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("facet_s", dr);
}
}