Skip to content

Add continuation token to list status api #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2019
Merged

Add continuation token to list status api #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
186efc5
Add contination token to for ls
akharit Mar 6, 2019
0bde554
Updated history and version:
akharit Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
Release History
===============

0.0.44 (2019-03-05)
+++++++++++++++++++
* Add continuation token to LISTSTATUS api call
* Update api-version to 2018-09-01

0.0.43 (2019-03-01)
+++++++++++++++++++
* Fix bug in downloader when glob returns a single file
Expand Down
2 changes: 1 addition & 1 deletion azure/datalake/store/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# license information.
# --------------------------------------------------------------------------

__version__ = "0.0.43"
__version__ = "0.0.44"

from .core import AzureDLFileSystem
from .multithread import ADLDownloader
Expand Down
16 changes: 9 additions & 7 deletions azure/datalake/store/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class AzureDLFileSystem(object):
url_suffix: str (None)
Domain to send REST requests to. The end-point URL is constructed
using this and the store_name. If None, use default.
api_version: str (2018-05-01)
api_version: str (2018-09-01)
The API version to target with requests. Changing this value will
change the behavior of the requests, and can cause unexpected behavior or
breaking changes. Changes to this value should be undergone with caution.
Expand Down Expand Up @@ -118,14 +118,16 @@ def _ls_batched(self, path, batch_size=4000):
raise ValueError("Batch size must be strictly greater than 1")
parms = {'listSize': batch_size}
ret = []
data = [None]
continuation_token = "NonEmptyStringSentinel"

while data:
data = self.azure.call('LISTSTATUS', path, **parms)['FileStatuses']['FileStatus']
while continuation_token != "":
ls_call_result = self.azure.call('LISTSTATUS', path, **parms)

data = ls_call_result['FileStatuses']['FileStatus']
ret.extend(data)
if len(data) < batch_size:
break
parms['listAfter'] = ret[-1]['pathSuffix'] # Last path to be used as ListAfter

continuation_token = ls_call_result['FileStatuses']['continuationToken']
parms['listAfter'] = continuation_token # continuationToken to be used as ListAfter

return ret

Expand Down
4 changes: 2 additions & 2 deletions azure/datalake/store/lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ class DatalakeRESTInterface:
url_suffix: str (None)
Domain to send REST requests to. The end-point URL is constructed
using this and the store_name. If None, use default.
api_version: str (2018-05-01)
api_version: str (2018-09-01)
The API version to target with requests. Changing this value will
change the behavior of the requests, and can cause unexpected behavior or
breaking changes. Changes to this value should be undergone with caution.
Expand Down Expand Up @@ -256,7 +256,7 @@ class DatalakeRESTInterface:
}

def __init__(self, store_name=default_store, token=None,
url_suffix=default_adls_suffix, api_version='2018-05-01', **kwargs):
url_suffix=default_adls_suffix, api_version='2018-09-01', **kwargs):
# in the case where an empty string is passed for the url suffix, it must be replaced with the default.
url_suffix = url_suffix or default_adls_suffix
self.local = threading.local()
Expand Down