You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/04/01 01:25:12 UTC
[1/4] lucene-solr:master: SOLR-10399: Generalize some internal facet
logic to simplify points/non-points field handling
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 1ae3cf4c5 -> c04a3acd8
refs/heads/master 413555651 -> 35aac1d46
SOLR-10399: Generalize some internal facet logic to simplify points/non-points field handling
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b60b86ec
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b60b86ec
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b60b86ec
Branch: refs/heads/master
Commit: b60b86ecab797396ab6bd8be82740191922b0aa2
Parents: 4135556
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Mar 31 17:01:42 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Mar 31 17:01:42 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/request/SimpleFacets.java | 14 +++-----------
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b60b86ec/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 097ee2b..1efefd0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -178,6 +178,8 @@ Other Changes
* SOLR-10338: Configure SecureRandom non blocking for tests. (Mihaly Toth, hossman, Ishan Chattopadhyaya, via Mark Miller)
+* SOLR-10399: Generalize some internal facet logic to simplify points/non-points field handling (Adrien Grand, hossman)
+
================== 6.5.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/b60b86ec/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index b452802..8972121 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -851,17 +851,9 @@ public class SimpleFacets {
SchemaField sf = searcher.getSchema().getField(field);
FieldType ft = sf.getType();
NamedList<Integer> res = new NamedList<>();
- if (ft.isPointField()) {
- for (String term : terms) {
- int count = searcher.numDocs(ft.getFieldQuery(null, sf, term), parsed.docs);
- res.add(term, count);
- }
- } else {
- for (String term : terms) {
- String internal = ft.toInternal(term);
- int count = searcher.numDocs(new TermQuery(new Term(field, internal)), parsed.docs);
- res.add(term, count);
- }
+ for (String term : terms) {
+ int count = searcher.numDocs(ft.getFieldQuery(null, sf, term), parsed.docs);
+ res.add(term, count);
}
return res;
}
[4/4] lucene-solr:branch_6x: SOLR-10399: cleanup unused imports
Posted by ho...@apache.org.
SOLR-10399: cleanup unused imports
(cherry picked from commit 35aac1d4623a34fe6b03d934eefd9066c61a95d5)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c04a3acd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c04a3acd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c04a3acd
Branch: refs/heads/branch_6x
Commit: c04a3acd8cfcd4d658ec2c7b71f95cef27e2a11c
Parents: eb9a4b9
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Mar 31 18:16:13 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Mar 31 18:16:25 2017 -0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/request/SimpleFacets.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c04a3acd/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index 8972121..0bfef4c 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -42,7 +42,6 @@ import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.MultiPostingsEnum;
import org.apache.lucene.index.PostingsEnum;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -52,7 +51,6 @@ import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FilterCollector;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.grouping.AllGroupHeadsCollector;
import org.apache.lucene.search.grouping.term.TermAllGroupsCollector;
import org.apache.lucene.search.grouping.term.TermGroupFacetCollector;
[3/4] lucene-solr:master: SOLR-10399: cleanup unused imports
Posted by ho...@apache.org.
SOLR-10399: cleanup unused imports
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/35aac1d4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/35aac1d4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/35aac1d4
Branch: refs/heads/master
Commit: 35aac1d4623a34fe6b03d934eefd9066c61a95d5
Parents: b60b86e
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Mar 31 18:16:13 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Mar 31 18:16:13 2017 -0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/request/SimpleFacets.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/35aac1d4/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index 8972121..0bfef4c 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -42,7 +42,6 @@ import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.MultiPostingsEnum;
import org.apache.lucene.index.PostingsEnum;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -52,7 +51,6 @@ import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FilterCollector;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.grouping.AllGroupHeadsCollector;
import org.apache.lucene.search.grouping.term.TermAllGroupsCollector;
import org.apache.lucene.search.grouping.term.TermGroupFacetCollector;
[2/4] lucene-solr:branch_6x: SOLR-10399: Generalize some internal
facet logic to simplify points/non-points field handling
Posted by ho...@apache.org.
SOLR-10399: Generalize some internal facet logic to simplify points/non-points field handling
(cherry picked from commit b60b86ecab797396ab6bd8be82740191922b0aa2)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eb9a4b96
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eb9a4b96
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eb9a4b96
Branch: refs/heads/branch_6x
Commit: eb9a4b962088ee38358303cc8e75d3b83c910ef3
Parents: 1ae3cf4
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Mar 31 17:01:42 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Mar 31 17:02:08 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/request/SimpleFacets.java | 14 +++-----------
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb9a4b96/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 82fb25d..5f11bcf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -103,6 +103,8 @@ Other Changes
* SOLR-10338: Configure SecureRandom non blocking for tests. (Mihaly Toth, hossman, Ishan Chattopadhyaya, via Mark Miller)
+* SOLR-10399: Generalize some internal facet logic to simplify points/non-points field handling (Adrien Grand, hossman)
+
================== 6.5.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/eb9a4b96/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index b452802..8972121 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -851,17 +851,9 @@ public class SimpleFacets {
SchemaField sf = searcher.getSchema().getField(field);
FieldType ft = sf.getType();
NamedList<Integer> res = new NamedList<>();
- if (ft.isPointField()) {
- for (String term : terms) {
- int count = searcher.numDocs(ft.getFieldQuery(null, sf, term), parsed.docs);
- res.add(term, count);
- }
- } else {
- for (String term : terms) {
- String internal = ft.toInternal(term);
- int count = searcher.numDocs(new TermQuery(new Term(field, internal)), parsed.docs);
- res.add(term, count);
- }
+ for (String term : terms) {
+ int count = searcher.numDocs(ft.getFieldQuery(null, sf, term), parsed.docs);
+ res.add(term, count);
}
return res;
}