dedup code by calling wrapWithParentPathConstraint

Author: dsmiley

solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java

@@ -16,19 +16,16 @@
  */
 package org.apache.solr.search.join;
 
-import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.FieldExistsQuery;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.join.ToChildBlockJoinQuery;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.search.SyntaxError;
 
+/** Matches child documents based on parent doc criteria. */
 public class BlockJoinChildQParser extends BlockJoinParentQParser {
 
   public BlockJoinChildQParser(
@@ -65,8 +62,8 @@ protected Query noClausesQuery() throws SyntaxError {
    * <pre>NEW: q={!child parentPath="/a/b/c"}p_title:dad
    *
    * OLD: q={!child of=$ff v=$vv}
-   *      ff=(*:* -{prefix f="_nest_path_" v="/a/b/c/"})
-   *      vv=(+p_title:dad +{field f="_nest_path_" v="/a/b/c"})</pre>
+   *      ff=(*:* -{!prefix f="_nest_path_" v="/a/b/c/"})
+   *      vv=(+p_title:dad +{!field f="_nest_path_" v="/a/b/c"})</pre>
    *
    * <p>For {@code parentPath="/"}:
    *
@@ -81,7 +78,7 @@ protected Query noClausesQuery() throws SyntaxError {
    */
   @Override
   protected Query parseUsingParentPath(String parentPath) throws SyntaxError {
-    // allParents filter: (*:* -{prefix f="_nest_path_" v="<parentPath>/"})
+    // allParents filter: (*:* -{!prefix f="_nest_path_" v="<parentPath>/"})
     // For root: (*:* -_nest_path_:*)
     final Query allParentsFilter = buildAllParentsFilterFromPath(parentPath);
 
@@ -98,18 +95,9 @@ protected Query parseUsingParentPath(String parentPath) throws SyntaxError {
     }
 
     // constrain the parent query to only match docs at exactly parentPath
-    // (+<original_parent> +{field f="_nest_path_" v="<parentPath>"})
+    // (+<original_parent> +{!field f="_nest_path_" v="<parentPath>"})
     // For root: (+<original_parent> -_nest_path_:*)
-    final BooleanQuery.Builder constrainedBuilder =
-        new BooleanQuery.Builder().add(parsedParentQuery, Occur.MUST);
-    if (parentPath.equals("/")) {
-      constrainedBuilder.add(
-          new FieldExistsQuery(IndexSchema.NEST_PATH_FIELD_NAME), Occur.MUST_NOT);
-    } else {
-      constrainedBuilder.add(
-          new TermQuery(new Term(IndexSchema.NEST_PATH_FIELD_NAME, parentPath)), Occur.FILTER);
-    }
-    final Query constrainedParentQuery = constrainedBuilder.build();
+    Query constrainedParentQuery = wrapWithParentPathConstraint(parentPath, parsedParentQuery);
 
     return createQuery(allParentsFilter, constrainedParentQuery, null);
   }

solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java

@@ -51,6 +51,7 @@
 import org.apache.solr.search.SyntaxError;
 import org.apache.solr.util.SolrDefaultScorerSupplier;
 
+/** Matches parent documents based on child doc criteria. */
 public class BlockJoinParentQParser extends FiltersQParser {
   /** implementation detail subject to change */
   public static final String CACHE_NAME = "perSegFilter";
@@ -114,8 +115,8 @@ public Query parse() throws SyntaxError {
    * <pre>NEW: q={!parent parentPath="/a/b/c"}c_title:son
    *
    * OLD: q=(+{!field f="_nest_path_" v="/a/b/c"} +{!parent which=$ff v=$vv})
-   *      ff=(*:* -{prefix f="_nest_path_" v="/a/b/c/"})
-   *      vv=(+c_title:son +{prefix f="_nest_path_" v="/a/b/c/"})</pre>
+   *      ff=(*:* -{!prefix f="_nest_path_" v="/a/b/c/"})
+   *      vv=(+c_title:son +{!prefix f="_nest_path_" v="/a/b/c/"})</pre>
    *
    * <p>For {@code parentPath="/"}:
    *
@@ -129,7 +130,7 @@ public Query parse() throws SyntaxError {
    *     root "/")
    */
   protected Query parseUsingParentPath(String parentPath) throws SyntaxError {
-    // allParents filter: (*:* -{prefix f="_nest_path_" v="<parentPath>/"})
+    // allParents filter: (*:* -{!prefix f="_nest_path_" v="<parentPath>/"})
     // For root: (*:* -_nest_path_:*)
     final Query allParentsFilter = buildAllParentsFilterFromPath(parentPath);
 
@@ -140,15 +141,15 @@ protected Query parseUsingParentPath(String parentPath) throws SyntaxError {
       return wrapWithParentPathConstraint(parentPath, allParentsFilter);
     }
 
-    // constrain child query: (+<original_child> +{prefix f="_nest_path_" v="<parentPath>/"})
+    // constrain child query: (+<original_child> +{!prefix f="_nest_path_" v="<parentPath>/"})
     // For root: (+<original_child> +_nest_path_:*)
     final Query constrainedChildQuery =
         buildChildQueryWithPathConstraint(parentPath, parsedChildQuery);
 
     final String scoreMode = localParams.get("score", ScoreMode.None.name());
     final Query parentJoinQuery = createQuery(allParentsFilter, constrainedChildQuery, scoreMode);
 
-    // wrap result: (+<parent_join> +{field f="_nest_path_" v="<parentPath>"})
+    // wrap result: (+<parent_join> +{!field f="_nest_path_" v="<parentPath>"})
     // For root: (+<parent_join> -_nest_path_:*)
     return wrapWithParentPathConstraint(parentPath, parentJoinQuery);
   }
@@ -165,7 +166,7 @@ protected Query parseUsingParentPath(String parentPath) throws SyntaxError {
    *       /a/b/c})
    * </ul>
    *
-   * <p>Equivalent to: {@code (*:* -{prefix f="_nest_path_" v="<parentPath>/"})} For root ({@code
+   * <p>Equivalent to: {@code (*:* -{!prefix f="_nest_path_" v="<parentPath>/"})} For root ({@code
    * /}): {@code (*:* -_nest_path_:*)}
    */
   protected static Query buildAllParentsFilterFromPath(String parentPath) {
@@ -186,7 +187,7 @@ protected static Query buildAllParentsFilterFromPath(String parentPath) {
    * level are matched. For root, this excludes docs that have a {@code _nest_path_} value. For
    * non-root, this requires an exact match on {@code _nest_path_}.
    */
-  private static Query wrapWithParentPathConstraint(String parentPath, Query query) {
+  protected static Query wrapWithParentPathConstraint(String parentPath, Query query) {
     final BooleanQuery.Builder builder = new BooleanQuery.Builder().add(query, Occur.MUST);
     if (parentPath.equals("/")) {
       builder.add(new FieldExistsQuery(IndexSchema.NEST_PATH_FIELD_NAME), Occur.MUST_NOT);