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/07/07 16:38:06 UTC
[1/2] lucene-solr:master: SOLR-10964: Reduce SolrIndexSearcher
casting in LTRRescorer.
Repository: lucene-solr
Updated Branches:
refs/heads/master 5d1f57f88 -> 14ec46c7f
SOLR-10964: Reduce SolrIndexSearcher casting in LTRRescorer.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/14ec46c7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/14ec46c7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/14ec46c7
Branch: refs/heads/master
Commit: 14ec46c7f8fb6d766334744a884192806e8c3803
Parents: b123eba
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jul 7 16:25:41 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jul 7 17:37:19 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../ltr/src/java/org/apache/solr/ltr/LTRRescorer.java | 13 ++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/14ec46c7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 022a28e..c562a85 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -80,6 +80,8 @@ Other Changes
* SOLR-10748: Make stream.body configurable and disabled by default (janhoy)
+* SOLR-10964: Reduce SolrIndexSearcher casting in LTRRescorer. (Christine Poerschke)
+
================== 7.0.0 ==================
Versions of Major Components
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/14ec46c7/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
index 33c9a36..59b764b 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
@@ -116,8 +116,7 @@ public class LTRRescorer extends Rescorer {
final LTRScoringQuery.ModelWeight modelWeight = (LTRScoringQuery.ModelWeight) searcher
.createNormalizedWeight(scoringQuery, true);
- final SolrIndexSearcher solrIndexSearch = (SolrIndexSearcher) searcher;
- scoreFeatures(solrIndexSearch, firstPassTopDocs,topN, modelWeight, hits, leaves, reranked);
+ scoreFeatures(searcher, firstPassTopDocs,topN, modelWeight, hits, leaves, reranked);
// Must sort all documents that we reranked, and then select the top
Arrays.sort(reranked, new Comparator<ScoreDoc>() {
@Override
@@ -138,7 +137,7 @@ public class LTRRescorer extends Rescorer {
return new TopDocs(firstPassTopDocs.totalHits, reranked, reranked[0].score);
}
- public void scoreFeatures(SolrIndexSearcher solrIndexSearch, TopDocs firstPassTopDocs,
+ public void scoreFeatures(IndexSearcher indexSearcher, TopDocs firstPassTopDocs,
int topN, LTRScoringQuery.ModelWeight modelWeight, ScoreDoc[] hits, List<LeafReaderContext> leaves,
ScoreDoc[] reranked) throws IOException {
@@ -183,8 +182,8 @@ public class LTRRescorer extends Rescorer {
reranked[hitUpto] = hit;
// if the heap is not full, maybe I want to log the features for this
// document
- if (featureLogger != null) {
- featureLogger.log(hit.doc, scoringQuery, solrIndexSearch,
+ if (featureLogger != null && indexSearcher instanceof SolrIndexSearcher) {
+ featureLogger.log(hit.doc, scoringQuery, (SolrIndexSearcher)indexSearcher,
modelWeight.getFeaturesInfo());
}
} else if (hitUpto == topN) {
@@ -200,8 +199,8 @@ public class LTRRescorer extends Rescorer {
if (hit.score > reranked[0].score) {
reranked[0] = hit;
heapAdjust(reranked, topN, 0);
- if (featureLogger != null) {
- featureLogger.log(hit.doc, scoringQuery, solrIndexSearch,
+ if (featureLogger != null && indexSearcher instanceof SolrIndexSearcher) {
+ featureLogger.log(hit.doc, scoringQuery, (SolrIndexSearcher)indexSearcher,
modelWeight.getFeaturesInfo());
}
}
[2/2] lucene-solr:master: SOLR-10985: Remove unnecessary toString()
calls in solr-core's search package's debug logging. (Michael Braun via
Christine Poerschke)
Posted by cp...@apache.org.
SOLR-10985: Remove unnecessary toString() calls in solr-core's search package's debug logging.
(Michael Braun 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/b123ebad
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b123ebad
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b123ebad
Branch: refs/heads/master
Commit: b123ebad4814132182ad15651e1aabe6e53e7558
Parents: 5d1f57f
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jul 7 16:22:39 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jul 7 17:37:19 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ++-
.../apache/solr/search/stats/ExactStatsCache.java | 5 ++---
.../apache/solr/search/stats/LRUStatsCache.java | 2 +-
.../apache/solr/search/stats/LocalStatsCache.java | 18 ++++++++++--------
4 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b123ebad/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 60c3b98..022a28e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -67,7 +67,8 @@ Bug Fixes
Optimizations
----------------------
-(No Changes)
+* SOLR-10985: Remove unnecessary toString() calls in solr-core's search package's debug logging.
+ (Michael Braun via Christine Poerschke)
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b123ebad/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
index 413584d..b4e76d4 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
@@ -179,15 +179,14 @@ public class ExactStatsCache extends StatsCache {
String termStatsString = StatsUtil.termStatsMapToString(statsMap);
rb.rsp.add(TERM_STATS_KEY, termStatsString);
if (LOG.isDebugEnabled()) {
- LOG.debug("termStats=" + termStatsString + ", terms=" + terms + ", numDocs=" + searcher.maxDoc());
+ LOG.debug("termStats={}, terms={}, numDocs={}", termStatsString, terms, searcher.maxDoc());
}
}
if (colMap.size() != 0){
String colStatsString = StatsUtil.colStatsMapToString(colMap);
rb.rsp.add(COL_STATS_KEY, colStatsString);
if (LOG.isDebugEnabled()) {
- LOG.debug("collectionStats="
- + colStatsString + ", terms=" + terms + ", numDocs=" + searcher.maxDoc());
+ LOG.debug("collectionStats={}, terms={}, numDocs={}", colStatsString, terms, searcher.maxDoc());
}
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b123ebad/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
index ffcc99d..99efb8d 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
@@ -136,7 +136,7 @@ public class LRUStatsCache extends ExactStatsCache {
throws IOException {
TermStats termStats = termStatsCache.get(term.toString());
if (termStats == null) {
- LOG.debug("## Missing global termStats info: {}, using local", term.toString());
+ LOG.debug("## Missing global termStats info: {}, using local", term);
return localSearcher.localTermStatistics(term, context);
} else {
return termStats.toTermStatistics();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b123ebad/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
index 2eb3fc0..90395f5 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
@@ -38,7 +38,7 @@ public class LocalStatsCache extends StatsCache {
@Override
public StatsSource get(SolrQueryRequest req) {
- LOG.debug("## GET {}", req.toString());
+ LOG.debug("## GET {}", req);
return new LocalStatsSource();
}
@@ -49,31 +49,33 @@ public class LocalStatsCache extends StatsCache {
// by returning null we don't create additional round-trip request.
@Override
public ShardRequest retrieveStatsRequest(ResponseBuilder rb) {
- LOG.debug("## RDR {}", rb.req.toString());
+ LOG.debug("## RDR {}", rb.req);
return null;
}
@Override
public void mergeToGlobalStats(SolrQueryRequest req,
List<ShardResponse> responses) {
- LOG.debug("## MTGD {}", req.toString());
- for (ShardResponse r : responses) {
- LOG.debug(" - {}", r);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("## MTGD {}", req);
+ for (ShardResponse r : responses) {
+ LOG.debug(" - {}", r);
+ }
}
}
@Override
public void returnLocalStats(ResponseBuilder rb, SolrIndexSearcher searcher) {
- LOG.debug("## RLD {}", rb.req.toString());
+ LOG.debug("## RLD {}", rb.req);
}
@Override
public void receiveGlobalStats(SolrQueryRequest req) {
- LOG.debug("## RGD {}", req.toString());
+ LOG.debug("## RGD {}", req);
}
@Override
public void sendGlobalStats(ResponseBuilder rb, ShardRequest outgoing) {
- LOG.debug("## SGD {}", outgoing.toString());
+ LOG.debug("## SGD {}", outgoing);
}
}