From 58c14837bcac119c39402e0e2f5e965039d3cad4 Mon Sep 17 00:00:00 2001 From: Tim Chaffee Date: Mon, 27 Aug 2018 14:00:16 -0400 Subject: [PATCH] Fix log messages and update to latest client --- .../AmazonDynamoDB_Sample.csproj | 15 +++++++---- .../DocumentModelSample.cs | 26 +++++++++++-------- .../AmazonDynamoDB_Sample/Program.cs | 6 ++--- .../AmazonDynamoDB_Sample/packages.config | 4 +-- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample.csproj b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample.csproj index b6c5067..99c1f7c 100644 --- a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample.csproj +++ b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample.csproj @@ -66,11 +66,11 @@ --> - - ..\packages\AWSSDK.Core.3.0.0.2-preview\lib\net35\AWSSDK.Core.dll + + ..\packages\AWSSDK.Core.3.3.25\lib\net35\AWSSDK.Core.dll - - ..\packages\AWSSDK.DynamoDBv2.3.0.0.3-preview\lib\net35\AWSSDK.DynamoDBv2.dll + + ..\packages\AWSSDK.DynamoDBv2.3.3.13\lib\net35\AWSSDK.DynamoDBv2.dll @@ -117,7 +117,12 @@ - + + Designer + + + + diff --git a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/DocumentModelSample.cs b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/DocumentModelSample.cs index 36362ba..be38a72 100644 --- a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/DocumentModelSample.cs +++ b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/DocumentModelSample.cs @@ -41,7 +41,7 @@ public static void RunDocumentModelSample() chainStore2["State"] = "NY"; table.PutItem(chainStore2); - Console.WriteLine("Creating and saving first item"); + Console.WriteLine("Creating and saving second item"); Document chainStore13 = new Document(); chainStore13["Name"] = "Big Sales Inc"; chainStore13["Id"] = 13; @@ -53,7 +53,7 @@ public static void RunDocumentModelSample() chainStore13["State"] = "IL"; table.PutItem(chainStore13); - Console.WriteLine("Creating and saving second item"); + Console.WriteLine("Creating and saving third item"); Document tinyDiner = new Document(); tinyDiner["Name"] = "Tiny Map-themed Diner"; tinyDiner["Id"] = 0; @@ -64,7 +64,7 @@ public static void RunDocumentModelSample() table.PutItem(tinyDiner); - Console.WriteLine("Creating and saving third item"); + Console.WriteLine("Creating and saving fourth item"); Document internetStore = new Document(); internetStore["Name"] = "Best Online Store Ever"; internetStore["Id"] = 0; @@ -75,8 +75,16 @@ public static void RunDocumentModelSample() internetStore["Phone"] = "425-555-1234"; table.PutItem(internetStore); + Search scan; + ScanFilter scanFilter; + Console.WriteLine(); + Console.WriteLine("Scanning for items (no filter) to get count"); + scanFilter = new ScanFilter(); + scan = table.Scan(scanFilter); + Console.WriteLine("Number of items returned (should be 4): " + scan.Count); + Console.WriteLine(); - Console.WriteLine("Loading item"); + Console.WriteLine("Loading item"); Document doc1 = table.GetItem("Big Sales Inc", 2); Console.WriteLine("Attribute counts match (should be true): " + (chainStore2.GetAttributeNames().Count == doc1.GetAttributeNames().Count)); @@ -103,7 +111,6 @@ public static void RunDocumentModelSample() Console.WriteLine("Returned document == null (should be true): " + (doc3 == null)); - Search query; Console.WriteLine(); Console.WriteLine("Querying for items (Equals)"); @@ -126,8 +133,9 @@ public static void RunDocumentModelSample() while (!query.IsDone) { Console.WriteLine("Retrieving next set (page) of items"); - List querySet = query.GetNextSet(); - Console.WriteLine("Number of items returned in set (should be 1, unless last set, which will be 0): " + querySet.Count); + List querySet = query.GetNextSet(); + Console.WriteLine("More items (Should be true until last set): " + !query.IsDone); + Console.WriteLine("Number of items returned in set (should be 1 (will be 0 for final set - no more to get): " + querySet.Count); foreach (Document doc in querySet) { @@ -142,10 +150,6 @@ public static void RunDocumentModelSample() Console.WriteLine("Total items found (should be 2): " + totalItems); - - Search scan; - ScanFilter scanFilter; - Console.WriteLine(); Console.WriteLine("Scanning for items (GreaterThan)"); scanFilter = new ScanFilter(); diff --git a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/Program.cs b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/Program.cs index 3440a17..8ccd3d7 100644 --- a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/Program.cs +++ b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/Program.cs @@ -33,7 +33,7 @@ public static void Main(string[] args) { Console.WriteLine(); Console.WriteLine("Setting up DynamoDB client"); - client = new AmazonDynamoDBClient(RegionEndpoint.USWest2); + client = new AmazonDynamoDBClient(RegionEndpoint.USWest2); Console.WriteLine(); Console.WriteLine("Creating sample tables"); @@ -44,7 +44,7 @@ public static void Main(string[] args) RunDataModelSample(); Console.WriteLine(); - Console.WriteLine("Running DataModel sample"); + Console.WriteLine("Running DocumentModel sample"); RunDocumentModelSample(); Console.WriteLine(); @@ -52,7 +52,7 @@ public static void Main(string[] args) DeleteSampleTables(); Console.WriteLine(); - Console.WriteLine("Press Enter to continue..."); + Console.WriteLine("Press the Enter key to end the program..."); Console.Read(); } } diff --git a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/packages.config b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/packages.config index 0ad7109..b27a7e6 100644 --- a/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/packages.config +++ b/ConsoleSamples/AmazonDynamoDB_Sample/AmazonDynamoDB_Sample/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file