Merge pull request #44 from richiej84/master

Batches not always getting executed
dtretyakov · Sep 21, 2016 · 80f5a3b · 80f5a3b
2 parents 68155b5 + 588afe0
commit 80f5a3b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/src/WindowsAzure/Table/RequestExecutor/TableRequestParallelExecutor.cs b/src/WindowsAzure/Table/RequestExecutor/TableRequestParallelExecutor.cs
@@ -57,9 +57,10 @@ public override IEnumerable<T> ExecuteBatches(IEnumerable<T> entities, Func<ITab
             }
 
             IEnumerable<ITableEntity> tableEntities = entities.Select(p => _entityConverter.GetEntity(p));
-            IEnumerable<TableBatchOperation> batches = _partitioner.GetBatches(tableEntities, operation);
-
-            return batches.AsParallel().SelectMany(GetEntities);
+            IEnumerable<TableBatchOperation> batches = _partitioner.GetBatches(tableEntities, operation);
+
+            // Force evaluation of the execution by calling ToArray()
+            return batches.AsParallel().SelectMany(GetEntities).ToArray();
         }
 
         /// <summary>

diff --git a/src/WindowsAzure/Table/RequestExecutor/TableRequestSequentialExecutor.cs b/src/WindowsAzure/Table/RequestExecutor/TableRequestSequentialExecutor.cs
@@ -57,11 +57,11 @@ public override IEnumerable<T> ExecuteBatches(IEnumerable<T> entities, Func<ITab
             }
 
             IEnumerable<ITableEntity> tableEntities = entities.Select(p => _entityConverter.GetEntity(p));
-            IEnumerable<TableBatchOperation> batches = _partitioner.GetBatches(tableEntities, operation);
-
-            return from batch in batches
-                   from result in _cloudTable.ExecuteBatch(batch)
-                   select _entityConverter.GetEntity((DynamicTableEntity) result.Result);
+            IEnumerable<TableBatchOperation> batches = _partitioner.GetBatches(tableEntities, operation);
+
+            // Force evaluation of the execution by calling ToArray()
+            var results = batches.SelectMany(t => _cloudTable.ExecuteBatch(t)).ToArray();
+            return results.Select(t => _entityConverter.GetEntity((DynamicTableEntity) t.Result));
         }
 
         /// <summary>

diff --git a/test/WindowsAzure.Tests/Table/RequestExecutor/ParallelExecutorTests.cs b/test/WindowsAzure.Tests/Table/RequestExecutor/ParallelExecutorTests.cs
@@ -102,6 +102,24 @@ public void ExecuteBatches()
             Assert.IsAssignableFrom<IEnumerable<Country>>(result);
             entityConverterMock.Verify(p => p.GetEntity(It.IsAny<Country>()), Times.Exactly(2));
             batchPartitionerMock.Verify(p => p.GetBatches(It.IsAny<IEnumerable<ITableEntity>>(), It.IsAny<Func<ITableEntity, TableOperation>>()), Times.Once());
+        }
+
+        [Fact]
+        public void ExecuteBatchesEvenWhenNotEvaluated()
+        {
+            // Arrange
+            Mock<ICloudTable> cloudTableMock = MocksFactory.GetCloudTableMock();
+            Mock<ITableEntityConverter<Country>> entityConverterMock = MocksFactory.GetTableEntityConverterMock<Country>();
+            Mock<ITableBatchPartitioner> batchPartitionerMock = MocksFactory.GetTableBatchPartitionerMock();
+            var executor = new TableRequestParallelExecutor<Country>(cloudTableMock.Object, entityConverterMock.Object, batchPartitionerMock.Object);
+            var entities = ObjectsFactory.GetCountries();
+
+            // Act
+            // We don't evaluate the call as we're not interested in the resulting entities. This should still execute the operations.
+            executor.ExecuteBatches(entities, TableOperation.Insert);
+
+            // Assert
+            cloudTableMock.Verify(t => t.ExecuteBatch(It.IsAny<TableBatchOperation>()));
         }
 
         [Fact]

diff --git a/test/WindowsAzure.Tests/Table/RequestExecutor/SequentialExecutorTests.cs b/test/WindowsAzure.Tests/Table/RequestExecutor/SequentialExecutorTests.cs
@@ -102,6 +102,24 @@ public void ExecuteBatches()
             Assert.IsAssignableFrom<IEnumerable<Country>>(result);
             entityConverterMock.Verify(p => p.GetEntity(It.IsAny<Country>()), Times.Exactly(2));
             batchPartitionerMock.Verify(p => p.GetBatches(It.IsAny<IEnumerable<ITableEntity>>(), It.IsAny<Func<ITableEntity, TableOperation>>()), Times.Once());
+        }
+
+        [Fact]
+        public void ExecuteBatchesEvenWhenNotEvaluated()
+        {
+            // Arrange
+            Mock<ICloudTable> cloudTableMock = MocksFactory.GetCloudTableMock();
+            Mock<ITableEntityConverter<Country>> entityConverterMock = MocksFactory.GetTableEntityConverterMock<Country>();
+            Mock<ITableBatchPartitioner> batchPartitionerMock = MocksFactory.GetTableBatchPartitionerMock();
+            var executor = new TableRequestSequentialExecutor<Country>(cloudTableMock.Object, entityConverterMock.Object, batchPartitionerMock.Object);
+            var entities = ObjectsFactory.GetCountries();
+
+            // Act
+            // We don't evaluate the call as we're not interested in the resulting entities. This should still execute the operations.
+            executor.ExecuteBatches(entities, TableOperation.Insert);
+
+            // Assert
+            cloudTableMock.Verify(t => t.ExecuteBatch(It.IsAny<TableBatchOperation>()));
         }
 
         [Fact]