You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/10/28 18:55:20 UTC
svn commit: r1190448 - in
/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index:
DocumentsWriterPerThreadPool.java FieldInfos.java IndexWriter.java
Author: rmuir
Date: Fri Oct 28 16:55:20 2011
New Revision: 1190448
URL: http://svn.apache.org/viewvc?rev=1190448&view=rev
Log:
LUCENE-3490: remove this sugar, hopefully coming from codec in the future...
Modified:
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java?rev=1190448&r1=1190447&r2=1190448&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java Fri Oct 28 16:55:20 2011
@@ -147,7 +147,7 @@ public abstract class DocumentsWriterPer
this.documentsWriter.set(documentsWriter); // thread pool is bound to DW
this.globalFieldMap = globalFieldMap;
for (int i = 0; i < perThreads.length; i++) {
- final FieldInfos infos = globalFieldMap.newFieldInfos();
+ final FieldInfos infos = new FieldInfos(globalFieldMap);
perThreads[i] = new ThreadState(new DocumentsWriterPerThread(documentsWriter.directory, documentsWriter, infos, documentsWriter.chain));
}
}
@@ -235,7 +235,7 @@ public abstract class DocumentsWriterPer
assert threadState.isHeldByCurrentThread();
final DocumentsWriterPerThread dwpt = threadState.perThread;
if (!closed) {
- final FieldInfos infos = globalFieldMap.newFieldInfos();
+ final FieldInfos infos = new FieldInfos(globalFieldMap);
final DocumentsWriterPerThread newDwpt = new DocumentsWriterPerThread(dwpt, infos);
newDwpt.initialize();
threadState.resetWriter(newDwpt);
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java?rev=1190448&r1=1190447&r2=1190448&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java Fri Oct 28 16:55:20 2011
@@ -143,17 +143,6 @@ public final class FieldInfos implements
}
/**
- * Returns a new {@link FieldInfos} instance with this as the global field
- * map
- *
- * @return a new {@link FieldInfos} instance with this as the global field
- * map
- */
- public FieldInfos newFieldInfos() {
- return new FieldInfos(this);
- }
-
- /**
* Returns <code>true</code> iff the last committed version differs from the
* current version, otherwise <code>false</code>
*
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1190448&r1=1190447&r2=1190448&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java Fri Oct 28 16:55:20 2011
@@ -2566,7 +2566,7 @@ public class IndexWriter implements Clos
// abortable so that IW.close(false) is able to stop it
SegmentMerger merger = new SegmentMerger(directory, config.getTermIndexInterval(),
mergedName, null, payloadProcessorProvider,
- globalFieldNumberMap.newFieldInfos(), codecs, context);
+ new FieldInfos(globalFieldNumberMap), codecs, context);
for (IndexReader reader : readers) // add new indexes
merger.add(reader);
@@ -3458,7 +3458,7 @@ public class IndexWriter implements Clos
// Bind a new segment name here so even with
// ConcurrentMergePolicy we keep deterministic segment
// names.
- merge.info = new SegmentInfo(newSegmentName(), 0, directory, false, null, globalFieldNumberMap.newFieldInfos());
+ merge.info = new SegmentInfo(newSegmentName(), 0, directory, false, null, new FieldInfos(globalFieldNumberMap));
// Lock order: IW -> BD
final BufferedDeletesStream.ApplyDeletesResult result = bufferedDeletesStream.applyDeletes(readerPool, merge.segments);