Limit bulk enrollment query to return 10 elements

Azure-Samples · Jan 17, 2020 · 42f47d0 · 42f47d0
1 parent b619e51
commit 42f47d0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/iot-hub/Samples/service/CleanUpDevicesSample/CleanUpDevicesSample.cs b/iot-hub/Samples/service/CleanUpDevicesSample/CleanUpDevicesSample.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Devices.Samples
 {
     public class CleanUpDevicesSample
     {
-        private const int QueryBatchSize = 1000;
+        private const int QueryBatchSize = 10000;
         private const int DeleteBatchSize = 100;
         private RegistryManager _rm;
         private List<string> _deleteDeviceWithPrefix =

diff --git a/iot-hub/Samples/service/RegistryManagerSample/RegistryManagerSample.cs b/iot-hub/Samples/service/RegistryManagerSample/RegistryManagerSample.cs
@@ -16,6 +16,9 @@ public class RegistryManagerSample
         private static string s_primaryThumbprint = Environment.GetEnvironmentVariable("IOTHUB_PFX_X509_THUMBPRINT");
         private static string s_secondaryThumbprint = Environment.GetEnvironmentVariable("IOTHUB_PFX_X509_THUMBPRINT2");
 
+        // Maximum number of elements per query.
+        private const int QueryPageSize = 100;
+
         private readonly RegistryManager _registryManager;
 
         public RegistryManagerSample(RegistryManager registryManager)
@@ -63,7 +66,7 @@ public async Task EnumerateTwinsAsync()
         {
             Console.WriteLine("Querying devices:");
 
-            var query = _registryManager.CreateQuery("select * from devices");
+            var query = _registryManager.CreateQuery("select * from devices", QueryPageSize);
 
             while (query.HasMoreResults)
             {

diff --git a/provisioning/Samples/service/BulkOperationSample/BulkOperationSample.cs b/provisioning/Samples/service/BulkOperationSample/BulkOperationSample.cs
@@ -18,9 +18,9 @@ public class BulkOperationSample
             "yKhZS3dkcvfBisBhP1XH9B33VqHG9SHnbnQXdBUaCgKAfxome8UmBKfe+naTsE5fkvjb/do3/dD6l4sGBwFCnKR" +
             "dln4XpM03zLpoHFao8zOwt8l/uP3qUIxmCYv9A7m69Ms+5/pCkTu/rK4mRDsfhZ0QLfbzVI6zQFOKF/rwsfBtFe" +
             "WlWtcuJMKlXdD8TXWElTzgh7JS4qhFzreL0c1mI0GCj+Aws0usZh7dLIVPnlgZcBhgy1SSDQMQ==";
-
+        
         // Maximum number of elements per query.
-        private const int QueryPageSize = 2;
+        private const int QueryPageSize = 100;
 
         private static IDictionary<string, string> _registrationIds = new Dictionary<string, string>
         {
@@ -85,6 +85,7 @@ public async Task QueryIndividualEnrollmentsAsync()
         {
             Console.WriteLine("\nCreating a query for enrollments...");
             QuerySpecification querySpecification = new QuerySpecification("SELECT * FROM enrollments");
+
             using (Query query = _provisioningServiceClient.CreateIndividualEnrollmentQuery(querySpecification, QueryPageSize))
             {
                 while (query.HasNext())

diff --git a/provisioning/Samples/service/CleanupEnrollmentsSample/CleanupEnrollmentsSample.cs b/provisioning/Samples/service/CleanupEnrollmentsSample/CleanupEnrollmentsSample.cs
@@ -12,8 +12,8 @@ namespace Microsoft.Azure.Devices.Provisioning.Service.Samples
     public class CleanupEnrollmentsSample
     {
         private ProvisioningServiceClient _provisioningServiceClient;
-        // Maximum number of elements per query.
-        private const int QueryPageSize = 100;
+        // Maximum number of elements per query - DPS has a limit of 10.
+        private const int QueryPageSize = 10;
         private static int _individualEnrollmentsDeleted;
         private static int _enrollmentGroupsDeleted;
         private List<string> individualEnrollmentsToBeRetained =
@@ -66,6 +66,8 @@ private async Task QueryAndDeleteIndividualEnrollments()
                     {
                         await DeleteBulkIndividualEnrollments(individualEnrollments).ConfigureAwait(false);
                     }
+
+                    await Task.Delay(1000).ConfigureAwait(false);
                 }
             }
         }