Repository: incubator-trafodion Updated Branches: refs/heads/master be7b89dc3 -> 318f48725
TRAFODION-2824 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1132ccdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1132ccdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1132ccdd Branch: refs/heads/master Commit: 1132ccdd13acc25182ceea279bc3ffdbc5bcfafe Parents: 4b86c64 Author: gpj1987 <gpj1...@gmail.com> Authored: Thu Nov 30 19:59:48 2017 +0800 Committer: gpj1987 <gpj1...@gmail.com> Committed: Thu Nov 30 19:59:48 2017 +0800 ---------------------------------------------------------------------- .../trafodion/jdbc/t2/SQLMXDataSource.java | 2 +- .../org/apache/trafodion/jdbc/t2/SQLMXDesc.java | 2 +- .../jdbc/t2/SQLMXPreparedStatement.java | 70 ++++++++++---------- core/conn/trafci/utils/trafci.sh-tmpl | 2 +- core/sql/langman/LmSQLMXDriver.java | 10 +-- .../java/org/trafodion/sql/udr/LmT2Driver.java | 4 +- .../java/org/trafodion/sql/udr/LmUtility.java | 26 ++++---- .../trafodion/dcs/servermt/ServerConstants.java | 2 +- .../trafodion/dcs/IntegrationTestEndurance.java | 4 +- dcs/src/test/pytests/README.rst | 4 +- .../src/asciidoc/_chapters/launch.adoc | 2 +- .../src/resources/source/blob_example.java | 12 ++-- .../src/resources/source/clob_example.java | 12 ++-- .../src/asciidoc/_chapters/binder_msgs.adoc | 4 +- .../src/asciidoc/_chapters/execute_spjs.adoc | 2 +- .../src/asciidoc/_chapters/get_started.adoc | 2 +- win-odbc64/odbcclient/drvr35/cconnect.cpp | 2 +- 17 files changed, 81 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDataSource.java ---------------------------------------------------------------------- diff --git a/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDataSource.java b/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDataSource.java index bbca284..0579079 100644 --- a/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDataSource.java +++ b/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDataSource.java @@ -71,7 +71,7 @@ import java.io.FileOutputStream; * <code>DataSource</code> API does not automatically register itself with the * <code>DriverManager</code> object. * - * @version HP JDBC/MX + * @version Trafodion JDBC/MX */ public class SQLMXDataSource extends T2Properties implements http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDesc.java ---------------------------------------------------------------------- diff --git a/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDesc.java b/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDesc.java index 8d6fc70..252c790 100644 --- a/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDesc.java +++ b/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDesc.java @@ -368,7 +368,7 @@ class SQLMXDesc } } - // The enum SQLTYPE_CODE from sqlcli.h. HP extenstion are negative values. + // The enum SQLTYPE_CODE from sqlcli.h. Trafodion extenstion are negative values. public static final int SQLTYPECODE_CHAR = 1; public static final int SQLTYPECODE_NUMERIC = 2; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXPreparedStatement.java ---------------------------------------------------------------------- diff --git a/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXPreparedStatement.java b/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXPreparedStatement.java index 6d83ae8..352bfe1 100644 --- a/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXPreparedStatement.java +++ b/core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXPreparedStatement.java @@ -68,7 +68,7 @@ import java.util.Locale; * so on) for setting IN parameter must specify types that are compatible with * the defined SQL type of the input parameter. For instance, if the IN * parameter has SQL type <tt>INTEGER</tt>, then the method <tt>setInt</tt> - * should be used. The HP JDBC does not follow this specification and will allow + * should be used. The Trafodion JDBC does not follow this specification and will allow * writing to all most all SQL column types. The only exceptions would be the * <tt>TIME</tt>, <tt>TIMESTAMP</tt>, <tt>DATE</tt>, <tt>CLOB</tt>, and * <tt>BLOB</tt>. <B>If these extensions are use the Java code may not run on @@ -99,7 +99,7 @@ import java.util.Locale; * Inventory p WHERE (p.cost / ? = ?) AND(p.partId = ?)"); * pstmt.setLong(1, 2); * pstmt.setLong(2,1000000); - * pstmt.setString(3, "HP Printer"); + * pstmt.setString(3, "Trafodion Printer"); * </ul> * </tt></pre> * <p> @@ -171,7 +171,7 @@ import java.util.Locale; * * @see ResultSet * @see org.apache.trafodion.jdbc.t2.SQLMXConnection#prepareStatement - * @version HP JDBC/MX + * @version Trafodion JDBC/MX * */ @@ -631,7 +631,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements public boolean execute(String sql) throws SQLException { System.out - .println("HP recommends that the JDBC Type 2 driver not be used in this context."); + .println("Trafodion recommends that the JDBC Type 2 driver not be used in this context."); System.out .println("The query ' " + sql @@ -1142,7 +1142,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements public int executeUpdate(String sql) throws SQLException { System.out - .println("HP recommends that the JDBC Type 2 driver not be used in this context."); + .println("Trafodion recommends that the JDBC Type 2 driver not be used in this context."); System.out .println("The query ' " + sql @@ -1181,7 +1181,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * driver converts this to an SQL <tt>ARRAY</tt> value when it sends it to * the database. * <p> - * <B>Note:</B>This method is <em><B>unsupported</B></em> by the HP JDBC + * <B>Note:</B>This method is <em><B>unsupported</B></em> by the Trafodion JDBC * driver. If this method is called a <i>Unsupported feature - * {setArray())</i> SQLException will be thrown. * </p> @@ -1313,7 +1313,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * value. The driver converts this to a SQL <tt>NUMERIC</tt> value when it * sends it to the database. * <p> - * <B>Note:</B> An <em>extended</em> feature of the HP JDBC driver will + * <B>Note:</B> An <em>extended</em> feature of the Trafodion JDBC driver will * allow the setBigDecimal to write data to any compatible SQL column type. * The given <tt>java.math.BigDecimal</tt> value is converted to the correct * SQL column type, before the data is written to the database. If the @@ -1648,7 +1648,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * </p> * <p> * The stream can be used to write <tt>BLOB</tt>, <tt>CHAR</tt>, - * <tt>VARCHAR</tt>, or <tt>LONGVARCHAR</tt> SQL column types. The HP JDBC + * <tt>VARCHAR</tt>, or <tt>LONGVARCHAR</tt> SQL column types. The Trafodion JDBC * driver does not support <tt>BINARY</tt>, <tt>VARBINARY</tt>, or * <tt>LONGVARBINARY</tt> SQL column types, at this time. * </p> @@ -1792,9 +1792,9 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * The driver converts this to a SQL <tt>BIT</tt> value when it sends it to * the database. * <P> - * <B>Note:</B> The HP JDBC driver does not support a SQL column type of + * <B>Note:</B> The Trafodion JDBC driver does not support a SQL column type of * <tt>BIT</tt> and can not convert the <tt>boolean</tt> value to a SQL - * <tt>BIT</tt> value. The HP JDBC driver does allow the use of the + * <tt>BIT</tt> value. The Trafodion JDBC driver does allow the use of the * setBoolean method to write to the following SQL column types: * * <ul PLAIN> <tt>TINYINT</tt> </ul> <ul PLAIN> <tt>SMALLINT</tt> </ul> <ul @@ -1923,8 +1923,8 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * <tt>LONGVARBINARY</tt> (depending on the argument's size relative to the * driver's limits on <tt>VARBINARY</tt>) when it sends it to the database. * <P> - * <B>Note:</B> The HP SQL/MX database <em><B>does not</B></em> support - * <tt>VARBINARY</tt> or <tt>LONVARBINARY</tt> at this time. An HP + * <B>Note:</B> The Trafodion SQL/MX database <em><B>does not</B></em> support + * <tt>VARBINARY</tt> or <tt>LONVARBINARY</tt> at this time. An Trafodion * extension, allows the use of the SQL column types <tt>VARCHAR</tt>, * <tt>LONGVARCHAR</tt>, and <tt>BLOB</tt>. * </p> @@ -2155,7 +2155,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * <tt>TIMESTAMP</tt> value when it sends it to the database. * * <p> - * <B>Note:</B> An extension to the HP JDBC driver is that the Date + * <B>Note:</B> An extension to the Trafodion JDBC driver is that the Date * parameter can be used to write to the following additional SQL column * types: * @@ -2217,7 +2217,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * sends it to the database. * *<p> - * <B>Note:</B> The cal parameter is used, by the HP JDBC driver from now. + * <B>Note:</B> The cal parameter is used, by the Trafodion JDBC driver from now. *</p> * * @param parameterIndex @@ -2301,7 +2301,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * to the database. * * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setFloat to write data to any compatible SQL column type. The float input * parameter is converted to the correct SQL column type before the data is * written to the database. If the conversion can not be performed, then the @@ -2310,7 +2310,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * too big or too small, the number is converted to + or - infinity. This * action conforms to the way that the IEEE floating point number * specification in the handling of overflow and underflow, and has changed - * from previous HP JDBC driver releases. + * from previous Trafodion JDBC driver releases. * </p> * <p> * The compatible SQL column types are: @@ -2372,7 +2372,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements paramContainer_.setFloat(parameterIndex, dataWrapper.getFloat( 1, connection_.locale_)); break; - default: // This is an HP extension JDBC 3.0 API does not allow data + default: // This is an Trafodion extension JDBC 3.0 API does not allow data // type conversion setObject(parameterIndex, dataWrapper, dataType); } @@ -2389,7 +2389,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * database. * * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setFloat to write data to any compatible SQL column type. The float input * parameter is converted to the correct SQL column type before the data is * written to the database. If the conversion can not be performed, then the @@ -2398,7 +2398,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * too big or too small, the number is converted to + or - infinity. This * action conforms to the way that the IEEE floating point number * specification in the handling of overflow and underflow, and has changed - * from previous HP JDBC driver releases. + * from previous Trafodion JDBC driver releases. * </p> * * <p> @@ -2460,7 +2460,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements case Types.TIMESTAMP: throw Messages.createSQLException(connection_.locale_, "invalid_datatype_for_column", null); - default: // This is an HP extension JDBC 3.0 API does not allow data + default: // This is an Trafodion extension JDBC 3.0 API does not allow data // type conversion setObject(parameterIndex, dataWrapper, dataType); } @@ -2513,7 +2513,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * the database. * * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setInt to write data to any compatible SQL column type. The int input * parameter is converted to the correct SQL column type before the data is * written to the database. If the conversion can not be performed, then the @@ -2656,7 +2656,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * the database. * * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setLong to write data to any compatible SQL column type. The long input * parameter is converted to the correct SQL column type before the data is * written to the database. If the conversion can not be performed, then the @@ -2772,7 +2772,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements /** * Sets the designated parameter to SQL <tt>NULL</tt>. * <p> - * <B>Note:</B> You must specify the parameters SQL type (although HP SQL/MX + * <B>Note:</B> You must specify the parameters SQL type (although Trafodion SQL/MX * database does not use the sqlType and it is ignored) * </p> * @@ -2808,7 +2808,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements /** * Sets the designated parameter to SQL <tt>NULL</tt>. * <P> - * <B>Note:</B> You must specify the parameters SQL type (although HP SQL/MX + * <B>Note:</B> You must specify the parameters SQL type (although Trafodion SQL/MX * database does not use the sqlType and it is ignored) * </p> * @@ -2863,7 +2863,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * named above. * </p> * <p> - * <B>Note:</B> The HP JDBC driver does not support the following and will + * <B>Note:</B> The Trafodion JDBC driver does not support the following and will * throw an exception if called with a object of one of these interfaces: * <ul PLAIN> <tt>Array</tt> </ul> <ul PLAIN> <tt>Ref</tt> </ul> <ul PLAIN> * <tt>Struct</tt> </ul> <ul PLAIN> <tt>SQLData</tt> </ul> @@ -3983,7 +3983,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * <tt><structured-type></tt> value. The driver converts this to an SQL * <tt>REF</tt> value when it sends it to the database. * <p> - * <B>Note:</B>This method is <em><B>unsupported</B></em> my the HP JDBC + * <B>Note:</B>This method is <em><B>unsupported</B></em> my the Trafodion JDBC * driver. If this method is called a <i>Unsupported feature - * {setArray())</i> SQLException will be thrown. * </p> @@ -4016,7 +4016,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * driver converts this to a SQL <tt>SMALLINT</tt> value when it sends it to * the database. * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setShort to write data to any compatible SQL column type. The * <tt>short</tt> input parameter is converted to the correct SQL column * type before the data is written to the database. If the conversion can @@ -4105,7 +4105,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * value (depending on the arguments size relative to the driver's limits on * <tt>VARCHAR</tt> values) when it sends it to the database. * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setString to write data to any compatible SQL column type. The * <tt>String</tt> input parameter is converted to the correct SQL column * type before the data is written to the database. If the conversion can @@ -4249,7 +4249,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * The driver converts this to a SQL <tt>TIME</tt> value when it sends it to * the database. * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setTime to write data to any compatible SQL column type. The * <tt>Time</tt> input parameter is converted to the correct SQL column type * before the data is written to the database. If the conversion can not be @@ -4319,8 +4319,8 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * the default timezone, which is that of the virtual machine running the * application. * <p> - * <B>Note:</B> The HP JDBC driver uses the <tt>Calendar</tt> parameter. An - * extended feature of the HP JDBC driver will allow the setTime to write + * <B>Note:</B> The Trafodion JDBC driver uses the <tt>Calendar</tt> parameter. An + * extended feature of the Trafodion JDBC driver will allow the setTime to write * data to any compatible SQL column type. The <tt>Time</tt> input parameter * is converted to the correct SQL column type before the data is written to * the database. If the conversion can not be performed, then the @@ -4414,7 +4414,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * value. The driver converts this to a SQL <tt>TIMESTAMP</tt> value when it * sends it to the database. * <p> - * <B>Note:</B> An extended feature of the HP JDBC driver will allow the + * <B>Note:</B> An extended feature of the Trafodion JDBC driver will allow the * setTimestamp to write data to any compatible SQL column type. The * <tt>Timestamp</tt> input parameter is converted to the correct SQL column * type before the data is written to the database. If the conversion can @@ -4496,8 +4496,8 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * uses the default timezone, which is that of the virtual machine running * the application. * <p> - * <B>Note:</B> The HP JDBC driver uses the <tt>Calendar</tt> parameter. An - * extended feature of the HP JDBC driver will allow the setTime to write + * <B>Note:</B> The Trafodion JDBC driver uses the <tt>Calendar</tt> parameter. An + * extended feature of the Trafodion JDBC driver will allow the setTime to write * data to any compatible SQL column type. The <tt>Timestamp</tt> input * parameter is converted to the correct SQL column type before the data is * written to the database. If the conversion can not be performed, then the @@ -4667,7 +4667,7 @@ public class SQLMXPreparedStatement extends SQLMXStatement implements * The driver converts this to an SQL <tt>DATALINK</tt> value when it sends * it to the database. * <p> - * <B>Note:</B>This method is <em><B>unsupported</B></em> by the HP JDBC + * <B>Note:</B>This method is <em><B>unsupported</B></em> by the Trafodion JDBC * driver. If this method is called a <i>Unsupported feature - * {setURL())</i> SQLException will be thrown. * </p> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/core/conn/trafci/utils/trafci.sh-tmpl ---------------------------------------------------------------------- diff --git a/core/conn/trafci/utils/trafci.sh-tmpl b/core/conn/trafci/utils/trafci.sh-tmpl index cb03e0e..30aa4a5 100644 --- a/core/conn/trafci/utils/trafci.sh-tmpl +++ b/core/conn/trafci/utils/trafci.sh-tmpl @@ -23,7 +23,7 @@ # # Classpath required for execution. Specifies the jar files containing -# the HP JDBC T4 classes and the Trafodion Command Interface classes. +# the Trafodion JDBC T4 classes and the Trafodion Command Interface classes. # TRAFCI_CLASSPATH="##TRAFCI_CLASSPATH##" http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/core/sql/langman/LmSQLMXDriver.java ---------------------------------------------------------------------- diff --git a/core/sql/langman/LmSQLMXDriver.java b/core/sql/langman/LmSQLMXDriver.java index 8c3ee9d..5f209a7 100644 --- a/core/sql/langman/LmSQLMXDriver.java +++ b/core/sql/langman/LmSQLMXDriver.java @@ -201,10 +201,10 @@ public class LmSQLMXDriver implements java.sql.Driver DriverManager.registerDriver( d ); - // Cache the Method Id for joinUDRTransaction of jdbc T4 driver HPT4Connection class + // Cache the Method Id for joinUDRTransaction of jdbc T4 driver TrafT4Connection class try { - Class connClass = Class.forName("com.hp.jdbc.HPT4Connection"); + Class connClass = Class.forName("org.trafodion.jdbc.t4.TrafT4Connection"); Class parTypes[] = new Class[1]; parTypes[0] = Long.TYPE; joinUDRTransMethodId_ = connClass.getMethod("joinUDRTransaction", parTypes); @@ -213,7 +213,7 @@ public class LmSQLMXDriver implements java.sql.Driver { String msg = "The SQL/MX language manager encountered an unexpected" + " error trying to lookup joinUDRTransaction method" - + " in the JDBC/MX driver HPT4Connection class: " + e.toString(); + + " in the JDBC/MX driver TrafT4Connection class: " + e.toString(); throw new SQLException( msg ); } @@ -490,7 +490,7 @@ public class LmSQLMXDriver implements java.sql.Driver { msg = "The SQL/MX language manager encountered an unexpected" + " error trying to invoke joinUDRTransaction method" - + " in the JDBC/MX driver HPT4Connection class: " + ite.toString() + + " in the JDBC/MX driver TrafT4Connection class: " + ite.toString() + " :" + ite.getCause(); throw new SQLException( msg ); } @@ -498,7 +498,7 @@ public class LmSQLMXDriver implements java.sql.Driver { msg = "The SQL/MX language manager encountered an unexpected" + " error trying to invoke joinUDRTransaction method" - + " in the JDBC/MX driver HPT4Connection class: " + e.toString(); + + " in the JDBC/MX driver TrafT4Connection class: " + e.toString(); throw new SQLException( msg ); } } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java ---------------------------------------------------------------------- diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java b/core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java index 119765e..4130b09 100644 --- a/core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java +++ b/core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java @@ -455,7 +455,7 @@ public class LmT2Driver implements java.sql.Driver { msg = "The SQL/MX language manager encountered an unexpected" + " error trying to invoke joinUDRTransaction method" - + " in the JDBC/MX driver HPT4Connection class: " + ite.toString() + + " in the JDBC/MX driver TrafT4Connection class: " + ite.toString() + " :" + ite.getCause(); throw new SQLException( msg ); } @@ -463,7 +463,7 @@ public class LmT2Driver implements java.sql.Driver { msg = "The SQL/MX language manager encountered an unexpected" + " error trying to invoke joinUDRTransaction method" - + " in the JDBC/MX driver HPT4Connection class: " + e.toString(); + + " in the JDBC/MX driver TrafT4Connection class: " + e.toString(); throw new SQLException( msg ); } */ http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java ---------------------------------------------------------------------- diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java b/core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java index 17f0aa3..407d76f 100644 --- a/core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java +++ b/core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java @@ -93,13 +93,13 @@ public class LmUtility { static Method getTypeMID_ = null; // ResultSet.getType() // static variables related to T4 driver - static Class rsT4Cls_ = null; // com.hp.jdbc.HPT4ResultSet - static Method getConnectionMID_ = null; // HPT4ResultSet.getConnection() - static Method getProxySyntaxMID_ = null; // HPT4ResultSet.getProxySyntax() + static Class rsT4Cls_ = null; // org.trafodion.jdbc.t4.TrafT4ResultSet + static Method getConnectionMID_ = null; // TrafT4ResultSet.getConnection() + static Method getProxySyntaxMID_ = null; // TrafT4ResultSet.getProxySyntax() static Method getSequenceNumberMID_ = null; - // HPT4ResultSet.getSequenceNumber() - static Method isClosedMID_ = null; // HPT4ResultSet.isClosed() - static Method hasLOBColumnsMID_ = null; // HPT4ResultSet.hasLOBColumns() + // TrafT4ResultSet.getSequenceNumber() + static Method isClosedMID_ = null; // TrafT4ResultSet.isClosed() + static Method hasLOBColumnsMID_ = null; // TrafT4ResultSet.hasLOBColumns() static final int JDBC_UNKNOWN_CONNECTION = -1; static final int JDBC_TYPE4_CONNECTION = 1; @@ -1325,8 +1325,8 @@ public class LmUtility { rsCls_ = Class.forName("java.sql.ResultSet"); getTypeMID_ = rsCls_.getMethod("getType", null); - // Load com.hp.jdbc.HPT4ResultSet class - rsT4Cls_ = Class.forName("com.hp.jdbc.HPT4ResultSet"); + // Load org.trafodion.jdbc.t4.TrafT4ResultSet class + rsT4Cls_ = Class.forName("org.trafodion.jdbc.t4.TrafT4ResultSet"); getConnectionMID_ = rsT4Cls_.getMethod("getConnection", null); getProxySyntaxMID_ = rsT4Cls_.getMethod("getProxySyntax", null); getSequenceNumberMID_ = rsT4Cls_.getMethod("getSequenceNumber", null); @@ -1440,21 +1440,21 @@ public class LmUtility { proxySyntax[0] = null; conn[0] = null; - // call HPT4ResultSet.isClosed() + // call TrafT4ResultSet.isClosed() closeStatus[0] = ((Boolean) (isClosedMID_.invoke(rsObj, null))).booleanValue(); if (closeStatus[0]) return; // RS is closed. No need for further processing - // call HPT4ResultSet.getConnection(); + // call TrafT4ResultSet.getConnection(); conn[0] = getConnectionMID_.invoke(rsObj, null); - // call HPT4ResultSet.getSequenceNumber() + // call TrafT4ResultSet.getSequenceNumber() rsCounter[0] = ((Long) (getSequenceNumberMID_.invoke(rsObj, null))).longValue(); - // call HPT4ResultSet.hasLOBColumns() + // call TrafT4ResultSet.hasLOBColumns() hasLOBColumns[0] = ((Boolean) (hasLOBColumnsMID_.invoke(rsObj, null))).booleanValue(); @@ -1467,7 +1467,7 @@ public class LmUtility { else if (type == ResultSet.TYPE_SCROLL_SENSITIVE) rsType[0] = 2; - // call HPT4ResultSet.getProxySyntax() + // call TrafT4ResultSet.getProxySyntax() proxySyntax[0] = (String) getProxySyntaxMID_.invoke(rsObj, null); } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java index 4284e05..20ba914 100644 --- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java +++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java @@ -176,7 +176,7 @@ public final class ServerConstants { public static final short SQL_ATTR_AUTOCOMMIT = 102; public static final short SQL_TXN_ISOLATION = 108; -// The enum SQLTYPE_CODE from sqlcli.h. HP extenstion are negative values. +// The enum SQLTYPE_CODE from sqlcli.h. Trafodion extenstion are negative values. public static final int SQLTYPECODE_CHAR = 1; public static final int SQLTYPECODE_NUMERIC = 2; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java ---------------------------------------------------------------------- diff --git a/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java b/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java index 589cb4e..eba9830 100755 --- a/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java +++ b/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java @@ -120,7 +120,7 @@ public class IntegrationTestEndurance { // Load JDBC driver // try { - Class.forName("org.trafodion.jdbc.HPT4Driver"); + Class.forName("org.trafodion.jdbc.t4.T4Driver"); } catch (ClassNotFoundException e) { fail("Thread number: " + numWorker + ". Could not find the JDBC driver class." + e); return average; @@ -183,4 +183,4 @@ public class IntegrationTestEndurance { return average; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/dcs/src/test/pytests/README.rst ---------------------------------------------------------------------- diff --git a/dcs/src/test/pytests/README.rst b/dcs/src/test/pytests/README.rst index d9aa6f0..0fc8a9f 100644 --- a/dcs/src/test/pytests/README.rst +++ b/dcs/src/test/pytests/README.rst @@ -35,12 +35,12 @@ Running Tests * Secondly, run ``config.sh`` to configure the Python ODBC test. If you need help on using this command then type ``./config.sh -h``. - For example, if the unixODBC driver manager is installed in the default location and the HP ODBC driver + For example, if the unixODBC driver manager is installed in the default location and the Trafodion ODBC driver is not yet installed in the ``odbc_driver`` sub-directory then run the following :: ./config.sh -d <Fully_Qualified_Domain_Name_Of_Machine_With_Trafodion>:<Port> -t /Absolute_PATH_to/TRAF_ODBC_Linux_Driver_64.tar.gz - This will configure your test and install the HP ODBC driver in the ``odbc_driver`` sub-directory. + This will configure your test and install the Trafodion ODBC driver in the ``odbc_driver`` sub-directory. .. note:: Do NOT put the TRAF_ODBC_Linux_Driver_64.tar.gz in the ``odbc_driver`` subdirectory. The contents of this sub-directory is removed every time config.sh is run with the -t option! http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/docs/command_interface/src/asciidoc/_chapters/launch.adoc ---------------------------------------------------------------------- diff --git a/docs/command_interface/src/asciidoc/_chapters/launch.adoc b/docs/command_interface/src/asciidoc/_chapters/launch.adoc index f4a61ef..dae2c7b 100644 --- a/docs/command_interface/src/asciidoc/_chapters/launch.adoc +++ b/docs/command_interface/src/asciidoc/_chapters/launch.adoc @@ -320,7 +320,7 @@ trafci prompts for the user name and password only. ``` SQL> connect user1/xxx@172.16.1.1 -com.hp.jdbc.HPT4Exception: **** ERROR[8837] CLI Authentication : User: user1 : invalid username or password [2105-03-12 16:35:15] +org.trafodion.jdbc.t4.TrafT4Exception: **** ERROR[8837] CLI Authentication : User: user1 : invalid username or password [2105-03-12 16:35:15] User Name: user1 Password: abc http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/docs/jdbct4ref_guide/src/resources/source/blob_example.java ---------------------------------------------------------------------- diff --git a/docs/jdbct4ref_guide/src/resources/source/blob_example.java b/docs/jdbct4ref_guide/src/resources/source/blob_example.java index d4415af..ca0cbae 100644 --- a/docs/jdbct4ref_guide/src/resources/source/blob_example.java +++ b/docs/jdbct4ref_guide/src/resources/source/blob_example.java @@ -69,12 +69,12 @@ public class TestBLOB long end ; Connection conn1 = null ; - // Set hpt4jdbc.blobTableName System Property. This property + // Set t4jdbc.blobTableName System Property. This property // can also be added to the command line through - // "-Dhpt4jdbc.blobTableName=...", or a + // "-Dt4jdbc.blobTableName=...", or a // java.util.Properties object can be used and passed to // getConnection. - System.setProperty( "hpt4jdbc.blobTableName", "Seabase.sch.blobdatatbl" ); + System.setProperty( "t4jdbc.blobTableName", "Seabase.sch.blobdatatbl" ); if ( args.length < 2 ) { @@ -107,13 +107,13 @@ public class TestBLOB try { - Class.forName( "org.trafodion.t4jdbc.HPT4Driver" ) ; + Class.forName( "org.trafodion.jdbc.t4.T4Driver" ) ; start = System.currentTimeMillis() ; // url should be of the form: - // jdbc:hpt4jdbc://ip_address|host_name:37800/:" + // jdbc:t4jdbc://ip_address|host_name:37800/:" // where host_name is the database host name - String url = "jdbc:hpt4jdbc://host_name:37800/:" ; + String url = "jdbc:t4jdbc://host_name:37800/:" ; conn1 = DriverManager.getConnection( url ) ; System.out.println( "Cleaning up test tables..." ) ; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/docs/jdbct4ref_guide/src/resources/source/clob_example.java ---------------------------------------------------------------------- diff --git a/docs/jdbct4ref_guide/src/resources/source/clob_example.java b/docs/jdbct4ref_guide/src/resources/source/clob_example.java index bcceb33..2b5e471 100644 --- a/docs/jdbct4ref_guide/src/resources/source/clob_example.java +++ b/docs/jdbct4ref_guide/src/resources/source/clob_example.java @@ -69,12 +69,12 @@ public class TestCLOB long end ; Connection conn1 = null ; - // Set hpt4jdbc.clobTableName System Property. This property + // Set t4jdbc.clobTableName System Property. This property // can also be added to the command line through - // "-Dhpt4jdbc.clobTableName=...", or a + // "-Dt4jdbc.clobTableName=...", or a // java.util.Properties object can be used and passed to // getConnection. - System.setProperty( "hpt4jdbc.clobTableName" + System.setProperty( "t4jdbc.clobTableName" , "Seabase.sch.clobdatatbl" ) ; @@ -104,13 +104,13 @@ public class TestCLOB try { - Class.forName( "org.trafodion.t4jdbc.HPT4Driver" ) ; + Class.forName( "org.trafodion.jdbc.t4.T4Driver" ) ; start = System.currentTimeMillis() ; // url should be of the form: - // jdbc:hpt4jdbc://ip_address|host_name:37800/:" + // jdbc:t4jdbc://ip_address|host_name:37800/:" // where host_name is the database host name - String url= "jdbc:hpt4jdbc://host_name:37800/:" ; + String url= "jdbc:t4jdbc://host_name:37800/:" ; conn1 = DriverManager.getConnection( url ) ; System.out.println( "Cleaning up test tables..." ) ; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc ---------------------------------------------------------------------- diff --git a/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc index b66b3d3..be303f7 100644 --- a/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc +++ b/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc @@ -1517,7 +1517,7 @@ T2(x,y) where y > 10; >>select a from T1 where runningcount(b) > 10 sequence by a; *** ERROR[4109] Sequence functions placed incorrectly: -RUNNINGCOUNT(CAT.SCH.HPPARTEST1.B). +RUNNINGCOUNT(CAT.SCH.TrafodionPARTEST1.B). *** ERROR[8822] Unable to prepare the statement. ``` @@ -2835,7 +2835,7 @@ type. *Effect:* {project-name} statement is not compiled. *Recovery:* This error should never occur. Drop the stored procedure and -re-create it with an appropriate data type. Report this problem to HP +re-create it with an appropriate data type. Report this problem to Trafodion support. [[SQL-4309]] http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/docs/spj_guide/src/asciidoc/_chapters/execute_spjs.adoc ---------------------------------------------------------------------- diff --git a/docs/spj_guide/src/asciidoc/_chapters/execute_spjs.adoc b/docs/spj_guide/src/asciidoc/_chapters/execute_spjs.adoc index 81c341d..a0ca931 100644 --- a/docs/spj_guide/src/asciidoc/_chapters/execute_spjs.adoc +++ b/docs/spj_guide/src/asciidoc/_chapters/execute_spjs.adoc @@ -621,7 +621,7 @@ while ( ( rc = SQLMoreResults( s ) ) != SQL_NO_DATA ) == Calling SPJs From a JDBC Client Application You can execute a CALL statement in a JDBC client application by using -the JDBC CallableStatement interface. The HP JDBC Type 4 driver requires +the JDBC CallableStatement interface. The Trafodion JDBC Type 4 driver requires that you put the CALL statement in an escape clause: [source, sql] http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/docs/spj_guide/src/asciidoc/_chapters/get_started.adoc ---------------------------------------------------------------------- diff --git a/docs/spj_guide/src/asciidoc/_chapters/get_started.adoc b/docs/spj_guide/src/asciidoc/_chapters/get_started.adoc index 18c9af2..931e05a 100644 --- a/docs/spj_guide/src/asciidoc/_chapters/get_started.adoc +++ b/docs/spj_guide/src/asciidoc/_chapters/get_started.adoc @@ -81,7 +81,7 @@ script files. To install `trafci` on a client workstation, see the {docs-url}/client_install/index.html[{project-name} Client Installation Guide]. [[hp-jdbc-type-4-driver]] -=== HP JDBC Type 4 Driver +=== Trafodion JDBC Type 4 Driver If you plan to use `trafci`, you must have a compatible version of the {project-name} JDBC Type-4 Driver installed on the client workstation. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1132ccdd/win-odbc64/odbcclient/drvr35/cconnect.cpp ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35/cconnect.cpp b/win-odbc64/odbcclient/drvr35/cconnect.cpp index ade058b..32102c9 100644 --- a/win-odbc64/odbcclient/drvr35/cconnect.cpp +++ b/win-odbc64/odbcclient/drvr35/cconnect.cpp @@ -2095,7 +2095,7 @@ SQLRETURN CConnect::SetConnectAttr(SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQ m_FetchBufferSize = 0; m_FetchBufferSize *= 1024; break; - // HP Extension to set the Session Name part of Unique Query ID + // Trafodion Extension to set the Session Name part of Unique Query ID case SQL_ATTR_SESSIONNAME: { if (StringLength == SQL_NTS)
