pr feedback and test fix

Author: analogrelay

sdk/cosmos/azure_data_cosmos/src/query/executor.rs

@@ -148,8 +148,8 @@ impl<T: DeserializeOwned + Send + 'static> QueryExecutor<T> {
                     request.partition_key_range_id.clone(),
                 );
 
-                let mut draining = true;
-                while draining {
+                let mut fetch_more_pages = true;
+                while fetch_more_pages {
                     if let Some(c) = request.continuation.clone() {
                         query_request.insert_header(constants::CONTINUATION, c);
                     } else {
@@ -169,7 +169,7 @@ impl<T: DeserializeOwned + Send + 'static> QueryExecutor<T> {
                     let next_continuation =
                         resp.headers().get_optional_string(&constants::CONTINUATION);
 
-                    draining = request.drain && next_continuation.is_some();
+                    fetch_more_pages = request.drain && next_continuation.is_some();
 
                     let body = resp.into_body();
                     let result = QueryResult {

sdk/cosmos/azure_data_cosmos/src/query/mod.rs

@@ -111,7 +111,7 @@ impl Query {
     /// Replaces all parameters in this [`Query`] instance with the parameters from another [`Query`] instance, and returns it.
     ///
     /// Since the parameters in the other query are already serialized, this method cannot fail.
-    #[cfg(feature = "preview_query_engine")]
+    #[cfg(feature = "preview_query_engine")] // Crate-private for now, and thus only in the preview_query_engine feature (which is the only place it's used).
     pub(crate) fn with_parameters_from(mut self, other: &Query) -> Self {
         self.parameters = other.parameters.clone();
         self
@@ -259,6 +259,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "preview_query_engine")]
     pub fn with_parameters_from_replaces_all_parameters() -> Result<(), Box<dyn Error>> {
         let source_query = Query::from("SELECT * FROM c")
             .with_parameter("@id", 42)?

sdk/cosmos/azure_data_cosmos/tests/framework/query_engine.rs

@@ -5,7 +5,7 @@ use std::{collections::VecDeque, sync::Mutex};
 
 use serde::{Deserialize, Serialize};
 
-use azure_data_cosmos::query::{PipelineResult, QueryEngine, QueryPipeline};
+use azure_data_cosmos::query::{PipelineResult, QueryEngine, QueryPipeline, QueryResult};
 use serde_json::value::RawValue;
 
 #[derive(Deserialize)]
@@ -267,10 +267,7 @@ impl QueryPipeline for MockQueryPipeline {
         })
     }
 
-    fn provide_data(
-        &mut self,
-        data: std::vec::Vec<azure_data_cosmos::query::QueryResult<'_>>,
-    ) -> azure_core::Result<()> {
+    fn provide_data(&mut self, data: Vec<QueryResult<'_>>) -> azure_core::Result<()> {
         for data in data {
             let payload: DocumentPayload<MockItem> =
                 serde_json::from_slice(data.result).map_err(|_| {