You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/03/15 23:50:03 UTC
[21/50] [abbrv] lucenenet git commit: SWEEP: Set all remaining
SortedSets and SortedDictionaries to use StringComparer.Ordinal
SWEEP: Set all remaining SortedSets and SortedDictionaries to use StringComparer.Ordinal
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d33dd73d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d33dd73d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d33dd73d
Branch: refs/heads/api-work
Commit: d33dd73d3d1de54eb66c2e20d20e54a502daee35
Parents: 5c9ad36
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Mar 15 03:25:31 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Mar 15 16:03:28 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs | 6 +++---
src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs | 4 ++--
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 4 ++--
.../VectorHighlight/FastVectorHighlighterTest.cs | 2 +-
.../Suggest/Analyzing/AnalyzingSuggesterTest.cs | 2 +-
.../Suggest/Analyzing/FuzzySuggesterTest.cs | 2 +-
src/Lucene.Net.Tests/Util/TestBytesRefHash.cs | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d33dd73d/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
index 2bc0ccc..56b10da 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
@@ -261,8 +261,8 @@ namespace Lucene.Net.Analysis.Hunspell
/// <exception cref="IOException"> Can be thrown while reading from the InputStream </exception>
private void ReadAffixFile(Stream affixStream, Encoding decoder)
{
- SortedDictionary<string, IList<char?>> prefixes = new SortedDictionary<string, IList<char?>>();
- SortedDictionary<string, IList<char?>> suffixes = new SortedDictionary<string, IList<char?>>();
+ SortedDictionary<string, IList<char?>> prefixes = new SortedDictionary<string, IList<char?>>(StringComparer.Ordinal);
+ SortedDictionary<string, IList<char?>> suffixes = new SortedDictionary<string, IList<char?>>(StringComparer.Ordinal);
IDictionary<string, int?> seenPatterns = new Dictionary<string, int?>();
// zero condition -> 0 ord
@@ -548,7 +548,7 @@ namespace Lucene.Net.Analysis.Hunspell
private FST<CharsRef> ParseConversions(TextReader reader, int num)
{
- IDictionary<string, string> mappings = new SortedDictionary<string, string>();
+ IDictionary<string, string> mappings = new SortedDictionary<string, string>(StringComparer.Ordinal);
for (int i = 0; i < num; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d33dd73d/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
index 9b103c5..d4612ff 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -966,8 +966,8 @@ namespace Lucene.Net.Store
(new IndexWriter(m_input, iwc)).Rollback();
string[] endFiles = m_input.ListAll();
- ISet<string> startSet = new SortedSet<string>(Arrays.AsList(startFiles));
- ISet<string> endSet = new SortedSet<string>(Arrays.AsList(endFiles));
+ ISet<string> startSet = new SortedSet<string>(Arrays.AsList(startFiles), StringComparer.Ordinal);
+ ISet<string> endSet = new SortedSet<string>(Arrays.AsList(endFiles), StringComparer.Ordinal);
if (pendingDeletions.Contains("segments.gen") && endSet.Contains("segments.gen"))
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d33dd73d/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index beadd74..39c9640 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -2616,8 +2616,8 @@ namespace Lucene.Net.Util
FieldInfos rightInfos = MultiFields.GetMergedFieldInfos(rightReader);
// TODO: would be great to verify more than just the names of the fields!
- SortedSet<string> left = new SortedSet<string>();
- SortedSet<string> right = new SortedSet<string>();
+ SortedSet<string> left = new SortedSet<string>(StringComparer.Ordinal);
+ SortedSet<string> right = new SortedSet<string>(StringComparer.Ordinal);
foreach (FieldInfo fi in leftInfos)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d33dd73d/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
index 7eea1ae..c40877f 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
@@ -643,7 +643,7 @@ namespace Lucene.Net.Search.VectorHighlight
internal class AnalyzerWrapperAnonymousHelper : AnalyzerWrapper
{
- IDictionary<String, Analyzer> fieldAnalyzers = new SortedDictionary<String, Analyzer>();
+ IDictionary<String, Analyzer> fieldAnalyzers = new SortedDictionary<String, Analyzer>(StringComparer.Ordinal);
#pragma warning disable 612, 618 // LUCENENET NOTE: Class calls obsolete (default) constructor
public AnalyzerWrapperAnonymousHelper()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d33dd73d/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
index 8e87e2e..27fe82d 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
@@ -776,7 +776,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
int numQueries = AtLeast(1000);
List<TermFreq2> slowCompletor = new List<TermFreq2>();
- ISet<string> allPrefixes = new SortedSet<string>(); //new TreeSet<>();
+ ISet<string> allPrefixes = new SortedSet<string>(StringComparer.Ordinal); //new TreeSet<>();
ISet<string> seen = new HashSet<string>();
bool doPayloads = Random().nextBoolean();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d33dd73d/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
index e90ba13..6a9d6c4 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
@@ -718,7 +718,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
int numQueries = AtLeast(100);
List<TermFreqPayload2> slowCompletor = new List<TermFreqPayload2>();
- SortedSet<string> allPrefixes = new SortedSet<string>();
+ SortedSet<string> allPrefixes = new SortedSet<string>(StringComparer.Ordinal);
ISet<string> seen = new HashSet<string>();
Input[] keys = new Input[numQueries];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d33dd73d/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs
index e1a6cb7..23b3d6b 100644
--- a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs
+++ b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs
@@ -201,9 +201,9 @@ namespace Lucene.Net.Util
for (int j = 0; j < num; j++)
{
// LUCENENET specific - to ensure sorting strings works the same in the SortedSet,
- // we need to use the natural comparer from ArrayUtil, which compares strings the same
+ // we need to use StringComparer.Ordinal, which compares strings the same
// way they are done in Java.
- SortedSet<string> strings = new SortedSet<string>(ArrayUtil.GetNaturalComparer<string>());
+ SortedSet<string> strings = new SortedSet<string>(StringComparer.Ordinal);
for (int k = 0; k < 797; k++)
{
string str;