You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/03/23 20:02:34 UTC
svn commit: r1304562 - in /incubator/lucene.net/trunk:
src/contrib/Analyzers/ src/contrib/Analyzers/Query/ src/contrib/Queries/
src/contrib/Queries/Similar/ src/contrib/Similarity/Similar/
src/core/Index/ test/contrib/Core/Util/Cache/ test/contrib/Spel...
Author: ccurrens
Date: Fri Mar 23 19:02:32 2012
New Revision: 1304562
URL: http://svn.apache.org/viewvc?rev=1304562&view=rev
Log:
Had accidentally changed IndexReader.NumDocs() to IndexReader.GetNumDocs(). This commit changes it back.
Modified:
incubator/lucene.net/trunk/src/contrib/Analyzers/Contrib.Analyzers.csproj
incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs
incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs
incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs
incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs
incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs
incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs
incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
incubator/lucene.net/trunk/src/core/Index/MultiReader.cs
incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs
incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs
incubator/lucene.net/trunk/test/contrib/Core/Util/Cache/SegmentCacheTest.cs
incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs
incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs
incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs
incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs
incubator/lucene.net/trunk/test/core/Index/TestConcurrentMergeScheduler.cs
incubator/lucene.net/trunk/test/core/Index/TestCrash.cs
incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs
incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs
incubator/lucene.net/trunk/test/core/Index/TestDoc.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexReaderClone.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexReaderReopen.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexWriterDelete.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs
incubator/lucene.net/trunk/test/core/Index/TestRollback.cs
incubator/lucene.net/trunk/test/core/Index/TestSegmentMerger.cs
incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs
incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs
incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs
incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs
incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs
incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs
incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs
incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs
incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs
incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs
incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs
Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Contrib.Analyzers.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Contrib.Analyzers.csproj?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Contrib.Analyzers.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Contrib.Analyzers.csproj Fri Mar 23 19:02:32 2012
@@ -100,7 +100,7 @@
<Compile Include="De\GermanAnalyzer.cs" />
<Compile Include="De\GermanStemFilter.cs" />
<Compile Include="De\GermanStemmer.cs" />
- <Compile Include="De\GermanStemmerDIN2.cs" />
+ <Compile Include="De\GermanDIN2Stemmer.cs" />
<Compile Include="El\GreekAnalyzer.cs" />
<Compile Include="El\GreekLowerCaseFilter.cs" />
<Compile Include="Fa\PersianAnalyzer.cs" />
Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs Fri Mar 23 19:02:32 2012
@@ -133,7 +133,7 @@ public class QueryAutoStopWordAnalyzer :
*/
public int AddStopWords(IndexReader reader, String fieldName, float maxPercentDocs)
{
- return AddStopWords(reader, fieldName, (int) (reader.GetNumDocs() * maxPercentDocs));
+ return AddStopWords(reader, fieldName, (int) (reader.NumDocs() * maxPercentDocs));
}
/**
Modified: incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs Fri Mar 23 19:02:32 2012
@@ -193,7 +193,7 @@ namespace Lucene.Net.Search
TokenStream ts = analyzer.TokenStream(f.fieldName, new System.IO.StringReader(f.queryString));
TermAttribute termAtt = ts.AddAttribute<TermAttribute>();
- int corpusNumDocs = reader.GetNumDocs();
+ int corpusNumDocs = reader.NumDocs();
Term internSavingTemplateTerm = new Term(f.fieldName); //optimization to avoid constructing new Term() objects
HashSet<string> processedTerms = new HashSet<string>();
while (ts.IncrementToken())
Modified: incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs Fri Mar 23 19:02:32 2012
@@ -403,7 +403,7 @@ namespace Lucene.Net.Search.Similar
/// </param>
public void SetMaxDocFreqPct(int maxPercentage)
{
- this.maxDocfreq = maxPercentage * ir.GetNumDocs() / 100;
+ this.maxDocfreq = maxPercentage * ir.NumDocs() / 100;
}
/// <summary> Returns whether to boost terms in query based on "score" or not. The default is
@@ -675,7 +675,7 @@ namespace Lucene.Net.Search.Similar
private PriorityQueue<object[]> CreateQueue(IDictionary<string,Int> words)
{
// have collected all words in doc and their freqs
- int numDocs = ir.GetNumDocs();
+ int numDocs = ir.NumDocs();
FreqQ res = new FreqQ(words.Count); // will order words by score
var it = words.Keys.GetEnumerator();
@@ -777,7 +777,7 @@ namespace Lucene.Net.Search.Similar
System.IO.StreamWriter o = temp_writer;
FSDirectory dir = FSDirectory.Open(new DirectoryInfo(indexName));
IndexReader r = IndexReader.Open(dir, true);
- o.WriteLine("Open index " + indexName + " which has " + r.GetNumDocs() + " docs");
+ o.WriteLine("Open index " + indexName + " which has " + r.NumDocs() + " docs");
MoreLikeThis mlt = new MoreLikeThis(r);
Modified: incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs Fri Mar 23 19:02:32 2012
@@ -611,7 +611,7 @@ namespace Similarity.Net
private PriorityQueue<object[]> CreateQueue(System.Collections.IDictionary words)
{
// have collected all words in doc and their freqs
- int numDocs = ir.GetNumDocs();
+ int numDocs = ir.NumDocs();
FreqQ res = new FreqQ(words.Count); // will order words by score
System.Collections.IEnumerator it = words.Keys.GetEnumerator();
@@ -706,7 +706,7 @@ namespace Similarity.Net
{AutoFlush = true};
var dir = FSDirectory.Open(new DirectoryInfo(indexName));
IndexReader r = IndexReader.Open(dir, true);
- o.WriteLine("Open index " + indexName + " which has " + r.GetNumDocs() + " docs");
+ o.WriteLine("Open index " + indexName + " which has " + r.NumDocs() + " docs");
MoreLikeThis mlt = new MoreLikeThis(r);
Modified: incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs Fri Mar 23 19:02:32 2012
@@ -510,7 +510,7 @@ namespace Lucene.Net.Index
segInfoStat.openReaderPassed = true;
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
toLoseDocCount = numDocs;
if (reader.HasDeletions)
{
@@ -781,7 +781,7 @@ namespace Lucene.Net.Index
}
// Validate docCount
- if (status.docCount != reader.GetNumDocs())
+ if (status.docCount != reader.NumDocs())
{
throw new System.SystemException("docCount=" + status.docCount + " but saw " + status.docCount + " undeleted docs");
}
Modified: incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs Fri Mar 23 19:02:32 2012
@@ -655,7 +655,7 @@ namespace Lucene.Net.Index
return segmentInfos.Count == 1 && !HasDeletions;
}
- public override int GetNumDocs()
+ public override int NumDocs()
{
// Don't call ensureOpen() here (it could affect performance)
// NOTE: multiple threads may wind up init'ing
@@ -665,7 +665,7 @@ namespace Lucene.Net.Index
// check cache
int n = 0; // cache miss--recompute
for (int i = 0; i < subReaders.Length; i++)
- n += subReaders[i].GetNumDocs(); // sum from readers
+ n += subReaders[i].NumDocs(); // sum from readers
numDocs = n;
}
return numDocs;
Modified: incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs Fri Mar 23 19:02:32 2012
@@ -207,10 +207,10 @@ namespace Lucene.Net.Index
in_Renamed.GetTermFreqVector(docNumber, mapper);
}
- public override int GetNumDocs()
+ public override int NumDocs()
{
// Don't call ensureOpen() here (it could affect performance)
- return in_Renamed.GetNumDocs();
+ return in_Renamed.NumDocs();
}
public override int MaxDoc
Modified: incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexReader.cs Fri Mar 23 19:02:32 2012
@@ -708,7 +708,7 @@ namespace Lucene.Net.Index
/// <summary>Returns the number of documents in this index. </summary>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
- public abstract int GetNumDocs();
+ public abstract int NumDocs();
/// <summary>Returns one greater than the largest possible document number.
/// This may be used to, e.g., determine how big to allocate an array which
@@ -719,7 +719,7 @@ namespace Lucene.Net.Index
/// <summary>Returns the number of deleted documents. </summary>
public virtual int NumDeletedDocs
{
- get { return MaxDoc - GetNumDocs(); }
+ get { return MaxDoc - NumDocs(); }
}
/// <summary> Returns the stored fields of the <c>n</c><sup>th</sup>
Modified: incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs Fri Mar 23 19:02:32 2012
@@ -5161,7 +5161,7 @@ namespace Lucene.Net.Index
currentDSSMerged |= currentDocStoreSegment.Equals(info.DocStoreSegment);
}
- totDocCount += clone.GetNumDocs();
+ totDocCount += clone.NumDocs();
}
if (infoStream != null)
Modified: incubator/lucene.net/trunk/src/core/Index/MultiReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/MultiReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/MultiReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/MultiReader.cs Fri Mar 23 19:02:32 2012
@@ -251,7 +251,7 @@ namespace Lucene.Net.Index
return false;
}
- public override int GetNumDocs()
+ public override int NumDocs()
{
// Don't call ensureOpen() here (it could affect performance)
// NOTE: multiple threads may wind up init'ing
@@ -261,7 +261,7 @@ namespace Lucene.Net.Index
// check cache
int n = 0; // cache miss--recompute
for (int i = 0; i < subReaders.Length; i++)
- n += subReaders[i].GetNumDocs(); // sum from readers
+ n += subReaders[i].NumDocs(); // sum from readers
numDocs = n;
}
return numDocs;
Modified: incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs Fri Mar 23 19:02:32 2012
@@ -98,15 +98,15 @@ namespace Lucene.Net.Index
if (readers.Count == 0)
{
this.maxDoc = reader.MaxDoc;
- this.numDocs = reader.GetNumDocs();
+ this.numDocs = reader.NumDocs();
this.hasDeletions = reader.HasDeletions;
}
if (reader.MaxDoc != maxDoc)
// check compatibility
throw new System.ArgumentException("All readers must have same maxDoc: " + maxDoc + "!=" + reader.MaxDoc);
- if (reader.GetNumDocs() != numDocs)
- throw new System.ArgumentException("All readers must have same numDocs: " + numDocs + "!=" + reader.GetNumDocs());
+ if (reader.NumDocs() != numDocs)
+ throw new System.ArgumentException("All readers must have same numDocs: " + numDocs + "!=" + reader.NumDocs());
ICollection<string> fields = reader.GetFieldNames(IndexReader.FieldOption.ALL);
readerToFields[reader] = fields;
@@ -254,7 +254,7 @@ namespace Lucene.Net.Index
}
- public override int GetNumDocs()
+ public override int NumDocs()
{
// Don't call ensureOpen() here (it could affect performance)
return numDocs;
Modified: incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs Fri Mar 23 19:02:32 2012
@@ -442,7 +442,7 @@ namespace Lucene.Net.Index
{
foreach(IndexReader reader in readers)
{
- docCount += reader.GetNumDocs();
+ docCount += reader.NumDocs();
}
}
@@ -714,12 +714,12 @@ namespace Lucene.Net.Index
delCounts = new int[readerCount];
}
docMaps[i] = docMap;
- delCounts[i] = smi.reader.MaxDoc - smi.reader.GetNumDocs();
+ delCounts[i] = smi.reader.MaxDoc - smi.reader.NumDocs();
}
- base_Renamed += reader.GetNumDocs();
+ base_Renamed += reader.NumDocs();
- System.Diagnostics.Debug.Assert(reader.GetNumDocs() == reader.MaxDoc - smi.delCount);
+ System.Diagnostics.Debug.Assert(reader.NumDocs() == reader.MaxDoc - smi.delCount);
if (smi.Next())
queue.Add(smi);
Modified: incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs Fri Mar 23 19:02:32 2012
@@ -1249,7 +1249,7 @@ namespace Lucene.Net.Index
return 0;
}
- public override int GetNumDocs()
+ public override int NumDocs()
{
// Don't call ensureOpen() here (it could affect performance)
int n = MaxDoc;
Modified: incubator/lucene.net/trunk/test/contrib/Core/Util/Cache/SegmentCacheTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Core/Util/Cache/SegmentCacheTest.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Core/Util/Cache/SegmentCacheTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Core/Util/Cache/SegmentCacheTest.cs Fri Mar 23 19:02:32 2012
@@ -116,7 +116,7 @@ namespace Lucene.Net.Test.Util.Cache
// add items to the existing index
this.AddItemsToIndex(this.directory);
IndexReader newReader = IndexReader.Open(this.directory, true);
- Assert.AreEqual(20, newReader.GetNumDocs());
+ Assert.AreEqual(20, newReader.NumDocs());
// test the cache, the old item from the class reader should still be there
t = MockCache.Instance.Get(newReader, "Cached");
Modified: incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs Fri Mar 23 19:02:32 2012
@@ -219,7 +219,7 @@ namespace SpellChecker.Net.Test.Search.S
private int Numdoc()
{
var rs = IndexReader.Open(spellindex);
- int num = rs.GetNumDocs();
+ int num = rs.NumDocs();
Assert.IsTrue(num != 0);
rs.Close();
Modified: incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs (original)
+++ incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs Fri Mar 23 19:02:32 2012
@@ -83,7 +83,7 @@ namespace Lucene.Net.Documents
/** delete the document from index */
reader.DeleteDocument(0);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
dir.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs Fri Mar 23 19:02:32 2012
@@ -389,7 +389,7 @@ namespace Lucene.Net.Index
{
reader.DeleteDocument(i);
}
- Assert.AreEqual(10, reader.GetNumDocs());
+ Assert.AreEqual(10, reader.NumDocs());
reader.Close();
IndexWriter writer = NewWriter(dir, false);
@@ -430,7 +430,7 @@ namespace Lucene.Net.Index
{
reader.DeleteDocument(i);
}
- Assert.AreEqual(3, reader.GetNumDocs());
+ Assert.AreEqual(3, reader.NumDocs());
reader.Close();
reader = IndexReader.Open(aux2, false);
@@ -438,7 +438,7 @@ namespace Lucene.Net.Index
{
reader.DeleteDocument(i);
}
- Assert.AreEqual(22, reader.GetNumDocs());
+ Assert.AreEqual(22, reader.NumDocs());
reader.Close();
writer = NewWriter(dir, false);
@@ -485,7 +485,7 @@ namespace Lucene.Net.Index
{
IndexReader reader = IndexReader.Open(dir, true);
Assert.AreEqual(numDocs, reader.MaxDoc);
- Assert.AreEqual(numDocs, reader.GetNumDocs());
+ Assert.AreEqual(numDocs, reader.NumDocs());
reader.Close();
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs Fri Mar 23 19:02:32 2012
@@ -149,7 +149,7 @@ namespace Lucene.Net.Index
public override void DoWork()
{
IndexReader r = IndexReader.Open(directory, true);
- Assert.AreEqual(100, r.GetNumDocs());
+ Assert.AreEqual(100, r.NumDocs());
r.Close();
}
}
@@ -182,7 +182,7 @@ namespace Lucene.Net.Index
writer.Commit();
IndexReader r = IndexReader.Open(directory, true);
- Assert.AreEqual(100, r.GetNumDocs());
+ Assert.AreEqual(100, r.NumDocs());
r.Close();
IndexerThread indexerThread = new IndexerThread(writer, threads);
Modified: incubator/lucene.net/trunk/test/core/Index/TestConcurrentMergeScheduler.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestConcurrentMergeScheduler.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestConcurrentMergeScheduler.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestConcurrentMergeScheduler.cs Fri Mar 23 19:02:32 2012
@@ -121,7 +121,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader reader = IndexReader.Open(directory, true);
- Assert.AreEqual(200+extraCount, reader.GetNumDocs());
+ Assert.AreEqual(200+extraCount, reader.NumDocs());
reader.Close();
directory.Close();
}
@@ -170,7 +170,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader reader = IndexReader.Open(directory, true);
// Verify that we did not lose any deletes...
- Assert.AreEqual(450, reader.GetNumDocs());
+ Assert.AreEqual(450, reader.NumDocs());
reader.Close();
directory.Close();
}
@@ -243,7 +243,7 @@ namespace Lucene.Net.Index
writer.Close(false);
IndexReader reader = IndexReader.Open(directory, true);
- Assert.AreEqual((1 + iter)*182, reader.GetNumDocs());
+ Assert.AreEqual((1 + iter)*182, reader.NumDocs());
reader.Close();
// Reopen
Modified: incubator/lucene.net/trunk/test/core/Index/TestCrash.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestCrash.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestCrash.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestCrash.cs Fri Mar 23 19:02:32 2012
@@ -72,7 +72,7 @@ namespace Lucene.Net.Index
MockRAMDirectory dir = (MockRAMDirectory) writer.Directory;
Crash(writer);
IndexReader reader = IndexReader.Open(dir, true);
- Assert.IsTrue(reader.GetNumDocs() < 157);
+ Assert.IsTrue(reader.NumDocs() < 157);
}
[Test]
@@ -86,7 +86,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader reader = IndexReader.Open(dir, false);
- Assert.IsTrue(reader.GetNumDocs() < 314);
+ Assert.IsTrue(reader.NumDocs() < 314);
}
[Test]
@@ -109,7 +109,7 @@ namespace Lucene.Net.Index
*/
IndexReader reader = IndexReader.Open(dir, false);
- Assert.IsTrue(reader.GetNumDocs() >= 157);
+ Assert.IsTrue(reader.NumDocs() >= 157);
}
[Test]
@@ -130,7 +130,7 @@ namespace Lucene.Net.Index
*/
IndexReader reader = IndexReader.Open(dir, false);
- Assert.AreEqual(157, reader.GetNumDocs());
+ Assert.AreEqual(157, reader.NumDocs());
}
[Test]
@@ -151,7 +151,7 @@ namespace Lucene.Net.Index
System.out.println("file " + i + " = " + l[i] + " " + dir.fileLength(l[i]) + " bytes");
*/
IndexReader reader = IndexReader.Open(dir, false);
- Assert.AreEqual(157, reader.GetNumDocs());
+ Assert.AreEqual(157, reader.NumDocs());
}
[Test]
@@ -174,7 +174,7 @@ namespace Lucene.Net.Index
System.out.println("file " + i + " = " + l[i] + " " + dir.fileLength(l[i]) + " bytes");
*/
reader = IndexReader.Open(dir, false);
- Assert.AreEqual(157, reader.GetNumDocs());
+ Assert.AreEqual(157, reader.NumDocs());
}
[Test]
@@ -198,7 +198,7 @@ namespace Lucene.Net.Index
System.out.println("file " + i + " = " + l[i] + " " + dir.fileLength(l[i]) + " bytes");
*/
reader = IndexReader.Open(dir, false);
- Assert.AreEqual(156, reader.GetNumDocs());
+ Assert.AreEqual(156, reader.NumDocs());
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs Fri Mar 23 19:02:32 2012
@@ -482,7 +482,7 @@ namespace Lucene.Net.Index
IndexReader r = IndexReader.Open(dir, true);
// Still optimized, still 11 docs
Assert.IsTrue(r.IsOptimized());
- Assert.AreEqual(11, r.GetNumDocs());
+ Assert.AreEqual(11, r.NumDocs());
r.Close();
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), policy, IndexWriter.MaxFieldLength.LIMITED, lastCommit);
@@ -497,7 +497,7 @@ namespace Lucene.Net.Index
// Not optimized because we rolled it back, and now only
// 10 docs
Assert.IsTrue(!r.IsOptimized());
- Assert.AreEqual(10, r.GetNumDocs());
+ Assert.AreEqual(10, r.NumDocs());
r.Close();
// Reoptimize
@@ -507,7 +507,7 @@ namespace Lucene.Net.Index
r = IndexReader.Open(dir, true);
Assert.IsTrue(r.IsOptimized());
- Assert.AreEqual(10, r.GetNumDocs());
+ Assert.AreEqual(10, r.NumDocs());
r.Close();
// Now open writer on the commit just before optimize,
@@ -519,7 +519,7 @@ namespace Lucene.Net.Index
// opened on the prior commit has not yet committed:
r = IndexReader.Open(dir, true);
Assert.IsTrue(r.IsOptimized());
- Assert.AreEqual(10, r.GetNumDocs());
+ Assert.AreEqual(10, r.NumDocs());
r.Close();
writer.Close();
@@ -527,7 +527,7 @@ namespace Lucene.Net.Index
// Now reader sees unoptimized index:
r = IndexReader.Open(dir, true);
Assert.IsTrue(!r.IsOptimized());
- Assert.AreEqual(10, r.GetNumDocs());
+ Assert.AreEqual(10, r.NumDocs());
r.Close();
dir.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs Fri Mar 23 19:02:32 2012
@@ -104,11 +104,11 @@ namespace Lucene.Net.Index
sis.Read(dir);
IndexReader reader = OpenReader();
Assert.IsTrue(reader != null);
- Assert.AreEqual(2, reader.GetNumDocs());
+ Assert.AreEqual(2, reader.NumDocs());
reader.DeleteDocument(0);
- Assert.AreEqual(1, reader.GetNumDocs());
+ Assert.AreEqual(1, reader.NumDocs());
reader.UndeleteAll();
- Assert.AreEqual(2, reader.GetNumDocs());
+ Assert.AreEqual(2, reader.NumDocs());
// Ensure undeleteAll survives commit/close/reopen:
reader.Commit();
@@ -121,10 +121,10 @@ namespace Lucene.Net.Index
sis.Read(dir);
reader = OpenReader();
- Assert.AreEqual(2, reader.GetNumDocs());
+ Assert.AreEqual(2, reader.NumDocs());
reader.DeleteDocument(0);
- Assert.AreEqual(1, reader.GetNumDocs());
+ Assert.AreEqual(1, reader.NumDocs());
reader.Commit();
reader.Close();
if (reader is MultiReader)
@@ -133,7 +133,7 @@ namespace Lucene.Net.Index
sis.Commit(dir);
sis.Read(dir);
reader = OpenReader();
- Assert.AreEqual(1, reader.GetNumDocs());
+ Assert.AreEqual(1, reader.NumDocs());
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestDoc.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDoc.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDoc.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDoc.cs Fri Mar 23 19:02:32 2012
@@ -226,7 +226,7 @@ namespace Lucene.Net.Index
{
SegmentReader reader = SegmentReader.Get(true, si, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
- for (int i = 0; i < reader.GetNumDocs(); i++)
+ for (int i = 0; i < reader.NumDocs(); i++)
{
out_Renamed.WriteLine(reader.Document(i));
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs Fri Mar 23 19:02:32 2012
@@ -886,7 +886,7 @@ namespace Lucene.Net.Index
reader.UndeleteAll();
reader.Close();
reader = IndexReader.Open(dir, false);
- Assert.AreEqual(2, reader.GetNumDocs()); // nothing has really been deleted thanks to undeleteAll()
+ Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
reader.Close();
dir.Close();
}
@@ -905,7 +905,7 @@ namespace Lucene.Net.Index
reader.Close();
reader = IndexReader.Open(dir, false);
reader.UndeleteAll();
- Assert.AreEqual(2, reader.GetNumDocs()); // nothing has really been deleted thanks to undeleteAll()
+ Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
reader.Close();
dir.Close();
}
@@ -926,7 +926,7 @@ namespace Lucene.Net.Index
reader.UndeleteAll();
reader.Close();
reader = IndexReader.Open(dir, false);
- Assert.AreEqual(2, reader.GetNumDocs()); // nothing has really been deleted thanks to undeleteAll()
+ Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
reader.Close();
dir.Close();
}
@@ -1511,7 +1511,7 @@ namespace Lucene.Net.Index
public static void AssertIndexEquals(IndexReader index1, IndexReader index2)
{
- Assert.AreEqual(index1.GetNumDocs(), index2.GetNumDocs(), "IndexReaders have different values for numDocs.");
+ Assert.AreEqual(index1.NumDocs(), index2.NumDocs(), "IndexReaders have different values for numDocs.");
Assert.AreEqual(index1.MaxDoc, index2.MaxDoc, "IndexReaders have different values for maxDoc.");
Assert.AreEqual(index1.HasDeletions, index2.HasDeletions, "Only one IndexReader has deletions.");
Assert.AreEqual(index1.IsOptimized(), index2.IsOptimized(), "Only one index is optimized.");
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexReaderClone.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexReaderClone.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexReaderClone.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexReaderClone.cs Fri Mar 23 19:02:32 2012
@@ -183,9 +183,9 @@ namespace Lucene.Net.Index
TestIndexReaderReopen.CreateIndex(dir1, true);
IndexReader reader = IndexReader.Open(dir1, false);
- int docCount = reader.GetNumDocs();
+ int docCount = reader.NumDocs();
Assert.IsTrue(DeleteWorked(1, reader));
- Assert.AreEqual(docCount - 1, reader.GetNumDocs());
+ Assert.AreEqual(docCount - 1, reader.NumDocs());
IndexReader readOnlyReader = reader.Reopen(true);
if (!IsReadOnly(readOnlyReader))
@@ -193,7 +193,7 @@ namespace Lucene.Net.Index
Assert.Fail("reader isn't read only");
}
Assert.IsFalse(DeleteWorked(1, readOnlyReader));
- Assert.AreEqual(docCount - 1, readOnlyReader.GetNumDocs());
+ Assert.AreEqual(docCount - 1, readOnlyReader.NumDocs());
reader.Close();
readOnlyReader.Close();
dir1.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexReaderReopen.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexReaderReopen.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexReaderReopen.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexReaderReopen.cs Fri Mar 23 19:02:32 2012
@@ -1413,7 +1413,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader r = IndexReader.Open(dir, false);
- Assert.AreEqual(0, r.GetNumDocs());
+ Assert.AreEqual(0, r.NumDocs());
Assert.AreEqual(4, r.MaxDoc);
System.Collections.IEnumerator it = IndexReader.ListCommits(dir).GetEnumerator();
@@ -1447,11 +1447,11 @@ namespace Lucene.Net.Index
}
if (v < 4)
{
- Assert.AreEqual(1 + v, r2.GetNumDocs());
+ Assert.AreEqual(1 + v, r2.NumDocs());
}
else
{
- Assert.AreEqual(7 - v, r2.GetNumDocs());
+ Assert.AreEqual(7 - v, r2.NumDocs());
}
r.Close();
r = r2;
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs Fri Mar 23 19:02:32 2012
@@ -459,7 +459,7 @@ namespace Lucene.Net.Index
reader = IndexReader.Open(dir, true);
Assert.AreEqual(100, reader.MaxDoc);
- Assert.AreEqual(60, reader.GetNumDocs());
+ Assert.AreEqual(60, reader.NumDocs());
reader.Close();
// optimize the index and check that the new doc count is correct
@@ -474,7 +474,7 @@ namespace Lucene.Net.Index
// check that the index reader gives the same numbers.
reader = IndexReader.Open(dir, true);
Assert.AreEqual(60, reader.MaxDoc);
- Assert.AreEqual(60, reader.GetNumDocs());
+ Assert.AreEqual(60, reader.NumDocs());
reader.Close();
// make sure opening a new index for create over
@@ -999,7 +999,7 @@ namespace Lucene.Net.Index
// Make sure the doc that has the massive term is in
// the index:
- Assert.AreEqual(2, reader.GetNumDocs(), "document with wicked long term should is not in the index!");
+ Assert.AreEqual(2, reader.NumDocs(), "document with wicked long term should is not in the index!");
reader.Close();
@@ -1176,7 +1176,7 @@ namespace Lucene.Net.Index
// now open reader:
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(reader.GetNumDocs(), 1, "should be one document");
+ Assert.AreEqual(reader.NumDocs(), 1, "should be one document");
// now open index for create:
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
@@ -1184,9 +1184,9 @@ namespace Lucene.Net.Index
AddDoc(writer);
writer.Close();
- Assert.AreEqual(reader.GetNumDocs(), 1, "should be one document");
+ Assert.AreEqual(reader.NumDocs(), 1, "should be one document");
IndexReader reader2 = IndexReader.Open(dir, true);
- Assert.AreEqual(reader2.GetNumDocs(), 1, "should be one document");
+ Assert.AreEqual(reader2.NumDocs(), 1, "should be one document");
reader.Close();
reader2.Close();
}
@@ -1629,7 +1629,7 @@ namespace Lucene.Net.Index
IndexReader reader = IndexReader.Open(dir, true);
Assert.AreEqual(0, reader.MaxDoc);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
@@ -1638,7 +1638,7 @@ namespace Lucene.Net.Index
reader = IndexReader.Open(dir, true);
Assert.AreEqual(0, reader.MaxDoc);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
}
@@ -1663,7 +1663,7 @@ namespace Lucene.Net.Index
IndexReader reader = IndexReader.Open(dir, true);
Assert.AreEqual(100, reader.MaxDoc);
- Assert.AreEqual(100, reader.GetNumDocs());
+ Assert.AreEqual(100, reader.NumDocs());
for (int j = 0; j < 100; j++)
{
Assert.AreEqual(1, reader.DocFreq(new Term("a" + j, "aaa" + j)));
@@ -1989,7 +1989,7 @@ namespace Lucene.Net.Index
IndexReader reader = IndexReader.Open(dir, true);
Assert.AreEqual(1, reader.MaxDoc);
- Assert.AreEqual(1, reader.GetNumDocs());
+ Assert.AreEqual(1, reader.NumDocs());
Term t = new Term("field", "a");
Assert.AreEqual(1, reader.DocFreq(t));
TermDocs td = reader.TermDocs(t);
@@ -2062,7 +2062,7 @@ namespace Lucene.Net.Index
writer.Close();
_TestUtil.CheckIndex(dir);
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(2, reader.GetNumDocs());
+ Assert.AreEqual(2, reader.NumDocs());
}
// Test calling optimize(false) whereby optimize is kicked
@@ -3365,24 +3365,24 @@ namespace Lucene.Net.Index
AddDoc(writer);
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
writer.Commit();
IndexReader reader2 = reader.Reopen();
- Assert.AreEqual(0, reader.GetNumDocs());
- Assert.AreEqual(23, reader2.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
+ Assert.AreEqual(23, reader2.NumDocs());
reader.Close();
for (int i = 0; i < 17; i++)
AddDoc(writer);
- Assert.AreEqual(23, reader2.GetNumDocs());
+ Assert.AreEqual(23, reader2.NumDocs());
reader2.Close();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(23, reader.GetNumDocs());
+ Assert.AreEqual(23, reader.NumDocs());
reader.Close();
writer.Commit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(40, reader.GetNumDocs());
+ Assert.AreEqual(40, reader.NumDocs());
reader.Close();
writer.Close();
dir.Close();
@@ -3449,7 +3449,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(23, reader.GetNumDocs());
+ Assert.AreEqual(23, reader.NumDocs());
reader.Close();
dir.Close();
}
@@ -3487,7 +3487,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader reader = IndexReader.Open(dir, true);
- for (int i = 0; i < reader.GetNumDocs(); i++)
+ for (int i = 0; i < reader.NumDocs(); i++)
{
reader.Document(i);
reader.GetTermFreqVectors(i);
@@ -3635,10 +3635,10 @@ namespace Lucene.Net.Index
IndexReader ir = IndexReader.Open(dir, false);
Assert.AreEqual(10, ir.MaxDoc);
- Assert.AreEqual(10, ir.GetNumDocs());
+ Assert.AreEqual(10, ir.NumDocs());
ir.DeleteDocument(0);
ir.DeleteDocument(7);
- Assert.AreEqual(8, ir.GetNumDocs());
+ Assert.AreEqual(8, ir.NumDocs());
ir.Close();
writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), IndexWriter.MaxFieldLength.LIMITED);
@@ -3649,7 +3649,7 @@ namespace Lucene.Net.Index
writer.Close();
ir = IndexReader.Open(dir, true);
Assert.AreEqual(8, ir.MaxDoc);
- Assert.AreEqual(8, ir.GetNumDocs());
+ Assert.AreEqual(8, ir.NumDocs());
ir.Close();
dir.Close();
}
@@ -3677,10 +3677,10 @@ namespace Lucene.Net.Index
IndexReader ir = IndexReader.Open(dir, false);
Assert.AreEqual(98, ir.MaxDoc);
- Assert.AreEqual(98, ir.GetNumDocs());
+ Assert.AreEqual(98, ir.NumDocs());
for (int i = 0; i < 98; i += 2)
ir.DeleteDocument(i);
- Assert.AreEqual(49, ir.GetNumDocs());
+ Assert.AreEqual(49, ir.NumDocs());
ir.Close();
writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), IndexWriter.MaxFieldLength.LIMITED);
@@ -3690,7 +3690,7 @@ namespace Lucene.Net.Index
writer.Close();
ir = IndexReader.Open(dir, true);
Assert.AreEqual(49, ir.MaxDoc);
- Assert.AreEqual(49, ir.GetNumDocs());
+ Assert.AreEqual(49, ir.NumDocs());
ir.Close();
dir.Close();
}
@@ -3719,10 +3719,10 @@ namespace Lucene.Net.Index
IndexReader ir = IndexReader.Open(dir, false);
Assert.AreEqual(98, ir.MaxDoc);
- Assert.AreEqual(98, ir.GetNumDocs());
+ Assert.AreEqual(98, ir.NumDocs());
for (int i = 0; i < 98; i += 2)
ir.DeleteDocument(i);
- Assert.AreEqual(49, ir.GetNumDocs());
+ Assert.AreEqual(49, ir.NumDocs());
ir.Close();
writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), IndexWriter.MaxFieldLength.LIMITED);
@@ -3732,7 +3732,7 @@ namespace Lucene.Net.Index
writer.Close();
ir = IndexReader.Open(dir, true);
Assert.AreEqual(49, ir.MaxDoc);
- Assert.AreEqual(49, ir.GetNumDocs());
+ Assert.AreEqual(49, ir.NumDocs());
ir.Close();
dir.Close();
}
@@ -3963,7 +3963,7 @@ namespace Lucene.Net.Index
IndexReader ir = IndexReader.Open(dir, true);
Assert.AreEqual(1, ir.MaxDoc);
- Assert.AreEqual(0, ir.GetNumDocs());
+ Assert.AreEqual(0, ir.NumDocs());
ir.Close();
dir.Close();
@@ -4315,40 +4315,40 @@ namespace Lucene.Net.Index
AddDoc(writer);
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
writer.PrepareCommit();
IndexReader reader2 = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader2.GetNumDocs());
+ Assert.AreEqual(0, reader2.NumDocs());
writer.Commit();
IndexReader reader3 = reader.Reopen();
- Assert.AreEqual(0, reader.GetNumDocs());
- Assert.AreEqual(0, reader2.GetNumDocs());
- Assert.AreEqual(23, reader3.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
+ Assert.AreEqual(0, reader2.NumDocs());
+ Assert.AreEqual(23, reader3.NumDocs());
reader.Close();
reader2.Close();
for (int i = 0; i < 17; i++)
AddDoc(writer);
- Assert.AreEqual(23, reader3.GetNumDocs());
+ Assert.AreEqual(23, reader3.NumDocs());
reader3.Close();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(23, reader.GetNumDocs());
+ Assert.AreEqual(23, reader.NumDocs());
reader.Close();
writer.PrepareCommit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(23, reader.GetNumDocs());
+ Assert.AreEqual(23, reader.NumDocs());
reader.Close();
writer.Commit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(40, reader.GetNumDocs());
+ Assert.AreEqual(40, reader.NumDocs());
reader.Close();
writer.Close();
dir.Close();
@@ -4370,19 +4370,19 @@ namespace Lucene.Net.Index
AddDoc(writer);
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
writer.PrepareCommit();
IndexReader reader2 = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader2.GetNumDocs());
+ Assert.AreEqual(0, reader2.NumDocs());
writer.Rollback();
IndexReader reader3 = reader.Reopen();
- Assert.AreEqual(0, reader.GetNumDocs());
- Assert.AreEqual(0, reader2.GetNumDocs());
- Assert.AreEqual(0, reader3.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
+ Assert.AreEqual(0, reader2.NumDocs());
+ Assert.AreEqual(0, reader3.NumDocs());
reader.Close();
reader2.Close();
@@ -4390,21 +4390,21 @@ namespace Lucene.Net.Index
for (int i = 0; i < 17; i++)
AddDoc(writer);
- Assert.AreEqual(0, reader3.GetNumDocs());
+ Assert.AreEqual(0, reader3.NumDocs());
reader3.Close();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
writer.PrepareCommit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
writer.Commit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(17, reader.GetNumDocs());
+ Assert.AreEqual(17, reader.NumDocs());
reader.Close();
writer.Close();
dir.Close();
@@ -4422,7 +4422,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
dir.Close();
}
@@ -4625,7 +4625,7 @@ namespace Lucene.Net.Index
_TestUtil.CheckIndex(c.dir2);
IndexReader reader = IndexReader.Open(c.dir2, true);
- Assert.AreEqual(100 + NUM_COPY * (3 * NUM_ITER / 4) * Lucene.Net.Index.TestIndexWriter.CommitAndAddIndexes.NUM_THREADS * Lucene.Net.Index.TestIndexWriter.CommitAndAddIndexes.NUM_INIT_DOCS, reader.GetNumDocs());
+ Assert.AreEqual(100 + NUM_COPY * (3 * NUM_ITER / 4) * Lucene.Net.Index.TestIndexWriter.CommitAndAddIndexes.NUM_THREADS * Lucene.Net.Index.TestIndexWriter.CommitAndAddIndexes.NUM_INIT_DOCS, reader.NumDocs());
reader.Close();
c.CloseDir();
@@ -5308,7 +5308,7 @@ namespace Lucene.Net.Index
writer.Close();
IndexReader r3 = IndexReader.Open(dir, true);
- Assert.AreEqual(5, r3.GetNumDocs());
+ Assert.AreEqual(5, r3.NumDocs());
r3.Close();
r1.Close();
@@ -5841,12 +5841,12 @@ namespace Lucene.Net.Index
Assert.NotNull(commit);
IndexReader r = IndexReader.Open(commit, true);
- Assert.AreEqual(2, r.GetNumDocs());
+ Assert.AreEqual(2, r.NumDocs());
r.Close();
// open "second", w/ writeable IndexReader & commit
r = IndexReader.Open(commit, new NoDeletionPolicy(), false);
- Assert.AreEqual(2, r.GetNumDocs());
+ Assert.AreEqual(2, r.NumDocs());
r.DeleteDocument(0);
r.DeleteDocument(1);
commitData["tag"]="fourth";
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriterDelete.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriterDelete.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriterDelete.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriterDelete.cs Fri Mar 23 19:02:32 2012
@@ -198,7 +198,7 @@ namespace Lucene.Net.Index
modifier.Commit();
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
modifier.DeleteDocuments(new Term("value", System.Convert.ToString(value_Renamed)));
@@ -206,7 +206,7 @@ namespace Lucene.Net.Index
modifier.Commit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
modifier.Close();
dir.Close();
@@ -263,7 +263,7 @@ namespace Lucene.Net.Index
modifier.Commit();
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(1, reader.GetNumDocs());
+ Assert.AreEqual(1, reader.NumDocs());
int hitCount = GetHitCount(dir, new Term("id", System.Convert.ToString(id)));
Assert.AreEqual(1, hitCount);
@@ -306,7 +306,7 @@ namespace Lucene.Net.Index
modifier.Commit();
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(5, reader.GetNumDocs());
+ Assert.AreEqual(5, reader.NumDocs());
modifier.Close();
}
@@ -330,7 +330,7 @@ namespace Lucene.Net.Index
modifier.Commit();
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
id = 0;
@@ -340,7 +340,7 @@ namespace Lucene.Net.Index
modifier.Commit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(5, reader.GetNumDocs());
+ Assert.AreEqual(5, reader.NumDocs());
reader.Close();
Term[] terms = new Term[3];
@@ -351,7 +351,7 @@ namespace Lucene.Net.Index
modifier.DeleteDocuments(terms);
modifier.Commit();
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(2, reader.GetNumDocs());
+ Assert.AreEqual(2, reader.NumDocs());
reader.Close();
modifier.Close();
@@ -377,7 +377,7 @@ namespace Lucene.Net.Index
modifier.Commit();
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
// Add 1 doc (so we will have something buffered)
@@ -388,7 +388,7 @@ namespace Lucene.Net.Index
// Delete all shouldn't be on disk yet
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
// Add a doc and update a doc (after the deleteAll, before the commit)
@@ -400,7 +400,7 @@ namespace Lucene.Net.Index
// Validate there are no docs left
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(2, reader.GetNumDocs());
+ Assert.AreEqual(2, reader.NumDocs());
reader.Close();
modifier.Close();
@@ -428,7 +428,7 @@ namespace Lucene.Net.Index
AddDoc(modifier, ++id, value_Renamed);
IndexReader reader = IndexReader.Open(dir, true);
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
// Delete all
@@ -440,7 +440,7 @@ namespace Lucene.Net.Index
// Validate that the docs are still there
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
dir.Close();
@@ -466,7 +466,7 @@ namespace Lucene.Net.Index
modifier.Commit();
IndexReader reader = modifier.GetReader();
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
AddDoc(modifier, ++id, value_Renamed);
@@ -476,7 +476,7 @@ namespace Lucene.Net.Index
modifier.DeleteAll();
reader = modifier.GetReader();
- Assert.AreEqual(0, reader.GetNumDocs());
+ Assert.AreEqual(0, reader.NumDocs());
reader.Close();
@@ -486,7 +486,7 @@ namespace Lucene.Net.Index
// Validate that the docs are still there
reader = IndexReader.Open(dir, true);
- Assert.AreEqual(7, reader.GetNumDocs());
+ Assert.AreEqual(7, reader.NumDocs());
reader.Close();
dir.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs Fri Mar 23 19:02:32 2012
@@ -404,7 +404,7 @@ namespace Lucene.Net.Index
_TestUtil.CheckIndex(mainDir);
IndexReader reader = IndexReader.Open(mainDir, true);
- Assert.AreEqual(addDirThreads.count.IntValue(), reader.GetNumDocs());
+ Assert.AreEqual(addDirThreads.count.IntValue(), reader.NumDocs());
//Assert.AreEqual(100 + numDirs * (3 * numIter / 4) * addDirThreads.NUM_THREADS
// * addDirThreads.NUM_INIT_DOCS, reader.numDocs());
reader.Close();
@@ -888,7 +888,7 @@ namespace Lucene.Net.Index
_TestUtil.CheckIndex(dir1);
writer.Commit();
_TestUtil.CheckIndex(dir1);
- Assert.AreEqual(100, r1.GetNumDocs());
+ Assert.AreEqual(100, r1.NumDocs());
for (int i = 0; i < 10; i++)
{
@@ -902,7 +902,7 @@ namespace Lucene.Net.Index
r1.Close();
r1 = r2;
}
- Assert.AreEqual(110, r1.GetNumDocs());
+ Assert.AreEqual(110, r1.NumDocs());
writer.Close();
r1.Close();
dir1.Close();
@@ -925,7 +925,7 @@ namespace Lucene.Net.Index
_TestUtil.CheckIndex(dir1);
// reader should remain usable even after IndexWriter is closed:
- Assert.AreEqual(100, r.GetNumDocs());
+ Assert.AreEqual(100, r.NumDocs());
Query q = new TermQuery(new Term("indexname", "test"));
Assert.AreEqual(100, new IndexSearcher(r).Search(q, 10).TotalHits);
@@ -1159,7 +1159,7 @@ namespace Lucene.Net.Index
w.Close();
r.Close();
r = IndexReader.Open(dir, true);
- Assert.AreEqual(1, r.GetNumDocs());
+ Assert.AreEqual(1, r.NumDocs());
Assert.IsFalse(r.HasDeletions);
r.Close();
dir.Close();
@@ -1180,17 +1180,17 @@ namespace Lucene.Net.Index
id.SetValue("1");
w.AddDocument(doc);
IndexReader r = w.GetReader();
- Assert.AreEqual(2, r.GetNumDocs());
+ Assert.AreEqual(2, r.NumDocs());
r.Close();
w.DeleteDocuments(new Term("id", "0"));
r = w.GetReader();
- Assert.AreEqual(1, r.GetNumDocs());
+ Assert.AreEqual(1, r.NumDocs());
r.Close();
w.DeleteDocuments(new Term("id", "1"));
r = w.GetReader();
- Assert.AreEqual(0, r.GetNumDocs());
+ Assert.AreEqual(0, r.NumDocs());
r.Close();
w.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestRollback.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestRollback.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestRollback.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestRollback.cs Fri Mar 23 19:02:32 2012
@@ -61,7 +61,7 @@ namespace Lucene.Net.Index
w.Rollback();
IndexReader r = IndexReader.Open(dir, true);
- Assert.AreEqual(5, r.GetNumDocs(), "index should contain same number of docs post rollback");
+ Assert.AreEqual(5, r.NumDocs(), "index should contain same number of docs post rollback");
r.Close();
dir.Close();
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestSegmentMerger.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestSegmentMerger.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestSegmentMerger.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestSegmentMerger.cs Fri Mar 23 19:02:32 2012
@@ -95,7 +95,7 @@ namespace Lucene.Net.Index
//Should be able to open a new SegmentReader against the new directory
SegmentReader mergedReader = SegmentReader.Get(true, new SegmentInfo(mergedSegment, docsMerged, mergedDir, false, true), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
Assert.IsTrue(mergedReader != null);
- Assert.IsTrue(mergedReader.GetNumDocs() == 2);
+ Assert.IsTrue(mergedReader.NumDocs() == 2);
Document newDoc1 = mergedReader.Document(0);
Assert.IsTrue(newDoc1 != null);
//There are 2 unstored fields on the document
Modified: incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs Fri Mar 23 19:02:32 2012
@@ -71,7 +71,7 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestDocument()
{
- Assert.IsTrue(reader.GetNumDocs() == 1);
+ Assert.IsTrue(reader.NumDocs() == 1);
Assert.IsTrue(reader.MaxDoc >= 1);
Document result = reader.Document(0);
Assert.IsTrue(result != null);
@@ -94,11 +94,11 @@ namespace Lucene.Net.Index
SegmentInfo info = DocHelper.WriteDoc(dir, docToDelete);
SegmentReader deleteReader = SegmentReader.Get(false, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
Assert.IsTrue(deleteReader != null);
- Assert.IsTrue(deleteReader.GetNumDocs() == 1);
+ Assert.IsTrue(deleteReader.NumDocs() == 1);
deleteReader.DeleteDocument(0);
Assert.IsTrue(deleteReader.IsDeleted(0) == true);
Assert.IsTrue(deleteReader.HasDeletions == true);
- Assert.IsTrue(deleteReader.GetNumDocs() == 0);
+ Assert.IsTrue(deleteReader.NumDocs() == 0);
}
[Test]
Modified: incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs Fri Mar 23 19:02:32 2012
@@ -318,8 +318,8 @@ namespace Lucene.Net.Index
public static void VerifyEquals(IndexReader r1, IndexReader r2, System.String idField)
{
- Assert.AreEqual(r1.GetNumDocs(), r2.GetNumDocs());
- bool hasDeletes = !(r1.MaxDoc == r2.MaxDoc && r1.GetNumDocs() == r1.MaxDoc);
+ Assert.AreEqual(r1.NumDocs(), r2.NumDocs());
+ bool hasDeletes = !(r1.MaxDoc == r2.MaxDoc && r1.NumDocs() == r1.MaxDoc);
int[] r2r1 = new int[r2.MaxDoc]; // r2 id to r1 id mapping
@@ -403,8 +403,8 @@ namespace Lucene.Net.Index
TermEnum termEnum2 = r2.Terms(new Term("", ""));
// pack both doc and freq into single element for easy sorting
- long[] info1 = new long[r1.GetNumDocs()];
- long[] info2 = new long[r2.GetNumDocs()];
+ long[] info1 = new long[r1.NumDocs()];
+ long[] info2 = new long[r2.NumDocs()];
for (; ; )
{
Modified: incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs Fri Mar 23 19:02:32 2012
@@ -161,7 +161,7 @@ namespace Lucene.Net.Index
IndexReader reader = IndexReader.Open(directory, true);
Assert.IsTrue(reader.IsOptimized());
- Assert.AreEqual(expectedDocCount, reader.GetNumDocs());
+ Assert.AreEqual(expectedDocCount, reader.NumDocs());
reader.Close();
}
writer.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs Fri Mar 23 19:02:32 2012
@@ -252,7 +252,7 @@ namespace Lucene.Net.Index
// should not work:
new IndexWriter(dir, new WhitespaceAnalyzer(), new DeleteLastCommitPolicy(this), MaxFieldLength.UNLIMITED).Close();
IndexReader r = IndexReader.Open(dir, true);
- Assert.AreEqual(100, r.GetNumDocs());
+ Assert.AreEqual(100, r.NumDocs());
r.Close();
}
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs Fri Mar 23 19:02:32 2012
@@ -228,8 +228,8 @@ namespace Lucene.Net.Index
r1 = IndexReader.Open(dir1, true);
r2 = IndexReader.Open(dir2, true);
}
- if (r1.GetNumDocs() != r2.GetNumDocs())
- throw new System.SystemException("doc counts differ: r1=" + r1.GetNumDocs() + " r2=" + r2.GetNumDocs());
+ if (r1.NumDocs() != r2.NumDocs())
+ throw new System.SystemException("doc counts differ: r1=" + r1.NumDocs() + " r2=" + r2.NumDocs());
r1.Close();
r2.Close();
}
Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs Fri Mar 23 19:02:32 2012
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search.Spans
public virtual void TestVerifyIndex()
{
IndexReader reader = IndexReader.Open(mDirectory, true);
- Assert.AreEqual(8, reader.GetNumDocs());
+ Assert.AreEqual(8, reader.NumDocs());
reader.Close();
}
Modified: incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs Fri Mar 23 19:02:32 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
System.String maxIP = Pad(maxId);
System.String medIP = Pad(medId);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
@@ -145,7 +145,7 @@ namespace Lucene.Net.Search
System.String minRP = Pad(signedIndex.minR);
System.String maxRP = Pad(signedIndex.maxR);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
@@ -207,7 +207,7 @@ namespace Lucene.Net.Search
IndexReader reader = IndexReader.Open(signedIndex.index, true);
IndexSearcher Search = new IndexSearcher(reader);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
int medId = ((maxId - minId) / 2);
System.Int16 minIdO = (short) minId;
System.Int16 maxIdO = (short) maxId;
@@ -301,7 +301,7 @@ namespace Lucene.Net.Search
IndexReader reader = IndexReader.Open(signedIndex.index, true);
IndexSearcher Search = new IndexSearcher(reader);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
int medId = ((maxId - minId) / 2);
System.Int32 minIdO = (System.Int32) minId;
System.Int32 maxIdO = (System.Int32) maxId;
@@ -395,7 +395,7 @@ namespace Lucene.Net.Search
IndexReader reader = IndexReader.Open(signedIndex.index, true);
IndexSearcher Search = new IndexSearcher(reader);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
int medId = ((maxId - minId) / 2);
System.Int64 minIdO = (long) minId;
System.Int64 maxIdO = (long) maxId;
@@ -491,7 +491,7 @@ namespace Lucene.Net.Search
IndexReader reader = IndexReader.Open(signedIndex.index, true);
IndexSearcher Search = new IndexSearcher(reader);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
System.Single minIdO = (float) (minId + .5f);
System.Single medIdO = (float) ((float) minIdO + ((float) (maxId - minId)) / 2.0f);
@@ -523,7 +523,7 @@ namespace Lucene.Net.Search
IndexReader reader = IndexReader.Open(signedIndex.index, true);
IndexSearcher Search = new IndexSearcher(reader);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
System.Double minIdO = (double) (minId + .5);
System.Double medIdO = (double) ((float) minIdO + ((double) (maxId - minId)) / 2.0);
Modified: incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs Fri Mar 23 19:02:32 2012
@@ -56,7 +56,7 @@ namespace Lucene.Net.Search
IndexReader reader = IndexReader.Open(rd, true);
IndexSearcher searcher = new IndexSearcher(reader);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
ScoreDoc[] results;
MatchAllDocsQuery q = new MatchAllDocsQuery();
Modified: incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs Fri Mar 23 19:02:32 2012
@@ -317,7 +317,7 @@ namespace Lucene.Net.Search
System.String maxIP = Pad(maxId);
System.String medIP = Pad(medId);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
AssertEquals("num of docs", numDocs, 1 + maxId - minId);
@@ -446,7 +446,7 @@ namespace Lucene.Net.Search
System.String maxIP = Pad(maxId);
System.String medIP = Pad(medId);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
AssertEquals("num of docs", numDocs, 1 + maxId - minId);
@@ -528,7 +528,7 @@ namespace Lucene.Net.Search
System.String minRP = Pad(signedIndex.minR);
System.String maxRP = Pad(signedIndex.maxR);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
AssertEquals("num of docs", numDocs, 1 + maxId - minId);
@@ -592,7 +592,7 @@ namespace Lucene.Net.Search
System.String minRP = Pad(unsignedIndex.minR);
System.String maxRP = Pad(unsignedIndex.maxR);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
AssertEquals("num of docs", numDocs, 1 + maxId - minId);
Modified: incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs Fri Mar 23 19:02:32 2012
@@ -171,7 +171,7 @@ namespace Lucene.Net.Search
private void TestTermVectors()
{
// check:
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
long start = 0L;
for (int docId = 0; docId < numDocs; docId++)
{
Modified: incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs Fri Mar 23 19:02:32 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
System.String maxIP = Pad(maxId);
System.String medIP = Pad(medId);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
@@ -147,7 +147,7 @@ namespace Lucene.Net.Search
System.String maxIP = Pad(maxId);
System.String medIP = Pad(medId);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
@@ -227,7 +227,7 @@ namespace Lucene.Net.Search
System.String minRP = Pad(signedIndex.minR);
System.String maxRP = Pad(signedIndex.maxR);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
@@ -293,7 +293,7 @@ namespace Lucene.Net.Search
System.String minRP = Pad(unsignedIndex.minR);
System.String maxRP = Pad(unsignedIndex.maxR);
- int numDocs = reader.GetNumDocs();
+ int numDocs = reader.NumDocs();
Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
Modified: incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs?rev=1304562&r1=1304561&r2=1304562&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs (original)
+++ incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs Fri Mar 23 19:02:32 2012
@@ -126,7 +126,7 @@ namespace Lucene.Net.Store
// open reader to test document count
IndexReader reader = IndexReader.Open(ramDir, true);
- Assert.AreEqual(docsToAdd, reader.GetNumDocs());
+ Assert.AreEqual(docsToAdd, reader.NumDocs());
// open search zo check if all doc's are there
IndexSearcher searcher = new IndexSearcher(reader);