Repository: beam Updated Branches: refs/heads/master aef89dea8 -> bbca4f741
Fix beam_job_api to conform to proto naming conventions. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/4764883a Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/4764883a Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/4764883a Branch: refs/heads/master Commit: 4764883a19174f0887ec091aa109e36881e102bf Parents: aef89de Author: Robert Bradshaw <rober...@gmail.com> Authored: Mon Aug 28 10:10:35 2017 -0700 Committer: Robert Bradshaw <rober...@gmail.com> Committed: Mon Aug 28 10:10:35 2017 -0700 ---------------------------------------------------------------------- .../src/main/proto/beam_job_api.proto | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/4764883a/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 8946d2a..5fa02ba 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 @@ -36,22 +36,22 @@ import "google/protobuf/struct.proto"; service JobService { // Prepare a job for execution. The job will not be executed until a call is made to run with the // returned preparationId. - rpc prepare (PrepareJobRequest) returns (PrepareJobResponse); + rpc Prepare (PrepareJobRequest) returns (PrepareJobResponse); // Submit the job for execution - rpc run (RunJobRequest) returns (RunJobResponse); + rpc Run (RunJobRequest) returns (RunJobResponse); // Get the current state of the job - rpc getState (GetJobStateRequest) returns (GetJobStateResponse); + rpc GetState (GetJobStateRequest) returns (GetJobStateResponse); // Cancel the job - rpc cancel (CancelJobRequest) returns (CancelJobResponse); + rpc Cancel (CancelJobRequest) returns (CancelJobResponse); // Subscribe to a stream of state changes of the job, will immediately return the current state of the job as the first response. - rpc getStateStream (GetJobStateRequest) returns (stream GetJobStateResponse); + rpc GetStateStream (GetJobStateRequest) returns (stream GetJobStateResponse); // Subscribe to a stream of state changes and messages from the job - rpc getMessageStream (JobMessagesRequest) returns (stream JobMessagesResponse); + rpc GetMessageStream (JobMessagesRequest) returns (stream JobMessagesResponse); } @@ -61,14 +61,14 @@ service JobService { // Throws error UNKNOWN for all other issues message PrepareJobRequest { org.apache.beam.runner_api.v1.Pipeline pipeline = 1; // (required) - google.protobuf.Struct pipelineOptions = 2; // (required) - string jobName = 3; // (required) + google.protobuf.Struct pipeline_options = 2; // (required) + string job_name = 3; // (required) } message PrepareJobResponse { // (required) The ID used to associate calls made while preparing the job. preparationId is used // to run the job, as well as in other pre-execution APIs such as Artifact staging. - string preparationId = 1; + string preparation_id = 1; } @@ -79,15 +79,15 @@ message PrepareJobResponse { message RunJobRequest { // (required) The ID provided by an earlier call to prepare. Runs the job. All prerequisite tasks // must have been completed. - string preparationId = 1; + string preparation_id = 1; // (optional) If any artifacts have been staged for this job, contains the staging_token returned // from the CommitManifestResponse. - string stagingToken = 2; + string staging_token = 2; } message RunJobResponse { - string jobId = 1; // (required) The ID for the executing job + string job_id = 1; // (required) The ID for the executing job } @@ -95,7 +95,7 @@ message RunJobResponse { // Throws error GRPC_STATUS_UNAVAILABLE if server is down // Throws error NOT_FOUND if the jobId is not found message CancelJobRequest { - string jobId = 1; // (required) + string job_id = 1; // (required) } @@ -109,7 +109,7 @@ message CancelJobResponse { // Throws error GRPC_STATUS_UNAVAILABLE if server is down // Throws error NOT_FOUND if the jobId is not found message GetJobStateRequest { - string jobId = 1; // (required) + string job_id = 1; // (required) } @@ -123,15 +123,15 @@ message GetJobStateResponse { // and job messages back; one is used for logging and the other for detecting // the job ended. message JobMessagesRequest { - string jobId = 1; // (required) + string job_id = 1; // (required) } message JobMessage { - string messageId = 1; + string message_id = 1; string time = 2; MessageImportance importance = 3; - string messageText = 4; + string message_text = 4; enum MessageImportance { JOB_MESSAGE_DEBUG = 0; @@ -144,8 +144,8 @@ message JobMessage { message JobMessagesResponse { oneof response { - JobMessage messageResponse = 1; - GetJobStateResponse stateResponse = 2; + JobMessage message_response = 1; + GetJobStateResponse state_response = 2; } }