[beam] branch master updated: [BEAM-7239] Do not close DataSource on Teardown on JdbcIO

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new c03bbec  [BEAM-7239] Do not close DataSource on Teardown on JdbcIO
     new 5c7ee60  Merge pull request #8565 from iemejia/beam-master
c03bbec is described below

commit c03bbecaa1e2fe1094e28d8f5baa890c4ca51e73
Author: Ismaël Mejía <ie...@gmail.com>
AuthorDate: Mon May 13 17:13:46 2019 +0200

    [BEAM-7239] Do not close DataSource on Teardown on JdbcIO
    
    DataSource implementations do not necessarily implement close() and even
    if so, it may make sense not to close them systematically on @Teardown
    because they could be provided for a longer lifecycle than the DoFn
    thread, e.g. PoolableDataSource.
---
 .../jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java
index 7a5cdc3..3ba547b 100644
--- a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java
+++ b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java
@@ -769,9 +769,6 @@ public class JdbcIO {
     @Teardown
     public void teardown() throws Exception {
       connection.close();
-      if (dataSource instanceof AutoCloseable) {
-        ((AutoCloseable) dataSource).close();
-      }
     }
   }
 
@@ -1075,13 +1072,6 @@ public class JdbcIO {
         }
         records.clear();
       }
-
-      @Teardown
-      public void teardown() throws Exception {
-        if (dataSource instanceof AutoCloseable) {
-          ((AutoCloseable) dataSource).close();
-        }
-      }
     }
   }