You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/30 23:31:51 UTC
svn commit: r1238050 - in /lucene/dev/branches/lucene2858:
lucene/src/java/org/apache/lucene/index/
lucene/src/java/org/apache/lucene/search/
lucene/src/test-framework/java/org/apache/lucene/search/
lucene/src/test/org/apache/lucene/index/ modules/grou...
Author: uschindler
Date: Mon Jan 30 22:31:51 2012
New Revision: 1238050
URL: http://svn.apache.org/viewvc?rev=1238050&view=rev
Log:
LUCENE-2858: fix remaining nocommits
Modified:
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java?rev=1238050&r1=1238049&r2=1238050&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java Mon Jan 30 22:31:51 2012
@@ -160,7 +160,7 @@ public final class SlowCompositeReaderWr
@Override
protected void doClose() throws IOException {
- // nocommit: as this is a wrapper, should we really close the delegate?
+ // TODO: as this is a wrapper, should we really close the delegate?
in.close();
}
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java?rev=1238050&r1=1238049&r2=1238050&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java Mon Jan 30 22:31:51 2012
@@ -109,7 +109,6 @@ public class SearcherLifetimeManager imp
public SearcherTracker(IndexSearcher searcher) {
this.searcher = searcher;
- // nocommit: what happens if this is no DirectoryReader?
version = ((DirectoryReader) searcher.getIndexReader()).getVersion();
searcher.getIndexReader().incRef();
// Use nanoTime not currentTimeMillis since it [in
@@ -169,7 +168,6 @@ public class SearcherLifetimeManager imp
// TODO: we don't have to use IR.getVersion to track;
// could be risky (if it's buggy); we could get better
// bug isolation if we assign our own private ID:
- // nocommit: fix getVersion() usage for atomic readers
final long version = ((DirectoryReader) searcher.getIndexReader()).getVersion();
SearcherTracker tracker = searchers.get(version);
if (tracker == null) {
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java?rev=1238050&r1=1238049&r2=1238050&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java Mon Jan 30 22:31:51 2012
@@ -116,8 +116,7 @@ public class CheckHits {
Assert.assertEquals("Wrap Reader " + i + ": " +
query.toString(defaultFieldName),
correct, actual);
- // nocommit: I removed that as we can never get insanity by composite readers anymore... Is this ok?
- //FieldCache.DEFAULT.purge(s.getIndexReader()); // our wrapping can create insanity otherwise
+ // TODO: FieldCache.DEFAULT.purge(s.getIndexReader()); // our wrapping can create insanity otherwise
}
}
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java?rev=1238050&r1=1238049&r2=1238050&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java Mon Jan 30 22:31:51 2012
@@ -116,13 +116,13 @@ public class QueryUtils {
if (wrap) {
IndexSearcher wrapped;
check(random, q1, wrapped = wrapUnderlyingReader(random, s, -1), false);
- // nocommit: I removed that as we can never get insanity by composite readers anymore... Is this ok?
+ // TODO: I removed that as we can never get insanity by composite readers anymore... Is this ok?
//FieldCache.DEFAULT.purge(wrapped.getIndexReader()); // our wrapping can create insanity otherwise
check(random, q1, wrapped = wrapUnderlyingReader(random, s, 0), false);
- // nocommit: I removed that as we can never get insanity by composite readers anymore... Is this ok?
+ // TODO: I removed that as we can never get insanity by composite readers anymore... Is this ok?
//FieldCache.DEFAULT.purge(wrapped.getIndexReader()); // our wrapping can create insanity otherwise
check(random, q1, wrapped = wrapUnderlyingReader(random, s, +1), false);
- // nocommit: I removed that as we can never get insanity by composite readers anymore... Is this ok?
+ // TODO: I removed that as we can never get insanity by composite readers anymore... Is this ok?
//FieldCache.DEFAULT.purge(wrapped.getIndexReader()); // our wrapping can create insanity otherwise
}
checkExplanations(q1,s);
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1238050&r1=1238049&r2=1238050&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java Mon Jan 30 22:31:51 2012
@@ -86,7 +86,7 @@ public class TestDirectoryReader extends
assertTrue(DocHelper.numFields(newDoc2) == DocHelper.numFields(doc2) - DocHelper.unstored.size());
Terms vector = reader.getTermVectors(0).terms(DocHelper.TEXT_FIELD_2_KEY);
assertNotNull(vector);
- // nocommit: pretty sure this check makes zero sense TestSegmentReader.checkNorms(reader);
+ // TODO: pretty sure this check makes zero sense TestSegmentReader.checkNorms(reader);
reader.close();
}
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java?rev=1238050&r1=1238049&r2=1238050&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java Mon Jan 30 22:31:51 2012
@@ -366,7 +366,7 @@ public class AllGroupHeadsCollectorTest
}
}
} finally {
- // nocommit FieldCache.DEFAULT.purge(r);
+ // TODO: FieldCache.DEFAULT.purge(r);
}
r.close();
Modified: lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1238050&r1=1238049&r2=1238050&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Mon Jan 30 22:31:51 2012
@@ -1140,9 +1140,9 @@ public class TestGrouping extends Lucene
assertEquals(docIDToIDBlocks, expectedGroups, topGroupsBlockShards, false, false, fillFields, getScores, false);
}
} finally {
- // nocommit FieldCache.DEFAULT.purge(r);
+ // TODO: FieldCache.DEFAULT.purge(r);
if (rBlocks != null) {
- // nocommit FieldCache.DEFAULT.purge(rBlocks);
+ // TODO: FieldCache.DEFAULT.purge(rBlocks);
}
}