You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/05/15 12:01:53 UTC
svn commit: r1679525 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/contrib/
solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/
solr/core/ solr/core/src/java/org/apache/solr/core/
solr/core/src/test-files/solr/ solr/core/src/t...
Author: shalin
Date: Fri May 15 10:01:52 2015
New Revision: 1679525
URL: http://svn.apache.org/r1679525
Log:
SOLR-7532: Removed occurrences of the unused 'commitIntervalLowerBound' property for updateHandler elements from Solr configuration
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/crazy-path-to-config.xml
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri May 15 10:01:52 2015
@@ -308,6 +308,9 @@ Other Changes
* SOLR-7544: CollectionsHandler refactored to be more modular (Noble Paul)
+* SOLR-7532: Removed occurrences of the unused 'commitIntervalLowerBound' property for
+ updateHandler elements from Solr configuration. (Marius Grama via shalin)
+
================== 5.1.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Modified: lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml Fri May 15 10:01:52 2015
@@ -38,11 +38,6 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
- <!-- represents a lower bound on the frequency that commits may
- occur (in seconds). NOTE: not yet implemented
-
- <commitIntervalLowerBound>0</commitIntervalLowerBound>
- -->
<!-- The RunExecutableListener executes an external command.
exe - the name of the executable to run
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java Fri May 15 10:01:52 2015
@@ -209,7 +209,6 @@ public class ConfigOverlay implements Ma
" maxDocs:20," +
" maxTime:20}," +
" commitWithin:{softCommit:11}," +
- " commitIntervalLowerBound:21," +
" indexWriter:{closeWaitsForMerges:11}}," +
" query:{" +
" filterCache:{" +
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java Fri May 15 10:01:52 2015
@@ -432,7 +432,6 @@ public class SolrConfig extends Config i
getInt("updateHandler/autoCommit/maxTime", -1),
getBool("updateHandler/indexWriter/closeWaitsForMerges", true),
getBool("updateHandler/autoCommit/openSearcher", true),
- getInt("updateHandler/commitIntervalLowerBound", -1),
getInt("updateHandler/autoSoftCommit/maxDocs", -1),
getInt("updateHandler/autoSoftCommit/maxTime", -1),
getBool("updateHandler/commitWithin/softCommit", true));
@@ -652,7 +651,7 @@ public class SolrConfig extends Config i
public static class UpdateHandlerInfo implements MapSerializable {
public final String className;
- public final int autoCommmitMaxDocs, autoCommmitMaxTime, commitIntervalLowerBound,
+ public final int autoCommmitMaxDocs, autoCommmitMaxTime,
autoSoftCommmitMaxDocs, autoSoftCommmitMaxTime;
public final boolean indexWriterCloseWaitsForMerges;
public final boolean openSearcher; // is opening a new searcher part of hard autocommit?
@@ -661,16 +660,14 @@ public class SolrConfig extends Config i
/**
* @param autoCommmitMaxDocs set -1 as default
* @param autoCommmitMaxTime set -1 as default
- * @param commitIntervalLowerBound set -1 as default
*/
- public UpdateHandlerInfo(String className, int autoCommmitMaxDocs, int autoCommmitMaxTime, boolean indexWriterCloseWaitsForMerges, boolean openSearcher, int commitIntervalLowerBound,
+ public UpdateHandlerInfo(String className, int autoCommmitMaxDocs, int autoCommmitMaxTime, boolean indexWriterCloseWaitsForMerges, boolean openSearcher,
int autoSoftCommmitMaxDocs, int autoSoftCommmitMaxTime, boolean commitWithinSoftCommit) {
this.className = className;
this.autoCommmitMaxDocs = autoCommmitMaxDocs;
this.autoCommmitMaxTime = autoCommmitMaxTime;
this.indexWriterCloseWaitsForMerges = indexWriterCloseWaitsForMerges;
this.openSearcher = openSearcher;
- this.commitIntervalLowerBound = commitIntervalLowerBound;
this.autoSoftCommmitMaxDocs = autoSoftCommmitMaxDocs;
this.autoSoftCommmitMaxTime = autoSoftCommmitMaxTime;
@@ -684,12 +681,10 @@ public class SolrConfig extends Config i
LinkedHashMap result = new LinkedHashMap();
result.put("indexWriter", makeMap("closeWaitsForMerges", indexWriterCloseWaitsForMerges));
result.put("openSearcher", openSearcher);
- result.put("commitIntervalLowerBound", commitIntervalLowerBound);
result.put("commitWithin", makeMap("softCommit", commitWithinSoftCommit));
result.put("autoCommit", makeMap(
"maxDocs", autoCommmitMaxDocs,
- "maxTime", autoCommmitMaxTime,
- "commitIntervalLowerBound", commitIntervalLowerBound
+ "maxTime", autoCommmitMaxTime
));
result.put("autoSoftCommit",
makeMap("maxDocs", autoSoftCommmitMaxDocs,
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml Fri May 15 10:01:52 2015
@@ -59,11 +59,6 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
- <!-- represents a lower bound on the frequency that commits may
- occur (in seconds). NOTE: not yet implemented
-
- <commitIntervalLowerBound>0</commitIntervalLowerBound>
- -->
<!-- The RunExecutableListener executes an external command.
exe - the name of the executable to run
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml Fri May 15 10:01:52 2015
@@ -59,11 +59,6 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
- <!-- represents a lower bound on the frequency that commits may
- occur (in seconds). NOTE: not yet implemented
-
- <commitIntervalLowerBound>0</commitIntervalLowerBound>
- -->
<!-- The RunExecutableListener executes an external command.
exe - the name of the executable to run
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml Fri May 15 10:01:52 2015
@@ -41,11 +41,6 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
- <!-- represents a lower bound on the frequency that commits may
- occur (in seconds). NOTE: not yet implemented
-
- <commitIntervalLowerBound>0</commitIntervalLowerBound>
- -->
<!-- The RunExecutableListener executes an external command.
exe - the name of the executable to run
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml Fri May 15 10:01:52 2015
@@ -59,12 +59,6 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
- <!-- represents a lower bound on the frequency that commits may
- occur (in seconds). NOTE: not yet implemented
-
- <commitIntervalLowerBound>0</commitIntervalLowerBound>
- -->
-
<!-- The RunExecutableListener executes an external command.
exe - the name of the executable to run
dir - dir to use as the current working directory. default="."
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Fri May 15 10:01:52 2015
@@ -64,11 +64,6 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
- <!-- represents a lower bound on the frequency that commits may
- occur (in seconds). NOTE: not yet implemented
-
- <commitIntervalLowerBound>0</commitIntervalLowerBound>
- -->
<!-- The RunExecutableListener executes an external command.
exe - the name of the executable to run
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/crazy-path-to-config.xml?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/crazy-path-to-config.xml Fri May 15 10:01:52 2015
@@ -26,9 +26,7 @@
<xi:include href="collection1/conf/solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <updateHandler class="solr.DirectUpdateHandler2">
- <commitIntervalLowerBound>0</commitIntervalLowerBound>
- </updateHandler>
+ <updateHandler class="solr.DirectUpdateHandler2"/>
<query>
<maxBooleanClauses>1024</maxBooleanClauses>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java?rev=1679525&r1=1679524&r2=1679525&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java Fri May 15 10:01:52 2015
@@ -58,8 +58,6 @@ public class TestConfigOverlay extends L
assertTrue(isEditableProp("requestDispatcher.handleSelect", false, null));
- assertTrue(isEditableProp("updateHandler/commitIntervalLowerBound", true, null));
- assertFalse(isEditableProp("updateHandler/commitIntervalLowerBound1", true, null));
assertTrue(isEditableProp("query.filterCache.initialSize", false, null));
assertFalse(isEditableProp("query.filterCache", false, null));
assertTrue(isEditableProp("query/filterCache/@initialSize", true, null));