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/11/13 21:59:06 UTC
[1/2] incubator-trafodion git commit: TRAFODION-2790 jdbc does not
implement abort related api
Repository: incubator-trafodion
Updated Branches:
refs/heads/master c1a61cee9 -> 5d7f41f0e
TRAFODION-2790 jdbc does not implement abort related api
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e861dea3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e861dea3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e861dea3
Branch: refs/heads/master
Commit: e861dea327c7ee2473d118803cb05b2c47c609f0
Parents: 371cb71
Author: gpj1987 <gp...@gmail.com>
Authored: Tue Oct 31 19:14:32 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
Committed: Tue Oct 31 19:14:32 2017 +0800
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 5 +-
.../java/org/trafodion/jdbc_test/TestAbort.java | 60 ++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e861dea3/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
index 2a8e381..057bd7b 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
@@ -1965,7 +1965,10 @@ public class TrafT4Connection extends PreparedStatementManager implements java.s
}
public void abort(Executor executor) throws SQLException {
- // TODO Auto-generated method stub
+ if (ic_.getT4Connection().getInputOutput() != null) {
+ ic_.getT4Connection().getInputOutput().CloseIO(null);
+ }
+ ic_.setIsClosed(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e861dea3/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestAbort.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestAbort.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestAbort.java
new file mode 100644
index 0000000..67124f4
--- /dev/null
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestAbort.java
@@ -0,0 +1,60 @@
+/*
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.junit.Test;
+
+public class TestAbort {
+ @Test(expected = SQLException.class)
+ public void testAbort() throws SQLException {
+ Connection conn = null;
+ try {
+ System.out.println("Connecting to database...");
+ conn = Utils.getUserConnection();
+
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ ExecutorService es = Executors.newSingleThreadExecutor();
+ es.shutdown();
+ conn.abort(es);
+ conn.getAutoCommit();
+ }
+}
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2790] PR 1286
Implement abort API in JDBC T4
Posted by db...@apache.org.
Merge [TRAFODION-2790] PR 1286 Implement abort API in JDBC T4
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5d7f41f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5d7f41f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5d7f41f0
Branch: refs/heads/master
Commit: 5d7f41f0ebf10bc2b73561e845e2ac600af640d5
Parents: c1a61ce e861dea
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Nov 13 21:58:23 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Nov 13 21:58:23 2017 +0000
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 5 +-
.../java/org/trafodion/jdbc_test/TestAbort.java | 60 ++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5d7f41f0/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
----------------------------------------------------------------------