Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9432: Fix-up precommit

This commit is contained in:
jbernste 2016-08-23 15:25:18 -04:00
parent a1b55eb743
commit 49ba37ac4d
4 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
View File

@ -1,15 +1,3 @@
package org.apache.solr.search.facet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.solr.common.util.SimpleOrderedMap;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -27,6 +15,16 @@ import org.apache.solr.common.util.SimpleOrderedMap;
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.facet;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.solr.common.util.SimpleOrderedMap;
// TODO: refactor more out to base class // TODO: refactor more out to base class
public class FacetFieldMerger extends FacetRequestSortedMerger<FacetField> { public class FacetFieldMerger extends FacetRequestSortedMerger<FacetField> {
FacetBucket missingBucket; FacetBucket missingBucket;

8
solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
View File

@ -17,16 +17,10 @@
package org.apache.solr.search.facet; package org.apache.solr.search.facet;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
@ -586,7 +580,7 @@ class FacetBucket {
} }
public Map<String, Object> getRefinement2(FacetMerger.Context mcontext, Collection<String> refineTags) { public Map<String, Object> getRefinement2(FacetMerger.Context mcontext, Collection<String> refineTags) {
// TODO nocommit - partial results should turn off refining!!! // TODO - partial results should turn off refining!!!
boolean parentMissing = mcontext.bucketWasMissing(); boolean parentMissing = mcontext.bucketWasMissing();

16
solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
View File

@ -1,11 +1,3 @@
package org.apache.solr.search.facet;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import org.apache.solr.common.params.FacetParams;
import org.apache.solr.common.util.SimpleOrderedMap;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
@ -24,6 +16,14 @@ import org.apache.solr.common.util.SimpleOrderedMap;
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.facet;
import java.util.ArrayList;
import java.util.List;
import org.apache.solr.common.params.FacetParams;
import org.apache.solr.common.util.SimpleOrderedMap;
public class FacetRangeMerger extends FacetRequestSortedMerger<FacetRange> { public class FacetRangeMerger extends FacetRequestSortedMerger<FacetRange> {
FacetBucket beforeBucket; FacetBucket beforeBucket;
FacetBucket afterBucket; FacetBucket afterBucket;

26
solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
View File

@ -1,16 +1,3 @@
package org.apache.solr.search.facet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.solr.common.util.SimpleOrderedMap;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -28,6 +15,19 @@ import org.apache.solr.common.util.SimpleOrderedMap;
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.facet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.solr.common.util.SimpleOrderedMap;
// base class for facets that create a list of buckets that can be sorted // base class for facets that create a list of buckets that can be sorted
abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted> extends FacetBucketMerger<FacetRequestT> { abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted> extends FacetBucketMerger<FacetRequestT> {
LinkedHashMap<Object,FacetBucket> buckets = new LinkedHashMap<>(); LinkedHashMap<Object,FacetBucket> buckets = new LinkedHashMap<>();