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/03/18 06:27:15 UTC
svn commit: r1457646 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/SolrCore.java
core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
core/src/java/org/apache/solr/update/UpdateHandler.java
Author: markrmiller
Date: Mon Mar 18 05:27:15 2013
New Revision: 1457646
URL: http://svn.apache.org/r1457646
Log:
SOLR-4604: UpdateLog#init is over called on SolrCore#reload
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1457646&r1=1457645&r2=1457646&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Mar 18 05:27:15 2013
@@ -157,8 +157,7 @@ Bug Fixes
* SOLR-4601: A Collection that is only partially created and then deleted will
leave pre allocated shard information in ZooKeeper. (Mark Miller)
-* SOLR-4604: SolrCore is not using the UpdateHandler that is passed to it in
- SolrCore#reload. (Mark Miller)
+* SOLR-4604: UpdateLog#init is over called on SolrCore#reload. (Mark Miller)
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1457646&r1=1457645&r2=1457646&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Mon Mar 18 05:27:15 2013
@@ -804,7 +804,9 @@ public final class SolrCore implements S
this.updateHandler = createUpdateHandler(updateHandlerClass == null ? DirectUpdateHandler2.class
.getName() : updateHandlerClass);
} else {
- this.updateHandler = updateHandler;
+ this.updateHandler = createUpdateHandler(
+ updateHandlerClass == null ? DirectUpdateHandler2.class.getName()
+ : updateHandlerClass, updateHandler);
}
infoRegistry.put("updateHandler", this.updateHandler);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1457646&r1=1457645&r2=1457646&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Mon Mar 18 05:27:15 2013
@@ -110,7 +110,7 @@ public class DirectUpdateHandler2 extend
}
public DirectUpdateHandler2(SolrCore core, UpdateHandler updateHandler) {
- super(core);
+ super(core, updateHandler.getUpdateLog());
solrCoreState = core.getSolrCoreState();
UpdateHandlerInfo updateHandlerInfo = core.getSolrConfig()
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java?rev=1457646&r1=1457645&r2=1457646&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java Mon Mar 18 05:27:15 2013
@@ -122,6 +122,10 @@ public abstract class UpdateHandler impl
}
public UpdateHandler(SolrCore core) {
+ this(core, null);
+ }
+
+ public UpdateHandler(SolrCore core, UpdateLog updateLog) {
this.core=core;
schema = core.getSchema();
idField = schema.getUniqueKeyField();
@@ -131,7 +135,11 @@ public abstract class UpdateHandler impl
if (!core.isReloaded() && !core.getDirectoryFactory().isPersistent()) {
clearLog(ulogPluginInfo);
}
- initLog(ulogPluginInfo);
+ if (updateLog == null) {
+ initLog(ulogPluginInfo);
+ } else {
+ this.ulog = updateLog;
+ }
}
/**