Rename QueryNodeNew to QueryNode (#1660)

<!-- The PR description should answer 2 important questions: -->

### What

This naming was to help disambiguate old and new code when refactoring
the `execute` crate, now it's just confusing. Functional no-op.

V3_GIT_ORIGIN_REV_ID: 4b1fc86f4869dd20dfbafdb3ceb5b6e61938367f

Author: danieljharvey

v3/crates/execute/src/execute/ndc_request/v01.rs

@@ -8,7 +8,7 @@ use crate::error::{FieldError, FieldInternalError};
 use plan_types::{
     AggregateFieldSelection, AggregateSelectionSet, Argument, Field, MutationArgument,
     MutationExecutionPlan, NestedArray, NestedField, NestedObject, OrderByDirection,
-    OrderByElement, OrderByTarget, QueryExecutionPlan, QueryNodeNew, Relationship,
+    OrderByElement, OrderByTarget, QueryExecutionPlan, QueryNode, Relationship,
     RelationshipArgument, ResolvedFilterExpression, VariableName,
 };
 
@@ -84,7 +84,7 @@ fn make_variables(
     })
 }
 
-fn make_query(query_node: QueryNodeNew) -> Result<ndc_models_v01::Query, FieldError> {
+fn make_query(query_node: QueryNode) -> Result<ndc_models_v01::Query, FieldError> {
     // Group by is not supported in 0.1.x
     if query_node.group_by.is_some() {
         return Err(FieldError::InternalError(

v3/crates/execute/src/execute/ndc_request/v02.rs

@@ -10,7 +10,7 @@ use crate::error::{FieldError, FieldInternalError};
 use plan_types::{
     AggregateFieldSelection, AggregateSelectionSet, Argument, Field, MutationArgument,
     MutationExecutionPlan, NestedArray, NestedField, NestedObject, OrderByDirection,
-    OrderByElement, OrderByTarget, QueryExecutionPlan, QueryNodeNew, Relationship,
+    OrderByElement, OrderByTarget, QueryExecutionPlan, QueryNode, Relationship,
     RelationshipArgument, ResolvedFilterExpression, VariableName,
 };
 
@@ -71,7 +71,7 @@ fn make_variables(
     })
 }
 
-fn make_query(query_node: QueryNodeNew) -> Result<ndc_models_v02::Query, FieldError> {
+fn make_query(query_node: QueryNode) -> Result<ndc_models_v02::Query, FieldError> {
     let ndc_predicate = query_node.predicate.map(make_expression).transpose()?;
 
     let ndc_fields = query_node

v3/crates/execute/src/execute/remote_predicates.rs

@@ -2,7 +2,7 @@ use crate::error::{FieldError, FieldInternalError, FilterPredicateError};
 use indexmap::{IndexMap, IndexSet};
 use plan_types::{
     Argument, Field, FieldsSelection, NestedArray, NestedField, NestedObject, OrderByElement,
-    OrderByTarget, QueryExecutionPlan, QueryNodeNew, RemotePredicateKey, ResolvedFilterExpression,
+    OrderByTarget, QueryExecutionPlan, QueryNode, RemotePredicateKey, ResolvedFilterExpression,
 };
 use std::collections::BTreeMap;
 
@@ -46,10 +46,10 @@ fn replace_predicates_in_argument(
 }
 
 fn replace_predicates_in_query_node(
-    query_node: QueryNodeNew,
+    query_node: QueryNode,
     predicates: &BTreeMap<RemotePredicateKey, ResolvedFilterExpression>,
-) -> Result<QueryNodeNew, FilterPredicateError> {
-    Ok(QueryNodeNew {
+) -> Result<QueryNode, FilterPredicateError> {
+    Ok(QueryNode {
         aggregates: query_node.aggregates,
         fields: query_node
             .fields

v3/crates/graphql/ir/src/plan/commands.rs

@@ -14,7 +14,7 @@ use open_dds::commands::ProcedureName;
 use plan_types::{
     Argument, Field, FieldsSelection, JoinLocations, MutationExecutionPlan, MutationExecutionTree,
     NdcFieldAlias, NdcRelationshipName, PredicateQueryTrees, QueryExecutionPlan,
-    QueryExecutionTree, QueryNodeNew, Relationship, UniqueNumber, FUNCTION_IR_VALUE_COLUMN_NAME,
+    QueryExecutionTree, QueryNode, Relationship, UniqueNumber, FUNCTION_IR_VALUE_COLUMN_NAME,
 };
 
 pub(crate) fn plan_query_node(
@@ -24,7 +24,7 @@ pub(crate) fn plan_query_node(
     session: &Session,
     request_headers: &reqwest::header::HeaderMap,
     unique_number: &mut UniqueNumber,
-) -> Result<Plan<QueryNodeNew>, error::Error> {
+) -> Result<Plan<QueryNode>, error::Error> {
     let mut ndc_nested_field = None;
     let mut join_locations = JoinLocations::new();
     let mut remote_predicates = PredicateQueryTrees::new();
@@ -54,7 +54,7 @@ pub(crate) fn plan_query_node(
                 join_locations = nested_join_locations;
                 remote_predicates = nested_remote_predicates;
             }
-            let query = QueryNodeNew {
+            let query = QueryNode {
                 aggregates: None,
                 fields: Some(FieldsSelection {
                     fields: IndexMap::from([(

v3/crates/graphql/ir/src/plan/model_selection.rs

@@ -13,7 +13,7 @@ use metadata_resolve::Metadata;
 use plan_types::Argument;
 use plan_types::{
     FieldsSelection, JoinLocations, NdcRelationshipName, PredicateQueryTrees, QueryExecutionPlan,
-    QueryExecutionTree, QueryNodeNew, Relationship, UniqueNumber,
+    QueryExecutionTree, QueryNode, Relationship, UniqueNumber,
 };
 use std::collections::BTreeMap;
 
@@ -26,7 +26,7 @@ pub(crate) fn plan_query_node(
     session: &Session,
     request_headers: &reqwest::header::HeaderMap,
     unique_number: &mut UniqueNumber,
-) -> Result<Plan<QueryNodeNew>, error::Error> {
+) -> Result<Plan<QueryNode>, error::Error> {
     let mut query_fields = None;
     let mut join_locations = JoinLocations::new();
     let mut remote_predicates = PredicateQueryTrees::new();
@@ -67,7 +67,7 @@ pub(crate) fn plan_query_node(
 
     remote_predicates.0.extend(order_by_remote_predicates.0);
 
-    let query_node = QueryNodeNew {
+    let query_node = QueryNode {
         limit: ir.limit,
         offset: ir.offset,
         order_by,

v3/crates/plan-types/src/execution_plan.rs

@@ -16,7 +16,7 @@ pub use filter::ResolvedFilterExpression;
 pub use mutation::MutationExecutionPlan;
 pub use query::{
     AggregateFieldsSelection, FieldsSelection, PredicateQueryTree, PredicateQueryTrees,
-    QueryExecutionPlan, QueryNodeNew, RemotePredicateKey, UniqueNumber,
+    QueryExecutionPlan, QueryNode, RemotePredicateKey, UniqueNumber,
 };
 pub use relationships::{Relationship, RelationshipArgument};
 pub use remote_joins::{

v3/crates/plan-types/src/execution_plan/field.rs

@@ -19,7 +19,7 @@ pub enum Field {
     },
     Relationship {
         /// The relationship query
-        query_node: Box<query::QueryNodeNew>,
+        query_node: Box<query::QueryNode>,
         /// The name of the relationship to follow for the subquery
         relationship: NdcRelationshipName,
         /// Values to be provided to any collection arguments

v3/crates/plan-types/src/execution_plan/query.rs

@@ -17,7 +17,7 @@ use std::sync::Arc;
 // this represents an execution plan. all predicates only refer to local comparisons.
 // remote predicates are represented as additional execution nodes
 pub struct QueryExecutionPlan {
-    pub query_node: QueryNodeNew,
+    pub query_node: QueryNode,
     /// The name of a collection
     pub collection: CollectionName,
     /// Values to be provided to any collection arguments
@@ -92,7 +92,7 @@ impl Default for UniqueNumber {
 
 /// Query plan for fetching data
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct QueryNodeNew {
+pub struct QueryNode {
     /// Optionally limit to N results
     pub limit: Option<u32>,
     /// Optionally offset from the Nth result

v3/crates/plan-types/src/lib.rs

@@ -14,7 +14,7 @@ pub use execution_plan::{
     Grouping, JoinLocations, JoinNode, Location, LocationKind, MutationArgument,
     MutationExecutionPlan, MutationExecutionTree, NDCMutationExecution, NDCQueryExecution,
     NDCSubscriptionExecution, NestedArray, NestedField, NestedObject, PredicateQueryTree,
-    PredicateQueryTrees, ProcessResponseAs, QueryExecutionPlan, QueryExecutionTree, QueryNodeNew,
+    PredicateQueryTrees, ProcessResponseAs, QueryExecutionPlan, QueryExecutionTree, QueryNode,
     Relationship, RelationshipArgument, RemoteJoin, RemoteJoinArgument, RemoteJoinType,
     RemotePredicateKey, ResolvedFilterExpression, SourceFieldAlias, TargetField, UniqueNumber,
 };

v3/crates/plan/src/query/command.rs

@@ -17,7 +17,7 @@ use open_dds::{
 use plan_types::{
     Argument, Field, JoinLocations, MutationArgument, MutationExecutionPlan, MutationExecutionTree,
     NdcFieldAlias, NdcRelationshipName, NestedArray, NestedField, NestedObject,
-    PredicateQueryTrees, QueryExecutionPlan, QueryExecutionTree, QueryNodeNew, Relationship,
+    PredicateQueryTrees, QueryExecutionPlan, QueryExecutionTree, QueryNode, Relationship,
 };
 use plan_types::{UniqueNumber, FUNCTION_IR_VALUE_COLUMN_NAME};
 use std::collections::BTreeMap;
@@ -218,7 +218,7 @@ pub(crate) fn from_command_selection(
                 remote_predicates,
                 remote_join_executions,
                 query_execution_plan: QueryExecutionPlan {
-                    query_node: QueryNodeNew {
+                    query_node: QueryNode {
                         fields: Some(plan_types::FieldsSelection {
                             fields: wrap_scalar_select(wrap_selection_in_response_config(
                                 command_source,

v3/crates/plan/src/query/filter.rs

@@ -13,7 +13,7 @@ use open_dds::{
 use plan_types::{
     Expression, Field, FieldsSelection, JoinLocations, LocalModelRelationshipInfo, NdcFieldAlias,
     NdcRelationshipName, PredicateQueryTree, PredicateQueryTrees, QueryExecutionPlan,
-    QueryExecutionTree, QueryNodeNew, Relationship, RelationshipColumnMapping,
+    QueryExecutionTree, QueryNode, Relationship, RelationshipColumnMapping,
     ResolvedFilterExpression, SourceNdcColumn, UniqueNumber,
 };
 use std::collections::BTreeMap;
@@ -162,7 +162,7 @@ pub fn plan_remote_predicate<'a>(
     unique_number: &mut UniqueNumber,
 ) -> Result<
     (
-        QueryNodeNew,
+        QueryNode,
         PredicateQueryTrees,
         BTreeMap<NdcRelationshipName, Relationship>,
     ),
@@ -177,7 +177,7 @@ pub fn plan_remote_predicate<'a>(
         unique_number,
     )?;
 
-    let query_node = QueryNodeNew {
+    let query_node = QueryNode {
         limit: None,
         offset: None,
         order_by: None,

v3/crates/plan/src/query/model.rs

@@ -21,7 +21,7 @@ use open_dds::query::{
 };
 use plan_types::{
     AggregateFieldSelection, AggregateSelectionSet, FieldsSelection, Grouping, JoinLocations,
-    NdcFieldAlias, PredicateQueryTrees, QueryExecutionPlan, QueryExecutionTree, QueryNodeNew,
+    NdcFieldAlias, PredicateQueryTrees, QueryExecutionPlan, QueryExecutionTree, QueryNode,
     UniqueNumber,
 };
 
@@ -246,7 +246,7 @@ pub fn from_model_group_by(
         .map_err(|_| PlanError::Internal("offset out of range".into()))?;
 
     let query_execution_plan = QueryExecutionPlan {
-        query_node: QueryNodeNew {
+        query_node: QueryNode {
             fields: None,
             aggregates: None,
             limit: query.limit,
@@ -362,7 +362,7 @@ pub fn from_model_aggregate_selection(
     };
 
     let query_execution_plan = QueryExecutionPlan {
-        query_node: QueryNodeNew {
+        query_node: QueryNode {
             fields: None,
             aggregates: query_aggregate_fields,
             limit: query.limit,
@@ -681,7 +681,7 @@ pub fn from_model_selection(
     };
 
     let query_execution_plan = QueryExecutionPlan {
-        query_node: QueryNodeNew {
+        query_node: QueryNode {
             fields: query_fields,
             aggregates: None,
             limit: query.limit,

v3/crates/plan/tests/passing/models/simple/execution_plan.snap

@@ -14,7 +14,7 @@ Queries(
                 {},
             ),
             query_execution_plan: QueryExecutionPlan {
-                query_node: QueryNodeNew {
+                query_node: QueryNode {
                     limit: Some(
                         5,
                     ),