This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit cf4d49be563ecfce1519d4d82d399e2a2e6145ad Author: Shad Storhaug <[email protected]> AuthorDate: Sat Nov 20 12:24:54 2021 +0700 BUG: Added StringComparer.Ordinal to all Sort() calls on string arrays and lists to override culture-sensitive sorting when it isn't needed. --- .../Tools/TokenInfoDictionaryBuilder.cs | 2 +- src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs | 2 +- src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs | 6 +++--- src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 4 ++-- src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs | 2 +- src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs | 2 +- src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs | 2 +- src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs b/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs index 032d1db..957a106 100644 --- a/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs +++ b/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs @@ -56,7 +56,7 @@ namespace Lucene.Net.Analysis.Ja.Util { csvFiles.Add(file.FullName); } - csvFiles.Sort(); + csvFiles.Sort(StringComparer.Ordinal); return BuildDictionary(csvFiles); } diff --git a/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs b/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs index cfaa427..57a1a50 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs @@ -143,7 +143,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils { Console.WriteLine("------------> config properties:"); IList<string> propKeys = new JCG.List<string>(props.Keys); - propKeys.Sort(); + propKeys.Sort(StringComparer.Ordinal); foreach (string propName in propKeys) { Console.WriteLine(propName + " = " + props[propName]); diff --git a/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs b/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs index 673476d..2febff8 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Support; using NUnit.Framework; @@ -132,8 +132,8 @@ namespace Lucene.Net.Index string[] files2 = dir.ListAll(); dir.Dispose(); - Array.Sort(files); - Array.Sort(files2); + Array.Sort(files, StringComparer.Ordinal); + Array.Sort(files2, StringComparer.Ordinal); ISet<string> dif = DifFiles(files, files2); diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index 449186d..b4cda08 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -187,8 +187,8 @@ namespace Lucene.Net.Index (new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)))).Rollback(); string[] endFiles = dir.ListAll(); - Array.Sort(startFiles); - Array.Sort(endFiles); + Array.Sort(startFiles, StringComparer.Ordinal); + Array.Sort(endFiles, StringComparer.Ordinal); if (!Arrays.Equals(startFiles, endFiles)) { diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs index b593e0f..4191393 100644 --- a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs +++ b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs @@ -91,7 +91,7 @@ namespace Lucene.Net.Index } */ - Array.Sort(testTerms); + Array.Sort(testTerms, StringComparer.Ordinal); int tokenUpto = 0; for (int i = 0; i < testTerms.Length; i++) { diff --git a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs index edc4632..c9203cb 100644 --- a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs @@ -83,7 +83,7 @@ namespace Lucene.Net.Search if (Verbose) { // utf16 order - terms.Sort(); + terms.Sort(StringComparer.Ordinal); Console.WriteLine("UTF16 order:"); foreach (string s in terms) { diff --git a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs index 5e939b4..c7e102f 100644 --- a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs +++ b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs @@ -87,7 +87,7 @@ namespace Lucene.Net.Search if (Verbose) { // utf16 order - terms.Sort(); + terms.Sort(StringComparer.Ordinal); Console.WriteLine("UTF16 order:"); foreach (string s in terms) { diff --git a/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs b/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs index 9156f48..4104056 100644 --- a/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs +++ b/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs @@ -85,7 +85,7 @@ namespace Lucene.Net.Search if (Verbose) { // utf16 order - terms.Sort(); + terms.Sort(StringComparer.Ordinal); Console.WriteLine("UTF16 order:"); foreach (string s in terms) {
