lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cpoersc...@apache.org
Subject [1/2] lucene-solr git commit: SOLR-12395: Make 'significantTerms' the SignificantTermsQParserPlugin's name and deprecate its old 'sigificantTerms' name. (Tobias Kässmann, Christine Poerschke)
Date Tue, 03 Jul 2018 18:51:04 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master d38a1753d -> a444e82ba


SOLR-12395: Make 'significantTerms' the SignificantTermsQParserPlugin's name and deprecate
its old 'sigificantTerms' name.
(Tobias Kässmann, Christine Poerschke)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1a4b1358
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1a4b1358
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1a4b1358

Branch: refs/heads/master
Commit: 1a4b1358ea1b3fbe03ca85b3272ade81e8056e86
Parents: d38a1753
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Tue Jul 3 18:09:35 2018 +0100
Committer: Christine Poerschke <cpoerschke@apache.org>
Committed: Tue Jul 3 18:09:35 2018 +0100

----------------------------------------------------------------------
 solr/CHANGES.txt                                |  5 +++
 .../org/apache/solr/search/QParserPlugin.java   |  1 +
 .../search/SignificantTermsQParserPlugin.java   |  5 ++-
 .../apache/solr/search/QueryEqualityTest.java   |  7 +++-
 .../SignificantTermsQParserPluginTest.java      | 40 ++++++++++++++++++++
 .../org/apache/solr/search/TestQueryTypes.java  |  4 +-
 .../solr/search/TestStandardQParsers.java       |  5 +++
 .../solrj/io/stream/SignificantTermsStream.java |  2 +-
 8 files changed, 64 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 54454b4..eb1b40f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -67,6 +67,8 @@ Upgrade Notes
 * LUCENE-7976: TieredMergePolicy now respects maxSegmentSizeMB by default when executing
   findForcedMerges (optimize) and findForcedDeletesMerges (expungeDeletes) (Erick Erickson)
 
+* SOLR-12395: SignificantTermsQParserPlugin's name is now 'significantTerms' and its old
name 'sigificantTerms' is deprecated.
+
 New Features
 ----------------------
 
@@ -129,6 +131,9 @@ Bug Fixes
 
 * SOLR-12427: Improve error message for invalid 'start', 'rows' parameters. (Munendra S N
via Jason Gerlowski)
 
+* SOLR-12395: Make 'significantTerms' the SignificantTermsQParserPlugin's name and deprecate
its old 'sigificantTerms' name.
+  (Tobias Kässmann, Christine Poerschke)
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
index b20c3c8..e9aa255 100644
--- a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
@@ -80,6 +80,7 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin,
SolrI
     map.put(GraphTermsQParserPlugin.NAME, new GraphTermsQParserPlugin());
     map.put(IGainTermsQParserPlugin.NAME, new IGainTermsQParserPlugin());
     map.put(TextLogisticRegressionQParserPlugin.NAME, new TextLogisticRegressionQParserPlugin());
+    map.put(SignificantTermsQParserPlugin.OLD_NAME, new SignificantTermsQParserPlugin());
// for Solr 7.x backcompat only
     map.put(SignificantTermsQParserPlugin.NAME, new SignificantTermsQParserPlugin());
     map.put(PayloadScoreQParserPlugin.NAME, new PayloadScoreQParserPlugin());
     map.put(PayloadCheckQParserPlugin.NAME, new PayloadCheckQParserPlugin());

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
index 8346316..7be5dad 100644
--- a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
@@ -39,7 +39,10 @@ import org.apache.solr.request.SolrQueryRequest;
 
 public class SignificantTermsQParserPlugin extends QParserPlugin {
 
-  public static final String NAME = "sigificantTerms";
+  @Deprecated
+  public static final String OLD_NAME = "sigificantTerms";
+
+  public static final String NAME = "significantTerms";
 
   @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest
req) {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
index 84c34e1..d27695f 100644
--- a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
+++ b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
@@ -190,7 +190,12 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
   public void testSignificantTermsQuery() throws Exception {
     SolrQueryRequest req = req("q", "*:*");
     try {
-      assertQueryEquals("sigificantTerms", req, "{!sigificantTerms}");
+      // for Solr 7.x backcompat only
+      assertQueryEquals(SignificantTermsQParserPlugin.OLD_NAME,
+          req, "{!"+SignificantTermsQParserPlugin.OLD_NAME+"}");
+
+      assertQueryEquals(SignificantTermsQParserPlugin.NAME,
+          req, "{!"+SignificantTermsQParserPlugin.NAME+"}");
     } finally {
       req.close();
     }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
new file mode 100644
index 0000000..a951c05
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package org.apache.solr.search;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.junit.Test;
+
+public class SignificantTermsQParserPluginTest extends LuceneTestCase {
+
+  /**
+   * Test the backwards compatibility for a typo in the SignificantTermsQParserPlugin. It
will fail if the backwards
+   * compatibility is broken.
+   */
+  @Test
+  public void testQParserBackwardsCompatibility() {
+    // for Solr 7.x backcompat only
+    assertEquals("sigificantTerms", SignificantTermsQParserPlugin.OLD_NAME);
+    assertEquals(SignificantTermsQParserPlugin.class,
+        QParserPlugin.standardPlugins.get(SignificantTermsQParserPlugin.OLD_NAME).getClass());
+
+    assertEquals("significantTerms", SignificantTermsQParserPlugin.NAME);
+    assertEquals(SignificantTermsQParserPlugin.class,
+        QParserPlugin.standardPlugins.get(SignificantTermsQParserPlugin.NAME).getClass());
+  }
+}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
index aa94fab..477468a 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
@@ -476,8 +476,8 @@ public class TestQueryTypes extends SolrTestCaseJ4 {
       }
       
       // Skipping: func, boost, raw, nested, frange, spatial*, join, surround, switch, parent,
child, collapsing, 
-      // complexphrase, rerank, export, mlt, hash, graph, graphTerms, igain, tlogit, sigificantTerms,
payload*
-      // Maybe add: raw, join, parent, child, collapsing, graphTerms, igain, sigificantTerms,
simple
+      // complexphrase, rerank, export, mlt, hash, graph, graphTerms, igain, tlogit, significantTerms,
payload*
+      // Maybe add: raw, join, parent, child, collapsing, graphTerms, igain, significantTerms,
simple
     }
 
   }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java b/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
index cab9026..4b79dd9 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
@@ -66,6 +66,11 @@ public class TestStandardQParsers extends LuceneTestCase {
       }
     }
 
+    // for Solr 7.x backcompat only
+    mismatch.remove(SignificantTermsQParserPlugin.OLD_NAME
+        + " != " + SignificantTermsQParserPlugin.NAME
+        + "(" + SignificantTermsQParserPlugin.class.getName() + ")");
+
     assertTrue("All standard QParsers must have final NAME, broken: " + notFinal, 
                notFinal.isEmpty());
     assertTrue("All standard QParsers must have static NAME, broken: " + notStatic, 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a4b1358/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index 111b94b..4562cd3 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -382,7 +382,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible{
       HttpSolrClient solrClient = cache.getHttpSolrClient(baseUrl);
 
       params.add(DISTRIB, "false");
-      params.add("fq","{!sigificantTerms}");
+      params.add("fq","{!significantTerms}");
 
       for(String key : paramsMap.keySet()) {
         params.add(key, paramsMap.get(key));


Mime
View raw message