You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/09/27 18:53:46 UTC
[1/2] beam git commit: [BEAM-2959] Fix proto enums to use
"YYY_UNSPECIFIED" as the first declared enum.
Repository: beam
Updated Branches:
refs/heads/master 41239d808 -> 87ea0681e
[BEAM-2959] Fix proto enums to use "YYY_UNSPECIFIED" as the first declared enum.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b6c68a6c
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b6c68a6c
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b6c68a6c
Branch: refs/heads/master
Commit: b6c68a6cb3c84d6445a5a494812b59df17627f22
Parents: 41239d8
Author: Luke Cwik <lc...@google.com>
Authored: Fri Sep 15 11:23:19 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Sep 27 11:52:20 2017 -0700
----------------------------------------------------------------------
runners/google-cloud-dataflow-java/pom.xml | 2 +-
.../fn-api/src/main/proto/beam_fn_api.proto | 15 ++---
.../src/main/proto/beam_job_api.proto | 34 +++++-----
.../src/main/proto/beam_runner_api.proto | 66 ++++++++++++--------
4 files changed, 66 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/b6c68a6c/runners/google-cloud-dataflow-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index 4d2c5ee..36ccb5a 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -33,7 +33,7 @@
<packaging>jar</packaging>
<properties>
- <dataflow.container_version>beam-master-20170922-01</dataflow.container_version>
+ <dataflow.container_version>beam-master-20170926</dataflow.container_version>
<dataflow.fnapi_environment_major_version>1</dataflow.fnapi_environment_major_version>
<dataflow.legacy_environment_major_version>6</dataflow.legacy_environment_major_version>
</properties>
http://git-wip-us.apache.org/repos/asf/beam/blob/b6c68a6c/sdks/common/fn-api/src/main/proto/beam_fn_api.proto
----------------------------------------------------------------------
diff --git a/sdks/common/fn-api/src/main/proto/beam_fn_api.proto b/sdks/common/fn-api/src/main/proto/beam_fn_api.proto
index 9bf1b5f..f2bbd3c 100644
--- a/sdks/common/fn-api/src/main/proto/beam_fn_api.proto
+++ b/sdks/common/fn-api/src/main/proto/beam_fn_api.proto
@@ -631,23 +631,24 @@ message LogEntry {
// can provide filtering and searching across log types. Users of the API are
// free not to use all severity levels in their log messages.
enum Severity {
+ SEVERITY_UNSPECIFIED = 0;
// Trace level information, also the default log level unless
// another severity is specified.
- TRACE = 0;
+ TRACE = 1;
// Debugging information.
- DEBUG = 10;
+ DEBUG = 2;
// Normal events.
- INFO = 20;
+ INFO = 3;
// Normal but significant events, such as start up, shut down, or
// configuration.
- NOTICE = 30;
+ NOTICE = 4;
// Warning events might cause problems.
- WARN = 40;
+ WARN = 5;
// Error events are likely to cause problems.
- ERROR = 50;
+ ERROR = 6;
// Critical events cause severe problems or brief outages and may
// indicate that a person must take action.
- CRITICAL = 60;
+ CRITICAL = 7;
}
// (Required) The severity of the log statement.
http://git-wip-us.apache.org/repos/asf/beam/blob/b6c68a6c/sdks/common/runner-api/src/main/proto/beam_job_api.proto
----------------------------------------------------------------------
diff --git a/sdks/common/runner-api/src/main/proto/beam_job_api.proto b/sdks/common/runner-api/src/main/proto/beam_job_api.proto
index 5fa02ba..9d826ff 100644
--- a/sdks/common/runner-api/src/main/proto/beam_job_api.proto
+++ b/sdks/common/runner-api/src/main/proto/beam_job_api.proto
@@ -134,11 +134,12 @@ message JobMessage {
string message_text = 4;
enum MessageImportance {
- JOB_MESSAGE_DEBUG = 0;
- JOB_MESSAGE_DETAILED = 1;
- JOB_MESSAGE_BASIC = 2;
- JOB_MESSAGE_WARNING = 3;
- JOB_MESSAGE_ERROR = 4;
+ MESSAGE_IMPORTANCE_UNSPECIFIED = 0;
+ JOB_MESSAGE_DEBUG = 1;
+ JOB_MESSAGE_DETAILED = 2;
+ JOB_MESSAGE_BASIC = 3;
+ JOB_MESSAGE_WARNING = 4;
+ JOB_MESSAGE_ERROR = 5;
}
}
@@ -152,16 +153,17 @@ message JobMessagesResponse {
message JobState {
// Enumeration of all JobStates
enum JobStateType {
- UNKNOWN = 0;
- STOPPED = 1;
- RUNNING = 2;
- DONE = 3;
- FAILED = 4;
- CANCELLED = 5;
- UPDATED = 6;
- DRAINING = 7;
- DRAINED = 8;
- STARTING = 9;
- CANCELLING = 10;
+ JOB_STATE_TYPE_UNSPECIFIED = 0;
+ UNKNOWN = 1;
+ STOPPED = 2;
+ RUNNING = 3;
+ DONE = 4;
+ FAILED = 5;
+ CANCELLED = 6;
+ UPDATED = 7;
+ DRAINING = 8;
+ DRAINED = 9;
+ STARTING = 10;
+ CANCELLING = 11;
}
}
http://git-wip-us.apache.org/repos/asf/beam/blob/b6c68a6c/sdks/common/runner-api/src/main/proto/beam_runner_api.proto
----------------------------------------------------------------------
diff --git a/sdks/common/runner-api/src/main/proto/beam_runner_api.proto b/sdks/common/runner-api/src/main/proto/beam_runner_api.proto
index fb5d47e..3b68993 100644
--- a/sdks/common/runner-api/src/main/proto/beam_runner_api.proto
+++ b/sdks/common/runner-api/src/main/proto/beam_runner_api.proto
@@ -245,9 +245,10 @@ message Parameter {
Type type = 1;
enum Type {
- WINDOW = 0;
- PIPELINE_OPTIONS = 1;
- RESTRICTION_TRACKER = 2;
+ TYPE_UNSPECIFIED = 0;
+ WINDOW = 1;
+ PIPELINE_OPTIONS = 2;
+ RESTRICTION_TRACKER = 3;
}
}
@@ -288,8 +289,9 @@ message TimerSpec {
}
enum IsBounded {
- UNBOUNDED = 0;
- BOUNDED = 1;
+ IS_BOUNDED_UNSPECIFIED = 0;
+ UNBOUNDED = 1;
+ BOUNDED = 2;
}
// The payload for the primitive Read transform.
@@ -454,87 +456,96 @@ message WindowingStrategy {
// merging-but-already-merged, in which case a subsequent GroupByKey is almost
// always going to do something the user does not want
enum MergeStatus {
+ MERGE_STATUS_UNSPECIFIED = 0;
+
// The WindowFn does not require merging.
// Examples: global window, FixedWindows, SlidingWindows
- NON_MERGING = 0;
+ NON_MERGING = 1;
// The WindowFn is merging and the PCollection has not had merging
// performed.
// Example: Sessions prior to a GroupByKey
- NEEDS_MERGE = 1;
+ NEEDS_MERGE = 2;
// The WindowFn is merging and the PCollection has had merging occur
// already.
// Example: Sessions after a GroupByKey
- ALREADY_MERGED = 2;
+ ALREADY_MERGED = 3;
}
// Whether or not subsequent outputs of aggregations should be entire
// replacement values or just the aggregation of inputs received since
// the prior output.
enum AccumulationMode {
+ ACCUMULATION_MODE_UNSPECIFIED = 0;
// The aggregation is discarded when it is output
- DISCARDING = 0;
+ DISCARDING = 1;
// The aggregation is accumulated across outputs
- ACCUMULATING = 1;
+ ACCUMULATING = 2;
}
// Controls whether or not an aggregating transform should output data
// when a window expires.
enum ClosingBehavior {
+ CLOSING_BEHVAIOR_UNSPECIFIED = 0;
// Emit output when a window expires, whether or not there has been
// any new data since the last output.
- EMIT_ALWAYS = 0;
+ EMIT_ALWAYS = 1;
// Only emit output when new data has arrives since the last output
- EMIT_IF_NONEMPTY = 1;
+ EMIT_IF_NONEMPTY = 2;
}
// Controls whether or not an aggregating transform should output data
// when an on-time pane is empty.
enum OnTimeBehavior {
+ ON_TIME_BEHAVIOR_UNSPECIFIED = 0;
+
// Always fire the on-time pane. Even if there is no new data since
// the previous firing, an element will be produced.
- FIRE_ALWAYS = 0;
+ FIRE_ALWAYS = 1;
// Only fire the on-time pane if there is new data since the previous firing.
- FIRE_IF_NONEMPTY = 1;
+ FIRE_IF_NONEMPTY = 2;
}
// When a number of windowed, timestamped inputs are aggregated, the timestamp
// for the resulting output.
enum OutputTime {
+ OUTPUT_TIME_UNSPECIFIED = 0;
+
// The output has the timestamp of the end of the window.
- END_OF_WINDOW = 0;
+ END_OF_WINDOW = 1;
// The output has the latest timestamp of the input elements since
// the last output.
- LATEST_IN_PANE = 1;
+ LATEST_IN_PANE = 2;
// The output has the earliest timestamp of the input elements since
// the last output.
- EARLIEST_IN_PANE = 2;
+ EARLIEST_IN_PANE = 3;
}
// The different time domains in the Beam model.
enum TimeDomain {
+ TIME_DOMAIN_UNSPECIFIED = 0;
// Event time is time from the perspective of the data
- EVENT_TIME = 0;
+ EVENT_TIME = 1;
// Processing time is time from the perspective of the
// execution of your pipeline
- PROCESSING_TIME = 1;
+ PROCESSING_TIME = 2;
// Synchronized processing time is the minimum of the
// processing time of all pending elements.
//
// The "processing time" of an element refers to
// the local processing time at which it was emitted
- SYNCHRONIZED_PROCESSING_TIME = 2;
+ SYNCHRONIZED_PROCESSING_TIME = 3;
}
// A small DSL for expressing when to emit new aggregations
@@ -804,12 +815,13 @@ message DisplayData {
}
enum Type {
- STRING = 0;
- INTEGER = 1;
- FLOAT = 2;
- BOOLEAN = 3;
- TIMESTAMP = 4;
- DURATION = 5;
- JAVA_CLASS = 6;
+ TYPE_UNSPECIFIED = 0;
+ STRING = 1;
+ INTEGER = 2;
+ FLOAT = 3;
+ BOOLEAN = 4;
+ TIMESTAMP = 5;
+ DURATION = 6;
+ JAVA_CLASS = 7;
}
}
[2/2] beam git commit: [BEAM-2959] Fix proto enums to use
"YYY_UNSPECIFIED" as the first declared enum.
Posted by lc...@apache.org.
[BEAM-2959] Fix proto enums to use "YYY_UNSPECIFIED" as the first declared enum.
This closes #3904
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/87ea0681
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/87ea0681
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/87ea0681
Branch: refs/heads/master
Commit: 87ea0681e36c0640c02c8d137f83ad73b95e1bc3
Parents: 41239d8 b6c68a6
Author: Luke Cwik <lc...@google.com>
Authored: Wed Sep 27 11:53:23 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Sep 27 11:53:23 2017 -0700
----------------------------------------------------------------------
runners/google-cloud-dataflow-java/pom.xml | 2 +-
.../fn-api/src/main/proto/beam_fn_api.proto | 15 ++---
.../src/main/proto/beam_job_api.proto | 34 +++++-----
.../src/main/proto/beam_runner_api.proto | 66 ++++++++++++--------
4 files changed, 66 insertions(+), 51 deletions(-)
----------------------------------------------------------------------