You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2011/02/21 10:59:07 UTC

svn commit: r1072915 - in /uima/sandbox/trunk/Solrcas: desc/SolrcasAE.xml src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java src/test/resources/TestSolrcasAE.xml

Author: tommaso
Date: Mon Feb 21 09:59:06 2011
New Revision: 1072915

URL: http://svn.apache.org/viewvc?rev=1072915&view=rev
Log:
[UIMA-2061] - introduced autoCommit parameter (default to false)

Modified:
    uima/sandbox/trunk/Solrcas/desc/SolrcasAE.xml
    uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
    uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml

Modified: uima/sandbox/trunk/Solrcas/desc/SolrcasAE.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/desc/SolrcasAE.xml?rev=1072915&r1=1072914&r2=1072915&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/desc/SolrcasAE.xml (original)
+++ uima/sandbox/trunk/Solrcas/desc/SolrcasAE.xml Mon Feb 21 09:59:06 2011
@@ -51,6 +51,13 @@
         <multiValued>false</multiValued>
         <mandatory>true</mandatory>
       </configurationParameter>
+      <configurationParameter>
+        <name>autoCommit</name>
+        <description>true if Solr autocommit is enabled</description>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
     </configurationParameters>
     <configurationParameterSettings>
       <nameValuePair>
@@ -71,6 +78,12 @@
           <string>http://localhost:8983/solr</string>
         </value>
       </nameValuePair>
+      <nameValuePair>
+        <name>autoCommit</name>
+        <value>
+          <string>false</string>
+        </value>
+      </nameValuePair>
     </configurationParameterSettings>
     <typeSystemDescription/>
     <typePriorities/>

Modified: uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java?rev=1072915&r1=1072914&r2=1072915&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java (original)
+++ uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java Mon Feb 21 09:59:06 2011
@@ -43,6 +43,8 @@ public class SolrCASConsumer extends Cas
 
   private SolrMappingConfiguration mappingConfig;
 
+  private boolean autoCommit;
+
   @Override
   public void initialize(UimaContext context) throws ResourceInitializationException {
     super.initialize(context);
@@ -55,6 +57,13 @@ public class SolrCASConsumer extends Cas
       String mappingFileParam = String.valueOf(context.getConfigParameterValue("mappingFile"));
       this.mappingConfig = fieldMappingReader.getConf(mappingFileParam);
 
+      /* set Solr autoCommit parameter */
+      Object autoCommitParam = context.getConfigParameterValue("autoCommit");
+      if (autoCommitParam != null && autoCommitParam.toString().length() > 0)
+        this.autoCommit = Boolean.valueOf(autoCommitParam.toString());
+      else
+        this.autoCommit = false; // default to false
+
     } catch (Exception e) {
       context.getLogger().log(Level.SEVERE, e.toString());
       throw new ResourceInitializationException(e);
@@ -116,7 +125,8 @@ public class SolrCASConsumer extends Cas
 
     try {
       solrServer.add(document);
-      solrServer.commit();
+      if (!autoCommit)
+        solrServer.commit();
     } catch (Exception e) {
       throw new AnalysisEngineProcessException(e);
     }

Modified: uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml?rev=1072915&r1=1072914&r2=1072915&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml (original)
+++ uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml Mon Feb 21 09:59:06 2011
@@ -51,6 +51,13 @@
         <multiValued>false</multiValued>
         <mandatory>true</mandatory>
       </configurationParameter>
+      <configurationParameter>
+        <name>autoCommit</name>
+        <description>true if Solr autocommit is enabled</description>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
     </configurationParameters>
     <configurationParameterSettings>
       <nameValuePair>
@@ -71,6 +78,12 @@
           <string>classpath:/org/apache/uima/solrcas/</string>
         </value>
       </nameValuePair>
+      <nameValuePair>
+        <name>autoCommit</name>
+        <value>
+          <string>false</string>
+        </value>
+      </nameValuePair>
     </configurationParameterSettings>
     <typeSystemDescription/>
     <typePriorities/>