You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/10/02 14:35:52 UTC
[34/50] [abbrv] lucenenet git commit: Suggest: Fixed all compiler
warnings.
Suggest: Fixed all compiler warnings.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f143395c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f143395c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f143395c
Branch: refs/heads/master
Commit: f143395c828ffcc6e8d4b8fa06f8ac5d0493b560
Parents: 432dec9
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Sep 19 00:12:49 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Oct 2 17:44:58 2016 +0700
----------------------------------------------------------------------
src/Lucene.Net.Suggest/Spell/SpellChecker.cs | 4 ++++
.../Suggest/Analyzing/AnalyzingSuggester.cs | 2 +-
.../Suggest/Analyzing/FreeTextSuggester.cs | 3 ++-
src/Lucene.Net.Suggest/Suggest/Tst/TSTLookup.cs | 2 ++
src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs | 12 ++++++------
.../Spell/TestWordBreakSpellChecker.cs | 10 +++++-----
.../Suggest/Analyzing/AnalyzingSuggesterTest.cs | 4 ++--
.../Suggest/Analyzing/TestFreeTextSuggester.cs | 6 +++---
.../Suggest/Fst/BytesRefSortersTest.cs | 2 +-
.../Suggest/LookupBenchmarkTest.cs | 2 +-
.../Suggest/TestInputIterator.cs | 3 ++-
11 files changed, 29 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Spell/SpellChecker.cs b/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
index b7b534e..fc8c562 100644
--- a/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
+++ b/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
@@ -152,9 +152,11 @@ namespace Lucene.Net.Search.Spell
EnsureOpen();
if (!DirectoryReader.IndexExists(value))
{
+#pragma warning disable 612, 618
using (var writer = new IndexWriter(value, new IndexWriterConfig(LuceneVersion.LUCENE_CURRENT, null)))
{
}
+#pragma warning restore 612, 618
}
SwapSearcher(value);
}
@@ -464,8 +466,10 @@ namespace Lucene.Net.Search.Spell
{
EnsureOpen();
var dir = this.spellIndex;
+#pragma warning disable 612, 618
using (var writer = new IndexWriter(dir, new IndexWriterConfig(LuceneVersion.LUCENE_CURRENT, null)
.SetOpenMode(IndexWriterConfig.OpenMode_e.CREATE))) { }
+#pragma warning restore 612, 618
SwapSearcher(dir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
index 711a5ef..08ea182 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
@@ -882,7 +882,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
return results;
}
- catch (IOException bogus)
+ catch (IOException /*bogus*/)
{
throw;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
index 5b40ca2..7acf03a 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
@@ -324,8 +324,9 @@ namespace Lucene.Net.Search.Suggest.Analyzing
using (Directory dir = FSDirectory.Open(tempIndexPath))
{
-
+#pragma warning disable 612, 618
IndexWriterConfig iwc = new IndexWriterConfig(LuceneVersion.LUCENE_CURRENT, indexAnalyzer);
+#pragma warning restore 612, 618
iwc.SetOpenMode(IndexWriterConfig.OpenMode_e.CREATE);
iwc.SetRAMBufferSizeMB(ramBufferSizeMB);
IndexWriter writer = new IndexWriter(dir, iwc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Suggest/Suggest/Tst/TSTLookup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Tst/TSTLookup.cs b/src/Lucene.Net.Suggest/Suggest/Tst/TSTLookup.cs
index a8d7a69..2a423eb 100644
--- a/src/Lucene.Net.Suggest/Suggest/Tst/TSTLookup.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Tst/TSTLookup.cs
@@ -57,11 +57,13 @@ namespace Lucene.Net.Search.Suggest.Tst
}
root = new TernaryTreeNode();
// buffer first
+#pragma warning disable 612, 618
if (tfit.Comparator != BytesRef.UTF8SortedAsUTF16Comparer)
{
// make sure it's sorted and the comparator uses UTF16 sort order
tfit = new SortedInputIterator(tfit, BytesRef.UTF8SortedAsUTF16Comparer);
}
+#pragma warning restore 612, 618
List<string> tokens = new List<string>();
List<object> vals = new List<object>(); // LUCENENET TODO: Should this be long? in Java it was Number, but we can probably do better than object
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs b/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs
index 5909ca8..e2e1db7 100644
--- a/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs
+++ b/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs
@@ -344,7 +344,7 @@ namespace Lucene.Net.Search.Spell
similar = spellChecker.SuggestSimilar("tousand", 10, r, null,
SuggestMode.SUGGEST_WHEN_NOT_IN_INDEX);
}
- catch (NullReferenceException e)
+ catch (NullReferenceException /*e*/)
{
assertTrue("threw an NPE, and it shouldn't have", false);
}
@@ -420,7 +420,7 @@ namespace Lucene.Net.Search.Spell
CheckCommonSuggestions(r);
fail("spellchecker was already closed");
}
- catch (AlreadyClosedException e)
+ catch (AlreadyClosedException /*e*/)
{
// expected
}
@@ -430,7 +430,7 @@ namespace Lucene.Net.Search.Spell
spellChecker.ClearIndex();
fail("spellchecker was already closed");
}
- catch (AlreadyClosedException e)
+ catch (AlreadyClosedException /*e*/)
{
// expected
}
@@ -440,7 +440,7 @@ namespace Lucene.Net.Search.Spell
spellChecker.IndexDictionary(new LuceneDictionary(r, field), NewIndexWriterConfig(TEST_VERSION_CURRENT, null), false);
fail("spellchecker was already closed");
}
- catch (AlreadyClosedException e)
+ catch (AlreadyClosedException /*e*/)
{
// expected
}
@@ -450,7 +450,7 @@ namespace Lucene.Net.Search.Spell
spellChecker.SpellIndex = (spellindex);
fail("spellchecker was already closed");
}
- catch (AlreadyClosedException e)
+ catch (AlreadyClosedException /*e*/)
{
// expected
}
@@ -598,7 +598,7 @@ namespace Lucene.Net.Search.Spell
Thread.Sleep(10);// don't starve refresh()'s CPU, which sleeps every 50 bytes for 1 ms
}
- catch (AlreadyClosedException e)
+ catch (AlreadyClosedException /*e*/)
{
return;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs b/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
index 7f8d12d..412357c 100644
--- a/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
+++ b/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
@@ -157,7 +157,7 @@ namespace Lucene.Net.Search.Spell
}
finally
{
- try { ir.Dispose(); } catch (Exception e1) { }
+ try { ir.Dispose(); } catch (Exception /*e1*/) { }
}
}
@@ -269,7 +269,7 @@ namespace Lucene.Net.Search.Spell
}
finally
{
- try { ir.Dispose(); } catch (Exception e1) { }
+ try { ir.Dispose(); } catch (Exception /*e1*/) { }
}
}
public void GRandom()
@@ -380,17 +380,17 @@ namespace Lucene.Net.Search.Spell
{
ir.Dispose();
}
- catch (Exception e1) { }
+ catch (Exception /*e1*/) { }
try
{
writer.Dispose();
}
- catch (Exception e1) { }
+ catch (Exception /*e1*/) { }
try
{
dir.Dispose();
}
- catch (Exception e1) { }
+ catch (Exception /*e1*/) { }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/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 ee7c240..44cbee8 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
@@ -1444,7 +1444,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
suggester.DoLookup("\u0430\u001E", false, 3);
fail("should throw IllegalArgumentException");
}
- catch (ArgumentException e)
+ catch (ArgumentException /*e*/)
{
// expected
}
@@ -1453,7 +1453,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
suggester.DoLookup("\u0430\u001F", false, 3);
fail("should throw IllegalArgumentException");
}
- catch (ArgumentException e)
+ catch (ArgumentException /*e*/)
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
index c88b6e7..ee79e68 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
@@ -98,7 +98,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
sug.Build(new InputArrayIterator(keys));
fail("did not hit expected exception");
}
- catch (ArgumentException iae)
+ catch (ArgumentException /*iae*/)
{
// expected
}
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
sug.DoLookup("foo\u001eb", 10);
fail("did not hit expected exception");
}
- catch (ArgumentException iae)
+ catch (ArgumentException /*iae*/)
{
// expected
}
@@ -275,7 +275,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
sug.DoLookup("", 10);
fail("did not hit exception");
}
- catch (ArgumentException iae)
+ catch (ArgumentException /*iae*/)
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Tests.Suggest/Suggest/Fst/BytesRefSortersTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Fst/BytesRefSortersTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Fst/BytesRefSortersTest.cs
index a610322..138da51 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Fst/BytesRefSortersTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Fst/BytesRefSortersTest.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Search.Suggest.Fst
sorter.Add(new BytesRef(new byte[1]));
fail("expected contract violation.");
}
- catch (InvalidOperationException e)
+ catch (InvalidOperationException /*e*/)
{
// Expected.
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Tests.Suggest/Suggest/LookupBenchmarkTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/LookupBenchmarkTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/LookupBenchmarkTest.cs
index be02682..cb1162e 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/LookupBenchmarkTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/LookupBenchmarkTest.cs
@@ -172,7 +172,7 @@ namespace Lucene.Net.Search.Suggest
//lookup = cls.newInstance();
lookup = (Lookup)Activator.CreateInstance(cls);
}
- catch (MissingMethodException e)
+ catch (MissingMethodException /*e*/)
{
Analyzer a = new MockAnalyzer(random, MockTokenizer.KEYWORD, false);
if (cls == typeof(AnalyzingInfixSuggester))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f143395c/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs b/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs
index 546d489..3f66cf2 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs
@@ -40,8 +40,9 @@ namespace Lucene.Net.Search.Suggest
{
Random random = Random();
int num = AtLeast(10000);
-
+#pragma warning disable 612, 618
IComparer<BytesRef> comparator = random.nextBoolean() ? BytesRef.UTF8SortedAsUnicodeComparer : BytesRef.UTF8SortedAsUTF16Comparer;
+#pragma warning restore 612, 618
IDictionary<BytesRef, KeyValuePair<long, BytesRef>> sorted = new SortedDictionary<BytesRef, KeyValuePair<long, BytesRef>>(comparator); //new TreeMap<>(comparator);
IDictionary<BytesRef, long> sortedWithoutPayload = new SortedDictionary<BytesRef, long>(comparator); //new TreeMap<>(comparator);
IDictionary<BytesRef, KeyValuePair<long, ISet<BytesRef>>> sortedWithContext = new SortedDictionary<BytesRef, KeyValuePair<long, ISet<BytesRef>>>(comparator); //new TreeMap<>(comparator);