8000 Test Pull Request by beam-testing · Pull Request #1 · beam-testing/DataflowJavaSDK · GitHub
[go: up one dir, main page]
Skip to content

Test Pull Request #1

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.

Sign up for GitHub

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

Open
beam-testing wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test Pull Request #1

Show file tree
Hide file tree
Changes 8000 from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3ffde3
Fix a BigQuery output issue in DirectPipelineRunner
peihe Oct 13, 2015
eac7a85
Version management
davorbonaci Oct 5, 2015
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
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.2.1-SNAPSHOT</version>
</parent>

<groupId>com.google.cloud.dataflow</groupId>
Expand Down
2 changes: 1 addition & 1 deletion maven-archetypes/examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.2.1-SNAPSHOT</versio 10BC0 n>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion maven-archetypes/starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<url>http://cloud.google.com/dataflow</url>
<inceptionYear>2013</inceptionYear>

<version>1.1.1-SNAPSHOT</version>
<version>1.2.1-SNAPSHOT</version>

<licenses>
<license>
Expand Down
2 changes: 1 addition & 1 deletion sdk/pom.xml
View file
Open in desktop
6880
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.2.1-SNAPSHOT</version>
</parent>

<groupId>com.google.cloud.dataflow</groupId>
Expand Down
9 changes: 6 additions & 3 deletions sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BigQueryIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,16 +1353,19 @@ private static void evaluateWriteHelper(
if (ref.getProjectId() == null) {
ref.setProjectId(options.getProject());
}
LOG.info("Writing to BigQuery table {}", toTableSpec(ref));
inserter.getOrCreateTable(
ref, transform.writeDisposition, transform.createDisposition, transform.schema);

List<TableRow> rows = getOrCreateMapListValue(tableRows, ref);
rows.add(windowedValue.getValue());
}
}

for (TableReference ref : tableRows.keySet()) {
LOG.info("Writing to BigQuery table {}", toTableSpec(ref));
// {@link BigQueryTableInserter#getOrCreateTable} validates {@link CreateDisposition}
// and {@link WriteDisposition}.
// For each {@link TableReference}, it can only be called before rows are written.
inserter.getOrCreateTable(
ref, transform.writeDisposition, transform.createDisposition, transform.schema);
inserter.insertAll(ref, tableRows.get(ref));
}
} catch (IOException e) {
Expand Down
0