You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2013/04/14 06:17:08 UTC
svn commit: r1467726 [2/4] - in
/db/derby/code/trunk/java/client/org/apache/derby: client/ client/am/
client/am/stmtcache/ client/net/ jdbc/
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java Sun Apr 14 04:17:07 2013
@@ -26,10 +26,17 @@ import java.sql.SQLException;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.ObjectInputStream;
+import java.io.Reader;
import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.sql.Array;
import java.sql.Date;
+import java.sql.Ref;
import java.sql.Time;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
@@ -49,7 +56,7 @@ public abstract class Cursor {
public final static int BYTES = 4;
public final static int VARIABLE_BYTES = 5;
- public final static int VARIABLE_SHORT_BYTES = 6;
+ // unused protocol element: VARIABLE_SHORT_BYTES = 6;
public final static int NULL_TERMINATED_BYTES = 7;
public final static int SBCS_CLOB = 8;
@@ -147,13 +154,10 @@ public abstract class Cursor {
*
* @param allowServerFetch if false, don't fetch more data from
* the server even if more data is needed
- * @return <code>true</code> if current row position is valid
+ * @return {@code true} if current row position is valid
* @exception SqlException if an error occurs
*/
protected boolean stepNext(boolean allowServerFetch) throws SqlException {
- // local variable usd to hold the returned value from calculateColumnOffsetsForRow()
- boolean rowPositionIsValid = true;
-
// reset lob data
// clears out Cursor.lobs_ calculated for the current row when cursor is moved.
clearLobData_();
@@ -179,7 +183,8 @@ public abstract class Cursor {
// The parameter passed in here is used as an index into the cached rowset for
// scrollable cursors, for the arrays to be reused. It is not used for forward-only
// cursors, so just pass in 0.
- rowPositionIsValid = calculateColumnOffsetsForRow_(0, allowServerFetch);
+ boolean rowPositionIsValid =
+ calculateColumnOffsetsForRow_(0, allowServerFetch);
markNextRowPosition();
return rowPositionIsValid;
}
@@ -188,7 +193,7 @@ public abstract class Cursor {
* Makes the next row the current row. Returns true if the current
* row position is a valid row position.
*
- * @return <code>true</code> if current row position is valid
+ * @return {@code true} if current row position is valid
* @exception SqlException if an error occurs
*/
public boolean next() throws SqlException {
@@ -200,7 +205,7 @@ public abstract class Cursor {
/**
* Set the value of value of allRowsReceivedFromServer_.
*
- * @param b a <code>boolean</code> value indicating whether all
+ * @param b a {@code boolean} value indicating whether all
* rows are received from the server
*/
public void setAllRowsReceivedFromServer(boolean b) {
@@ -208,10 +213,10 @@ public abstract class Cursor {
}
/**
- * Return <code>true</code> if all rows are received from the
+ * Return {@code true} if all rows are received from the
* server.
*
- * @return <code>true</code> if all rows are received from the
+ * @return {@code true} if all rows are received from the
* server.
*/
public final boolean allRowsReceivedFromServer() {
@@ -245,7 +250,7 @@ public abstract class Cursor {
* @param row row index
* @param allowServerFetch if true, allow fetching more data from
* server
- * @return <code>true</code> if the current row position is a
+ * @return {@code true} if the current row position is a
* valid row position.
* @exception SqlException
* @exception DisconnectException
@@ -322,47 +327,47 @@ public abstract class Cursor {
// Direct conversions only, cross conversions are handled by another set of getters.
// Build a Java boolean from a 1-byte signed binary representation.
- private final boolean get_BOOLEAN(int column) {
- if ( org.apache.derby.client.am.SignedBinary.getByte
+ private boolean get_BOOLEAN(int column) {
+ if ( SignedBinary.getByte
( dataBuffer_, columnDataPosition_[column - 1] ) == 0 )
{ return false; }
else { return true; }
}
// Build a Java short from a 2-byte signed binary representation.
- private final short get_SMALLINT(int column) {
- return org.apache.derby.client.am.SignedBinary.getShort(dataBuffer_,
+ private short get_SMALLINT(int column) {
+ return SignedBinary.getShort(dataBuffer_,
columnDataPosition_[column - 1]);
}
// Build a Java int from a 4-byte signed binary representation.
protected final int get_INTEGER(int column) {
- return org.apache.derby.client.am.SignedBinary.getInt(dataBuffer_,
+ return SignedBinary.getInt(dataBuffer_,
columnDataPosition_[column - 1]);
}
// Build a Java long from an 8-byte signed binary representation.
- private final long get_BIGINT(int column) {
- return org.apache.derby.client.am.SignedBinary.getLong(dataBuffer_,
+ private long get_BIGINT(int column) {
+ return SignedBinary.getLong(dataBuffer_,
columnDataPosition_[column - 1]);
}
// Build a Java float from a 4-byte floating point representation.
- private final float get_FLOAT(int column) {
- return org.apache.derby.client.am.FloatingPoint.getFloat(dataBuffer_,
+ private float get_FLOAT(int column) {
+ return FloatingPoint.getFloat(dataBuffer_,
columnDataPosition_[column - 1]);
}
// Build a Java double from an 8-byte floating point representation.
- private final double get_DOUBLE(int column) {
- return org.apache.derby.client.am.FloatingPoint.getDouble(dataBuffer_,
+ private double get_DOUBLE(int column) {
+ return FloatingPoint.getDouble(dataBuffer_,
columnDataPosition_[column - 1]);
}
// Build a java.math.BigDecimal from a fixed point decimal byte representation.
- private final java.math.BigDecimal get_DECIMAL(int column) throws SqlException {
+ private BigDecimal get_DECIMAL(int column) throws SqlException {
try {
- return org.apache.derby.client.am.Decimal.getBigDecimal(dataBuffer_,
+ return Decimal.getBigDecimal(dataBuffer_,
columnDataPosition_[column - 1],
getColumnPrecision(column - 1),
getColumnScale(column - 1));
@@ -375,9 +380,9 @@ public abstract class Cursor {
// Build a Java double from a fixed point decimal byte representation.
- private final double getDoubleFromDECIMAL(int column) throws SqlException {
+ private double getDoubleFromDECIMAL(int column) throws SqlException {
try {
- return org.apache.derby.client.am.Decimal.getDouble(dataBuffer_,
+ return Decimal.getDouble(dataBuffer_,
columnDataPosition_[column - 1],
getColumnPrecision(column - 1),
getColumnScale(column - 1));
@@ -393,10 +398,10 @@ public abstract class Cursor {
}
// Build a Java long from a fixed point decimal byte representation.
- private final long getLongFromDECIMAL(int column, String targetType)
+ private long getLongFromDECIMAL(int column, String targetType)
throws SqlException {
try {
- return org.apache.derby.client.am.Decimal.getLong(dataBuffer_,
+ return Decimal.getLong(dataBuffer_,
columnDataPosition_[column - 1],
getColumnPrecision(column - 1),
getColumnScale(column - 1));
@@ -421,8 +426,7 @@ public abstract class Cursor {
// For 2-byte character ccsids, length is the number of characters,
// for all other cases length is the number of bytes.
// The length does not include the null terminator.
- private final String getVARCHAR(int column) throws SqlException {
- String tempString = null;
+ private String getVARCHAR(int column) throws SqlException {
try {
if (ccsid_[column - 1] == 1200) {
return getStringWithoutConvert(columnDataPosition_[column - 1] + 2, columnDataComputedLength_[column - 1] - 2);
@@ -438,7 +442,7 @@ public abstract class Cursor {
new ClientMessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
}
- tempString = new String(dataBuffer_,
+ String tempString = new String(dataBuffer_,
columnDataPosition_[column - 1] + 2,
columnDataComputedLength_[column - 1] - 2,
charsetName_[column - 1]);
@@ -452,8 +456,7 @@ public abstract class Cursor {
}
// Build a Java String from a database CHAR field.
- private final String getCHAR(int column) throws SqlException {
- String tempString = null;
+ private String getCHAR(int column) throws SqlException {
if (ccsid_[column - 1] == 1200) {
return getStringWithoutConvert(columnDataPosition_[column - 1], columnDataComputedLength_[column - 1]);
}
@@ -469,7 +472,7 @@ public abstract class Cursor {
new ClientMessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
}
- tempString = new String(dataBuffer_,
+ String tempString = new String(dataBuffer_,
columnDataPosition_[column - 1],
columnDataComputedLength_[column - 1],
charsetName_[column - 1]);
@@ -483,9 +486,9 @@ public abstract class Cursor {
}
// Build a JDBC Date object from the DERBY ISO DATE field.
- private final Date getDATE(int column, Calendar cal) throws SqlException {
+ private Date getDATE(int column, Calendar cal) throws SqlException {
try {
- return org.apache.derby.client.am.DateTime.dateBytesToDate(dataBuffer_,
+ return DateTime.dateBytesToDate(dataBuffer_,
columnDataPosition_[column - 1],
cal,
charsetName_[column - 1]);
@@ -499,9 +502,9 @@ public abstract class Cursor {
}
// Build a JDBC Time object from the DERBY ISO TIME field.
- private final Time getTIME(int column, Calendar cal) throws SqlException {
+ private Time getTIME(int column, Calendar cal) throws SqlException {
try {
- return org.apache.derby.client.am.DateTime.timeBytesToTime(dataBuffer_,
+ return DateTime.timeBytesToTime(dataBuffer_,
columnDataPosition_[column - 1],
cal,
charsetName_[column - 1]);
@@ -513,11 +516,11 @@ public abstract class Cursor {
}
// Build a JDBC Timestamp object from the DERBY ISO TIMESTAMP field.
- private final java.sql.Timestamp getTIMESTAMP(int column, Calendar cal)
+ private Timestamp getTIMESTAMP(int column, Calendar cal)
throws SqlException {
try {
- return org.apache.derby.client.am.DateTime.timestampBytesToTimestamp(
+ return DateTime.timestampBytesToTimestamp(
dataBuffer_,
columnDataPosition_[column - 1],
cal,
@@ -531,10 +534,10 @@ public abstract class Cursor {
}
// Build a JDBC Timestamp object from the DERBY ISO DATE field.
- private final java.sql.Timestamp getTimestampFromDATE(
+ private Timestamp getTimestampFromDATE(
int column, Calendar cal) throws SqlException {
try {
- return org.apache.derby.client.am.DateTime.dateBytesToTimestamp(dataBuffer_,
+ return DateTime.dateBytesToTimestamp(dataBuffer_,
columnDataPosition_[column - 1],
cal,
charsetName_[column -1]);
@@ -546,10 +549,10 @@ public abstract class Cursor {
}
// Build a JDBC Timestamp object from the DERBY ISO TIME field.
- private final java.sql.Timestamp getTimestampFromTIME(
+ private java.sql.Timestamp getTimestampFromTIME(
int column, Calendar cal) throws SqlException {
try {
- return org.apache.derby.client.am.DateTime.timeBytesToTimestamp(dataBuffer_,
+ return DateTime.timeBytesToTimestamp(dataBuffer_,
columnDataPosition_[column - 1],
cal,
charsetName_[column -1]);
@@ -561,10 +564,10 @@ public abstract class Cursor {
}
// Build a JDBC Date object from the DERBY ISO TIMESTAMP field.
- private final java.sql.Date getDateFromTIMESTAMP(int column, Calendar cal)
+ private Date getDateFromTIMESTAMP(int column, Calendar cal)
throws SqlException {
try {
- return org.apache.derby.client.am.DateTime.timestampBytesToDate(dataBuffer_,
+ return DateTime.timestampBytesToDate(dataBuffer_,
columnDataPosition_[column - 1],
cal,
charsetName_[column -1]);
@@ -576,10 +579,10 @@ public abstract class Cursor {
}
// Build a JDBC Time object from the DERBY ISO TIMESTAMP field.
- private final java.sql.Time getTimeFromTIMESTAMP(int column, Calendar cal)
+ private Time getTimeFromTIMESTAMP(int column, Calendar cal)
throws SqlException {
try {
- return org.apache.derby.client.am.DateTime.timestampBytesToTime(dataBuffer_,
+ return DateTime.timestampBytesToTime(dataBuffer_,
columnDataPosition_[column - 1],
cal,
charsetName_[column -1]);
@@ -590,23 +593,23 @@ public abstract class Cursor {
}
}
- private final String getStringFromDATE(int column) throws SqlException {
+ private String getStringFromDATE(int column) throws SqlException {
return getDATE(column, getRecyclableCalendar()).toString();
}
// Build a string object from the DERBY byte TIME representation.
- private final String getStringFromTIME(int column) throws SqlException {
+ private String getStringFromTIME(int column) throws SqlException {
return getTIME(column, getRecyclableCalendar()).toString();
}
// Build a string object from the DERBY byte TIMESTAMP representation.
- private final String getStringFromTIMESTAMP(int column) throws SqlException {
+ private String getStringFromTIMESTAMP(int column) throws SqlException {
return getTIMESTAMP(column, getRecyclableCalendar()).toString();
}
// Extract bytes from a database java.sql.Types.BINARY field.
// This is the DERBY type CHAR(n) FOR BIT DATA.
- private final byte[] get_CHAR_FOR_BIT_DATA(int column) throws SqlException {
+ private byte[] get_CHAR_FOR_BIT_DATA(int column) throws SqlException {
// There is no limit to the size of a column if maxFieldSize is zero.
// Otherwise, use the smaller of maxFieldSize and the actual column length.
int columnLength = (maxFieldSize_ == 0) ? columnDataComputedLength_[column - 1] :
@@ -621,11 +624,11 @@ public abstract class Cursor {
// This includes the DERBY types:
// VARCHAR(n) FOR BIT DATA
// LONG VARCHAR(n) FOR BIT DATA
- private final byte[] get_VARCHAR_FOR_BIT_DATA(int column) throws SqlException {
+ private byte[] get_VARCHAR_FOR_BIT_DATA(int column) throws SqlException {
byte[] bytes;
- int columnLength = 0;
- columnLength = (maxFieldSize_ == 0) ? columnDataComputedLength_[column - 1] - 2 :
- java.lang.Math.min(maxFieldSize_, columnDataComputedLength_[column - 1] - 2);
+ int columnLength =
+ (maxFieldSize_ == 0) ? columnDataComputedLength_[column - 1] - 2 :
+ Math.min(maxFieldSize_, columnDataComputedLength_[column - 1] - 2);
bytes = new byte[columnLength];
System.arraycopy(dataBuffer_, columnDataPosition_[column - 1] + 2, bytes, 0, bytes.length);
return bytes;
@@ -633,11 +636,11 @@ public abstract class Cursor {
// Deserialize a UDT from a database java.sql.Types.JAVA_OBJECT field.
// This is used for user defined types.
- private final Object get_UDT(int column) throws SqlException {
+ private Object get_UDT(int column) throws SqlException {
byte[] bytes;
- int columnLength = 0;
- columnLength = (maxFieldSize_ == 0) ? columnDataComputedLength_[column - 1] - 2 :
- java.lang.Math.min(maxFieldSize_, columnDataComputedLength_[column - 1] - 2);
+ int columnLength =
+ (maxFieldSize_ == 0) ? columnDataComputedLength_[column - 1] - 2 :
+ Math.min(maxFieldSize_, columnDataComputedLength_[column - 1] - 2);
bytes = new byte[columnLength];
System.arraycopy(dataBuffer_, columnDataPosition_[column - 1] + 2, bytes, 0, bytes.length);
@@ -1013,7 +1016,7 @@ public abstract class Cursor {
final String getString(int column) throws SqlException {
try {
- String tempString = null;
+ String tempString;
switch (jdbcTypes_[column - 1]) {
case java.sql.Types.BOOLEAN:
if ( get_BOOLEAN( column ) ) { return Boolean.TRUE.toString(); }
@@ -1096,7 +1099,7 @@ public abstract class Cursor {
}
}
- final java.io.InputStream getBinaryStream(int column) throws SqlException
+ final InputStream getBinaryStream(int column) throws SqlException
{
switch (jdbcTypes_[column - 1]) {
case java.sql.Types.BINARY:
@@ -1118,7 +1121,7 @@ public abstract class Cursor {
}
}
- final java.io.InputStream getAsciiStream(int column) throws SqlException
+ final InputStream getAsciiStream(int column) throws SqlException
{
switch (jdbcTypes_[column - 1]) {
case java.sql.Types.CLOB:
@@ -1159,56 +1162,7 @@ public abstract class Cursor {
}
}
- public final java.io.InputStream getUnicodeStream(int column) throws SqlException {
- try {
- switch (jdbcTypes_[column - 1]) {
- case java.sql.Types.CLOB:
- {
- Clob c = getClobColumn_(column, agent_, false);
- String s = c.getSubString(1L, (int) c.length());
- try {
- return new java.io.ByteArrayInputStream(s.getBytes("UTF-8"));
- } catch (java.io.UnsupportedEncodingException e) {
- throw new SqlException(agent_.logWriter_,
- new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
- "CLOB", "UnicodeStream", e);
- }
- }
- case java.sql.Types.CHAR:
- {
- try {
- return new java.io.ByteArrayInputStream(getCHAR(column).getBytes("UTF-8"));
- } catch (java.io.UnsupportedEncodingException e) {
- throw new SqlException(agent_.logWriter_,
- new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
- "CHAR", "UnicodeStream", e);
- }
- }
- case java.sql.Types.VARCHAR:
- case java.sql.Types.LONGVARCHAR:
- try {
- return new java.io.ByteArrayInputStream(getVARCHAR(column).getBytes("UTF-8"));
- } catch (java.io.UnsupportedEncodingException e) {
- throw new SqlException(agent_.logWriter_,
- new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
- "VARCHAR/LONGVARCHAR", "UnicodeStream", e);
- }
- case java.sql.Types.BINARY:
- return new java.io.ByteArrayInputStream(get_CHAR_FOR_BIT_DATA(column));
- case java.sql.Types.VARBINARY:
- case java.sql.Types.LONGVARBINARY:
- return new java.io.ByteArrayInputStream(get_VARCHAR_FOR_BIT_DATA(column));
- case java.sql.Types.BLOB:
- return getBinaryStream(column);
- default:
- throw coercionError( "UnicodeStream", column );
- }
- } catch ( SQLException se ) {
- throw new SqlException(se);
- }
- }
-
- final java.io.Reader getCharacterStream(int column)
+ final Reader getCharacterStream(int column)
throws SqlException
{
switch (jdbcTypes_[column - 1]) {
@@ -1228,8 +1182,9 @@ public abstract class Cursor {
return new java.io.StringReader(getVARCHAR(column));
case java.sql.Types.BINARY:
try {
- return new java.io.InputStreamReader(new java.io.ByteArrayInputStream(get_CHAR_FOR_BIT_DATA(column)), "UTF-16BE");
- } catch (java.io.UnsupportedEncodingException e) {
+ return new InputStreamReader(new ByteArrayInputStream(
+ get_CHAR_FOR_BIT_DATA(column)), "UTF-16BE");
+ } catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"BINARY", "java.io.Reader", e);
@@ -1237,17 +1192,18 @@ public abstract class Cursor {
case java.sql.Types.VARBINARY:
case java.sql.Types.LONGVARBINARY:
try {
- return new java.io.InputStreamReader(new java.io.ByteArrayInputStream(get_VARCHAR_FOR_BIT_DATA(column)), "UTF-16BE");
- } catch (java.io.UnsupportedEncodingException e) {
+ return new InputStreamReader(new ByteArrayInputStream(
+ get_VARCHAR_FOR_BIT_DATA(column)), "UTF-16BE");
+ } catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"VARBINARY/LONGVARBINARY", "java.io.Reader", e);
}
case java.sql.Types.BLOB:
try {
- return new java.io.InputStreamReader(getBinaryStream(column),
+ return new InputStreamReader(getBinaryStream(column),
"UTF-16BE");
- } catch (java.io.UnsupportedEncodingException e) {
+ } catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"BLOB", "java.io.Reader", e);
@@ -1275,13 +1231,13 @@ public abstract class Cursor {
}
}
- final java.sql.Array getArray(int column) throws SqlException {
+ final Array getArray(int column) throws SqlException {
throw new SqlException(agent_.logWriter_,
new ClientMessageId (SQLState.NOT_IMPLEMENTED),
"getArray(int)");
}
- final java.sql.Ref getRef(int column) throws SqlException {
+ final Ref getRef(int column) throws SqlException {
throw new SqlException(agent_.logWriter_,
new ClientMessageId (SQLState.NOT_IMPLEMENTED), "getRef(int)");
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java Sun Apr 14 04:17:07 2013
@@ -2901,7 +2901,7 @@ public abstract class DatabaseMetaData i
private PreparedStatement prepareMetaDataQuery(String cmd) throws SqlException {
PreparedStatement ps;
- ps = (org.apache.derby.client.am.PreparedStatement)
+ ps = (PreparedStatement)
connection_.prepareStatementX("CALL " + cmd,
java.sql.ResultSet.TYPE_FORWARD_ONLY,
java.sql.ResultSet.CONCUR_READ_ONLY,
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java Sun Apr 14 04:17:07 2013
@@ -365,7 +365,7 @@ public class EncryptionManager {
byte[] targetPublicKey) throws SqlException {
byte[] cipherText = null;
- java.security.Key key = null;
+ java.security.Key key;
if (token_ == null) {
token_ = calculateEncryptionToken(securityMechanism, initVector);
@@ -435,7 +435,7 @@ public class EncryptionManager {
byte[] targetPublicKey) throws SqlException {
byte[] plainText = null;
- java.security.Key key = null;
+ java.security.Key key;
if (token_ == null) {
token_ = calculateEncryptionToken(securityMechanism, initVector);
@@ -622,14 +622,14 @@ public class EncryptionManager {
};
/**
- Convert a byte array to a String with a hexidecimal format.
+ Convert a byte array to a String with a hexadecimal format.
The String may be converted back to a byte array using fromHexString.
<BR>
- For each byte (b) two characaters are generated, the first character
- represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
- the second character represents the low nibble (<code>b & 0x0f</code>).
+ For each byte (b) two characters are generated, the first character
+ represents the high nibble (4 bits) in hexadecimal ({@code b & 0xf0}),
+ the second character represents the low nibble ({@code b & 0x0f}).
<BR>
- The byte at <code>data[offset]</code> is represented by the first two
+ The byte at {@code data[offset]} is represented by the first two
characters in the returned String.
@param data byte array
@@ -640,7 +640,7 @@ public class EncryptionManager {
*/
private String toHexString(byte[] data, int offset, int length)
{
- StringBuffer s = new StringBuffer(length*2);
+ StringBuilder s = new StringBuilder(length*2);
int end = offset+length;
for (int i = offset; i < end; i++)
@@ -659,17 +659,17 @@ public class EncryptionManager {
Convert a string into a byte array in hex format.
<BR>
For each character (b) two bytes are generated, the first byte
- represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
- the second byte represents the low nibble (<code>b & 0x0f</code>).
+ represents the high nibble (4 bits) in hexadecimal ({@code b & 0xf0}),
+ the second byte represents the low nibble ({@code b & 0x0f}).
<BR>
- The character at <code>str.charAt(0)</code> is represented by the first two bytes
- in the returned String.
+ The character at {@code str.charAt(0)} is represented by the
+ first two bytes in the returned String.
@param str string
@param offset starting character (zero based) to convert.
@param length number of characters to convert.
- @return the byte[] (with hexidecimal format) form of the string (str)
+ @return the byte[] (with hexadecimal format) form of the string (str)
*/
private byte[] toHexByte(String str, int offset, int length)
{
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java Sun Apr 14 04:17:07 2013
@@ -140,7 +140,6 @@ public abstract class Lob implements Uni
* subclasses. A stored procedure call will be made to get the
* length from the server.
*
- * @throws org.apache.derby.client.am.SqlException
* @return length of Lob
*/
long getLocatorLength() throws SqlException
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java Sun Apr 14 04:17:07 2013
@@ -27,6 +27,7 @@ import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
import java.sql.SQLException;
import java.util.Properties;
+import javax.transaction.xa.XAException;
import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
import org.apache.derby.jdbc.ClientDataSourceInterface;
import org.apache.derby.shared.common.reference.Attribute;
@@ -656,7 +657,7 @@ public class LogWriter {
}
}
- void traceDiagnosable(javax.transaction.xa.XAException e) {
+ void traceDiagnosable(XAException e) {
if (!loggingEnabled(ClientDataSourceInterface.TRACE_DIAGNOSTICS)) {
return;
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement.java Sun Apr 14 04:17:07 2013
@@ -25,8 +25,6 @@ import java.io.Reader;
import java.math.BigDecimal;
import java.net.URL;
import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
import java.sql.Date;
import java.sql.Ref;
import java.sql.SQLException;
@@ -216,11 +214,11 @@ public class LogicalCallableStatement
return getPhysCs().getArray(i);
}
- public Blob getBlob(int i) throws SQLException {
+ public java.sql.Blob getBlob(int i) throws SQLException {
return getPhysCs().getBlob(i);
}
- public Clob getClob(int i) throws SQLException {
+ public java.sql.Clob getClob(int i) throws SQLException {
return getPhysCs().getClob(i);
}
@@ -308,11 +306,11 @@ public class LogicalCallableStatement
return getPhysCs().getArray(parameterName);
}
- public Blob getBlob(String parameterName) throws SQLException {
+ public java.sql.Blob getBlob(String parameterName) throws SQLException {
return getPhysCs().getBlob(parameterName);
}
- public Clob getClob(String parameterName) throws SQLException {
+ public java.sql.Clob getClob(String parameterName) throws SQLException {
return getPhysCs().getClob(parameterName);
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement40.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalCallableStatement40.java Sun Apr 14 04:17:07 2013
@@ -22,8 +22,6 @@ package org.apache.derby.client.am;
import java.io.InputStream;
import java.io.Reader;
-import java.sql.Blob;
-import java.sql.Clob;
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLException;
@@ -264,12 +262,12 @@ public class LogicalCallableStatement40
return getPhysCs().getCharacterStream(arg0);
}
- public void setBlob(String arg0, Blob arg1)
+ public void setBlob(String arg0, java.sql.Blob arg1)
throws SQLException {
getPhysCs().setBlob(arg0, arg1);
}
- public void setClob(String arg0, Clob arg1)
+ public void setClob(String arg0, java.sql.Clob arg1)
throws SQLException {
getPhysCs().setClob(arg0, arg1);
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java Sun Apr 14 04:17:07 2013
@@ -23,6 +23,7 @@ package org.apache.derby.client.am;
import java.sql.SQLException;
import java.util.Map;
+import org.apache.derby.client.ClientPooledConnection;
import org.apache.derby.shared.common.reference.SQLState;
/**
@@ -45,7 +46,7 @@ public class LogicalConnection implement
* Set to {@code null} when this logical connection is closed.
*/
Connection physicalConnection_;
- private org.apache.derby.client.ClientPooledConnection pooledConnection_ = null;
+ private ClientPooledConnection pooledConnection_ = null;
/**
* Logical database metadata object created on demand and then cached.
* The lifetime of the metadata object is the same as this logical
@@ -54,8 +55,10 @@ public class LogicalConnection implement
*/
private LogicalDatabaseMetaData logicalDatabaseMetaData = null;
- public LogicalConnection(Connection physicalConnection,
- org.apache.derby.client.ClientPooledConnection pooledConnection) throws SqlException {
+ public LogicalConnection(
+ Connection physicalConnection,
+ ClientPooledConnection pooledConnection) throws SqlException {
+
physicalConnection_ = physicalConnection;
pooledConnection_ = pooledConnection;
try {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java Sun Apr 14 04:17:07 2013
@@ -22,8 +22,6 @@
package org.apache.derby.client.am;
import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
import java.sql.NClob;
import java.sql.SQLClientInfoException;
import java.sql.SQLException;
@@ -63,7 +61,7 @@ public class LogicalConnection40
}
}
- public Blob createBlob()
+ public java.sql.Blob createBlob()
throws SQLException {
try
{
@@ -75,7 +73,7 @@ public class LogicalConnection40
}
}
- public Clob createClob()
+ public java.sql.Clob createClob()
throws SQLException {
try
{
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData.java Sun Apr 14 04:17:07 2013
@@ -20,8 +20,6 @@
*/
package org.apache.derby.client.am;
-import java.sql.Connection;
-import java.sql.ResultSet;
import java.sql.SQLException;
/**
@@ -559,92 +557,104 @@ public class LogicalDatabaseMetaData
return getRealMetaDataObject().dataDefinitionIgnoredInTransactions();
}
- public ResultSet getProcedures(
+ public java.sql.ResultSet getProcedures(
String catalog, String schemaPattern, String procedureNamePattern)
throws SQLException {
return getRealMetaDataObject().getProcedures(
catalog, schemaPattern, procedureNamePattern);
}
- public ResultSet getProcedureColumns(String catalog, String schemaPattern,
- String procedureNamePattern, String columnNamePattern)
- throws SQLException {
+ public java.sql.ResultSet getProcedureColumns(
+ String catalog,
+ String schemaPattern,
+ String procedureNamePattern,
+ String columnNamePattern) throws SQLException {
+
return getRealMetaDataObject().getProcedureColumns(catalog,
schemaPattern, procedureNamePattern, columnNamePattern);
}
- public ResultSet getTables(String catalog, String schemaPattern,
+ public java.sql.ResultSet getTables(String catalog, String schemaPattern,
String tableNamePattern, String[] types)
throws SQLException {
return getRealMetaDataObject().getTables(
catalog, schemaPattern, tableNamePattern, types);
}
- public ResultSet getSchemas() throws SQLException {
+ public java.sql.ResultSet getSchemas() throws SQLException {
return getRealMetaDataObject().getSchemas();
}
- public ResultSet getCatalogs() throws SQLException {
+ public java.sql.ResultSet getCatalogs() throws SQLException {
return getRealMetaDataObject().getCatalogs();
}
- public ResultSet getTableTypes() throws SQLException {
+ public java.sql.ResultSet getTableTypes() throws SQLException {
return getRealMetaDataObject().getTableTypes();
}
- public ResultSet getColumns(String catalog, String schemaPattern,
+ public java.sql.ResultSet getColumns(String catalog, String schemaPattern,
String tableNamePattern, String columnNamePattern)
throws SQLException {
return getRealMetaDataObject().getColumns(
catalog, schemaPattern, tableNamePattern, columnNamePattern);
}
- public ResultSet getColumnPrivileges(String catalog, String schema,
+ public java.sql.ResultSet getColumnPrivileges(String catalog, String schema,
String table, String columnNamePattern)
throws SQLException {
return getRealMetaDataObject().getColumnPrivileges(
catalog, schema, table, columnNamePattern);
}
- public ResultSet getTablePrivileges(String catalog, String schemaPattern,
- String tableNamePattern)
- throws SQLException {
+ public java.sql.ResultSet getTablePrivileges(
+ String catalog,
+ String schemaPattern,
+ String tableNamePattern) throws SQLException {
+
return getRealMetaDataObject().getTablePrivileges(
catalog, schemaPattern, tableNamePattern);
}
- public ResultSet getBestRowIdentifier(String catalog, String schema,
- String table, int scope, boolean nullable)
- throws SQLException {
+ public java.sql.ResultSet getBestRowIdentifier(
+ String catalog,
+ String schema,
+ String table,
+ int scope,
+ boolean nullable) throws SQLException {
+
return getRealMetaDataObject().getBestRowIdentifier(
catalog, schema, table, scope, nullable);
}
- public ResultSet getVersionColumns(
+ public java.sql.ResultSet getVersionColumns(
String catalog, String schema, String table)
throws SQLException {
return getRealMetaDataObject().getVersionColumns(
catalog, schema, table);
}
- public ResultSet getPrimaryKeys(String catalog, String schema, String table)
- throws SQLException {
+ public java.sql.ResultSet getPrimaryKeys(
+ String catalog,
+ String schema,
+ String table) throws SQLException {
+
return getRealMetaDataObject().getPrimaryKeys(catalog, schema, table);
}
- public ResultSet getImportedKeys(
+ public java.sql.ResultSet getImportedKeys(
String catalog, String schema, String table)
throws SQLException {
return getRealMetaDataObject().getImportedKeys(catalog, schema, table);
}
- public ResultSet getExportedKeys(
+ public java.sql.ResultSet getExportedKeys(
String catalog, String schema, String table)
throws SQLException {
return getRealMetaDataObject().getExportedKeys(catalog, schema, table);
}
- public ResultSet getCrossReference(String parentCatalog,
+ public java.sql.ResultSet getCrossReference(String parentCatalog,
String parentSchema, String parentTable, String foreignCatalog,
String foreignSchema, String foreignTable)
throws SQLException {
@@ -653,13 +663,17 @@ public class LogicalDatabaseMetaData
foreignSchema, foreignTable);
}
- public ResultSet getTypeInfo() throws SQLException {
+ public java.sql.ResultSet getTypeInfo() throws SQLException {
return getRealMetaDataObject().getTypeInfo();
}
- public ResultSet getIndexInfo(String catalog, String schema, String table,
- boolean unique, boolean approximate)
- throws SQLException {
+ public java.sql.ResultSet getIndexInfo(
+ String catalog,
+ String schema,
+ String table,
+ boolean unique,
+ boolean approximate) throws SQLException {
+
return getRealMetaDataObject().getIndexInfo(
catalog, schema, table, unique, approximate);
}
@@ -714,14 +728,14 @@ public class LogicalDatabaseMetaData
return getRealMetaDataObject().supportsBatchUpdates();
}
- public ResultSet getUDTs(String catalog, String schemaPattern,
+ public java.sql.ResultSet getUDTs(String catalog, String schemaPattern,
String typeNamePattern, int[] types)
throws SQLException {
return getRealMetaDataObject().getUDTs(
catalog, schemaPattern, typeNamePattern, types);
}
- public Connection getConnection() throws SQLException {
+ public java.sql.Connection getConnection() throws SQLException {
getRealMetaDataObject(); // Just check if the connection is still open.
return this.logicalCon;
}
@@ -742,23 +756,26 @@ public class LogicalDatabaseMetaData
return getRealMetaDataObject().supportsGetGeneratedKeys();
}
- public ResultSet getSuperTypes(
+ public java.sql.ResultSet getSuperTypes(
String catalog, String schemaPattern, String typeNamePattern)
throws SQLException {
return getRealMetaDataObject().getSuperTypes(
catalog, schemaPattern, typeNamePattern);
}
- public ResultSet getSuperTables(
+ public java.sql.ResultSet getSuperTables(
String catalog, String schemaPattern, String tableNamePattern)
throws SQLException {
return getRealMetaDataObject().getSuperTables(
catalog, schemaPattern, tableNamePattern);
}
- public ResultSet getAttributes(String catalog, String schemaPattern,
- String typeNamePattern, String attributeNamePattern)
- throws SQLException {
+ public java.sql.ResultSet getAttributes(
+ String catalog,
+ String schemaPattern,
+ String typeNamePattern,
+ String attributeNamePattern) throws SQLException {
+
return getRealMetaDataObject().getAttributes(
catalog, schemaPattern, typeNamePattern, attributeNamePattern);
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java Sun Apr 14 04:17:07 2013
@@ -20,7 +20,6 @@
*/
package org.apache.derby.client.am;
-import java.sql.ResultSet;
import java.sql.RowIdLifetime;
import java.sql.SQLException;
import org.apache.derby.shared.common.reference.SQLState;
@@ -52,22 +51,23 @@ public class LogicalDatabaseMetaData40
return getRealMetaDataObject().autoCommitFailureClosesAllResultSets();
}
- public ResultSet getClientInfoProperties()
+ public java.sql.ResultSet getClientInfoProperties()
throws SQLException {
return getRealMetaDataObject().getClientInfoProperties();
}
- public ResultSet getFunctions(String catalog, String schemaPattern,
+ public java.sql.ResultSet getFunctions(String catalog, String schemaPattern,
String functionNamePattern)
throws SQLException {
return getRealMetaDataObject().getFunctions(
catalog, schemaPattern, functionNamePattern);
}
- public ResultSet getFunctionColumns(String catalog, String schemaPattern,
- String functionNamePattern,
- String columnNamePattern)
- throws SQLException {
+ public java.sql.ResultSet getFunctionColumns(
+ String catalog, String schemaPattern,
+ String functionNamePattern,
+ String columnNamePattern) throws SQLException {
+
return getRealMetaDataObject().getFunctionColumns(
catalog, schemaPattern, functionNamePattern, columnNamePattern);
}
@@ -77,7 +77,7 @@ public class LogicalDatabaseMetaData40
return getRealMetaDataObject().getRowIdLifetime();
}
- public ResultSet getSchemas(String catalog, String schemaPattern)
+ public java.sql.ResultSet getSchemas(String catalog, String schemaPattern)
throws SQLException {
return getRealMetaDataObject().getSchemas(catalog, schemaPattern);
}
@@ -116,18 +116,19 @@ public class LogicalDatabaseMetaData40
/** See DatabaseMetaData javadoc */
public boolean generatedKeyAlwaysReturned() throws SQLException
{
- return ((org.apache.derby.client.am.DatabaseMetaData) getRealMetaDataObject()).generatedKeyAlwaysReturned();
+ return ((DatabaseMetaData) getRealMetaDataObject()).
+ generatedKeyAlwaysReturned();
}
/**
* See DatabaseMetaData javadoc. Empty ResultSet because Derby does
* not support pseudo columns.
*/
- public ResultSet getPseudoColumns
+ public java.sql.ResultSet getPseudoColumns
( String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern )
throws SQLException
{
- return ((org.apache.derby.client.am.DatabaseMetaData) getRealMetaDataObject()).getPseudoColumns
+ return ((DatabaseMetaData) getRealMetaDataObject()).getPseudoColumns
( catalog, schemaPattern, tableNamePattern, columnNamePattern );
}
@@ -140,11 +141,13 @@ public class LogicalDatabaseMetaData40
/** See DatabaseMetaData javadoc */
public long getMaxLogicalLobSize() throws SQLException
{
- return ((org.apache.derby.client.am.DatabaseMetaData) getRealMetaDataObject()).getMaxLogicalLobSize();
+ return ((DatabaseMetaData) getRealMetaDataObject()).
+ getMaxLogicalLobSize();
}
public boolean supportsRefCursors() throws SQLException
{
- return ((org.apache.derby.client.am.DatabaseMetaData) getRealMetaDataObject()).supportsRefCursors();
+ return ((DatabaseMetaData) getRealMetaDataObject()).
+ supportsRefCursors();
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalPreparedStatement.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalPreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalPreparedStatement.java Sun Apr 14 04:17:07 2013
@@ -27,14 +27,8 @@ import java.net.URL;
import java.util.Calendar;
import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Connection;
import java.sql.Date;
-import java.sql.ParameterMetaData;
import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Time;
@@ -182,11 +176,11 @@ public class LogicalPreparedStatement
getPhysPs().setArray(i, x);
}
- public void setBlob(int i, Blob x) throws SQLException {
+ public void setBlob(int i, java.sql.Blob x) throws SQLException {
getPhysPs().setBlob(i, x);
}
- public void setClob(int i, Clob x) throws SQLException {
+ public void setClob(int i, java.sql.Clob x) throws SQLException {
getPhysPs().setClob(i, x);
}
@@ -194,7 +188,8 @@ public class LogicalPreparedStatement
getPhysPs().setDate(parameterIndex, x);
}
- public ParameterMetaData getParameterMetaData() throws SQLException {
+ public java.sql.ParameterMetaData getParameterMetaData()
+ throws SQLException {
return getPhysPs().getParameterMetaData();
}
@@ -202,11 +197,11 @@ public class LogicalPreparedStatement
getPhysPs().setRef(i, x);
}
- public ResultSet executeQuery() throws SQLException {
+ public java.sql.ResultSet executeQuery() throws SQLException {
return getPhysPs().executeQuery();
}
- public ResultSetMetaData getMetaData() throws SQLException {
+ public java.sql.ResultSetMetaData getMetaData() throws SQLException {
return getPhysPs().getMetaData();
}
@@ -355,15 +350,15 @@ public class LogicalPreparedStatement
return getPhysPs().execute(sql, columnIndexes);
}
- public Connection getConnection() throws SQLException {
+ public java.sql.Connection getConnection() throws SQLException {
return getPhysPs().getConnection();
}
- public ResultSet getGeneratedKeys() throws SQLException {
+ public java.sql.ResultSet getGeneratedKeys() throws SQLException {
return getPhysPs().getGeneratedKeys();
}
- public ResultSet getResultSet() throws SQLException {
+ public java.sql.ResultSet getResultSet() throws SQLException {
return getPhysPs().getResultSet();
}
@@ -381,7 +376,7 @@ public class LogicalPreparedStatement
return getPhysPs().execute(sql, columnNames);
}
- public ResultSet executeQuery(String sql) throws SQLException {
+ public java.sql.ResultSet executeQuery(String sql) throws SQLException {
return getPhysPs().executeQuery(sql);
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalStatementEntity.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalStatementEntity.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalStatementEntity.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalStatementEntity.java Sun Apr 14 04:17:07 2013
@@ -166,7 +166,7 @@ abstract class LogicalStatementEntity
public synchronized void close() throws SQLException {
if (physicalPs != null) {
final PreparedStatement temporaryPsRef =
- (org.apache.derby.client.am.PreparedStatement)physicalPs;
+ (PreparedStatement)physicalPs;
// Nullify both references.
physicalPs = null;
physicalCs = null;
@@ -245,7 +245,7 @@ abstract class LogicalStatementEntity
* interface
*/
public <T> T unwrap(Class<T> iface) throws SQLException {
- if (((org.apache.derby.client.am.Statement) getPhysStmt()).isClosed()) {
+ if (((Statement) getPhysStmt()).isClosed()) {
throw new SqlException(null,
new ClientMessageId(SQLState.ALREADY_CLOSED),
hasCallableStmt ? "CallableStatement" : "PreparedStatement")
@@ -269,12 +269,12 @@ abstract class LogicalStatementEntity
public void closeOnCompletion() throws SQLException
{
- ((org.apache.derby.client.am.Statement) getPhysStmt()).closeOnCompletion();
+ ((Statement) getPhysStmt()).closeOnCompletion();
}
public boolean isCloseOnCompletion() throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).isCloseOnCompletion();
+ return ((Statement) getPhysStmt()).isCloseOnCompletion();
}
////////////////////////////////////////////////////////////////////
@@ -285,35 +285,38 @@ abstract class LogicalStatementEntity
public long[] executeLargeBatch() throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).executeLargeBatch();
+ return ((Statement) getPhysStmt()).executeLargeBatch();
}
public long executeLargeUpdate( String sql ) throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).executeLargeUpdate( sql );
+ return ((Statement) getPhysStmt()).executeLargeUpdate( sql );
}
public long executeLargeUpdate( String sql, int autoGeneratedKeys) throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).executeLargeUpdate( sql, autoGeneratedKeys );
+ return ((Statement) getPhysStmt()).
+ executeLargeUpdate( sql, autoGeneratedKeys );
}
public long executeLargeUpdate( String sql, int[] columnIndexes ) throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).executeLargeUpdate( sql, columnIndexes );
+ return ((Statement) getPhysStmt()).
+ executeLargeUpdate( sql, columnIndexes );
}
public long executeLargeUpdate( String sql, String[] columnNames ) throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).executeLargeUpdate( sql, columnNames );
+ return ((Statement) getPhysStmt()).
+ executeLargeUpdate( sql, columnNames );
}
public long getLargeUpdateCount() throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).getLargeUpdateCount();
+ return ((Statement) getPhysStmt()).getLargeUpdateCount();
}
public long getLargeMaxRows() throws SQLException
{
- return ((org.apache.derby.client.am.Statement) getPhysStmt()).getLargeMaxRows();
+ return ((Statement) getPhysStmt()).getLargeMaxRows();
}
public void setLargeMaxRows(long maxRows) throws SQLException
{
- ((org.apache.derby.client.am.Statement) getPhysStmt()).setLargeMaxRows( maxRows );
+ ((Statement) getPhysStmt()).setLargeMaxRows( maxRows );
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java Sun Apr 14 04:17:07 2013
@@ -27,7 +27,7 @@ import java.sql.SQLException;
import java.sql.SQLXML;
import org.apache.derby.client.ClientPooledConnection;
-public class PreparedStatement40 extends org.apache.derby.client.am.PreparedStatement{
+public class PreparedStatement40 extends PreparedStatement {
/**
* The PreparedStatement used for JDBC 4 positioned update statements.
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement42.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement42.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement42.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement42.java Sun Apr 14 04:17:07 2013
@@ -25,7 +25,7 @@ import java.sql.SQLException;
import java.sql.SQLType;
import org.apache.derby.client.ClientPooledConnection;
-public class PreparedStatement42 extends org.apache.derby.client.am.PreparedStatement40
+public class PreparedStatement42 extends PreparedStatement40
{
/**
* The PreparedStatement used for JDBC 4.2 positioned update statements.
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Sun Apr 14 04:17:07 2013
@@ -4908,7 +4908,8 @@ public abstract class ResultSet implemen
// has been received.
if (!openOnServer_) {
SqlException sqlException = null;
- int sqlcode = org.apache.derby.client.am.Utils.getSqlcodeFromSqlca(queryTerminatingSqlca_);
+ int sqlcode = Utils.getSqlcodeFromSqlca(queryTerminatingSqlca_);
+
if (sqlcode < 0) {
sqlException = new SqlException(agent_.logWriter_, queryTerminatingSqlca_);
} else if (sqlcode > 0 && sqlcode != 100) {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Sun Apr 14 04:17:07 2013
@@ -84,7 +84,6 @@ public class SqlException extends Except
protected int errorcode_ = DEFAULT_ERRCODE;
protected String causeString_ = null;
protected SqlException nextException_;
- protected Throwable throwable_;
public static final String CLIENT_MESSAGE_RESOURCE_NAME =
"org.apache.derby.loc.clientmessages";
@@ -264,18 +263,19 @@ public class SqlException extends Except
errorcode_ = sqlca.getErrorCode();
if ( logWriter != null )
{
- logWriter.traceDiagnosable(this);
+ logWriter.traceDiagnosable(SqlException.this);
}
}
/**
* Create one of the exceptions in an exception chain generated by the
* engine. This constructor calls itself recursively to create the rest of
- * the exception chain if <code>chain</code> is <code>true</code>.
+ * the exception chain if {@code chain} is
+ * {@code true}.
*
* @param sqlca the SQLCA sent from the server
* @param number the message number for this exception (counting from 0)
- * @param chain if <code>true</code>, generate the rest of the exception
+ * @param chain if {@code true}, generate the rest of the exception
* chain recursively and link it to this exception
*/
private SqlException(Sqlca sqlca, int number, boolean chain) {
@@ -312,16 +312,18 @@ public class SqlException extends Except
setThrowable(throwable);
if (logWriter != null) {
- logWriter.traceDiagnosable(this);
+ logWriter.traceDiagnosable(SqlException.this);
}
}
/**
* Set the cause of this exception based on its type.
- * <code>SQLException</code>s and <code>SqlException</code>s are
- * linked with <code>setNextException()</code> and <code>initCause()</code>.
- * All other exception types are linked with <code>initCause()</code>.
+ * {@code SQLException}s and
+ * {@code SqlException}s are
+ * linked with {@code setNextException()} and
+ * {@code initCause()}.
+ * All other exception types are linked with {@code initCause()}.
*/
private void setThrowable(Throwable throwable)
{
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java Sun Apr 14 04:17:07 2013
@@ -79,7 +79,7 @@ public abstract class Sqlca {
* procedure to get the same message). */
private String[] cachedMessages;
- protected Sqlca(org.apache.derby.client.am.Connection connection) {
+ protected Sqlca(Connection connection) {
connection_ = connection;
agent_ = connection_ != null ? connection_.agent_ : null;
}
@@ -495,7 +495,7 @@ public abstract class Sqlca {
return result;
}
- public long getRowCount() throws org.apache.derby.client.am.DisconnectException {
+ public long getRowCount() throws DisconnectException {
return ((long) getSqlErrd()[ HIGH_ORDER_ROW_COUNT ] << 32) +
getSqlErrd()[ LOW_ORDER_ROW_COUNT ];
}
@@ -508,7 +508,7 @@ public abstract class Sqlca {
return containsSqlcax_;
}
- public void resetRowsetSqlca(org.apache.derby.client.am.Connection connection,
+ public void resetRowsetSqlca(Connection connection,
int sqlCode,
String sqlState) {
connection_ = connection;
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java Sun Apr 14 04:17:07 2013
@@ -1688,8 +1688,7 @@ public class Statement implements java.s
if (resultSet_.fetchSize_ == 0 &&
(resultSet_.resultSetType_ == java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE ||
resultSet_.resultSetType_ == java.sql.ResultSet.TYPE_SCROLL_SENSITIVE)) {
- resultSet_.setFetchSize_(org.apache.derby.client.am.
- Configuration.defaultFetchSize);
+ resultSet_.setFetchSize_(Configuration.defaultFetchSize);
}
}
@@ -1715,7 +1714,7 @@ public class Statement implements java.s
// fetchSize_ is not set, we do not send any default value. Here since we always send
// the fetchSize_, we need to set it to what we sent.
if (resultSet.fetchSize_ == 0) {
- resultSet.fetchSize_ = org.apache.derby.client.am.Configuration.defaultFetchSize;
+ resultSet.fetchSize_ = Configuration.defaultFetchSize;
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java Sun Apr 14 04:17:07 2013
@@ -21,8 +21,6 @@ limitations under the License.
package org.apache.derby.client.am;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import org.apache.derby.client.am.stmtcache.JDBCStatementCache;
@@ -83,12 +81,12 @@ public final class StatementCacheInterac
/**
* @see java.sql.Connection#prepareStatement(String)
*/
- public synchronized PreparedStatement prepareStatement(String sql)
+ public synchronized java.sql.PreparedStatement prepareStatement(String sql)
throws SQLException {
StatementKey stmtKey = StatementKeyFactory.newPrepared(
sql, physicalConnection.getCurrentSchemaName(),
physicalConnection.holdability());
- PreparedStatement ps = cache.getCached(stmtKey);
+ java.sql.PreparedStatement ps = cache.getCached(stmtKey);
if (ps == null) {
ps = physicalConnection.prepareStatement(sql);
}
@@ -98,7 +96,7 @@ public final class StatementCacheInterac
/**
* @see java.sql.Connection#prepareStatement(String,int,int)
*/
- public synchronized PreparedStatement prepareStatement(
+ public synchronized java.sql.PreparedStatement prepareStatement(
String sql,
int resultSetType,
int resultSetConcurrency)
@@ -106,7 +104,7 @@ public final class StatementCacheInterac
StatementKey stmtKey = StatementKeyFactory.newPrepared(
sql, physicalConnection.getCurrentSchemaName(), resultSetType,
resultSetConcurrency, physicalConnection.holdability());
- PreparedStatement ps = cache.getCached(stmtKey);
+ java.sql.PreparedStatement ps = cache.getCached(stmtKey);
if (ps == null) {
ps = physicalConnection.prepareStatement(
sql, resultSetType, resultSetConcurrency);
@@ -117,7 +115,7 @@ public final class StatementCacheInterac
/**
* @see java.sql.Connection#prepareStatement(String,int,int,int)
*/
- public synchronized PreparedStatement prepareStatement(
+ public synchronized java.sql.PreparedStatement prepareStatement(
String sql,
int resultSetType,
int resultSetConcurrency,
@@ -127,7 +125,7 @@ public final class StatementCacheInterac
sql, physicalConnection.getCurrentSchemaName(), resultSetType,
resultSetConcurrency, resultSetHoldability);
- PreparedStatement ps = cache.getCached(stmtKey);
+ java.sql.PreparedStatement ps = cache.getCached(stmtKey);
if (ps == null) {
ps = physicalConnection.prepareStatement(
sql, resultSetType,resultSetConcurrency, resultSetHoldability);
@@ -138,14 +136,14 @@ public final class StatementCacheInterac
/**
* @see java.sql.Connection#prepareStatement(String,int)
*/
- public synchronized PreparedStatement prepareStatement(
+ public synchronized java.sql.PreparedStatement prepareStatement(
String sql,
int autoGeneratedKeys)
throws SQLException {
StatementKey stmtKey = StatementKeyFactory.newPrepared(
sql, physicalConnection.getCurrentSchemaName(),
physicalConnection.getHoldability(), autoGeneratedKeys);
- PreparedStatement ps = cache.getCached(stmtKey);
+ java.sql.PreparedStatement ps = cache.getCached(stmtKey);
if (ps == null) {
ps = physicalConnection.prepareStatement(sql, autoGeneratedKeys);
}
@@ -155,12 +153,14 @@ public final class StatementCacheInterac
/**
* @see java.sql.Connection#prepareCall(String)
*/
- public synchronized CallableStatement prepareCall(String sql)
+ public synchronized java.sql.CallableStatement prepareCall(String sql)
throws SQLException {
StatementKey stmtKey = StatementKeyFactory.newCallable(
sql, physicalConnection.getCurrentSchemaName(),
physicalConnection.holdability());
- CallableStatement cs = (CallableStatement)cache.getCached(stmtKey);
+ java.sql.CallableStatement cs =
+ (java.sql.CallableStatement)cache.getCached(stmtKey);
+
if (cs == null) {
cs = physicalConnection.prepareCall(sql);
}
@@ -170,14 +170,16 @@ public final class StatementCacheInterac
/**
* @see java.sql.Connection#prepareCall(String,int,int)
*/
- public synchronized CallableStatement prepareCall(String sql,
+ public synchronized java.sql.CallableStatement prepareCall(String sql,
int resultSetType,
int resultSetConcurrency)
throws SQLException {
StatementKey stmtKey = StatementKeyFactory.newCallable(
sql, physicalConnection.getCurrentSchemaName(), resultSetType,
resultSetConcurrency, physicalConnection.holdability());
- CallableStatement cs = (CallableStatement)cache.getCached(stmtKey);
+ java.sql.CallableStatement cs =
+ (java.sql.CallableStatement)cache.getCached(stmtKey);
+
if (cs == null) {
cs = physicalConnection.prepareCall(sql, resultSetType, resultSetConcurrency);
}
@@ -187,7 +189,7 @@ public final class StatementCacheInterac
/**
* @see java.sql.Connection#prepareCall(String,int,int,int)
*/
- public synchronized CallableStatement prepareCall(String sql,
+ public synchronized java.sql.CallableStatement prepareCall(String sql,
int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
@@ -195,7 +197,9 @@ public final class StatementCacheInterac
StatementKey stmtKey = StatementKeyFactory.newCallable(
sql, physicalConnection.getCurrentSchemaName(), resultSetType,
resultSetConcurrency, resultSetHoldability);
- CallableStatement cs = (CallableStatement)cache.getCached(stmtKey);
+ java.sql.CallableStatement cs =
+ (java.sql.CallableStatement)cache.getCached(stmtKey);
+
if (cs == null) {
cs = physicalConnection.prepareCall(sql, resultSetType, resultSetConcurrency,
resultSetHoldability);
@@ -248,15 +252,15 @@ public final class StatementCacheInterac
* @return A logical prepared statement.
* @throws SQLException if creating a logical prepared statement fails
*/
- private PreparedStatement createLogicalPreparedStatement(
- PreparedStatement ps,
- StatementKey stmtKey)
- throws SQLException {
+ private java.sql.PreparedStatement createLogicalPreparedStatement(
+ java.sql.PreparedStatement ps,
+ StatementKey stmtKey) throws SQLException {
+
LogicalPreparedStatement logicalPs =
ClientDriver.getFactory().newLogicalPreparedStatement(
ps, stmtKey, this);
- this.openLogicalStatements.add(logicalPs);
- return logicalPs;
+ this.openLogicalStatements.add(logicalPs);
+ return logicalPs;
}
/**
@@ -267,15 +271,15 @@ public final class StatementCacheInterac
* @return A logical callable statement.
* @throws SQLException if creating a logical callable statement fails
*/
- private CallableStatement createLogicalCallableStatement(
- CallableStatement cs,
- StatementKey stmtKey)
- throws SQLException {
+ private java.sql.CallableStatement createLogicalCallableStatement(
+ java.sql.CallableStatement cs,
+ StatementKey stmtKey) throws SQLException {
+
LogicalCallableStatement logicalCs =
ClientDriver.getFactory().newLogicalCallableStatement(
cs, stmtKey, this);
- this.openLogicalStatements.add(logicalCs);
- return logicalCs;
+ this.openLogicalStatements.add(logicalCs);
+ return logicalCs;
}
/**
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java Sun Apr 14 04:17:07 2013
@@ -21,7 +21,6 @@
package org.apache.derby.client.am;
-import java.io.BufferedInputStream;
import java.io.InputStream;
/**
@@ -43,9 +42,9 @@ class UpdateSensitiveBlobLocatorInputStr
* appropriate initializers.
*
* @param con connection to be used to read the
- * <code>Blob</code> value from the server
- * @param blob <code>Blob</code> object that contains locator for
- * the <code>Blob</code> value on the server.
+ * {@code Blob} value from the server
+ * @param blob {@code Blob} object that contains locator for
+ * the {@code Blob} value on the server.
*
* @throws SqlException If any exception occurs during stream
* creation.
@@ -60,13 +59,13 @@ class UpdateSensitiveBlobLocatorInputStr
* Creates an instance of the BlobLocatorInputStream.
*
* @param con connection to be used to read the
- * <code>Blob</code> value from the server
- * @param blob <code>Blob</code> object that contains locator for
- * the <code>Blob</code> value on the server.
- * @param position the position in the <code>Blob</code> of the first
+ * {@code Blob} value from the server
+ * @param blob {@code Blob} object that contains locator for
+ * the {@code Blob} value on the server.
+ * @param position the position in the {@code Blob} of the first
* byte to read.
* @param length the maximum number of bytes to read from
- * the <code>Blob</code>.
+ * the {@code Blob}.
*
* @throws SqlException If any exception occurs during stream
* creation.
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java Sun Apr 14 04:17:07 2013
@@ -43,9 +43,9 @@ class UpdateSensitiveClobLocatorInputStr
* super class constructor with appropriate initializers.
*
* @param con connection to be used to read the
- * <code>Clob</code> value from the server
- * @param clob <code>Clob</code> object that contains locator for
- * the <code>Clob</code> value on the server.
+ * {@code Clob} value from the server
+ * @param clob {@code Clob} object that contains locator for
+ * the {@code Clob} value on the server.
*
* @throws SqlException If any exception occurs during stream
* creation.
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java Sun Apr 14 04:17:07 2013
@@ -78,10 +78,10 @@ abstract class UpdateSensitiveLOBLocator
* and the connection to the appropriate values.
*
* @param con connection to be used to read the
- * <code>Lob</code> value from the server
- * @param lob <code>Lob</code> object which could be a
- * <code>Blob</code> or a <code>Clob</code>.
- * @param is an <code>InputStream</code> that contains the
+ * {@code Lob} value from the server
+ * @param lob {@code Lob} object which could be a
+ * {@code Blob} or a {@code Clob}.
+ * @param is an {@code InputStream} that contains the
* appropriate locator stream instance.
*/
protected UpdateSensitiveLOBLocatorInputStream(Connection con, Lob lob,
@@ -110,10 +110,10 @@ abstract class UpdateSensitiveLOBLocator
* length and the connection to the appropriate values.
*
* @param con connection to be used to read the
- * <code>Lob</code> value from the server
- * @param lob <code>Lob</code> object which could be a
- * <code>Blob</code> or a <code>Clob</code>.
- * @param is an <code>InputStream</code> that contains the
+ * {@code Lob} value from the server
+ * @param lob {@code Lob} object which could be a
+ * {@code Blob} or a {@code Clob}.
+ * @param is an {@code InputStream} that contains the
* appropriate locator stream instance.
* @param pos the position from which the first read begins.
* @param len the length in bytes of the partial value to be
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java Sun Apr 14 04:17:07 2013
@@ -21,7 +21,6 @@
package org.apache.derby.client.am.stmtcache;
-import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -53,7 +52,8 @@ public final class JDBCStatementCache {
/** Structure holding the cached prepared statement objects. */
//@GuardedBy("this");
- private final LinkedHashMap<StatementKey, PreparedStatement> statements;
+ private final
+ LinkedHashMap<StatementKey, java.sql.PreparedStatement> statements;
/**
* Creates a new, empty JDBC statement cache.
@@ -76,7 +76,8 @@ public final class JDBCStatementCache {
* @param statementKey key for the prepared statement to look up
* @return A cached statement if one exists, <code>null</code> otherwise.
*/
- public synchronized PreparedStatement getCached(StatementKey statementKey) {
+ public synchronized java.sql.PreparedStatement getCached(
+ StatementKey statementKey) {
if (SanityManager.DEBUG) {
// Getting a null here indicates a programming error, but does not
// cause Derby to fail.
@@ -96,7 +97,7 @@ public final class JDBCStatementCache {
*/
public synchronized boolean cacheStatement(
StatementKey statementKey,
- PreparedStatement ps) {
+ java.sql.PreparedStatement ps) {
if (SanityManager.DEBUG) {
SanityManager.ASSERT(statementKey != null,
"statementKey is not supposed to be null");
@@ -118,7 +119,7 @@ public final class JDBCStatementCache {
*/
//@NotThreadSafe
private static class BoundedLinkedHashMap
- extends LinkedHashMap<StatementKey, PreparedStatement> {
+ extends LinkedHashMap<StatementKey, java.sql.PreparedStatement> {
/** Maximum number of entries. */
private final int maxSize;
@@ -148,7 +149,7 @@ public final class JDBCStatementCache {
* <code>false</code> if not.
*/
protected boolean removeEldestEntry(
- Map.Entry<StatementKey, PreparedStatement> eldest) {
+ Map.Entry<StatementKey, java.sql.PreparedStatement> eldest) {
final boolean remove = size() > maxSize;
if (remove && eldest != null) {
try {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKey.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKey.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKey.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKey.java Sun Apr 14 04:17:07 2013
@@ -21,8 +21,6 @@
package org.apache.derby.client.am.stmtcache;
-import java.sql.ResultSet;
-import java.sql.Statement;
import org.apache.derby.shared.common.sanity.SanityManager;
/**
@@ -86,22 +84,22 @@ public class StatementKey {
// In sane builds, make sure valid JDBC values are passed.
if (SanityManager.DEBUG) {
SanityManager.ASSERT(
- rsType == ResultSet.TYPE_FORWARD_ONLY ||
- rsType == ResultSet.TYPE_SCROLL_INSENSITIVE ||
- rsType == ResultSet.TYPE_SCROLL_SENSITIVE,
- "Invalid result set type: " + rsType);
+ rsType == java.sql.ResultSet.TYPE_FORWARD_ONLY ||
+ rsType == java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE ||
+ rsType == java.sql.ResultSet.TYPE_SCROLL_SENSITIVE,
+ "Invalid result set type: " + rsType);
SanityManager.ASSERT(
- rsConcurrency == ResultSet.CONCUR_READ_ONLY ||
- rsConcurrency == ResultSet.CONCUR_UPDATABLE,
- "Invalid result set concurrency: " + rsConcurrency);
+ rsConcurrency == java.sql.ResultSet.CONCUR_READ_ONLY ||
+ rsConcurrency == java.sql.ResultSet.CONCUR_UPDATABLE,
+ "Invalid result set concurrency: " + rsConcurrency);
SanityManager.ASSERT(
- rsHoldability == ResultSet.HOLD_CURSORS_OVER_COMMIT ||
- rsHoldability == ResultSet.CLOSE_CURSORS_AT_COMMIT,
- "Invalid result set holdability: " + rsHoldability);
+ rsHoldability == java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT ||
+ rsHoldability == java.sql.ResultSet.CLOSE_CURSORS_AT_COMMIT,
+ "Invalid result set holdability: " + rsHoldability);
SanityManager.ASSERT(
- autogeneratedKeys == Statement.NO_GENERATED_KEYS ||
- autogeneratedKeys == Statement.RETURN_GENERATED_KEYS,
- "Invalid autogenerated key value: " + autogeneratedKeys);
+ autogeneratedKeys == java.sql.Statement.NO_GENERATED_KEYS ||
+ autogeneratedKeys == java.sql.Statement.RETURN_GENERATED_KEYS,
+ "Invalid autogenerated key value: " + autogeneratedKeys);
}
}