SOLR-18256: Fix lucene QParser to support nested pure negative queries

changelog/unreleased/SOLR_18256_autofix_negative_lucene_clauses.yml

@@ -0,0 +1,8 @@
+type: fixed
+title: Fix pure negative (NOT) sub-expression queries in lucene QParser
+authors:
+  - name: Abhishek Umarjikar
+    nick: abumarjikar
+links:
+  - name: SOLR-18256
+    url: https://issues.apache.org/jira/browse/SOLR-18256

solr/core/src/java/org/apache/solr/search/SolrQueryParser.java

@@ -16,6 +16,9 @@
  */
 package org.apache.solr.search;
 
+import java.util.List;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.Query;
 import org.apache.solr.parser.QueryParser;
 
 /** Solr's default query parser, a schema-driven superset of the classic lucene query parser. */
@@ -24,4 +27,9 @@ public class SolrQueryParser extends QueryParser {
   public SolrQueryParser(QParser parser, String defaultField) {
     super(defaultField, parser);
   }
+
+  @Override
+  protected Query getBooleanQuery(List<BooleanClause> clauses) throws SyntaxError {
+    return QueryUtils.makeQueryable(super.getBooleanQuery(clauses));
+  }
 }

solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java

@@ -1901,4 +1901,42 @@ public void testFieldExistsQueries() throws SyntaxError {
       }
     }
   }
+
+  @Test
+  public void testNestedPureNegativeQuery() throws Exception {
+
+    // Standard sample data with completely unique field values to isolate matches
+    assertU(adoc("id", "9414", "v_t", "pureneg foo bar", "type_t", "negativetest"));
+    assertU(adoc("id", "9415", "v_t", "pureneg foo baz", "type_t", "negativetest"));
+    assertU(adoc("id", "9416", "v_t", "pureneg baz", "type_t", "negativetest"));
+    assertU(commit());
+
+    // Top-level negative query must exclude 'bar' but successfully find our other docs
+    // Force sort by ID so the array index expectations always line up perfectly
+    assertJQ(
+        req("q", "v_t:pureneg AND -v_t:bar", "df", "v_t", "sort", "id asc"),
+        "/response/docs/[0]/id=='9415'",
+        "/response/docs/[1]/id=='9416'");
+
+    // Nested pure negative query inside a parenthesized group with AND
+    assertJQ(
+        req("q", "v_t:pureneg AND v_t:foo AND (-v_t:bar)", "df", "v_t"),
+        "/response/numFound==1",
+        "/response/docs/[0]/id=='9415'");
+
+    // Nested pure negative query using explicit NOT syntax
+    assertJQ(
+        req("q", "v_t:pureneg AND v_t:foo AND (NOT v_t:bar)", "df", "v_t"),
+        "/response/numFound==1",
+        "/response/docs/[0]/id=='9415'");
+
+    assertJQ(
+        req("q", "v_t:pureneg NOT v_t:foo", "df", "v_t"),
+        "/response/numFound==1",
+        "/response/docs/[0]/id=='9416'");
+
+    assertJQ(
+        req("q", "NOT v_t:pureneg", "df", "v_t", "fq", "type_t:negativetest"),
+        "/response/numFound==0");
+  }
 }