You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/12/04 19:11:08 UTC
svn commit: r1417077 - in
/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index:
AtomicReader.java SegmentCoreReaders.java
Author: mikemccand
Date: Tue Dec 4 18:11:08 2012
New Revision: 1417077
URL: http://svn.apache.org/viewvc?rev=1417077&view=rev
Log:
fix some nocommits
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java?rev=1417077&r1=1417076&r2=1417077&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java Tue Dec 4 18:11:08 2012
@@ -163,22 +163,22 @@ public abstract class AtomicReader exten
*/
public abstract DocValues docValues(String field) throws IOException;
- // nocommit document that these are thread-private:
/** Returns {@link NumericDocValues} for this field, or
* null if no {@link NumericDocValues} were indexed for
- * this field. */
+ * this field. The returned instance should only be
+ * used by a single thread. */
public abstract NumericDocValues getNumericDocValues(String field) throws IOException;
- // nocommit document that these are thread-private:
/** Returns {@link BinaryDocValues} for this field, or
* null if no {@link BinaryDocValues} were indexed for
- * this field. */
+ * this field. The returned instance should only be
+ * used by a single thread. */
public abstract BinaryDocValues getBinaryDocValues(String field) throws IOException;
- // nocommit document that these are thread-private:
/** Returns {@link SortedDocValues} for this field, or
* null if no {@link SortedDocValues} were indexed for
- * this field. */
+ * this field. The returned instance should only be
+ * used by a single thread. */
public abstract SortedDocValues getSortedDocValues(String field) throws IOException;
/**
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java?rev=1417077&r1=1417076&r2=1417077&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java Tue Dec 4 18:11:08 2012
@@ -65,8 +65,9 @@ final class SegmentCoreReaders {
final TermVectorsReader termVectorsReaderOrig;
final CompoundFileDirectory cfsReader;
- // nocommit we should make a single thread local w/ a
- // class holding these N things...?
+ // TODO: make a single thread local w/ a
+ // Thingy class holding fieldsReader, termVectorsReader,
+ // simpleNormsProducer, simpleDVProducer
final CloseableThreadLocal<StoredFieldsReader> fieldsReaderLocal = new CloseableThreadLocal<StoredFieldsReader>() {
@Override
@@ -82,8 +83,6 @@ final class SegmentCoreReaders {
}
};
- // nocommit not great to hold onto lots-o-ram in a thread
- // local...? do we need a "needsClone"/"isThreadSafe"!?
final CloseableThreadLocal<SimpleDVProducer> simpleDocValuesLocal = new CloseableThreadLocal<SimpleDVProducer>() {
@Override
protected SimpleDVProducer initialValue() {
@@ -92,8 +91,6 @@ final class SegmentCoreReaders {
}
};
- // nocommit not great to hold onto lots-o-ram in a thread
- // local...? do we need a "needsClone"/"isThreadSafe"!?
final CloseableThreadLocal<SimpleDVProducer> simpleNormsLocal = new CloseableThreadLocal<SimpleDVProducer>() {
@Override
protected SimpleDVProducer initialValue() {