You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/08/08 12:14:24 UTC
[11/50] [abbrv] lucene-solr:feature/autoscaling: SOLR-11163: Fix
contrib/ltr Normalizer persistence after solr core reload or restart. (Yuki
Yano via Christine Poerschke)
SOLR-11163: Fix contrib/ltr Normalizer persistence after solr core reload or restart.
(Yuki Yano via 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/c297180c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c297180c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c297180c
Branch: refs/heads/feature/autoscaling
Commit: c297180cca19eff3f9ace04ef8e56e8418151bd0
Parents: a381bdb
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Aug 3 16:07:40 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Aug 3 16:07:40 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../org/apache/solr/ltr/norm/MinMaxNormalizer.java | 4 ++--
.../apache/solr/ltr/norm/StandardNormalizer.java | 4 ++--
.../apache/solr/ltr/norm/TestMinMaxNormalizer.java | 17 ++++++++++++++++-
.../solr/ltr/norm/TestStandardNormalizer.java | 17 ++++++++++++++++-
5 files changed, 39 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c297180c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fd8a1e8..bb134bb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -415,6 +415,9 @@ Bug Fixes
* SOLR-11154: Child documents' return fields now include useDocValuesAsStored fields (Mohammed Sheeri Shaketi Nauage via
Ishan Chattopadhyaya)
+* SOLR-11163: Fix contrib/ltr Normalizer persistence after solr core reload or restart.
+ (Yuki Yano via Christine Poerschke)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c297180c/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.java
index ff31c01..f6322fe 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.java
@@ -90,8 +90,8 @@ public class MinMaxNormalizer extends Normalizer {
@Override
public LinkedHashMap<String,Object> paramsToMap() {
final LinkedHashMap<String,Object> params = new LinkedHashMap<>(2, 1.0f);
- params.put("min", '"'+Float.toString(min)+'"');
- params.put("max", '"'+Float.toString(max)+'"');
+ params.put("min", Float.toString(min));
+ params.put("max", Float.toString(max));
return params;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c297180c/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.java
index 57df7b4..d908ea94 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.java
@@ -82,8 +82,8 @@ public class StandardNormalizer extends Normalizer {
@Override
public LinkedHashMap<String,Object> paramsToMap() {
final LinkedHashMap<String,Object> params = new LinkedHashMap<>(2, 1.0f);
- params.put("avg", '"'+Float.toString(avg)+'"');
- params.put("std", '"'+Float.toString(std)+'"');
+ params.put("avg", Float.toString(avg));
+ params.put("std", Float.toString(std));
return params;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c297180c/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java
index 794e393..f5e0026 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java
@@ -40,7 +40,7 @@ public class TestMinMaxNormalizer {
final MinMaxNormalizer mmn = (MinMaxNormalizer)n;
assertEquals(mmn.getMin(), expectedMin, 0.0);
assertEquals(mmn.getMax(), expectedMax, 0.0);
- assertEquals("{min=\""+expectedMin+"\", max=\""+expectedMax+"\"}", mmn.paramsToMap().toString());
+ assertEquals("{min="+expectedMin+", max="+expectedMax+"}", mmn.paramsToMap().toString());
return n;
}
@@ -118,4 +118,19 @@ public class TestMinMaxNormalizer {
value = 5;
assertEquals((value - 5f) / (10f - 5f), n.normalize(value), 0.0001);
}
+
+ @Test
+ public void testParamsToMap() {
+ final MinMaxNormalizer n1 = new MinMaxNormalizer();
+ n1.setMin(5.0f);
+ n1.setMax(10.0f);
+
+ final Map<String,Object> params = n1.paramsToMap();
+ final MinMaxNormalizer n2 = (MinMaxNormalizer) Normalizer.getInstance(
+ new SolrResourceLoader(),
+ MinMaxNormalizer.class.getName(),
+ params);
+ assertEquals(n1.getMin(), n2.getMin(), 1e-6);
+ assertEquals(n1.getMax(), n2.getMax(), 1e-6);
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c297180c/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java
index 1794686..c27dcad 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java
@@ -40,7 +40,7 @@ public class TestStandardNormalizer {
final StandardNormalizer sn = (StandardNormalizer)n;
assertEquals(sn.getAvg(), expectedAvg, 0.0);
assertEquals(sn.getStd(), expectedStd, 0.0);
- assertEquals("{avg=\""+expectedAvg+"\", std=\""+expectedStd+"\"}", sn.paramsToMap().toString());
+ assertEquals("{avg="+expectedAvg+", std="+expectedStd+"}", sn.paramsToMap().toString());
return n;
}
@@ -130,4 +130,19 @@ public class TestStandardNormalizer {
assertEquals((v - 10f) / (1.5f), norm.normalize(v), 0.0001);
}
}
+
+ @Test
+ public void testParamsToMap() {
+ final StandardNormalizer n1 = new StandardNormalizer();
+ n1.setAvg(2.0f);
+ n1.setStd(3.0f);
+
+ final Map<String, Object> params = n1.paramsToMap();
+ final StandardNormalizer n2 = (StandardNormalizer) Normalizer.getInstance(
+ new SolrResourceLoader(),
+ StandardNormalizer.class.getName(),
+ params);
+ assertEquals(n1.getAvg(), n2.getAvg(), 1e-6);
+ assertEquals(n1.getStd(), n2.getStd(), 1e-6);
+ }
}