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/02/01 19:25:24 UTC
svn commit: r1441570 - in /lucene/dev/branches/lucene4547: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/core/
solr/core/src/java/org/apache/solr/update/
solr/core/src/test-files/solr/collection1/conf/
solr/core/src/test/org/apache/solr/update/
Author: rmuir
Date: Fri Feb 1 18:25:23 2013
New Revision: 1441570
URL: http://svn.apache.org/viewvc?rev=1441570&view=rev
Log:
Merged /lucene/dev/trunk:r1441423-1441567
Added:
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/HardAutoCommitTest.java
- copied unchanged from r1441567, lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/HardAutoCommitTest.java
Modified:
lucene/dev/branches/lucene4547/ (props changed)
lucene/dev/branches/lucene4547/solr/ (props changed)
lucene/dev/branches/lucene4547/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene4547/solr/core/ (props changed)
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java
Modified: lucene/dev/branches/lucene4547/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/CHANGES.txt?rev=1441570&r1=1441569&r2=1441570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene4547/solr/CHANGES.txt Fri Feb 1 18:25:23 2013
@@ -68,6 +68,9 @@ New Features
* SOLR-2827: RegexpBoost Update Processor (janhoy)
+* SOLR-4370: Allow configuring commitWithin to do hard commits.
+ (Mark Miller, Senthuran Sivananthan)
+
Bug Fixes
----------------------
Modified: lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1441570&r1=1441569&r2=1441570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrConfig.java Fri Feb 1 18:25:23 2013
@@ -238,7 +238,8 @@ public class SolrConfig extends Config {
getBool("updateHandler/autoCommit/openSearcher",true),
getInt("updateHandler/commitIntervalLowerBound",-1),
getInt("updateHandler/autoSoftCommit/maxDocs",-1),
- getInt("updateHandler/autoSoftCommit/maxTime",-1));
+ getInt("updateHandler/autoSoftCommit/maxTime",-1),
+ getBool("updateHandler/commitWithin/softCommit",true));
}
private void loadPluginInfo(Class clazz, String tag, boolean requireName, boolean requireClass) {
@@ -402,6 +403,7 @@ public class SolrConfig extends Config {
public final int autoCommmitMaxDocs,autoCommmitMaxTime,commitIntervalLowerBound,
autoSoftCommmitMaxDocs,autoSoftCommmitMaxTime;
public final boolean openSearcher; // is opening a new searcher part of hard autocommit?
+ public final boolean commitWithinSoftCommit;
/**
* @param autoCommmitMaxDocs set -1 as default
@@ -409,7 +411,7 @@ public class SolrConfig extends Config {
* @param commitIntervalLowerBound set -1 as default
*/
public UpdateHandlerInfo(String className, int autoCommmitMaxDocs, int autoCommmitMaxTime, boolean openSearcher, int commitIntervalLowerBound,
- int autoSoftCommmitMaxDocs, int autoSoftCommmitMaxTime) {
+ int autoSoftCommmitMaxDocs, int autoSoftCommmitMaxTime, boolean commitWithinSoftCommit) {
this.className = className;
this.autoCommmitMaxDocs = autoCommmitMaxDocs;
this.autoCommmitMaxTime = autoCommmitMaxTime;
@@ -418,6 +420,8 @@ public class SolrConfig extends Config {
this.autoSoftCommmitMaxDocs = autoSoftCommmitMaxDocs;
this.autoSoftCommmitMaxTime = autoSoftCommmitMaxTime;
+
+ this.commitWithinSoftCommit = commitWithinSoftCommit;
}
}
Modified: lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1441570&r1=1441569&r2=1441570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Fri Feb 1 18:25:23 2013
@@ -91,6 +91,8 @@ public class DirectUpdateHandler2 extend
// tracks when auto-commit should occur
protected final CommitTracker commitTracker;
protected final CommitTracker softCommitTracker;
+
+ protected boolean commitWithinSoftCommit;
public DirectUpdateHandler2(SolrCore core) {
super(core);
@@ -106,6 +108,8 @@ public class DirectUpdateHandler2 extend
int softCommitDocsUpperBound = updateHandlerInfo.autoSoftCommmitMaxDocs; // getInt("updateHandler/autoSoftCommit/maxDocs", -1);
int softCommitTimeUpperBound = updateHandlerInfo.autoSoftCommmitMaxTime; // getInt("updateHandler/autoSoftCommit/maxTime", -1);
softCommitTracker = new CommitTracker("Soft", core, softCommitDocsUpperBound, softCommitTimeUpperBound, true, true);
+
+ commitWithinSoftCommit = updateHandlerInfo.commitWithinSoftCommit;
}
public DirectUpdateHandler2(SolrCore core, UpdateHandler updateHandler) {
@@ -126,6 +130,8 @@ public class DirectUpdateHandler2 extend
if (this.ulog != null) {
this.ulog.init(this, core);
}
+
+ commitWithinSoftCommit = updateHandlerInfo.commitWithinSoftCommit;
}
private void deleteAll() throws IOException {
@@ -229,8 +235,13 @@ public class DirectUpdateHandler2 extend
}
if ((cmd.getFlags() & UpdateCommand.IGNORE_AUTOCOMMIT) == 0) {
- commitTracker.addedDocument(-1);
- softCommitTracker.addedDocument(cmd.commitWithin);
+ if (commitWithinSoftCommit) {
+ commitTracker.addedDocument(-1);
+ softCommitTracker.addedDocument(cmd.commitWithin);
+ } else {
+ softCommitTracker.addedDocument(-1);
+ commitTracker.addedDocument(cmd.commitWithin);
+ }
}
rc = 1;
@@ -252,7 +263,11 @@ public class DirectUpdateHandler2 extend
private void updateDeleteTrackers(DeleteUpdateCommand cmd) {
if ((cmd.getFlags() & UpdateCommand.IGNORE_AUTOCOMMIT) == 0) {
- softCommitTracker.deletedDocument(cmd.commitWithin);
+ if (commitWithinSoftCommit) {
+ softCommitTracker.deletedDocument(cmd.commitWithin);
+ } else {
+ commitTracker.deletedDocument(cmd.commitWithin);
+ }
if (commitTracker.getTimeUpperBound() > 0) {
commitTracker.scheduleCommitWithin(commitTracker.getTimeUpperBound());
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1441570&r1=1441569&r2=1441570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Fri Feb 1 18:25:23 2013
@@ -97,6 +97,10 @@
<updateLog enable="${enable.update.log:false}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
+
+ <commitWithin>
+ <softCommit>${solr.commitwithin.softcommit:true}</softCommit>
+ </commitWithin>
</updateHandler>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java?rev=1441570&r1=1441569&r2=1441570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java Fri Feb 1 18:25:23 2013
@@ -286,7 +286,7 @@ public class AutoCommitTest extends Abst
MapSolrParams params = new MapSolrParams( new HashMap<String, String>() );
- // Add a single document with commitWithin == 1 second
+ // Add a single document with commitWithin == 2 second
SolrQueryResponse rsp = new SolrQueryResponse();
SolrQueryRequestBase req = new SolrQueryRequestBase( core, params ) {};
req.setContentStreams( toContentStreams(