You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2016/08/23 19:49:17 UTC
[2/2] lucene-solr:branch_6x: SOLR-9432: Fix-up precommit
SOLR-9432: Fix-up precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f64262ed
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f64262ed
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f64262ed
Branch: refs/heads/branch_6x
Commit: f64262ed89ecc0194250a28bd9b2521ea2c8f459
Parents: 171f633
Author: jbernste <jb...@apache.org>
Authored: Tue Aug 23 15:25:18 2016 -0400
Committer: jbernste <jb...@apache.org>
Committed: Tue Aug 23 15:40:37 2016 -0400
----------------------------------------------------------------------
.../solr/search/facet/FacetFieldMerger.java | 22 ++++++++---------
.../apache/solr/search/facet/FacetModule.java | 8 +-----
.../solr/search/facet/FacetRangeMerger.java | 16 ++++++------
.../search/facet/FacetRequestSortedMerger.java | 26 ++++++++++----------
4 files changed, 32 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f64262ed/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
index 8a26f51..432e1a7 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
@@ -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
* contributor license agreements. See the NOTICE file distributed with
@@ -27,6 +15,16 @@ import org.apache.solr.common.util.SimpleOrderedMap;
* 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
public class FacetFieldMerger extends FacetRequestSortedMerger<FacetField> {
FacetBucket missingBucket;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f64262ed/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 b2831a3..8767e5b 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
@@ -17,16 +17,10 @@
package org.apache.solr.search.facet;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.common.SolrException;
@@ -586,7 +580,7 @@ class FacetBucket {
}
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();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f64262ed/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
index 587b919..5fae6c6 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
@@ -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
@@ -24,6 +16,14 @@ import org.apache.solr.common.util.SimpleOrderedMap;
* 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> {
FacetBucket beforeBucket;
FacetBucket afterBucket;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f64262ed/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
index 955882d..a981006 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
@@ -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
* contributor license agreements. See the NOTICE file distributed with
@@ -28,6 +15,19 @@ import org.apache.solr.common.util.SimpleOrderedMap;
* 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
abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted> extends FacetBucketMerger<FacetRequestT> {
LinkedHashMap<Object,FacetBucket> buckets = new LinkedHashMap<>();