You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2017/06/15 16:53:14 UTC
lucene-solr:master: SOLR-7452: add CHANGES for refinement,
remove debugging output, don't indent _facet_ refinement info
Repository: lucene-solr
Updated Branches:
refs/heads/master f1e2be645 -> 3b5f3cc3e
SOLR-7452: add CHANGES for refinement, remove debugging output, don't indent _facet_ refinement info
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3b5f3cc3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3b5f3cc3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3b5f3cc3
Branch: refs/heads/master
Commit: 3b5f3cc3edfaf22b41f3f969391b56be482fb7b4
Parents: f1e2be6
Author: yonik <yo...@apache.org>
Authored: Thu Jun 15 12:53:09 2017 -0400
Committer: yonik <yo...@apache.org>
Committed: Thu Jun 15 12:53:09 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 7 +++++++
.../src/java/org/apache/solr/search/facet/FacetModule.java | 6 ++----
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3b5f3cc3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8db8752..ec80aec 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -136,6 +136,13 @@ New Features
* SOLR-10677: Expose a diagnostics API to return nodes sorted by load in descending order and
any policy violations. (shalin)
+* SOLR-7452: Refinement for JSON Facet API: Adding refine:true to any terms facet will cause an
+ additional distributed search phase (overlapped with field retrieval) that requests additional info
+ for top facet buckets from shards that did not previously contribute to that bucket.
+ This will correct counts (and other statistics) for those top buckets collected in the first
+ phase. (yonik)
+
+
Bug Fixes
----------------------
* SOLR-9262: Connection and read timeouts are being ignored by UpdateShardHandler after SOLR-4509.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3b5f3cc3/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
index 3407ae4..7fc016b 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
@@ -234,7 +234,7 @@ public class FacetModule extends SearchComponent {
Map<String,Object> finfo = new HashMap<>(1);
finfo.put(FACET_REFINE, refinement);
- String finfoStr = JSONUtil.toJSON(finfo);
+ String finfoStr = JSONUtil.toJSON(finfo, -1);
// System.err.println("##################### REFINE=" + finfoStr);
shardsRefineRequest.params.add(FACET_INFO, finfoStr);
@@ -281,10 +281,8 @@ public class FacetModule extends SearchComponent {
}
if ((sreq.purpose & PURPOSE_REFINE_JSON_FACETS) != 0) {
- System.err.println("REFINE FACET RESULT FROM SHARD = " + facet);
+ // System.err.println("REFINE FACET RESULT FROM SHARD = " + facet);
// call merge again with a diff flag set on the context???
-// throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "WORK IN PROGRESS, MERGING FACET REFINEMENT NOT SUPPORTED YET!");
-
facetState.mcontext.root = facet;
facetState.mcontext.setShard(shardRsp.getShard()); // TODO: roll newShard into setShard?
facetState.merger.merge(facet , facetState.mcontext);