You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/04/05 11:42:12 UTC
[1/2] lucene-solr:branch_6x: SOLR-10421: Fix params persistence for
solr/contrib/ltr (MinMax|Standard)Normalizer classes. (Jianxiong Dong,
Christine Poerschke)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x ef5db5663 -> 29b59f593
SOLR-10421: Fix params persistence for solr/contrib/ltr (MinMax|Standard)Normalizer classes.
(Jianxiong Dong, 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/50317924
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/50317924
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/50317924
Branch: refs/heads/branch_6x
Commit: 503179248312f8610d074e2e67fdf48454a8940a
Parents: ef5db56
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Apr 5 11:50:13 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Apr 5 12:17:28 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.java | 4 ++--
.../src/java/org/apache/solr/ltr/norm/StandardNormalizer.java | 4 ++--
.../src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java | 1 +
.../test/org/apache/solr/ltr/norm/TestStandardNormalizer.java | 1 +
5 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/50317924/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5a9ae75..e66d722 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -132,6 +132,9 @@ Bug Fixes
* SOLR-10277: On 'downnode', lots of wasteful mutations are done to ZK.
(Joshua Humphries, Scott Blum, Varun Thacker, shalin)
+* SOLR-10421: Fix params persistence for solr/contrib/ltr (MinMax|Standard)Normalizer classes.
+ (Jianxiong Dong, Christine Poerschke)
+
================== 6.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/50317924/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 92e233c..ff31c01 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", min);
- params.put("max", 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/50317924/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 7ab525c..57df7b4 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", avg);
- params.put("std", 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/50317924/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 055b3bc..794e393 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,6 +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());
return n;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/50317924/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 10fa972..1794686 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,6 +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());
return n;
}
[2/2] lucene-solr:branch_6x: Remove unused (private static final)
loggers in LTRQParserPlugin and LTRFeatureLoggerTransformerFactory.
Posted by cp...@apache.org.
Remove unused (private static final) loggers in LTRQParserPlugin and LTRFeatureLoggerTransformerFactory.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/29b59f59
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/29b59f59
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/29b59f59
Branch: refs/heads/branch_6x
Commit: 29b59f593de3fa3cf3d178c7ce311b6aadd38d5d
Parents: 5031792
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Apr 5 11:52:34 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Apr 5 12:17:40 2017 +0100
----------------------------------------------------------------------
.../response/transform/LTRFeatureLoggerTransformerFactory.java | 5 -----
.../src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java | 5 -----
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29b59f59/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
index 8fd8e51..f725fb9 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
@@ -17,7 +17,6 @@
package org.apache.solr.ltr.response.transform;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
@@ -47,8 +46,6 @@ import org.apache.solr.response.transform.DocTransformer;
import org.apache.solr.response.transform.TransformerFactory;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.SolrPluginUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* This transformer will take care to generate and append in the response the
@@ -65,8 +62,6 @@ import org.slf4j.LoggerFactory;
public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
// used inside fl to specify the format (dense|sparse) of the extracted features
private static final String FV_FORMAT = "format";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29b59f59/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java
index 2b4d570..c5db963 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java
@@ -17,7 +17,6 @@
package org.apache.solr.ltr.search;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -46,8 +45,6 @@ import org.apache.solr.search.QParserPlugin;
import org.apache.solr.search.RankQuery;
import org.apache.solr.search.SyntaxError;
import org.apache.solr.util.SolrPluginUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Plug into solr a rerank model.
@@ -60,8 +57,6 @@ public class LTRQParserPlugin extends QParserPlugin implements ResourceLoaderAwa
public static final String NAME = "ltr";
private static Query defaultQuery = new MatchAllDocsQuery();
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
// params for setting custom external info that features can use, like query
// intent
static final String EXTERNAL_FEATURE_INFO = "efi.";