Cleans up PTransform validation across Beam #3730
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgroh
reviewed
Aug 18, 2017
| public void validate() { | ||
| spec.validate(null); | ||
| } | ||
| public void validate() {} |
There was a problem hiding this comment.
Done (had to introduce a default empty validate() method in Source, which is probably a good thing anyway, and I removed a bunch more empty validate() methods)
| return builder().setMaxReadTime(maxReadTime).build(); | ||
| } | ||
|
|
||
| @Override | ||
| public PCollection<byte[]> expand(PBegin input) { | ||
| checkArgument(maxReadTime() == null, | ||
| "withMaxNumRecords() and withMaxReadTime() are exclusive"); |
| public void validate() { | ||
| spec.validate(null); | ||
| } | ||
| public void validate() {} |
| @@ -282,9 +270,7 @@ private BoundedMongoDbSource(Read spec) { | |||
| } | |||
|
|
|||
| @Override | |||
| public void validate() { | |||
| spec.validate(null); | |||
| } | |||
| checkArgument(numSplits >= 0, "MongoDbIO.read().withNumSplits(numSplits) called with " | ||
| + "invalid number. The number of splits has to be a positive value (currently %d)", | ||
| numSplits); | ||
| checkArgument(numSplits >= 0, "invalid num_splits: must be > 0, but was %d", numSplits); |
There was a problem hiding this comment.
This message and check don't agree on the requirement
| checkNotNull(parseFn, "parseFn"); | ||
| checkNotNull(parseFn, "coder"); | ||
| checkArgument(parseFn != null, "parseFn can not be null"); | ||
| checkArgument(parseFn != null, "parseFn can not be null"); |
| table != null || getQuery() != null, | ||
| "Invalid BigQueryIO.Read: one of table reference and query must be set"); | ||
|
|
||
| if (table != null) { |
There was a problem hiding this comment.
We may be able to collapse these a bit;
if (table == null) {
checkArgument(query != null, ...)
// query validation
} else {
checkArgument(query == null, ...)
// table validation
}
| @@ -540,6 +512,37 @@ public void validate(PipelineOptions options) { | |||
|
|
|||
| @Override | |||
| public PCollection<TableRow> expand(PBegin input) { | |||
| ValueProvider<TableReference> table = getTableProvider(); | |||
|
|
|||
| checkState( | |||
| type != null, | ||
| "ConnectionConfiguration.create(addresses, index, type) called with null type"); | ||
| checkArgument(addresses != null, "addresses can not be null"); | ||
| checkArgument(addresses.length != 0, "addresses can not be empty"); |
| public void validate() { | ||
| spec.validate(null); | ||
| } | ||
| public void validate() {} |
|
Changes Unknown when pulling e9bbabd on jkff:validate-cleanup into ** on apache:master**. |
jkff
force-pushed
the
validate-cleanup
branch
2 times, most recently
from
6ff7b24
to
45b267b
Compare
- Moves validation from validate() to expand() when possible - Replaces checkNotNull() with checkArgument() when possible - Shortens overly verbose validation messages in a few IOs
jkff
force-pushed
the
validate-cleanup
branch
from
45b267b
to
7b81dcb
Compare
|
Rebased, PTAL. |
|
retest this please |
tgroh
approved these changes
Sep 11, 2017
| @@ -1130,6 +1122,12 @@ public DeleteKey withProjectId(ValueProvider<String> projectId) { | |||
|
|
|||
| @Override | |||
| public PDone expand(PCollection<T> input) { | |||
| checkArgument(projectId != null, "withProjectId() is required"); | |||
| if (projectId.isAccessible()) { | |||
There was a problem hiding this comment.
My meaning is that it fits the appropriate mental model of when validation occurs rather than it will accept more pipelines properly
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As a piggyback, one of the sites to be cleaned up was AssignWindows which happened to be unused (it is also unused by Dataflow Worker), so I deleted it.
R: @tgroh