Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14130: Fix precommit

This commit is contained in:
Joel Bernstein 2020-01-02 15:11:58 -05:00
parent 29c00d4fe7
commit 8784d7c787
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java
View File

@ -17,6 +17,7 @@
package org.apache.solr.util; package org.apache.solr.util;
import java.io.*; import java.io.*;
import java.nio.charset.Charset;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.net.URLDecoder; import java.net.URLDecoder;
@ -69,7 +70,7 @@ public class SolrLogPostTool {
LineNumberReader bufferedReader = null; LineNumberReader bufferedReader = null;
try { try {
bufferedReader = new LineNumberReader(new FileReader(file)); bufferedReader = new LineNumberReader(new InputStreamReader(new FileInputStream(file), Charset.defaultCharset()));
LogRecordReader recordReader = new LogRecordReader(bufferedReader); LogRecordReader recordReader = new LogRecordReader(bufferedReader);
SolrInputDocument doc = null; SolrInputDocument doc = null;
String fileName = file.getName(); String fileName = file.getName();
@ -461,33 +462,33 @@ public class SolrLogPostTool {
for(String pair : pairs) { for(String pair : pairs) {
String[] parts = pair.split("="); String[] parts = pair.split("=");
if(parts.length == 2 && parts[0].equals("q")) { 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_s", dq);
doc.addField("q_t", dq); doc.addField("q_t", dq);
} }
if(parts[0].equals("rows")) { if(parts[0].equals("rows")) {
String dr = URLDecoder.decode(parts[1]); String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("rows_i", dr); doc.addField("rows_i", dr);
} }
if(parts[0].equals("distrib")) { if(parts[0].equals("distrib")) {
String dr = URLDecoder.decode(parts[1]); String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("distrib_s", dr); doc.addField("distrib_s", dr);
} }
if(parts[0].equals("isShard")) { if(parts[0].equals("isShard")) {
String dr = URLDecoder.decode(parts[1]); String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("isShard_s", dr); doc.addField("isShard_s", dr);
} }
if(parts[0].equals("wt")) { if(parts[0].equals("wt")) {
String dr = URLDecoder.decode(parts[1]); String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("wt_s", dr); doc.addField("wt_s", dr);
} }
if(parts[0].equals("facet")) { if(parts[0].equals("facet")) {
String dr = URLDecoder.decode(parts[1]); String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
doc.addField("facet_s", dr); doc.addField("facet_s", dr);
} }
} }