You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2017/01/11 21:07:49 UTC
[1/3] hive git commit: HIVE-15551 : memory leak in directsql for
mysql+bonecp specific initialization (Xiaomin Zhang,
reviewed by Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/branch-1 e39db2aa8 -> 1f2be2663
refs/heads/branch-2.0 6f60710a1 -> 7d8accfe5
refs/heads/branch-2.1 dc3d99359 -> 9b76ac932
HIVE-15551 : memory leak in directsql for mysql+bonecp specific initialization (Xiaomin Zhang, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9b76ac93
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9b76ac93
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9b76ac93
Branch: refs/heads/branch-2.1
Commit: 9b76ac932eea36f5bfe8e4d375e73270654dde4b
Parents: dc3d993
Author: Sergey Shelukhin <se...@apache.org>
Authored: Wed Jan 11 13:05:59 2017 -0800
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Wed Jan 11 13:07:06 2017 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/9b76ac93/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
index a3dc928..05fc617 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
@@ -22,6 +22,7 @@ import static org.apache.commons.lang.StringUtils.join;
import static org.apache.commons.lang.StringUtils.repeat;
import java.sql.Connection;
+import java.sql.Statement;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.ArrayList;
@@ -260,12 +261,17 @@ class MetaStoreDirectSql {
private void executeNoResult(final String queryText) throws SQLException {
JDOConnection jdoConn = pm.getDataStoreConnection();
+ Statement statement = null;
boolean doTrace = LOG.isDebugEnabled();
try {
long start = doTrace ? System.nanoTime() : 0;
- ((Connection)jdoConn.getNativeConnection()).createStatement().execute(queryText);
+ statement = ((Connection)jdoConn.getNativeConnection()).createStatement();
+ statement.execute(queryText);
timingTrace(doTrace, queryText, start, doTrace ? System.nanoTime() : 0);
} finally {
+ if(statement != null){
+ statement.close();
+ }
jdoConn.close(); // We must release the connection before we call other pm methods.
}
}
[3/3] hive git commit: HIVE-15551 : memory leak in directsql for
mysql+bonecp specific initialization (Xiaomin Zhang,
reviewed by Sergey Shelukhin)
Posted by se...@apache.org.
HIVE-15551 : memory leak in directsql for mysql+bonecp specific initialization (Xiaomin Zhang, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1f2be266
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1f2be266
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1f2be266
Branch: refs/heads/branch-1
Commit: 1f2be26632eacebfbaa39334b3db432249846014
Parents: e39db2a
Author: Sergey Shelukhin <se...@apache.org>
Authored: Wed Jan 11 13:05:59 2017 -0800
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Wed Jan 11 13:07:25 2017 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/1f2be266/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
index 6b69d55..220893d 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
@@ -22,6 +22,7 @@ import static org.apache.commons.lang.StringUtils.join;
import static org.apache.commons.lang.StringUtils.repeat;
import java.sql.Connection;
+import java.sql.Statement;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.ArrayList;
@@ -240,12 +241,17 @@ class MetaStoreDirectSql {
private void executeNoResult(final String queryText) throws SQLException {
JDOConnection jdoConn = pm.getDataStoreConnection();
+ Statement statement = null;
boolean doTrace = LOG.isDebugEnabled();
try {
long start = doTrace ? System.nanoTime() : 0;
- ((Connection)jdoConn.getNativeConnection()).createStatement().execute(queryText);
+ statement = ((Connection)jdoConn.getNativeConnection()).createStatement();
+ statement.execute(queryText);
timingTrace(doTrace, queryText, start, doTrace ? System.nanoTime() : 0);
} finally {
+ if(statement != null){
+ statement.close();
+ }
jdoConn.close(); // We must release the connection before we call other pm methods.
}
}
[2/3] hive git commit: HIVE-15551 : memory leak in directsql for
mysql+bonecp specific initialization (Xiaomin Zhang,
reviewed by Sergey Shelukhin)
Posted by se...@apache.org.
HIVE-15551 : memory leak in directsql for mysql+bonecp specific initialization (Xiaomin Zhang, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7d8accfe
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7d8accfe
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7d8accfe
Branch: refs/heads/branch-2.0
Commit: 7d8accfe5047e4a464997a83a8e01396ba362647
Parents: 6f60710
Author: Sergey Shelukhin <se...@apache.org>
Authored: Wed Jan 11 13:05:59 2017 -0800
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Wed Jan 11 13:07:16 2017 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/7d8accfe/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
index 186115c..486c0fa 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
@@ -22,6 +22,7 @@ import static org.apache.commons.lang.StringUtils.join;
import static org.apache.commons.lang.StringUtils.repeat;
import java.sql.Connection;
+import java.sql.Statement;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.ArrayList;
@@ -257,12 +258,17 @@ class MetaStoreDirectSql {
private void executeNoResult(final String queryText) throws SQLException {
JDOConnection jdoConn = pm.getDataStoreConnection();
+ Statement statement = null;
boolean doTrace = LOG.isDebugEnabled();
try {
long start = doTrace ? System.nanoTime() : 0;
- ((Connection)jdoConn.getNativeConnection()).createStatement().execute(queryText);
+ statement = ((Connection)jdoConn.getNativeConnection()).createStatement();
+ statement.execute(queryText);
timingTrace(doTrace, queryText, start, doTrace ? System.nanoTime() : 0);
} finally {
+ if(statement != null){
+ statement.close();
+ }
jdoConn.close(); // We must release the connection before we call other pm methods.
}
}