svn commit: r1087687 - in /lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index: DocumentsWriter.java DocumentsWriterPerThreadPool.java

[si...@apache.org]

Author: simonw
Date: Fri Apr  1 12:42:07 2011
New Revision: 1087687

URL: http://svn.apache.org/viewvc?rev=1087687&view=rev
Log:
do not clear threadbindings when DWPT is swapped out for flushing

Modified:
    lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java

Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=1087687&r1=1087686&r2=1087687&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java Fri Apr  1 12:42:07 2011
@@ -119,6 +119,8 @@ final class DocumentsWriter {
   final BufferedDeletesStream bufferedDeletesStream;
   // TODO: cutover to BytesRefHash
   private final BufferedDeletes pendingDeletes = new BufferedDeletes(false);
+  private Collection<String> abortedFiles;               // List of files that were written before last abort()
+
   final IndexingChain chain;
 
   final DocumentsWriterPerThreadPool perThreadPool;
@@ -214,7 +216,7 @@ final class DocumentsWriter {
       pendingDeletes.addTerm(term, BufferedDeletes.MAX_INT);
     }
 
-    Iterator<ThreadState> threadsIterator = perThreadPool.getActivePerThreadsIterator();
+    final Iterator<ThreadState> threadsIterator = perThreadPool.getActivePerThreadsIterator();
 
     while (threadsIterator.hasNext()) {
       ThreadState state = threadsIterator.next();
@@ -239,19 +241,16 @@ final class DocumentsWriter {
     indexWriter.flushCount.incrementAndGet();
   }
 
-  /** If non-null, various details of indexing are printed
-   *  here. */
   synchronized void setInfoStream(PrintStream infoStream) {
     this.infoStream = infoStream;
     pushConfigChange();
   }
 
   private final void pushConfigChange() {
-    Iterator<ThreadState> it = perThreadPool.getAllPerThreadsIterator();
+    final Iterator<ThreadState> it = perThreadPool.getAllPerThreadsIterator();
     while (it.hasNext()) {
       DocumentsWriterPerThread perThread = it.next().perThread;
       perThread.docState.infoStream = this.infoStream;
-      perThread.docState.similarityProvider = this.similarityProvider;
     }
   }
 
@@ -259,7 +258,6 @@ final class DocumentsWriter {
   int getNumDocs() {
     return numDocsInRAM.get();
   }
-  private Collection<String> abortedFiles;               // List of files that were written before last abort()
 
   Collection<String> abortedFiles() {
     return abortedFiles;

Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java?rev=1087687&r1=1087686&r2=1087687&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java Fri Apr  1 12:42:07 2011
@@ -132,7 +132,6 @@ public abstract class DocumentsWriterPer
     } else {
       threadState.resetWriter(null);
     }
-    clearThreadBindings(threadState); // TODO - do we need to clear ThreadBindings here  since we swap DWPT this is not necessary
     return dwpt;
   }