Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReply.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReply.java?rev=165585&r1=165584&r2=165585&view=diff ============================================================================== --- incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReply.java (original) +++ incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReply.java Sun May 1 23:25:59 2005 @@ -20,47 +20,41 @@ package org.apache.derby.client.net; +import org.apache.derby.client.am.Agent; import org.apache.derby.client.am.ResultSetCallbackInterface; import org.apache.derby.client.am.SqlException; -import org.apache.derby.client.am.Agent; -public class ResultSetReply extends StatementReply -{ - private ResultSetReplyInterface materialResultSetReply_; - - public ResultSetReply (Agent agent, - ResultSetReplyInterface materialResultSetReply, - StatementReplyInterface materialStatementReply, - ConnectionReplyInterface materialConnectionReply) - { - super (agent, materialStatementReply, materialConnectionReply); - materialResultSetReply_ = materialResultSetReply; - } - - public void readFetch (ResultSetCallbackInterface resultSet) throws SqlException - { - materialResultSetReply_.readFetch(resultSet); - agent_.checkForChainBreakingException_(); - } - - - // think about splitting out the position cursor stuff from the fetch stuff - public void readScrollableFetch (ResultSetCallbackInterface resultSet) throws SqlException - { - materialResultSetReply_.readScrollableFetch(resultSet); - agent_.checkForChainBreakingException_(); - } - - public void readPositioningFetch (ResultSetCallbackInterface resultSet) throws SqlException - { - materialResultSetReply_.readPositioningFetch(resultSet); - agent_.checkForChainBreakingException_(); - } - - public void readCursorClose (ResultSetCallbackInterface resultSet) throws SqlException - { - materialResultSetReply_.readCursorClose(resultSet); - agent_.checkForChainBreakingException_(); - } +public class ResultSetReply extends StatementReply { + private ResultSetReplyInterface materialResultSetReply_; + + public ResultSetReply(Agent agent, + ResultSetReplyInterface materialResultSetReply, + StatementReplyInterface materialStatementReply, + ConnectionReplyInterface materialConnectionReply) { + super(agent, materialStatementReply, materialConnectionReply); + materialResultSetReply_ = materialResultSetReply; + } + + public void readFetch(ResultSetCallbackInterface resultSet) throws SqlException { + materialResultSetReply_.readFetch(resultSet); + agent_.checkForChainBreakingException_(); + } + + + // think about splitting out the position cursor stuff from the fetch stuff + public void readScrollableFetch(ResultSetCallbackInterface resultSet) throws SqlException { + materialResultSetReply_.readScrollableFetch(resultSet); + agent_.checkForChainBreakingException_(); + } + + public void readPositioningFetch(ResultSetCallbackInterface resultSet) throws SqlException { + materialResultSetReply_.readPositioningFetch(resultSet); + agent_.checkForChainBreakingException_(); + } + + public void readCursorClose(ResultSetCallbackInterface resultSet) throws SqlException { + materialResultSetReply_.readCursorClose(resultSet); + agent_.checkForChainBreakingException_(); + } }
Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java?rev=165585&r1=165584&r2=165585&view=diff ============================================================================== --- incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java (original) +++ incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java Sun May 1 23:25:59 2005 @@ -22,13 +22,12 @@ import org.apache.derby.client.am.ResultSetCallbackInterface; -public interface ResultSetReplyInterface -{ - public void readFetch (ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; +public interface ResultSetReplyInterface { + public void readFetch(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; - public void readScrollableFetch (ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; + public void readScrollableFetch(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; - public void readPositioningFetch (ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; + public void readPositioningFetch(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; - public void readCursorClose (ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; + public void readCursorClose(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException; } Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java?rev=165585&r1=165584&r2=165585&view=diff ============================================================================== --- incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java (original) +++ incubator/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java Sun May 1 23:25:59 2005 @@ -26,24 +26,25 @@ // In addition, ResultSet objects are passed for convenient access to any material result set caches. // Implementations of this interface should not dereference common layer ResultSet state, as it is passed in, // but may dereference material layer ResultSet state if necessary for performance. -public interface ResultSetRequestInterface -{ - public void writeFetch (NetResultSet resultSet, - Section section, - int fetchSize) throws org.apache.derby.client.am.SqlException; - public void writeScrollableFetch (NetResultSet resultSet, - Section section, - int fetchSize, - int orientation, - long rowToFetch, - boolean resetQueryBlocks) throws org.apache.derby.client.am.SqlException; - public void writePositioningFetch (NetResultSet resultSet, +public interface ResultSetRequestInterface { + public void writeFetch(NetResultSet resultSet, + Section section, + int fetchSize) throws org.apache.derby.client.am.SqlException; + + public void writeScrollableFetch(NetResultSet resultSet, Section section, + int fetchSize, int orientation, - long rowToFetch) throws org.apache.derby.client.am.SqlException; + long rowToFetch, + boolean resetQueryBlocks) throws org.apache.derby.client.am.SqlException; + + public void writePositioningFetch(NetResultSet resultSet, + Section section, + int orientation, + long rowToFetch) throws org.apache.derby.client.am.SqlException; - public void writeCursorClose (NetResultSet resultSet, - Section section) throws org.apache.derby.client.am.SqlException; + public void writeCursorClose(NetResultSet resultSet, + Section section) throws org.apache.derby.client.am.SqlException; } Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReply.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReply.java?rev=165585&r1=165584&r2=165585&view=diff ============================================================================== --- incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReply.java (original) +++ incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReply.java Sun May 1 23:25:59 2005 @@ -20,75 +20,64 @@ package org.apache.derby.client.net; -import org.apache.derby.client.am.StatementCallbackInterface; +import org.apache.derby.client.am.Agent; import org.apache.derby.client.am.PreparedStatementCallbackInterface; import org.apache.derby.client.am.SqlException; -import org.apache.derby.client.am.Agent; +import org.apache.derby.client.am.StatementCallbackInterface; + +public class StatementReply extends ConnectionReply { + private StatementReplyInterface materialStatementReply_; -public class StatementReply extends ConnectionReply -{ - private StatementReplyInterface materialStatementReply_; - - StatementReply (Agent agent, - StatementReplyInterface materialStatementReply, - ConnectionReplyInterface materialConnectionReply) - { - super (agent,materialConnectionReply); - materialStatementReply_ = materialStatementReply; - } - - public void readPrepareDescribeOutput (StatementCallbackInterface statement) throws SqlException - { - materialStatementReply_.readPrepareDescribeOutput(statement); - agent_.checkForChainBreakingException_(); - } - - public void readExecuteImmediate (StatementCallbackInterface statement) throws SqlException - { - materialStatementReply_.readExecuteImmediate(statement); - agent_.checkForChainBreakingException_(); - } - - public void readOpenQuery (StatementCallbackInterface statement) throws SqlException - { - materialStatementReply_.readOpenQuery(statement); - agent_.checkForChainBreakingException_(); - } - - public void readExecute (PreparedStatementCallbackInterface preparedStatement) throws SqlException - { - materialStatementReply_.readExecute(preparedStatement); - agent_.checkForChainBreakingException_(); - } - - public void readPrepare (StatementCallbackInterface statement) throws SqlException - { - materialStatementReply_.readPrepare(statement); - agent_.checkForChainBreakingException_(); - } - - public void readDescribeInput (PreparedStatementCallbackInterface preparedStatement) throws SqlException - { - materialStatementReply_.readDescribeInput(preparedStatement); - agent_.checkForChainBreakingException_(); - } - - public void readDescribeOutput (PreparedStatementCallbackInterface preparedStatement) throws SqlException - { - materialStatementReply_.readDescribeOutput(preparedStatement); - agent_.checkForChainBreakingException_(); - } - - public void readExecuteCall (StatementCallbackInterface statement) throws SqlException - { - materialStatementReply_.readExecuteCall(statement); - agent_.checkForChainBreakingException_(); - } - - - public void readSetSpecialRegister (StatementCallbackInterface statement) throws SqlException - { - materialStatementReply_.readSetSpecialRegister(statement); - agent_.checkForChainBreakingException_(); - } + StatementReply(Agent agent, + StatementReplyInterface materialStatementReply, + ConnectionReplyInterface materialConnectionReply) { + super(agent, materialConnectionReply); + materialStatementReply_ = materialStatementReply; + } + + public void readPrepareDescribeOutput(StatementCallbackInterface statement) throws SqlException { + materialStatementReply_.readPrepareDescribeOutput(statement); + agent_.checkForChainBreakingException_(); + } + + public void readExecuteImmediate(StatementCallbackInterface statement) throws SqlException { + materialStatementReply_.readExecuteImmediate(statement); + agent_.checkForChainBreakingException_(); + } + + public void readOpenQuery(StatementCallbackInterface statement) throws SqlException { + materialStatementReply_.readOpenQuery(statement); + agent_.checkForChainBreakingException_(); + } + + public void readExecute(PreparedStatementCallbackInterface preparedStatement) throws SqlException { + materialStatementReply_.readExecute(preparedStatement); + agent_.checkForChainBreakingException_(); + } + + public void readPrepare(StatementCallbackInterface statement) throws SqlException { + materialStatementReply_.readPrepare(statement); + agent_.checkForChainBreakingException_(); + } + + public void readDescribeInput(PreparedStatementCallbackInterface preparedStatement) throws SqlException { + materialStatementReply_.readDescribeInput(preparedStatement); + agent_.checkForChainBreakingException_(); + } + + public void readDescribeOutput(PreparedStatementCallbackInterface preparedStatement) throws SqlException { + materialStatementReply_.readDescribeOutput(preparedStatement); + agent_.checkForChainBreakingException_(); + } + + public void readExecuteCall(StatementCallbackInterface statement) throws SqlException { + materialStatementReply_.readExecuteCall(statement); + agent_.checkForChainBreakingException_(); + } + + + public void readSetSpecialRegister(StatementCallbackInterface statement) throws SqlException { + materialStatementReply_.readSetSpecialRegister(statement); + agent_.checkForChainBreakingException_(); + } } Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReplyInterface.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReplyInterface.java?rev=165585&r1=165584&r2=165585&view=diff ============================================================================== --- incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReplyInterface.java (original) +++ incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementReplyInterface.java Sun May 1 23:25:59 2005 @@ -21,20 +21,25 @@ package org.apache.derby.client.net; import org.apache.derby.client.am.DisconnectException; -import org.apache.derby.client.am.StatementCallbackInterface; import org.apache.derby.client.am.PreparedStatementCallbackInterface; +import org.apache.derby.client.am.StatementCallbackInterface; + +public interface StatementReplyInterface { + public void readPrepareDescribeOutput(StatementCallbackInterface statement) throws DisconnectException; + + public void readExecuteImmediate(StatementCallbackInterface statement) throws DisconnectException; + + public void readOpenQuery(StatementCallbackInterface statement) throws DisconnectException; + + public void readExecute(PreparedStatementCallbackInterface preparedStatement) throws DisconnectException; + + public void readPrepare(StatementCallbackInterface statement) throws DisconnectException; + + public void readDescribeInput(PreparedStatementCallbackInterface preparedStatement) throws DisconnectException; + + public void readDescribeOutput(PreparedStatementCallbackInterface preparedStatement) throws DisconnectException; -public interface StatementReplyInterface -{ - public void readPrepareDescribeOutput (StatementCallbackInterface statement) throws DisconnectException; - public void readExecuteImmediate (StatementCallbackInterface statement) throws DisconnectException; - public void readOpenQuery (StatementCallbackInterface statement) throws DisconnectException; - - public void readExecute (PreparedStatementCallbackInterface preparedStatement) throws DisconnectException; - public void readPrepare (StatementCallbackInterface statement) throws DisconnectException; - public void readDescribeInput (PreparedStatementCallbackInterface preparedStatement) throws DisconnectException; - public void readDescribeOutput (PreparedStatementCallbackInterface preparedStatement) throws DisconnectException; - public void readExecuteCall (StatementCallbackInterface statement) throws DisconnectException; + public void readExecuteCall(StatementCallbackInterface statement) throws DisconnectException; - public void readSetSpecialRegister (StatementCallbackInterface statement) throws DisconnectException; + public void readSetSpecialRegister(StatementCallbackInterface statement) throws DisconnectException; } Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java?rev=165585&r1=165584&r2=165585&view=diff ============================================================================== --- incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java (original) +++ incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java Sun May 1 23:25:59 2005 @@ -20,72 +20,72 @@ package org.apache.derby.client.net; -import org.apache.derby.client.am.SqlException; -import org.apache.derby.client.am.Section; import org.apache.derby.client.am.ColumnMetaData; +import org.apache.derby.client.am.Section; +import org.apache.derby.client.am.SqlException; // In general, all required data is passed. // In addition, Material Statement objects are passed for convenient access to any material statement caches. // Implementations of this interface should not dereference common layer Statement state, as it is passed in, // but may dereference material layer Statement state if necessary for performance. -public interface StatementRequestInterface -{ - public void writeExecuteImmediate (NetStatement materialStatement, - String sql, - Section section) throws SqlException; - - public void writePrepareDescribeOutput (NetStatement materialStatement, - String sql, - Section section) throws SqlException; - - public void writePrepare (NetStatement materialStatement, - String sql, - Section section) throws SqlException; - - public void writeOpenQuery (NetStatement materialStatement, - Section section, - int fetchSize, - int resultSetType) throws SqlException; - - public void writeExecute (NetPreparedStatement materialPreparedStatement, - Section section, - org.apache.derby.client.am.ColumnMetaData parameterMetaData, - Object[] inputs, - int numInputColumns, - boolean outputExpected, - // This is a hint to the material layer that more write commands will follow. - // It is ignored by the driver in all cases except when blob data is written, - // in which case this boolean is used to optimize the implementation. - // Otherwise we wouldn't be able to chain after blob data is sent. - // If we could always chain a no-op DDM after every execute that writes blobs - // then we could just always set the chaining flag to on for blob send data - boolean chainedWritesFollowingSetLob) throws SqlException; - - - public void writeOpenQuery (NetPreparedStatement materialPreparedStatement, - Section section, - int fetchSize, - int resultSetType, - int numInputColumns, - ColumnMetaData parameterMetaData, - Object[] inputs) throws SqlException; - - public void writeDescribeInput (NetPreparedStatement materialPreparedStatement, - Section section) throws SqlException; - - public void writeDescribeOutput (NetPreparedStatement materialPreparedStatement, - Section section) throws SqlException; - - public void writeExecuteCall (NetStatement materialStatement, - boolean outputExpected, - String procedureName, - Section section, - int fetchSize, - boolean suppressResultSets, // set to true for batched calls - int resultSetType, - ColumnMetaData parameterMetaData, - Object[] inputs) throws SqlException; + +public interface StatementRequestInterface { + public void writeExecuteImmediate(NetStatement materialStatement, + String sql, + Section section) throws SqlException; + + public void writePrepareDescribeOutput(NetStatement materialStatement, + String sql, + Section section) throws SqlException; + + public void writePrepare(NetStatement materialStatement, + String sql, + Section section) throws SqlException; + + public void writeOpenQuery(NetStatement materialStatement, + Section section, + int fetchSize, + int resultSetType) throws SqlException; + + public void writeExecute(NetPreparedStatement materialPreparedStatement, + Section section, + org.apache.derby.client.am.ColumnMetaData parameterMetaData, + Object[] inputs, + int numInputColumns, + boolean outputExpected, + // This is a hint to the material layer that more write commands will follow. + // It is ignored by the driver in all cases except when blob data is written, + // in which case this boolean is used to optimize the implementation. + // Otherwise we wouldn't be able to chain after blob data is sent. + // If we could always chain a no-op DDM after every execute that writes blobs + // then we could just always set the chaining flag to on for blob send data + boolean chainedWritesFollowingSetLob) throws SqlException; + + + public void writeOpenQuery(NetPreparedStatement materialPreparedStatement, + Section section, + int fetchSize, + int resultSetType, + int numInputColumns, + ColumnMetaData parameterMetaData, + Object[] inputs) throws SqlException; + + public void writeDescribeInput(NetPreparedStatement materialPreparedStatement, + Section section) throws SqlException; + + public void writeDescribeOutput(NetPreparedStatement materialPreparedStatement, + Section section) throws SqlException; + + public void writeExecuteCall(NetStatement materialStatement, + boolean outputExpected, + String procedureName, + Section section, + int fetchSize, + boolean suppressResultSets, // set to true for batched calls + int resultSetType, + ColumnMetaData parameterMetaData, + Object[] inputs) throws SqlException; - public void writeSetSpecialRegister (java.util.ArrayList sqlsttList) throws SqlException; + public void writeSetSpecialRegister(java.util.ArrayList sqlsttList) throws SqlException; }
