Lucene.Net.Suggest refactor: renamed all protected fields camelCase prefixed with m_
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/e9db285a Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/e9db285a Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/e9db285a Branch: refs/heads/api-work Commit: e9db285ad1f766ae8b2747b79c6e9a8e667b7fe4 Parents: c2e1a01 Author: Shad Storhaug <[email protected]> Authored: Tue Jan 31 19:40:56 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Tue Jan 31 19:40:56 2017 +0700 ---------------------------------------------------------------------- .../Analyzing/AnalyzingInfixSuggester.cs | 56 ++++++++++---------- .../Suggest/BufferedInputIterator.cs | 38 ++++++------- .../Suggest/BufferingTermFreqIteratorWrapper.cs | 22 ++++---- .../Suggest/DocumentDictionary.cs | 28 +++++----- .../Suggest/DocumentValueSourceDictionary.cs | 6 +-- .../Suggest/UnsortedInputIterator.cs | 24 ++++----- .../Analyzing/AnalyzingInfixSuggesterTest.cs | 2 +- 7 files changed, 88 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e9db285a/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 5dd491d..2899aeb 100644 --- a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs +++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs @@ -66,26 +66,26 @@ namespace Lucene.Net.Search.Suggest.Analyzing /// <summary> /// Field name used for the indexed text. </summary> - protected internal const string TEXT_FIELD_NAME = "text"; + protected const string TEXT_FIELD_NAME = "text"; /// <summary> /// Field name used for the indexed text, as a /// <see cref="StringField"/>, for exact lookup. /// </summary> - protected internal const string EXACT_TEXT_FIELD_NAME = "exacttext"; + protected const string EXACT_TEXT_FIELD_NAME = "exacttext"; /// <summary> /// Field name used for the indexed context, as a /// <see cref="StringField"/> and a <see cref="SortedSetDocValuesField"/>, for filtering. /// </summary> - protected internal const string CONTEXTS_FIELD_NAME = "contexts"; + protected const string CONTEXTS_FIELD_NAME = "contexts"; /// <summary> /// Analyzer used at search time </summary> - protected internal readonly Analyzer queryAnalyzer; + protected readonly Analyzer m_queryAnalyzer; /// <summary> /// Analyzer used at index time </summary> - protected internal readonly Analyzer indexAnalyzer; + protected readonly Analyzer m_indexAnalyzer; internal readonly LuceneVersion matchVersion; private readonly Directory dir; internal readonly int minPrefixChars; @@ -96,7 +96,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing /// <summary> /// <see cref="IndexSearcher"/> used for lookups. </summary> - protected internal SearcherManager searcherMgr; + protected SearcherManager m_searcherMgr; /// <summary> /// Default minimum number of leading characters before @@ -142,8 +142,8 @@ namespace Lucene.Net.Search.Suggest.Analyzing throw new System.ArgumentException("minPrefixChars must be >= 0; got: " + minPrefixChars); } - this.queryAnalyzer = queryAnalyzer; - this.indexAnalyzer = indexAnalyzer; + this.m_queryAnalyzer = queryAnalyzer; + this.m_indexAnalyzer = indexAnalyzer; this.matchVersion = matchVersion; this.dir = dir; this.minPrefixChars = minPrefixChars; @@ -152,7 +152,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing { // Already built; open it: writer = new IndexWriter(dir, GetIndexWriterConfig(matchVersion, GramAnalyzer, OpenMode.APPEND)); - searcherMgr = new SearcherManager(writer, true, null); + m_searcherMgr = new SearcherManager(writer, true, null); } } @@ -187,10 +187,10 @@ namespace Lucene.Net.Search.Suggest.Analyzing public override void Build(IInputIterator iter) { - if (searcherMgr != null) + if (m_searcherMgr != null) { - searcherMgr.Dispose(); - searcherMgr = null; + m_searcherMgr.Dispose(); + m_searcherMgr = null; } if (writer != null) @@ -227,7 +227,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing //System.out.println("initial indexing time: " + ((System.nanoTime()-t0)/1000000) + " msec"); - searcherMgr = new SearcherManager(writer, true, null); + m_searcherMgr = new SearcherManager(writer, true, null); success = true; } finally @@ -264,7 +264,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing protected override Analyzer GetWrappedAnalyzer(string fieldName) { - return outerInstance.indexAnalyzer; + return outerInstance.m_indexAnalyzer; } protected override TokenStreamComponents WrapComponents(string fieldName, TokenStreamComponents components) @@ -347,7 +347,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing /// </summary> public virtual void Refresh() { - searcherMgr.MaybeRefreshBlocking(); + m_searcherMgr.MaybeRefreshBlocking(); } /// <summary> @@ -403,7 +403,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing public virtual IList<LookupResult> DoLookup(string key, IEnumerable<BytesRef> contexts, int num, bool allTermsRequired, bool doHighlight) { - if (searcherMgr == null) + if (m_searcherMgr == null) { throw new InvalidOperationException("suggester was not built"); } @@ -425,7 +425,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing try { - ts = queryAnalyzer.TokenStream("", new StringReader(key)); + ts = m_queryAnalyzer.TokenStream("", new StringReader(key)); //long t0 = System.currentTimeMillis(); ts.Reset(); @@ -517,7 +517,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing // We sorted postings by weight during indexing, so we // only retrieve the first num hits now: ICollector c2 = new EarlyTerminatingSortingCollector(c, SORT, num); - IndexSearcher searcher = searcherMgr.Acquire(); + IndexSearcher searcher = m_searcherMgr.Acquire(); IList<LookupResult> results = null; try { @@ -532,7 +532,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing } finally { - searcherMgr.Release(searcher); + m_searcherMgr.Release(searcher); } //System.out.println((System.currentTimeMillis() - t0) + " msec for infix suggest"); @@ -630,7 +630,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing /// </summary> protected internal virtual object Highlight(string text, IEnumerable<string> matchedTokens, string prefixToken) { - TokenStream ts = queryAnalyzer.TokenStream("text", new StringReader(text)); + TokenStream ts = m_queryAnalyzer.TokenStream("text", new StringReader(text)); try { var termAtt = ts.AddAttribute<ICharTermAttribute>(); @@ -737,10 +737,10 @@ namespace Lucene.Net.Search.Suggest.Analyzing public virtual void Dispose() { - if (searcherMgr != null) + if (m_searcherMgr != null) { - searcherMgr.Dispose(); - searcherMgr = null; + m_searcherMgr.Dispose(); + m_searcherMgr = null; } if (writer != null) { @@ -755,9 +755,9 @@ namespace Lucene.Net.Search.Suggest.Analyzing long mem = RamUsageEstimator.ShallowSizeOf(this); try { - if (searcherMgr != null) + if (m_searcherMgr != null) { - IndexSearcher searcher = searcherMgr.Acquire(); + IndexSearcher searcher = m_searcherMgr.Acquire(); try { foreach (AtomicReaderContext context in searcher.IndexReader.Leaves) @@ -771,7 +771,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing } finally { - searcherMgr.Release(searcher); + m_searcherMgr.Release(searcher); } } return mem; @@ -786,14 +786,14 @@ namespace Lucene.Net.Search.Suggest.Analyzing { get { - IndexSearcher searcher = searcherMgr.Acquire(); + IndexSearcher searcher = m_searcherMgr.Acquire(); try { return searcher.IndexReader.NumDocs; } finally { - searcherMgr.Release(searcher); + m_searcherMgr.Release(searcher); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e9db285a/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 4470e92..23e179b 100644 --- a/src/Lucene.Net.Suggest/Suggest/BufferedInputIterator.cs +++ b/src/Lucene.Net.Suggest/Suggest/BufferedInputIterator.cs @@ -29,19 +29,19 @@ namespace Lucene.Net.Search.Suggest // TODO keep this for now /// <summary> /// buffered term entries </summary> - protected internal BytesRefArray entries = new BytesRefArray(Counter.NewCounter()); + protected BytesRefArray m_entries = new BytesRefArray(Counter.NewCounter()); /// <summary> /// buffered payload entries </summary> - protected internal BytesRefArray payloads = new BytesRefArray(Counter.NewCounter()); + protected BytesRefArray m_payloads = new BytesRefArray(Counter.NewCounter()); /// <summary> /// buffered context set entries </summary> - protected internal IList<IEnumerable<BytesRef>> contextSets = new List<IEnumerable<BytesRef>>(); + protected IList<IEnumerable<BytesRef>> m_contextSets = new List<IEnumerable<BytesRef>>(); /// <summary> /// current buffer position </summary> - protected internal int curPos = -1; + protected int m_curPos = -1; /// <summary> - /// buffered weights, parallel with <see cref="entries"/> </summary> - protected internal long[] freqs = new long[1]; + /// buffered weights, parallel with <see cref="m_entries"/> </summary> + protected long[] m_freqs = new long[1]; private readonly BytesRef spare = new BytesRef(); private readonly BytesRef payloadSpare = new BytesRef(); private readonly bool hasPayloads; @@ -59,34 +59,34 @@ namespace Lucene.Net.Search.Suggest hasContexts = source.HasContexts; while ((spare = source.Next()) != null) { - entries.Append(spare); + m_entries.Append(spare); if (hasPayloads) { - payloads.Append(source.Payload); + m_payloads.Append(source.Payload); } if (hasContexts) { - contextSets.Add(source.Contexts); + m_contextSets.Add(source.Contexts); } - if (freqIndex >= freqs.Length) + if (freqIndex >= m_freqs.Length) { - freqs = ArrayUtil.Grow(freqs, freqs.Length + 1); + m_freqs = ArrayUtil.Grow(m_freqs, m_freqs.Length + 1); } - freqs[freqIndex++] = source.Weight; + m_freqs[freqIndex++] = source.Weight; } comp = source.Comparer; } public virtual long Weight { - get { return freqs[curPos]; } + get { return m_freqs[m_curPos]; } } public virtual BytesRef Next() { - if (++curPos < entries.Length) + if (++m_curPos < m_entries.Length) { - entries.Get(spare, curPos); + m_entries.Get(spare, m_curPos); return spare; } return null; @@ -96,9 +96,9 @@ namespace Lucene.Net.Search.Suggest { get { - if (hasPayloads && curPos < payloads.Length) + if (hasPayloads && m_curPos < m_payloads.Length) { - return payloads.Get(payloadSpare, curPos); + return m_payloads.Get(payloadSpare, m_curPos); } return null; } @@ -121,9 +121,9 @@ namespace Lucene.Net.Search.Suggest { get { - if (hasContexts && curPos < contextSets.Count) + if (hasContexts && m_curPos < m_contextSets.Count) { - return contextSets[curPos]; + return m_contextSets[m_curPos]; } return null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e9db285a/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 ee21be5..15be41c 100644 --- a/src/Lucene.Net.Suggest/Suggest/BufferingTermFreqIteratorWrapper.cs +++ b/src/Lucene.Net.Suggest/Suggest/BufferingTermFreqIteratorWrapper.cs @@ -30,13 +30,13 @@ namespace Lucene.Net.Search.Suggest // TODO keep this for now /// <summary> /// buffered term entries </summary> - protected internal BytesRefArray entries = new BytesRefArray(Counter.NewCounter()); + protected BytesRefArray m_entries = new BytesRefArray(Counter.NewCounter()); /// <summary> /// current buffer position </summary> - protected internal int curPos = -1; + protected int m_curPos = -1; /// <summary> - /// buffered weights, parallel with <see cref="entries"/> </summary> - protected internal long[] freqs = new long[1]; + /// buffered weights, parallel with <see cref="m_entries"/> </summary> + protected long[] m_freqs = new long[1]; private readonly BytesRef spare = new BytesRef(); private readonly IComparer<BytesRef> comp; @@ -50,26 +50,26 @@ namespace Lucene.Net.Search.Suggest int freqIndex = 0; while ((spare = source.Next()) != null) { - entries.Append(spare); - if (freqIndex >= freqs.Length) + m_entries.Append(spare); + if (freqIndex >= m_freqs.Length) { - freqs = ArrayUtil.Grow(freqs, freqs.Length + 1); + m_freqs = ArrayUtil.Grow(m_freqs, m_freqs.Length + 1); } - freqs[freqIndex++] = source.Weight; + m_freqs[freqIndex++] = source.Weight; } } public virtual long Weight { - get { return freqs[curPos]; } + get { return m_freqs[m_curPos]; } } public virtual BytesRef Next() { - if (++curPos < entries.Length) + if (++m_curPos < m_entries.Length) { - entries.Get(spare, curPos); + m_entries.Get(spare, m_curPos); return spare; } return null; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e9db285a/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 49c737a..f70c0d2 100644 --- a/src/Lucene.Net.Suggest/Suggest/DocumentDictionary.cs +++ b/src/Lucene.Net.Suggest/Suggest/DocumentDictionary.cs @@ -51,14 +51,14 @@ namespace Lucene.Net.Search.Suggest /// <summary> /// <see cref="IndexReader"/> to load documents from </summary> - protected internal readonly IndexReader reader; + protected readonly IndexReader m_reader; /// <summary> /// Field to read payload from </summary> - protected internal readonly string payloadField; + protected readonly string m_payloadField; /// <summary> /// Field to read contexts from </summary> - protected internal readonly string contextsField; + protected readonly string m_contextsField; private readonly string field; private readonly string weightField; @@ -91,18 +91,18 @@ namespace Lucene.Net.Search.Suggest /// </summary> public DocumentDictionary(IndexReader reader, string field, string weightField, string payloadField, string contextsField) { - this.reader = reader; + this.m_reader = reader; this.field = field; this.weightField = weightField; - this.payloadField = payloadField; - this.contextsField = contextsField; + this.m_payloadField = payloadField; + this.m_contextsField = contextsField; } public virtual IInputIterator EntryIterator { get { - return new DocumentInputIterator(this, payloadField != null, contextsField != null); + return new DocumentInputIterator(this, m_payloadField != null, m_contextsField != null); } } @@ -135,10 +135,10 @@ namespace Lucene.Net.Search.Suggest this.outerInstance = outerInstance; this.hasPayloads = hasPayloads; this.hasContexts = hasContexts; - docCount = outerInstance.reader.MaxDoc - 1; - weightValues = (outerInstance.weightField != null) ? MultiDocValues.GetNumericValues(outerInstance.reader, outerInstance.weightField) : null; - liveDocs = (outerInstance.reader.Leaves.Count > 0) ? MultiFields.GetLiveDocs(outerInstance.reader) : null; - relevantFields = GetRelevantFields(new string[] { outerInstance.field, outerInstance.weightField, outerInstance.payloadField, outerInstance.contextsField }); + docCount = outerInstance.m_reader.MaxDoc - 1; + weightValues = (outerInstance.weightField != null) ? MultiDocValues.GetNumericValues(outerInstance.m_reader, outerInstance.weightField) : null; + liveDocs = (outerInstance.m_reader.Leaves.Count > 0) ? MultiFields.GetLiveDocs(outerInstance.m_reader) : null; + relevantFields = GetRelevantFields(new string[] { outerInstance.field, outerInstance.weightField, outerInstance.m_payloadField, outerInstance.m_contextsField }); } public virtual long Weight @@ -164,7 +164,7 @@ namespace Lucene.Net.Search.Suggest continue; } - Document doc = outerInstance.reader.Document(currentDocId, relevantFields); + Document doc = outerInstance.m_reader.Document(currentDocId, relevantFields); BytesRef tempPayload = null; BytesRef tempTerm = null; @@ -172,7 +172,7 @@ namespace Lucene.Net.Search.Suggest if (hasPayloads) { - IIndexableField payload = doc.GetField(outerInstance.payloadField); + IIndexableField payload = doc.GetField(outerInstance.m_payloadField); if (payload == null || (payload.GetBinaryValue() == null && payload.GetStringValue() == null)) { continue; @@ -182,7 +182,7 @@ namespace Lucene.Net.Search.Suggest if (hasContexts) { - IIndexableField[] contextFields = doc.GetFields(outerInstance.contextsField); + IIndexableField[] contextFields = doc.GetFields(outerInstance.m_contextsField); foreach (IIndexableField contextField in contextFields) { if (contextField.GetBinaryValue() == null && contextField.GetStringValue() == null) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e9db285a/src/Lucene.Net.Suggest/Suggest/DocumentValueSourceDictionary.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/DocumentValueSourceDictionary.cs b/src/Lucene.Net.Suggest/Suggest/DocumentValueSourceDictionary.cs index b8252ec..ae45105 100644 --- a/src/Lucene.Net.Suggest/Suggest/DocumentValueSourceDictionary.cs +++ b/src/Lucene.Net.Suggest/Suggest/DocumentValueSourceDictionary.cs @@ -101,7 +101,7 @@ namespace Lucene.Net.Search.Suggest { get { - return new DocumentValueSourceInputIterator(this, payloadField != null, contextsField != null); + return new DocumentValueSourceInputIterator(this, m_payloadField != null, m_contextsField != null); } } @@ -125,13 +125,13 @@ namespace Lucene.Net.Search.Suggest : base(outerInstance, hasPayloads, hasContexts) { this.outerInstance = outerInstance; - leaves = outerInstance.reader.Leaves; + leaves = outerInstance.m_reader.Leaves; starts = new int[leaves.Count + 1]; for (int i = 0; i < leaves.Count; i++) { starts[i] = leaves[i].DocBase; } - starts[leaves.Count] = outerInstance.reader.MaxDoc; + starts[leaves.Count] = outerInstance.m_reader.MaxDoc; currentWeightValues = (leaves.Count > 0) ? outerInstance.weightsValueSource.GetValues(new Dictionary<string, object>(), leaves[currentLeafIndex]) : null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e9db285a/src/Lucene.Net.Suggest/Suggest/UnsortedInputIterator.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/UnsortedInputIterator.cs b/src/Lucene.Net.Suggest/Suggest/UnsortedInputIterator.cs index ee78fb9..601fdf1 100644 --- a/src/Lucene.Net.Suggest/Suggest/UnsortedInputIterator.cs +++ b/src/Lucene.Net.Suggest/Suggest/UnsortedInputIterator.cs @@ -42,7 +42,7 @@ namespace Lucene.Net.Search.Suggest public UnsortedInputIterator(IInputIterator source) : base(source) { - ords = new int[entries.Length]; + ords = new int[m_entries.Length]; Random random = new Random(); for (int i = 0; i < ords.Length; i++) { @@ -61,17 +61,17 @@ namespace Lucene.Net.Search.Suggest { get { - Debug.Assert(currentOrd == ords[curPos]); - return freqs[currentOrd]; + Debug.Assert(currentOrd == ords[m_curPos]); + return m_freqs[currentOrd]; } } public override BytesRef Next() { - if (++curPos < entries.Length) + if (++m_curPos < m_entries.Length) { - currentOrd = ords[curPos]; - return entries.Get(spare, currentOrd); + currentOrd = ords[m_curPos]; + return m_entries.Get(spare, currentOrd); } return null; } @@ -81,10 +81,10 @@ namespace Lucene.Net.Search.Suggest get { { - if (HasPayloads && curPos < payloads.Length) + if (HasPayloads && m_curPos < m_payloads.Length) { - Debug.Assert(currentOrd == ords[curPos]); - return payloads.Get(payloadSpare, currentOrd); + Debug.Assert(currentOrd == ords[m_curPos]); + return m_payloads.Get(payloadSpare, currentOrd); } return null; } @@ -95,10 +95,10 @@ namespace Lucene.Net.Search.Suggest { get { - if (HasContexts && curPos < contextSets.Count) + if (HasContexts && m_curPos < m_contextSets.Count) { - Debug.Assert(currentOrd == ords[curPos]); - return contextSets[currentOrd]; + Debug.Assert(currentOrd == ords[m_curPos]); + return m_contextSets[currentOrd]; } return null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e9db285a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs index 04b49c2..a68373d 100644 --- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs +++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs @@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing protected internal override object Highlight(string text, IEnumerable<string> matchedTokens, string prefixToken) { - TokenStream ts = queryAnalyzer.TokenStream("text", new StringReader(text)); + TokenStream ts = m_queryAnalyzer.TokenStream("text", new StringReader(text)); try { ICharTermAttribute termAtt = ts.AddAttribute<ICharTermAttribute>();
