You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by mx...@apache.org on 2016/03/23 19:35:10 UTC
[05/10] incubator-beam git commit: Update AutoComplete.java
Update AutoComplete.java
Allow for the Datastore dependency of this test to be in a different project than the main project for the job.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/834d0710
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/834d0710
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/834d0710
Branch: refs/heads/master
Commit: 834d071060cb916bedc0859baa256791ab22b7d4
Parents: 158f9f8
Author: sammcveety <sa...@gmail.com>
Authored: Tue Mar 22 11:58:19 2016 -0700
Committer: Maximilian Michels <mx...@apache.org>
Committed: Wed Mar 23 19:27:51 2016 +0100
----------------------------------------------------------------------
.../cloud/dataflow/examples/complete/AutoComplete.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/834d0710/examples/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java b/examples/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java
index 1bccc4a..f897338 100644
--- a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java
+++ b/examples/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java
@@ -57,6 +57,7 @@ import com.google.cloud.dataflow.sdk.values.KV;
import com.google.cloud.dataflow.sdk.values.PBegin;
import com.google.cloud.dataflow.sdk.values.PCollection;
import com.google.cloud.dataflow.sdk.values.PCollectionList;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import org.joda.time.Duration;
@@ -432,10 +433,14 @@ public class AutoComplete {
Boolean getOutputToBigQuery();
void setOutputToBigQuery(Boolean value);
- @Description("Whether output to Datastoree")
+ @Description("Whether output to Datastore")
@Default.Boolean(false)
Boolean getOutputToDatastore();
void setOutputToDatastore(Boolean value);
+
+ @Description("Datastore output dataset ID, defaults to project ID")
+ String getOutputDataset();
+ void setOutputDataset(String value);
}
public static void main(String[] args) throws IOException {
@@ -477,7 +482,8 @@ public class AutoComplete {
if (options.getOutputToDatastore()) {
toWrite
.apply(ParDo.named("FormatForDatastore").of(new FormatForDatastore(options.getKind())))
- .apply(DatastoreIO.writeTo(options.getProject()));
+ .apply(DatastoreIO.writeTo(MoreObjects.firstNonNull(
+ options.getOutputDataset(), options.getProject())));
}
if (options.getOutputToBigQuery()) {
dataflowUtils.setupBigQueryTable();