Lucene.Net.Facet refactor: Changed all parameters and return types from List<T> to IList<T>
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/71adfdb7 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/71adfdb7 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/71adfdb7 Branch: refs/heads/api-work Commit: 71adfdb7a3f0e1ee07da52180c7b143879e45b51 Parents: 368e3f0 Author: Shad Storhaug <[email protected]> Authored: Tue Jan 31 16:06:56 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Tue Jan 31 16:06:56 2017 +0700 ---------------------------------------------------------------------- src/Lucene.Net.Facet/Facets.cs | 2 +- src/Lucene.Net.Facet/FacetsCollector.cs | 2 +- src/Lucene.Net.Facet/MultiFacets.cs | 2 +- src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs | 10 +++++----- src/Lucene.Net.Facet/Range/RangeFacetCounts.cs | 2 +- .../SortedSet/SortedSetDocValuesFacetCounts.cs | 9 ++++----- src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/71adfdb7/src/Lucene.Net.Facet/Facets.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Facets.cs b/src/Lucene.Net.Facet/Facets.cs index 669124f..71c08a2 100644 --- a/src/Lucene.Net.Facet/Facets.cs +++ b/src/Lucene.Net.Facet/Facets.cs @@ -54,6 +54,6 @@ namespace Lucene.Net.Facet /// different dimensions were indexed, for example /// depending on the type of document. /// </summary> - public abstract List<FacetResult> GetAllDims(int topN); + public abstract IList<FacetResult> GetAllDims(int topN); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/71adfdb7/src/Lucene.Net.Facet/FacetsCollector.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/FacetsCollector.cs b/src/Lucene.Net.Facet/FacetsCollector.cs index e0d2805..adb6d83 100644 --- a/src/Lucene.Net.Facet/FacetsCollector.cs +++ b/src/Lucene.Net.Facet/FacetsCollector.cs @@ -172,7 +172,7 @@ namespace Lucene.Net.Facet /// Returns the documents matched by the query, one <see cref="GetMatchingDocs"/> per /// visited segment. /// </summary> - public virtual List<MatchingDocs> GetMatchingDocs() + public virtual IList<MatchingDocs> GetMatchingDocs() { if (docs != null) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/71adfdb7/src/Lucene.Net.Facet/MultiFacets.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/MultiFacets.cs b/src/Lucene.Net.Facet/MultiFacets.cs index 340b706..2a1b168 100644 --- a/src/Lucene.Net.Facet/MultiFacets.cs +++ b/src/Lucene.Net.Facet/MultiFacets.cs @@ -67,7 +67,7 @@ namespace Lucene.Net.Facet return facets.GetSpecificValue(dim, path); } - public override List<FacetResult> GetAllDims(int topN) + public override IList<FacetResult> GetAllDims(int topN) { List<FacetResult> results = new List<FacetResult>(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/71adfdb7/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs b/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs index 436f9b0..d853ebd 100644 --- a/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs +++ b/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs @@ -90,7 +90,7 @@ namespace Lucene.Net.Facet private readonly XORShift64Random random; private double samplingRate; - private List<MatchingDocs> sampledDocs; + private IList<MatchingDocs> sampledDocs; private int totalHits = NOT_CALCULATED; private int leftoverBin = NOT_CALCULATED; private int leftoverIndex = NOT_CALCULATED; @@ -136,9 +136,9 @@ namespace Lucene.Net.Facet /// <see cref="FacetsCollector.MatchingDocs"/>, scores is set to <c>null</c> /// </para> /// </summary> - public override List<MatchingDocs> GetMatchingDocs() + public override IList<MatchingDocs> GetMatchingDocs() { - List<MatchingDocs> matchingDocs = base.GetMatchingDocs(); + IList<MatchingDocs> matchingDocs = base.GetMatchingDocs(); if (totalHits == NOT_CALCULATED) { @@ -165,7 +165,7 @@ namespace Lucene.Net.Facet /// <summary> /// Returns the original matching documents. /// </summary> - public virtual List<MatchingDocs> GetOriginalMatchingDocs() + public virtual IList<MatchingDocs> GetOriginalMatchingDocs() { return base.GetMatchingDocs(); } @@ -173,7 +173,7 @@ namespace Lucene.Net.Facet /// <summary> /// Create a sampled copy of the matching documents list. /// </summary> - private List<MatchingDocs> CreateSampledDocs(IEnumerable<MatchingDocs> matchingDocsList) + private IList<MatchingDocs> CreateSampledDocs(IEnumerable<MatchingDocs> matchingDocsList) { List<MatchingDocs> sampledDocsList = new List<MatchingDocs>(matchingDocsList.Count()); foreach (MatchingDocs docs in matchingDocsList) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/71adfdb7/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs b/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs index 2647238..f9bf70f 100644 --- a/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs +++ b/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs @@ -86,7 +86,7 @@ namespace Lucene.Net.Facet.Range throw new System.NotSupportedException(); } - public override List<FacetResult> GetAllDims(int topN) + public override IList<FacetResult> GetAllDims(int topN) { return new List<FacetResult> { GetTopChildren(topN, null) }; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/71adfdb7/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs index 0f2cec4..e636416 100644 --- a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs +++ b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs @@ -291,9 +291,9 @@ namespace Lucene.Net.Facet.SortedSet return counts[ord]; } - public override List<FacetResult> GetAllDims(int topN) + public override IList<FacetResult> GetAllDims(int topN) { - IList<FacetResult> results = new List<FacetResult>(); + List<FacetResult> results = new List<FacetResult>(); foreach (KeyValuePair<string, OrdRange> ent in state.PrefixToOrdRange) { FacetResult fr = GetDim(ent.Key, ent.Value, topN); @@ -303,10 +303,9 @@ namespace Lucene.Net.Facet.SortedSet } } - var resultArray = results.ToList(); // Sort by highest count: - resultArray.Sort(new ComparerAnonymousInnerClassHelper(this)); - return resultArray; + results.Sort(new ComparerAnonymousInnerClassHelper(this)); + return results; } private class ComparerAnonymousInnerClassHelper : IComparer<FacetResult> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/71adfdb7/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs index 9b14d3f..435b610 100644 --- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs +++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs @@ -109,7 +109,7 @@ namespace Lucene.Net.Facet.Taxonomy return dimConfig; } - public override List<FacetResult> GetAllDims(int topN) + public override IList<FacetResult> GetAllDims(int topN) { int ord = children[TaxonomyReader.ROOT_ORDINAL]; IList<FacetResult> results = new List<FacetResult>();
