You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ie...@apache.org on 2017/08/23 17:09:46 UTC
[38/55] [abbrv] beam git commit: Remove references to dataflow in
generic classes
Remove references to dataflow in generic classes
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/69953a0b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/69953a0b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/69953a0b
Branch: refs/heads/master
Commit: 69953a0b803896a982347b6bb821a922f6970d2b
Parents: dbd1b15
Author: Etienne Chauchot <ec...@gmail.com>
Authored: Tue May 9 12:08:10 2017 +0200
Committer: Ismaël Mejía <ie...@gmail.com>
Committed: Wed Aug 23 19:07:28 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/beam/integration/nexmark/Main.java | 4 ++--
.../java/org/apache/beam/integration/nexmark/NexmarkOptions.java | 2 +-
.../java/org/apache/beam/integration/nexmark/NexmarkUtils.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/69953a0b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/Main.java
----------------------------------------------------------------------
diff --git a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/Main.java b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/Main.java
index da4d446..4c23651 100644
--- a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/Main.java
+++ b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/Main.java
@@ -36,7 +36,7 @@ import org.joda.time.Duration;
import org.joda.time.Instant;
/**
- * An implementation of the 'NEXMark queries' for Google Dataflow.
+ * An implementation of the 'NEXMark queries' for Beam.
* These are multiple queries over a three table schema representing an online auction system:
* <ul>
* <li>{@link Person} represents a person submitting an item for auction and/or making a bid
@@ -44,7 +44,7 @@ import org.joda.time.Instant;
* <li>{@link Auction} represents an item under auction.
* <li>{@link Bid} represents a bid for an item under auction.
* </ul>
- * The queries exercise many aspects of streaming dataflow.
+ * The queries exercise many aspects of the Beam model.
*
* <p>We synthesize the creation of people, auctions and bids in real-time. The data is not
* particularly sensible.
http://git-wip-us.apache.org/repos/asf/beam/blob/69953a0b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java
----------------------------------------------------------------------
diff --git a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java
index f162fd6..9afffaa 100644
--- a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java
+++ b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java
@@ -37,7 +37,7 @@ public interface NexmarkOptions
void setSuite(NexmarkSuite suite);
- @Description("If true, and using the DataflowPipelineRunner, monitor the jobs as they run.")
+ @Description("If true, monitor the jobs as they run.")
@Default.Boolean(false)
boolean getMonitorJobs();
http://git-wip-us.apache.org/repos/asf/beam/blob/69953a0b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkUtils.java
----------------------------------------------------------------------
diff --git a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkUtils.java b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkUtils.java
index f6215e9..ea851af 100644
--- a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkUtils.java
+++ b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkUtils.java
@@ -289,7 +289,7 @@ public class NexmarkUtils {
private static final boolean LOG_ERROR = true;
/**
- * Set to true to log directly to stdout on VM. You can watch the results in real-time with:
+ * Set to true to log directly to stdout. If run using Google Dataflow, you can watch the results in real-time with:
* tail -f /var/log/dataflow/streaming-harness/harness-stdout.log
*/
private static final boolean LOG_TO_CONSOLE = false;