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 2016/05/24 16:34:52 UTC
[8/9] incubator-trafodion git commit: Along with jdbcT4 rename changes
Along with jdbcT4 rename changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/283190e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/283190e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/283190e1
Branch: refs/heads/master
Commit: 283190e1c0f404a29de36b8fd04fea2080b5ed7f
Parents: f8f1f48
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Fri May 20 11:01:29 2016 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Fri May 20 11:01:29 2016 +0800
----------------------------------------------------------------------
.../java/org/trafodion/dcs/util/JdbcT4Util.java | 24 +++++---------------
1 file changed, 6 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/283190e1/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
index dd28c2c..dfd2895 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
@@ -22,42 +22,30 @@
**********************************************************************/
package org.trafodion.dcs.util;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.*;
-import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.math.BigDecimal;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.HelpFormatter;
-import org.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
+import org.apache.commons.cli.Options;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.trafodion.dcs.util.DcsConfiguration;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONObject;
import org.trafodion.dcs.Constants;
import org.trafodion.jdbc.t4.TrafT4Connection;
+import org.trafodion.jdbc.t4.TrafT4DataSource;
import org.trafodion.jdbc.t4.TrafT4PreparedStatement;
-import org.trafodion.jdbc.t4.HPT4DataSource;
public final class JdbcT4Util
{
private static final Log LOG = LogFactory.getLog(JdbcT4Util.class);
private Configuration conf;
private DcsNetworkConfiguration netConf;
- private HPT4DataSource cpds = null;
+ private TrafT4DataSource cpds = null;
static {
try {
@@ -72,7 +60,7 @@ public final class JdbcT4Util
public void init(Configuration conf,DcsNetworkConfiguration netConf) throws SQLException {
this.conf = conf;
this.netConf = netConf;
- cpds = new HPT4DataSource();
+ cpds = new TrafT4DataSource();
String url = Constants.T4_DRIVER_URL + "//" + netConf.getHostName() + ":" + conf.getInt(Constants.DCS_MASTER_PORT,Constants.DEFAULT_DCS_MASTER_PORT) + "/:";
cpds.setURL(url);
cpds.setMinPoolSize(conf.getInt(Constants.T4_DRIVER_MIN_POOL_SIZE,Constants.DEFAULT_T4_DRIVER_MIN_POOL_SIZE));