,QueryMaker> readTaskQueryMaker;
@@ -245,6 +247,20 @@
}
/**
+ * @return the locale
+ */
+ public Locale getLocale() {
+ return locale;
+ }
+
+ /**
+ * @param locale the locale to set
+ */
+ public void setLocale(Locale locale) {
+ this.locale = locale;
+ }
+
+ /**
* @return Returns the config.
*/
public Config getConfig() {
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java (revision 0)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java (revision 0)
@@ -0,0 +1,110 @@
+package org.apache.lucene.benchmark.byTask.tasks;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.benchmark.byTask.PerfRunData;
+
+/**
+ * Task to support benchmarking collation.
+ *
+ *
+ * -
NewCollationAnalyzer with the default jdk impl
+ * -
NewCollationAnalyzer(impl:icu) specify an impl (jdk,icu)
+ *
+ *
+ */
+public class NewCollationAnalyzerTask extends PerfTask {
+ public enum Implementation {
+ JDK("org.apache.lucene.collation.CollationKeyAnalyzer",
+ "java.text.Collator"),
+ ICU("org.apache.lucene.collation.ICUCollationKeyAnalyzer",
+ "com.ibm.icu.text.Collator");
+
+ String className;
+ String collatorClassName;
+
+ Implementation(String className, String collatorClassName) {
+ this.className = className;
+ this.collatorClassName = collatorClassName;
+ }
+ }
+
+ private Implementation impl = Implementation.JDK;
+
+ public NewCollationAnalyzerTask(PerfRunData runData) {
+ super(runData);
+ }
+
+ static Analyzer createAnalyzer(Locale locale, Implementation impl)
+ throws Exception {
+ final Class collatorClazz = Class.forName(impl.collatorClassName);
+ Method collatorMethod = collatorClazz.getMethod("getInstance",
+ new Class[] {Locale.class});
+ Object collator = collatorMethod.invoke(null, locale);
+
+ final Class clazz = Class.forName(impl.className)
+ .asSubclass(Analyzer.class);
+ Constructor ctor = clazz.getConstructor(collatorClazz);
+ return ctor.newInstance(collator);
+ }
+
+ @Override
+ public int doLogic() throws Exception {
+ try {
+ Locale locale = getRunData().getLocale();
+ if (locale == null) throw new RuntimeException(
+ "Locale must be set with the NewLocale task!");
+ Analyzer analyzer = createAnalyzer(locale, impl);
+ getRunData().setAnalyzer(analyzer);
+ System.out.println("Changed Analyzer to: "
+ + analyzer.getClass().getName() + "(" + locale + ")");
+ } catch (Exception e) {
+ throw new RuntimeException("Error creating Analyzer: impl=" + impl, e);
+ }
+ return 1;
+ }
+
+ @Override
+ public void setParams(String params) {
+ super.setParams(params);
+
+ StringTokenizer st = new StringTokenizer(params, ",");
+ while (st.hasMoreTokens()) {
+ StringTokenizer expr = new StringTokenizer(st.nextToken(), ":");
+ String key = expr.nextToken();;
+ String value = expr.nextToken();
+ // for now we only support the "impl" parameter.
+ // TODO: add strength, decomposition, etc
+ if (key.equals("impl")) {
+ if (value.equalsIgnoreCase("icu"))
+ impl = Implementation.ICU;
+ }
+ }
+ }
+
+ @Override
+ public boolean supportsParams() {
+ return true;
+ }
+}
Property changes on: contrib\benchmark\src\java\org\apache\lucene\benchmark\byTask\tasks\NewCollationAnalyzerTask.java
___________________________________________________________________
Added: svn:eol-style
+ native
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java (revision 0)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java (revision 0)
@@ -0,0 +1,89 @@
+package org.apache.lucene.benchmark.byTask.tasks;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import org.apache.lucene.benchmark.byTask.PerfRunData;
+
+/**
+ * Set a {@link java.util.Locale} for use in benchmarking.
+ *
+ * Locales can be specified in the following ways:
+ *
+ * de: Language "de"
+ * en,US: Language "en", country "US"
+ * no,NO,NY: Language "no", country "NO", variant "NY"
+ * ROOT: The root (language-agnostic) Locale
+ * - <empty string>: Erase the Locale (null)
+ *
+ *
+ */
+public class NewLocaleTask extends PerfTask {
+ private String language;
+ private String country;
+ private String variant;
+
+ /**
+ * Create a new {@link java.util.Locale} and set it it in the getRunData() for
+ * use by all future tasks.
+ */
+ public NewLocaleTask(PerfRunData runData) {
+ super(runData);
+ }
+
+ static Locale createLocale(String language, String country, String variant) {
+ if (language == null || language.length() == 0)
+ return null;
+
+ String lang = language;
+ if (lang.equalsIgnoreCase("ROOT"))
+ lang = ""; // empty language is the root locale in the JDK
+
+ return new Locale(lang, country, variant);
+ }
+
+ @Override
+ public int doLogic() throws Exception {
+ Locale locale = createLocale(language, country, variant);
+ getRunData().setLocale(locale);
+ System.out.println("Changed Locale to: " +
+ (locale == null ? "null" :
+ (locale.getDisplayName().length() == 0) ? "root locale" : locale));
+ return 1;
+ }
+
+ @Override
+ public void setParams(String params) {
+ super.setParams(params);
+ language = country = variant = "";
+ StringTokenizer st = new StringTokenizer(params, ",");
+ if (st.hasMoreTokens())
+ language = st.nextToken();
+ if (st.hasMoreTokens())
+ country = st.nextToken();
+ if (st.hasMoreTokens())
+ variant = st.nextToken();
+ }
+
+ @Override
+ public boolean supportsParams() {
+ return true;
+ }
+}
Property changes on: contrib\benchmark\src\java\org\apache\lucene\benchmark\byTask\tasks\NewLocaleTask.java
___________________________________________________________________
Added: svn:eol-style
+ native
Index: contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
===================================================================
--- contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (revision 897721)
+++ contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (working copy)
@@ -21,13 +21,19 @@
import java.io.File;
import java.io.FileReader;
import java.io.BufferedReader;
+import java.text.Collator;
import java.util.List;
import java.util.Iterator;
+import java.util.Locale;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.benchmark.byTask.feeds.ReutersQueryMaker;
import org.apache.lucene.benchmark.byTask.tasks.CountingSearchTestTask;
import org.apache.lucene.benchmark.byTask.tasks.CountingHighlighterTestTask;
import org.apache.lucene.benchmark.byTask.stats.TaskStats;
+import org.apache.lucene.collation.CollationKeyAnalyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.TermEnum;
@@ -850,6 +856,115 @@
};
}
+ /**
+ * Test that we can change the Locale in the runData,
+ * that it is parsed as we expect.
+ */
+ public void testLocale() throws Exception {
+ // empty Locale: clear it (null)
+ Benchmark benchmark = execBenchmark(getLocaleConfig(""));
+ assertNull(benchmark.getRunData().getLocale());
+
+ // ROOT locale
+ benchmark = execBenchmark(getLocaleConfig("ROOT"));
+ assertEquals(new Locale(""), benchmark.getRunData().getLocale());
+
+ // specify just a language
+ benchmark = execBenchmark(getLocaleConfig("de"));
+ assertEquals(new Locale("de"), benchmark.getRunData().getLocale());
+
+ // specify language + country
+ benchmark = execBenchmark(getLocaleConfig("en,US"));
+ assertEquals(new Locale("en", "US"), benchmark.getRunData().getLocale());
+
+ // specify language + country + variant
+ benchmark = execBenchmark(getLocaleConfig("no,NO,NY"));
+ assertEquals(new Locale("no", "NO", "NY"), benchmark.getRunData().getLocale());
+ }
+
+ private static String[] getLocaleConfig(String localeParam) {
+ String algLines[] = {
+ "# ----- properties ",
+ "content.source=org.apache.lucene.benchmark.byTask.feeds.LineDocSource",
+ "docs.file=" + getReuters20LinesFile(),
+ "content.source.log.step=3",
+ "content.source.forever=false",
+ "directory=RAMDirectory",
+ "# ----- alg ",
+ "{ \"Rounds\"",
+ " ResetSystemErase",
+ " NewLocale(" + localeParam + ")",
+ " CreateIndex",
+ " { \"AddDocs\" AddDoc > : * ",
+ " NewRound",
+ "} : 1",
+ };
+ return algLines;
+ }
+
+ /**
+ * Test that we can create CollationAnalyzers.
+ */
+ public void testCollator() throws Exception {
+ // ROOT locale
+ Benchmark benchmark = execBenchmark(getCollatorConfig("ROOT", "impl:jdk"));
+ CollationKeyAnalyzer expected = new CollationKeyAnalyzer(Collator
+ .getInstance(new Locale("")));
+ assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
+
+ // specify just a language
+ benchmark = execBenchmark(getCollatorConfig("de", "impl:jdk"));
+ expected = new CollationKeyAnalyzer(Collator.getInstance(new Locale("de")));
+ assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
+
+ // specify language + country
+ benchmark = execBenchmark(getCollatorConfig("en,US", "impl:jdk"));
+ expected = new CollationKeyAnalyzer(Collator.getInstance(new Locale("en",
+ "US")));
+ assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
+
+ // specify language + country + variant
+ benchmark = execBenchmark(getCollatorConfig("no,NO,NY", "impl:jdk"));
+ expected = new CollationKeyAnalyzer(Collator.getInstance(new Locale("no",
+ "NO", "NY")));
+ assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
+ }
+
+ private void assertEqualCollation(Analyzer a1, Analyzer a2, String text)
+ throws Exception {
+ TokenStream ts1 = a1.tokenStream("bogus", new StringReader(text));
+ TokenStream ts2 = a2.tokenStream("bogus", new StringReader(text));
+ ts1.reset();
+ ts2.reset();
+ TermAttribute termAtt1 = ts1.addAttribute(TermAttribute.class);
+ TermAttribute termAtt2 = ts2.addAttribute(TermAttribute.class);
+ assertEquals(termAtt1.term(), termAtt2.term());
+ ts1.close();
+ ts2.close();
+ }
+
+ private static String[] getCollatorConfig(String localeParam,
+ String collationParam) {
+ String algLines[] = {
+ "# ----- properties ",
+ "content.source=org.apache.lucene.benchmark.byTask.feeds.LineDocSource",
+ "docs.file=" + getReuters20LinesFile(),
+ "content.source.log.step=3",
+ "content.source.forever=false",
+ "directory=RAMDirectory",
+ "# ----- alg ",
+ "{ \"Rounds\"",
+ " ResetSystemErase",
+ " NewLocale(" + localeParam + ")",
+ " NewCollationAnalyzer(" + collationParam + ")",
+ " CreateIndex",
+ " { \"AddDocs\" AddDoc > : * ",
+ " NewRound",
+ "} : 1",
+ };
+ return algLines;
+ }
+
private static String getReuters20LinesFile() {
return System.getProperty("lucene.common.dir").replace('\\','/') +
"/contrib/benchmark/src/test/org/apache/lucene/benchmark/reuters.first20.lines.txt";