Repository: incubator-trafodion Updated Branches: refs/heads/master 89433fbab -> c1a61cee9
TRAFODION-2789 jdbc does not implement NetworkTimeout 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/27d394c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/27d394c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/27d394c3 Branch: refs/heads/master Commit: 27d394c37b26fc04641d23a47233e80617ba7aa1 Parents: 371cb71 Author: gpj1987 <[email protected]> Authored: Tue Oct 31 19:05:41 2017 +0800 Committer: gpj1987 <[email protected]> Committed: Tue Oct 31 19:05:41 2017 +0800 ---------------------------------------------------------------------- .../org/trafodion/jdbc/t4/TrafT4Connection.java | 9 +-- .../trafodion/jdbc_test/TestNetworkTimeout.java | 74 ++++++++++++++++++++ 2 files changed, 79 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/27d394c3/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..03466db 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 @@ -1971,13 +1971,14 @@ public class TrafT4Connection extends PreparedStatementManager implements java.s public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { - // TODO Auto-generated method stub - + validateConnection(); + props_.setNetworkTimeout(milliseconds); } + public int getNetworkTimeout() throws SQLException { - // TODO Auto-generated method stub - return 0; + validateConnection(); + return props_.getNetworkTimeout(); } /* http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/27d394c3/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java ---------------------------------------------------------------------- diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java new file mode 100644 index 0000000..14f9f44 --- /dev/null +++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java @@ -0,0 +1,74 @@ +/* +/* @@@ 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 static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import org.junit.Test; + +public class TestNetworkTimeout { + @Test + public void testSetAndGetNetworkTimeout() { + Connection conn = null; + try { + System.out.println("Connecting to database..."); + conn = Utils.getUserConnection(); + ExecutorService es = Executors.newSingleThreadExecutor(); + conn.setNetworkTimeout(es, 100); + es.shutdown(); + int result = conn.getNetworkTimeout(); + assertTrue("this is networkTimeout", result == 100); + } catch (SQLException e) { + e.printStackTrace(); + } + } + @Test + public void testGetNetworkTimeout() { + Connection conn = null; + try { + System.out.println("Connecting to database..."); + conn = Utils.getUserConnection(); + int result = conn.getNetworkTimeout(); + assertTrue("this is networkTimeout", result == 0); + } catch (SQLException e) { + e.printStackTrace(); + } + } +}
