From commits-return-102529-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Sun Jul 29 18:04:59 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D506318065B for ; Sun, 29 Jul 2018 18:04:58 +0200 (CEST) Received: (qmail 20737 invoked by uid 500); 29 Jul 2018 16:04:57 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 20727 invoked by uid 99); 29 Jul 2018 16:04:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Jul 2018 16:04:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A12E2DFAB3; Sun, 29 Jul 2018 16:04:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arafalov@apache.org To: commits@lucene.apache.org Message-Id: <7ab7e309f4c94354aaf0045e999a5969@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:branch_7x: SOLR-12574: Use a common bucket for all significantTerms outputs Date: Sun, 29 Jul 2018 16:04:57 +0000 (UTC) Repository: lucene-solr Updated Branches: refs/heads/branch_7x 3c3137728 -> c0b78f74e SOLR-12574: Use a common bucket for all significantTerms outputs Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c0b78f74 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c0b78f74 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c0b78f74 Branch: refs/heads/branch_7x Commit: c0b78f74e5cabb2a1aee2012aa55229a9780b86d Parents: 3c31377 Author: Alexandre Rafalovitch Authored: Sun Jul 29 12:04:42 2018 -0400 Committer: Alexandre Rafalovitch Committed: Sun Jul 29 12:04:42 2018 -0400 ---------------------------------------------------------------------- solr/CHANGES.txt | 2 ++ .../solr/search/SignificantTermsQParserPlugin.java | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c0b78f74/solr/CHANGES.txt ---------------------------------------------------------------------- diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index f0405c0..7d7ee97 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -193,6 +193,8 @@ Other Changes * SOLR-12454: Tweak Overseer leadership transition related logging for easier troubleshooting. (Christine Poerschke) +* SOLR-12574: Put under a common "significantTerms" bucket all output by SignificantTerms Query Parser (Alexandre Rafalovitch) + ================== 7.4.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/c0b78f74/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java index e781329..e484470 100644 --- a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java @@ -20,6 +20,7 @@ package org.apache.solr.search; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.TreeSet; @@ -144,12 +145,15 @@ public class SignificantTermsQParserPlugin extends QParserPlugin { NamedList allFreq = new NamedList(); NamedList allQueryFreq = new NamedList(); - rb.rsp.add("numDocs", numDocs); - rb.rsp.add("resultCount", count); - rb.rsp.add("sterms", outTerms); - rb.rsp.add("scores", scores); - rb.rsp.add("docFreq", outFreq); - rb.rsp.add("queryDocFreq", outQueryFreq); + LinkedHashMap response = new LinkedHashMap<>(); + + rb.rsp.add("significantTerms", response); + + response.put("numDocs", numDocs); + response.put("sterms", outTerms); + response.put("scores", scores); + response.put("docFreq", outFreq); + response.put("queryDocFreq", outQueryFreq); //TODO: Use a priority queue TreeSet topTerms = new TreeSet<>();