From d2693ec252317d168a6b5338c79617f4b6e6df6d Mon Sep 17 00:00:00 2001 From: Eugene Kirpichov Date: Tue, 30 May 2017 18:04:36 -0700 Subject: [PATCH 1/2] Bumps dataflow container version to 0530 --- runners/google-cloud-dataflow-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 16e12664918c..92c94a8394db 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -33,7 +33,7 @@ jar - beam-master-20170519 + beam-master-20170530 1 6 From a073f36a26ef6f4fed1718c3143351bdb47b4aeb Mon Sep 17 00:00:00 2001 From: Eugene Kirpichov Date: Fri, 26 May 2017 16:11:20 -0700 Subject: [PATCH 2/2] Removes unused PropertyNames --- .../runners/dataflow/util/PropertyNames.java | 46 ------------------- 1 file changed, 46 deletions(-) diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/PropertyNames.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/PropertyNames.java index c8c990302102..f82f1f112c17 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/PropertyNames.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/PropertyNames.java @@ -21,67 +21,31 @@ * Constant property names used by the SDK in CloudWorkflow specifications. */ public class PropertyNames { - public static final String ALLOWED_ENCODINGS = "allowed_encodings"; - public static final String APPEND_TRAILING_NEWLINES = "append_trailing_newlines"; - public static final String BIGQUERY_CREATE_DISPOSITION = "create_disposition"; - public static final String BIGQUERY_DATASET = "dataset"; - public static final String BIGQUERY_PROJECT = "project"; - public static final String BIGQUERY_SCHEMA = "schema"; - public static final String BIGQUERY_TABLE = "table"; - public static final String BIGQUERY_QUERY = "bigquery_query"; - public static final String BIGQUERY_FLATTEN_RESULTS = "bigquery_flatten_results"; - public static final String BIGQUERY_USE_LEGACY_SQL = "bigquery_use_legacy_sql"; - public static final String BIGQUERY_WRITE_DISPOSITION = "write_disposition"; - public static final String BIGQUERY_EXPORT_FORMAT = "bigquery_export_format"; - public static final String BIGQUERY_EXPORT_SCHEMA = "bigquery_export_schema"; public static final String CO_GBK_RESULT_SCHEMA = "co_gbk_result_schema"; - public static final String COMBINE_FN = "combine_fn"; public static final String COMPONENT_ENCODINGS = "component_encodings"; - public static final String COMPRESSION_TYPE = "compression_type"; public static final String CUSTOM_SOURCE_FORMAT = "custom_source"; - public static final String CONCAT_SOURCE_SOURCES = "sources"; - public static final String CONCAT_SOURCE_BASE_SPECS = "base_specs"; public static final String SOURCE_STEP_INPUT = "custom_source_step_input"; public static final String SOURCE_SPEC = "spec"; public static final String SOURCE_METADATA = "metadata"; public static final String SOURCE_DOES_NOT_NEED_SPLITTING = "does_not_need_splitting"; - public static final String SOURCE_PRODUCES_SORTED_KEYS = "produces_sorted_keys"; public static final String SOURCE_IS_INFINITE = "is_infinite"; public static final String SOURCE_ESTIMATED_SIZE_BYTES = "estimated_size_bytes"; - public static final String ELEMENT = "element"; - public static final String ELEMENTS = "elements"; public static final String ENCODING = "encoding"; - public static final String ENCODING_ID = "encoding_id"; - public static final String END_INDEX = "end_index"; - public static final String END_OFFSET = "end_offset"; - public static final String END_SHUFFLE_POSITION = "end_shuffle_position"; public static final String ENVIRONMENT_VERSION_JOB_TYPE_KEY = "job_type"; public static final String ENVIRONMENT_VERSION_MAJOR_KEY = "major"; - public static final String FILENAME = "filename"; - public static final String FILENAME_PREFIX = "filename_prefix"; - public static final String FILENAME_SUFFIX = "filename_suffix"; - public static final String FILEPATTERN = "filepattern"; - public static final String FOOTER = "footer"; public static final String FORMAT = "format"; - public static final String HEADER = "header"; public static final String INPUTS = "inputs"; - public static final String INPUT_CODER = "input_coder"; - public static final String IS_GENERATED = "is_generated"; public static final String IS_MERGING_WINDOW_FN = "is_merging_window_fn"; public static final String IS_PAIR_LIKE = "is_pair_like"; public static final String IS_STREAM_LIKE = "is_stream_like"; public static final String IS_WRAPPER = "is_wrapper"; public static final String DISALLOW_COMBINER_LIFTING = "disallow_combiner_lifting"; public static final String NON_PARALLEL_INPUTS = "non_parallel_inputs"; - public static final String NUM_SHARD_CODERS = "num_shard_coders"; - public static final String NUM_METADATA_SHARD_CODERS = "num_metadata_shard_coders"; - public static final String NUM_SHARDS = "num_shards"; public static final String OBJECT_TYPE_NAME = "@type"; public static final String OUTPUT = "output"; public static final String OUTPUT_INFO = "output_info"; public static final String OUTPUT_NAME = "output_name"; public static final String PARALLEL_INPUT = "parallel_input"; - public static final String PHASE = "phase"; public static final String PUBSUB_ID_ATTRIBUTE = "pubsub_id_label"; public static final String PUBSUB_SERIALIZED_ATTRIBUTES_FN = "pubsub_serialized_attributes_fn"; public static final String PUBSUB_SUBSCRIPTION = "pubsub_subscription"; @@ -91,22 +55,12 @@ public class PropertyNames { public static final String PUBSUB_TOPIC_OVERRIDE = "pubsub_topic_runtime_override"; public static final String SCALAR_FIELD_NAME = "value"; public static final String SERIALIZED_FN = "serialized_fn"; - public static final String SHARD_NAME_TEMPLATE = "shard_template"; - public static final String SHUFFLE_KIND = "shuffle_kind"; - public static final String SHUFFLE_READER_CONFIG = "shuffle_reader_config"; - public static final String SHUFFLE_WRITER_CONFIG = "shuffle_writer_config"; public static final String SORT_VALUES = "sort_values"; - public static final String START_INDEX = "start_index"; - public static final String START_OFFSET = "start_offset"; - public static final String START_SHUFFLE_POSITION = "start_shuffle_position"; - public static final String STRIP_TRAILING_NEWLINES = "strip_trailing_newlines"; public static final String TUPLE_TAGS = "tuple_tags"; public static final String USE_INDEXED_FORMAT = "use_indexed_format"; public static final String USER_FN = "user_fn"; public static final String USER_NAME = "user_name"; public static final String USES_KEYED_STATE = "uses_keyed_state"; - public static final String VALIDATE_SINK = "validate_sink"; - public static final String VALIDATE_SOURCE = "validate_source"; public static final String VALUE = "value"; public static final String DISPLAY_DATA = "display_data"; }