You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/07/25 22:41:10 UTC
svn commit: r1507116 - in /lucene/dev/branches/lucene5127:
lucene/core/src/java/org/apache/lucene/index/
lucene/core/src/test/org/apache/lucene/codecs/lucene40/
lucene/core/src/test/org/apache/lucene/index/
solr/example/example-schemaless/solr/collecti...
Author: rmuir
Date: Thu Jul 25 20:41:09 2013
New Revision: 1507116
URL: http://svn.apache.org/r1507116
Log:
LUCENE-5127: fix TestLucene40PF and clean up some more outdated stuff
Modified:
lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsFormat.java
lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/branches/lucene5127/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene5127/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java?rev=1507116&r1=1507115&r2=1507116&view=diff
==============================================================================
--- lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java (original)
+++ lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java Thu Jul 25 20:41:09 2013
@@ -19,7 +19,6 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat; // javadocs
import org.apache.lucene.index.DocumentsWriterPerThread.IndexingChain;
import org.apache.lucene.index.IndexWriter.IndexReaderWarmer;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -42,7 +41,6 @@ public class LiveIndexWriterConfig {
private volatile double ramBufferSizeMB;
private volatile int maxBufferedDeleteTerms;
private volatile IndexReaderWarmer mergedSegmentWarmer;
- private volatile int termIndexInterval; // TODO: this should be private to the codec, not settable here
// modified by IndexWriterConfig
/** {@link IndexDeletionPolicy} controlling when commit
Modified: lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsFormat.java?rev=1507116&r1=1507115&r2=1507116&view=diff
==============================================================================
--- lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsFormat.java (original)
+++ lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsFormat.java Thu Jul 25 20:41:09 2013
@@ -24,7 +24,7 @@ import org.apache.lucene.index.BasePosti
* Tests Lucene40PostingsFormat
*/
public class TestLucene40PostingsFormat extends BasePostingsFormatTestCase {
- private final Codec codec = new Lucene40Codec();
+ private final Codec codec = new Lucene40RWCodec();
@Override
protected Codec getCodec() {
Modified: lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=1507116&r1=1507115&r2=1507116&view=diff
==============================================================================
--- lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/branches/lucene5127/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Thu Jul 25 20:41:09 2013
@@ -89,7 +89,6 @@ public class TestIndexWriterConfig exten
getters.add("getMergeScheduler");
getters.add("getOpenMode");
getters.add("getSimilarity");
- getters.add("getTermIndexInterval");
getters.add("getWriteLockTimeout");
getters.add("getDefaultWriteLockTimeout");
getters.add("getMaxBufferedDeleteTerms");
@@ -101,7 +100,6 @@ public class TestIndexWriterConfig exten
getters.add("getMaxThreadStates");
getters.add("getReaderPooling");
getters.add("getIndexerThreadPool");
- getters.add("getReaderTermsIndexDivisor");
getters.add("getFlushPolicy");
getters.add("getRAMPerThreadHardLimitMB");
getters.add("getCodec");
Modified: lucene/dev/branches/lucene5127/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5127/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1507116&r1=1507115&r2=1507116&view=diff
==============================================================================
--- lucene/dev/branches/lucene5127/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5127/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml Thu Jul 25 20:41:09 2013
@@ -257,11 +257,6 @@
<unlockOnStartup>false</unlockOnStartup>
-->
- <!-- Expert: Controls how often Lucene loads terms into memory
- Default is 128 and is likely good for most everyone.
- -->
- <!-- <termIndexInterval>128</termIndexInterval> -->
-
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
-->
@@ -440,15 +435,6 @@
<str name="someArg">Some Value</str>
</indexReaderFactory >
-->
- <!-- By explicitly declaring the Factory, the termIndexDivisor can
- be specified.
- -->
- <!--
- <indexReaderFactory name="IndexReaderFactory"
- class="solr.StandardIndexReaderFactory">
- <int name="setTermIndexDivisor">12</int>
- </indexReaderFactory >
- -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Query section - these settings control query time things like caches
Modified: lucene/dev/branches/lucene5127/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5127/solr/example/solr/collection1/conf/solrconfig.xml?rev=1507116&r1=1507115&r2=1507116&view=diff
==============================================================================
--- lucene/dev/branches/lucene5127/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5127/solr/example/solr/collection1/conf/solrconfig.xml Thu Jul 25 20:41:09 2013
@@ -257,11 +257,6 @@
<!--
<unlockOnStartup>false</unlockOnStartup>
-->
-
- <!-- Expert: Controls how often Lucene loads terms into memory
- Default is 128 and is likely good for most everyone.
- -->
- <!-- <termIndexInterval>128</termIndexInterval> -->
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
@@ -441,15 +436,6 @@
<str name="someArg">Some Value</str>
</indexReaderFactory >
-->
- <!-- By explicitly declaring the Factory, the termIndexDivisor can
- be specified.
- -->
- <!--
- <indexReaderFactory name="IndexReaderFactory"
- class="solr.StandardIndexReaderFactory">
- <int name="setTermIndexDivisor">12</int>
- </indexReaderFactory >
- -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Query section - these settings control query time things like caches