You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/03/30 11:57:37 UTC
[3/5] tajo git commit: TAJO-1437: Resolve findbug warnings on Tajo
JDBC Module.
TAJO-1437: Resolve findbug warnings on Tajo JDBC Module.
Closes #447
Signed-off-by: Jihoon Son <ji...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7f775933
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7f775933
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7f775933
Branch: refs/heads/index_support
Commit: 7f7759331a9ac0e6513c5870ef9127218da1360f
Parents: 5c89130
Author: Dongjoon Hyun <do...@apache.org>
Authored: Sun Mar 29 21:41:06 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Sun Mar 29 21:41:06 2015 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
.../apache/tajo/jdbc/TajoDatabaseMetaData.java | 3 ++-
.../apache/tajo/jdbc/TajoPreparedStatement.java | 4 ++--
.../org/apache/tajo/jdbc/TajoStatement.java | 23 ++++++++++++--------
4 files changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/7f775933/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 3fa205a..3e849b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,9 @@ Release 0.11.0 - unreleased
BUG FIXES
+ TAJO-1437: Resolve findbug warnings on Tajo JDBC Module.
+ (Contributed by Dongjoon Hyun, Committed by jihoon)
+
TAJO-1438: Resolve findbug warnings on Tajo Client Module.
(Contributed by Dongjoon Hyun, Committed by jihoon)
http://git-wip-us.apache.org/repos/asf/tajo/blob/7f775933/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java
index 150e9bf..2368082 100644
--- a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java
+++ b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java
@@ -46,6 +46,7 @@ public class TajoDatabaseMetaData implements DatabaseMetaData {
"abs,acos,asin,atan,atan2,ceiling,cos,degrees,exp,,floor,mod,pi,pow," +
"radians,round,sign,sin,sqrt,tan";
private static final String STRING_FUNCTIONS = "ascii,chr,concat,left,length,ltrim,repeat,rtrim,substring";
+ private static final String PROCEDURE_TERM = "UDF";
private final JdbcConnection conn;
@@ -157,7 +158,7 @@ public class TajoDatabaseMetaData implements DatabaseMetaData {
@Override
public String getProcedureTerm() throws SQLException {
- return new String("UDF");
+ return PROCEDURE_TERM;
}
@Override
http://git-wip-us.apache.org/repos/asf/tajo/blob/7f775933/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java
----------------------------------------------------------------------
diff --git a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java
index fa3df98..229587a 100644
--- a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java
+++ b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java
@@ -86,8 +86,8 @@ public class TajoPreparedStatement implements PreparedStatement {
@Override
public boolean execute() throws SQLException {
- ResultSet rs = executeImmediate(sql);
- return rs != null;
+ resultSet = executeImmediate(sql);
+ return resultSet != null;
}
@Override
http://git-wip-us.apache.org/repos/asf/tajo/blob/7f775933/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
----------------------------------------------------------------------
diff --git a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
index 57cd066..0a0a849 100644
--- a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
+++ b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
@@ -41,11 +41,6 @@ public class TajoStatement implements Statement {
private ResultSet resultSet = null;
/**
- * Add SQLWarnings to the warningChain if needed.
- */
- private SQLWarning warningChain = null;
-
- /**
* Keep state so we can fail certain calls made after close().
*/
private boolean isClosed = false;
@@ -71,9 +66,7 @@ public class TajoStatement implements Statement {
}
@Override
- public void clearWarnings() throws SQLException {
- warningChain = null;
- }
+ public void clearWarnings() throws SQLException {}
@Override
public void close() throws SQLException {
@@ -219,6 +212,8 @@ public class TajoStatement implements Statement {
@Override
public Connection getConnection() throws SQLException {
+ if (isClosed)
+ throw new SQLException("Can't get connection after statement has been closed");
return conn;
}
@@ -229,6 +224,8 @@ public class TajoStatement implements Statement {
@Override
public int getFetchSize() throws SQLException {
+ if (isClosed)
+ throw new SQLException("Can't get fetch size after statement has been closed");
return fetchSize;
}
@@ -264,6 +261,8 @@ public class TajoStatement implements Statement {
@Override
public ResultSet getResultSet() throws SQLException {
+ if (isClosed)
+ throw new SQLException("Can't get result set after statement has been closed");
return resultSet;
}
@@ -284,12 +283,16 @@ public class TajoStatement implements Statement {
@Override
public int getUpdateCount() throws SQLException {
+ if (isClosed)
+ throw new SQLException("Can't get update count after statement has been closed");
return 0;
}
@Override
public SQLWarning getWarnings() throws SQLException {
- return warningChain;
+ if (isClosed)
+ throw new SQLException("Can't get warnings after statement has been closed");
+ return null;
}
@Override
@@ -325,6 +328,8 @@ public class TajoStatement implements Statement {
@Override
public void setFetchSize(int rows) throws SQLException {
+ if (isClosed)
+ throw new SQLException("Can't set fetch size after statement has been closed");
fetchSize = rows;
}