From fc0e8cc9d23c7f560afbca63eb9992bbbf2f1919 Mon Sep 17 00:00:00 2001 From: gildea Date: Mon, 21 Mar 2016 10:29:16 -0700 Subject: [PATCH] Update some str methods for recent SDK representation changes Update Operation.str() to reflect that receivers is now an array instead of a defaultdict. Update Worker* objects to not output serialized combine_fn. These problems surface only when logging at DEBUG level. ----Release Notes---- [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=117727480 --- google/cloud/dataflow/worker/executor.py | 2 +- google/cloud/dataflow/worker/maptask.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/google/cloud/dataflow/worker/executor.py b/google/cloud/dataflow/worker/executor.py index c322143..a71ae3a 100644 --- a/google/cloud/dataflow/worker/executor.py +++ b/google/cloud/dataflow/worker/executor.py @@ -128,7 +128,7 @@ def str_internal(self, is_recursive=False): if not is_recursive and getattr(self, 'receivers', []): printable_fields.append('receivers=[%s]' % ', '.join([ rop.str_internal(is_recursive=True) - for oplist in self.receivers.values() + for oplist in self.receivers for rop in oplist])) return '<%s %s>' % (printable_name, ', '.join(printable_fields)) diff --git a/google/cloud/dataflow/worker/maptask.py b/google/cloud/dataflow/worker/maptask.py index aa0120c..af9a555 100644 --- a/google/cloud/dataflow/worker/maptask.py +++ b/google/cloud/dataflow/worker/maptask.py @@ -60,7 +60,8 @@ def worker_printable_fields(workerproto): # want to output value 0 but not None nor [] if (value or value == 0) and name not in - ('coder', 'coders', 'elements', 'serialized_fn', 'window_fn', + ('coder', 'coders', 'elements', + 'combine_fn', 'serialized_fn', 'window_fn', 'append_trailing_newlines', 'strip_trailing_newlines', 'compression_type', 'context', 'start_shuffle_position', 'end_shuffle_position',