[rft-commit] CVS update: MODIFIED: database

[Ravi Madduri]

, Tag:, ReliableFileTransferDbAdapter.java
 ...

  User: madduri 
  Date: 06/08/24 13:16:42

  Modified:    reliable/service/java/source/src/org/globus/transfer/reliable/service/database
                        Tag: gram-perf-rft
                        ReliableFileTransferDbAdapter.java
  Log:
  some more optimizations
  
  Revision  Changes    Path
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/ws-transfer/reliable/service/java/source/src/org/globus/transfer/reliable/service/database/Tag:
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/ws-transfer/reliable/service/java/source/src/org/globus/transfer/reliable/service/database/gram-perf-rft
  1.64.4.12.2.3 +7 -17     ws-transfer/reliable/service/java/source/src/org/globus/transfer/reliable/service/database/ReliableFileTransferDbAdapter.java
  
  http://viewcvs.globus.org/viewcvs.cgi/ws-transfer/reliable/service/java/source/src/org/globus/transfer/reliable/service/database/ReliableFileTransferDbAdapter.java.diff?r1=1.64.4.12.2.2&r2=1.64.4.12.2.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReliableFileTransferDbAdapter.java
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/ws-transfer/reliable/service/java/source/src/org/globus/transfer/reliable/service/database/ReliableFileTransferDbAdapter.java,v
  retrieving revision 1.64.4.12.2.2
  retrieving revision 1.64.4.12.2.3
  diff -u -b -r1.64.4.12.2.2 -r1.64.4.12.2.3
  --- ReliableFileTransferDbAdapter.java	24 Aug 2006 16:52:43 -0000	1.64.4.12.2.2
  +++ ReliableFileTransferDbAdapter.java	24 Aug 2006 18:16:42 -0000	1.64.4.12.2.3
  @@ -175,7 +175,7 @@
               c = RFTDatabaseSetup.getDBConnection();
               if(!OLD_SCHEMA) {
                   pstmt = c.prepareStatement(requestInsertSQL);
  -                requestId = getNextRequestId();
  +                requestId = getNextRequestId(c);
                   pstmt.setObject(1, new Integer(requestId));
                   pstmt.setObject(2, new Integer(concurrency));
                   pstmt.setObject(3, new Long(terminationTime.getTimeInMillis()));
  @@ -266,7 +266,7 @@
               c = RFTDatabaseSetup.getDBConnection();
               if(!OLD_SCHEMA) {
                   pstmt = c.prepareStatement(requestInsertSQL);
  -                requestId = getNextRequestId();
  +                requestId = getNextRequestId(c);
                   pstmt.setObject(1, new Integer(requestId));
                   pstmt.setObject(2, new Integer(concurrency));
                   pstmt.setObject(3, new Long(terminationTime.getTimeInMillis()));
  @@ -322,14 +322,12 @@
           }
       }
   
  -    public synchronized int getNextRequestId() throws RftDBException {
  -        Connection c = null;
  +    public synchronized int getNextRequestId(Connection c) throws RftDBException {
           Statement statement = null;
           Statement tempStatement = null;
           ResultSet rs = null;
           int nextRequestId = 0;
           try {
  -            c = RFTDatabaseSetup.getDBConnection();
               statement = c.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                       ResultSet.CONCUR_UPDATABLE);
               rs = statement.executeQuery("select request_id from requestid");
  @@ -367,9 +365,6 @@
                   if (rs != null) {
                       rs.close();
                   }
  -                if (c != null) {
  -                    RFTDatabaseSetup.returnDBConnection(c);
  -                }
               } catch (SQLException sql) {
                   logger.warn(i18n.getMessage("dbStatementErr"), sql);
               }
  @@ -403,14 +398,12 @@
       }
      /* To be used only in the case of post 4.0 db schema
       */
  -    public synchronized int getNextTransferId() throws RftDBException {
  -        Connection c = null;
  +    public synchronized int getNextTransferId(Connection c) throws RftDBException {
           Statement statement = null;
           Statement tempStatement = null;
           ResultSet rs = null;
           int nextTransferId = 0;
           try {
  -            c = RFTDatabaseSetup.getDBConnection();
               statement = c.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                       ResultSet.CONCUR_UPDATABLE);
               rs = statement.executeQuery("select transfer_id from transferid");
  @@ -447,9 +440,6 @@
                   if (rs != null) {
                       rs.close();
                   }
  -                if (c != null) {
  -                    RFTDatabaseSetup.returnDBConnection(c);
  -                }
               } catch (SQLException sql) {
                   logger.warn(i18n.getMessage("dbStatementErr"), sql);
               }
  @@ -515,7 +505,7 @@
                       pstmt.setObject(12, rftOptions.getDestinationSubjectName());
                       pstmt.setObject(13, rftOptions.getIgnoreFilePermErr());
                   } else {
  -                    int firstTransferId = getNextTransferId();
  +                    int firstTransferId = getNextTransferId(c);
                       pstmt.setObject(1, new Integer(firstTransferId)); 
                       pstmt.setObject(2, new Integer(requestId));
                       pstmt.setObject(3, transfer.getSourceUrl());
  @@ -610,7 +600,7 @@
                   String tempSubjectName = localDeleteOptions.getSubjectName();
                   String tempUserName = localDeleteOptions.getUserName();
                   if (!OLD_SCHEMA) {
  -                    int transferId = getNextTransferId();
  +                    int transferId = getNextTransferId(c);
                       pstmt.setObject(1, new Integer(transferId));
                       pstmt.setObject(2, new Integer(requestId));
                       pstmt.setObject(3, tempSubjectName);
  @@ -1823,7 +1813,7 @@
               }
               if (!OLD_SCHEMA) {
                   statement = c.prepareStatement(singleTransferInsertQuery);
  -                int transferId = getNextTransferId();
  +                int transferId = getNextTransferId(c);
                   statement.setObject(1, new Integer(transferId));
                   statement.setObject(2, new Integer(requestId));
                   statement.setObject(3, transferJob.getSourceUrl());