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/24 06:37:31 UTC
svn commit: r1471245 [12/14] - in /db/derby/code/trunk/java:
client/org/apache/derby/client/ client/org/apache/derby/client/am/
client/org/apache/derby/client/am/stmtcache/
client/org/apache/derby/client/net/ client/org/apache/derby/jdbc/
testing/org/a...
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java Wed Apr 24 04:37:28 2013
@@ -24,7 +24,7 @@ package org.apache.derby.client.net;
import java.util.HashMap;
import javax.transaction.xa.Xid;
-import org.apache.derby.client.am.Connection;
+import org.apache.derby.client.am.ClientConnection;
import org.apache.derby.client.am.ConnectionCallbackInterface;
import org.apache.derby.client.am.StatementCallbackInterface;
import org.apache.derby.client.am.ResultSetCallbackInterface;
@@ -51,7 +51,8 @@ public class NetConnectionReply extends
}
// NET only entry point
- void readExchangeServerAttributes(Connection connection) throws SqlException {
+ void readExchangeServerAttributes(ClientConnection connection)
+ throws SqlException {
startSameIdChainParse();
parseEXCSATreply((NetConnection) connection);
endOfSameIdChainData();
@@ -59,7 +60,7 @@ public class NetConnectionReply extends
}
// NET only entry point
- void readAccessSecurity(Connection connection,
+ void readAccessSecurity(ClientConnection connection,
int securityMechanism) throws SqlException {
startSameIdChainParse();
parseACCSECreply((NetConnection) connection, securityMechanism);
@@ -68,7 +69,7 @@ public class NetConnectionReply extends
}
// NET only entry point
- void readSecurityCheck(Connection connection) throws SqlException {
+ void readSecurityCheck(ClientConnection connection) throws SqlException {
startSameIdChainParse();
parseSECCHKreply((NetConnection) connection);
endOfSameIdChainData();
@@ -76,7 +77,7 @@ public class NetConnectionReply extends
}
// NET only entry point
- void readAccessDatabase(Connection connection) throws SqlException {
+ void readAccessDatabase(ClientConnection connection) throws SqlException {
startSameIdChainParse();
parseACCRDBreply((NetConnection) connection);
endOfSameIdChainData();
@@ -3262,7 +3263,7 @@ public class NetConnectionReply extends
*
* @throws org.apache.derby.client.am.DisconnectException
*/
- protected void parseInitialPBSD(Connection connection)
+ protected void parseInitialPBSD(ClientConnection connection)
throws DisconnectException {
if (peekCodePoint() != CodePoint.PBSD) {
return;
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java Wed Apr 24 04:37:28 2013
@@ -21,12 +21,15 @@
package org.apache.derby.client.net;
+import java.io.UnsupportedEncodingException;
+import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.HashMap;
import org.apache.derby.client.am.Agent;
-import org.apache.derby.client.am.Blob;
+import org.apache.derby.client.am.ClientBlob;
import org.apache.derby.client.am.ClientMessageId;
-import org.apache.derby.client.am.Clob;
+import org.apache.derby.client.am.ClientClob;
+import org.apache.derby.client.am.Cursor;
import org.apache.derby.client.am.Cursor;
import org.apache.derby.client.am.DisconnectException;
import org.apache.derby.client.am.Lob;
@@ -34,7 +37,8 @@ import org.apache.derby.client.am.Signed
import org.apache.derby.client.am.SqlCode;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.am.SqlWarning;
-import org.apache.derby.client.am.Types;
+import org.apache.derby.client.am.ClientTypes;
+import org.apache.derby.client.am.Utils;
import org.apache.derby.client.am.Utils;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.shared.common.sanity.SanityManager;
@@ -535,8 +539,8 @@ public class NetCursor extends Cursor {
long length = 0L;
if (isNull_[index] ||
- (jdbcTypes_[index] != Types.BLOB &&
- jdbcTypes_[index] != Types.CLOB)) {
+ (jdbcTypes_[index] != ClientTypes.BLOB &&
+ jdbcTypes_[index] != ClientTypes.CLOB)) {
return false;
}
@@ -878,7 +882,7 @@ public class NetCursor extends Cursor {
try {
s = new String(dataBuffer_, position_, length, encoding);
- } catch (java.io.UnsupportedEncodingException e) {
+ } catch (UnsupportedEncodingException e) {
netAgent_.accumulateChainBreakingReadExceptionAndThrow(
new DisconnectException(
netAgent_,
@@ -937,8 +941,11 @@ public class NetCursor extends Cursor {
/**
* @see org.apache.derby.client.am.Cursor#getBlobColumn_
*/
- public Blob getBlobColumn_(int column, Agent agent, boolean toBePublished)
- throws SqlException {
+ public ClientBlob getBlobColumn_(
+ int column,
+ Agent agent,
+ boolean toBePublished) throws SqlException {
+
// Only inform the tracker if the Blob is published to the user.
if (toBePublished) {
if ( netResultSet_ != null ) { netResultSet_.markLOBAsPublished(column); }
@@ -946,14 +953,14 @@ public class NetCursor extends Cursor {
// Check for locator
int locator = locator(column);
if (locator > 0) { // Create locator-based LOB object
- return new Blob(agent, locator);
+ return new ClientBlob(agent, locator);
}
// The Blob value has been sent instead of locator
int index = column - 1;
int dataOffset;
byte[] data;
- Blob blob = null;
+ ClientBlob blob = null;
// locate the EXTDTA bytes, if any
data = findExtdtaData(column);
@@ -967,9 +974,9 @@ public class NetCursor extends Cursor {
dataOffset = 1;
}
- blob = new Blob(data, agent, dataOffset);
+ blob = new ClientBlob(data, agent, dataOffset);
} else {
- blob = new Blob(new byte[0], agent, 0);
+ blob = new ClientBlob(new byte[0], agent, 0);
}
return blob;
@@ -979,8 +986,11 @@ public class NetCursor extends Cursor {
/**
* @see org.apache.derby.client.am.Cursor#getClobColumn_
*/
- public Clob getClobColumn_(int column, Agent agent, boolean toBePublished)
- throws SqlException {
+ public ClientClob getClobColumn_(
+ int column,
+ Agent agent,
+ boolean toBePublished) throws SqlException {
+
// Only inform the tracker if the Clob is published to the user.
if (toBePublished) {
if ( netResultSet_ != null ) { netResultSet_.markLOBAsPublished(column); }
@@ -988,14 +998,14 @@ public class NetCursor extends Cursor {
// Check for locator
int locator = locator(column);
if (locator > 0) { // Create locator-based LOB object
- return new Clob(agent, locator);
+ return new ClientClob(agent, locator);
}
// The Clob value has been sent instead of locator
int index = column - 1;
int dataOffset;
byte[] data;
- Clob clob = null;
+ ClientClob clob = null;
// locate the EXTDTA bytes, if any
data = findExtdtaData(column);
@@ -1008,10 +1018,10 @@ public class NetCursor extends Cursor {
} else {
dataOffset = 1;
}
- clob = new Clob(agent, data, charsetName_[index], dataOffset);
+ clob = new ClientClob(agent, data, charsetName_[index], dataOffset);
} else {
// the locator is not valid, it is a zero-length LOB
- clob = new Clob(agent, "");
+ clob = new ClientClob(agent, "");
}
return clob;
@@ -1034,7 +1044,7 @@ public class NetCursor extends Cursor {
// reset the dataBuffer_ before getting more data if cursor is foward-only.
// getMoreData() is only called in Cursor.next() when current position is
// equal to lastValidBytePosition_.
- if (netResultSet_.resultSetType_ == java.sql.ResultSet.TYPE_FORWARD_ONLY) {
+ if (netResultSet_.resultSetType_ == ResultSet.TYPE_FORWARD_ONLY) {
resetDataBuffer();
}
netResultSet_.flowFetch();
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java Wed Apr 24 04:37:28 2013
@@ -21,11 +21,11 @@
package org.apache.derby.client.net;
import org.apache.derby.client.am.Configuration;
-import org.apache.derby.client.am.DatabaseMetaData;
+import org.apache.derby.client.am.ClientDatabaseMetaData;
import org.apache.derby.client.am.ProductLevel;
import org.apache.derby.client.am.SqlException;
-public class NetDatabaseMetaData extends DatabaseMetaData {
+public class NetDatabaseMetaData extends ClientDatabaseMetaData {
public NetDatabaseMetaData(NetAgent netAgent, NetConnection netConnection) {
// Consider setting product level during parse
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java Wed Apr 24 04:37:28 2013
@@ -90,7 +90,7 @@ public class NetDatabaseMetaData40 exten
* @throws java.sql.SQLExption if no object if found that implements the
* interface
*/
- public <T> T unwrap(java.lang.Class<T> interfaces)
+ public <T> T unwrap(Class<T> interfaces)
throws SQLException {
try {
return interfaces.cast(this);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java Wed Apr 24 04:37:28 2013
@@ -23,7 +23,8 @@ package org.apache.derby.client.net;
// network traffic tracer.
-import org.apache.derby.client.am.Connection;
+import java.io.PrintWriter;
+import org.apache.derby.client.am.ClientConnection;
import org.apache.derby.client.am.LogWriter;
import org.apache.derby.jdbc.ClientDataSource;
@@ -125,7 +126,7 @@ public class NetLogWriter extends LogWri
//-----------------------------constructors/finalizer-------------------------
// One NetLogWriter object is created per data source, iff tracing is enabled.
- public NetLogWriter(java.io.PrintWriter printWriter, int traceLevel) {
+ public NetLogWriter(PrintWriter printWriter, int traceLevel) {
super(printWriter, traceLevel);
// Initialize the codepoint name table if not previously initialized.
@@ -146,7 +147,7 @@ public class NetLogWriter extends LogWri
//------------------------------entry points----------------------------------
// Specialization of LogWriter.traceConnectsExit()
- public void traceConnectsExit(Connection connection) {
+ public void traceConnectsExit(ClientConnection connection) {
NetConnection c = (NetConnection) connection;
synchronized (printWriter_) {
super.traceConnectsExit(c);
@@ -164,7 +165,7 @@ public class NetLogWriter extends LogWri
}
}
- public void traceConnectsResetExit(Connection connection) {
+ public void traceConnectsResetExit(ClientConnection connection) {
NetConnection c = (NetConnection) connection;
synchronized (printWriter_) {
super.traceConnectsResetExit(c);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java Wed Apr 24 04:37:28 2013
@@ -178,7 +178,7 @@ public class NetPackageRequest extends N
private byte[] getBytes(String string, String encoding) throws SqlException {
try {
return string.getBytes(encoding);
- } catch (java.lang.Exception e) {
+ } catch (Exception e) {
throw new SqlException(netAgent_.logWriter_,
new ClientMessageId(SQLState.JAVA_EXCEPTION),
e.getClass().getName(), e.getMessage(), e);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java Wed Apr 24 04:37:28 2013
@@ -21,11 +21,10 @@
package org.apache.derby.client.net;
import org.apache.derby.client.am.ColumnMetaData;
-import org.apache.derby.client.am.PreparedStatement;
+import org.apache.derby.client.am.ClientPreparedStatement;
import org.apache.derby.client.am.Section;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.jdbc.ClientDriver;
-import org.apache.derby.client.am.ClientJDBCObjectFactory;
import org.apache.derby.client.ClientPooledConnection;
import org.apache.derby.client.am.MaterialPreparedStatement;
@@ -35,25 +34,25 @@ public class NetPreparedStatement extend
// Alias for (NetPreparedStatement) super.statement.
/*final*/
- PreparedStatement preparedStatement_;
+ ClientPreparedStatement preparedStatement_;
// Relay constructor for NetCallableStatement.
- NetPreparedStatement(PreparedStatement statement,
+ NetPreparedStatement(ClientPreparedStatement statement,
NetAgent netAgent,
NetConnection netConnection) {
super(statement, netAgent, netConnection);
initNetPreparedStatement(statement);
}
- void resetNetPreparedStatement(PreparedStatement statement,
+ void resetNetPreparedStatement(ClientPreparedStatement statement,
NetAgent netAgent,
NetConnection netConnection) {
super.resetNetStatement(statement, netAgent, netConnection);
initNetPreparedStatement(statement);
}
- private void initNetPreparedStatement(PreparedStatement statement) {
+ private void initNetPreparedStatement(ClientPreparedStatement statement) {
preparedStatement_ = statement;
preparedStatement_.materialPreparedStatement_ = this;
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java Wed Apr 24 04:37:28 2013
@@ -20,14 +20,15 @@
*/
package org.apache.derby.client.net;
+import java.sql.ResultSet;
import org.apache.derby.client.am.Cursor;
import org.apache.derby.client.am.DisconnectException;
-import org.apache.derby.client.am.ResultSet;
+import org.apache.derby.client.am.ClientResultSet;
import org.apache.derby.client.am.Section;
import org.apache.derby.client.am.SqlException;
-public class NetResultSet extends ResultSet {
+public class NetResultSet extends ClientResultSet {
// Alias for (NetConnection) super.statement.connection
private final NetConnection netConnection_;
@@ -191,7 +192,7 @@ public class NetResultSet extends Result
// ------------------------------- abstract box car methods --------------------------------------
public void writeFetch_(Section section) throws SqlException {
- if (resultSetType_ == java.sql.ResultSet.TYPE_FORWARD_ONLY && fetchSize_ != 0 &&
+ if (resultSetType_ == ResultSet.TYPE_FORWARD_ONLY && fetchSize_ != 0 &&
rowsYetToBeReceivedForRowset_ > 0) {
netAgent_.resultSetRequest_.writeFetch(this,
section,
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java Wed Apr 24 04:37:28 2013
@@ -24,6 +24,8 @@ package org.apache.derby.client.net;
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
+import java.sql.Blob;
+import java.sql.Clob;
import java.sql.Date;
import java.sql.NClob;
import java.sql.RowId;
@@ -180,7 +182,7 @@ public class NetResultSet40 extends NetR
* @throws java.sql.SQLExption if no object if found that implements the
* interface
*/
- public <T> T unwrap(java.lang.Class<T> interfaces)
+ public <T> T unwrap(Class<T> interfaces)
throws SQLException {
try {
checkForClosedResultSet("unwrap");
@@ -296,10 +298,10 @@ public class NetResultSet40 extends NetR
else if ( Time.class.equals( type ) ) { retval = getTime( columnIndex ); }
else if ( Timestamp.class.equals( type ) ) { retval = getTimestamp( columnIndex ); }
- else if ( java.sql.Blob.class.equals( type ) ) {
+ else if ( Blob.class.equals( type ) ) {
retval = getBlob( columnIndex );
- } else if ( java.sql.Clob.class.equals( type ) ) {
+ } else if ( Clob.class.equals( type ) ) {
retval = getClob( columnIndex );
} else if ( type.isArray() &&
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetReply.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetReply.java Wed Apr 24 04:37:28 2013
@@ -22,7 +22,7 @@
package org.apache.derby.client.net;
import org.apache.derby.client.am.DisconnectException;
-import org.apache.derby.client.am.ResultSet;
+import org.apache.derby.client.am.ClientResultSet;
import org.apache.derby.client.am.ResultSetCallbackInterface;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.am.ClientMessageId;
@@ -111,14 +111,16 @@ public class NetResultSetReply extends N
int ddmLength = getDdmLength();
ensureBLayerDataInBuffer(ddmLength);
- ((ResultSet) resultSetI).expandRowsetSqlca();
- NetSqlca sqlca = parseSQLCARDrow(((ResultSet) resultSetI).rowsetSqlca_);
+ ((ClientResultSet) resultSetI).expandRowsetSqlca();
+ NetSqlca sqlca = parseSQLCARDrow(
+ ((ClientResultSet) resultSetI).rowsetSqlca_);
int daNullIndicator = readFastByte();
adjustLengths(getDdmLength());
// define event interface and use the event method
// only get the rowCount_ if sqlca is not null and rowCount_ is unknown
if (sqlca != null && sqlca.containsSqlcax()) {
- ((ResultSet) resultSetI).setRowCountEvent(sqlca.getRowCount());
+ ((ClientResultSet)resultSetI).setRowCountEvent(
+ sqlca.getRowCount());
}
peekCP = peekCodePoint();
@@ -140,7 +142,7 @@ public class NetResultSetReply extends N
if (peekCP == CodePoint.EXTDTA) {
found = true;
do {
- copyEXTDTA((NetCursor) ((ResultSet) resultSetI).cursor_);
+ copyEXTDTA((NetCursor) ((ClientResultSet) resultSetI).cursor_);
if (longBufferForDecryption_ != null) {//encrypted EXTDTA
buffer_ = longBufferForDecryption_;
pos_ = longPosForDecryption_;
@@ -155,14 +157,18 @@ public class NetResultSetReply extends N
if (peekCP == CodePoint.SQLCARD) {
found = true;
- ((ResultSet) resultSetI).expandRowsetSqlca();
- NetSqlca netSqlca = parseSQLCARD(((ResultSet) resultSetI).rowsetSqlca_);
+ ((ClientResultSet) resultSetI).expandRowsetSqlca();
+ NetSqlca netSqlca =
+ parseSQLCARD(((ClientResultSet)resultSetI).rowsetSqlca_);
// for an atomic operation, the SQLCA contains the sqlcode for the first (statement
// terminating)error, the last warning, or zero. all multi-row fetch operatons are
// atomic. (the only operation that is not atomic is multi-row insert).
- if (((ResultSet) resultSetI).sensitivity_ != ResultSet.sensitivity_sensitive_dynamic__) {
+ if (((ClientResultSet)resultSetI).sensitivity_ !=
+ ClientResultSet.sensitivity_sensitive_dynamic__) {
+
if (netSqlca != null && netSqlca.containsSqlcax() && netSqlca.getRowsetRowCount() == 0) {
- ((ResultSet) resultSetI).setRowCountEvent(netSqlca.getRowCount());
+ ((ClientResultSet)resultSetI).setRowCountEvent(
+ netSqlca.getRowCount());
}
}
resultSetI.completeSqlca(netSqlca);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetRequest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetRequest.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetRequest.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSetRequest.java Wed Apr 24 04:37:28 2013
@@ -21,8 +21,9 @@
package org.apache.derby.client.net;
+import java.sql.ResultSet;
import org.apache.derby.client.am.ColumnMetaData;
-import org.apache.derby.client.am.ResultSet;
+import org.apache.derby.client.am.ClientResultSet;
import org.apache.derby.client.am.Section;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.am.ClientMessageId;
@@ -45,8 +46,11 @@ public class NetResultSetRequest extends
((NetStatement) resultSet.statement_.getMaterialStatement()).qryrowsetSentOnOpnqry_;
boolean sendRtnextdta = false;
- if (sendQryrowset && resultSet.resultSetType_ == java.sql.ResultSet.TYPE_FORWARD_ONLY &&
- ((NetCursor) resultSet.cursor_).hasLobs_) {
+
+ if (sendQryrowset && resultSet.resultSetType_ ==
+ ResultSet.TYPE_FORWARD_ONLY &&
+ ((NetCursor) resultSet.cursor_).hasLobs_) {
+
fetchSize = 1;
resultSet.fetchSize_ = 1;
sendRtnextdta = true;
@@ -91,10 +95,12 @@ public class NetResultSetRequest extends
// * qryrowset is optional. it is ignored on opnqry. if not sent on cntqry,
// then the fetch is going fetch next row as opposed to fetch next rowset.
boolean sendQryrowset =
- (resultSet.isRowsetCursor_ ||
- (((NetStatement) resultSet.statement_.getMaterialStatement()).qryrowsetSentOnOpnqry_ &&
- (resultSet.sensitivity_ == ResultSet.sensitivity_sensitive_static__ ||
- ((NetCursor) resultSet.cursor_).blocking_)));
+ resultSet.isRowsetCursor_ ||
+ (((NetStatement)resultSet.statement_.getMaterialStatement()).
+ qryrowsetSentOnOpnqry_ &&
+ (resultSet.sensitivity_ ==
+ ClientResultSet.sensitivity_sensitive_static__ ||
+ ((NetCursor)resultSet.cursor_).blocking_));
buildScrollCNTQRY(protocolOrientation,
rowToFetch,
@@ -308,16 +314,16 @@ public class NetResultSetRequest extends
// Called by NetResultSetRequest.writeScrollableFetch()
private int computePROTOCOLOrientation(int orientation) throws SqlException {
switch (orientation) {
- case ResultSet.scrollOrientation_absolute__:
+ case ClientResultSet.scrollOrientation_absolute__:
return CodePoint.QRYSCRABS;
- case ResultSet.scrollOrientation_after__:
+ case ClientResultSet.scrollOrientation_after__:
return CodePoint.QRYSCRAFT;
- case ResultSet.scrollOrientation_before__:
+ case ClientResultSet.scrollOrientation_before__:
return CodePoint.QRYSCRBEF;
- case ResultSet.scrollOrientation_relative__:
+ case ClientResultSet.scrollOrientation_relative__:
return CodePoint.QRYSCRREL;
default:
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java Wed Apr 24 04:37:28 2013
@@ -26,14 +26,14 @@ import org.apache.derby.shared.common.re
import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.client.am.SqlException;
import java.io.UnsupportedEncodingException;
-import org.apache.derby.client.am.Connection;
+import org.apache.derby.client.am.ClientConnection;
import org.apache.derby.client.am.DisconnectException;
public class NetSqlca extends Sqlca {
// these are the same variables that are in the Sqlca except ccsids
// are a little different
- NetSqlca(Connection connection,
+ NetSqlca(ClientConnection connection,
int sqlCode,
String sqlState,
byte[] sqlErrpBytes) {
@@ -43,7 +43,7 @@ public class NetSqlca extends Sqlca {
sqlErrpBytes_ = sqlErrpBytes;
}
- NetSqlca(Connection connection,
+ NetSqlca(ClientConnection connection,
int sqlCode,
byte[] sqlState,
byte[] sqlErrpBytes) throws SqlException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java Wed Apr 24 04:37:28 2013
@@ -21,16 +21,17 @@
package org.apache.derby.client.net;
+import java.util.ArrayList;
import org.apache.derby.client.am.ColumnMetaData;
-import org.apache.derby.client.am.MaterialStatement;
import org.apache.derby.client.am.Section;
import org.apache.derby.client.am.SqlException;
-import org.apache.derby.client.am.Statement;
+import org.apache.derby.client.am.ClientStatement;
+import org.apache.derby.client.am.MaterialStatement;
import org.apache.derby.jdbc.ClientDriver;
public class NetStatement implements MaterialStatement {
- Statement statement_;
+ ClientStatement statement_;
// Alias for (NetConnection) statement_.connection
@@ -58,23 +59,29 @@ public class NetStatement implements Mat
}
// Relay constructor for NetPreparedStatement.
- NetStatement(Statement statement,
- NetAgent netAgent,
- NetConnection netConnection) {
+ NetStatement(
+ ClientStatement statement,
+ NetAgent netAgent,
+ NetConnection netConnection) {
+
this();
initNetStatement(statement, netAgent, netConnection);
}
- void resetNetStatement(Statement statement,
- NetAgent netAgent,
- NetConnection netConnection) {
+ void resetNetStatement(
+ ClientStatement statement,
+ NetAgent netAgent,
+ NetConnection netConnection) {
+
resetNetStatement();
initNetStatement(statement, netAgent, netConnection);
}
- private void initNetStatement(Statement statement,
- NetAgent netAgent,
- NetConnection netConnection) {
+ private void initNetStatement(
+ ClientStatement statement,
+ NetAgent netAgent,
+ NetConnection netConnection) {
+
netAgent_ = netAgent;
netConnection_ = netConnection;
statement_ = statement;
@@ -99,22 +106,38 @@ public class NetStatement implements Mat
// Called by abstract Connection.createStatement().newStatement() for jdbc 2 statements with scroll attributes
NetStatement(NetAgent netAgent, NetConnection netConnection, int type, int concurrency, int holdability) throws SqlException {
- this(ClientDriver.getFactory().newStatement(netAgent, netConnection, type, concurrency, holdability, java.sql.Statement.NO_GENERATED_KEYS,
- null,null
- ),
- netAgent,
- netConnection);
+ this(ClientDriver.getFactory().newStatement(
+ netAgent,
+ netConnection,
+ type,
+ concurrency,
+ holdability,
+ ClientStatement.NO_GENERATED_KEYS,
+ null,
+ null),
+ netAgent,
+ netConnection);
}
void resetNetStatement(NetAgent netAgent, NetConnection netConnection, int type, int concurrency, int holdability) throws SqlException {
- statement_.resetStatement(netAgent, netConnection, type, concurrency, holdability, java.sql.Statement.NO_GENERATED_KEYS,
- null, null);
+ statement_.resetStatement(
+ netAgent,
+ netConnection,
+ type,
+ concurrency,
+ holdability,
+ ClientStatement.NO_GENERATED_KEYS,
+ null,
+ null);
resetNetStatement(statement_, netAgent, netConnection);
}
// ------------------------abstract box car methods-----------------------------------------------
- public void writeSetSpecialRegister_(Section section, java.util.ArrayList sqlsttList) throws SqlException {
+ public void writeSetSpecialRegister_(
+ Section section,
+ ArrayList sqlsttList) throws SqlException {
+
netAgent_.statementRequest_.writeSetSpecialRegister(section,sqlsttList);
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java?rev=1471245&r1=1471244&r2=1471245&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java Wed Apr 24 04:37:28 2013
@@ -21,6 +21,7 @@
package org.apache.derby.client.net;
+import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
import org.apache.derby.client.am.ClientMessageId;
@@ -30,9 +31,9 @@ import org.apache.derby.client.am.Prepar
import org.apache.derby.client.am.ResultSetCallbackInterface;
import org.apache.derby.client.am.Section;
import org.apache.derby.client.am.SqlException;
-import org.apache.derby.client.am.Statement;
+import org.apache.derby.client.am.ClientStatement;
import org.apache.derby.client.am.StatementCallbackInterface;
-import org.apache.derby.client.am.Types;
+import org.apache.derby.client.am.ClientTypes;
import org.apache.derby.client.am.Utils;
import org.apache.derby.jdbc.ClientDriver;
import org.apache.derby.shared.common.i18n.MessageUtil;
@@ -275,7 +276,7 @@ public class NetStatementReply extends N
// Parse the reply for the Execute SQL Statement Command.
// This method handles the parsing of all command replies and reply data
// for the excsqlstt command.
- // Also called by CallableStatement.readExecuteCall()
+ // Also called by ClientCallableStatement.readExecuteCall()
private void parseEXCSQLSTTreply(StatementCallbackInterface statementI) throws DisconnectException {
// first handle the transaction component, which consists of one or more
// reply messages indicating the transaction state.
@@ -326,10 +327,11 @@ public class NetStatementReply extends N
// has parameters or singleton select which translates to sqldtard.
NetSqldta netSqldta = null;
boolean useCachedSingletonRowData = false;
- if (((Statement) statementI).cachedSingletonRowData_ == null) {
+ if (((ClientStatement)statementI).cachedSingletonRowData_ == null) {
netSqldta = new NetSqldta(netAgent_);
} else {
- netSqldta = (NetSqldta) ((Statement) statementI).cachedSingletonRowData_;
+ netSqldta = (NetSqldta)((ClientStatement) statementI).
+ cachedSingletonRowData_;
netSqldta.resetDataBuffer();
netSqldta.extdtaData_.clear();
useCachedSingletonRowData = true;
@@ -885,7 +887,7 @@ public class NetStatementReply extends N
netAgent_.setSvrcod(svrcod);
// hack for now until event methods are used below
- Statement statement = (Statement) statementI;
+ ClientStatement statement = (ClientStatement) statementI;
// if there is a cached Cursor object, then use the cached cursor object.
NetResultSet rs = null;
@@ -937,7 +939,7 @@ public class NetStatementReply extends N
// QRYCLSIMP only applies to OPNQRY, not EXCSQLSTT
final boolean qryclsimp =
isOPNQRYreply &&
- (rs.resultSetType_ == java.sql.ResultSet.TYPE_FORWARD_ONLY) &&
+ (rs.resultSetType_ == ResultSet.TYPE_FORWARD_ONLY) &&
netAgent_.netConnection_.serverSupportsQryclsimp();
rs.netCursor_.setQryclsimpEnabled(qryclsimp);
@@ -1529,7 +1531,7 @@ public class NetStatementReply extends N
longValueForDecryption_ = null;
}
netCursor.extdtaData_.add(data);
- } catch (java.lang.OutOfMemoryError e) {
+ } catch (OutOfMemoryError e) {
agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
new ClientMessageId(SQLState.NET_LOB_DATA_TOO_LARGE_FOR_JVM), null, e));
}
@@ -1991,7 +1993,10 @@ public class NetStatementReply extends N
columnMetaData.nullable_[columnNumber] = Utils.isSqlTypeNullable(sqlType);
columnMetaData.sqlCcsid_[columnNumber] = ccsid;
columnMetaData.types_[columnNumber] =
- Types.mapDERBYTypeToDriverType(true, sqlType, columnLength, ccsid); // true means isDescribed
+ ClientTypes.mapDERBYTypeToDriverType(
+ true, sqlType, columnLength, ccsid);
+ // true means isDescribed
+
parseSQLDOPTGRP(columnMetaData, columnNumber);
}
@@ -2006,8 +2011,9 @@ public class NetStatementReply extends N
{
int jdbcType = columnMetaData.types_[columnNumber];
- if ( !(jdbcType == Types.JAVA_OBJECT) || !netAgent_.netConnection_.serverSupportsUDTs() )
- {
+ if (!(jdbcType == ClientTypes.JAVA_OBJECT) ||
+ !netAgent_.netConnection_.serverSupportsUDTs()) {
+
if (readFastUnsignedByte() == CodePoint.NULLDATA) { return; }
}
else
@@ -2289,12 +2295,12 @@ public class NetStatementReply extends N
// but we will set it to the default.
if (qryattscr == 0xF0) {
- return java.sql.ResultSet.TYPE_FORWARD_ONLY;
+ return ResultSet.TYPE_FORWARD_ONLY;
}
switch (qryattsns) {
case CodePoint.QRYINS:
- return java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE;
+ return ResultSet.TYPE_SCROLL_INSENSITIVE;
default:
return defaultType;
}
@@ -2306,9 +2312,9 @@ public class NetStatementReply extends N
// we want to set it to the actual concurrency.
switch (qryattupd) {
case CodePoint.QRYRDO:
- return java.sql.ResultSet.CONCUR_READ_ONLY;
+ return ResultSet.CONCUR_READ_ONLY;
case CodePoint.QRYUPD:
- return java.sql.ResultSet.CONCUR_UPDATABLE;
+ return ResultSet.CONCUR_UPDATABLE;
default:
return defaultConcurrency;
}
@@ -2316,9 +2322,9 @@ public class NetStatementReply extends N
private int calculateResultSetHoldability(int sqlcsrhld) {
if (sqlcsrhld == 0xF0) {
- return java.sql.ResultSet.CLOSE_CURSORS_AT_COMMIT;
+ return ResultSet.CLOSE_CURSORS_AT_COMMIT;
} else {
- return java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
+ return ResultSet.HOLD_CURSORS_OVER_COMMIT;
}
}