You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/07/07 18:41:50 UTC
svn commit: r1358600 - in /lucene/dev/branches/lucene4199/lucene:
analysis/stempel/src/java/org/egothor/stemmer/
analysis/stempel/src/test/org/egothor/stemmer/
benchmark/src/java/org/apache/lucene/benchmark/quality/trec/
benchmark/src/java/org/apache/l...
Author: rmuir
Date: Sat Jul 7 16:41:50 2012
New Revision: 1358600
URL: http://svn.apache.org/viewvc?rev=1358600&view=rev
Log:
LUCENE-4199: fix more violations
Modified:
lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCharBlockArray.java
lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCompactLabelToOrdinal.java
lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java
lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java
lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/lucene4199/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
Modified: lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java Sat Jul 7 16:41:50 2012
@@ -63,6 +63,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
+import java.util.Locale;
import java.util.StringTokenizer;
/**
@@ -89,7 +90,7 @@ public class Compile {
return;
}
- args[0].toUpperCase();
+ args[0].toUpperCase(Locale.ROOT);
backward = args[0].charAt(0) == '-';
int qq = (backward) ? 1 : 0;
@@ -127,7 +128,7 @@ public class Compile {
new FileInputStream(args[i]), charset)));
for (String line = in.readLine(); line != null; line = in.readLine()) {
try {
- line = line.toLowerCase();
+ line = line.toLowerCase(Locale.ROOT);
StringTokenizer st = new StringTokenizer(line);
String stem = st.nextToken();
if (storeorig) {
Modified: lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java Sat Jul 7 16:41:50 2012
@@ -55,9 +55,11 @@
package org.egothor.stemmer;
import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.LineNumberReader;
+import java.util.Locale;
import java.util.StringTokenizer;
/**
@@ -95,10 +97,11 @@ public class DiffIt {
// System.out.println("[" + args[i] + "]");
Diff diff = new Diff(ins, del, rep, nop);
try {
- in = new LineNumberReader(new BufferedReader(new FileReader(args[i])));
+ String charset = System.getProperty("egothor.stemmer.charset", "UTF-8");
+ in = new LineNumberReader(new BufferedReader(new InputStreamReader(new FileInputStream(args[i]), charset)));
for (String line = in.readLine(); line != null; line = in.readLine()) {
try {
- line = line.toLowerCase();
+ line = line.toLowerCase(Locale.ROOT);
StringTokenizer st = new StringTokenizer(line);
String stem = st.nextToken();
System.out.println(stem + " -a");
Modified: lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java Sat Jul 7 16:41:50 2012
@@ -64,6 +64,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader;
import java.net.URI;
+import java.util.Locale;
import java.util.StringTokenizer;
import org.apache.lucene.util.LuceneTestCase;
@@ -107,7 +108,7 @@ public class TestCompile extends LuceneT
Trie trie;
DataInputStream is = new DataInputStream(new BufferedInputStream(
new FileInputStream(path)));
- String method = is.readUTF().toUpperCase();
+ String method = is.readUTF().toUpperCase(Locale.ROOT);
if (method.indexOf('M') < 0) {
trie = new Trie(is);
} else {
@@ -124,7 +125,7 @@ public class TestCompile extends LuceneT
for (String line = in.readLine(); line != null; line = in.readLine()) {
try {
- line = line.toLowerCase();
+ line = line.toLowerCase(Locale.ROOT);
StringTokenizer st = new StringTokenizer(line);
String stem = st.nextToken();
if (storeorig) {
@@ -132,7 +133,7 @@ public class TestCompile extends LuceneT
.getLastOnPath(stem);
StringBuilder stm = new StringBuilder(stem);
Diff.apply(stm, cmd);
- assertEquals(stem.toLowerCase(), stm.toString().toLowerCase());
+ assertEquals(stem.toLowerCase(Locale.ROOT), stm.toString().toLowerCase(Locale.ROOT));
}
while (st.hasMoreTokens()) {
String token = st.nextToken();
@@ -143,7 +144,7 @@ public class TestCompile extends LuceneT
.getLastOnPath(token);
StringBuilder stm = new StringBuilder(token);
Diff.apply(stm, cmd);
- assertEquals(stem.toLowerCase(), stm.toString().toLowerCase());
+ assertEquals(stem.toLowerCase(Locale.ROOT), stm.toString().toLowerCase(Locale.ROOT));
}
} catch (java.util.NoSuchElementException x) {
// no base token (stem) on a line
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java Sat Jul 7 16:41:50 2012
@@ -28,8 +28,9 @@ import org.apache.lucene.util.IOUtils;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.nio.charset.Charset;
import java.util.HashSet;
import java.util.Set;
@@ -61,7 +62,7 @@ public class QueryDriver {
int maxResults = 1000;
String docNameField = "docname";
- PrintWriter logger = new PrintWriter(System.out, true);
+ PrintWriter logger = new PrintWriter(new OutputStreamWriter(System.out, Charset.defaultCharset()), true);
// use trec utilities to read trec topics into quality queries
TrecTopicsReader qReader = new TrecTopicsReader();
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java Sat Jul 7 16:41:50 2012
@@ -18,8 +18,10 @@ package org.apache.lucene.benchmark.util
*/
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.Properties;
import org.apache.lucene.benchmark.byTask.feeds.ContentSource;
@@ -28,6 +30,7 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.feeds.NoMoreDataException;
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.document.Document;
+import org.apache.lucene.util.IOUtils;
/**
* Extract the downloaded Wikipedia dump into separate files for indexing.
@@ -83,7 +86,7 @@ public class ExtractWikipedia {
contents.append("\n");
try {
- FileWriter writer = new FileWriter(f);
+ Writer writer = new OutputStreamWriter(new FileOutputStream(f), IOUtils.CHARSET_UTF_8);
writer.write(contents.toString());
writer.close();
} catch (IOException ioe) {
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java Sat Jul 7 16:41:50 2012
@@ -166,7 +166,7 @@ public class DocMakerTest extends Benchm
// DocMaker did not close its ContentSource if resetInputs was called twice,
// leading to a file handle leak.
File f = new File(getWorkDir(), "docMakerLeak.txt");
- PrintStream ps = new PrintStream(f);
+ PrintStream ps = new PrintStream(f, "UTF-8");
ps.println("one title\t" + System.currentTimeMillis() + "\tsome content");
ps.close();
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java Sat Jul 7 16:41:50 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.benchmark.byTa
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
+import java.nio.charset.Charset;
import java.util.Properties;
import org.apache.lucene.benchmark.BenchmarkTestCase;
@@ -50,7 +51,7 @@ public class CreateIndexTaskTest extends
PrintStream curOut = System.out;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- System.setOut(new PrintStream(baos));
+ System.setOut(new PrintStream(baos, false, Charset.defaultCharset().name()));
try {
PerfRunData runData = createPerfRunData("SystemOut");
CreateIndexTask cit = new CreateIndexTask(runData);
@@ -63,7 +64,7 @@ public class CreateIndexTaskTest extends
PrintStream curErr = System.err;
baos.reset();
- System.setErr(new PrintStream(baos));
+ System.setErr(new PrintStream(baos, false, Charset.defaultCharset().name()));
try {
PerfRunData runData = createPerfRunData("SystemErr");
CreateIndexTask cit = new CreateIndexTask(runData);
Modified: lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCharBlockArray.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCharBlockArray.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCharBlockArray.java (original)
+++ lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCharBlockArray.java Sat Jul 7 16:41:50 2012
@@ -5,9 +5,13 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
import org.junit.Test;
+import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.facet.taxonomy.writercache.cl2o.CharBlockArray;
@@ -41,8 +45,12 @@ public class TestCharBlockArray extends
for (int i = 0; i < n; i++) {
random().nextBytes(buffer);
int size = 1 + random().nextInt(50);
-
- String s = new String(buffer, 0, size);
+ // This test is turning random bytes into a string,
+ // this is asking for trouble.
+ CharsetDecoder decoder = IOUtils.CHARSET_UTF_8.newDecoder()
+ .onUnmappableCharacter(CodingErrorAction.REPLACE)
+ .onMalformedInput(CodingErrorAction.REPLACE);
+ String s = decoder.decode(ByteBuffer.wrap(buffer, 0, size)).toString();
array.append(s);
builder.append(s);
}
@@ -50,8 +58,12 @@ public class TestCharBlockArray extends
for (int i = 0; i < n; i++) {
random().nextBytes(buffer);
int size = 1 + random().nextInt(50);
-
- String s = new String(buffer, 0, size);
+ // This test is turning random bytes into a string,
+ // this is asking for trouble.
+ CharsetDecoder decoder = IOUtils.CHARSET_UTF_8.newDecoder()
+ .onUnmappableCharacter(CodingErrorAction.REPLACE)
+ .onMalformedInput(CodingErrorAction.REPLACE);
+ String s = decoder.decode(ByteBuffer.wrap(buffer, 0, size)).toString();
array.append((CharSequence)s);
builder.append(s);
}
@@ -59,8 +71,12 @@ public class TestCharBlockArray extends
for (int i = 0; i < n; i++) {
random().nextBytes(buffer);
int size = 1 + random().nextInt(50);
-
- String s = new String(buffer, 0, size);
+ // This test is turning random bytes into a string,
+ // this is asking for trouble.
+ CharsetDecoder decoder = IOUtils.CHARSET_UTF_8.newDecoder()
+ .onUnmappableCharacter(CodingErrorAction.REPLACE)
+ .onMalformedInput(CodingErrorAction.REPLACE);
+ String s = decoder.decode(ByteBuffer.wrap(buffer, 0, size)).toString();
for (int j = 0; j < s.length(); j++) {
array.append(s.charAt(j));
}
Modified: lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCompactLabelToOrdinal.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCompactLabelToOrdinal.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCompactLabelToOrdinal.java (original)
+++ lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/cl2o/TestCompactLabelToOrdinal.java Sat Jul 7 16:41:50 2012
@@ -1,11 +1,15 @@
package org.apache.lucene.facet.taxonomy.writercache.cl2o;
import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
+import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.writercache.cl2o.CompactLabelToOrdinal;
@@ -46,7 +50,12 @@ public class TestCompactLabelToOrdinal e
random().nextBytes(buffer);
int size = 1 + random().nextInt(50);
- uniqueValues[i] = new String(buffer, 0, size);
+ // This test is turning random bytes into a string,
+ // this is asking for trouble.
+ CharsetDecoder decoder = IOUtils.CHARSET_UTF_8.newDecoder()
+ .onUnmappableCharacter(CodingErrorAction.REPLACE)
+ .onMalformedInput(CodingErrorAction.REPLACE);
+ uniqueValues[i] = decoder.decode(ByteBuffer.wrap(buffer, 0, size)).toString();
if (uniqueValues[i].indexOf(CompactLabelToOrdinal.TerminatorChar) == -1) {
i++;
}
Modified: lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java (original)
+++ lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java Sat Jul 7 16:41:50 2012
@@ -5,6 +5,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.text.NumberFormat;
import java.util.Arrays;
+import java.util.Locale;
import org.apache.lucene.util.encoding.DGapIntEncoder;
import org.apache.lucene.util.encoding.EightFlagsIntEncoder;
@@ -67,11 +68,11 @@ public class EncodingSpeed {
+ ") " + loopFactor + " times.");
System.out.println();
- String header = String.format(headerFormat, "Encoder", "Bits/Int",
+ String header = String.format(Locale.ROOT, headerFormat, "Encoder", "Bits/Int",
"Encode Time", "Encode Time", "Decode Time", "Decode Time");
System.out.println(header);
- String header2 = String.format(headerFormat, "", "", "[milliseconds]",
+ String header2 = String.format(Locale.ROOT, headerFormat, "", "", "[milliseconds]",
"[microsecond / int]", "[milliseconds]", "[microsecond / int]");
System.out.println(header2);
@@ -148,7 +149,7 @@ public class EncodingSpeed {
endTime = System.currentTimeMillis();
long decodeTime = endTime - startTime;
- System.out.println(String.format(resultsFormat, encoder, nf.format(baos
+ System.out.println(String.format(Locale.ROOT, resultsFormat, encoder, nf.format(baos
.size()
* 8.0 / data.length), encodeTime, nf.format(encodeTime
* 1000000.0 / (loopFactor * data.length)), decodeTime, nf
Modified: lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java (original)
+++ lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java Sat Jul 7 16:41:50 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import java.io.IOException;
+import java.util.Locale;
/**
* Utility for query time joining using TermsQuery and TermsCollector.
@@ -85,7 +86,7 @@ public final class JoinUtil {
fromQuery
);
default:
- throw new IllegalArgumentException(String.format("Score mode %s isn't supported.", scoreMode));
+ throw new IllegalArgumentException(String.format(Locale.ROOT, "Score mode %s isn't supported.", scoreMode));
}
}
Modified: lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java (original)
+++ lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java Sat Jul 7 16:41:50 2012
@@ -36,6 +36,7 @@ import org.apache.lucene.util.BytesRefHa
import org.apache.lucene.util.FixedBitSet;
import java.io.IOException;
+import java.util.Locale;
import java.util.Set;
class TermsIncludingScoreQuery extends Query {
@@ -69,7 +70,7 @@ class TermsIncludingScoreQuery extends Q
}
public String toString(String string) {
- return String.format("TermsIncludingScoreQuery{field=%s;originalQuery=%s}", field, unwrittenOriginalQuery);
+ return String.format(Locale.ROOT, "TermsIncludingScoreQuery{field=%s;originalQuery=%s}", field, unwrittenOriginalQuery);
}
@Override
Modified: lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/branches/lucene4199/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Sat Jul 7 16:41:50 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.search.join;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
+import java.util.Locale;
import java.util.Set;
import org.apache.lucene.index.AtomicReaderContext;
@@ -395,7 +396,7 @@ public class ToParentBlockJoinQuery exte
int start = docBase + prevParentDoc + 1; // +1 b/c prevParentDoc is previous parent doc
int end = docBase + parentDoc - 1; // -1 b/c parentDoc is parent doc
return new ComplexExplanation(
- true, score(), String.format("Score based on child doc range from %d to %d", start, end)
+ true, score(), String.format(Locale.ROOT, "Score based on child doc range from %d to %d", start, end)
);
}
Modified: lucene/dev/branches/lucene4199/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1358600&r1=1358599&r2=1358600&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/branches/lucene4199/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Sat Jul 7 16:41:50 2012
@@ -319,12 +319,12 @@ public class TestJoinUtil extends Lucene
System.out.println("expected cardinality:" + expectedResult.cardinality());
DocIdSetIterator iterator = expectedResult.iterator();
for (int doc = iterator.nextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = iterator.nextDoc()) {
- System.out.println(String.format("Expected doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
+ System.out.println(String.format(Locale.ROOT, "Expected doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
}
System.out.println("actual cardinality:" + actualResult.cardinality());
iterator = actualResult.iterator();
for (int doc = iterator.nextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = iterator.nextDoc()) {
- System.out.println(String.format("Actual doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
+ System.out.println(String.format(Locale.ROOT, "Actual doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
}
}
assertEquals(expectedResult, actualResult);