You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2016/02/26 02:00:25 UTC
lucene-solr git commit: SOLR-8737: Managed synonym lists do not
include the original term in the expand
Repository: lucene-solr
Updated Branches:
refs/heads/master d21fe2e34 -> 9bb9b7900
SOLR-8737: Managed synonym lists do not include the original term in the expand
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9bb9b790
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9bb9b790
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9bb9b790
Branch: refs/heads/master
Commit: 9bb9b7900faaaa0418517d1966cc26dc22df9c27
Parents: d21fe2e
Author: Jan Høydahl <ja...@apache.org>
Authored: Fri Feb 26 01:26:30 2016 +0100
Committer: Jan Høydahl <ja...@apache.org>
Committed: Fri Feb 26 01:26:30 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 7 +++++++
.../rest/schema/analysis/ManagedSynonymFilterFactory.java | 1 -
.../schema/analysis/TestManagedSynonymFilterFactory.java | 8 ++++----
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bb9b790/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e1f9e826..5e814d0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -324,6 +324,13 @@ Other Changes
* SOLR-8691: Cache index fingerprints per searcher. (yonik)
+================== 5.5.1 ==================
+
+Bug Fixes
+----------------------
+
+* SOLR-8737: Managed synonym lists do not include the original term in the expand (janhoy)
+
======================= 5.5.0 =======================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bb9b790/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java
index 0edaa69..3b5ce2e 100644
--- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java
+++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java
@@ -185,7 +185,6 @@ public class ManagedSynonymFilterFactory extends BaseManagedTokenFilterFactory {
Set<String> treeTerms = new TreeSet<>();
treeTerms.addAll(jsonList);
- treeTerms.remove(origTerm);
cpsm.mappings.put(origTerm, treeTerms);
madeChanges = true;
// only add the cpsm to the synonymMappings if it has valid data
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bb9b790/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
index 54a6529..9afaf6f 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
@@ -207,13 +207,13 @@ public class TestManagedSynonymFilterFactory extends RestTestBase {
assertJPut(endpoint, JSONUtil.toJSON(m2mSyns), "/responseHeader/status==0");
assertJQ(endpoint + "/funny",
- "/funny==['entertaining','jocular','whimiscal']");
+ "/funny==['entertaining','funny','jocular','whimiscal']");
assertJQ(endpoint + "/entertaining",
- "/entertaining==['funny','jocular','whimiscal']");
+ "/entertaining==['entertaining','funny','jocular','whimiscal']");
assertJQ(endpoint + "/jocular",
- "/jocular==['entertaining','funny','whimiscal']");
+ "/jocular==['entertaining','funny','jocular','whimiscal']");
assertJQ(endpoint + "/whimiscal",
- "/whimiscal==['entertaining','funny','jocular']");
+ "/whimiscal==['entertaining','funny','jocular','whimiscal']");
}
/**