beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Work logged] (BEAM-4558) org.apache.beam.runners.direct.portable.ReferenceRunnerTest » pipelineExecution failure in 2.5.0 release branch
Date Mon, 03 Sep 2018 18:14:01 GMT

     [ https://issues.apache.org/jira/browse/BEAM-4558?focusedWorklogId=140686&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-140686
]

ASF GitHub Bot logged work on BEAM-4558:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 03/Sep/18 18:13
            Start Date: 03/Sep/18 18:13
    Worklog Time Spent: 10m 
      Work Description: stale[bot] closed pull request #5693: [BEAM-4558] Bigtable: upgrade
to the latest version
URL: https://github.com/apache/beam/pull/5693
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle
index 914d9645155..f5cb471dc2e 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -55,7 +55,8 @@ dependencies {
   shadow library.java.joda_time
   shadow library.java.google_cloud_core
   shadow library.java.google_cloud_spanner
-  shadow library.java.bigtable_protos
+  shadow library.java.proto-google-cloud-bigtable-v2
+  shadow library.java.proto-google-cloud-bigtable-admin-v2
   shadow library.java.bigtable_client_core
   shadow library.java.google_api_client
   shadow library.java.google_http_client
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index f05ae64c412..4d83cfe88ba 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -271,10 +271,13 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.cloud.bigtable</groupId>
-      <artifactId>bigtable-protos</artifactId>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>proto-google-cloud-bigtable-v2</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.google.cloud.bigtable</groupId>
       <artifactId>bigtable-client-core</artifactId>
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java
index b9492b3ab4e..ef68cf96118 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java
@@ -201,13 +201,7 @@ public void flush() throws IOException {
     public void close() throws IOException {
       try {
         if (bulkMutation != null) {
-          try {
-            bulkMutation.flush();
-          } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            // We fail since flush() operation was interrupted.
-            throw new IOException(e);
-          }
+          flush();
           bulkMutation = null;
         }
       } finally {
@@ -220,16 +214,16 @@ public void close() throws IOException {
 
     @Override
     public CompletionStage<MutateRowResponse> writeRecord(
-        KV<ByteString, Iterable<Mutation>> record)
-        throws IOException {
-      MutateRowsRequest.Entry request = MutateRowsRequest.Entry.newBuilder()
-          .setRowKey(record.getKey())
-          .addAllMutations(record.getValue())
-          .build();
+        KV<ByteString, Iterable<Mutation>> record) {
+      MutateRowsRequest.Entry.Builder request = MutateRowsRequest.Entry.newBuilder()
+          .setRowKey(record.getKey());
+      for (Mutation mutation : record.getValue()) {
+        request.addMutations(mutation);
+      }
 
       CompletableFuture<MutateRowResponse> result = new CompletableFuture<>();
       Futures.addCallback(
-          bulkMutation.add(request),
+          bulkMutation.add(request.build()),
           new FutureCallback<MutateRowResponse>() {
             @Override
             public void onSuccess(MutateRowResponse mutateRowResponse) {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Issue Time Tracking
-------------------

    Worklog Id:     (was: 140686)
    Time Spent: 1h 10m  (was: 1h)

> org.apache.beam.runners.direct.portable.ReferenceRunnerTest » pipelineExecution failure
in 2.5.0 release branch
> ---------------------------------------------------------------------------------------------------------------
>
>                 Key: BEAM-4558
>                 URL: https://issues.apache.org/jira/browse/BEAM-4558
>             Project: Beam
>          Issue Type: Bug
>          Components: runner-direct
>            Reporter: Pablo Estrada
>            Assignee: Pablo Estrada
>            Priority: Blocker
>             Fix For: 2.5.0
>
>          Time Spent: 1h 10m
>  Remaining Estimate: 0h
>
> Running in release branch: https://builds.apache.org/job/beam_PreCommit_Java_GradleBuild/6441/consoleFull
> Failure is here: https://scans.gradle.com/s/xwc6k7jffxj3w/tests/jqhvlvf72f7pg-6uohttmt2cl3u



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message