refined nested query solition

Author: piergm

server/src/main/java/org/elasticsearch/action/search/CanMatchNodeRequest.java

@@ -132,7 +132,7 @@ public CanMatchNodeRequest(
         @Nullable String clusterAlias
     ) {
         this.source = searchRequest.source();
-        this.originalSource = searchRequest.originalSource();
+        this.originalSource = searchRequest.source();
         this.indicesOptions = indicesOptions;
         this.shards = new ArrayList<>(shards);
         this.searchType = searchRequest.searchType();
@@ -212,7 +212,6 @@ public ShardSearchRequest createShardSearchRequest(Shard r) {
             numberOfShards,
             searchType,
             source,
-            originalSource,
             requestCache,
             r.aliasFilter,
             r.indexBoost,

server/src/main/java/org/elasticsearch/action/search/SearchRequest.java

@@ -78,8 +78,6 @@ public class SearchRequest extends ActionRequest implements IndicesRequest.Repla
 
     private SearchSourceBuilder source;
 
-    private SearchSourceBuilder originalSource;
-
     private Boolean requestCache;
 
     private Boolean allowPartialSearchResults;
@@ -218,7 +216,6 @@ private SearchRequest(
         this.scroll = searchRequest.scroll;
         this.searchType = searchRequest.searchType;
         this.source = searchRequest.source;
-        this.originalSource = searchRequest.originalSource;
         this.localClusterAlias = localClusterAlias;
         this.absoluteStartMillis = absoluteStartMillis;
         this.finalReduce = finalReduce;
@@ -242,7 +239,6 @@ public SearchRequest(StreamInput in) throws IOException {
         preference = in.readOptionalString();
         scroll = in.readOptionalWriteable(Scroll::new);
         source = in.readOptionalWriteable(SearchSourceBuilder::new);
-        originalSource = in.readOptionalWriteable(SearchSourceBuilder::new);
         if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) {
             // types no longer relevant so ignore
             String[] types = in.readStringArray();
@@ -292,7 +288,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalString(preference);
         out.writeOptionalWriteable(scroll);
         out.writeOptionalWriteable(source);
-        out.writeOptionalWriteable(originalSource);
         if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) {
             // types not supported so send an empty array to previous versions
             out.writeStringArray(Strings.EMPTY_ARRAY);
@@ -611,13 +606,6 @@ public SearchRequest source(SearchSourceBuilder sourceBuilder) {
         this.source = Objects.requireNonNull(sourceBuilder, "source must not be null");
         return this;
     }
-    /**
-     * The source of the search request.
-     */
-    public SearchRequest originalSource(SearchSourceBuilder originalSourceBuilder) {
-        this.originalSource = Objects.requireNonNull(originalSourceBuilder, "originalSource must not be null");
-        return this;
-    }
 
     /**
      * The search source to execute.
@@ -626,13 +614,6 @@ public SearchSourceBuilder source() {
         return source;
     }
 
-    /**
-     * The original source.
-     */
-    public SearchSourceBuilder originalSource() {
-        return originalSource;
-    }
-
     public PointInTimeBuilder pointInTimeBuilder() {
         if (source != null) {
             return source.pointInTimeBuilder();
@@ -923,7 +904,6 @@ public boolean equals(Object o) {
             && Objects.equals(routing, that.routing)
             && Objects.equals(preference, that.preference)
             && Objects.equals(source, that.source)
-            && Objects.equals(originalSource, that.originalSource)
             && Objects.equals(requestCache, that.requestCache)
             && Objects.equals(scroll, that.scroll)
             && Objects.equals(batchedReduceSize, that.batchedReduceSize)
@@ -946,7 +926,6 @@ public int hashCode() {
             routing,
             preference,
             source,
-            originalSource,
             requestCache,
             scroll,
             indicesOptions,
@@ -997,8 +976,6 @@ public String toString() {
             + ccsMinimizeRoundtrips
             + ", source="
             + source
-            + ", originalSource="
-            + originalSource
             + '}';
     }
 }

server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java

@@ -30,7 +30,12 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.mapper.SourceLoader;
-import org.elasticsearch.index.query.*;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.MatchNoneQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryRewriteContext;
+import org.elasticsearch.index.query.Rewriteable;
+import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.AliasFilterParsingException;
@@ -143,7 +148,6 @@ public ShardSearchRequest(
             numberOfShards,
             searchRequest.searchType(),
             searchRequest.source(),
-            searchRequest.source(),
             searchRequest.requestCache(),
             aliasFilter,
             indexBoost,
@@ -186,7 +190,6 @@ public ShardSearchRequest(ShardId shardId, long nowInMillis, AliasFilter aliasFi
             SearchType.QUERY_THEN_FETCH,
             null,
             null,
-            null,
             aliasFilter,
             1.0f,
             true,
@@ -208,7 +211,6 @@ public ShardSearchRequest(
         int numberOfShards,
         SearchType searchType,
         SearchSourceBuilder source,
-        SearchSourceBuilder originalSource,
         Boolean requestCache,
         AliasFilter aliasFilter,
         float indexBoost,
@@ -227,7 +229,7 @@ public ShardSearchRequest(
         this.numberOfShards = numberOfShards;
         this.searchType = searchType;
         this.source(source);
-        this.originalSource(originalSource);
+        this.originalSource(source);
         this.requestCache = requestCache;
         this.aliasFilter = aliasFilter;
         this.indexBoost = indexBoost;
@@ -278,7 +280,7 @@ public ShardSearchRequest(StreamInput in) throws IOException {
         numberOfShards = in.readVInt();
         scroll = in.readOptionalWriteable(Scroll::new);
         source = in.readOptionalWriteable(SearchSourceBuilder::new);
-        originalSource = in.readOptionalWriteable(SearchSourceBuilder::new);
+        originalSource = source;
         if (in.getTransportVersion().onOrAfter(TransportVersion.V_8_8_0) && in.getTransportVersion().before(TransportVersion.V_8_500_013)) {
             // to deserialize between the 8.8 and 8.500.013 version we need to translate
             // the rank queries into sub searches if we are ranking; if there are no rank queries
@@ -373,7 +375,6 @@ protected final void innerWriteTo(StreamOutput out, boolean asKey) throws IOExce
         }
         out.writeOptionalWriteable(scroll);
         out.writeOptionalWriteable(source);
-        out.writeOptionalWriteable(originalSource);
         if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_8_0)
             && out.getTransportVersion().before(TransportVersion.V_8_500_013)) {
             // to serialize between the 8.8 and 8.500.013 version we need to translate
@@ -482,7 +483,6 @@ public void source(SearchSourceBuilder source) {
             source = source.shallowCopy();
             source.pointInTimeBuilder(new PointInTimeBuilder(""));
         }
-        // this.originalSource = source;
         this.source = source;
     }