svn commit: r1717999 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java

[jd...@apache.org]

Author: jdyer
Date: Fri Dec  4 17:41:17 2015
New Revision: 1717999

URL: http://svn.apache.org/viewvc?rev=1717999&view=rev
Log:
SOLR-6271: fix StringDistance comparison in CSSC. ( This closes #135 )

Added:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java   (with props)
Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1717999&r1=1717998&r2=1717999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Dec  4 17:41:17 2015
@@ -199,6 +199,9 @@ Bug Fixes
 
 * SOLR-8366: ConcurrentUpdateSolrClient attempts to use response's content type as charset encoding
   for parsing exception. (shalin)
+  
+* SOLR-6271: fix ConjunctionSolrSpellChecker to not compare StringDistance by instance.
+  (Igor Kostromin via James Dyer)
 
 Other Changes
 ----------------------

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java?rev=1717999&r1=1717998&r2=1717999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java Fri Dec  4 17:41:17 2015
@@ -57,7 +57,7 @@ public class ConjunctionSolrSpellChecker
     try {
       if (stringDistance == null) {
         stringDistance = checker.getStringDistance();
-      } else if (stringDistance != checker.getStringDistance()) {
+      } else if (!stringDistance.equals(checker.getStringDistance())) {
         throw new IllegalArgumentException(
             "All checkers need to use the same StringDistance.");
       }

Added: lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java?rev=1717999&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java (added)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java Fri Dec  4 17:41:17 2015
@@ -0,0 +1,74 @@
+package org.apache.solr.spelling;
+
+import java.io.IOException;
+
+import org.apache.lucene.search.spell.LevensteinDistance;
+import org.apache.lucene.search.spell.NGramDistance;
+import org.apache.lucene.search.spell.StringDistance;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.search.SolrIndexSearcher;
+import org.junit.Test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class ConjunctionSolrSpellCheckerTest extends LuceneTestCase {
+  
+  @Test
+  public void test() throws Exception {
+    ConjunctionSolrSpellChecker cssc = new ConjunctionSolrSpellChecker();
+    MockSolrSpellChecker levenstein1 = new MockSolrSpellChecker(new LevensteinDistance());
+    MockSolrSpellChecker levenstein2 = new MockSolrSpellChecker(new LevensteinDistance());
+    MockSolrSpellChecker ngram = new MockSolrSpellChecker(new NGramDistance());
+    
+    cssc.addChecker(levenstein1);
+    cssc.addChecker(levenstein2);
+    try {
+      cssc.addChecker(ngram);
+      fail("ConjunctionSolrSpellChecker should have thrown an exception about non-identical StringDistances.");
+    } catch (IllegalArgumentException iae) {
+      // correct behavior
+    }
+  }
+  
+  class MockSolrSpellChecker extends SolrSpellChecker {
+    
+    final StringDistance sd;
+    
+    MockSolrSpellChecker(StringDistance sd) {
+      this.sd = sd;
+    }
+    
+    @Override
+    protected StringDistance getStringDistance() {
+      return sd;
+    }
+    
+    @Override
+    public void reload(SolrCore core, SolrIndexSearcher searcher) throws IOException {}
+    
+    @Override
+    public void build(SolrCore core, SolrIndexSearcher searcher) throws IOException {}
+    
+    @Override
+    public SpellingResult getSuggestions(SpellingOptions options) throws IOException {
+      return null;
+    }
+    
+  }
+}