You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/07/05 13:57:38 UTC
svn commit: r1357568 - in
/lucene/dev/branches/branch_4x/lucene/benchmark/src:
java/org/apache/lucene/benchmark/byTask/utils/Config.java
test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
Author: dweiss
Date: Thu Jul 5 11:57:38 2012
New Revision: 1357568
URL: http://svn.apache.org/viewvc?rev=1357568&view=rev
Log:
LUCENE-4194: just a taste of what I mean by encoding-sensitive.
Modified:
lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java?rev=1357568&r1=1357567&r2=1357568&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java Thu Jul 5 11:57:38 2012
@@ -80,7 +80,8 @@ public class Config {
}
// read props from string
this.props = new Properties();
- props.load(new ByteArrayInputStream(sb.toString().getBytes()));
+ // props.load always assumes iso8859-1...
+ props.load(new ByteArrayInputStream(sb.toString().getBytes("ISO-8859-1")));
// make sure work dir is set properly
if (props.get("work.dir") == null) {
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1357568&r1=1357567&r2=1357568&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Thu Jul 5 11:57:38 2012
@@ -19,7 +19,8 @@ package org.apache.lucene.benchmark.byTa
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
import java.io.StringReader;
import java.text.Collator;
import java.util.List;
@@ -398,7 +399,9 @@ public class TestPerfTasksLogic extends
// Run algo
Benchmark benchmark = execBenchmark(algLines1);
- BufferedReader r = new BufferedReader(new FileReader(lineFile));
+ BufferedReader r = new BufferedReader(
+ new InputStreamReader(
+ new FileInputStream(lineFile), "UTF-8"));
int numLines = 0;
String line;
while((line = r.readLine()) != null) {