From 39656589c1195f9d9c115ddc92f99de19f2672f5 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 24 Aug 2016 13:05:17 -0700 Subject: [PATCH] default filename in cmd_args property in Python client (#374) --- genie-client/src/main/python/pygenie/jobs/hive.py | 2 +- genie-client/src/main/python/pygenie/jobs/pig.py | 2 +- genie-client/src/main/python/pygenie/jobs/presto.py | 2 +- genie-client/src/main/python/setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/genie-client/src/main/python/pygenie/jobs/hive.py b/genie-client/src/main/python/pygenie/jobs/hive.py index 4220c798b1e..7812e15c7d9 100644 --- a/genie-client/src/main/python/pygenie/jobs/hive.py +++ b/genie-client/src/main/python/pygenie/jobs/hive.py @@ -56,11 +56,11 @@ def cmd_args(self): if self._command_arguments is not None: return self._command_arguments + filename = HiveJob.DEFAULT_SCRIPT_NAME if is_file(self._script): filename = os.path.basename(self._script) self._add_dependency(self._script) elif self._script is not None: - filename = HiveJob.DEFAULT_SCRIPT_NAME self._add_dependency({'name': filename, 'data': self._script}) params_str = ' '.join([ diff --git a/genie-client/src/main/python/pygenie/jobs/pig.py b/genie-client/src/main/python/pygenie/jobs/pig.py index fa47dc6af7c..b0dc4b7448a 100644 --- a/genie-client/src/main/python/pygenie/jobs/pig.py +++ b/genie-client/src/main/python/pygenie/jobs/pig.py @@ -58,11 +58,11 @@ def cmd_args(self): if self._command_arguments is not None: return self._command_arguments + filename = PigJob.DEFAULT_SCRIPT_NAME if is_file(self._script): filename = os.path.basename(self._script) self._add_dependency(self._script) elif self._script is not None: - filename = PigJob.DEFAULT_SCRIPT_NAME self._add_dependency({'name': filename, 'data': self._script}) param_files_str = ' '.join([ diff --git a/genie-client/src/main/python/pygenie/jobs/presto.py b/genie-client/src/main/python/pygenie/jobs/presto.py index 8d9a9f86c4c..9e0a6d9aa8b 100644 --- a/genie-client/src/main/python/pygenie/jobs/presto.py +++ b/genie-client/src/main/python/pygenie/jobs/presto.py @@ -64,11 +64,11 @@ def cmd_args(self): if self._command_arguments is not None: return self._command_arguments + filename = PrestoJob.DEFAULT_SCRIPT_NAME if is_file(self._script): filename = os.path.basename(self._script) self._add_dependency(self._script) elif self._script is not None: - filename = PrestoJob.DEFAULT_SCRIPT_NAME if not self._script.strip().endswith(';'): self._script = '{};'.format(self._script) self._add_dependency({'name': filename, 'data': self._script}) diff --git a/genie-client/src/main/python/setup.py b/genie-client/src/main/python/setup.py index 869281d5f44..78d130223be 100644 --- a/genie-client/src/main/python/setup.py +++ b/genie-client/src/main/python/setup.py @@ -26,7 +26,7 @@ setup( name='nflx-genie-client', - version='3.0.33', + version='3.0.34', author='Netflix Inc.', author_email='genieoss@googlegroups.com', keywords='genie hadoop cloud netflix client bigdata presto',