You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/07/03 18:50:21 UTC
svn commit: r1499473 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/build.xml solr/example/ solr/example/alt-configs/
solr/example/solr/collection1/conf/solrconfig.xml
Author: markrmiller
Date: Wed Jul 3 16:50:20 2013
New Revision: 1499473
URL: http://svn.apache.org/r1499473
Log:
SOLR-4916: Merge out separate hdfs solrconfig.xml
Removed:
lucene/dev/branches/branch_4x/solr/example/alt-configs/
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1499473&r1=1499472&r2=1499473&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Wed Jul 3 16:50:20 2013
@@ -40,7 +40,7 @@
<!-- ========================================================================= -->
<target name="example" description="Creates a runnable example configuration."
- depends="dist-contrib,dist-war,setup-alt-examples">
+ depends="dist-contrib,dist-war">
<copy file="${dist}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar"
@@ -55,15 +55,6 @@
</delete>
<echo>See ${example}/README.txt for how to run the Solr example configuration.</echo>
</target>
-
- <target name="setup-alt-examples">
- <copy todir="${example}/hdfs" overwrite="true">
- <fileset dir="${example}/solr"/>
- </copy>
- <copy todir="${example}/hdfs/collection1/conf" overwrite="true">
- <fileset dir="${example}/alt-configs/hdfs"/>
- </copy>
- </target>
<target name="run-example" depends="example"
description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger">
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1499473&r1=1499472&r2=1499473&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml Wed Jul 3 16:50:20 2013
@@ -184,7 +184,8 @@
maxBufferedDocs sets a limit on the number of documents buffered
before flushing.
If both ramBufferSizeMB and maxBufferedDocs is set, then
- Lucene will flush based on whichever limit is hit first. -->
+ Lucene will flush based on whichever limit is hit first.
+ The default is 100 MB. -->
<!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
<!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
@@ -365,7 +366,7 @@
have some sort of hard autoCommit to limit the log size.
-->
<autoCommit>
- <maxTime>15000</maxTime>
+ <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
<openSearcher>false</openSearcher>
</autoCommit>
@@ -374,11 +375,10 @@
but does not ensure that data is synced to disk. This is
faster and more near-realtime friendly than a hard commit.
-->
- <!--
- <autoSoftCommit>
- <maxTime>1000</maxTime>
- </autoSoftCommit>
- -->
+
+ <autoSoftCommit>
+ <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+ </autoSoftCommit>
<!-- Update Related Event Listeners