From 7c5e05e5abafe4417c39463b6645235c1fe32c1b Mon Sep 17 00:00:00 2001 From: Prashanth Dintyala Date: Fri, 22 Nov 2019 19:23:59 -0500 Subject: [PATCH] Update disk storage executor to use all the attributes from StoragePlan Former-commit-id: ae1af4f82459d77c33ab78d942e2bc33f18a31b9 --- src/query_executor/disk_based_storage_executor.py | 6 +++++- test/query_executor/test_disk_storage_executor.py | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/query_executor/disk_based_storage_executor.py b/src/query_executor/disk_based_storage_executor.py index 22269e5b2..999851bf6 100644 --- a/src/query_executor/disk_based_storage_executor.py +++ b/src/query_executor/disk_based_storage_executor.py @@ -18,7 +18,11 @@ class DiskStorageExecutor(AbstractStorageExecutor): def __init__(self, node: StoragePlan): super().__init__(node) - self.storage = SimpleVideoLoader(node.video) + self.storage = SimpleVideoLoader(node.video, + batch_size=node.batch_size, + skip_frames=node.skip_frames, + limit=node.limit, + offset=node.offset) def validate(self): pass diff --git a/test/query_executor/test_disk_storage_executor.py b/test/query_executor/test_disk_storage_executor.py index 23382c6ef..ca310e601 100644 --- a/test/query_executor/test_disk_storage_executor.py +++ b/test/query_executor/test_disk_storage_executor.py @@ -21,6 +21,11 @@ def test_calling_storage_executor_should_return_batches(self, mock_class): class_instance.load.return_value = range(5) actual = list(executor.next()) - mock_class.assert_called_once_with(video_info) + mock_class.assert_called_once_with(video_info, + batch_size=storage_plan.batch_size, + limit=storage_plan.limit, + offset=storage_plan.offset, + skip_frames=storage_plan.skip_frames, + ) class_instance.load.assert_called_once() self.assertEqual(list(range(5)), actual)