Skip to content

Clean up DataflowPipeline[Debug]Options #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tgroh wants to merge 1 commit into from
Closed

Clean up DataflowPipeline[Debug]Options #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ...dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineDebugOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,6 @@ public Dataflow create(PipelineOptions options) {
}
}

/**
* Whether to update the currently running pipeline with the same name as this one.
*
* @deprecated This property is replaced by {@link DataflowPipelineOptions#getUpdate()}
*/
@Deprecated
@Description("If set, replace the existing pipeline with the name specified by --jobName with "
+ "this pipeline, preserving state.")
boolean getUpdate();
@Deprecated
void setUpdate(boolean value);

/**
* Mapping of old PTranform names to new ones, specified as JSON
* <code>{"oldName":"newName",...}</code>. To mark a transform as deleted, make newName the
Expand Down
6 changes: 1 addition & 5 deletions ...loud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,10 @@ public interface DataflowPipelineOptions
/**
* Whether to update the currently running pipeline with the same name as this one.
*/
@Override
@SuppressWarnings("deprecation") // base class member deprecated in favor of this one.
@Description(
"If set, replace the existing pipeline with the name specified by --jobName with "
+ "this pipeline, preserving state.")
boolean getUpdate();
@Override
@SuppressWarnings("deprecation") // base class member deprecated in favor of this one.
boolean isUpdate();
void setUpdate(boolean value);

/**
Expand Down
4 changes: 2 additions & 2 deletions ...cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ public DataflowPipelineJob run(Pipeline pipeline) {
}

String jobIdToUpdate = null;
if (options.getUpdate()) {
if (options.isUpdate()) {
jobIdToUpdate = getJobIdFromName(options.getJobName());
newJob.setTransformNameMapping(options.getTransformNameMapping());
newJob.setReplaceJobId(jobIdToUpdate);
Expand Down Expand Up @@ -612,7 +612,7 @@ public DataflowPipelineJob run(Pipeline pipeline) {
if (jobResult.getClientRequestId() != null && !jobResult.getClientRequestId().isEmpty()
&& !jobResult.getClientRequestId().equals(requestId)) {
// If updating a job.
if (options.getUpdate()) {
if (options.isUpdate()) {
throw new DataflowJobAlreadyUpdatedException(dataflowPipelineJob,
String.format("The job named %s with id: %s has already been updated into job id: %s "
+ "and cannot be updated again.",
Expand Down