svn commit: r602734 - /james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java

[rdonkin]

Author: rdonkin
Date: Sun Dec  9 13:52:57 2007
New Revision: 602734

URL: http://svn.apache.org/viewvc?rev=602734&view=rev
Log:
Checking for a gap in this manner is a very expensive operation for very little 
gain.

Modified:
    
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java

Modified: 
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=602734&r1=602733&r2=602734&view=diff
==============================================================================
--- 
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
 (original)
+++ 
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
 Sun Dec  9 13:52:57 2007
@@ -148,7 +148,6 @@
 
                     save(messageRow);
                     MessageResult messageResult = 
fillMessageResult(messageRow, result);
-                    checkForScanGap(uid);
                     getUidChangeTracker().found(messageResult);
                     return messageResult;
                 } catch (Exception e) {
@@ -237,20 +236,6 @@
         return myMailboxRow;
     }
 
-    private void checkForScanGap(long uid) throws MailboxManagerException, 
TorqueException, MessagingException {
-        synchronized (getUidChangeTracker()) {
-            long lastScannedUid=getUidChangeTracker().getLastScannedUid();
-            if (uid>(lastScannedUid+1)) {
-                GeneralMessageSet 
set=GeneralMessageSetImpl.uidRange(lastScannedUid+1, uid);
-                Criteria criteria=criteriaForMessageSet(set);
-                final List messageRows=mailboxRow.getMessageRows(criteria);
-                getUidChangeTracker().found(uidRangeForMessageSet(set), 
-                        MessageRowUtils.toMessageFlags(messageRows));
-            }
-        }
-        
-    }
-
     private Criteria criteriaForMessageSet(GeneralMessageSet set)
             throws MailboxManagerException {
         Criteria criteria = new Criteria();
@@ -310,7 +295,6 @@
         List rows = MessageRowPeer.doSelectJoinMessageFlags(c);
         Collections.sort(rows, MessageRowUtils.getUidComparator());
         final TorqueResultIterator results = new TorqueResultIterator(rows, 
result, getUidToKeyConverter());
-        checkForScanGap(range.getFromUid());
         getUidChangeTracker().found(range, results.getMessageFlags());
         return results;
     }
@@ -391,7 +375,6 @@
                     if (messageRows.size() > 0) {
                         MessageResult 
messageResult=fillMessageResult((MessageRow) messageRows.get(0), result);
                         if (messageResult!=null) {
-                            checkForScanGap(messageResult.getUid());
                             getUidChangeTracker().found(messageResult);
                         }
 
@@ -521,7 +504,6 @@
             final List messageRows = getMailboxRow()
                     .getMessageRows(criteriaForMessageSet(set));
             UidRange uidRange=uidRangeForMessageSet(set);
-            checkForScanGap(uidRange.getFromUid());
             getUidChangeTracker().found(uidRange, 
MessageRowUtils.toMessageFlags(messageRows));
             for (Iterator iter = messageRows.iterator(); iter.hasNext();) {
                 final MessageRow messageRow = (MessageRow) iter.next();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]