[ https://issues.apache.org/jira/browse/BEAM-5417?focusedWorklogId=148134&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-148134 ]
ASF GitHub Bot logged work on BEAM-5417: ---------------------------------------- Author: ASF GitHub Bot Created on: 26/Sep/18 13:30 Start Date: 26/Sep/18 13:30 Worklog Time Spent: 10m Work Description: joar commented on a change in pull request #6423: [BEAM-5417] Parity between GCS and local match URL: https://github.com/apache/beam/pull/6423#discussion_r220456040 ########## File path: sdks/python/apache_beam/io/filesystem.py ########## @@ -531,24 +530,117 @@ def _list(self, dir_or_prefix): """ raise NotImplementedError + @staticmethod + def _split_scheme(url_or_path): + match = re.match(r'(^[a-z]+)://(.*)', url_or_path) + if match is not None: + return match.groups() + return None, url_or_path + + @staticmethod + def _combine_scheme(scheme, path): + if scheme is None: + return path + return '{}://{}'.format(scheme, path) + def _url_dirname(self, url_or_path): """Like posixpath.dirname, but preserves scheme:// prefix. Args: url_or_path: A string in the form of scheme://some/path OR /some/path. """ - match = re.match(r'([a-z]+://)(.*)', url_or_path) - if match is None: - return posixpath.dirname(url_or_path) - url_prefix, path = match.groups() - return url_prefix + posixpath.dirname(path) + scheme, path = self._split_scheme(url_or_path) Review comment: Although it's an unnecessary indirection to split them up in the name of possible future re-use. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 148134) Time Spent: 4h 20m (was: 4h 10m) > FileSystems.match behaviour diff between GCS and local file system > ------------------------------------------------------------------ > > Key: BEAM-5417 > URL: https://issues.apache.org/jira/browse/BEAM-5417 > Project: Beam > Issue Type: Bug > Components: sdk-py-core > Affects Versions: 2.5.0, 2.6.0 > Reporter: Joar Wandborg > Assignee: Chamikara Jayalath > Priority: Major > Time Spent: 4h 20m > Remaining Estimate: 0h > > Given the directory structure: > > {noformat} > . > ├── filesystem-match-test > │ ├── a > │ │ └── file.txt > │ └── b > │ └── file.txt > └── filesystem-match-test.py > {noformat} > > Where {{filesystem-match-test.py}} contains: > {code:python} > from __future__ import print_function > import os > import posixpath > from apache_beam.io.filesystem import MatchResult > from apache_beam.io.filesystems import FileSystems > BASES = [ > os.path.join(os.path.dirname(__file__), "./"), > "gs://my-bucket/test/", > ] > pattern = "filesystem-match-test/*/file.txt" > for base_path in BASES: > full_pattern = posixpath.join(base_path, pattern) > print("full_pattern: {}".format(full_pattern)) > match_result = FileSystems.match([full_pattern])[0] # type: MatchResult > print("metadata list: {}".format(match_result.metadata_list)) > {code} > Running {{python filesystem-match-test.py}} does not match any files locally, > but does match files on GCS: > {noformat} > full_pattern: ./filesystem-match-test/*/file.txt > metadata list: [] > full_pattern: gs://my-bucket/test/filesystem-match-test/*/file.txt > metadata list: > [FileMetadata(gs://my-bucket/test/filesystem-match-test/a/file.txt, 6), > FileMetadata(gs://my-bucket/test/filesystem-match-test/b/file.txt, 6)] > {noformat} > The expected result is that a/file.txt and b/file.txt should be matched for > both patterns. -- This message was sent by Atlassian JIRA (v7.6.3#76005)