[hornetq-commits] JBoss hornetq SVN: r8304 - in branches/ClebertTemporary: src/main/org/hornetq/core/postoffice/impl and 6 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Nov 17 23:19:10 EST 2009


Author: clebert.suconic at jboss.com
Date: 2009-11-17 23:19:10 -0500 (Tue, 17 Nov 2009)
New Revision: 8304

Modified:
   branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
   branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
   branches/ClebertTemporary/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java
   branches/ClebertTemporary/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java
   branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
   branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java
   branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java
   branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
Log:
more changes

Modified: branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -444,27 +444,27 @@
          messageJournal.appendAddRecord(message.getMessageID(),
                                         ADD_LARGE_MESSAGE,
                                         new LargeMessageEncoding((LargeServerMessage)message),
-                                        false);
+                                        false, getIOContext());
       }
       else
       {
-         messageJournal.appendAddRecord(message.getMessageID(), ADD_MESSAGE, message, false);
+         messageJournal.appendAddRecord(message.getMessageID(), ADD_MESSAGE, message, false, getIOContext());
       }
    }
 
    public void storeReference(final long queueID, final long messageID) throws Exception
    {
-      messageJournal.appendUpdateRecord(messageID, ADD_REF, new RefEncoding(queueID), syncNonTransactional);
+      messageJournal.appendUpdateRecord(messageID, ADD_REF, new RefEncoding(queueID), syncNonTransactional, getIOContext());
    }
 
    public void storeAcknowledge(final long queueID, final long messageID) throws Exception
    {
-      messageJournal.appendUpdateRecord(messageID, ACKNOWLEDGE_REF, new RefEncoding(queueID), syncNonTransactional);
+      messageJournal.appendUpdateRecord(messageID, ACKNOWLEDGE_REF, new RefEncoding(queueID), syncNonTransactional, getIOContext());
    }
 
    public void deleteMessage(final long messageID) throws Exception
    {
-      messageJournal.appendDeleteRecord(messageID, syncNonTransactional);
+      messageJournal.appendDeleteRecord(messageID, syncNonTransactional, getIOContext());
    }
 
    public void updateScheduledDeliveryTime(final MessageReference ref) throws Exception
@@ -475,19 +475,19 @@
       messageJournal.appendUpdateRecord(ref.getMessage().getMessageID(),
                                         SET_SCHEDULED_DELIVERY_TIME,
                                         encoding,
-                                        syncNonTransactional);
+                                        syncNonTransactional, getIOContext());
    }
 
    public void storeDuplicateID(final SimpleString address, final byte[] duplID, final long recordID) throws Exception
    {
       DuplicateIDEncoding encoding = new DuplicateIDEncoding(address, duplID);
 
-      messageJournal.appendAddRecord(recordID, DUPLICATE_ID, encoding, syncNonTransactional);
+      messageJournal.appendAddRecord(recordID, DUPLICATE_ID, encoding, syncNonTransactional, getIOContext());
    }
 
    public void deleteDuplicateID(long recordID) throws Exception
    {
-      messageJournal.appendDeleteRecord(recordID, syncNonTransactional);
+      messageJournal.appendDeleteRecord(recordID, syncNonTransactional, getIOContext());
    }
 
    // Transactional operations
@@ -543,13 +543,13 @@
    public long storeHeuristicCompletion(Xid xid, boolean isCommit) throws Exception
    {
       long id = generateUniqueID();
-      messageJournal.appendAddRecord(id, HEURISTIC_COMPLETION, new HeuristicCompletionEncoding(xid, isCommit), true);
+      messageJournal.appendAddRecord(id, HEURISTIC_COMPLETION, new HeuristicCompletionEncoding(xid, isCommit), true, getIOContext());
       return id;
    }
 
    public void deleteHeuristicCompletion(long id) throws Exception
    {
-      messageJournal.appendDeleteRecord(id, true);
+      messageJournal.appendDeleteRecord(id, true, getIOContext());
    }
 
    public void deletePageTransactional(final long txID, final long recordID) throws Exception
@@ -575,17 +575,17 @@
 
    public void prepare(final long txID, final Xid xid) throws Exception
    {
-      messageJournal.appendPrepareRecord(txID, new XidEncoding(xid), syncTransactional);
+      messageJournal.appendPrepareRecord(txID, new XidEncoding(xid), syncTransactional, getIOContext());
    }
 
    public void commit(final long txID) throws Exception
    {
-      messageJournal.appendCommitRecord(txID, syncTransactional);
+      messageJournal.appendCommitRecord(txID, syncTransactional, getIOContext());
    }
 
    public void rollback(final long txID) throws Exception
    {
-      messageJournal.appendRollbackRecord(txID, syncTransactional);
+      messageJournal.appendRollbackRecord(txID, syncTransactional, getIOContext());
    }
 
    public void storeDuplicateIDTransactional(final long txID,
@@ -623,7 +623,7 @@
       messageJournal.appendUpdateRecord(ref.getMessage().getMessageID(),
                                         UPDATE_DELIVERY_COUNT,
                                         updateInfo,
-                                        syncNonTransactional);
+                                        syncNonTransactional, getIOContext());
    }
 
    private static final class AddMessageRecord
@@ -1368,6 +1368,11 @@
    }
 
    // Private ----------------------------------------------------------------------------------
+   
+   private IOCompletion getIOContext()
+   {
+      return OperationContextImpl.getContext();
+   }
 
    private void checkAndCreateDir(final String dir, final boolean create)
    {

Modified: branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -28,6 +28,7 @@
 import org.hornetq.core.client.management.impl.ManagementHelper;
 import org.hornetq.core.exception.HornetQException;
 import org.hornetq.core.filter.Filter;
+import org.hornetq.core.journal.IOCompletion;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.management.ManagementService;
 import org.hornetq.core.management.Notification;
@@ -924,10 +925,15 @@
       }
       else
       {
-         storageManager.afterCompleteOperations(new Runnable()
+         storageManager.afterCompleteOperations(new IOCompletion()
          {
-            public void run()
+            public void onError(int errorCode, String errorMessage)
             {
+               log.warn("It wasn't possible to add references due to an IO error code " + errorCode + " message = " + errorMessage);
+            }
+            
+            public void done()
+            {
                addReferences(refs);
             }
          });

Modified: branches/ClebertTemporary/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -16,6 +16,7 @@
 import java.util.List;
 
 import org.hornetq.core.journal.EncodingSupport;
+import org.hornetq.core.journal.IOCompletion;
 import org.hornetq.core.journal.Journal;
 import org.hornetq.core.journal.JournalLoadInformation;
 import org.hornetq.core.journal.LoaderCallback;
@@ -27,7 +28,6 @@
 import org.hornetq.core.persistence.impl.journal.JournalStorageManager;
 import org.hornetq.core.replication.ReplicationManager;
 
-
 /**
  * Used by the {@link JournalStorageManager} to replicate journal calls. 
  *
@@ -46,7 +46,7 @@
    // Attributes ----------------------------------------------------
 
    private static final boolean trace = false;
-   
+
    private static void trace(String message)
    {
       System.out.println("ReplicatedJournal::" + message);
@@ -58,9 +58,7 @@
 
    private final byte journalID;
 
-   public ReplicatedJournal(final byte journaID,
-                                final Journal localJournal,
-                                final ReplicationManager replicationManager)
+   public ReplicatedJournal(final byte journaID, final Journal localJournal, final ReplicationManager replicationManager)
    {
       super();
       journalID = journaID;
@@ -69,11 +67,11 @@
    }
 
    // Static --------------------------------------------------------
-   
 
    // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
+
    /**
     * @param id
     * @param recordType
@@ -87,6 +85,21 @@
       this.appendAddRecord(id, recordType, new ByteArrayEncoding(record), sync);
    }
 
+   public void appendAddRecord(long id, byte recordType, EncodingSupport record, boolean sync) throws Exception
+   {
+      if (trace)
+      {
+         trace("Append record id = " + id + " recordType = " + recordType);
+      }
+      replicationManager.appendAddRecord(journalID, id, recordType, record);
+      localJournal.appendAddRecord(id, recordType, record, sync);
+   }
+
+   public void appendAddRecord(long id, byte recordType, byte[] record, boolean sync, IOCompletion completionCallback) throws Exception
+   {
+      this.appendAddRecord(id, recordType, new ByteArrayEncoding(record), sync, completionCallback);
+   }
+
    /**
     * @param id
     * @param recordType
@@ -95,14 +108,18 @@
     * @throws Exception
     * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean)
     */
-   public void appendAddRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception
+   public void appendAddRecord(final long id,
+                               final byte recordType,
+                               final EncodingSupport record,
+                               final boolean sync,
+                               IOCompletion completionCallback) throws Exception
    {
       if (trace)
       {
          trace("Append record id = " + id + " recordType = " + recordType);
       }
       replicationManager.appendAddRecord(journalID, id, recordType, record);
-      localJournal.appendAddRecord(id, recordType, record, sync);
+      localJournal.appendAddRecord(id, recordType, record, sync, completionCallback);
    }
 
    /**
@@ -155,6 +172,19 @@
       localJournal.appendCommitRecord(txID, sync);
    }
 
+   /* (non-Javadoc)
+    * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean, org.hornetq.core.journal.IOCompletion)
+    */
+   public void appendCommitRecord(long txID, boolean sync, IOCompletion callback) throws Exception
+   {
+      if (trace)
+      {
+         trace("AppendCommit " + txID);
+      }
+      replicationManager.appendCommitRecord(journalID, txID);
+      localJournal.appendCommitRecord(txID, sync, callback);
+   }
+
    /**
     * @param id
     * @param sync
@@ -171,6 +201,19 @@
       localJournal.appendDeleteRecord(id, sync);
    }
 
+   /* (non-Javadoc)
+    * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean, org.hornetq.core.journal.IOCompletion)
+    */
+   public void appendDeleteRecord(long id, boolean sync, IOCompletion completionCallback) throws Exception
+   {
+      if (trace)
+      {
+         trace("AppendDelete " + id);
+      }
+      replicationManager.appendDeleteRecord(journalID, id);
+      localJournal.appendDeleteRecord(id, sync, completionCallback);
+   }
+
    /**
     * @param txID
     * @param id
@@ -245,6 +288,27 @@
       localJournal.appendPrepareRecord(txID, transactionData, sync);
    }
 
+   /* (non-Javadoc)
+    * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
+    */
+   public void appendPrepareRecord(long txID, EncodingSupport transactionData, boolean sync, IOCompletion callback) throws Exception
+   {
+      if (trace)
+      {
+         trace("AppendPrepare txID=" + txID);
+      }
+      replicationManager.appendPrepareRecord(journalID, txID, transactionData);
+      localJournal.appendPrepareRecord(txID, transactionData, sync, callback);
+   }
+
+   /* (non-Javadoc)
+    * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean, org.hornetq.core.journal.IOCompletion)
+    */
+   public void appendPrepareRecord(long txID, byte[] transactionData, boolean sync, IOCompletion callback) throws Exception
+   {
+      this.appendPrepareRecord(txID, new ByteArrayEncoding(transactionData), sync, callback);
+   }
+
    /**
     * @param txID
     * @param sync
@@ -261,6 +325,19 @@
       localJournal.appendRollbackRecord(txID, sync);
    }
 
+   /* (non-Javadoc)
+    * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean, org.hornetq.core.journal.IOCompletion)
+    */
+   public void appendRollbackRecord(long txID, boolean sync, IOCompletion callback) throws Exception
+   {
+      if (trace)
+      {
+         trace("AppendRollback " + txID);
+      }
+      replicationManager.appendRollbackRecord(journalID, txID);
+      localJournal.appendRollbackRecord(txID, sync, callback);
+   }
+
    /**
     * @param id
     * @param recordType
@@ -291,7 +368,34 @@
       replicationManager.appendUpdateRecord(journalID, id, recordType, record);
       localJournal.appendUpdateRecord(id, recordType, record, sync);
    }
+   
+   /* (non-Javadoc)
+    * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean, org.hornetq.core.journal.IOCompletion)
+    */
+   public void appendUpdateRecord(long id, byte recordType, byte[] record, boolean sync, IOCompletion completionCallback) throws Exception
+   {
+      this.appendUpdateRecord(id, recordType, new ByteArrayEncoding(record), sync, completionCallback);
+   }
 
+   /* (non-Javadoc)
+    * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
+    */
+   public void appendUpdateRecord(long id,
+                                  byte recordType,
+                                  EncodingSupport record,
+                                  boolean sync,
+                                  IOCompletion completionCallback) throws Exception
+   {
+      if (trace)
+      {
+         trace("AppendUpdateRecord id = " + id + " , recordType = " + recordType);
+      }
+      replicationManager.appendUpdateRecord(journalID, id, recordType, record);
+      localJournal.appendUpdateRecord(id, recordType, record, sync, completionCallback);
+   }
+
+
+
    /**
     * @param txID
     * @param id
@@ -338,8 +442,8 @@
     * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback)
     */
    public JournalLoadInformation load(final List<RecordInfo> committedRecords,
-                    final List<PreparedTransactionInfo> preparedTransactions,
-                    final TransactionFailureCallback transactionFailure) throws Exception
+                                      final List<PreparedTransactionInfo> preparedTransactions,
+                                      final TransactionFailureCallback transactionFailure) throws Exception
    {
       return localJournal.load(committedRecords, preparedTransactions, transactionFailure);
    }

Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -16,6 +16,7 @@
 import java.util.concurrent.Executor;
 
 import org.hornetq.core.filter.Filter;
+import org.hornetq.core.journal.IOCompletion;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.persistence.StorageManager;
 import org.hornetq.core.postoffice.PostOffice;
@@ -144,13 +145,20 @@
 
       tx.commit();
 
-      storageManager.afterCompleteOperations(new Runnable()
+      storageManager.afterCompleteOperations(new IOCompletion()
       {
-         public void run()
+         
+         public void onError(int errorCode, String errorMessage)
          {
+            log.warn("IO Error during redistribution, errorCode = " + errorCode + " message = " + errorMessage);
+         }
+         
+         public void done()
+         {
             execPrompter();
          }
       });
+      
       storageManager.completeOperations();
    }
    

Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Red Hat, Inc.
+x * Copyright 2009 Red Hat, Inc.
  * Red Hat licenses this file to you under the Apache License, version
  * 2.0 (the "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
@@ -34,6 +34,7 @@
 import org.hornetq.core.exception.HornetQException;
 import org.hornetq.core.filter.Filter;
 import org.hornetq.core.filter.impl.FilterImpl;
+import org.hornetq.core.journal.IOCompletion;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.management.ManagementService;
 import org.hornetq.core.management.Notification;
@@ -1718,13 +1719,22 @@
                              final boolean flush,
                              final boolean closeChannel)
    {
-      storageManager.afterCompleteOperations(new Runnable()
+      storageManager.afterCompleteOperations(new IOCompletion()
       {
-         public void run()
+         
+         public void onError(int errorCode, String errorMessage)
          {
+            log.warn("Error processing IOCallback code = " + errorCode + " message = " + errorMessage);
+
+            HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage(new HornetQException(errorCode, errorMessage));
+            
+            doSendResponse(confirmPacket, exceptionMessage, flush, closeChannel);
+         }
+         
+         public void done()
+         {
             doSendResponse(confirmPacket, response, flush, closeChannel);
          }
-
       });
       
       storageManager.completeOperations();

Modified: branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -19,6 +19,7 @@
 import javax.transaction.xa.Xid;
 
 import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.journal.IOCompletion;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.persistence.StorageManager;
 import org.hornetq.core.postoffice.PostOffice;
@@ -219,10 +220,16 @@
          // We use the Callback even for non persistence
          // If we are using non-persistence with replication, the replication manager will have
          // to execute this runnable in the correct order
-         storageManager.afterCompleteOperations(new Runnable()
+         storageManager.afterCompleteOperations(new IOCompletion()
          {
-            public void run()
+            
+            public void onError(int errorCode, String errorMessage)
             {
+               log.warn("IO Error completing the transaction, code = " + errorCode + ", message = " + errorMessage);
+            }
+            
+            public void done()
+            {
                for (TransactionOperation operation : operations)
                {
                   try
@@ -238,6 +245,7 @@
                }
             }
          });
+
       }
    }
 

Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -38,6 +38,7 @@
 import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.hornetq.core.exception.HornetQException;
 import org.hornetq.core.journal.EncodingSupport;
+import org.hornetq.core.journal.IOCompletion;
 import org.hornetq.core.journal.Journal;
 import org.hornetq.core.journal.JournalLoadInformation;
 import org.hornetq.core.journal.LoaderCallback;
@@ -375,10 +376,15 @@
          }
 
          final CountDownLatch latch = new CountDownLatch(1);
-         OperationContextImpl.getContext().executeOnCompletion(new Runnable()
+         OperationContextImpl.getContext().executeOnCompletion(new IOCompletion()
          {
-            public void run()
+
+            public void onError(int errorCode, String errorMessage)
             {
+            }
+
+            public void done()
+            {
                latch.countDown();
             }
          });
@@ -402,14 +408,17 @@
    private void blockOnReplication(ReplicationManagerImpl manager) throws Exception
    {
       final CountDownLatch latch = new CountDownLatch(1);
-      OperationContextImpl.getContext().executeOnCompletion(new Runnable()
+      OperationContextImpl.getContext().executeOnCompletion(new IOCompletion()
       {
 
-         public void run()
+         public void onError(int errorCode, String errorMessage)
          {
+         }
+
+         public void done()
+         {
             latch.countDown();
          }
-
       });
 
       manager.closeContext();
@@ -458,14 +467,17 @@
          replicatedJournal.appendPrepareRecord(1, new FakeData(), false);
 
          final CountDownLatch latch = new CountDownLatch(1);
-         OperationContextImpl.getContext().executeOnCompletion(new Runnable()
+         OperationContextImpl.getContext().executeOnCompletion(new IOCompletion()
          {
 
-            public void run()
+            public void onError(int errorCode, String errorMessage)
             {
+            }
+
+            public void done()
+            {
                latch.countDown();
             }
-
          });
 
          manager.closeContext();
@@ -505,41 +517,41 @@
          Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(), manager);
 
          int numberOfAdds = 200;
-         
+
          final CountDownLatch latch = new CountDownLatch(numberOfAdds);
-         
+
          for (int i = 0; i < numberOfAdds; i++)
          {
             final int nAdd = i;
-            
+
             if (i % 2 == 0)
             {
                replicatedJournal.appendPrepareRecord(i, new FakeData(), false);
             }
 
-
-            OperationContextImpl.getContext().executeOnCompletion(new Runnable()
+            OperationContextImpl.getContext().executeOnCompletion(new IOCompletion()
             {
 
-               public void run()
+               public void onError(int errorCode, String errorMessage)
                {
-                  executions.add(nAdd);
+               }
+
+               public void done()
+               {
                   latch.countDown();
                }
-
             });
 
             manager.closeContext();
          }
-         
+
          assertTrue(latch.await(10, TimeUnit.SECONDS));
 
-         
          for (int i = 0; i < numberOfAdds; i++)
          {
             assertEquals(i, executions.get(i).intValue());
          }
-         
+
          assertEquals(0, manager.getActiveTokens().size());
          manager.stop();
       }
@@ -868,5 +880,80 @@
          return 0;
       }
 
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendAddRecord(long id, byte recordType, byte[] record, boolean sync, IOCompletion completionCallback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendAddRecord(long id,
+                                  byte recordType,
+                                  EncodingSupport record,
+                                  boolean sync,
+                                  IOCompletion completionCallback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendCommitRecord(long txID, boolean sync, IOCompletion callback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendDeleteRecord(long id, boolean sync, IOCompletion completionCallback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendPrepareRecord(long txID, EncodingSupport transactionData, boolean sync, IOCompletion callback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendPrepareRecord(long txID, byte[] transactionData, boolean sync, IOCompletion callback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendRollbackRecord(long txID, boolean sync, IOCompletion callback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendUpdateRecord(long id,
+                                     byte recordType,
+                                     byte[] record,
+                                     boolean sync,
+                                     IOCompletion completionCallback) throws Exception
+      {
+      }
+
+      /* (non-Javadoc)
+       * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
+       */
+      public void appendUpdateRecord(long id,
+                                     byte recordType,
+                                     EncodingSupport record,
+                                     boolean sync,
+                                     IOCompletion completionCallback) throws Exception
+      {
+      }
+
    }
 }

Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java	2009-11-18 02:52:31 UTC (rev 8303)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java	2009-11-18 04:19:10 UTC (rev 8304)
@@ -29,6 +29,7 @@
 import javax.transaction.xa.Xid;
 
 import org.hornetq.core.buffers.ChannelBuffers;
+import org.hornetq.core.journal.IOCompletion;
 import org.hornetq.core.journal.JournalLoadInformation;
 import org.hornetq.core.journal.SequentialFile;
 import org.hornetq.core.journal.SequentialFileFactory;
@@ -1232,6 +1233,15 @@
       {
       }
 
+      /* (non-Javadoc)
+       * @see org.hornetq.core.persistence.StorageManager#afterCompleteOperations(org.hornetq.core.journal.IOCompletion)
+       */
+      public void afterCompleteOperations(IOCompletion run)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
    }
 
    class FakeStoreFactory implements PagingStoreFactory



More information about the hornetq-commits mailing list