BREAKING: Lucene.Net.Facet: De-nested DrillSidewaysResult from DrillSideways class
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/21522f37 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/21522f37 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/21522f37 Branch: refs/heads/master Commit: 21522f37acce3620268ffdd6fa1739941d0fde58 Parents: a06752f Author: Shad Storhaug <[email protected]> Authored: Thu Oct 5 04:08:18 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Thu Oct 5 04:08:18 2017 +0700 ---------------------------------------------------------------------- .../Facet/SimpleFacetsExample.cs | 2 +- src/Lucene.Net.Facet/DrillSideways.cs | 40 ++++++++++---------- .../Range/TestRangeFacetCounts.cs | 2 +- src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 1 - 4 files changed, 22 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21522f37/src/Lucene.Net.Demo/Facet/SimpleFacetsExample.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Demo/Facet/SimpleFacetsExample.cs b/src/Lucene.Net.Demo/Facet/SimpleFacetsExample.cs index 1e5b49b..90eb472 100644 --- a/src/Lucene.Net.Demo/Facet/SimpleFacetsExample.cs +++ b/src/Lucene.Net.Demo/Facet/SimpleFacetsExample.cs @@ -202,7 +202,7 @@ namespace Lucene.Net.Demo.Facet q.Add("Publish Date", "2010"); DrillSideways ds = new DrillSideways(searcher, config, taxoReader); - DrillSideways.DrillSidewaysResult result = ds.Search(q, 10); + DrillSidewaysResult result = ds.Search(q, 10); // Retrieve results IList<FacetResult> facets = result.Facets.GetAllDims(10); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21522f37/src/Lucene.Net.Facet/DrillSideways.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/DrillSideways.cs b/src/Lucene.Net.Facet/DrillSideways.cs index d60af28..31fbaaa 100644 --- a/src/Lucene.Net.Facet/DrillSideways.cs +++ b/src/Lucene.Net.Facet/DrillSideways.cs @@ -265,31 +265,31 @@ namespace Lucene.Net.Facet { return false; } + } + /// <summary> + /// Result of a drill sideways search, including the + /// <see cref="Facet.Facets"/> and <see cref="TopDocs"/>. + /// </summary> + public class DrillSidewaysResult + { /// <summary> - /// Result of a drill sideways search, including the - /// <see cref="Facet.Facets"/> and <see cref="TopDocs"/>. + /// Combined drill down & sideways results. /// </summary> - public class DrillSidewaysResult // LUCENENET TODO: API De-nest this class - { - /// <summary> - /// Combined drill down & sideways results. - /// </summary> - public Facets Facets { get; private set; } + public Facets Facets { get; private set; } - /// <summary> - /// Hits. - /// </summary> - public TopDocs Hits { get; private set; } + /// <summary> + /// Hits. + /// </summary> + public TopDocs Hits { get; private set; } - /// <summary> - /// Sole constructor. - /// </summary> - public DrillSidewaysResult(Facets facets, TopDocs hits) - { - this.Facets = facets; - this.Hits = hits; - } + /// <summary> + /// Sole constructor. + /// </summary> + public DrillSidewaysResult(Facets facets, TopDocs hits) + { + this.Facets = facets; + this.Hits = hits; } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21522f37/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs index 5f70626..5495ecb 100644 --- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs @@ -37,7 +37,7 @@ namespace Lucene.Net.Facet.Range using SingleField = Lucene.Net.Documents.SingleField; using Int64Field = Lucene.Net.Documents.Int64Field; using NumericDocValuesField = Lucene.Net.Documents.NumericDocValuesField; - using DrillSidewaysResult = Lucene.Net.Facet.DrillSideways.DrillSidewaysResult; + using DrillSidewaysResult = Lucene.Net.Facet.DrillSidewaysResult; using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader; using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader; using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21522f37/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs index 95f9b01..068f62b 100644 --- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs +++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs @@ -31,7 +31,6 @@ namespace Lucene.Net.Facet using Document = Lucene.Net.Documents.Document; using Field = Lucene.Net.Documents.Field; using StringField = Lucene.Net.Documents.StringField; - using DrillSidewaysResult = Lucene.Net.Facet.DrillSideways.DrillSidewaysResult; using DefaultSortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.DefaultSortedSetDocValuesReaderState; using SortedSetDocValuesFacetField = Lucene.Net.Facet.SortedSet.SortedSetDocValuesFacetField; using SortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.SortedSetDocValuesReaderState;
