You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2006/03/31 23:25:23 UTC

svn commit: r390501 - in /incubator/solr/trunk: example/solr/conf/solrconfig.xml src/java/org/apache/solr/update/DirectUpdateHandler.java src/java/org/apache/solr/update/DirectUpdateHandler2.java src/java/org/apache/solr/update/UpdateHandler.java

Author: yonik
Date: Fri Mar 31 13:25:20 2006
New Revision: 390501

URL: http://svn.apache.org/viewcvs?rev=390501&view=rev
Log:
added postOptimize hooks, analogous to postCommit hooks but only called after an optimize command.  Useful for only distributing optimized indicies

Modified:
    incubator/solr/trunk/example/solr/conf/solrconfig.xml
    incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java
    incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java
    incubator/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java

Modified: incubator/solr/trunk/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/example/solr/conf/solrconfig.xml?rev=390501&r1=390500&r2=390501&view=diff
==============================================================================
--- incubator/solr/trunk/example/solr/conf/solrconfig.xml (original)
+++ incubator/solr/trunk/example/solr/conf/solrconfig.xml Fri Mar 31 13:25:20 2006
@@ -47,13 +47,21 @@
          args - the arguments to pass to the program.  default=nothing
          env - environment variables to set.  default=nothing
       -->
-    <!-- A postCommit event is fired after every commit
+    <!-- A postCommit event is fired after every commit or optimize command
     <listener event="postCommit" class="solr.RunExecutableListener">
       <str name="exe">snapshooter</str>
-      <str name="dir">bin</str>
+      <str name="dir">solr/bin</str>
       <bool name="wait">true</bool>
       <arr name="args"> <str>arg1</str> <str>arg2</str> </arr>
       <arr name="env"> <str>MYVAR=val1</str> </arr>
+    </listener>
+    -->
+    <!-- A postOptimize event is fired only after every optimize command, useful
+         in conjunction with index distribution to only distribute optimized indicies 
+    <listener event="postOptimize" class="solr.RunExecutableListener">
+      <str name="exe">snapshooter</str>
+      <str name="dir">solr/bin</str>
+      <bool name="wait">true</bool>
     </listener>
     -->
 

Modified: incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java?rev=390501&r1=390500&r2=390501&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java Fri Mar 31 13:25:20 2006
@@ -238,6 +238,9 @@
       closeWriter();
 
       callPostCommitCallbacks();
+      if (cmd.optimize) {
+        callPostOptimizeCallbacks();
+      }
 
       core.getSearcher(true,false,waitSearcher);
     }

Modified: incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=390501&r1=390500&r2=390501&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java Fri Mar 31 13:25:20 2006
@@ -463,7 +463,9 @@
         closeWriter();
 
         callPostCommitCallbacks();
-
+        if (cmd.optimize) {
+          callPostOptimizeCallbacks();
+        }
         // open a new searcher in the sync block to avoid opening it
         // after a deleteByQuery changed the index, or in between deletes
         // and adds of another commit being done.

Modified: incubator/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java?rev=390501&r1=390500&r2=390501&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java Fri Mar 31 13:25:20 2006
@@ -55,6 +55,7 @@
   protected final FieldType idFieldType;
 
   protected Vector<SolrEventListener> commitCallbacks = new Vector<SolrEventListener>();
+  protected Vector<SolrEventListener> optimizeCallbacks = new Vector<SolrEventListener>();
 
   private void parseEventListeners() {
     NodeList nodes = (NodeList) SolrConfig.config.evaluate("updateHandler/listener[@event=\"postCommit\"]", XPathConstants.NODESET);
@@ -73,10 +74,31 @@
         }
       }
     }
+    nodes = (NodeList)SolrConfig.config.evaluate("updateHandler/listener[@event=\"postOptimize\"]", XPathConstants.NODESET);
+    if (nodes!=null) {
+      for (int i=0; i<nodes.getLength(); i++) {
+        Node node = nodes.item(i);
+        try {
+          String className = DOMUtil.getAttr(node,"class");
+          SolrEventListener listener = (SolrEventListener)Config.newInstance(className);
+          listener.init(DOMUtil.childNodesToNamedList(node));
+          optimizeCallbacks.add(listener);
+          log.info("added SolarEventListener for postOptimize: " + listener);
+        } catch (Exception e) {
+          throw new SolrException(1,"error parsing event listeners", e, false);
+        }
+      }
+    }
   }
 
   protected void callPostCommitCallbacks() {
     for (SolrEventListener listener : commitCallbacks) {
+      listener.postCommit();
+    }
+  }
+
+  protected void callPostOptimizeCallbacks() {
+    for (SolrEventListener listener : optimizeCallbacks) {
       listener.postCommit();
     }
   }