Table API query/get all rewrite

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
 members = [
   "sdk/*",
-  "services/mgmt/*",
+  #"services/mgmt/*",
 ]

sdk/rustfmt.toml

@@ -1 +1,2 @@
 newline_style = "Unix"
+edition = "2018"

sdk/storage/examples/cloud_table.rs

@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-use azure_storage::table::{Batch, CloudTable, Continuation, TableClient};
+use azure_storage::table::{Batch, CloudTable, TableClient};
 use std::error::Error;
 use std::mem;
 
@@ -51,20 +51,16 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .await?;
     println!("entity(value): {:?}", entity);
 
-    let mut cont = Continuation::start();
-    while let Some(entities) = cloud_table
-        .execute_query::<MyEntity>(None, &mut cont)
-        .await?
-    {
-        println!("segment: {:?}", entities.first());
+    let mut response = cloud_table.begin_get_all::<MyEntity>().await?;
+    while let Some(continuation_token) = response.continuation_token {
+        response = cloud_table.continue_execution(continuation_token).await?;
+        println!("segment: {:?}", response.entities.first());
     }
 
-    let mut cont = Continuation::start();
-    while let Some(entities) = cloud_table
-        .execute_query::<serde_json::Value>(None, &mut cont)
-        .await?
-    {
-        println!("segment(value): {:?}", entities.first());
+    let mut response = cloud_table.begin_get_all::<serde_json::Value>().await?;
+    while let Some(continuation_token) = response.continuation_token {
+        response = cloud_table.continue_execution(continuation_token).await?;
+        println!("segment: {:?}", response.entities.first());
     }
 
     let mut batch = Batch::new("big2".to_owned());

sdk/storage/examples/copy_table.rs

@@ -40,11 +40,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let mut count: u32 = 0;
 
-    let mut stream = Box::pin(from_table.stream_query::<MyEntity>(None));
+    let mut stream = Box::pin(from_table.stream_get_all::<MyEntity>());
 
-    while let Some(Ok(entities)) = stream.next().await {
-        println!("segemnt len: {}", entities.len());
-        for entity in entities {
+    while let Some(query_result) = stream.next().await {
+        let query_result = query_result?;
+        println!("segemnt len: {}", query_result.entities.len());
+        for entity in query_result.entities {
             count += 1;
             println!("before {:?}", entity);
             let entity = to_table.insert_entity(entity).await?;

sdk/storage/examples/tables.rs

@@ -1,6 +1,12 @@
-use azure_storage::table::TableClient;
+use azure_storage::table::*;
+use serde::Deserialize;
 use std::error::Error;
 
+#[derive(Debug, Clone, Deserialize)]
+struct MyEntity {
+    my_value: String,
+}
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     // First we retrieve the account name and master key from environment variables.
@@ -16,5 +22,24 @@ async fn main() -> Result<(), Box<dyn Error>> {
     for ref table in tables {
         println!("{}", table);
     }
+
+    let table_client = CloudTable::new(client, "example");
+
+    let response = table_client.begin_get_all::<MyEntity>().await?;
+    println!("{:?}", response.entities);
+    println!("{:?}", response.continuation_token);
+
+    let mut response = table_client.begin_query::<MyEntity>("$top=2").await?;
+    println!("{:?}", response.entities);
+    println!("{:?}", response.continuation_token);
+
+    while let Some(continuation_token) = response.continuation_token {
+        println!("we have more data!");
+
+        response = table_client.continue_execution(continuation_token).await?;
+        println!("{:?}", response.entities);
+        println!("{:?}", response.continuation_token);
+    }
+
     Ok(())
 }

sdk/storage/src/table/batch.rs

@@ -1,6 +1,5 @@
 use crate::{entity_path, TableEntity};
 use serde::Serialize;
-use serde_json;
 
 const BATCH_MAX_SIZE: usize = 100;
 
@@ -40,9 +39,9 @@ pub enum BatchOperation {
 }
 
 impl BatchOperation {
-    fn into_payload(&self, uri_prefix: &str, table: &str, partition_key: &str, body: &mut String) {
+    fn into_payload(self, uri_prefix: &str, table: &str, partition_key: &str, body: &mut String) {
         // todo: consider using the cloud_table request builder to generate payloads
-        match *self {
+        match self {
             BatchOperation::Insert { ref payload, .. } => {
                 body.push_str("POST ");
                 body.push_str(uri_prefix);
@@ -51,7 +50,7 @@ impl BatchOperation {
                 body.push_str("Accept: application/json;odata=nometadata\n");
                 body.push_str("Content-Type: application/json\n\n");
                 body.push_str(&payload);
-                body.push_str("\n");
+                body.push('\n');
             }
 
             BatchOperation::Update {
@@ -73,7 +72,7 @@ impl BatchOperation {
                     body.push_str("If-Match: *\n\n");
                 }
                 body.push_str(&payload);
-                body.push_str("\n");
+                body.push('\n');
             }
 
             BatchOperation::Delete {
@@ -93,7 +92,7 @@ impl BatchOperation {
                 } else {
                     body.push_str("If-Match: *\n");
                 }
-                body.push_str("\n");
+                body.push('\n');
             }
         }
     }
@@ -118,7 +117,7 @@ impl Batch {
     /// Create a new changeset for the given partition key
     pub fn new(partition_key: String) -> Batch {
         Batch {
-            partition_key: partition_key,
+            partition_key,
             items: vec![],
         }
     }
@@ -186,9 +185,9 @@ impl Batch {
         T: Serialize,
     {
         self.add_operation(BatchOperation::Update {
-            row_key: row_key.to_owned(),
+            row_key,
             payload: serde_json::to_string(data)?,
-            etag: etag,
+            etag,
         })
     }
 
@@ -210,10 +209,7 @@ impl Batch {
         row_key: String,
         etag: Option<String>,
     ) -> Result<&mut Self, BatchError> {
-        self.add_operation(BatchOperation::Delete {
-            row_key: row_key.to_owned(),
-            etag: etag,
-        })
+        self.add_operation(BatchOperation::Delete { row_key, etag })
     }
 
     /// Add a delete operation using a TableEntitiy
@@ -238,7 +234,7 @@ impl Batch {
             payload.push_str("Content-Type: application/http\n");
             payload.push_str("Content-Transfer-Encoding: binary\n\n");
             item.into_payload(uri_prefix, table, &self.partition_key, &mut payload);
-            payload.push_str("\n");
+            payload.push('\n');
         }
 
         payload.push_str("--changeset_8a28b620-b4bb-458c-a177-0959fb14c977--\n");