LUCENE-10100: configuration items of the alg file are adapted to the 9.0 branch (#301)

lucene/benchmark/conf/analyzer.alg

@@ -32,8 +32,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=500
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource
 

lucene/benchmark/conf/collector-small.alg

@@ -21,7 +21,7 @@
 #    Fully Qualified Class Name of a Collector with a empty constructor
 #    topScoreDocOrdered - Creates a TopScoreDocCollector that requires in order docs
 #    topScoreDocUnordered - Like above, but allows out of order
-collector.class=coll:topScoreDocOrdered:topScoreDocUnordered:topScoreDocOrdered:topScoreDocUnordered
+collector.class=coll:topScoreDoc
 
 analyzer=org.apache.lucene.analysis.core.WhitespaceAnalyzer
 directory=FSDirectory

lucene/benchmark/conf/collector.alg

@@ -21,7 +21,7 @@
 #    Fully Qualified Class Name of a Collector with a empty constructor
 #    topScoreDocOrdered - Creates a TopScoreDocCollector that requires in order docs
 #    topScoreDocUnordered - Like above, but allows out of order
-collector.class=coll:topScoreDocOrdered:topScoreDocUnordered:topScoreDocOrdered:topScoreDocUnordered
+collector.class=coll:topScoreDoc
 
 analyzer=org.apache.lucene.analysis.core.WhitespaceAnalyzer
 directory=FSDirectory

lucene/benchmark/conf/compound-penalty.alg

@@ -37,8 +37,8 @@ doc.term.vector=vector:true:true:false:false
 log.step=500
 log.step.DeleteDoc=100
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource
 

lucene/benchmark/conf/english-porter-comparison.alg

@@ -20,7 +20,8 @@
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource
 doc.tokenized=false
 doc.body.tokenized=true
-docs.dir=reuters-out
+work.dir=data
+docs.dir=reuters21578
 
 -AnalyzerFactory(name:original-porter-stemmer,StandardTokenizer,
   EnglishPossessiveFilter,LowerCaseFilter,StopFilter,

lucene/benchmark/conf/facets.alg

@@ -30,7 +30,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=1000
 
-docs.dir=reuters-out
+work.dir=data
+docs.dir=reuters21578
 
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource
 

lucene/benchmark/conf/highlights.alg

@@ -30,7 +30,8 @@ doc.term.vector.offsets=false
 doc.term.vector.positions=false
 log.step=2000
 
-docs.dir=reuters-out
+work.dir=data
+docs.dir=reuters21578
 
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource
 

lucene/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg

@@ -32,8 +32,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=2000
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 #content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/indexing-flush-by-RAM.alg

@@ -32,8 +32,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=2000
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 #content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/indexing-multithreaded.alg

@@ -32,8 +32,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=2000
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 #content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/indexing.alg

@@ -32,8 +32,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=2000
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 #content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/micro-standard-flush-by-ram.alg

@@ -31,8 +31,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=500
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 #content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/sample.alg

@@ -42,8 +42,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=500
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 #content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/shingle.alg

@@ -16,7 +16,8 @@
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource
 doc.tokenized=false
 doc.body.tokenized=true
-docs.dir=reuters-out
+work.dir=data
+docs.dir=reuters21578
 log.step=1000
 
 -AnalyzerFactory(name:shingle-bigrams-unigrams,

lucene/benchmark/conf/sloppy-phrase.alg

@@ -30,7 +30,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=500
 
-docs.dir=reuters-out
+work.dir=data
+docs.dir=reuters21578
 #docs.dir=reuters-111
 
 content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource

lucene/benchmark/conf/sort-standard.alg

@@ -31,7 +31,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=100000
 
-docs.dir=reuters-out
+work.dir=data
+docs.dir=reuters21578
 
 content.source=org.apache.lucene.benchmark.byTask.feeds.SortableSingleDocSource
 

lucene/benchmark/conf/standard-flush-by-RAM.alg

@@ -31,8 +31,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=2000
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 #content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/standard.alg

@@ -31,8 +31,8 @@ doc.tokenized=true
 doc.term.vector=false
 log.step=2000
 
-docs.dir=reuters-out
-#docs.dir=reuters-111
+work.dir=data
+docs.dir=reuters21578
 
 #content.source=org.apache.lucene.benchmark.byTask.feeds.SingleDocSource
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource

lucene/benchmark/conf/wstok.alg

@@ -18,7 +18,8 @@
 content.source=org.apache.lucene.benchmark.byTask.feeds.ReutersContentSource
 doc.tokenized=false
 doc.body.tokenized=true
-docs.dir=reuters-out
+work.dir=data
+docs.dir=reuters21578
 
 -AnalyzerFactory(name:WhitespaceTokenizer, WhitespaceTokenizer(rule:java))
 

lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java

@@ -23,9 +23,9 @@ import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.benchmark.byTask.PerfRunData;
 import org.apache.lucene.benchmark.byTask.utils.AnalyzerFactory;
-import org.apache.lucene.util.Version;
 
 /**
  * Create a new {@link org.apache.lucene.analysis.Analyzer} and set it in the getRunData() for use
@@ -42,17 +42,13 @@ public class NewAnalyzerTask extends PerfTask {
 
   public static final Analyzer createAnalyzer(String className) throws Exception {
     final Class<? extends Analyzer> clazz = Class.forName(className).asSubclass(Analyzer.class);
-    try {
-      // first try to use a ctor with version parameter (needed for many new Analyzers that have no
-      // default one anymore
-      Constructor<? extends Analyzer> cnstr = clazz.getConstructor(Version.class);
-      return cnstr.newInstance(Version.LATEST);
-    } catch (
-        @SuppressWarnings("unused")
-        NoSuchMethodException nsme) {
-      // otherwise use default ctor
-      return clazz.getConstructor().newInstance();
+    Constructor<? extends Analyzer> cnstr;
+    if (className.equals("org.apache.lucene.analysis.core.StopAnalyzer")) {
+      cnstr = clazz.getConstructor(CharArraySet.class);
+      return cnstr.newInstance(CharArraySet.EMPTY_SET);
     }
+    cnstr = clazz.getConstructor();
+    return cnstr.newInstance();
   }
 
   @Override