Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import org.apache.beam.sdk.options.Validation;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.MapElements;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.transforms.ParDo;
Expand Down Expand Up @@ -76,8 +74,9 @@ private static Row flattenAnalyticsRow(Row row) {

static class ExtractBrowserTransactionsFn extends DoFn<Row, KV<String, Long>> {
@ProcessElement
public void processElement(@Element Row row, OutputReceiver<KV<String, Long>> receiver) {
receiver.output(
public void processElement(ProcessContext c) {
Row row = c.element();
c.output(
KV.of(
Preconditions.checkStateNotNull(row.getString("browser")),
Preconditions.checkStateNotNull(row.getInt64("transactions"))));
Expand All @@ -86,13 +85,13 @@ public void processElement(@Element Row row, OutputReceiver<KV<String, Long>> re

static class FormatCountsFn extends DoFn<KV<String, Long>, Row> {
@ProcessElement
public void processElement(@Element KV<String, Long> element, OutputReceiver<Row> receiver) {
public void processElement(ProcessContext c) {
Row row =
Row.withSchema(AGGREGATED_SCHEMA)
.withFieldValue("browser", element.getKey())
.withFieldValue("transaction_count", element.getValue())
.withFieldValue("browser", c.element().getKey())
.withFieldValue("transaction_count", c.element().getValue())
.build();
receiver.output(row);
c.output(row);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
import org.apache.beam.sdk.schemas.transforms.Select;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.Max;
import org.apache.beam.sdk.transforms.Min;
import org.apache.beam.sdk.transforms.ParDo;
Expand Down Expand Up @@ -103,9 +101,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.Row;
Expand Down Expand Up @@ -97,9 +95,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import org.apache.beam.sdk.transforms.ApproximateQuantiles;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.PCollection;
import org.slf4j.Logger;
Expand Down Expand Up @@ -72,9 +70,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
import org.apache.beam.sdk.transforms.CombineFns;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.Max;
import org.apache.beam.sdk.transforms.Min;
import org.apache.beam.sdk.transforms.ParDo;
Expand Down Expand Up @@ -187,16 +185,13 @@ public Long apply(Long input) {
new DoFn<
KV<Long, CombineFns.CoCombineResult>, KV<Long, Iterable<KV<String, Long>>>>() {
@ProcessElement
public void processElement(
@Element KV<Long, CombineFns.CoCombineResult> element,
OutputReceiver<KV<Long, Iterable<KV<String, Long>>>> receiver)
throws Exception {
CombineFns.CoCombineResult e = element.getValue();
public void processElement(ProcessContext c) throws Exception {
CombineFns.CoCombineResult e = c.element().getValue();
ArrayList<KV<String, Long>> o = new ArrayList<KV<String, Long>>();
o.add(KV.of(minTag.getId(), e.get(minTag)));
o.add(KV.of(maxTag.getId(), e.get(maxTag)));
o.add(KV.of(sumTag.getId(), e.get(sumTag)));
receiver.output(KV.of(element.getKey(), o));
c.output(KV.of(c.element().getKey(), o));
}
}));

Expand All @@ -215,9 +210,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.transforms.join.CoGbkResult;
import org.apache.beam.sdk.transforms.join.CoGroupByKey;
Expand Down Expand Up @@ -86,9 +84,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import org.apache.beam.sdk.transforms.Combine;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.transforms.Sum;
import org.apache.beam.sdk.values.PCollection;
Expand Down Expand Up @@ -70,9 +68,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import org.apache.beam.sdk.transforms.Count;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.PCollection;
import org.slf4j.Logger;
Expand Down Expand Up @@ -65,9 +63,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import org.apache.beam.sdk.transforms.Count;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
Expand Down Expand Up @@ -69,9 +67,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
Expand Down Expand Up @@ -81,9 +79,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
Expand Down Expand Up @@ -117,19 +115,18 @@ public FilterTextFn(String pattern) {
private final Counter unmatchedWords = Metrics.counter(FilterTextFn.class, "unmatchedWords");

@ProcessElement
public void processElement(
@Element KV<String, Long> element, OutputReceiver<KV<String, Long>> receiver) {
if (filter.matcher(element.getKey()).matches()) {
public void processElement(ProcessContext c) {
if (filter.matcher(c.element().getKey()).matches()) {
// Log at the "DEBUG" level each element that we match. When executing this pipeline
// these log lines will appear only if the log level is set to "DEBUG" or lower.
LOG.debug("Matched: {}", element.getKey());
LOG.debug("Matched: {}", c.element().getKey());
matchedWords.inc();
receiver.output(element);
c.output(c.element());
} else {
// Log at the "TRACE" level each element that is not matched. Different log levels
// can be used to control the verbosity of logging providing an effective mechanism
// to filter less important information.
LOG.trace("Did not match: {}", element.getKey());
LOG.trace("Did not match: {}", c.element().getKey());
unmatchedWords.inc();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.Distinct;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.PCollection;
import org.slf4j.Logger;
Expand Down Expand Up @@ -70,9 +68,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.FlatMapElements;
import org.apache.beam.sdk.transforms.InferableFunction;
import org.apache.beam.sdk.transforms.ParDo;
Expand Down Expand Up @@ -80,9 +78,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.GroupIntoBatches;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.KV;
Expand Down Expand Up @@ -76,9 +74,9 @@ public LogOutput(String prefix) {
}

@ProcessElement
public void processElement(@Element T element, OutputReceiver<T> receiver) throws Exception {
LOG.info("{}{}", prefix, element);
receiver.output(element);
public void processElement(ProcessContext c) throws Exception {
LOG.info("{}{}", prefix, c.element());
c.output(c.element());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.transforms.Combine;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.DoFn.Element;
import org.apache.beam.sdk.transforms.DoFn.OutputReceiver;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.transforms.Sum;
import org.apache.beam.sdk.transforms.Values;
Expand Down Expand Up @@ -111,13 +109,10 @@ public static void main(String[] args) {
ParDo.of(
new DoFn<String, KV<Integer, Integer>>() {
@ProcessElement
public void processElement(
@Element String element, OutputReceiver<KV<Integer, Integer>> receiver)
throws JsonProcessingException {
public void processElement(ProcessContext c) throws JsonProcessingException {
final VendorToPassengerDTO result =
om.readValue(element, new TypeReference<VendorToPassengerDTO>() {});
receiver.output(
KV.of(result.getVendorIdField(), result.getPassengerCountField()));
om.readValue(c.element(), new TypeReference<VendorToPassengerDTO>() {});
c.output(KV.of(result.getVendorIdField(), result.getPassengerCountField()));
}
}))
.apply(
Expand All @@ -129,11 +124,11 @@ public void processElement(
new DoFn<KV<Integer, Integer>, KV<Integer, Integer>>() {
@ProcessElement
public void processElement(
OutputReceiver<KV<Integer, Integer>> out,
@Element KV<Integer, Integer> element) {
ProcessContext c, OutputReceiver<KV<Integer, Integer>> out) {
System.out.printf(
"Vendor: %s, Passengers: %s%n", element.getKey(), element.getValue());
out.output(element);
"Vendor: %s, Passengers: %s%n",
c.element().getKey(), c.element().getValue());
out.output(c.element());
Comment on lines +127 to +131

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

This method signature mixes legacy ProcessContext with the modern OutputReceiver parameter. For consistency and clarity, it is recommended to use one style. Since this PR is reverting to ProcessContext, you should use c.output() instead of the out parameter.

Suggested change
ProcessContext c, OutputReceiver<KV<Integer, Integer>> out) {
System.out.printf(
"Vendor: %s, Passengers: %s%n", element.getKey(), element.getValue());
out.output(element);
"Vendor: %s, Passengers: %s%n",
c.element().getKey(), c.element().getValue());
out.output(c.element());
ProcessContext c) {
System.out.printf(
"Vendor: %s, Passengers: %s%n",
c.element().getKey(), c.element().getValue());
c.output(c.element());

}
}));
p.run().waitUntilFinish();
Expand Down
Loading
Loading