You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ar...@apache.org on 2018/08/03 01:34:47 UTC
lucene-solr:branch_7x: SOLR-12574: Fix the SignificantTermStream to
use the new bucket format
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x a41a4fc69 -> 2b121e7f2
SOLR-12574: Fix the SignificantTermStream to use the new bucket format
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2b121e7f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2b121e7f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2b121e7f
Branch: refs/heads/branch_7x
Commit: 2b121e7f2267d185455b4f6bf4aa9fa6bf9266f9
Parents: a41a4fc
Author: Alexandre Rafalovitch <ar...@apache.org>
Authored: Thu Aug 2 21:34:12 2018 -0400
Committer: Alexandre Rafalovitch <ar...@apache.org>
Committed: Thu Aug 2 21:34:12 2018 -0400
----------------------------------------------------------------------
.../solrj/io/stream/SignificantTermsStream.java | 16 ++++++++++------
.../solrj/io/stream/StreamExpressionTest.java | 1 -
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2b121e7f/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index 4562cd3..729ddb1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -44,6 +44,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.NamedList;
@@ -286,13 +287,16 @@ public class SignificantTermsStream extends TupleStream implements Expressible{
long numDocs = 0;
long resultCount = 0;
for (Future<NamedList> getTopTermsCall : callShards(getShards(zkHost, collection, streamContext))) {
- NamedList resp = getTopTermsCall.get();
+ NamedList fullResp = getTopTermsCall.get();
+ Map stResp = (Map)fullResp.get("significantTerms");
- List<String> terms = (List<String>)resp.get("sterms");
- List<Integer> docFreqs = (List<Integer>)resp.get("docFreq");
- List<Integer> queryDocFreqs = (List<Integer>)resp.get("queryDocFreq");
- numDocs += (Integer)resp.get("numDocs");
- resultCount += (Integer)resp.get("resultCount");
+ List<String> terms = (List<String>)stResp.get("sterms");
+ List<Integer> docFreqs = (List<Integer>)stResp.get("docFreq");
+ List<Integer> queryDocFreqs = (List<Integer>)stResp.get("queryDocFreq");
+ numDocs += (Integer)stResp.get("numDocs");
+
+ SolrDocumentList searchResp = (SolrDocumentList) fullResp.get("response");
+ resultCount += searchResp.getNumFound();
for (int i = 0; i < terms.size(); i++) {
String term = terms.get(i);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2b121e7f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index c7f15e8..e5455b5 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -2258,7 +2258,6 @@ public class StreamExpressionTest extends SolrCloudTestCase {
@Test
- @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12574")
public void testSignificantTermsStream() throws Exception {
UpdateRequest updateRequest = new UpdateRequest();