You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/12/20 21:58:53 UTC

[1/3] incubator-trafodion git commit: TRAFODION-2846 optimize for batchException message display

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master f5e623170 -> 330448e3a


TRAFODION-2846 optimize for batchException message display


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3fb277ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3fb277ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3fb277ef

Branch: refs/heads/master
Commit: 3fb277efbfccaf4f0b8439fe7b532baf98611085
Parents: 4639458
Author: aven <sh...@esgyn.cn>
Authored: Fri Dec 15 13:29:35 2017 +0800
Committer: aven <sh...@esgyn.cn>
Committed: Fri Dec 15 13:29:35 2017 +0800

----------------------------------------------------------------------
 core/conn/jdbcT4/src/main/java/T4Messages.properties               | 2 +-
 .../main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java   | 2 +-
 .../src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3fb277ef/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties
index 3d0a43c..ef85d50 100644
--- a/core/conn/jdbcT4/src/main/java/T4Messages.properties
+++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties
@@ -212,7 +212,7 @@ numeric_out_of_range_msg=Numeric value out of range, Numeric is {0}
 numeric_out_of_range_sqlstate=22003
 numeric_out_of_range_sqlcode=29046
 
-batch_command_failed_msg=Batch Update Failed, See next exception for details
+batch_command_failed_msg=Batch Update Failed, reason is {0} , See next exception for details
 batch_command_failed_sqlstate=HY000
 batch_command_failed_sqlcode=29047
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3fb277ef/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
index c07e204..ee1268d 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
@@ -313,7 +313,7 @@ public class TrafT4PreparedStatement extends TrafT4Statement implements java.sql
 			} catch (SQLException e) {
 				BatchUpdateException be;
 				se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
-						"batch_command_failed", null);
+						"batch_command_failed", e.getMessage());
 				if (batchRowCount_ == null) // we failed before execute
 				{
 					batchRowCount_ = new int[paramRowCount_];

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3fb277ef/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
index da6e843..e5e4962 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
@@ -416,7 +416,7 @@ public class TrafT4Statement extends TrafT4Handle implements java.sql.Statement
 				BatchUpdateException be;
 
 				se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
-						"batch_command_failed", null);
+						"batch_command_failed", e.getMessage());
 				be = new BatchUpdateException(se.getMessage(), se.getSQLState(), batchRowCount_);
 				be.setNextException(e);
 


[3/3] incubator-trafodion git commit: Merge [TRAFODION-2846] PR 1347 Optimize for batchException msg display

Posted by db...@apache.org.
Merge [TRAFODION-2846] PR 1347 Optimize for batchException msg display


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/330448e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/330448e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/330448e3

Branch: refs/heads/master
Commit: 330448e3a97b63aa5db9ddb2156cabe41442ad3a
Parents: f5e6231 6db7a95
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Dec 20 21:58:16 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Dec 20 21:58:16 2017 +0000

----------------------------------------------------------------------
 core/conn/jdbcT4/src/main/java/T4Messages.properties               | 2 +-
 .../main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java   | 2 +-
 .../src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[2/3] incubator-trafodion git commit: optimize the description message

Posted by db...@apache.org.
optimize the description message


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6db7a95c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6db7a95c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6db7a95c

Branch: refs/heads/master
Commit: 6db7a95c5a3f050fc60c04aef5bfda5b22980e7c
Parents: 3fb277e
Author: aven <sh...@esgyn.cn>
Authored: Fri Dec 15 16:37:46 2017 +0800
Committer: aven <sh...@esgyn.cn>
Committed: Fri Dec 15 16:37:46 2017 +0800

----------------------------------------------------------------------
 core/conn/jdbcT4/src/main/java/T4Messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6db7a95c/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties
index ef85d50..3b2e661 100644
--- a/core/conn/jdbcT4/src/main/java/T4Messages.properties
+++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties
@@ -212,7 +212,7 @@ numeric_out_of_range_msg=Numeric value out of range, Numeric is {0}
 numeric_out_of_range_sqlstate=22003
 numeric_out_of_range_sqlcode=29046
 
-batch_command_failed_msg=Batch Update Failed, reason is {0} , See next exception for details
+batch_command_failed_msg=Batch Update Failed, you can use getNextException() for more details, first getNextException() message is {0} 
 batch_command_failed_sqlstate=HY000
 batch_command_failed_sqlcode=29047