You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/11/10 22:16:34 UTC
[1/2] incubator-beam git commit: [BEAM-962] Fix games example
pipeline options default values conflicts.
Repository: incubator-beam
Updated Branches:
refs/heads/master 503b40717 -> f7745dc29
[BEAM-962] Fix games example pipeline options default values conflicts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7da12429
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7da12429
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7da12429
Branch: refs/heads/master
Commit: 7da124293f1726efb716cb8432fd2c87bab54bca
Parents: 503b407
Author: Pei He <pe...@google.com>
Authored: Thu Nov 10 13:52:52 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Thu Nov 10 14:16:18 2016 -0800
----------------------------------------------------------------------
.../org/apache/beam/examples/complete/game/GameStats.java | 8 ++++----
.../beam/examples/complete/game/HourlyTeamScore.java | 8 +++-----
.../apache/beam/examples/complete/game/LeaderBoard.java | 10 ++++------
.../org/apache/beam/examples/complete/game/UserScore.java | 6 +++---
.../apache/beam/examples/complete/game/GameStatsTest.java | 5 +++++
.../beam/examples/complete/game/HourlyTeamScoreTest.java | 5 +++++
.../beam/examples/complete/game/LeaderBoardTest.java | 6 ++++++
7 files changed, 30 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7da12429/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
index 2b5255f..f352252 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
@@ -181,8 +181,8 @@ public class GameStats extends LeaderBoard {
@Description("Prefix used for the BigQuery table names")
@Default.String("game_stats")
- String getTablePrefix();
- void setTablePrefix(String value);
+ String getGameStatsTablePrefix();
+ void setGameStatsTablePrefix(String value);
}
@@ -301,7 +301,7 @@ public class GameStats extends LeaderBoard {
// Write the result to BigQuery
.apply("WriteTeamSums",
new WriteWindowedToBigQuery<KV<String, Integer>>(
- options.getTablePrefix() + "_team", configureWindowedWrite()));
+ options.getGameStatsTablePrefix() + "_team", configureWindowedWrite()));
// [START DocInclude_SessionCalc]
@@ -328,7 +328,7 @@ public class GameStats extends LeaderBoard {
// Write this info to a BigQuery table.
.apply("WriteAvgSessionLength",
new WriteWindowedToBigQuery<Double>(
- options.getTablePrefix() + "_sessions", configureSessionWindowWrite()));
+ options.getGameStatsTablePrefix() + "_sessions", configureSessionWindowWrite()));
// [END DocInclude_Rewindow]
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7da12429/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
index 3a8d2ad..b905d61 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
@@ -107,12 +107,10 @@ public class HourlyTeamScore extends UserScore {
String getStopMin();
void setStopMin(String value);
- @Override
@Description("The BigQuery table name. Should not already exist.")
@Default.String("hourly_team_score")
- String getTableName();
- @Override
- void setTableName(String value);
+ String getHourlyTeamScoreTableName();
+ void setHourlyTeamScoreTableName(String value);
}
/**
@@ -187,7 +185,7 @@ public class HourlyTeamScore extends UserScore {
// Extract and sum teamname/score pairs from the event data.
.apply("ExtractTeamScore", new ExtractAndSumScore("team"))
.apply("WriteTeamScoreSums",
- new WriteWindowedToBigQuery<KV<String, Integer>>(options.getTableName(),
+ new WriteWindowedToBigQuery<KV<String, Integer>>(options.getHourlyTeamScoreTableName(),
configureWindowedTableWrite()));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7da12429/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
index 0a3dfb3..3275fa0 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
@@ -120,12 +120,10 @@ public class LeaderBoard extends HourlyTeamScore {
Integer getAllowedLateness();
void setAllowedLateness(Integer value);
- @Override
@Description("Prefix used for the BigQuery table names")
@Default.String("leaderboard")
- String getTableName();
- @Override
- void setTableName(String value);
+ String getLeaderBoardTableName();
+ void setLeaderBoardTableName(String value);
}
/**
@@ -202,7 +200,7 @@ public class LeaderBoard extends HourlyTeamScore {
// Write the results to BigQuery.
.apply("WriteTeamScoreSums",
new WriteWindowedToBigQuery<KV<String, Integer>>(
- options.getTableName() + "_team", configureWindowedTableWrite()));
+ options.getLeaderBoardTableName() + "_team", configureWindowedTableWrite()));
gameEvents
.apply(
"CalculateUserScores",
@@ -211,7 +209,7 @@ public class LeaderBoard extends HourlyTeamScore {
.apply(
"WriteUserScoreSums",
new WriteToBigQuery<KV<String, Integer>>(
- options.getTableName() + "_user", configureGlobalWindowBigQueryWrite()));
+ options.getLeaderBoardTableName() + "_user", configureGlobalWindowBigQueryWrite()));
// Run the pipeline and wait for the pipeline to finish; capture cancellation requests from the
// command line.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7da12429/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
index f4dca32..2bca7fc 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
@@ -193,8 +193,8 @@ public class UserScore {
@Description("The BigQuery table name. Should not already exist.")
@Default.String("user_score")
- String getTableName();
- void setTableName(String value);
+ String getUserScoreTableName();
+ void setUserScoreTableName(String value);
}
/**
@@ -232,7 +232,7 @@ public class UserScore {
// Extract and sum username/score pairs from the event data.
.apply("ExtractUserScore", new ExtractAndSumScore("user"))
.apply("WriteUserScoreSums",
- new WriteToBigQuery<KV<String, Integer>>(options.getTableName(),
+ new WriteToBigQuery<KV<String, Integer>>(options.getUserScoreTableName(),
configureBigQueryWrite()));
// Run the batch pipeline.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7da12429/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
index 51ca719..8e12c46 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.beam.examples.complete.game.GameStats.CalculateSpammyUsers;
import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.RunnableOnService;
import org.apache.beam.sdk.testing.TestPipeline;
@@ -72,4 +73,8 @@ public class GameStatsTest implements Serializable {
p.run().waitUntilFinish();
}
+ @Test
+ public void testGameStatsOptions() {
+ PipelineOptionsFactory.as(GameStats.Options.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7da12429/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
index 645f123..cc42d52 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
@@ -24,6 +24,7 @@ import org.apache.beam.examples.complete.game.UserScore.GameActionInfo;
import org.apache.beam.examples.complete.game.UserScore.ParseEventFn;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.StringUtf8Coder;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.RunnableOnService;
import org.apache.beam.sdk.testing.TestPipeline;
@@ -108,4 +109,8 @@ public class HourlyTeamScoreTest implements Serializable {
p.run().waitUntilFinish();
}
+ @Test
+ public void testUserScoreOptions() {
+ PipelineOptionsFactory.as(HourlyTeamScore.Options.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7da12429/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
index 676dedb..2b51da1 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
@@ -27,6 +27,7 @@ import org.apache.beam.examples.complete.game.LeaderBoard.CalculateTeamScores;
import org.apache.beam.examples.complete.game.LeaderBoard.CalculateUserScores;
import org.apache.beam.examples.complete.game.UserScore.GameActionInfo;
import org.apache.beam.sdk.coders.AvroCoder;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.testing.TestStream;
@@ -349,6 +350,11 @@ public class LeaderBoardTest implements Serializable {
p.run().waitUntilFinish();
}
+ @Test
+ public void testLeaderBoardOptions() {
+ PipelineOptionsFactory.as(LeaderBoard.Options.class);
+ }
+
private TimestampedValue<GameActionInfo> event(
TestUser user,
int score,
[2/2] incubator-beam git commit: This closes #1340
Posted by da...@apache.org.
This closes #1340
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f7745dc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f7745dc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f7745dc2
Branch: refs/heads/master
Commit: f7745dc295b0c17e5fbafc263577457a6bb52a17
Parents: 503b407 7da1242
Author: Davor Bonaci <da...@google.com>
Authored: Thu Nov 10 14:16:24 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Thu Nov 10 14:16:24 2016 -0800
----------------------------------------------------------------------
.../org/apache/beam/examples/complete/game/GameStats.java | 8 ++++----
.../beam/examples/complete/game/HourlyTeamScore.java | 8 +++-----
.../apache/beam/examples/complete/game/LeaderBoard.java | 10 ++++------
.../org/apache/beam/examples/complete/game/UserScore.java | 6 +++---
.../apache/beam/examples/complete/game/GameStatsTest.java | 5 +++++
.../beam/examples/complete/game/HourlyTeamScoreTest.java | 5 +++++
.../beam/examples/complete/game/LeaderBoardTest.java | 6 ++++++
7 files changed, 30 insertions(+), 18 deletions(-)
----------------------------------------------------------------------