Skip to content
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.

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

[BEAM-86] Add CountingInput as a PTransform #10

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
191 changes: 191 additions & 0 deletions sdk/src/main/java/com/google/cloud/dataflow/sdk/io/CountingInput.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
/*
* Copyright (C) 2016 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/

package com.google.cloud.dataflow.sdk.io;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.cloud.dataflow.sdk.io.CountingSource.NowTimestampFn;
import com.google.cloud.dataflow.sdk.io.Read.Unbounded;
import com.google.cloud.dataflow.sdk.transforms.PTransform;
import com.google.cloud.dataflow.sdk.transforms.SerializableFunction;
import com.google.cloud.dataflow.sdk.values.PBegin;
import com.google.cloud.dataflow.sdk.values.PCollection;
import com.google.cloud.dataflow.sdk.values.PCollection.IsBounded;
import com.google.common.base.Optional;

import org.joda.time.Duration;
import org.joda.time.Instant;

/**
* A {@link PTransform} that produces longs. When used to produce a
* {@link IsBounded#BOUNDED bounded} {@link PCollection}, {@link CountingInput} starts at {@code 0}
* and counts up to a specified maximum. When used to produce an
* {@link IsBounded#UNBOUNDED unbounded} {@link PCollection}, it counts up to {@link Long#MAX_VALUE}
* and then never produces more output. (In practice, this limit should never be reached.)
*
* <p>The bounded {@link CountingInput} is implemented based on {@link OffsetBasedSource} and
* {@link OffsetBasedSource.OffsetBasedReader}, so it performs efficient initial splitting and it
* supports dynamic work rebalancing.
*
* <p>To produce a bounded {@code PCollection<Long>}, use {@link CountingInput#upTo(long)}:
*
* <pre>{@code
* Pipeline p = ...
* PTransform<PBegin, PCollection<Long>> producer = CountingInput.upTo(1000);
* PCollection<Long> bounded = p.apply(producer);
* }</pre>
*
* <p>To produce an unbounded {@code PCollection<Long>}, use {@link CountingInput#unbounded()},
* calling {@link UnboundedCountingInput#withTimestampFn(SerializableFunction)} to provide values
* with timestamps other than {@link Instant#now}.
*
* <pre>{@code
* Pipeline p = ...
*
* // To create an unbounded producer that uses processing time as the element timestamp.
* PCollection<Long> unbounded = p.apply(CountingInput.unbounded());
* // Or, to create an unbounded source that uses a provided function to set the element timestamp.
* PCollection<Long> unboundedWithTimestamps =
* p.apply(CountingInput.unbounded().withTimestampFn(someFn));
* }</pre>
*/
public class CountingInput {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

class-level javadoc mimicking the CountingSource javadoc.

/**
* Creates a {@link BoundedCountingInput} that will produce the specified number of elements,
* from {@code 0} to {@code numElements - 1}.
*/
public static BoundedCountingInput upTo(long numElements) {
checkArgument(numElements > 0, "numElements (%s) must be greater than 0", numElements);
return new BoundedCountingInput(numElements);
}

/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need tests for this file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

* Creates an {@link UnboundedCountingInput} that will produce numbers starting from {@code 0} up
* to {@link Long#MAX_VALUE}.
*
* <p>After {@link Long#MAX_VALUE}, the transform never produces more output. (In practice, this
* limit should never be reached.)
*
* <p>Elements in the resulting {@link PCollection PCollection&lt;Long&gt;} will by default have
* timestamps corresponding to processing time at element generation, provided by
* {@link Instant#now}. Use the transform returned by
* {@link UnboundedCountingInput#withTimestampFn(SerializableFunction)} to control the output
* timestamps.
*/
public static UnboundedCountingInput unbounded() {
return new UnboundedCountingInput(
new NowTimestampFn(), Optional.<Long>absent(), Optional.<Duration>absent());
}

/**
* A {@link PTransform} that will produce a specified number of {@link Long Longs} starting from
* 0.
*/
public static class BoundedCountingInput extends PTransform<PBegin, PCollection<Long>> {
private final long numElements;

private BoundedCountingInput(long numElements) {
this.numElements = numElements;
}

@SuppressWarnings("deprecation")
@Override
public PCollection<Long> apply(PBegin begin) {
return begin.apply(Read.from(CountingSource.upTo(numElements)));
}
}

/**
* A {@link PTransform} that will produce numbers starting from {@code 0} up to
* {@link Long#MAX_VALUE}.
*
* <p>After {@link Long#MAX_VALUE}, the transform never produces more output. (In practice, this
* limit should never be reached.)
*
* <p>Elements in the resulting {@link PCollection PCollection&lt;Long&gt;} will by default have
* timestamps corresponding to processing time at element generation, provided by
* {@link Instant#now}. Use the transform returned by
* {@link UnboundedCountingInput#withTimestampFn(SerializableFunction)} to control the output
* timestamps.
*/
public static class UnboundedCountingInput extends PTransform<PBegin, PCollection<Long>> {
private final SerializableFunction<Long, Instant> timestampFn;
private final Optional<Long> maxNumRecords;
private final Optional<Duration> maxReadTime;

private UnboundedCountingInput(
SerializableFunction<Long, Instant> timestampFn,
Optional<Long> maxNumRecords,
Optional<Duration> maxReadTime) {
this.timestampFn = timestampFn;
this.maxNumRecords = maxNumRecords;
this.maxReadTime = maxReadTime;
}

/**
* Returns an {@link UnboundedCountingInput} like this one, but where output elements have the
* timestamp specified by the timestampFn.
*
* <p>Note that the timestamps produced by {@code timestampFn} may not decrease.
*/
public UnboundedCountingInput withTimestampFn(SerializableFunction<Long, Instant> timestampFn) {
return new UnboundedCountingInput(timestampFn, maxNumRecords, maxReadTime);
}

/**
* Returns an {@link UnboundedCountingInput} like this one, but that will read at most the
* specified number of elements.
*
* <p>A bounded amount of elements will be produced by the result transform, and the result
* {@link PCollection} will be {@link IsBounded#BOUNDED bounded}.
*/
public UnboundedCountingInput withMaxNumRecords(long maxRecords) {
checkArgument(
maxRecords > 0, "MaxRecords must be a positive (nonzero) value. Got %s", maxRecords);
return new UnboundedCountingInput(timestampFn, Optional.of(maxRecords), maxReadTime);
}

/**
* Returns an {@link UnboundedCountingInput} like this one, but that will read for at most the
* specified amount of time.
*
* <p>A bounded amount of elements will be produced by the result transform, and the result
* {@link PCollection} will be {@link IsBounded#BOUNDED bounded}.
*/
public UnboundedCountingInput withMaxReadTime(Duration readTime) {
checkNotNull(readTime, "ReadTime cannot be null");
return new UnboundedCountingInput(timestampFn, maxNumRecords, Optional.of(readTime));
}

@SuppressWarnings("deprecation")
@Override
public PCollection<Long> apply(PBegin begin) {
Unbounded<Long> read = Read.from(CountingSource.unboundedWithTimestampFn(timestampFn));
if (!maxNumRecords.isPresent() && !maxReadTime.isPresent()) {
return begin.apply(read);
} else if (maxNumRecords.isPresent() && !maxReadTime.isPresent()) {
return begin.apply(read.withMaxNumRecords(maxNumRecords.get()));
} else if (!maxNumRecords.isPresent() && maxReadTime.isPresent()) {
return begin.apply(read.withMaxReadTime(maxReadTime.get()));
} else {
return begin.apply(
read.withMaxReadTime(maxReadTime.get()).withMaxNumRecords(maxNumRecords.get()));
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.cloud.dataflow.sdk.coders.Coder;
import com.google.cloud.dataflow.sdk.coders.DefaultCoder;
import com.google.cloud.dataflow.sdk.coders.VarLongCoder;
import com.google.cloud.dataflow.sdk.io.CountingInput.UnboundedCountingInput;
import com.google.cloud.dataflow.sdk.io.UnboundedSource.UnboundedReader;
import com.google.cloud.dataflow.sdk.options.PipelineOptions;
import com.google.cloud.dataflow.sdk.transforms.SerializableFunction;
Expand All @@ -48,29 +49,33 @@
*
* <pre>{@code
* Pipeline p = ...
* BoundedSource<Long> source = CountingSource.upTo(1000);
* PCollection<Long> bounded = p.apply(Read.from(source));
* PTransform<PBegin, PCollection<Long>> producer = CountingInput.upTo(1000);
* PCollection<Long> bounded = p.apply(producer);
* }</pre>
*
* <p>To produce an unbounded {@code PCollection<Long>}, use {@link CountingSource#unbounded} or
* {@link CountingSource#unboundedWithTimestampFn}:
* <p>To produce an unbounded {@code PCollection<Long>}, use {@link CountingInput#unbounded()},
* calling {@link UnboundedCountingInput#withTimestampFn(SerializableFunction)} to provide values
* with timestamps other than {@link Instant#now}.
*
* <pre>{@code
* Pipeline p = ...
*
* // To create an unbounded source that uses processing time as the element timestamp.
* UnboundedSource<Long, CounterMark> source = CountingSource.unbounded();
* // To create an unbounded PCollection that uses processing time as the element timestamp.
* PCollection<Long> unbounded = p.apply(CountingInput.unbounded());
* // Or, to create an unbounded source that uses a provided function to set the element timestamp.
* UnboundedSource<Long, CounterMark> source = CountingSource.unboundedWithTimestampFn(someFn);
* PCollection<Long> unboundedWithTimestamps =
* p.apply(CountingInput.unbounded().withTimestampFn(someFn));
*
* PCollection<Long> unbounded = p.apply(Read.from(source));
* }</pre>
*/
public class CountingSource {
/**
* Creates a {@link BoundedSource} that will produce the specified number of elements,
* from {@code 0} to {@code numElements - 1}.
*
* @deprecated use {@link CountingInput#upTo(long)} instead
*/
@Deprecated
public static BoundedSource<Long> upTo(long numElements) {
checkArgument(numElements > 0, "numElements (%s) must be greater than 0", numElements);
return new BoundedCountingSource(0, numElements);
Expand All @@ -85,7 +90,10 @@ public static BoundedSource<Long> upTo(long numElements) {
*
* <p>Elements in the resulting {@link PCollection PCollection&lt;Long&gt;} will have timestamps
* corresponding to processing time at element generation, provided by {@link Instant#now}.
*
* @deprecated use {@link CountingInput#unbounded()} instead
*/
@Deprecated
public static UnboundedSource<Long, CounterMark> unbounded() {
return unboundedWithTimestampFn(new NowTimestampFn());
}
Expand All @@ -98,7 +106,11 @@ public static UnboundedSource<Long, CounterMark> unbounded() {
* limit should never be reached.)
*
* <p>Note that the timestamps produced by {@code timestampFn} may not decrease.
*
* @deprecated use {@link CountingInput#unbounded()} and call
* {@link UnboundedCountingInput#withTimestampFn(SerializableFunction)} instead
*/
@Deprecated
public static UnboundedSource<Long, CounterMark> unboundedWithTimestampFn(
SerializableFunction<Long, Instant> timestampFn) {
return new UnboundedCountingSource(0, 1, timestampFn);
Expand All @@ -109,11 +121,10 @@ public static UnboundedSource<Long, CounterMark> unboundedWithTimestampFn(
/** Prevent instantiation. */
private CountingSource() {}


/**
* A function that returns {@link Instant#now} as the timestamp for each generated element.
*/
private static class NowTimestampFn implements SerializableFunction<Long, Instant> {
static class NowTimestampFn implements SerializableFunction<Long, Instant> {
@Override
public Instant apply(Long input) {
return Instant.now();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ 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
Expand Down
Loading