EMD related bug fixes (#35)

1. IG-15770: "limit" argument for "get_items" accepts only int and not str as documentation mentions
2. IG-15771: "limit" argument for "get_items" returns 1 item when limit=0
3. Removed Pipfile.lock as it differs between py2 and py3

Author: pavius

Pipfile.lock

@@ -326,7 +326,7 @@ class TestEmd(Test):
     def setUp(self):
         super(TestEmd, self).setUp()
 
-        self._path = '/v3io-py-test-emd'
+        self._path = 'some_dir/v3io-py-test-emd'
 
     def test_emd(self):
         items = {
@@ -359,6 +359,20 @@ def test_emd(self):
         self.assertEqual('i can smell fear on you', response.output.item['quip'])
         self.assertEqual(130, response.output.item['height'])
 
+        response = self._client.get_items(container=self._container,
+                                          path=self._path,
+                                          filter_expression="feature == 'singing'")
+        self.assertEqual(1, len(response.output.items))
+
+        # with limit = 0
+        received_items = self._client.new_items_cursor(container=self._container,
+                                                       path=self._path,
+                                                       attribute_names=['age', 'feature'],
+                                                       filter_expression='age > 15',
+                                                       limit=0).all()
+
+        self.assertEqual(0, len(received_items))
+
         received_items = self._client.new_items_cursor(container=self._container,
                                                        path=self._path,
                                                        attribute_names=['age', 'feature'],

tests/test_client.py

@@ -126,7 +126,7 @@ def get_container_contents(self,
             True - retrieves only directories (common prefixes)
         limit (Optional) : int
             Number of objects/directories to receive. default: 1000
-        marker (Optional) : int
+        marker (Optional) : str
             An opaque identifier that was returned in the NextMarker element of a response to a previous
             get_container_contents request that did not return all the requested items. This marker identifies the
             location in the path from which to start searching for the remaining requested items.
@@ -496,7 +496,7 @@ def get_items(self,
             applicable only together with the ShardingKey request parameter. The scan will return all items with the
             specified sharding-key value whose sorting-key values are greater than or equal to (>=) than the value of
             the SortKeyRangeStart parameter (if set) and less than (<) the value of the SortKeyRangeEnd parameter.
-        limit (Optional) : str
+        limit (Optional) : int
             The maximum number of items to return within the response (i.e., the maximum number of elements in the
             response object's Items array).
         segment (Optional) : str

v3io/dataplane/client.py

@@ -45,7 +45,7 @@ def next_item(self):
 
             return self._current_item
 
-        if self._current_response and self._current_response.output.last:
+        if self._current_response and (self._current_response.output.last or len(self._current_items) == 0):
             return None
 
         self.marker = self._current_response.output.next_marker if self._current_response else None

v3io/dataplane/items_cursor.py

@@ -62,7 +62,7 @@ def encode_get_container_contents(container_name, access_key, kwargs):
     if kwargs['directories_only']:
         query['prefix-only'] = 1
 
-    if kwargs['limit']:
+    if kwargs['limit'] is not None:
         query['max-keys'] = kwargs['limit']
 
     if kwargs['marker']:
@@ -199,7 +199,7 @@ def encode_get_items(container_name, access_key, kwargs):
     if kwargs['sharding_key']:
         body['ShardingKey'] = kwargs['sharding_key']
 
-    if kwargs['limit']:
+    if kwargs['limit'] is not None:
         body['Limit'] = kwargs['limit']
 
     if kwargs['segment']: