svn commit: r745831 - in /lucene/solr/trunk/contrib/dataimporthandler: ./ src/main/java/org/apache/solr/handler/dataimport/

[shalin]

Author: shalin
Date: Thu Feb 19 11:59:54 2009
New Revision: 745831

URL: http://svn.apache.org/viewvc?rev=745831&view=rev
Log:
SOLR-1024 -- Calling abort on DataImportHandler import commits data instead of 
calling rollback

Modified:
    lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
    
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
    
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
    
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java

Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=745831&r1=745830&r2=745831&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Thu Feb 19 11:59:54 
2009
@@ -138,6 +138,9 @@
               of SimpleDateFormat by multiple threads.
               (Ryuuichi Kumai via shalin)
 
+18.SOLR-1024: Calling abort on DataImportHandler import commits data instead 
of calling rollback.
+              (shalin)
+
 Documentation
 ----------------------
 

Modified: 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=745831&r1=745830&r2=745831&view=diff
==============================================================================
--- 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
 (original)
+++ 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
 Thu Feb 19 11:59:54 2009
@@ -260,11 +260,6 @@
               debugDocuments = new ArrayList<SolrInputDocument>();
             debugDocuments.add(document);
           }
-          if (importer.getDocBuilder().importStatistics.docCount.get() >= 
requestParams.rows) {
-            // Abort this operation now
-            importer.getDocBuilder().abort();
-            LOG.info("Indexing stopped at docCount = " + 
importer.getDocBuilder().importStatistics.docCount);
-          }
           return super.upload(document);
         } catch (RuntimeException e) {
           LOG.error( "Exception while adding: " + document, e);

Modified: 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=745831&r1=745830&r2=745831&view=diff
==============================================================================
--- 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
 (original)
+++ 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
 Thu Feb 19 11:59:54 2009
@@ -462,7 +462,7 @@
 
     public int start = 0;
 
-    public int rows = Integer.MAX_VALUE;
+    public long rows = Integer.MAX_VALUE;
 
     public boolean clean = true;
 

Modified: 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=745831&r1=745830&r2=745831&view=diff
==============================================================================
--- 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
 (original)
+++ 
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
 Thu Feb 19 11:59:54 2009
@@ -161,17 +161,9 @@
     }
 
     if (stop.get()) {
-      if (DataImporter.ABORT_CMD.equals(requestParameters.command)) {
-        // Dont commit if aborted using command=abort
-        statusMessages.put("Aborted", 
DataImporter.DATE_TIME_FORMAT.get().format(new Date()));
-        rollback();
-      } else if (requestParameters.commit) {
-        // Debug mode, commit if commit=true was specified
-        commit();
-        if (document.onImportEnd != null) {
-          invokeEventListener(document.onImportEnd);
-        }
-      }
+      // Dont commit if aborted using command=abort
+      statusMessages.put("Aborted", 
DataImporter.DATE_TIME_FORMAT.get().format(new Date()));
+      rollback();
     } else {
       // Do not commit unnecessarily if this is a delta-import and no 
documents were created or deleted
       if (!requestParameters.clean) {
@@ -344,6 +336,10 @@
           if (entity.isDocRoot) {
             if (seenDocCount <= requestParameters.start)
               continue;
+            if (seenDocCount > requestParameters.start + 
requestParameters.rows)  {
+              LOG.info("Indexing stopped at docCount = " + 
importStatistics.docCount);
+              break;
+            }
           }
 
           if (verboseDebug) {