lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [50/58] [abbrv] lucenenet git commit: Cleaned up usings in Grouping.
Date Thu, 10 Nov 2016 11:34:01 GMT
Cleaned up usings in Grouping.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/38811808
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/38811808
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/38811808

Branch: refs/heads/grouping
Commit: 3881180835b2c605b0fc587c54f2676c7f521f1e
Parents: 5c9a388
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Sun Nov 6 23:31:51 2016 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Tue Nov 8 02:48:20 2016 +0700

----------------------------------------------------------------------
 .../AbstractAllGroupHeadsCollector.cs           |  8 +----
 .../AbstractDistinctValuesCollector.cs          |  7 +----
 .../AbstractGroupFacetCollector.cs              |  7 +----
 src/Lucene.Net.Grouping/CollectedSearchGroup.cs |  8 +----
 .../Function/FunctionAllGroupHeadsCollector.cs  |  5 ---
 .../Term/TermAllGroupHeadsCollector.cs          |  5 ---
 .../Term/TermAllGroupsCollector.cs              |  4 ---
 .../Term/TermFirstPassGroupingCollector.cs      |  1 -
 .../Term/TermGroupFacetCollector.cs             |  5 ---
 .../AbstractGroupingTestCase.cs                 |  4 ---
 .../AllGroupHeadsCollectorTest.cs               | 32 +++++++++-----------
 .../AllGroupsCollectorTest.cs                   |  9 ++----
 src/Lucene.Net.Tests.Grouping/TestGrouping.cs   |  1 -
 13 files changed, 20 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/AbstractAllGroupHeadsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/AbstractAllGroupHeadsCollector.cs b/src/Lucene.Net.Grouping/AbstractAllGroupHeadsCollector.cs
index 4d3b66f..279805e 100644
--- a/src/Lucene.Net.Grouping/AbstractAllGroupHeadsCollector.cs
+++ b/src/Lucene.Net.Grouping/AbstractAllGroupHeadsCollector.cs
@@ -1,11 +1,5 @@
-using Lucene.Net.Index;
-using Lucene.Net.Search;
-using Lucene.Net.Util;
-using System;
+using Lucene.Net.Util;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/AbstractDistinctValuesCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/AbstractDistinctValuesCollector.cs b/src/Lucene.Net.Grouping/AbstractDistinctValuesCollector.cs
index 5c3e624..f832b1b 100644
--- a/src/Lucene.Net.Grouping/AbstractDistinctValuesCollector.cs
+++ b/src/Lucene.Net.Grouping/AbstractDistinctValuesCollector.cs
@@ -1,9 +1,4 @@
-using Lucene.Net.Search;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Lucene.Net.Search.Grouping
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs b/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs
index 920e6d3..9a079e8 100644
--- a/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs
+++ b/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs
@@ -1,11 +1,6 @@
-using Lucene.Net.Search;
-using Lucene.Net.Support;
+using Lucene.Net.Support;
 using Lucene.Net.Util;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/CollectedSearchGroup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/CollectedSearchGroup.cs b/src/Lucene.Net.Grouping/CollectedSearchGroup.cs
index 50b5bd7..51a905f 100644
--- a/src/Lucene.Net.Grouping/CollectedSearchGroup.cs
+++ b/src/Lucene.Net.Grouping/CollectedSearchGroup.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lucene.Net.Search.Grouping
+namespace Lucene.Net.Search.Grouping
 {
     /// <summary>
     /// Expert: representation of a group in {@link AbstractFirstPassGroupingCollector},

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
index f0410d2..70aa484 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
@@ -1,13 +1,8 @@
 using Lucene.Net.Index;
 using Lucene.Net.Queries.Function;
-using Lucene.Net.Search;
 using Lucene.Net.Util.Mutable;
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping.Function
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/Term/TermAllGroupHeadsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Term/TermAllGroupHeadsCollector.cs b/src/Lucene.Net.Grouping/Term/TermAllGroupHeadsCollector.cs
index 4aa9615..8b5776e 100644
--- a/src/Lucene.Net.Grouping/Term/TermAllGroupHeadsCollector.cs
+++ b/src/Lucene.Net.Grouping/Term/TermAllGroupHeadsCollector.cs
@@ -1,12 +1,7 @@
 using Lucene.Net.Index;
-using Lucene.Net.Search;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping.Terms
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/Term/TermAllGroupsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Term/TermAllGroupsCollector.cs b/src/Lucene.Net.Grouping/Term/TermAllGroupsCollector.cs
index ef33aa5..953bb82 100644
--- a/src/Lucene.Net.Grouping/Term/TermAllGroupsCollector.cs
+++ b/src/Lucene.Net.Grouping/Term/TermAllGroupsCollector.cs
@@ -1,11 +1,7 @@
 using Lucene.Net.Index;
-using Lucene.Net.Search;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping.Terms
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/Term/TermFirstPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Term/TermFirstPassGroupingCollector.cs b/src/Lucene.Net.Grouping/Term/TermFirstPassGroupingCollector.cs
index 17003ba..9f61ae7 100644
--- a/src/Lucene.Net.Grouping/Term/TermFirstPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/Term/TermFirstPassGroupingCollector.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Index;
-using Lucene.Net.Search;
 using Lucene.Net.Util;
 
 namespace Lucene.Net.Search.Grouping.Terms

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs b/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs
index 08fbb70..e694ef2 100644
--- a/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs
+++ b/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs
@@ -1,12 +1,7 @@
 using Lucene.Net.Index;
-using Lucene.Net.Search;
 using Lucene.Net.Util;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping.Terms
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Tests.Grouping/AbstractGroupingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/AbstractGroupingTestCase.cs b/src/Lucene.Net.Tests.Grouping/AbstractGroupingTestCase.cs
index d4cd062..74a926a 100644
--- a/src/Lucene.Net.Tests.Grouping/AbstractGroupingTestCase.cs
+++ b/src/Lucene.Net.Tests.Grouping/AbstractGroupingTestCase.cs
@@ -1,9 +1,5 @@
 using Lucene.Net.Util;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs
index 2d8e8fe..0f1ddb2 100644
--- a/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs
+++ b/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs
@@ -1,30 +1,26 @@
 using Lucene.Net.Analysis;
 using Lucene.Net.Documents;
-using Lucene.Net.Search.Grouping.Function;
 using Lucene.Net.Index;
 using Lucene.Net.Queries.Function;
 using Lucene.Net.Queries.Function.ValueSources;
-using Lucene.Net.Search;
+using Lucene.Net.Search.Grouping.Function;
+using Lucene.Net.Search.Grouping.Terms;
 using Lucene.Net.Store;
+using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using static Lucene.Net.Index.FieldInfo;
-using Lucene.Net.Search.Grouping.Terms;
-using System.Collections;
-using Lucene.Net.Support;
 
 namespace Lucene.Net.Search.Grouping
 {
     public class AllGroupHeadsCollectorTest : LuceneTestCase
     {
-        private static readonly DocValuesType_e[] vts = new DocValuesType_e[]{
-            DocValuesType_e.BINARY, DocValuesType_e.SORTED
+        private static readonly FieldInfo.DocValuesType_e[] vts = new FieldInfo.DocValuesType_e[]{
+            FieldInfo.DocValuesType_e.BINARY, FieldInfo.DocValuesType_e.SORTED
         };
 
         [Test]
@@ -38,7 +34,7 @@ namespace Lucene.Net.Search.Grouping
             NewIndexWriterConfig(TEST_VERSION_CURRENT,
                 new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy()));
             bool canUseIDV = !"Lucene3x".Equals(w.w.Config.Codec.Name, StringComparison.Ordinal);
-            DocValuesType_e valueType = vts[Random().nextInt(vts.Length)];
+            FieldInfo.DocValuesType_e valueType = vts[Random().nextInt(vts.Length)];
 
             // 0
             Document doc = new Document();
@@ -203,7 +199,7 @@ namespace Lucene.Net.Search.Grouping
                         new MockAnalyzer(Random())));
                 bool preFlex = "Lucene3x".Equals(w.w.Config.Codec.Name, StringComparison.Ordinal);
                 bool canUseIDV = !preFlex;
-                DocValuesType_e valueType = vts[Random().nextInt(vts.Length)];
+                FieldInfo.DocValuesType_e valueType = vts[Random().nextInt(vts.Length)];
 
                 Document doc = new Document();
                 Document docNoGroup = new Document();
@@ -214,10 +210,10 @@ namespace Lucene.Net.Search.Grouping
                 {
                     switch (valueType)
                     {
-                        case DocValuesType_e.BINARY:
+                        case FieldInfo.DocValuesType_e.BINARY:
                             valuesField = new BinaryDocValuesField("group_dv", new BytesRef());
                             break;
-                        case DocValuesType_e.SORTED:
+                        case FieldInfo.DocValuesType_e.SORTED:
                             valuesField = new SortedDocValuesField("group_dv", new BytesRef());
                             break;
                         default:
@@ -601,7 +597,7 @@ namespace Lucene.Net.Search.Grouping
             return new ComparatorAnonymousHelper(this, sortFields, sortByScoreOnly, fieldIdToDocID);
         }
 
-        private AbstractAllGroupHeadsCollector CreateRandomCollector(string groupField, Sort
sortWithinGroup, bool canUseIDV, DocValuesType_e valueType)
+        private AbstractAllGroupHeadsCollector CreateRandomCollector(string groupField, Sort
sortWithinGroup, bool canUseIDV, FieldInfo.DocValuesType_e valueType)
         {
             AbstractAllGroupHeadsCollector collector;
             if (Random().nextBoolean())
@@ -622,7 +618,7 @@ namespace Lucene.Net.Search.Grouping
             return collector;
         }
 
-        private void AddGroupField(Document doc, string groupField, string value, bool canUseIDV,
DocValuesType_e valueType)
+        private void AddGroupField(Document doc, string groupField, string value, bool canUseIDV,
FieldInfo.DocValuesType_e valueType)
         {
             doc.Add(new TextField(groupField, value, Field.Store.YES));
             if (canUseIDV)
@@ -630,10 +626,10 @@ namespace Lucene.Net.Search.Grouping
                 Field valuesField = null;
                 switch (valueType)
                 {
-                    case DocValuesType_e.BINARY:
+                    case FieldInfo.DocValuesType_e.BINARY:
                         valuesField = new BinaryDocValuesField(groupField + "_dv", new BytesRef(value));
                         break;
-                    case DocValuesType_e.SORTED:
+                    case FieldInfo.DocValuesType_e.SORTED:
                         valuesField = new SortedDocValuesField(groupField + "_dv", new BytesRef(value));
                         break;
                     default:

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs
index 1efd4b5..2d42c43 100644
--- a/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs
+++ b/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs
@@ -1,20 +1,15 @@
 using Lucene.Net.Analysis;
 using Lucene.Net.Documents;
-using Lucene.Net.Search.Grouping.Function;
 using Lucene.Net.Index;
 using Lucene.Net.Queries.Function;
 using Lucene.Net.Queries.Function.ValueSources;
-using Lucene.Net.Search;
+using Lucene.Net.Search.Grouping.Function;
+using Lucene.Net.Search.Grouping.Terms;
 using Lucene.Net.Store;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Collections;
-using Lucene.Net.Search.Grouping.Terms;
 
 namespace Lucene.Net.Search.Grouping
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/38811808/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/TestGrouping.cs b/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
index dc4743e..6098887 100644
--- a/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
+++ b/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
@@ -15,7 +15,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Search.Grouping
 {


Mime
View raw message