You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/10/02 14:35:45 UTC
[27/50] [abbrv] lucenenet git commit: Updated Suggest member
accessibility to match that of Java.
Updated Suggest member accessibility to match that of Java.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/319fb52b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/319fb52b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/319fb52b
Branch: refs/heads/master
Commit: 319fb52b4f4584a0120760b24c1fd8de3c5f2a1e
Parents: 2a23271
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Sep 17 07:59:29 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Oct 2 17:44:45 2016 +0700
----------------------------------------------------------------------
.../Spell/LuceneDictionary.cs | 2 +-
.../Spell/TermFreqIterator.cs | 4 +--
.../Analyzing/AnalyzingInfixSuggester.cs | 2 +-
.../Suggest/BufferedInputIterator.cs | 2 +-
.../Suggest/BufferingTermFreqIteratorWrapper.cs | 4 +--
.../Suggest/DocumentDictionary.cs | 26 ++++++++++----------
.../Suggest/Fst/ExternalRefSorter.cs | 10 ++++----
.../Suggest/Fst/WFSTCompletionLookup.cs | 10 ++++----
src/Lucene.Net.Suggest/Suggest/InputIterator.cs | 4 +--
.../Suggest/SortedInputIterator.cs | 4 +--
.../Suggest/SortedTermFreqIteratorWrapper.cs | 12 ++++-----
11 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs b/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
index 52f48ed..b881eeb 100644
--- a/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
+++ b/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Search.Spell
this.field = field;
}
- public IInputIterator EntryIterator
+ public virtual IInputIterator EntryIterator
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Spell/TermFreqIterator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Spell/TermFreqIterator.cs b/src/Lucene.Net.Suggest/Spell/TermFreqIterator.cs
index 66a2fd7..a8fedb0 100644
--- a/src/Lucene.Net.Suggest/Spell/TermFreqIterator.cs
+++ b/src/Lucene.Net.Suggest/Spell/TermFreqIterator.cs
@@ -54,12 +54,12 @@ namespace Lucene.Net.Search.Spell
get { return 1; }
}
- public BytesRef Next()
+ public virtual BytesRef Next()
{
return wrapped.Next();
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get { return wrapped.Comparator; }
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
index 4ce7e27..d839260 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
@@ -733,7 +733,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
return false;
}
- public void Dispose()
+ public virtual void Dispose()
{
if (searcherMgr != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/BufferedInputIterator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/BufferedInputIterator.cs b/src/Lucene.Net.Suggest/Suggest/BufferedInputIterator.cs
index 71590d8..e133411 100644
--- a/src/Lucene.Net.Suggest/Suggest/BufferedInputIterator.cs
+++ b/src/Lucene.Net.Suggest/Suggest/BufferedInputIterator.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Search.Suggest
get { return hasPayloads; }
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/BufferingTermFreqIteratorWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/BufferingTermFreqIteratorWrapper.cs b/src/Lucene.Net.Suggest/Suggest/BufferingTermFreqIteratorWrapper.cs
index fa929be..202ba6e 100644
--- a/src/Lucene.Net.Suggest/Suggest/BufferingTermFreqIteratorWrapper.cs
+++ b/src/Lucene.Net.Suggest/Suggest/BufferingTermFreqIteratorWrapper.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search.Suggest
get { return freqs[curPos]; }
}
- public BytesRef Next()
+ public virtual BytesRef Next()
{
if (++curPos < entries.Size())
{
@@ -75,7 +75,7 @@ namespace Lucene.Net.Search.Suggest
return null;
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/DocumentDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/DocumentDictionary.cs b/src/Lucene.Net.Suggest/Suggest/DocumentDictionary.cs
index ff7bc3d..9f8e02c 100644
--- a/src/Lucene.Net.Suggest/Suggest/DocumentDictionary.cs
+++ b/src/Lucene.Net.Suggest/Suggest/DocumentDictionary.cs
@@ -113,16 +113,16 @@ namespace Lucene.Net.Search.Suggest
private readonly DocumentDictionary outerInstance;
- internal readonly int docCount;
- internal readonly HashSet<string> relevantFields;
- internal readonly bool hasPayloads;
- internal readonly bool hasContexts;
- internal readonly Bits liveDocs;
- internal int currentDocId = -1;
- internal long currentWeight;
- internal BytesRef currentPayload;
- internal HashSet<BytesRef> currentContexts;
- internal readonly NumericDocValues weightValues;
+ private readonly int docCount;
+ private readonly HashSet<string> relevantFields;
+ private readonly bool hasPayloads;
+ private readonly bool hasContexts;
+ private readonly Bits liveDocs;
+ private int currentDocId = -1;
+ private long currentWeight;
+ private BytesRef currentPayload;
+ private HashSet<BytesRef> currentContexts;
+ private readonly NumericDocValues weightValues;
/// <summary>
@@ -146,7 +146,7 @@ namespace Lucene.Net.Search.Suggest
get { return currentWeight; }
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get
{
@@ -154,7 +154,7 @@ namespace Lucene.Net.Search.Suggest
}
}
- public BytesRef Next()
+ public virtual BytesRef Next()
{
while (currentDocId < docCount)
{
@@ -247,7 +247,7 @@ namespace Lucene.Net.Search.Suggest
}
}
- internal HashSet<string> GetRelevantFields(params string[] fields)
+ private HashSet<string> GetRelevantFields(params string[] fields)
{
var relevantFields = new HashSet<string>();
foreach (string relevantField in fields)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs b/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
index eb834da..0523f55 100644
--- a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Search.Suggest.Fst
this.writer = new OfflineSorter.ByteSequencesWriter(input);
}
- public void Add(BytesRef utf8)
+ public virtual void Add(BytesRef utf8)
{
if (writer == null)
{
@@ -52,7 +52,7 @@ namespace Lucene.Net.Search.Suggest.Fst
writer.Write(utf8);
}
- public BytesRefIterator GetEnumerator()
+ public virtual BytesRefIterator GetEnumerator()
{
if (sorted == null)
{
@@ -88,7 +88,7 @@ namespace Lucene.Net.Search.Suggest.Fst
/// <summary>
/// Removes any written temporary files.
/// </summary>
- public void Dispose()
+ public virtual void Dispose()
{
try
{
@@ -122,7 +122,7 @@ namespace Lucene.Net.Search.Suggest.Fst
this.comparator = comparator;
}
- public BytesRef Next()
+ public virtual BytesRef Next()
{
if (scratch == null)
{
@@ -155,7 +155,7 @@ namespace Lucene.Net.Search.Suggest.Fst
}
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/Fst/WFSTCompletionLookup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Fst/WFSTCompletionLookup.cs b/src/Lucene.Net.Suggest/Suggest/Fst/WFSTCompletionLookup.cs
index 7186ad5..147d85b 100644
--- a/src/Lucene.Net.Suggest/Suggest/Fst/WFSTCompletionLookup.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Fst/WFSTCompletionLookup.cs
@@ -126,11 +126,11 @@ namespace Lucene.Net.Search.Suggest.Fst
}
public override bool Load(DataInput input)
- {
- count = input.ReadVLong();
- this.fst = new FST<long?>(input, PositiveIntOutputs.Singleton);
- return true;
- }
+ {
+ count = input.ReadVLong();
+ this.fst = new FST<long?>(input, PositiveIntOutputs.Singleton);
+ return true;
+ }
public override IList<LookupResult> DoLookup(string key, IEnumerable<BytesRef> contexts, bool onlyMorePopular, int num)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/InputIterator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/InputIterator.cs b/src/Lucene.Net.Suggest/Suggest/InputIterator.cs
index 9e460d2..f16c88f 100644
--- a/src/Lucene.Net.Suggest/Suggest/InputIterator.cs
+++ b/src/Lucene.Net.Suggest/Suggest/InputIterator.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Search.Suggest
get { return 1; }
}
- public BytesRef Next()
+ public virtual BytesRef Next()
{
return wrapped.Next();
}
@@ -100,7 +100,7 @@ namespace Lucene.Net.Search.Suggest
get { return false; }
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs b/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
index 8e2e8dc..719c76d 100644
--- a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
+++ b/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
@@ -68,7 +68,7 @@ namespace Lucene.Net.Search.Suggest
this.reader = Sort();
}
- public BytesRef Next()
+ public virtual BytesRef Next()
{
bool success = false;
if (done)
@@ -133,7 +133,7 @@ namespace Lucene.Net.Search.Suggest
get { return contexts; }
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/319fb52b/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs b/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
index a9b8efc..ef58e04 100644
--- a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
+++ b/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search.Suggest
this.tieBreakByCostComparator = new ComparatorAnonymousInnerClassHelper(this);
}
- public IComparer<BytesRef> Comparator
+ public virtual IComparer<BytesRef> Comparator
{
get
{
@@ -70,7 +70,7 @@ namespace Lucene.Net.Search.Suggest
}
}
- public BytesRef Next()
+ public virtual BytesRef Next()
{
bool success = false;
if (done)
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search.Suggest
success = true;
return scratch;
}
- Close();
+ Dispose();
success = done = true;
return null;
}
@@ -95,7 +95,7 @@ namespace Lucene.Net.Search.Suggest
if (!success)
{
done = true;
- Close();
+ Dispose();
}
}
}
@@ -182,13 +182,13 @@ namespace Lucene.Net.Search.Suggest
}
finally
{
- Close();
+ Dispose();
}
}
}
}
- private void Close()
+ private void Dispose()
{
IOUtils.Close(reader);
if (tempInput != null)