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 2016/09/27 12:20:32 UTC
[1/3] lucene-solr:master: In ConfigSetProperties use unintentionally
unused local (objectClass).
Repository: lucene-solr
Updated Branches:
refs/heads/master 59c107134 -> a84d9a5d6
In ConfigSetProperties use unintentionally unused local (objectClass).
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a84d9a5d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a84d9a5d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a84d9a5d
Branch: refs/heads/master
Commit: a84d9a5d694e97c40d90a07a0882492946e72141
Parents: 85603b0
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Sep 27 12:17:58 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Sep 27 12:18:22 2016 +0100
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a84d9a5d/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
index 004b166..77cd272 100644
--- a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
+++ b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
@@ -70,7 +70,7 @@ public class ConfigSetProperties {
Object object = ObjectBuilder.getVal(jsonParser);
if (!(object instanceof Map)) {
final String objectClass = object == null ? "null" : object.getClass().getName();
- throw new SolrException(ErrorCode.SERVER_ERROR, "Invalid JSON type " + object.getClass().getName() + ", expected Map");
+ throw new SolrException(ErrorCode.SERVER_ERROR, "Invalid JSON type " + objectClass + ", expected Map");
}
return new NamedList((Map)object);
} catch (Exception ex) {
[3/3] lucene-solr:master: SOLR-9567: Make ReRankQParserPlugin's
private ReRankCollector a public class of its own. (Christine Poerschke)
Posted by cp...@apache.org.
SOLR-9567: Make ReRankQParserPlugin's private ReRankCollector a public class of its own. (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/1d2be1df
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1d2be1df
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1d2be1df
Branch: refs/heads/master
Commit: 1d2be1df7ba29f6efd9b2f55990bb193bf718f3c
Parents: 59c1071
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Sep 27 11:56:30 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Sep 27 12:18:22 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../org/apache/solr/search/ReRankCollector.java | 175 +++++++++++++++++++
.../apache/solr/search/ReRankQParserPlugin.java | 147 ----------------
3 files changed, 177 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1d2be1df/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 70253b8..2f81d0a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -203,6 +203,8 @@ Other Changes
* SOLR-9547: Do not allow bin/solr start as root user, unless -force param specified (janhoy)
+* SOLR-9567: Make ReRankQParserPlugin's private ReRankCollector a public class of its own. (Christine Poerschke)
+
================== 6.2.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1d2be1df/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
new file mode 100644
index 0000000..1ac1eaf
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
@@ -0,0 +1,175 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.search;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Map;
+import com.carrotsearch.hppc.IntFloatHashMap;
+import com.carrotsearch.hppc.IntIntHashMap;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LeafCollector;
+import org.apache.lucene.search.Rescorer;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.TopDocsCollector;
+import org.apache.lucene.search.TopFieldCollector;
+import org.apache.lucene.search.TopScoreDocCollector;
+import org.apache.lucene.util.BytesRef;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.handler.component.QueryElevationComponent;
+import org.apache.solr.request.SolrRequestInfo;
+
+/* A TopDocsCollector used by reranking queries. */
+public class ReRankCollector extends TopDocsCollector {
+
+ final private TopDocsCollector mainCollector;
+ final private IndexSearcher searcher;
+ final private int reRankDocs;
+ final private int length;
+ final private Map<BytesRef, Integer> boostedPriority;
+ final private Rescorer reRankQueryRescorer;
+
+
+ public ReRankCollector(int reRankDocs,
+ int length,
+ Rescorer reRankQueryRescorer,
+ QueryCommand cmd,
+ IndexSearcher searcher,
+ Map<BytesRef, Integer> boostedPriority) throws IOException {
+ super(null);
+ this.reRankDocs = reRankDocs;
+ this.length = length;
+ this.boostedPriority = boostedPriority;
+ Sort sort = cmd.getSort();
+ if(sort == null) {
+ this.mainCollector = TopScoreDocCollector.create(Math.max(this.reRankDocs, length));
+ } else {
+ sort = sort.rewrite(searcher);
+ this.mainCollector = TopFieldCollector.create(sort, Math.max(this.reRankDocs, length), false, true, true);
+ }
+ this.searcher = searcher;
+ this.reRankQueryRescorer = reRankQueryRescorer;
+ }
+
+ public int getTotalHits() {
+ return mainCollector.getTotalHits();
+ }
+
+ @Override
+ public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
+ return mainCollector.getLeafCollector(context);
+ }
+
+ @Override
+ public boolean needsScores() {
+ return true;
+ }
+
+ public TopDocs topDocs(int start, int howMany) {
+
+ try {
+
+ TopDocs mainDocs = mainCollector.topDocs(0, Math.max(reRankDocs, length));
+
+ if(mainDocs.totalHits == 0 || mainDocs.scoreDocs.length == 0) {
+ return mainDocs;
+ }
+
+ ScoreDoc[] mainScoreDocs = mainDocs.scoreDocs;
+ ScoreDoc[] reRankScoreDocs = new ScoreDoc[Math.min(mainScoreDocs.length, reRankDocs)];
+ System.arraycopy(mainScoreDocs, 0, reRankScoreDocs, 0, reRankScoreDocs.length);
+
+ mainDocs.scoreDocs = reRankScoreDocs;
+
+ TopDocs rescoredDocs = reRankQueryRescorer
+ .rescore(searcher, mainDocs, mainDocs.scoreDocs.length);
+
+ //Lower howMany to return if we've collected fewer documents.
+ howMany = Math.min(howMany, mainScoreDocs.length);
+
+ if(boostedPriority != null) {
+ SolrRequestInfo info = SolrRequestInfo.getRequestInfo();
+ Map requestContext = null;
+ if(info != null) {
+ requestContext = info.getReq().getContext();
+ }
+
+ IntIntHashMap boostedDocs = QueryElevationComponent.getBoostDocs((SolrIndexSearcher)searcher, boostedPriority, requestContext);
+
+ Arrays.sort(rescoredDocs.scoreDocs, new BoostedComp(boostedDocs, mainDocs.scoreDocs, rescoredDocs.getMaxScore()));
+ }
+
+ if(howMany == rescoredDocs.scoreDocs.length) {
+ return rescoredDocs; // Just return the rescoredDocs
+ } else if(howMany > rescoredDocs.scoreDocs.length) {
+ //We need to return more then we've reRanked, so create the combined page.
+ ScoreDoc[] scoreDocs = new ScoreDoc[howMany];
+ System.arraycopy(mainScoreDocs, 0, scoreDocs, 0, scoreDocs.length); //lay down the initial docs
+ System.arraycopy(rescoredDocs.scoreDocs, 0, scoreDocs, 0, rescoredDocs.scoreDocs.length);//overlay the re-ranked docs.
+ rescoredDocs.scoreDocs = scoreDocs;
+ return rescoredDocs;
+ } else {
+ //We've rescored more then we need to return.
+ ScoreDoc[] scoreDocs = new ScoreDoc[howMany];
+ System.arraycopy(rescoredDocs.scoreDocs, 0, scoreDocs, 0, howMany);
+ rescoredDocs.scoreDocs = scoreDocs;
+ return rescoredDocs;
+ }
+ } catch (Exception e) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
+ }
+ }
+
+ public class BoostedComp implements Comparator {
+ IntFloatHashMap boostedMap;
+
+ public BoostedComp(IntIntHashMap boostedDocs, ScoreDoc[] scoreDocs, float maxScore) {
+ this.boostedMap = new IntFloatHashMap(boostedDocs.size()*2);
+
+ for(int i=0; i<scoreDocs.length; i++) {
+ final int idx;
+ if((idx = boostedDocs.indexOf(scoreDocs[i].doc)) >= 0) {
+ boostedMap.put(scoreDocs[i].doc, maxScore+boostedDocs.indexGet(idx));
+ } else {
+ break;
+ }
+ }
+ }
+
+ public int compare(Object o1, Object o2) {
+ ScoreDoc doc1 = (ScoreDoc) o1;
+ ScoreDoc doc2 = (ScoreDoc) o2;
+ float score1 = doc1.score;
+ float score2 = doc2.score;
+ int idx;
+ if((idx = boostedMap.indexOf(doc1.doc)) >= 0) {
+ score1 = boostedMap.indexGet(idx);
+ }
+
+ if((idx = boostedMap.indexOf(doc2.doc)) >= 0) {
+ score2 = boostedMap.indexGet(idx);
+ }
+
+ return -Float.compare(score1, score2);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1d2be1df/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
index a230170..fab39d6 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
@@ -17,26 +17,15 @@
package org.apache.solr.search;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Comparator;
import java.util.Map;
-import com.carrotsearch.hppc.IntFloatHashMap;
-import com.carrotsearch.hppc.IntIntHashMap;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryRescorer;
import org.apache.lucene.search.Rescorer;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopDocsCollector;
-import org.apache.lucene.search.TopFieldCollector;
-import org.apache.lucene.search.TopScoreDocCollector;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
@@ -190,140 +179,4 @@ public class ReRankQParserPlugin extends QParserPlugin {
return new ReRankWeight(mainQuery, reRankQueryRescorer, searcher, mainWeight);
}
}
-
- private class ReRankCollector extends TopDocsCollector {
-
- final private TopDocsCollector mainCollector;
- final private IndexSearcher searcher;
- final private int reRankDocs;
- final private int length;
- final private Map<BytesRef, Integer> boostedPriority;
- final private Rescorer reRankQueryRescorer;
-
-
- public ReRankCollector(int reRankDocs,
- int length,
- Rescorer reRankQueryRescorer,
- QueryCommand cmd,
- IndexSearcher searcher,
- Map<BytesRef, Integer> boostedPriority) throws IOException {
- super(null);
- this.reRankDocs = reRankDocs;
- this.length = length;
- this.boostedPriority = boostedPriority;
- Sort sort = cmd.getSort();
- if(sort == null) {
- this.mainCollector = TopScoreDocCollector.create(Math.max(this.reRankDocs, length));
- } else {
- sort = sort.rewrite(searcher);
- this.mainCollector = TopFieldCollector.create(sort, Math.max(this.reRankDocs, length), false, true, true);
- }
- this.searcher = searcher;
- this.reRankQueryRescorer = reRankQueryRescorer;
- }
-
- public int getTotalHits() {
- return mainCollector.getTotalHits();
- }
-
- @Override
- public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
- return mainCollector.getLeafCollector(context);
- }
-
- @Override
- public boolean needsScores() {
- return true;
- }
-
- public TopDocs topDocs(int start, int howMany) {
-
- try {
-
- TopDocs mainDocs = mainCollector.topDocs(0, Math.max(reRankDocs, length));
-
- if(mainDocs.totalHits == 0 || mainDocs.scoreDocs.length == 0) {
- return mainDocs;
- }
-
- ScoreDoc[] mainScoreDocs = mainDocs.scoreDocs;
- ScoreDoc[] reRankScoreDocs = new ScoreDoc[Math.min(mainScoreDocs.length, reRankDocs)];
- System.arraycopy(mainScoreDocs, 0, reRankScoreDocs, 0, reRankScoreDocs.length);
-
- mainDocs.scoreDocs = reRankScoreDocs;
-
- TopDocs rescoredDocs = reRankQueryRescorer
- .rescore(searcher, mainDocs, mainDocs.scoreDocs.length);
-
- //Lower howMany to return if we've collected fewer documents.
- howMany = Math.min(howMany, mainScoreDocs.length);
-
- if(boostedPriority != null) {
- SolrRequestInfo info = SolrRequestInfo.getRequestInfo();
- Map requestContext = null;
- if(info != null) {
- requestContext = info.getReq().getContext();
- }
-
- IntIntHashMap boostedDocs = QueryElevationComponent.getBoostDocs((SolrIndexSearcher)searcher, boostedPriority, requestContext);
-
- Arrays.sort(rescoredDocs.scoreDocs, new BoostedComp(boostedDocs, mainDocs.scoreDocs, rescoredDocs.getMaxScore()));
- }
-
- if(howMany == rescoredDocs.scoreDocs.length) {
- return rescoredDocs; // Just return the rescoredDocs
- } else if(howMany > rescoredDocs.scoreDocs.length) {
- //We need to return more then we've reRanked, so create the combined page.
- ScoreDoc[] scoreDocs = new ScoreDoc[howMany];
- System.arraycopy(mainScoreDocs, 0, scoreDocs, 0, scoreDocs.length); //lay down the initial docs
- System.arraycopy(rescoredDocs.scoreDocs, 0, scoreDocs, 0, rescoredDocs.scoreDocs.length);//overlay the re-ranked docs.
- rescoredDocs.scoreDocs = scoreDocs;
- return rescoredDocs;
- } else {
- //We've rescored more then we need to return.
- ScoreDoc[] scoreDocs = new ScoreDoc[howMany];
- System.arraycopy(rescoredDocs.scoreDocs, 0, scoreDocs, 0, howMany);
- rescoredDocs.scoreDocs = scoreDocs;
- return rescoredDocs;
- }
- } catch (Exception e) {
- throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
- }
- }
-
- }
-
- public class BoostedComp implements Comparator {
- IntFloatHashMap boostedMap;
-
- public BoostedComp(IntIntHashMap boostedDocs, ScoreDoc[] scoreDocs, float maxScore) {
- this.boostedMap = new IntFloatHashMap(boostedDocs.size()*2);
-
- for(int i=0; i<scoreDocs.length; i++) {
- final int idx;
- if((idx = boostedDocs.indexOf(scoreDocs[i].doc)) >= 0) {
- boostedMap.put(scoreDocs[i].doc, maxScore+boostedDocs.indexGet(idx));
- } else {
- break;
- }
- }
- }
-
- public int compare(Object o1, Object o2) {
- ScoreDoc doc1 = (ScoreDoc) o1;
- ScoreDoc doc2 = (ScoreDoc) o2;
- float score1 = doc1.score;
- float score2 = doc2.score;
- int idx;
- if((idx = boostedMap.indexOf(doc1.doc)) >= 0) {
- score1 = boostedMap.indexGet(idx);
- }
-
- if((idx = boostedMap.indexOf(doc2.doc)) >= 0) {
- score2 = boostedMap.indexGet(idx);
- }
-
- return -Float.compare(score1, score2);
- }
- }
}
[2/3] lucene-solr:master: Remove unused local (targetShard) in
SliceMutator.
Posted by cp...@apache.org.
Remove unused local (targetShard) in SliceMutator.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/85603b0e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/85603b0e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/85603b0e
Branch: refs/heads/master
Commit: 85603b0eca806e42f5ccb47f58469834094e97fa
Parents: 1d2be1d
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Sep 27 12:17:15 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Sep 27 12:18:22 2016 +0100
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/85603b0e/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
index 8eb323d..ec2ce2e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
@@ -184,7 +184,6 @@ public class SliceMutator {
String routeKey = message.getStr("routeKey");
String range = message.getStr("range");
String targetCollection = message.getStr("targetCollection");
- String targetShard = message.getStr("targetShard");
String expireAt = message.getStr("expireAt");
DocCollection collection = clusterState.getCollection(collectionName);