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/06/25 02:06:58 UTC
[36/47] lucene-solr:feature/autoscaling: SOLR-10778: eliminate local
variables in (PageTool, AnalyzeEvaluator, ClassifyStream)
SOLR-10778: eliminate local variables in (PageTool,AnalyzeEvaluator,ClassifyStream)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3a017e4c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3a017e4c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3a017e4c
Branch: refs/heads/feature/autoscaling
Commit: 3a017e4cf2641ca2b0e9861f3ce915c2d2308c74
Parents: 55b0227
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 23 11:12:29 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 23 15:47:24 2017 +0100
----------------------------------------------------------------------
.../velocity/src/java/org/apache/solr/response/PageTool.java | 5 ++---
.../core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java | 3 +--
solr/core/src/java/org/apache/solr/handler/ClassifyStream.java | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3a017e4c/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
----------------------------------------------------------------------
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java b/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
index 48dc826..193c89b 100644
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
@@ -44,9 +44,8 @@ public class PageTool {
Object docs = response.getResponse();
if (docs != null) {
if (docs instanceof DocSlice) {
- DocSlice doc_slice = (DocSlice) docs;
- results_found = doc_slice.matches();
- start = doc_slice.offset();
+ results_found = ((DocSlice) docs).matches();
+ start = ((DocSlice) docs).offset();
} else if(docs instanceof ResultContext) {
DocList dl = ((ResultContext) docs).getDocList();
results_found = dl.matches();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3a017e4c/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
index 7c73498..d5bc70d 100644
--- a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
+++ b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
@@ -59,9 +59,8 @@ public class AnalyzeEvaluator extends SimpleEvaluator {
if (solrCoreObj == null || !(solrCoreObj instanceof SolrCore) ) {
throw new SolrException(SolrException.ErrorCode.INVALID_STATE, "StreamContext must have SolrCore in solr-core key");
}
- SolrCore solrCore = (SolrCore) solrCoreObj;
- analyzer = solrCore.getLatestSchema().getFieldType(analyzerField).getIndexAnalyzer();
+ analyzer = ((SolrCore) solrCoreObj).getLatestSchema().getFieldType(analyzerField).getIndexAnalyzer();
}
private void init(String fieldName, String analyzerField) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3a017e4c/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java b/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java
index 1c26685..b4b0669 100644
--- a/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java
+++ b/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java
@@ -85,8 +85,7 @@ public class ClassifyStream extends TupleStream implements Expressible {
if (solrCoreObj == null || !(solrCoreObj instanceof SolrCore) ) {
throw new SolrException(SolrException.ErrorCode.INVALID_STATE, "StreamContext must have SolrCore in solr-core key");
}
- SolrCore solrCore = (SolrCore) solrCoreObj;
- analyzer = solrCore.getLatestSchema().getFieldType(analyzerField).getIndexAnalyzer();
+ analyzer = ((SolrCore) solrCoreObj).getLatestSchema().getFieldType(analyzerField).getIndexAnalyzer();
this.docStream.setStreamContext(context);
this.modelStream.setStreamContext(context);