feat: fixed NEAR operator being order sensitive

romanchyla · Feb 2, 2022 · 7aa2d9d · 7aa2d9d
1 parent d5d9ec0
commit 7aa2d9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/contrib/adsabs/src/test/org/apache/solr/search/TestAqpAdsabsSolrSearch.java b/contrib/adsabs/src/test/org/apache/solr/search/TestAqpAdsabsSolrSearch.java
@@ -412,6 +412,13 @@ public void testSpecialCases() throws Exception {
               "//*[@numFound='1']",
               "//doc/str[@name='id'][.='61']");
 
+      // check NEAR ignores order
+      assertQ(req("q", "title:(rotation NEAR2 profile)"),
+              "//*[@numFound='1']",
+              "//doc/str[@name='id'][.='61']");
+      assertQ(req("q", "title:(profile NEAR2 rotation)"),
+              "//*[@numFound='1']",
+              "//doc/str[@name='id'][.='61']");
 
       assertQEx("INVALID_SYNTAX", req("q", "author:\"^\"de marco year:2015"), 400);
 

diff --git a/...eryparser/src/java/org/apache/lucene/queryparser/flexible/aqp/nodes/AqpNearQueryNode.java b/...eryparser/src/java/org/apache/lucene/queryparser/flexible/aqp/nodes/AqpNearQueryNode.java
@@ -23,7 +23,7 @@ public class AqpNearQueryNode extends QueryNodeImpl implements QueryNode {
 
   private static final long serialVersionUID = 8806759327487974314L;
   private Integer slop = null;
-  private boolean inOrder = true;
+  private boolean inOrder = false;
 
   public AqpNearQueryNode(List<QueryNode> children, int proximity) {
     if (children == null) {