You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2010/12/06 01:47:28 UTC
svn commit: r1042501 [13/13] - in /lucene/dev/branches/docvalues: ./ lucene/
lucene/contrib/
lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/
lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/
lucene/...
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexConfig.java Mon Dec 6 00:47:16 2010
@@ -17,11 +17,12 @@
package org.apache.solr.update;
+import org.apache.lucene.index.*;
+import org.apache.lucene.util.Version;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.PluginInfo;
-import org.apache.lucene.index.LogByteSizeMergePolicy;
-import org.apache.lucene.index.ConcurrentMergeScheduler;
-import org.apache.lucene.index.IndexWriter;
+import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.util.SolrPluginUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,8 +46,8 @@ public class SolrIndexConfig {
public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName();
static final SolrIndexConfig defaultDefaults = new SolrIndexConfig();
-
private SolrIndexConfig() {
+ luceneVersion = Version.LUCENE_40;
useCompoundFile = true;
maxBufferedDocs = -1;
maxMergeDocs = -1;
@@ -56,10 +57,12 @@ public class SolrIndexConfig {
writeLockTimeout = -1;
commitLockTimeout = -1;
lockType = null;
- termIndexInterval = IndexWriter.DEFAULT_TERM_INDEX_INTERVAL;
+ termIndexInterval = IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL;
mergePolicyInfo = null;
mergeSchedulerInfo = null;
}
+
+ public final Version luceneVersion;
public final boolean useCompoundFile;
public final int maxBufferedDocs;
@@ -83,6 +86,9 @@ public class SolrIndexConfig {
prefix = defaultsName;
if (def == null)
def = defaultDefaults;
+
+ luceneVersion = solrConfig.luceneMatchVersion;
+
useCompoundFile=solrConfig.getBool(prefix+"/useCompoundFile", def.useCompoundFile);
maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs);
maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs);
@@ -129,11 +135,74 @@ public class SolrIndexConfig {
infoStreamFile= solrConfig.get(prefix + "/infoStream/@file", null);
log.info("IndexWriter infoStream debug log is enabled: " + infoStreamFile);
}
-
}
private PluginInfo getPluginInfo(String path, SolrConfig solrConfig, PluginInfo def) {
List<PluginInfo> l = solrConfig.readPluginInfos(path, false, true);
return l.isEmpty() ? def : l.get(0);
}
+
+ public IndexWriterConfig toIndexWriterConfig(IndexSchema schema) {
+ IndexWriterConfig iwc = new IndexWriterConfig(luceneVersion, schema.getAnalyzer());
+ if (maxBufferedDocs != -1)
+ iwc.setMaxBufferedDocs(maxBufferedDocs);
+
+ if (ramBufferSizeMB != -1)
+ iwc.setRAMBufferSizeMB(ramBufferSizeMB);
+
+ if (termIndexInterval != -1)
+ iwc.setTermIndexInterval(termIndexInterval);
+
+ if (maxFieldLength != -1)
+ iwc.setMaxFieldLength(maxFieldLength);
+
+ if (writeLockTimeout != -1)
+ iwc.setWriteLockTimeout(writeLockTimeout);
+
+ iwc.setSimilarity(schema.getSimilarity());
+ iwc.setMergePolicy(buildMergePolicy(schema));
+ iwc.setMergeScheduler(buildMergeScheduler(schema));
+
+ return iwc;
+ }
+
+ private MergePolicy buildMergePolicy(IndexSchema schema) {
+ MergePolicy policy;
+ String mpClassName = mergePolicyInfo == null ? SolrIndexConfig.DEFAULT_MERGE_POLICY_CLASSNAME : mergePolicyInfo.className;
+
+ try {
+ policy = (MergePolicy) schema.getResourceLoader().newInstance(mpClassName, null, new Class[]{IndexWriter.class}, new Object[]{this});
+ } catch (Exception e) {
+ policy = (MergePolicy) schema.getResourceLoader().newInstance(mpClassName);
+ }
+
+ if (mergePolicyInfo != null)
+ SolrPluginUtils.invokeSetters(policy, mergePolicyInfo.initArgs);
+
+ if (policy instanceof LogMergePolicy) {
+ LogMergePolicy logMergePolicy = (LogMergePolicy) policy;
+
+ if (maxMergeDocs != -1)
+ logMergePolicy.setMaxMergeDocs(maxMergeDocs);
+
+ logMergePolicy.setUseCompoundFile(useCompoundFile);
+
+ if (mergeFactor != -1)
+ logMergePolicy.setMergeFactor(mergeFactor);
+ } else {
+ log.warn("Use of compound file format or mergefactor cannot be configured if merge policy is not an instance of LogMergePolicy. The configured policy's defaults will be used.");
+ }
+
+ return policy;
+ }
+
+ private MergeScheduler buildMergeScheduler(IndexSchema schema) {
+ String msClassName = mergeSchedulerInfo == null ? SolrIndexConfig.DEFAULT_MERGE_SCHEDULER_CLASSNAME : mergeSchedulerInfo.className;
+ MergeScheduler scheduler = (MergeScheduler) schema.getResourceLoader().newInstance(msClassName);
+
+ if (mergeSchedulerInfo != null)
+ SolrPluginUtils.invokeSetters(scheduler, mergeSchedulerInfo.initArgs);
+
+ return scheduler;
+ }
}
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/SolrIndexWriter.java Mon Dec 6 00:47:16 2010
@@ -20,11 +20,8 @@ package org.apache.solr.update;
import org.apache.lucene.index.*;
import org.apache.lucene.store.*;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.DirectoryFactory;
-import org.apache.solr.core.StandardDirectoryFactory;
import org.apache.solr.schema.IndexSchema;
-import org.apache.solr.util.SolrPluginUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,73 +42,12 @@ import java.util.Locale;
* @since solr 0.9
*/
-
public class SolrIndexWriter extends IndexWriter {
private static Logger log = LoggerFactory.getLogger(SolrIndexWriter.class);
String name;
- IndexSchema schema;
-
private PrintStream infoStream;
- private void init(String name, IndexSchema schema, SolrIndexConfig config) throws IOException {
- log.debug("Opened Writer " + name);
- this.name = name;
- this.schema = schema;
- setSimilarity(schema.getSimilarity());
- // setUseCompoundFile(false);
-
- if (config != null) {
- //only set maxBufferedDocs
- if (config.maxBufferedDocs != -1) {
- setMaxBufferedDocs(config.maxBufferedDocs);
- }
- if (config.ramBufferSizeMB != -1) {
- setRAMBufferSizeMB(config.ramBufferSizeMB);
- }
- if (config.termIndexInterval != -1) {
- setTermIndexInterval(config.termIndexInterval);
-
- }
- if (config.maxMergeDocs != -1) setMaxMergeDocs(config.maxMergeDocs);
- if (config.maxFieldLength != -1) setMaxFieldLength(config.maxFieldLength);
- String className = config.mergePolicyInfo == null ? SolrIndexConfig.DEFAULT_MERGE_POLICY_CLASSNAME: config.mergePolicyInfo.className;
- MergePolicy policy = null;
- try {
- policy = (MergePolicy) schema.getResourceLoader().newInstance(className, null, new Class[]{IndexWriter.class}, new Object[] { this });
- } catch (Exception e) {
- policy = (MergePolicy) schema.getResourceLoader().newInstance(className);
- }
- if(config.mergePolicyInfo != null) SolrPluginUtils.invokeSetters(policy,config.mergePolicyInfo.initArgs);
- setMergePolicy(policy);
-
- if (getMergePolicy() instanceof LogMergePolicy) {
- setUseCompoundFile(config.useCompoundFile);
- if (config.mergeFactor != -1) { setMergeFactor(config.mergeFactor); }
- } else {
- log.warn("Use of compound file format or mergefactor cannot be configured if merge policy is not an instance " +
- "of LogMergePolicy. The configured policy's defaults will be used.");
- }
-
- className = config.mergeSchedulerInfo == null ? SolrIndexConfig.DEFAULT_MERGE_SCHEDULER_CLASSNAME: config.mergeSchedulerInfo.className;
- MergeScheduler scheduler = (MergeScheduler) schema.getResourceLoader().newInstance(className);
- if(config.mergeSchedulerInfo != null) SolrPluginUtils.invokeSetters(scheduler,config.mergeSchedulerInfo.initArgs);
- setMergeScheduler(scheduler);
-
- String infoStreamFile = config.infoStreamFile;
- if (infoStreamFile != null) {
- File f = new File(infoStreamFile);
- File parent = f.getParentFile();
- if (parent != null) parent.mkdirs();
- FileOutputStream fos = new FileOutputStream(f, true);
- infoStream = new TimeLoggingPrintStream(fos, true);
- setInfoStream(infoStream);
- }
- //if (config.commitLockTimeout != -1) setWriteLockTimeout(config.commitLockTimeout);
- }
-
- }
-
public static Directory getDirectory(String path, DirectoryFactory directoryFactory, SolrIndexConfig config) throws IOException {
Directory d = directoryFactory.open(path);
@@ -135,7 +71,7 @@ public class SolrIndexWriter extends Ind
} else if ("none".equals(lockType)) {
// Recipe for disaster
log.error("CONFIGURATION WARNING: locks are disabled on " + path);
- d.setLockFactory(new NoLockFactory());
+ d.setLockFactory(NoLockFactory.getNoLockFactory());
} else {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Unrecognized lockType: " + rawLockType);
@@ -143,58 +79,25 @@ public class SolrIndexWriter extends Ind
return d;
}
- /** @deprecated remove when getDirectory(String,SolrIndexConfig) is gone */
- @Deprecated
- private static DirectoryFactory LEGACY_DIR_FACTORY
- = new StandardDirectoryFactory();
- static {
- LEGACY_DIR_FACTORY.init(new NamedList());
- }
-
- /**
- * @deprecated use getDirectory(String path, DirectoryFactory directoryFactory, SolrIndexConfig config)
- */
- @Deprecated
- public static Directory getDirectory(String path, SolrIndexConfig config) throws IOException {
- log.warn("SolrIndexWriter is using LEGACY_DIR_FACTORY which means deprecated code is likely in use and SolrIndexWriter is ignoring any custom DirectoryFactory.");
- return getDirectory(path, LEGACY_DIR_FACTORY, config);
- }
-
- /**
- *
- */
- public SolrIndexWriter(String name, String path, DirectoryFactory dirFactory, boolean create, IndexSchema schema) throws IOException {
- super(getDirectory(path, dirFactory, null), schema.getAnalyzer(), create, MaxFieldLength.LIMITED);
- init(name, schema, null);
- }
-
- @Deprecated
- public SolrIndexWriter(String name, String path, DirectoryFactory dirFactory, boolean create, IndexSchema schema, SolrIndexConfig config) throws IOException {
- super(getDirectory(path, dirFactory, null), schema.getAnalyzer(), create, MaxFieldLength.LIMITED);
- init(name, schema, config);
- }
-
- /**
- * @deprecated
- */
- @Deprecated
- public SolrIndexWriter(String name, String path, boolean create, IndexSchema schema) throws IOException {
- super(getDirectory(path, null), schema.getAnalyzer(), create, MaxFieldLength.LIMITED);
- init(name, schema, null);
- }
-
- /**
- * @deprecated
- */
- @Deprecated
- public SolrIndexWriter(String name, String path, boolean create, IndexSchema schema, SolrIndexConfig config) throws IOException {
- super(getDirectory(path, config), schema.getAnalyzer(), create, MaxFieldLength.LIMITED);
- init(name, schema, config);
- }
-
public SolrIndexWriter(String name, String path, DirectoryFactory dirFactory, boolean create, IndexSchema schema, SolrIndexConfig config, IndexDeletionPolicy delPolicy) throws IOException {
- super(getDirectory(path, dirFactory, config), schema.getAnalyzer(), create, delPolicy, new MaxFieldLength(IndexWriter.DEFAULT_MAX_FIELD_LENGTH));
- init(name, schema, config);
+ super(
+ getDirectory(path, dirFactory, config),
+ config.toIndexWriterConfig(schema).
+ setOpenMode(create ? IndexWriterConfig.OpenMode.CREATE : IndexWriterConfig.OpenMode.APPEND).
+ setIndexDeletionPolicy(delPolicy)
+ );
+ log.debug("Opened Writer " + name);
+ this.name = name;
+
+ String infoStreamFile = config.infoStreamFile;
+ if (infoStreamFile != null) {
+ File f = new File(infoStreamFile);
+ File parent = f.getParentFile();
+ if (parent != null) parent.mkdirs();
+ FileOutputStream fos = new FileOutputStream(f, true);
+ infoStream = new TimeLoggingPrintStream(fos, true);
+ setInfoStream(infoStream);
+ }
}
@@ -280,5 +183,4 @@ public class SolrIndexWriter extends Ind
super.println(x);
}
}
-
}
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/SentinelIntSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/SentinelIntSet.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/SentinelIntSet.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/SentinelIntSet.java Mon Dec 6 00:47:16 2010
@@ -30,7 +30,7 @@ public class SentinelIntSet {
this.emptyVal = emptyVal;
int tsize = Math.max(org.apache.lucene.util.BitUtil.nextHighestPowerOfTwo(size), 1);
rehashCount = tsize - (tsize>>2);
- if (tsize <= rehashCount) {
+ if (size >= rehashCount) { // should be able to hold "size" w/o rehashing
tsize <<= 1;
rehashCount = tsize - (tsize>>2);
}
@@ -117,6 +117,8 @@ public class SentinelIntSet {
startRehash(newSize);
int[] oldKeys = keys;
keys = new int[newSize];
+ if (emptyVal != 0) Arrays.fill(keys, emptyVal);
+
for (int i=0; i<oldKeys.length; i++) {
int key = oldKeys[i];
if (key == emptyVal) continue;
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/BasicFunctionalityTest.java Mon Dec 6 00:47:16 2010
@@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.LogMergePolicy;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.solr.common.params.AppendedSolrParams;
@@ -121,7 +122,7 @@ public class BasicFunctionalityTest exte
SolrCore core = h.getCore();
SolrIndexWriter writer = new SolrIndexWriter("testWriter",core.getNewIndexDir(), core.getDirectoryFactory(), false, core.getSchema(), core.getSolrConfig().mainIndexConfig, core.getDeletionPolicy());
- assertEquals("Mergefactor was not picked up", writer.getMergeFactor(), 8);
+ assertEquals("Mergefactor was not picked up", ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor(), 8);
writer.close();
lrf.args.put("version","2.0");
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrTestCaseJ4.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrTestCaseJ4.java Mon Dec 6 00:47:16 2010
@@ -907,16 +907,16 @@ public abstract class SolrTestCaseJ4 ext
if (which == fieldTypes.size()) {
// sort by score
sortSpec.append("score").append(asc ? " asc" : " desc");
- comparators.add(createComparator("score", asc, false, false));
+ comparators.add(createComparator("score", asc, false, false, false));
} else if (which == fieldTypes.size() + 1) {
// sort by docid
sortSpec.append("_docid_").append(asc ? " asc" : " desc");
- comparators.add(createComparator("_docid_", asc, false, false));
+ comparators.add(createComparator("_docid_", asc, false, false, false));
} else {
String field = fieldTypes.get(which).fname;
sortSpec.append(field).append(asc ? " asc" : " desc");
SchemaField sf = schema.getField(field);
- comparators.add(createComparator(field, asc, sf.sortMissingLast(), sf.sortMissingFirst()));
+ comparators.add(createComparator(field, asc, sf.sortMissingLast(), sf.sortMissingFirst(), !(sf.sortMissingLast()||sf.sortMissingFirst()) ));
}
}
@@ -924,13 +924,13 @@ public abstract class SolrTestCaseJ4 ext
if (comparators.size() == 0) {
// default sort is by score desc
- comparators.add(createComparator("score", false, false, false));
+ comparators.add(createComparator("score", false, false, false, false));
}
return createComparator(comparators);
}
- public static Comparator<Doc> createComparator(final String field, final boolean asc, final boolean sortMissingLast, final boolean sortMissingFirst) {
+ public static Comparator<Doc> createComparator(final String field, final boolean asc, final boolean sortMissingLast, final boolean sortMissingFirst, final boolean sortMissingAsZero) {
final int mul = asc ? 1 : -1;
if (field.equals("_docid_")) {
@@ -943,15 +943,31 @@ public abstract class SolrTestCaseJ4 ext
}
if (field.equals("score")) {
- return createComparator("score_f", asc, sortMissingLast, sortMissingFirst);
+ return createComparator("score_f", asc, sortMissingLast, sortMissingFirst, sortMissingAsZero);
}
return new Comparator<Doc>() {
+ private Comparable zeroVal(Comparable template) {
+ if (template == null) return null;
+ if (template instanceof String) return null; // fast-path for string
+ if (template instanceof Integer) return 0;
+ if (template instanceof Long) return (long)0;
+ if (template instanceof Float) return (float)0;
+ if (template instanceof Double) return (double)0;
+ if (template instanceof Short) return (short)0;
+ if (template instanceof Byte) return (byte)0;
+ if (template instanceof Character) return (char)0;
+ return null;
+ }
+
@Override
public int compare(Doc o1, Doc o2) {
Comparable v1 = o1.getFirstValue(field);
Comparable v2 = o2.getFirstValue(field);
+ v1 = v1 == null ? zeroVal(v2) : v1;
+ v2 = v2 == null ? zeroVal(v1) : v2;
+
int c = 0;
if (v1 == v2) {
c = 0;
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/TestGroupingSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/TestGroupingSearch.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/TestGroupingSearch.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/TestGroupingSearch.java Mon Dec 6 00:47:16 2010
@@ -291,6 +291,22 @@ public class TestGroupingSearch extends
"'doclist':{'numFound':4,'start':10,'docs':[]}}}"
);
+ ///////////////////////// group.query as main result
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.query","id:[2 TO 5]", "fl","id", "rows","3", "group.main","true")
+ ,"/response=={'numFound':4,'start':0,'docs':[{'id':'3'},{'id':'4'},{'id':'2'}]}"
+ );
+
+ // group.query and offset
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.query","id:[2 TO 5]", "fl","id", "rows","3", "start","2", "group.main","true")
+ ,"/response=={'numFound':4,'start':2,'docs':[{'id':'2'},{'id':'5'}]}"
+ );
+
+ // group.query and big offset
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.query","id:[2 TO 5]", "fl","id", "rows","3", "start","10", "group.main","true")
+ ,"/response=={'numFound':4,'start':10,'docs':[]}"
+ );
+
+
// multiple at once
assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true",
"group.query","id:[2 TO 5]",
@@ -304,6 +320,36 @@ public class TestGroupingSearch extends
);
+ ///////////////////////// group.field as main result
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "group.main","true")
+ ,"/response=={'numFound':10,'start':0,'docs':[{'id':'8'},{'id':'3'},{'id':'4'},{'id':'1'},{'id':'2'}]}"
+ );
+ // test that rows limits #docs
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "rows","3", "group.main","true")
+ ,"/response=={'numFound':10,'start':0,'docs':[{'id':'8'},{'id':'3'},{'id':'4'}]}"
+ );
+ // small offset
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "rows","2", "start","1", "group.main","true")
+ ,"/response=={'numFound':10,'start':1,'docs':[{'id':'3'},{'id':'4'}]}"
+ );
+ // large offset
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "rows","2", "start","20", "group.main","true")
+ ,"/response=={'numFound':10,'start':20,'docs':[]}"
+ );
+ // group.limit>1
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "rows","3", "group.limit","2", "group.main","true")
+ ,"/response=={'numFound':10,'start':0,'docs':[{'id':'8'},{'id':'10'},{'id':'3'}]}"
+ );
+ // group.limit>1 with start>0
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "rows","3", "start","1", "group.limit","2", "group.main","true")
+ ,"/response=={'numFound':10,'start':1,'docs':[{'id':'10'},{'id':'3'},{'id':'6'}]}"
+ );
+
+ ///////////////////////// group.format == simple
+ assertJQ(req("fq",filt, "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "rows","3", "start","1", "group.limit","2", "group.format","simple")
+ , "/grouped/foo_i=={'matches':10,'doclist':"
+ +"{'numFound':10,'start':1,'docs':[{'id':'10'},{'id':'3'},{'id':'6'}]}}"
+ );
};
@@ -320,59 +366,118 @@ public class TestGroupingSearch extends
assertJQ(req("q","id:"+doc.id), "/response/numFound==1");
**/
- int indexIter=0; // make >0 to enable test
- int queryIter=1000;
+ int indexIter=50 * RANDOM_MULTIPLIER; // make >0 to enable test
+ int queryIter=100 * RANDOM_MULTIPLIER;
while (--indexIter >= 0) {
+ int indexSize = random.nextInt(25 * RANDOM_MULTIPLIER);
+//indexSize=2;
List<FldType> types = new ArrayList<FldType>();
- types.add(new FldType("id",ONE_ONE, new SVal('A','Z',2,2)));
+ types.add(new FldType("id",ONE_ONE, new SVal('A','Z',4,4)));
types.add(new FldType("score_f",ONE_ONE, new FVal(1,100))); // field used to score
- types.add(new FldType("foo_i",ONE_ONE, new IRange(0,10)));
- types.add(new FldType("foo_s",ONE_ONE, new SVal('a','z',1,2)));
-
- Map<Comparable, Doc> model = indexDocs(types, null, 2);
- System.out.println("############### model=" + model);
+ types.add(new FldType("foo_i",ZERO_ONE, new IRange(0,indexSize)));
+ types.add(new FldType("foo_s",ZERO_ONE, new SVal('a','z',1,2)));
+ types.add(new FldType("small_s",ZERO_ONE, new SVal('a',(char)('c'+indexSize/10),1,1)));
+ types.add(new FldType("small_i",ZERO_ONE, new IRange(0,5+indexSize/10)));
+
+ clearIndex();
+ Map<Comparable, Doc> model = indexDocs(types, null, indexSize);
+ //System.out.println("############### model=" + model);
+
+ // test with specific docs
+ if (false) {
+ clearIndex();
+ model.clear();
+ Doc d1 = createDoc(types);
+ d1.getValues("small_s").set(0,"c");
+ d1.getValues("small_i").set(0,5);
+ d1.order = 0;
+ updateJ(toJSON(d1), params("commit","true"));
+ model.put(d1.id, d1);
+
+ d1 = createDoc(types);
+ d1.getValues("small_s").set(0,"b");
+ d1.getValues("small_i").set(0,5);
+ d1.order = 1;
+ updateJ(toJSON(d1), params("commit","false"));
+ model.put(d1.id, d1);
+
+ d1 = createDoc(types);
+ d1.getValues("small_s").set(0,"c");
+ d1.getValues("small_i").set(0,5);
+ d1.order = 2;
+ updateJ(toJSON(d1), params("commit","false"));
+ model.put(d1.id, d1);
+
+ d1 = createDoc(types);
+ d1.getValues("small_s").set(0,"c");
+ d1.getValues("small_i").set(0,5);
+ d1.order = 3;
+ updateJ(toJSON(d1), params("commit","false"));
+ model.put(d1.id, d1);
+
+ d1 = createDoc(types);
+ d1.getValues("small_s").set(0,"b");
+ d1.getValues("small_i").set(0,2);
+ d1.order = 4;
+ updateJ(toJSON(d1), params("commit","true"));
+ model.put(d1.id, d1);
+ }
for (int qiter=0; qiter<queryIter; qiter++) {
String groupField = types.get(random.nextInt(types.size())).fname;
- Map<Comparable, Grp> groups = groupBy(model.values(), groupField);
- int rows = random.nextInt(11)-1;
+ int rows = random.nextInt(10)==0 ? random.nextInt(model.size()+2) : random.nextInt(11)-1;
int start = random.nextInt(5)==0 ? random.nextInt(model.size()+2) : random.nextInt(5); // pick a small start normally for better coverage
- int group_limit = random.nextInt(11)-1;
-group_limit = random.nextInt(10)+1;
+ int group_limit = random.nextInt(10)==0 ? random.nextInt(model.size()+2) : random.nextInt(11)-1;
int group_offset = random.nextInt(10)==0 ? random.nextInt(model.size()+2) : random.nextInt(2); // pick a small start normally for better coverage
- // sort each group
String[] stringSortA = new String[1];
- Comparator<Doc> groupComparator = createSort(h.getCore().getSchema(), types, stringSortA);
+ Comparator<Doc> sortComparator = createSort(h.getCore().getSchema(), types, stringSortA);
+ String sortStr = stringSortA[0];
+ Comparator<Doc> groupComparator = random.nextBoolean() ? sortComparator : createSort(h.getCore().getSchema(), types, stringSortA);
String groupSortStr = stringSortA[0];
- // Test specific sort
- /***
- groupComparator = createComparator("_docid_", false, false, false);
- stringSort = "_docid_ desc";
- ***/
+ // since groupSortStr defaults to sortStr, we need to normalize null to "score desc" if
+ // sortStr != null.
+ if (groupSortStr == null && groupSortStr != sortStr) {
+ groupSortStr = "score desc";
+ }
+
+ // Test specific case
+ if (false) {
+ groupField="small_i";
+ sortComparator=createComparator(Arrays.asList(createComparator("small_s", true, true, false, true)));
+ sortStr = "small_s asc";
+ groupComparator = createComparator(Arrays.asList(createComparator("small_s", true, true, false, false)));
+ groupSortStr = "small_s asc";
+ rows=1; start=0; group_offset=1; group_limit=1;
+ }
+
+ Map<Comparable, Grp> groups = groupBy(model.values(), groupField);
// first sort the docs in each group
for (Grp grp : groups.values()) {
Collections.sort(grp.docs, groupComparator);
}
- // now sort the groups by the first doc in that group
- Comparator<Doc> sortComparator = random.nextBoolean() ? groupComparator : createSort(h.getCore().getSchema(), types, stringSortA);
- String sortStr = stringSortA[0];
+ // now sort the groups
+
+ // if sort != group.sort, we need to find the max doc by "sort"
+ if (groupComparator != sortComparator) {
+ for (Grp grp : groups.values()) grp.setMaxDoc(sortComparator);
+ }
List<Grp> sortedGroups = new ArrayList(groups.values());
- Collections.sort(sortedGroups, createFirstDocComparator(sortComparator));
+ Collections.sort(sortedGroups, groupComparator==sortComparator ? createFirstDocComparator(sortComparator) : createMaxDocComparator(sortComparator));
Object modelResponse = buildGroupedResult(h.getCore().getSchema(), sortedGroups, start, rows, group_offset, group_limit);
// TODO: create a random filter too
- SolrQueryRequest req = req("group","true","wt","json","indent","true", "q","{!func}score_f", "group.field",groupField
+ SolrQueryRequest req = req("group","true","wt","json","indent","true", "echoParams","all", "q","{!func}score_f", "group.field",groupField
,sortStr==null ? "nosort":"sort", sortStr ==null ? "": sortStr
,(groupSortStr==null || groupSortStr==sortStr) ? "nosort":"group.sort", groupSortStr==null ? "": groupSortStr
,"rows",""+rows, "start",""+start, "group.offset",""+group_offset, "group.limit",""+group_limit
@@ -384,11 +489,15 @@ group_limit = random.nextInt(10)+1;
String err = JSONTestUtil.matchObj("/grouped/"+groupField, realResponse, modelResponse);
if (err != null) {
log.error("GROUPING MISMATCH: " + err
+ + "\n\trequest="+req
+ "\n\tresult="+strResponse
+ "\n\texpected="+ JSONUtil.toJSON(modelResponse)
+ "\n\tsorted_model="+ sortedGroups
);
+ // re-execute the request... good for putting a breakpoint here for debugging
+ String rsp = h.query(req);
+
fail(err);
}
} // end query iter
@@ -423,7 +532,7 @@ group_limit = random.nextInt(10)+1;
List docs = new ArrayList();
resultSet.put("docs", docs);
for (int j=group_offset; j<grp.docs.size(); j++) {
- if (group_offset != -1 && docs.size() >= group_limit) break;
+ if (group_limit != -1 && docs.size() >= group_limit) break;
docs.add( grp.docs.get(j).toObject(schema) );
}
}
@@ -432,6 +541,18 @@ group_limit = random.nextInt(10)+1;
}
+ public static Comparator<Grp> createMaxDocComparator(final Comparator<Doc> docComparator) {
+ return new Comparator<Grp>() {
+ @Override
+ public int compare(Grp o1, Grp o2) {
+ // all groups should have at least one doc
+ Doc d1 = o1.maxDoc;
+ Doc d2 = o2.maxDoc;
+ return docComparator.compare(d1, d2);
+ }
+ };
+ }
+
public static Comparator<Grp> createFirstDocComparator(final Comparator<Doc> docComparator) {
return new Comparator<Grp>() {
@Override
@@ -444,8 +565,6 @@ group_limit = random.nextInt(10)+1;
};
}
-
-
public static Map<Comparable, Grp> groupBy(Collection<Doc> docs, String field) {
Map<Comparable, Grp> groups = new HashMap<Comparable, Grp>();
for (Doc doc : docs) {
@@ -479,7 +598,15 @@ group_limit = random.nextInt(10)+1;
public static class Grp {
public Comparable groupValue;
- public List<SolrTestCaseJ4.Doc> docs;
+ public List<Doc> docs;
+ public Doc maxDoc; // the document highest according to the "sort" param
+
+
+ public void setMaxDoc(Comparator<Doc> comparator) {
+ Doc[] arr = docs.toArray(new Doc[docs.size()]);
+ Arrays.sort(arr, comparator);
+ maxDoc = arr.length > 0 ? arr[0] : null;
+ }
@Override
public String toString() {
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java Mon Dec 6 00:47:16 2010
@@ -16,15 +16,12 @@
*/
package org.apache.solr.analysis;
-import java.io.StringReader;
import java.lang.reflect.Field;
-import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.Config;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.FieldType;
-import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.Version;
@@ -53,17 +50,11 @@ public class TestLuceneMatchVersion exte
TokenizerChain ana = (TokenizerChain) type.getAnalyzer();
assertEquals(DEFAULT_VERSION, ((BaseTokenizerFactory) ana.getTokenizerFactory()).luceneMatchVersion);
assertEquals(DEFAULT_VERSION, ((BaseTokenFilterFactory) ana.getTokenFilterFactories()[2]).luceneMatchVersion);
- TokenizerChain.TokenStreamInfo tsi = ana.getStream("textDefault",new StringReader(""));
- StandardTokenizer tok = (StandardTokenizer) tsi.getTokenizer();
- assertTrue(tok.isReplaceInvalidAcronym());
-
- type = schema.getFieldType("text20");
+
+ type = schema.getFieldType("text30");
ana = (TokenizerChain) type.getAnalyzer();
- assertEquals(Version.LUCENE_20, ((BaseTokenizerFactory) ana.getTokenizerFactory()).luceneMatchVersion);
- assertEquals(Version.LUCENE_24, ((BaseTokenFilterFactory) ana.getTokenFilterFactories()[2]).luceneMatchVersion);
- tsi = ana.getStream("text20",new StringReader(""));
- tok = (StandardTokenizer) tsi.getTokenizer();
- assertFalse(tok.isReplaceInvalidAcronym());
+ assertEquals(Version.LUCENE_30, ((BaseTokenizerFactory) ana.getTokenizerFactory()).luceneMatchVersion);
+ assertEquals(Version.LUCENE_31, ((BaseTokenFilterFactory) ana.getTokenFilterFactories()[2]).luceneMatchVersion);
// this is a hack to get the private matchVersion field in StandardAnalyzer's superclass, may break in later lucene versions - we have no getter :(
final Field matchVersionField = StandardAnalyzer.class.getSuperclass().getDeclaredField("matchVersion");
@@ -74,9 +65,9 @@ public class TestLuceneMatchVersion exte
assertTrue(ana1 instanceof StandardAnalyzer);
assertEquals(DEFAULT_VERSION, matchVersionField.get(ana1));
- type = schema.getFieldType("textStandardAnalyzer20");
+ type = schema.getFieldType("textStandardAnalyzer30");
ana1 = type.getAnalyzer();
assertTrue(ana1 instanceof StandardAnalyzer);
- assertEquals(Version.LUCENE_20, matchVersionField.get(ana1));
+ assertEquals(Version.LUCENE_30, matchVersionField.get(ana1));
}
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestRussianFilters.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestRussianFilters.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestRussianFilters.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestRussianFilters.java Mon Dec 6 00:47:16 2010
@@ -38,37 +38,4 @@ public class TestRussianFilters extends
assertTokenStreamContents(stream, new String[] {"ÐмеÑÑе", "Ñ", "Ñем", "о",
"Ñиле", "ÑлекÑÑомагниÑной", "100"});
}
-
- /**
- * Test RussianLowerCaseFilterFactory
- */
- public void testLowerCase() throws Exception {
- Reader reader = new StringReader("ÐмеÑÑе Ñ Ñем о Ñиле ÑлекÑÑомагниÑной 100");
- RussianLetterTokenizerFactory factory = new RussianLetterTokenizerFactory();
- factory.init(DEFAULT_VERSION_PARAM);
- RussianLowerCaseFilterFactory filterFactory = new RussianLowerCaseFilterFactory();
- filterFactory.init(DEFAULT_VERSION_PARAM);
- Tokenizer tokenizer = factory.create(reader);
- TokenStream stream = filterFactory.create(tokenizer);
- assertTokenStreamContents(stream, new String[] {"вмеÑÑе", "Ñ", "Ñем", "о",
- "Ñиле", "ÑлекÑÑомагниÑной", "100"});
- }
-
- /**
- * Test RussianStemFilterFactory
- */
- public void testStemmer() throws Exception {
- Reader reader = new StringReader("ÐмеÑÑе Ñ Ñем о Ñиле ÑлекÑÑомагниÑной 100");
- RussianLetterTokenizerFactory factory = new RussianLetterTokenizerFactory();
- factory.init(DEFAULT_VERSION_PARAM);
- RussianLowerCaseFilterFactory caseFactory = new RussianLowerCaseFilterFactory();
- caseFactory.init(DEFAULT_VERSION_PARAM);
- RussianStemFilterFactory stemFactory = new RussianStemFilterFactory();
- stemFactory.init(DEFAULT_VERSION_PARAM);
- Tokenizer tokenizer = factory.create(reader);
- TokenStream stream = caseFactory.create(tokenizer);
- stream = stemFactory.create(stream);
- assertTokenStreamContents(stream, new String[] {"вмеÑÑ", "Ñ", "Ñем", "о",
- "Ñил", "ÑлекÑÑомагниÑн", "100"});
- }
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestStandardFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestStandardFactories.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestStandardFactories.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestStandardFactories.java Mon Dec 6 00:47:16 2010
@@ -126,17 +126,4 @@ public class TestStandardFactories exten
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "Ceska" });
}
-
- /**
- * Ensure the ISOLatin1AccentFilterFactory works
- * (sometimes, at least not uppercase hacek)
- */
- public void testISOLatin1Folding() throws Exception {
- Reader reader = new StringReader("Äeská");
- Tokenizer tokenizer = new WhitespaceTokenizer(DEFAULT_VERSION, reader);
- ISOLatin1AccentFilterFactory factory = new ISOLatin1AccentFilterFactory();
- factory.init(DEFAULT_VERSION_PARAM);
- TokenStream stream = factory.create(tokenizer);
- assertTokenStreamContents(stream, new String[] { "Äeska" });
- }
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Mon Dec 6 00:47:16 2010
@@ -27,11 +27,8 @@ import org.apache.lucene.analysis.standa
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriter.MaxFieldLength;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Version;
@@ -101,7 +98,11 @@ public class TestArbitraryIndexDir exten
//add a doc in the new index dir
Directory dir = FSDirectory.open(newDir);
- IndexWriter iw = new IndexWriter(dir, new StandardAnalyzer(Version.LUCENE_24), new MaxFieldLength(1000));
+ IndexWriter iw = new IndexWriter(
+ dir,
+ new IndexWriterConfig(Version.LUCENE_40, new StandardAnalyzer(Version.LUCENE_40)).
+ setMaxFieldLength(1000)
+ );
Document doc = new Document();
doc.add(new Field("id", "2", Field.Store.YES, Field.Index.ANALYZED));
doc.add(new Field("name", "name2", Field.Store.YES, Field.Index.ANALYZED));
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestConfig.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestConfig.java Mon Dec 6 00:47:16 2010
@@ -133,7 +133,7 @@ public class TestConfig extends SolrTest
ExposeWriterHandler duh = new ExposeWriterHandler();
IndexWriter writer = duh.getWriter();
- int interval = writer.getTermIndexInterval();
+ int interval = writer.getConfig().getTermIndexInterval();
assertEquals(256, interval);
duh.close();
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java Mon Dec 6 00:47:16 2010
@@ -20,8 +20,8 @@ public class TestLegacyMergeSchedulerPol
public void testLegacy() throws Exception {
ExposeWriterHandler duh = new ExposeWriterHandler();
IndexWriter writer = duh.getWriter();
- assertTrue(writer.getMergePolicy().getClass().getName().equals(LogDocMergePolicy.class.getName()));
- assertTrue(writer.getMergeScheduler().getClass().getName().equals(SerialMergeScheduler.class.getName()));
+ assertTrue(writer.getConfig().getMergePolicy().getClass().getName().equals(LogDocMergePolicy.class.getName()));
+ assertTrue(writer.getConfig().getMergeScheduler().getClass().getName().equals(SerialMergeScheduler.class.getName()));
duh.close();
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInject.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInject.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInject.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInject.java Mon Dec 6 00:47:16 2010
@@ -31,7 +31,7 @@ public class TestPropInject extends Abst
public void testMergePolicy() throws Exception {
ExposeWriterHandler uh = new ExposeWriterHandler();
IndexWriter writer = uh.getWriter();
- LogByteSizeMergePolicy mp = (LogByteSizeMergePolicy)writer.getMergePolicy();
+ LogByteSizeMergePolicy mp = (LogByteSizeMergePolicy)writer.getConfig().getMergePolicy();
assertEquals(64.0, mp.getMaxMergeMB());
uh.close();
}
@@ -39,7 +39,7 @@ public class TestPropInject extends Abst
public void testProps() throws Exception {
ExposeWriterHandler uh = new ExposeWriterHandler();
IndexWriter writer = uh.getWriter();
- ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getMergeScheduler();
+ ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getConfig().getMergeScheduler();
assertEquals(2, cms.getMaxThreadCount());
uh.close();
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java Mon Dec 6 00:47:16 2010
@@ -48,7 +48,7 @@ public class TestPropInjectDefaults exte
public void testMergePolicyDefaults() throws Exception {
ExposeWriterHandler uh = new ExposeWriterHandler();
IndexWriter writer = uh.getWriter();
- LogByteSizeMergePolicy mp = (LogByteSizeMergePolicy)writer.getMergePolicy();
+ LogByteSizeMergePolicy mp = (LogByteSizeMergePolicy)writer.getConfig().getMergePolicy();
assertEquals(32.0, mp.getMaxMergeMB());
uh.close();
}
@@ -57,7 +57,7 @@ public class TestPropInjectDefaults exte
public void testPropsDefaults() throws Exception {
ExposeWriterHandler uh = new ExposeWriterHandler();
IndexWriter writer = uh.getWriter();
- ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getMergeScheduler();
+ ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getConfig().getMergeScheduler();
assertEquals(4, cms.getMaxThreadCount());
uh.close();
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java Mon Dec 6 00:47:16 2010
@@ -66,7 +66,7 @@ public class SpellCheckComponentTest ext
);
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","bluo", SpellCheckComponent.SPELLCHECK_COUNT,"3", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS,"true")
- ,"/spellcheck/suggestions/[1]/suggestion==[{'word':'blue','freq':1}, {'word':'blud','freq':1}, {'word':'boue','freq':1}]"
+ ,"/spellcheck/suggestions/[1]/suggestion==[{'word':'blud','freq':1}, {'word':'blue','freq':1}, {'word':'blee','freq':1}]"
);
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/highlight/HighlighterTest.java Mon Dec 6 00:47:16 2010
@@ -158,12 +158,12 @@ public class HighlighterTest extends Sol
@Test
public void testTermOffsetsTokenStream() throws Exception {
String[] multivalued = { "a b c d", "e f g", "h", "i j k l m n" };
- Analyzer a1 = new WhitespaceAnalyzer();
+ Analyzer a1 = new WhitespaceAnalyzer(TEST_VERSION_CURRENT);
TermOffsetsTokenStream tots = new TermOffsetsTokenStream(
a1.tokenStream( "", new StringReader( "a b c d e f g h i j k l m n" ) ) );
for( String v : multivalued ){
TokenStream ts1 = tots.getMultiValuedTokenStream( v.length() );
- Analyzer a2 = new WhitespaceAnalyzer();
+ Analyzer a2 = new WhitespaceAnalyzer(TEST_VERSION_CURRENT);
TokenStream ts2 = a2.tokenStream( "", new StringReader( v ) );
while (ts1.incrementToken()) {
assertTrue(ts2.incrementToken());
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestSort.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestSort.java Mon Dec 6 00:47:16 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
@@ -59,7 +60,12 @@ public class TestSort extends AbstractSo
Field f2 = new Field("f2","0", Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS);
for (int iterCnt = 0; iterCnt<iter; iterCnt++) {
- IndexWriter iw = new IndexWriter(dir, new SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
+ IndexWriter iw = new IndexWriter(
+ dir,
+ new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)).
+ setOpenMode(IndexWriterConfig.OpenMode.CREATE).
+ setMaxFieldLength(IndexWriterConfig.UNLIMITED_FIELD_LENGTH)
+ );
final MyDoc[] mydocs = new MyDoc[ndocs];
int v1EmptyPercent = 50;
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Mon Dec 6 00:47:16 2010
@@ -24,6 +24,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.spell.JaroWinklerDistance;
import org.apache.lucene.search.spell.SpellChecker;
import org.apache.lucene.search.spell.StringDistance;
@@ -283,7 +284,11 @@ public class IndexBasedSpellCheckerTest
File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
//create a standalone index
File altIndexDir = new File(TEMP_DIR, "alternateIdx" + new Date().getTime());
- IndexWriter iw = new IndexWriter(FSDirectory.open(altIndexDir), new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter iw = new IndexWriter(
+ FSDirectory.open(altIndexDir),
+ new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).
+ setMaxFieldLength(IndexWriterConfig.UNLIMITED_FIELD_LENGTH)
+ );
for (int i = 0; i < ALT_DOCS.length; i++) {
Document doc = new Document();
doc.add(new Field("title", ALT_DOCS[i], Field.Store.YES, Field.Index.ANALYZED));
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SimpleQueryConverter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SimpleQueryConverter.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SimpleQueryConverter.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SimpleQueryConverter.java Mon Dec 6 00:47:16 2010
@@ -25,6 +25,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
+import org.apache.lucene.util.Version;
import java.util.Collection;
import java.util.HashSet;
@@ -40,7 +41,7 @@ class SimpleQueryConverter extends Spell
@Override
public Collection<Token> convert(String origQuery) {
Collection<Token> result = new HashSet<Token>();
- WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer();
+ WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_40);
TokenStream ts = analyzer.tokenStream("", new StringReader(origQuery));
// TODO: support custom attributes
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java Mon Dec 6 00:47:16 2010
@@ -21,13 +21,9 @@ import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.Assert;
import java.util.Collection;
-import java.util.ArrayList;
/**
@@ -42,7 +38,7 @@ public class SpellingQueryConverterTest
public void test() throws Exception {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer());
+ converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
Collection<Token> tokens = converter.convert("field:foo");
assertTrue("tokens is null and it shouldn't be", tokens != null);
assertTrue("tokens Size: " + tokens.size() + " is not: " + 1, tokens.size() == 1);
@@ -52,7 +48,7 @@ public class SpellingQueryConverterTest
public void testSpecialChars() {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer());
+ converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
String original = "field_with_underscore:value_with_underscore";
Collection<Token> tokens = converter.convert(original);
assertTrue("tokens is null and it shouldn't be", tokens != null);
@@ -98,7 +94,7 @@ public class SpellingQueryConverterTest
public void testUnicode() {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer());
+ converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
// chinese text value
Collection<Token> tokens = converter.convert("text_field:æè´ä¹°äºéå
·åæè£
ã");
@@ -118,7 +114,7 @@ public class SpellingQueryConverterTest
public void testMultipleClauses() {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer());
+ converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
// two field:value pairs should give two tokens
Collection<Token> tokens = converter.convert("ä¹°text_field:æè´ä¹°äºéå
·åæè£
ã field2:bar");
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/bad_solrconfig.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/bad_solrconfig.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/bad_solrconfig.xml Mon Dec 6 00:47:16 2010
@@ -23,6 +23,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<useCompoundFile>${unset.sys.property}</useCompoundFile>
</indexDefaults>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/schema-luceneMatchVersion.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/schema-luceneMatchVersion.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/schema-luceneMatchVersion.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/schema-luceneMatchVersion.xml Mon Dec 6 00:47:16 2010
@@ -18,12 +18,12 @@
<schema name="luceneMatchVersionTest" version="1.1">
<types>
<fieldtype name="string" class="solr.StrField"/>
- <fieldtype name="text20" class="solr.TextField">
+ <fieldtype name="text30" class="solr.TextField">
<analyzer>
- <tokenizer class="solr.StandardTokenizerFactory" luceneMatchVersion="LUCENE_20"/>
+ <tokenizer class="solr.StandardTokenizerFactory" luceneMatchVersion="LUCENE_30"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.StopFilterFactory" luceneMatchVersion="2.4"/>
+ <filter class="solr.StopFilterFactory" luceneMatchVersion="3.1"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
</fieldtype>
@@ -36,8 +36,8 @@
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
</fieldtype>
- <fieldtype name="textStandardAnalyzer20" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer" luceneMatchVersion="LUCENE_20"/>
+ <fieldtype name="textStandardAnalyzer30" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer" luceneMatchVersion="LUCENE_30"/>
</fieldtype>
<fieldtype name="textStandardAnalyzerDefault" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
@@ -45,9 +45,9 @@
</types>
<fields>
<field name="signatureField" type="string" indexed="true" stored="false"/>
- <field name="text20" type="text20" indexed="true" stored="false" />
+ <field name="text30" type="text30" indexed="true" stored="false" />
<field name="textDefault" type="textDefault" indexed="true" stored="false" />
- <field name="textStandardAnalyzer20" type="textStandardAnalyzer20" indexed="true" stored="false" />
+ <field name="textStandardAnalyzer30" type="textStandardAnalyzer30" indexed="true" stored="false" />
<field name="textStandardAnalyzerDefault" type="textStandardAnalyzerDefault" indexed="true" stored="false" />
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
</fields>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml Mon Dec 6 00:47:16 2010
@@ -18,6 +18,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
<indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory >
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml Mon Dec 6 00:47:16 2010
@@ -18,6 +18,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<mainIndex>
<deletionPolicy class="org.apache.solr.core.FakeDeletionPolicy">
<str name="var1">value1</str>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<!-- The DirectoryFactory to use for indexes.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml Mon Dec 6 00:47:16 2010
@@ -37,7 +37,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master1.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master1.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master1.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master2.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master2.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-master2.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml Mon Dec 6 00:47:16 2010
@@ -37,7 +37,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml Mon Dec 6 00:47:16 2010
@@ -37,7 +37,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml Mon Dec 6 00:47:16 2010
@@ -23,6 +23,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<!-- The DirectoryFactory to use for indexes.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml Mon Dec 6 00:47:16 2010
@@ -25,7 +25,7 @@ Config for testing spellcheck component
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard"
class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml Mon Dec 6 00:47:16 2010
@@ -22,7 +22,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- see TestConfig.testLib() -->
<lib dir="../lib-dirs/a" />
<lib dir="../lib-dirs/b" regex="b." />
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml Mon Dec 6 00:47:16 2010
@@ -18,7 +18,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml Mon Dec 6 00:47:16 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig.xml Mon Dec 6 00:47:16 2010
@@ -50,7 +50,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<!-- Values here affect all index writers and act as a default
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig_perf.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig_perf.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig_perf.xml Mon Dec 6 00:47:16 2010
@@ -17,6 +17,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data
other than the default ./data under the Solr home.
If replication is in use, this should match the replication configuration. -->
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/crazy-path-to-config.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/crazy-path-to-config.xml Mon Dec 6 00:47:16 2010
@@ -24,6 +24,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
<mergeFactor>10</mergeFactor>
Modified: lucene/dev/branches/docvalues/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/test-files/solr/shared/conf/solrconfig.xml?rev=1042501&r1=1042500&r2=1042501&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/test-files/solr/shared/conf/solrconfig.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/test/test-files/solr/shared/conf/solrconfig.xml Mon Dec 6 00:47:16 2010
@@ -21,6 +21,7 @@
It is *not* a good example to work from.
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.solr.home}/data/${l10n}-${version}</dataDir>