Repository: incubator-gobblin Updated Branches: refs/heads/master 7ab7f8b09 -> b9a774a82
[GOBBLIN-551] Fixed re-using data connection in executeSql and execute⦠Closes #2412 from mvachhani/master Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/b9a774a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/b9a774a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/b9a774a8 Branch: refs/heads/master Commit: b9a774a827ab9b929c7d9e66516ae06cee4022f3 Parents: 7ab7f8b Author: Monish Vachhani <[email protected]> Authored: Thu Aug 2 13:11:03 2018 -0700 Committer: Hung Tran <[email protected]> Committed: Thu Aug 2 13:11:37 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/gobblin/source/jdbc/JdbcExtractor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/b9a774a8/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java ---------------------------------------------------------------------- diff --git a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java index 07d33a5..f6eb79e 100644 --- a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java +++ b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java @@ -655,7 +655,9 @@ public abstract class JdbcExtractor extends QueryBasedExtractor<JsonArray, JsonE ResultSet resultSet = null; try { this.jdbcSource = createJdbcSource(); - this.dataConnection = this.jdbcSource.getConnection(); + if (this.dataConnection == null) { + this.dataConnection = this.jdbcSource.getConnection(); + } Statement statement = this.dataConnection.createStatement(); if (fetchSize != 0 && this.getExpectedRecordCount() > 2000) { @@ -712,7 +714,9 @@ public abstract class JdbcExtractor extends QueryBasedExtractor<JsonArray, JsonE ResultSet resultSet = null; try { this.jdbcSource = createJdbcSource(); - this.dataConnection = this.jdbcSource.getConnection(); + if (this.dataConnection == null) { + this.dataConnection = this.jdbcSource.getConnection(); + } PreparedStatement statement = this.dataConnection.prepareStatement(query, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
