You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2018/12/21 18:28:21 UTC
lucene-solr:branch_7x: SOLR-13080: TermsQParserPlugin automaton
method should (must?) sort input
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x ba514dd7c -> bcf1a4eaf
SOLR-13080: TermsQParserPlugin automaton method should (must?) sort input
(cherry picked from commit 1d0a08621708dde4220f9b45886a2c147d7fefd1)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bcf1a4ea
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bcf1a4ea
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bcf1a4ea
Branch: refs/heads/branch_7x
Commit: bcf1a4eaf8d3b945f11833c9dfed4a17a6d6ac58
Parents: ba514dd
Author: David Smiley <ds...@apache.org>
Authored: Fri Dec 21 13:26:03 2018 -0500
Committer: David Smiley <ds...@apache.org>
Committed: Fri Dec 21 13:28:16 2018 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../core/src/java/org/apache/solr/search/TermsQParserPlugin.java | 4 +++-
solr/core/src/test/org/apache/solr/search/TestQueryTypes.java | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bcf1a4ea/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 736fbe3..0346e8b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -64,6 +64,9 @@ Bug Fixes
* SOLR-13072: Management of markers for nodeLost / nodeAdded events is broken. This bug could have caused
some events to be lost if they coincided with an Overseer leader crash. (ab)
+* SOLR-13080: The "terms" QParser's "automaton" method semi-required that the input terms/IDs be sorted. This
+ query parser now does this. Unclear if this is a perf issue or actual bug. (Daniel Lowe, David Smiley)
+
Improvements
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bcf1a4ea/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
index 45bb13f..805cca3 100644
--- a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
@@ -30,6 +30,7 @@ import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermInSetQuery;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.automaton.Automata;
@@ -79,7 +80,8 @@ public class TermsQParserPlugin extends QParserPlugin {
automaton {
@Override
Query makeFilter(String fname, BytesRef[] byteRefs) {
- Automaton union = Automata.makeStringUnion(Arrays.asList(byteRefs));
+ ArrayUtil.timSort(byteRefs); // same sort algo as TermInSetQuery's choice
+ Automaton union = Automata.makeStringUnion(Arrays.asList(byteRefs)); // input must be sorted
return new AutomatonQuery(new Term(fname), union);//constant scores
}
},
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bcf1a4ea/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
index 477468a..eb96efa 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
@@ -109,7 +109,7 @@ public class TestQueryTypes extends SolrTestCaseJ4 {
);
String termsMethod = new String[]{"termsFilter", "booleanQuery", "automaton", "docValuesTermsFilter"}[random().nextInt(4)];
- assertQ(req( "q", "{!terms f=v_s method=" + termsMethod + " }other stuff,wow dude")
+ assertQ(req( "q", "{!terms f=v_s method=" + termsMethod + " }wow dude,other stuff")//terms reverse sorted to show this works
,"//result[@numFound='2']"
);