svn commit: r906186 - in /lucene/solr/branches/cloud: ./ contrib/dataimporthandler/ contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ example/solr/conf/ src/solrj/org/apache/solr/client/solrj/impl/

[ma...@apache.org]

Author: markrmiller
Date: Wed Feb  3 19:16:59 2010
New Revision: 906186

URL: http://svn.apache.org/viewvc?rev=906186&view=rev
Log:
merge up to r906068

Added:
    lucene/solr/branches/cloud/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
      - copied unchanged from r906068, lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
Modified:
    lucene/solr/branches/cloud/   (props changed)
    lucene/solr/branches/cloud/CHANGES.txt
    lucene/solr/branches/cloud/contrib/dataimporthandler/CHANGES.txt
    lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml
    lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java

Propchange: lucene/solr/branches/cloud/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  3 19:16:59 2010
@@ -1 +1 @@
-/lucene/solr/trunk:888480-902484
+/lucene/solr/trunk:888480-906068

Modified: lucene/solr/branches/cloud/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/CHANGES.txt?rev=906186&r1=906185&r2=906186&view=diff
==============================================================================
--- lucene/solr/branches/cloud/CHANGES.txt (original)
+++ lucene/solr/branches/cloud/CHANGES.txt Wed Feb  3 19:16:59 2010
@@ -162,9 +162,19 @@
 * SOLR-1667: PatternTokenizer does not reset attributes such as positionIncrementGap
   (Robert Muir via shalin)
 
+* SOLR-1711: SolrJ - StreamingUpdateSolrServer had a race condition that
+  could halt the streaming of documents. (Attila Babo via yonik)
+
 Other Changes
 ----------------------
 
+* SOLR-1516: Addition of an abstract BaseResponseWriter class to simplify the
+  development of QueryResponseWriter implementations.
+  (Chris A. Mattmann via noble)
+
+* SOLR-1592: Refactor XMLWriter startTag to allow arbitrary attributes to be written
+  (Chris A. Mattmann via noble)
+
 * SOLR-1561: Added Lucene 2.9.1 spatial contrib jar to lib. (gsingers)
 
 * SOLR-1570: Log warnings if uniqueKey is multi-valued or not stored (hossman, shalin) 

Modified: lucene/solr/branches/cloud/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/contrib/dataimporthandler/CHANGES.txt?rev=906186&r1=906185&r2=906186&view=diff
==============================================================================
--- lucene/solr/branches/cloud/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/branches/cloud/contrib/dataimporthandler/CHANGES.txt Wed Feb  3 19:16:59 2010
@@ -39,6 +39,8 @@
 
 * SOLR-1721 : Add explicit option to run DataImportHandler in synchronous mode (Alexey Serba via noble)
 
+* SOLR-1737 : Added FieldStreamDataSource (noble)
+
 Optimizations
 ----------------------
 

Modified: lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml?rev=906186&r1=906185&r2=906186&view=diff
==============================================================================
--- lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml Wed Feb  3 19:16:59 2010
@@ -131,11 +131,15 @@
                or when there is no possibility of another process trying
                to modify the index.
       native = NativeFSLockFactory  - uses OS native file locking.
-               Do not use with multiple solr webapps in the same JVM.
+               Do not use when multiple solr webapps in the same JVM are
+               attempting to share a single index.
       simple = SimpleFSLockFactory  - uses a plain file for locking
 
       (For backwards compatibility with Solr 1.2, 'simple' is the default
        if not specified.)
+
+      More details on the nuances of each LockFactory...
+      http://wiki.apache.org/lucene-java/AvailableLockFactories
     -->
     <lockType>native</lockType>
     <!--

Modified: lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java?rev=906186&r1=906185&r2=906186&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java (original)
+++ lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java Wed Feb  3 19:16:59 2010
@@ -99,6 +99,7 @@
       log.info( "starting runner: {}" , this );
       PostMethod method = null;
       try {
+        do {
         RequestEntity request = new RequestEntity() {
           // we don't know the length
           public long getContentLength() { return -1; }
@@ -159,6 +160,7 @@
           msg.append( "request: "+method.getURI() );
           handleError( new Exception( msg.toString() ) );
         }
+        }  while( ! queue.isEmpty());
       }
       catch (Throwable e) {
         handleError( e );
@@ -166,6 +168,7 @@
       finally {
         try {
           // make sure to release the connection
+          if(method != null)
           method.releaseConnection();
         }
         catch( Exception ex ){}
@@ -212,11 +215,11 @@
 
       queue.put( req );
       
+        synchronized( runners ) {
       if( runners.isEmpty() 
         || (queue.remainingCapacity() < queue.size() 
          && runners.size() < threadCount) ) 
       {
-        synchronized( runners ) {
           Runner r = new Runner();
           scheduler.execute( r );
           runners.add( r );