You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/02/08 14:32:31 UTC
[52/53] [abbrv] lucenenet git commit: Lucene.Net.Core.Index.Fields
refactor: Renamed Terms() > GetTerms()
Lucene.Net.Core.Index.Fields refactor: Renamed Terms() > GetTerms()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/52da783d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/52da783d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/52da783d
Branch: refs/heads/api-work
Commit: 52da783d84489904a083579a38b52d1620574dee
Parents: 4a28508
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 8 21:14:22 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 8 21:14:22 2017 +0700
----------------------------------------------------------------------
.../BlockTerms/BlockTermsReader.cs | 2 +-
.../Bloom/BloomFilteringPostingsFormat.cs | 6 +++---
.../Memory/DirectPostingsFormat.cs | 4 ++--
src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs | 2 +-
src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 2 +-
.../Memory/MemoryPostingsFormat.cs | 2 +-
.../SimpleText/SimpleTextFieldsReader.cs | 2 +-
.../SimpleText/SimpleTextTermVectorsReader.cs | 2 +-
.../Codecs/BlockTreeTermsReader.cs | 4 ++--
.../Compressing/CompressingTermVectorsReader.cs | 2 +-
src/Lucene.Net.Core/Codecs/FieldsConsumer.cs | 2 +-
.../Codecs/Lucene3x/Lucene3xFields.cs | 2 +-
.../Codecs/Lucene3x/Lucene3xTermVectorsReader.cs | 2 +-
.../Codecs/Lucene40/Lucene40TermVectorsReader.cs | 2 +-
.../Codecs/Perfield/PerFieldPostingsFormat.cs | 4 ++--
src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs | 2 +-
src/Lucene.Net.Core/Index/AtomicReader.cs | 10 +++++-----
.../Index/BufferedUpdatesStream.cs | 4 ++--
src/Lucene.Net.Core/Index/CheckIndex.cs | 14 +++++++-------
src/Lucene.Net.Core/Index/DocTermOrds.cs | 6 +++---
src/Lucene.Net.Core/Index/Fields.cs | 6 +++---
src/Lucene.Net.Core/Index/FilterAtomicReader.cs | 4 ++--
src/Lucene.Net.Core/Index/IndexReader.cs | 2 +-
src/Lucene.Net.Core/Index/MultiFields.cs | 6 +++---
src/Lucene.Net.Core/Index/ParallelAtomicReader.cs | 4 ++--
src/Lucene.Net.Core/Index/TermContext.cs | 2 +-
.../Search/MultiTermQueryWrapperFilter.cs | 2 +-
src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs | 2 +-
.../Search/TermCollectingRewrite.cs | 2 +-
.../Highlight/TokenSources.cs | 6 +++---
.../Highlight/WeightedSpanTermExtractor.cs | 4 ++--
.../VectorHighlight/FieldTermStack.cs | 2 +-
.../MemoryIndex.MemoryIndexReader.cs | 2 +-
.../Index/Sorter/SortingAtomicReader.cs | 4 ++--
src/Lucene.Net.Misc/Misc/HighFreqTerms.cs | 4 ++--
src/Lucene.Net.Queries/CommonTermsQuery.cs | 2 +-
.../ValueSources/SumTotalTermFreqValueSource.cs | 2 +-
.../Function/ValueSources/TFValueSource.cs | 2 +-
.../Function/ValueSources/TermFreqValueSource.cs | 2 +-
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 2 +-
src/Lucene.Net.Queries/TermsFilter.cs | 2 +-
src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs | 4 ++--
.../Codecs/asserting/AssertingPostingsFormat.cs | 4 ++--
.../Codecs/ramonly/RAMOnlyPostingsFormat.cs | 2 +-
.../Index/AssertingAtomicReader.cs | 4 ++--
.../Index/BasePostingsFormatTestCase.cs | 2 +-
.../Index/BaseTermVectorsFormatTestCase.cs | 2 +-
.../Index/FieldFilterAtomicReader.cs | 4 ++--
.../Index/ThreadedIndexingAndSearchingTestCase.cs | 2 +-
.../Util/LuceneTestCase.cs | 2 +-
.../Analysis/Sinks/TestTeeSinkTokenFilter.cs | 2 +-
.../Highlight/TokenSourcesTest.cs | 2 +-
.../Index/Memory/MemoryIndexTest.cs | 2 +-
.../core/Analysis/TestMockAnalyzer.cs | 2 +-
.../core/Codecs/Lucene3x/TestSurrogates.cs | 2 +-
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 2 +-
.../core/Document/TestDocument.cs | 2 +-
.../core/Index/TestBackwardsCompatibility.cs | 4 ++--
.../core/Index/TestBackwardsCompatibility3x.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/TestCodecs.cs | 4 ++--
.../core/Index/TestDirectoryReader.cs | 8 ++++----
src/Lucene.Net.Tests/core/Index/TestDoc.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestDocCount.cs | 2 +-
.../core/Index/TestDocumentWriter.cs | 4 ++--
.../core/Index/TestFilterAtomicReader.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/TestFlex.cs | 2 +-
.../core/Index/TestIndexWriter.cs | 8 ++++----
.../core/Index/TestIndexWriterUnicode.cs | 2 +-
.../core/Index/TestIndexableField.cs | 4 ++--
.../core/Index/TestParallelTermEnum.cs | 6 +++---
src/Lucene.Net.Tests/core/Index/TestPayloads.cs | 2 +-
.../core/Index/TestPerSegmentDeletes.cs | 2 +-
.../core/Index/TestPostingsOffsets.cs | 2 +-
.../core/Index/TestSegmentMerger.cs | 2 +-
.../core/Index/TestSegmentReader.cs | 4 ++--
.../core/Index/TestSegmentTermDocs.cs | 2 +-
.../core/Index/TestSegmentTermEnum.cs | 2 +-
.../core/Index/TestStressAdvance.cs | 2 +-
.../core/Index/TestStressIndexing2.cs | 18 +++++++++---------
src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs | 2 +-
.../core/Index/TestTermVectorsReader.cs | 10 +++++-----
.../core/Index/TestTermVectorsWriter.cs | 16 ++++++++--------
src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs | 6 +++---
.../core/Search/TestMultiPhraseQuery.cs | 2 +-
.../core/Search/TestMultiThreadTermVectors.cs | 4 ++--
.../core/Search/TestPhrasePrefixQuery.cs | 2 +-
.../core/Search/TestSameScoresWithThreads.cs | 2 +-
.../core/Search/TestTermVectors.cs | 4 ++--
88 files changed, 159 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
index 707bef3..9999cf6 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
@@ -248,7 +248,7 @@ namespace Lucene.Net.Codecs.BlockTerms
return _fields.Keys.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
Debug.Assert(field != null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
index cb68c0f..8176fa3 100644
--- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
@@ -186,13 +186,13 @@ namespace Lucene.Net.Codecs.Bloom
_delegateFieldsProducer.Dispose();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
var filter = _bloomsByFieldName[field];
if (filter == null)
- return _delegateFieldsProducer.Terms(field);
+ return _delegateFieldsProducer.GetTerms(field);
- var result = _delegateFieldsProducer.Terms(field);
+ var result = _delegateFieldsProducer.GetTerms(field);
return result == null ? null : new BloomFilteredTerms(result, filter);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
index 6bfbedf..20b8421 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
@@ -137,7 +137,7 @@ namespace Lucene.Net.Codecs.Memory
{
foreach (string field in fields)
{
- this.fields[field] = new DirectField(state, field, fields.Terms(field), minSkipCount, lowFreqCutoff);
+ this.fields[field] = new DirectField(state, field, fields.GetTerms(field), minSkipCount, lowFreqCutoff);
}
}
@@ -146,7 +146,7 @@ namespace Lucene.Net.Codecs.Memory
return Collections.UnmodifiableSet<string>(fields.Keys).GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
return fields[field];
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
index f57f31f..168e298 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
@@ -160,7 +160,7 @@ namespace Lucene.Net.Codecs.Memory
return Collections.UnmodifiableSet(fields.Keys).GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
Debug.Assert(field != null);
return fields[field];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
index b2cf9b8..059a99e 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
@@ -162,7 +162,7 @@ namespace Lucene.Net.Codecs.Memory
return Collections.UnmodifiableSet<string>(fields.Keys).GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
Debug.Assert(field != null);
return fields[field];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
index 9ed0949..7795f85 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
@@ -1070,7 +1070,7 @@ namespace Lucene.Net.Codecs.Memory
return Collections.UnmodifiableSet<string>(_fields.Keys).GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
return _fields[field];
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
index 09bde88..139a2af 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
@@ -734,7 +734,7 @@ namespace Lucene.Net.Codecs.SimpleText
return _fields.Keys.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
lock (this)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
index aea82d4..900cf42 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
@@ -288,7 +288,7 @@ namespace Lucene.Net.Codecs.SimpleText
return _fields.Keys.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
return _fields.ContainsKey(field) ? _fields[field] : null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
index a9ecb01..2ce3b29 100644
--- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
@@ -280,7 +280,7 @@ namespace Lucene.Net.Codecs
return fields.Keys.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
Debug.Assert(field != null);
FieldReader ret;
@@ -533,7 +533,7 @@ namespace Lucene.Net.Codecs
internal BytesRef NO_OUTPUT;
/// <summary>
- /// BlockTree's implementation of <seealso cref="Terms"/>. </summary>
+ /// BlockTree's implementation of <seealso cref="GetTerms"/>. </summary>
public sealed class FieldReader : Terms
{
private readonly BlockTreeTermsReader outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
index 12cd209..03e1191 100644
--- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
@@ -733,7 +733,7 @@ namespace Lucene.Net.Codecs.Compressing
}
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
FieldInfo fieldInfo = outerInstance.fieldInfos.FieldInfo(field);
if (fieldInfo == null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs b/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
index 948e121..d338fce 100644
--- a/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
+++ b/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Codecs
{
FieldInfo info = mergeState.FieldInfos.FieldInfo(field);
Debug.Assert(info != null, "FieldInfo for field is null: " + field);
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
if (terms != null)
{
TermsConsumer termsConsumer = AddField(info);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
index 57aab75..9ea1fdf 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
@@ -148,7 +148,7 @@ namespace Lucene.Net.Codecs.Lucene3x
return fields.Keys.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
Terms ret;
preTerms.TryGetValue(field, out ret);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
index 86f8692..604ea8c 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
@@ -315,7 +315,7 @@ namespace Lucene.Net.Codecs.Lucene3x
}
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
FieldInfo fieldInfo = outerInstance.fieldInfos.FieldInfo(field);
if (fieldInfo == null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
index 52f3ea3..956257c 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
@@ -304,7 +304,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
FieldInfo fieldInfo = outerInstance.fieldInfos.FieldInfo(field);
if (fieldInfo == null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/Perfield/PerFieldPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Perfield/PerFieldPostingsFormat.cs b/src/Lucene.Net.Core/Codecs/Perfield/PerFieldPostingsFormat.cs
index 8aac700..4c4a30c 100644
--- a/src/Lucene.Net.Core/Codecs/Perfield/PerFieldPostingsFormat.cs
+++ b/src/Lucene.Net.Core/Codecs/Perfield/PerFieldPostingsFormat.cs
@@ -235,11 +235,11 @@ namespace Lucene.Net.Codecs.Perfield
return fields.Keys.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
FieldsProducer fieldsProducer;
fields.TryGetValue(field, out fieldsProducer);
- return fieldsProducer == null ? null : fieldsProducer.Terms(field);
+ return fieldsProducer == null ? null : fieldsProducer.GetTerms(field);
}
public override int Count
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs b/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
index 39563ec..e23b0ed 100644
--- a/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
@@ -282,7 +282,7 @@ namespace Lucene.Net.Codecs
Debug.Assert(lastFieldName == null || fieldName.CompareTo(lastFieldName) > 0, "lastFieldName=" + lastFieldName + " fieldName=" + fieldName);
lastFieldName = fieldName;
- Terms terms = vectors.Terms(fieldName);
+ Terms terms = vectors.GetTerms(fieldName);
if (terms == null)
{
// FieldsEnum shouldn't lie...
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/AtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/AtomicReader.cs b/src/Lucene.Net.Core/Index/AtomicReader.cs
index 601fc41..24419ea 100644
--- a/src/Lucene.Net.Core/Index/AtomicReader.cs
+++ b/src/Lucene.Net.Core/Index/AtomicReader.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Index
{
return 0;
}
- Terms terms = fields.Terms(term.Field);
+ Terms terms = fields.GetTerms(term.Field);
if (terms == null)
{
return 0;
@@ -140,7 +140,7 @@ namespace Lucene.Net.Index
{
return 0;
}
- Terms terms = fields.Terms(term.Field);
+ Terms terms = fields.GetTerms(term.Field);
if (terms == null)
{
return 0;
@@ -195,7 +195,7 @@ namespace Lucene.Net.Index
{
return null;
}
- return fields.Terms(field);
+ return fields.GetTerms(field);
}
/// <summary>
@@ -210,7 +210,7 @@ namespace Lucene.Net.Index
Fields fields = Fields;
if (fields != null)
{
- Terms terms = fields.Terms(term.Field);
+ Terms terms = fields.GetTerms(term.Field);
if (terms != null)
{
TermsEnum termsEnum = terms.GetIterator(null);
@@ -235,7 +235,7 @@ namespace Lucene.Net.Index
Fields fields = Fields;
if (fields != null)
{
- Terms terms = fields.Terms(term.Field);
+ Terms terms = fields.GetTerms(term.Field);
if (terms != null)
{
TermsEnum termsEnum = terms.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs b/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
index 4db8b0d..9ae9d7f 100644
--- a/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
+++ b/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
@@ -481,7 +481,7 @@ namespace Lucene.Net.Index
{
Debug.Assert(currentField == null || currentField.CompareTo(term.Field) < 0);
currentField = term.Field;
- Terms terms = fields.Terms(currentField);
+ Terms terms = fields.GetTerms(currentField);
if (terms != null)
{
termsEnum = terms.GetIterator(termsEnum);
@@ -586,7 +586,7 @@ namespace Lucene.Net.Index
// if we change the code to process updates in terms order, enable this assert
// assert currentField == null || currentField.compareTo(term.field()) < 0;
currentField = term.Field;
- Terms terms = fields.Terms(currentField);
+ Terms terms = fields.GetTerms(currentField);
if (terms != null)
{
termsEnum = terms.GetIterator(termsEnum);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/CheckIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/CheckIndex.cs b/src/Lucene.Net.Core/Index/CheckIndex.cs
index a26eb30..0468e20 100644
--- a/src/Lucene.Net.Core/Index/CheckIndex.cs
+++ b/src/Lucene.Net.Core/Index/CheckIndex.cs
@@ -1036,7 +1036,7 @@ namespace Lucene.Net.Index
// assert fields.terms(field) != null;
computedFieldCount++;
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
if (terms == null)
{
continue;
@@ -1443,7 +1443,7 @@ namespace Lucene.Net.Index
}
}
- Terms fieldTerms = fields.Terms(field);
+ Terms fieldTerms = fields.GetTerms(field);
if (fieldTerms == null)
{
// Unusual: the FieldsEnum returned a field but
@@ -1467,7 +1467,7 @@ namespace Lucene.Net.Index
if (sumTotalTermFreq != 0)
{
- long v = fields.Terms(field).SumTotalTermFreq;
+ long v = fields.GetTerms(field).SumTotalTermFreq;
if (v != -1 && sumTotalTermFreq != v)
{
throw new Exception("sumTotalTermFreq for field " + field + "=" + v + " != recomputed sumTotalTermFreq=" + sumTotalTermFreq);
@@ -1476,7 +1476,7 @@ namespace Lucene.Net.Index
if (sumDocFreq != 0)
{
- long v = fields.Terms(field).SumDocFreq;
+ long v = fields.GetTerms(field).SumDocFreq;
if (v != -1 && sumDocFreq != v)
{
throw new Exception("sumDocFreq for field " + field + "=" + v + " != recomputed sumDocFreq=" + sumDocFreq);
@@ -1518,7 +1518,7 @@ namespace Lucene.Net.Index
if ((status.DelTermCount + status.TermCount) - termCountStart > 0)
{
- termCount = fields.Terms(field).Count;
+ termCount = fields.GetTerms(field).Count;
if (termCount != -1 && termCount != status.DelTermCount + status.TermCount - termCountStart)
{
@@ -2132,13 +2132,13 @@ namespace Lucene.Net.Index
if (crossCheckTermVectors)
{
- Terms terms = tfv.Terms(field);
+ Terms terms = tfv.GetTerms(field);
termsEnum = terms.GetIterator(termsEnum);
bool postingsHasFreq = fieldInfo.IndexOptions >= IndexOptions.DOCS_AND_FREQS;
bool postingsHasPayload = fieldInfo.HasPayloads;
bool vectorsHasPayload = terms.HasPayloads;
- Terms postingsTerms = postingsFields.Terms(field);
+ Terms postingsTerms = postingsFields.GetTerms(field);
if (postingsTerms == null)
{
throw new Exception("vector field=" + field + " does not exist in postings; doc=" + j);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/DocTermOrds.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocTermOrds.cs b/src/Lucene.Net.Core/Index/DocTermOrds.cs
index 0c087ca..5a6884c 100644
--- a/src/Lucene.Net.Core/Index/DocTermOrds.cs
+++ b/src/Lucene.Net.Core/Index/DocTermOrds.cs
@@ -270,7 +270,7 @@ namespace Lucene.Net.Index
{
return null;
}
- Terms terms = fields.Terms(m_field);
+ Terms terms = fields.GetTerms(m_field);
if (terms == null)
{
return null;
@@ -345,7 +345,7 @@ namespace Lucene.Net.Index
// No terms
return;
}
- Terms terms = fields.Terms(m_field);
+ Terms terms = fields.GetTerms(m_field);
if (terms == null)
{
// No terms
@@ -750,7 +750,7 @@ namespace Lucene.Net.Index
InitializeInstanceFields();
Debug.Assert(outerInstance.m_indexedTermsArray != null);
- termsEnum = reader.Fields.Terms(outerInstance.m_field).GetIterator(null);
+ termsEnum = reader.Fields.GetTerms(outerInstance.m_field).GetIterator(null);
}
public override IComparer<BytesRef> Comparer
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/Fields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/Fields.cs b/src/Lucene.Net.Core/Index/Fields.cs
index f98fd98..c3ebb96 100644
--- a/src/Lucene.Net.Core/Index/Fields.cs
+++ b/src/Lucene.Net.Core/Index/Fields.cs
@@ -48,10 +48,10 @@ namespace Lucene.Net.Index
}
/// <summary>
- /// Get the <seealso cref="Terms"/> for this field. this will return
+ /// Get the <seealso cref="GetTerms"/> for this field. this will return
/// null if the field does not exist.
/// </summary>
- public abstract Terms Terms(string field); // LUCENENET TODO: Rename GetTerms() ?
+ public abstract Terms GetTerms(string field);
/// <summary>
/// Gets the number of fields or -1 if the number of
@@ -79,7 +79,7 @@ namespace Lucene.Net.Index
long numTerms = 0;
foreach (string field in this)
{
- Terms terms = Terms(field);
+ Terms terms = GetTerms(field);
if (terms != null)
{
long termCount = terms.Count;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/FilterAtomicReader.cs b/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
index b700d1b..ceea3b5 100644
--- a/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
+++ b/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
@@ -81,9 +81,9 @@ namespace Lucene.Net.Index
return m_input.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
- return m_input.Terms(field);
+ return m_input.GetTerms(field);
}
public override int Count
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/IndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexReader.cs b/src/Lucene.Net.Core/Index/IndexReader.cs
index f445715..8c839da 100644
--- a/src/Lucene.Net.Core/Index/IndexReader.cs
+++ b/src/Lucene.Net.Core/Index/IndexReader.cs
@@ -461,7 +461,7 @@ namespace Lucene.Net.Index
{
return null;
}
- return vectors.Terms(field);
+ return vectors.GetTerms(field);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/MultiFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/MultiFields.cs b/src/Lucene.Net.Core/Index/MultiFields.cs
index b4f0081..1b0ce69 100644
--- a/src/Lucene.Net.Core/Index/MultiFields.cs
+++ b/src/Lucene.Net.Core/Index/MultiFields.cs
@@ -150,7 +150,7 @@ namespace Lucene.Net.Index
}
else
{
- return fields.Terms(field);
+ return fields.GetTerms(field);
}
}
@@ -244,7 +244,7 @@ namespace Lucene.Net.Index
return new MergedIterator<string>(subIterators);
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
Terms result;
terms.TryGetValue(field, out result);
@@ -261,7 +261,7 @@ namespace Lucene.Net.Index
// Gather all sub-readers that share this field
for (int i = 0; i < subs.Length; i++)
{
- Terms terms = subs[i].Terms(field);
+ Terms terms = subs[i].GetTerms(field);
if (terms != null)
{
subs2.Add(terms);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/ParallelAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/ParallelAtomicReader.cs b/src/Lucene.Net.Core/Index/ParallelAtomicReader.cs
index 67ca41a..3e89924 100644
--- a/src/Lucene.Net.Core/Index/ParallelAtomicReader.cs
+++ b/src/Lucene.Net.Core/Index/ParallelAtomicReader.cs
@@ -150,7 +150,7 @@ namespace Lucene.Net.Index
// only add if the reader responsible for that field name is the current:
if (fieldToReader[field].Equals(reader))
{
- this.fields.AddField(field, readerFields.Terms(field));
+ this.fields.AddField(field, readerFields.GetTerms(field));
}
}
}
@@ -208,7 +208,7 @@ namespace Lucene.Net.Index
return fields.Keys.GetEnumerator();
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
Terms ret;
fields.TryGetValue(field, out ret);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Index/TermContext.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/TermContext.cs b/src/Lucene.Net.Core/Index/TermContext.cs
index 42a6afd..bf6244f 100644
--- a/src/Lucene.Net.Core/Index/TermContext.cs
+++ b/src/Lucene.Net.Core/Index/TermContext.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.Index
Fields fields = ctx.AtomicReader.Fields;
if (fields != null)
{
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
if (terms != null)
{
TermsEnum termsEnum = terms.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs b/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs
index 189b1ca..17004d5 100644
--- a/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs
+++ b/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs
@@ -106,7 +106,7 @@ namespace Lucene.Net.Search
return null;
}
- Terms terms = fields.Terms(m_query.m_field);
+ Terms terms = fields.GetTerms(m_query.m_field);
if (terms == null)
{
// field does not exist
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs b/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
index 0d129a6..b96b5e5 100644
--- a/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
+++ b/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
@@ -132,7 +132,7 @@ namespace Lucene.Net.Search.Spans
Fields fields = context.AtomicReader.Fields;
if (fields != null)
{
- Terms terms = fields.Terms(m_term.Field);
+ Terms terms = fields.GetTerms(m_term.Field);
if (terms != null)
{
TermsEnum termsEnum = terms.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Core/Search/TermCollectingRewrite.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/TermCollectingRewrite.cs b/src/Lucene.Net.Core/Search/TermCollectingRewrite.cs
index c256e1a..d0ea128 100644
--- a/src/Lucene.Net.Core/Search/TermCollectingRewrite.cs
+++ b/src/Lucene.Net.Core/Search/TermCollectingRewrite.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Search
continue;
}
- Terms terms = fields.Terms(query.m_field);
+ Terms terms = fields.GetTerms(query.m_field);
if (terms == null)
{
// field does not exist
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs b/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
index 5800ce5..842eedf 100644
--- a/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
+++ b/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
@@ -108,7 +108,7 @@ namespace Lucene.Net.Search.Highlight
TokenStream ts = null;
Fields vectors = reader.GetTermVectors(docId);
- Terms vector = vectors?.Terms(field);
+ Terms vector = vectors?.GetTerms(field);
if (vector != null)
{
ts = GetTokenStream(vector);
@@ -131,7 +131,7 @@ namespace Lucene.Net.Search.Highlight
TokenStream ts = null;
Fields vectors = reader.GetTermVectors(docId);
- Terms vector = vectors?.Terms(field);
+ Terms vector = vectors?.GetTerms(field);
if (vector != null)
{
ts = GetTokenStream(vector);
@@ -302,7 +302,7 @@ namespace Lucene.Net.Search.Highlight
return null;
}
- Terms vector = vectors.Terms(field);
+ Terms vector = vectors.GetTerms(field);
if (vector == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
index c31005e..029c047 100644
--- a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
+++ b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
@@ -418,9 +418,9 @@ namespace Lucene.Net.Search.Highlight
{
public DelegatingFilterFields(Fields fields) : base(fields) { }
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
- return base.Terms(DelegatingAtomicReader.FIELD_NAME);
+ return base.GetTerms(DelegatingAtomicReader.FIELD_NAME);
}
public override IEnumerator<string> GetEnumerator()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs b/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
index 9b8b8e6..ad83dbc 100644
--- a/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
+++ b/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Search.VectorHighlight
return;
}
- Terms vector = vectors.Terms(fieldName);
+ Terms vector = vectors.GetTerms(fieldName);
if (vector == null)
{
// null snippet
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
index 636925f..2cf38f1 100644
--- a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
+++ b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
@@ -153,7 +153,7 @@ namespace Lucene.Net.Index.Memory
}
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
var searchField = new KeyValuePair<string, Info>(field, null);
int i = Array.BinarySearch(outerInstance.outerInstance.sortedFields, searchField, new TermComparer<string, Info>());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
index 6b4e60d..79cb7e6 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
@@ -57,9 +57,9 @@ namespace Lucene.Net.Index.Sorter
this.infos = infos;
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
- Terms terms = this.m_input.Terms(field);
+ Terms terms = this.m_input.GetTerms(field);
if (terms == null)
{
return null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs b/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
index 6675a52..b898e9a 100644
--- a/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
+++ b/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.Misc
{
throw new Exception("field " + field + " not found");
}
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
if (terms != null)
{
TermsEnum termsEnum = terms.GetIterator(null);
@@ -123,7 +123,7 @@ namespace Lucene.Net.Misc
tiq = new TermStatsQueue(numTerms, comparer);
foreach (string fieldName in fields)
{
- Terms terms = fields.Terms(fieldName);
+ Terms terms = fields.GetTerms(fieldName);
if (terms != null)
{
tiq.Fill(fieldName, terms.GetIterator(null));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Queries/CommonTermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs
index 8735514..59a2620 100644
--- a/src/Lucene.Net.Queries/CommonTermsQuery.cs
+++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs
@@ -260,7 +260,7 @@ namespace Lucene.Net.Queries
{
Term term = queryTerms[i];
TermContext termContext = contextArray[i];
- Terms terms = fields.Terms(term.Field);
+ Terms terms = fields.GetTerms(term.Field);
if (terms == null)
{
// field does not exist
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
index 0ffc576..9b9e183 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
continue;
}
- Terms terms = fields.Terms(m_indexedField);
+ Terms terms = fields.GetTerms(m_indexedField);
if (terms == null)
{
continue;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
index 2ffe4f8..ecce892 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
var fields = readerContext.AtomicReader.Fields;
- var terms = fields.Terms(m_indexedField);
+ var terms = fields.GetTerms(m_indexedField);
var searcher = (IndexSearcher)context["searcher"];
var similarity = IDFValueSource.AsTFIDF(searcher.Similarity, m_indexedField);
if (similarity == null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
index 96b9ad7..eefea68 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
Fields fields = readerContext.AtomicReader.Fields;
- Terms terms = fields.Terms(m_indexedField);
+ Terms terms = fields.GetTerms(m_indexedField);
return new Int32DocValuesAnonymousInnerClassHelper(this, this, terms);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 9ab7dc9..d557213 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -507,7 +507,7 @@ namespace Lucene.Net.Queries.Mlt
Terms vector;
if (vectors != null)
{
- vector = vectors.Terms(fieldName);
+ vector = vectors.GetTerms(fieldName);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Queries/TermsFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs
index 8e13032..3a82206 100644
--- a/src/Lucene.Net.Queries/TermsFilter.cs
+++ b/src/Lucene.Net.Queries/TermsFilter.cs
@@ -234,7 +234,7 @@ namespace Lucene.Net.Queries
DocsEnum docs = null;
foreach (TermsAndField termsAndField in this.termsAndFields)
{
- if ((terms = fields.Terms(termsAndField.field)) != null)
+ if ((terms = fields.GetTerms(termsAndField.field)) != null)
{
termsEnum = terms.GetIterator(termsEnum); // this won't return null
for (int i = termsAndField.start; i < termsAndField.end; i++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs b/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
index 3b97d06..7e7cc39 100644
--- a/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
+++ b/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Sandbox.Queries
private FixedBitSet CorrectBits(AtomicReader reader, IBits acceptDocs)
{
FixedBitSet bits = new FixedBitSet(reader.MaxDoc); //assume all are INvalid
- Terms terms = reader.Fields.Terms(fieldName);
+ Terms terms = reader.Fields.GetTerms(fieldName);
if (terms == null)
{
@@ -122,7 +122,7 @@ namespace Lucene.Net.Sandbox.Queries
{
FixedBitSet bits = new FixedBitSet(reader.MaxDoc);
bits.Set(0, reader.MaxDoc); //assume all are valid
- Terms terms = reader.Fields.Terms(fieldName);
+ Terms terms = reader.Fields.GetTerms(fieldName);
if (terms == null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Codecs/asserting/AssertingPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/asserting/AssertingPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/asserting/AssertingPostingsFormat.cs
index 0fa200f..41e48e5 100644
--- a/src/Lucene.Net.TestFramework/Codecs/asserting/AssertingPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/asserting/AssertingPostingsFormat.cs
@@ -81,9 +81,9 @@ namespace Lucene.Net.Codecs.asserting
return iterator;
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
- Terms terms = @in.Terms(field);
+ Terms terms = @in.GetTerms(field);
return terms == null ? null : new AssertingAtomicReader.AssertingTerms(terms);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
index 2a10d2b..b818169 100644
--- a/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Codecs.ramonly
{
internal readonly IDictionary<string, RAMField> FieldToTerms = new SortedDictionary<string, RAMField>();
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
return FieldToTerms[field];
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
index 6fcdc14..a44c3e1 100644
--- a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
+++ b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
@@ -73,9 +73,9 @@ namespace Lucene.Net.Index
return iterator;
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
- Terms terms = base.Terms(field);
+ Terms terms = base.GetTerms(field);
return terms == null ? null : new AssertingTerms(terms);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index 4774c67..397050f 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -1145,7 +1145,7 @@ namespace Lucene.Net.Index
termState = termStates[idx];
}
- Terms terms = fieldsSource.Terms(fieldAndTerm.Field);
+ Terms terms = fieldsSource.GetTerms(fieldAndTerm.Field);
Assert.IsNotNull(terms);
termsEnum = terms.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index b3822d2..fb903a8 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -498,7 +498,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < doc.FieldNames.Length; ++i)
{
- AssertEquals(doc.TokenStreams[i], doc.FieldTypes[i], fields.Terms(doc.FieldNames[i]));
+ AssertEquals(doc.TokenStreams[i], doc.FieldTypes[i], fields.GetTerms(doc.FieldNames[i]));
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Index/FieldFilterAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/FieldFilterAtomicReader.cs b/src/Lucene.Net.TestFramework/Index/FieldFilterAtomicReader.cs
index a2414d2..e3e66dc 100644
--- a/src/Lucene.Net.TestFramework/Index/FieldFilterAtomicReader.cs
+++ b/src/Lucene.Net.TestFramework/Index/FieldFilterAtomicReader.cs
@@ -215,9 +215,9 @@ namespace Lucene.Net.Index
}
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
- return OuterInstance.HasField(field) ? base.Terms(field) : null;
+ return OuterInstance.HasField(field) ? base.GetTerms(field) : null;
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index f2ee00b..a751ff6 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -472,7 +472,7 @@ namespace Lucene.Net.Index
{
continue;
}
- Terms terms = fields.Terms("body");
+ Terms terms = fields.GetTerms("body");
if (terms == null)
{
continue;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 8bc158b..0111ce3 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -1890,7 +1890,7 @@ namespace Lucene.Net.Util
string field = leftEnum.Current;
rightEnum.MoveNext();
Assert.AreEqual(field, rightEnum.Current, info);
- AssertTermsEquals(info, leftReader, leftFields.Terms(field), rightFields.Terms(field), deep);
+ AssertTermsEquals(info, leftReader, leftFields.GetTerms(field), rightFields.GetTerms(field), deep);
}
Assert.IsFalse(rightEnum.MoveNext());
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
index 161c3b9..43f4790 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Analysis.Sinks
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- Terms vector = r.GetTermVectors(0).Terms("field");
+ Terms vector = r.GetTermVectors(0).GetTerms("field");
assertEquals(1, vector.Count);
TermsEnum termsEnum = vector.GetIterator(null);
termsEnum.Next();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs
index 8ff521a..63b1db2 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs
@@ -374,7 +374,7 @@ namespace Lucene.Net.Search.Highlight
// Do this twice, once passing true and then passing
// false: they are entirely different code paths
// under-the-hood:
- TokenStream ts = TokenSources.GetTokenStream(reader.GetTermVectors(0).Terms("field"), i == 0);
+ TokenStream ts = TokenSources.GetTokenStream(reader.GetTermVectors(0).GetTerms("field"), i == 0);
ICharTermAttribute termAtt = ts.GetAttribute<ICharTermAttribute>();
IPositionIncrementAttribute posIncAtt = ts.GetAttribute<IPositionIncrementAttribute>();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
index ae11e87..fef76e2 100644
--- a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
+++ b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
@@ -131,7 +131,7 @@ namespace Lucene.Net.Index.Memory
Fields memFields = memIndexReader.Fields;
foreach (string field in competitor.Fields)
{
- Terms memTerms = memFields.Terms(field);
+ Terms memTerms = memFields.GetTerms(field);
Terms iwTerms = memIndexReader.Terms(field);
if (iwTerms == null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
index d1f429c..cd8f315 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
@@ -367,7 +367,7 @@ namespace Lucene.Net.Analysis
writer.AddDocument(doc, a);
AtomicReader reader = GetOnlySegmentReader(writer.Reader);
Fields fields = reader.GetTermVectors(0);
- Terms terms = fields.Terms("f");
+ Terms terms = fields.GetTerms("f");
TermsEnum te = terms.GetIterator(null);
Assert.AreEqual(new BytesRef("a"), te.Next());
DocsAndPositionsEnum dpe = te.DocsAndPositions(null, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
index 625e769..d4b1b63 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -137,7 +137,7 @@ namespace Lucene.Net.Codecs.Lucene3x
int termCount = 0;
foreach (string field in fields)
{
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
Assert.IsNotNull(terms);
TermsEnum termsEnum = terms.GetIterator(null);
BytesRef text;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index b661f08..2d9dd05 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -169,7 +169,7 @@ namespace Lucene.Net.Codecs.Lucene3x
Fields fields = MultiFields.GetFields(reader);
foreach (string field in fields)
{
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
Assert.IsNotNull(terms);
TermsEnum termsEnum = terms.GetIterator(null);
while (termsEnum.Next() != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index 11b108b..2a73911 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -406,7 +406,7 @@ namespace Lucene.Net.Documents
foreach (string field in new string[] { "tv", "tv_pos", "tv_off", "tv_pos_off" })
{
Fields tvFields = r.GetTermVectors(0);
- Terms tvs = tvFields.Terms(field);
+ Terms tvs = tvFields.GetTerms(field);
Assert.IsNotNull(tvs);
Assert.AreEqual(2, tvs.Count);
TermsEnum tvsEnum = tvs.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
index 96c40ab..e46e342 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -476,7 +476,7 @@ namespace Lucene.Net.Index
Fields tfvFields = reader.GetTermVectors(i);
Assert.IsNotNull(tfvFields, "i=" + i);
- Terms tfv = tfvFields.Terms("utf8");
+ Terms tfv = tfvFields.GetTerms("utf8");
Assert.IsNotNull(tfv, "docID=" + i + " index=" + oldName);
}
else
@@ -787,7 +787,7 @@ namespace Lucene.Net.Index
{
Directory dir = OldIndexDirs[name];
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum terms = MultiFields.GetFields(r).Terms("content").GetIterator(null);
+ TermsEnum terms = MultiFields.GetFields(r).GetTerms("content").GetIterator(null);
BytesRef t = terms.Next();
Assert.IsNotNull(t);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
index eeadaa4..45b09c1 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -447,7 +447,7 @@ namespace Lucene.Net.Index
Fields tfvFields = reader.GetTermVectors(i);
Assert.IsNotNull(tfvFields, "i=" + i);
- Terms tfv = tfvFields.Terms("utf8");
+ Terms tfv = tfvFields.GetTerms("utf8");
Assert.IsNotNull(tfv, "docID=" + i + " index=" + oldName);
}
else
@@ -744,7 +744,7 @@ namespace Lucene.Net.Index
{
Directory dir = OldIndexDirs[name];
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum terms = MultiFields.GetFields(r).Terms("content").GetIterator(null);
+ TermsEnum terms = MultiFields.GetFields(r).GetTerms("content").GetIterator(null);
BytesRef t = terms.Next();
Assert.IsNotNull(t);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
index 80e1d87..e798da9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -404,7 +404,7 @@ namespace Lucene.Net.Index
fieldsEnum.MoveNext();
string fieldName = fieldsEnum.Current;
Assert.IsNotNull(fieldName);
- Terms terms2 = reader.Terms(fieldName);
+ Terms terms2 = reader.GetTerms(fieldName);
Assert.IsNotNull(terms2);
TermsEnum termsEnum = terms2.GetIterator(null);
@@ -629,7 +629,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < NUM_TEST_ITER; iter++)
{
FieldData field = Fields[Random().Next(Fields.Length)];
- TermsEnum termsEnum = TermsDict.Terms(field.FieldInfo.Name).GetIterator(null);
+ TermsEnum termsEnum = TermsDict.GetTerms(field.FieldInfo.Name).GetIterator(null);
#pragma warning disable 612, 618
if (Si.Codec is Lucene3xCodec)
#pragma warning restore 612, 618
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index 62fd676..14fea69 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -68,7 +68,7 @@ namespace Lucene.Net.Index
Document newDoc2 = reader.Document(1);
Assert.IsTrue(newDoc2 != null);
Assert.IsTrue(DocHelper.NumFields(newDoc2) == DocHelper.NumFields(doc2) - DocHelper.Unstored.Count);
- Terms vector = reader.GetTermVectors(0).Terms(DocHelper.TEXT_FIELD_2_KEY);
+ Terms vector = reader.GetTermVectors(0).GetTerms(DocHelper.TEXT_FIELD_2_KEY);
Assert.IsNotNull(vector);
reader.Dispose();
@@ -662,15 +662,15 @@ namespace Lucene.Net.Index
{
fenum2.MoveNext();
Assert.AreEqual(field1, fenum2.Current, "Different fields");
- Terms terms1 = fields1.Terms(field1);
+ Terms terms1 = fields1.GetTerms(field1);
if (terms1 == null)
{
- Assert.IsNull(fields2.Terms(field1));
+ Assert.IsNull(fields2.GetTerms(field1));
continue;
}
TermsEnum enum1 = terms1.GetIterator(null);
- Terms terms2 = fields2.Terms(field1);
+ Terms terms2 = fields2.GetTerms(field1);
Assert.IsNotNull(terms2);
TermsEnum enum2 = terms2.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestDoc.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDoc.cs b/src/Lucene.Net.Tests/core/Index/TestDoc.cs
index 482c3ec..bd65361 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDoc.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDoc.cs
@@ -247,7 +247,7 @@ namespace Lucene.Net.Index
Fields fields = reader.Fields;
foreach (string field in fields)
{
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
Assert.IsNotNull(terms);
TermsEnum tis = terms.GetIterator(null);
while (tis.Next() != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
index 6322786..3ac9a3c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Index
}
foreach (string field in fields)
{
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
if (terms == null)
{
continue;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs b/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
index ea81441..fe61f04 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
@@ -355,11 +355,11 @@ namespace Lucene.Net.Index
IndexReader reader = DirectoryReader.Open(Dir);
// f1
- Terms tfv1 = reader.GetTermVectors(0).Terms("f1");
+ Terms tfv1 = reader.GetTermVectors(0).GetTerms("f1");
Assert.IsNotNull(tfv1);
Assert.AreEqual(2, tfv1.Count, "the 'with_tv' setting should rule!");
// f2
- Terms tfv2 = reader.GetTermVectors(0).Terms("f2");
+ Terms tfv2 = reader.GetTermVectors(0).GetTerms("f2");
Assert.IsNotNull(tfv2);
Assert.AreEqual(2, tfv2.Count, "the 'with_tv' setting should rule!");
reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs b/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
index ff95c85..f22c0ee 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
@@ -48,9 +48,9 @@ namespace Lucene.Net.Index
{
}
- public override Terms Terms(string field)
+ public override Terms GetTerms(string field)
{
- return new TestTerms(base.Terms(field));
+ return new TestTerms(base.GetTerms(field));
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestFlex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFlex.cs b/src/Lucene.Net.Tests/core/Index/TestFlex.cs
index 4c6a924..01cd762 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlex.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlex.cs
@@ -80,7 +80,7 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
w.ForceMerge(1);
DirectoryReader r = w.Reader;
- TermsEnum terms = GetOnlySegmentReader(r).Fields.Terms("f").GetIterator(null);
+ TermsEnum terms = GetOnlySegmentReader(r).Fields.GetTerms("f").GetIterator(null);
Assert.IsTrue(terms.Next() != null);
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index de2d69c..1c3a56a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -917,7 +917,7 @@ namespace Lucene.Net.Index
writer.Dispose();
DirectoryReader reader = DirectoryReader.Open(dir);
AtomicReader subreader = GetOnlySegmentReader(reader);
- TermsEnum te = subreader.Fields.Terms("").GetIterator(null);
+ TermsEnum te = subreader.Fields.GetTerms("").GetIterator(null);
Assert.AreEqual(new BytesRef("a"), te.Next());
Assert.AreEqual(new BytesRef("b"), te.Next());
Assert.AreEqual(new BytesRef("c"), te.Next());
@@ -940,7 +940,7 @@ namespace Lucene.Net.Index
writer.Dispose();
DirectoryReader reader = DirectoryReader.Open(dir);
AtomicReader subreader = GetOnlySegmentReader(reader);
- TermsEnum te = subreader.Fields.Terms("").GetIterator(null);
+ TermsEnum te = subreader.Fields.GetTerms("").GetIterator(null);
Assert.AreEqual(new BytesRef(""), te.Next());
Assert.AreEqual(new BytesRef("a"), te.Next());
Assert.AreEqual(new BytesRef("b"), te.Next());
@@ -1077,7 +1077,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- Terms tpv = r.GetTermVectors(0).Terms("field");
+ Terms tpv = r.GetTermVectors(0).GetTerms("field");
TermsEnum termsEnum = tpv.GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
@@ -1582,7 +1582,7 @@ namespace Lucene.Net.Index
w.AddDocument(d);
AtomicReader r = GetOnlySegmentReader(w.Reader);
- TermsEnum t = r.Fields.Terms("field").GetIterator(null);
+ TermsEnum t = r.Fields.GetTerms("field").GetIterator(null);
int count = 0;
while (t.Next() != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
index 251f05d..e9fdbf4 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
@@ -149,7 +149,7 @@ namespace Lucene.Net.Index
private void CheckTermsOrder(IndexReader r, ISet<string> allTerms, bool isTop)
{
- TermsEnum terms = MultiFields.GetFields(r).Terms("f").GetIterator(null);
+ TermsEnum terms = MultiFields.GetFields(r).GetTerms("f").GetIterator(null);
BytesRef last = new BytesRef();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index a3d76b0..88402dd 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -318,7 +318,7 @@ namespace Lucene.Net.Index
bool tv = counter % 2 == 1 && fieldID != 9;
if (tv)
{
- Terms tfv = r.GetTermVectors(docID).Terms(name);
+ Terms tfv = r.GetTermVectors(docID).GetTerms(name);
Assert.IsNotNull(tfv);
TermsEnum termsEnum = tfv.GetIterator(null);
Assert.AreEqual(new BytesRef("" + counter), termsEnum.Next());
@@ -342,7 +342,7 @@ namespace Lucene.Net.Index
else
{
Fields vectors = r.GetTermVectors(docID);
- Assert.IsTrue(vectors == null || vectors.Terms(name) == null);
+ Assert.IsTrue(vectors == null || vectors.GetTerms(name) == null);
}
BooleanQuery bq = new BooleanQuery();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs b/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
index db90e9f..9b6ac85 100644
--- a/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
@@ -109,17 +109,17 @@ namespace Lucene.Net.Index
fe.MoveNext();
string f = fe.Current;
Assert.AreEqual("field1", f);
- CheckTerms(fields.Terms(f), liveDocs, "brown", "fox", "jumps", "quick", "the");
+ CheckTerms(fields.GetTerms(f), liveDocs, "brown", "fox", "jumps", "quick", "the");
fe.MoveNext();
f = fe.Current;
Assert.AreEqual("field2", f);
- CheckTerms(fields.Terms(f), liveDocs, "brown", "fox", "jumps", "quick", "the");
+ CheckTerms(fields.GetTerms(f), liveDocs, "brown", "fox", "jumps", "quick", "the");
fe.MoveNext();
f = fe.Current;
Assert.AreEqual("field3", f);
- CheckTerms(fields.Terms(f), liveDocs, "dog", "fox", "jumps", "lazy", "over", "the");
+ CheckTerms(fields.GetTerms(f), liveDocs, "dog", "fox", "jumps", "lazy", "over", "the");
Assert.IsFalse(fe.MoveNext());
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
index ec64145..5c106d9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
@@ -493,7 +493,7 @@ namespace Lucene.Net.Index
}
writer.Dispose();
IndexReader reader = DirectoryReader.Open(dir);
- TermsEnum terms = MultiFields.GetFields(reader).Terms(field).GetIterator(null);
+ TermsEnum terms = MultiFields.GetFields(reader).GetTerms(field).GetIterator(null);
IBits liveDocs = MultiFields.GetLiveDocs(reader);
DocsAndPositionsEnum tp = null;
while (terms.Next() != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs b/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
index b52811b..ce7e767 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
@@ -245,7 +245,7 @@ namespace Lucene.Net.Index
public virtual int[] ToDocsArray(Term term, IBits bits, IndexReader reader)
{
Fields fields = MultiFields.GetFields(reader);
- Terms cterms = fields.Terms(term.Field);
+ Terms cterms = fields.GetTerms(term.Field);
TermsEnum ctermsEnum = cterms.GetIterator(null);
if (ctermsEnum.SeekExact(new BytesRef(term.Text())))
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
index 3d05e9a..706987e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
@@ -327,7 +327,7 @@ namespace Lucene.Net.Index
// TODO: improve this
AtomicReader sub = (AtomicReader)ctx.Reader;
//System.out.println("\nsub=" + sub);
- TermsEnum termsEnum = sub.Fields.Terms("content").GetIterator(null);
+ TermsEnum termsEnum = sub.Fields.GetTerms("content").GetIterator(null);
DocsEnum docs = null;
DocsAndPositionsEnum docsAndPositions = null;
DocsAndPositionsEnum docsAndPositionsAndOffsets = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
index f73c270..30786b5 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Index
//System.out.println("stored size: " + stored.Size());
Assert.AreEqual(3, tvCount, "We do not have 3 fields that were indexed with term vector");
- Terms vector = mergedReader.GetTermVectors(0).Terms(DocHelper.TEXT_FIELD_2_KEY);
+ Terms vector = mergedReader.GetTermVectors(0).GetTerms(DocHelper.TEXT_FIELD_2_KEY);
Assert.IsNotNull(vector);
Assert.AreEqual(3, vector.Count);
TermsEnum termsEnum = vector.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
index effcd5c..b98287d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Index
Fields fields = MultiFields.GetFields(Reader);
foreach (string field in fields)
{
- Terms terms = fields.Terms(field);
+ Terms terms = fields.GetTerms(field);
Assert.IsNotNull(terms);
TermsEnum termsEnum = terms.GetIterator(null);
while (termsEnum.Next() != null)
@@ -208,7 +208,7 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestTermVectors()
{
- Terms result = Reader.GetTermVectors(0).Terms(DocHelper.TEXT_FIELD_2_KEY);
+ Terms result = Reader.GetTermVectors(0).GetTerms(DocHelper.TEXT_FIELD_2_KEY);
Assert.IsNotNull(result);
Assert.AreEqual(3, result.Count);
TermsEnum termsEnum = result.GetIterator(null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
index dc8d8a9..f876774 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(reader != null);
Assert.AreEqual(indexDivisor, reader.TermInfosIndexDivisor);
- TermsEnum terms = reader.Fields.Terms(DocHelper.TEXT_FIELD_2_KEY).GetIterator(null);
+ TermsEnum terms = reader.Fields.GetTerms(DocHelper.TEXT_FIELD_2_KEY).GetIterator(null);
terms.SeekCeil(new BytesRef("field"));
DocsEnum termDocs = TestUtil.Docs(Random(), terms, reader.LiveDocs, null, DocsEnum.FLAG_FREQS);
if (termDocs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
index e6bdca3..3ed504b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Index
AddDoc(writer, "aaa bbb");
writer.Dispose();
SegmentReader reader = GetOnlySegmentReader(DirectoryReader.Open(Dir));
- TermsEnum terms = reader.Fields.Terms("content").GetIterator(null);
+ TermsEnum terms = reader.Fields.GetTerms("content").GetIterator(null);
Assert.IsNotNull(terms.Next());
Assert.AreEqual("aaa", terms.Term.Utf8ToString());
Assert.IsNotNull(terms.Next());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/52da783d/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
index aeefc90..c6c4521 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
@@ -91,7 +91,7 @@ namespace Lucene.Net.Index
bDocIDs.Add(docID);
}
}
- TermsEnum te = GetOnlySegmentReader(r).Fields.Terms("field").GetIterator(null);
+ TermsEnum te = GetOnlySegmentReader(r).Fields.GetTerms("field").GetIterator(null);
DocsEnum de = null;
for (int iter2 = 0; iter2 < 10; iter2++)