mirror of https://github.com/apache/lucene.git
SOLR-7412: Fixed range.facet.other parameter for distributed requests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1674182 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tomas Eduardo Fernandez Lobbe
parent
3dd6b59650
commit
61bdfdd635
|
|
@ -122,6 +122,9 @@ Bug Fixes
|
|||
* SOLR-7401: Fixed a NullPointerException when concurrently creating and deleting collections,
|
||||
while accessing other collections. (Shai Erera)
|
||||
|
||||
* SOLR-7412: Fixed range.facet.other parameter for distributed requests.
|
||||
(Will Miller, Tomás Fernándes Löbbe)
|
||||
|
||||
Optimizations
|
||||
----------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import org.apache.solr.common.SolrException;
|
|||
import org.apache.solr.common.SolrException.ErrorCode;
|
||||
import org.apache.solr.common.params.CommonParams;
|
||||
import org.apache.solr.common.params.FacetParams;
|
||||
import org.apache.solr.common.params.FacetParams.FacetRangeOther;
|
||||
import org.apache.solr.common.params.ModifiableSolrParams;
|
||||
import org.apache.solr.common.params.ShardParams;
|
||||
import org.apache.solr.common.params.SolrParams;
|
||||
|
|
@ -763,7 +764,7 @@ public class FacetComponent extends SearchComponent {
|
|||
}
|
||||
}
|
||||
|
||||
//
|
||||
private final static String[] OTHER_KEYS = new String[]{FacetRangeOther.BEFORE.toString(), FacetRangeOther.BETWEEN.toString(), FacetRangeOther.AFTER.toString()};
|
||||
// The implementation below uses the first encountered shard's
|
||||
// facet_ranges as the basis for subsequent shards' data to be merged.
|
||||
private void doDistribRanges(FacetInfo fi, NamedList facet_counts) {
|
||||
|
|
@ -777,7 +778,8 @@ public class FacetComponent extends SearchComponent {
|
|||
// go through each facet_range
|
||||
for (Map.Entry<String,SimpleOrderedMap<Object>> entry : facet_ranges) {
|
||||
final String field = entry.getKey();
|
||||
if (fi.rangeFacets.get(field) == null) {
|
||||
SimpleOrderedMap<Object> fieldMap = fi.rangeFacets.get(field);
|
||||
if (fieldMap == null) {
|
||||
// first time we've seen this field, no merging
|
||||
fi.rangeFacets.add(field, entry.getValue());
|
||||
|
||||
|
|
@ -790,17 +792,29 @@ public class FacetComponent extends SearchComponent {
|
|||
|
||||
@SuppressWarnings("unchecked")
|
||||
NamedList<Integer> existFieldValues
|
||||
= (NamedList<Integer>) fi.rangeFacets.get(field).get("counts");
|
||||
= (NamedList<Integer>) fieldMap.get("counts");
|
||||
|
||||
for (Map.Entry<String,Integer> existPair : existFieldValues) {
|
||||
final String key = existPair.getKey();
|
||||
// can be null if inconsistencies in shards responses
|
||||
Integer newValue = shardFieldValues.get(key);
|
||||
if (null != newValue) {
|
||||
if (null != newValue) {
|
||||
Integer oldValue = existPair.getValue();
|
||||
existPair.setValue(oldValue + newValue);
|
||||
}
|
||||
}
|
||||
|
||||
// merge before/between/after if they exist
|
||||
for (String otherKey:OTHER_KEYS) {
|
||||
Integer shardValue = (Integer)entry.getValue().get(otherKey);
|
||||
if (shardValue != null && shardValue > 0) {
|
||||
Integer existingValue = (Integer)fieldMap.get(otherKey);
|
||||
// shouldn't be null
|
||||
int idx = fieldMap.indexOf(otherKey, 0);
|
||||
fieldMap.setVal(idx, existingValue + shardValue);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,18 +17,26 @@
|
|||
|
||||
package org.apache.solr;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.lucene.util.LuceneTestCase.Slow;
|
||||
import org.apache.solr.client.solrj.SolrClient;
|
||||
import org.apache.solr.client.solrj.SolrQuery;
|
||||
import org.apache.solr.client.solrj.SolrResponse;
|
||||
import org.apache.solr.client.solrj.SolrServerException;
|
||||
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
|
||||
import org.apache.solr.client.solrj.impl.HttpSolrClient;
|
||||
import org.apache.solr.client.solrj.response.FacetField;
|
||||
import org.apache.solr.client.solrj.response.FieldStatsInfo;
|
||||
import org.apache.solr.client.solrj.response.QueryResponse;
|
||||
import org.apache.solr.client.solrj.response.RangeFacet;
|
||||
import org.apache.solr.client.solrj.response.FieldStatsInfo;
|
||||
import org.apache.solr.cloud.ChaosMonkey;
|
||||
import org.apache.solr.common.EnumFieldValue;
|
||||
import org.apache.solr.common.SolrException;
|
||||
|
|
@ -40,23 +48,13 @@ import org.apache.solr.common.params.SolrParams;
|
|||
import org.apache.solr.common.params.StatsParams;
|
||||
import org.apache.solr.common.util.NamedList;
|
||||
import org.apache.solr.handler.component.ShardResponse;
|
||||
import org.apache.solr.handler.component.ShardRequest;
|
||||
import org.apache.solr.handler.component.StatsComponentTest.StatSetCombinations;
|
||||
import org.apache.solr.handler.component.StatsField.Stat;
|
||||
import org.apache.solr.handler.component.TrackingShardHandlerFactory;
|
||||
import org.apache.solr.handler.component.TrackingShardHandlerFactory.ShardRequestAndParams;
|
||||
import org.apache.solr.handler.component.TrackingShardHandlerFactory.RequestTrackingQueue;
|
||||
import org.apache.solr.handler.component.StatsComponentTest.StatSetCombinations;
|
||||
import org.apache.solr.handler.component.TrackingShardHandlerFactory.ShardRequestAndParams;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.EnumSet;
|
||||
|
||||
/**
|
||||
* TODO? perhaps use:
|
||||
* http://docs.codehaus.org/display/JETTY/ServletTester
|
||||
|
|
@ -218,9 +216,11 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
|
|||
"facet","true", "facet.limit", 1, // TODO: limit shouldn't be needed: SOLR-6386
|
||||
"facet.field", tdate_b, "facet.field", tdate_a);
|
||||
assertEquals(2, rsp.getFacetFields().size());
|
||||
|
||||
String facetQuery = "id:[1 TO 15]";
|
||||
|
||||
// simple date facet on one field
|
||||
query("q","*:*", "rows",100, "facet","true",
|
||||
query("q",facetQuery, "rows",100, "facet","true",
|
||||
"facet.date",tdate_a,
|
||||
"facet.date",tdate_a,
|
||||
"facet.date.other", "all",
|
||||
|
|
@ -229,7 +229,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
|
|||
"facet.date.end","2010-05-20T11:00:00Z");
|
||||
|
||||
// date facet on multiple fields
|
||||
query("q","*:*", "rows",100, "facet","true",
|
||||
query("q",facetQuery, "rows",100, "facet","true",
|
||||
"facet.date",tdate_a,
|
||||
"facet.date",tdate_b,
|
||||
"facet.date",tdate_a,
|
||||
|
|
@ -241,7 +241,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
|
|||
"facet.date.end","2010-05-20T11:00:00Z");
|
||||
|
||||
// simple range facet on one field
|
||||
query("q","*:*", "rows",100, "facet","true",
|
||||
query("q",facetQuery, "rows",100, "facet","true",
|
||||
"facet.range",tlong,
|
||||
"facet.range",tlong,
|
||||
"facet.range.start",200,
|
||||
|
|
@ -249,7 +249,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
|
|||
"facet.range.end",900);
|
||||
|
||||
// range facet on multiple fields
|
||||
query("q","*:*", "rows",100, "facet","true",
|
||||
query("q",facetQuery, "rows",100, "facet","true",
|
||||
"facet.range",tlong,
|
||||
"facet.range",i1,
|
||||
"f."+i1+".facet.range.start",300,
|
||||
|
|
@ -258,6 +258,18 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
|
|||
"facet.range.start",200,
|
||||
"facet.range.gap",100,
|
||||
"f."+tlong+".facet.range.end",900);
|
||||
|
||||
// range facet with "other" param
|
||||
QueryResponse response = query("q",facetQuery, "rows",100, "facet","true",
|
||||
"facet.range",tlong,
|
||||
"facet.range.start",200,
|
||||
"facet.range.gap",100,
|
||||
"facet.range.end",900,
|
||||
"facet.range.other","all");
|
||||
assertEquals(tlong, response.getFacetRanges().get(0).getName());
|
||||
assertEquals(new Integer(6), response.getFacetRanges().get(0).getBefore());
|
||||
assertEquals(new Integer(5), response.getFacetRanges().get(0).getBetween());
|
||||
assertEquals(new Integer(2), response.getFacetRanges().get(0).getAfter());
|
||||
|
||||
// Test mincounts. Do NOT want to go through all the stuff where with validateControlData in query() method
|
||||
// Purposely packing a _bunch_ of stuff together here to insure that the proper level of mincount is used for
|
||||
|
|
|
|||
Loading…
Reference in New Issue