[hornetq-commits] JBoss hornetq SVN: r8071 - in branches/Replication_Clebert: src/main/org/hornetq/core/replication/impl and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Oct 8 17:41:36 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-10-08 17:41:35 -0400 (Thu, 08 Oct 2009)
New Revision: 8071
Added:
branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java
Removed:
branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java
Modified:
branches/Replication_Clebert/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java
Log:
Rename
Modified: branches/Replication_Clebert/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/Replication_Clebert/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-10-08 21:40:37 UTC (rev 8070)
+++ branches/Replication_Clebert/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-10-08 21:41:35 UTC (rev 8071)
@@ -57,7 +57,7 @@
import org.hornetq.core.remoting.impl.wireformat.XidCodecSupport;
import org.hornetq.core.remoting.spi.HornetQBuffer;
import org.hornetq.core.replication.ReplicationManager;
-import org.hornetq.core.replication.impl.ReplicatedJournalImpl;
+import org.hornetq.core.replication.impl.ReplicatedJournal;
import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.LargeServerMessage;
import org.hornetq.core.server.MessageReference;
@@ -192,7 +192,7 @@
if (replicator != null)
{
- this.bindingsJournal = new ReplicatedJournalImpl((byte)0, localBindings, replicator);
+ this.bindingsJournal = new ReplicatedJournal((byte)0, localBindings, replicator);
}
else
{
@@ -261,7 +261,7 @@
if (replicator != null)
{
- this.messageJournal = new ReplicatedJournalImpl((byte)1, localMessage, replicator);
+ this.messageJournal = new ReplicatedJournal((byte)1, localMessage, replicator);
}
else
{
Copied: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java (from rev 8068, branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java)
===================================================================
--- branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java (rev 0)
+++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java 2009-10-08 21:41:35 UTC (rev 8071)
@@ -0,0 +1,399 @@
+/*
+ * 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
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.core.replication.impl;
+
+import java.util.List;
+
+import org.hornetq.core.journal.EncodingSupport;
+import org.hornetq.core.journal.Journal;
+import org.hornetq.core.journal.LoaderCallback;
+import org.hornetq.core.journal.PreparedTransactionInfo;
+import org.hornetq.core.journal.RecordInfo;
+import org.hornetq.core.journal.TransactionFailureCallback;
+import org.hornetq.core.journal.impl.JournalImpl.ByteArrayEncoding;
+import org.hornetq.core.persistence.impl.journal.JournalStorageManager;
+import org.hornetq.core.replication.ReplicationManager;
+
+/**
+ * Used by the {@link JournalStorageManager} to replicate journal calls.
+ *
+ * @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ *
+ * @see JournalStorageManager
+ *
+ */
+public class ReplicatedJournal implements Journal
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private static final boolean trace = false;
+
+ private final ReplicationManager replicationManager;
+
+ private final Journal replicatedJournal;
+
+ private final byte journalID;
+
+ public ReplicatedJournal(final byte journaID,
+ final Journal replicatedJournal,
+ final ReplicationManager replicationManager)
+ {
+ super();
+ journalID = journaID;
+ this.replicatedJournal = replicatedJournal;
+ this.replicationManager = replicationManager;
+ }
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+ /**
+ * @param id
+ * @param recordType
+ * @param record
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean)
+ */
+ public void appendAddRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception
+ {
+ this.appendAddRecord(id, recordType, new ByteArrayEncoding(record), sync);
+ }
+
+ /**
+ * @param id
+ * @param recordType
+ * @param record
+ * @param sync
+ * @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
+ {
+ if (trace)
+ {
+ System.out.println("Append record id = " + id + " recordType = " + recordType);
+ }
+ replicationManager.appendAddRecord(journalID, id, recordType, record);
+ replicatedJournal.appendAddRecord(id, recordType, record, sync);
+ }
+
+ /**
+ * @param txID
+ * @param id
+ * @param recordType
+ * @param record
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[])
+ */
+ public void appendAddRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception
+ {
+ this.appendAddRecordTransactional(txID, id, recordType, new ByteArrayEncoding(record));
+ }
+
+ /**
+ * @param txID
+ * @param id
+ * @param recordType
+ * @param record
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport)
+ */
+ public void appendAddRecordTransactional(final long txID,
+ final long id,
+ final byte recordType,
+ final EncodingSupport record) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("Append record TXid = " + id + " recordType = " + recordType);
+ }
+ replicationManager.appendAddRecordTransactional(journalID, txID, id, recordType, record);
+ replicatedJournal.appendAddRecordTransactional(txID, id, recordType, record);
+ }
+
+ /**
+ * @param txID
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean)
+ */
+ public void appendCommitRecord(final long txID, final boolean sync) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendCommit " + txID);
+ }
+ replicationManager.appendCommitRecord(journalID, txID);
+ replicatedJournal.appendCommitRecord(txID, sync);
+ }
+
+ /**
+ * @param id
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean)
+ */
+ public void appendDeleteRecord(final long id, final boolean sync) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendDelete " + id);
+ }
+ replicationManager.appendDeleteRecord(journalID, id);
+ replicatedJournal.appendDeleteRecord(id, sync);
+ }
+
+ /**
+ * @param txID
+ * @param id
+ * @param record
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[])
+ */
+ public void appendDeleteRecordTransactional(final long txID, final long id, final byte[] record) throws Exception
+ {
+ this.appendDeleteRecordTransactional(txID, id, new ByteArrayEncoding(record));
+ }
+
+ /**
+ * @param txID
+ * @param id
+ * @param record
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.hornetq.core.journal.EncodingSupport)
+ */
+ public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendDelete txID=" + txID + " id=" + id);
+ }
+ replicationManager.appendDeleteRecordTransactional(journalID, txID, id, record);
+ replicatedJournal.appendDeleteRecordTransactional(txID, id, record);
+ }
+
+ /**
+ * @param txID
+ * @param id
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long)
+ */
+ public void appendDeleteRecordTransactional(final long txID, final long id) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendDelete (noencoding) txID=" + txID + " id=" + id);
+ }
+ replicationManager.appendDeleteRecordTransactional(journalID, txID, id);
+ replicatedJournal.appendDeleteRecordTransactional(txID, id);
+ }
+
+ /**
+ * @param txID
+ * @param transactionData
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean)
+ */
+ public void appendPrepareRecord(final long txID, final byte[] transactionData, final boolean sync) throws Exception
+ {
+ this.appendPrepareRecord(txID, new ByteArrayEncoding(transactionData), sync);
+ }
+
+ /**
+ * @param txID
+ * @param transactionData
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean)
+ */
+ public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendPrepare txID=" + txID);
+ }
+ replicationManager.appendPrepareRecord(journalID, txID, transactionData);
+ replicatedJournal.appendPrepareRecord(txID, transactionData, sync);
+ }
+
+ /**
+ * @param txID
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean)
+ */
+ public void appendRollbackRecord(final long txID, final boolean sync) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendRollback " + txID);
+ }
+ replicationManager.appendRollbackRecord(journalID, txID);
+ replicatedJournal.appendRollbackRecord(txID, sync);
+ }
+
+ /**
+ * @param id
+ * @param recordType
+ * @param record
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean)
+ */
+ public void appendUpdateRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception
+ {
+ this.appendUpdateRecord(id, recordType, new ByteArrayEncoding(record), sync);
+ }
+
+ /**
+ * @param id
+ * @param recordType
+ * @param record
+ * @param sync
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean)
+ */
+ public void appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendUpdateRecord id = " + id + " , recordType = " + recordType);
+ }
+ replicationManager.appendUpdateRecord(journalID, id, recordType, record);
+ replicatedJournal.appendUpdateRecord(id, recordType, record, sync);
+ }
+
+ /**
+ * @param txID
+ * @param id
+ * @param recordType
+ * @param record
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[])
+ */
+ public void appendUpdateRecordTransactional(final long txID,
+ final long id,
+ final byte recordType,
+ final byte[] record) throws Exception
+ {
+ this.appendUpdateRecordTransactional(txID, id, recordType, new ByteArrayEncoding(record));
+ }
+
+ /**
+ * @param txID
+ * @param id
+ * @param recordType
+ * @param record
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport)
+ */
+ public void appendUpdateRecordTransactional(final long txID,
+ final long id,
+ final byte recordType,
+ final EncodingSupport record) throws Exception
+ {
+ if (trace)
+ {
+ System.out.println("AppendUpdateRecord txid=" + txID + " id = " + id + " , recordType = " + recordType);
+ }
+ replicationManager.appendUpdateRecordTransactional(journalID, txID, id, recordType, record);
+ replicatedJournal.appendUpdateRecordTransactional(txID, id, recordType, record);
+ }
+
+ /**
+ * @param committedRecords
+ * @param preparedTransactions
+ * @param transactionFailure
+ * @return
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback)
+ */
+ public long load(final List<RecordInfo> committedRecords,
+ final List<PreparedTransactionInfo> preparedTransactions,
+ final TransactionFailureCallback transactionFailure) throws Exception
+ {
+ return replicatedJournal.load(committedRecords, preparedTransactions, transactionFailure);
+ }
+
+ /**
+ * @param reloadManager
+ * @return
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback)
+ */
+ public long load(final LoaderCallback reloadManager) throws Exception
+ {
+ return replicatedJournal.load(reloadManager);
+ }
+
+ /**
+ * @param pages
+ * @throws Exception
+ * @see org.hornetq.core.journal.Journal#perfBlast(int)
+ */
+ public void perfBlast(final int pages) throws Exception
+ {
+ replicatedJournal.perfBlast(pages);
+ }
+
+ /**
+ * @throws Exception
+ * @see org.hornetq.core.server.HornetQComponent#start()
+ */
+ public void start() throws Exception
+ {
+ replicatedJournal.start();
+ }
+
+ /**
+ * @throws Exception
+ * @see org.hornetq.core.server.HornetQComponent#stop()
+ */
+ public void stop() throws Exception
+ {
+ replicatedJournal.stop();
+ }
+
+ /* (non-Javadoc)
+ * @see org.hornetq.core.journal.Journal#getAlignment()
+ */
+ public int getAlignment() throws Exception
+ {
+ return replicatedJournal.getAlignment();
+ }
+
+ /* (non-Javadoc)
+ * @see org.hornetq.core.server.HornetQComponent#isStarted()
+ */
+ public boolean isStarted()
+ {
+ return replicatedJournal.isStarted();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Deleted: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java
===================================================================
--- branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java 2009-10-08 21:40:37 UTC (rev 8070)
+++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java 2009-10-08 21:41:35 UTC (rev 8071)
@@ -1,399 +0,0 @@
-/*
- * 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
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.core.replication.impl;
-
-import java.util.List;
-
-import org.hornetq.core.journal.EncodingSupport;
-import org.hornetq.core.journal.Journal;
-import org.hornetq.core.journal.LoaderCallback;
-import org.hornetq.core.journal.PreparedTransactionInfo;
-import org.hornetq.core.journal.RecordInfo;
-import org.hornetq.core.journal.TransactionFailureCallback;
-import org.hornetq.core.journal.impl.JournalImpl.ByteArrayEncoding;
-import org.hornetq.core.persistence.impl.journal.JournalStorageManager;
-import org.hornetq.core.replication.ReplicationManager;
-
-/**
- * Used by the {@link JournalStorageManager} to replicate journal calls.
- *
- * @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- *
- * @see JournalStorageManager
- *
- */
-public class ReplicatedJournalImpl implements Journal
-{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private static final boolean trace = false;
-
- private final ReplicationManager replicationManager;
-
- private final Journal replicatedJournal;
-
- private final byte journalID;
-
- public ReplicatedJournalImpl(final byte journaID,
- final Journal replicatedJournal,
- final ReplicationManager replicationManager)
- {
- super();
- journalID = journaID;
- this.replicatedJournal = replicatedJournal;
- this.replicationManager = replicationManager;
- }
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
- /**
- * @param id
- * @param recordType
- * @param record
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean)
- */
- public void appendAddRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception
- {
- this.appendAddRecord(id, recordType, new ByteArrayEncoding(record), sync);
- }
-
- /**
- * @param id
- * @param recordType
- * @param record
- * @param sync
- * @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
- {
- if (trace)
- {
- System.out.println("Append record id = " + id + " recordType = " + recordType);
- }
- replicationManager.appendAddRecord(journalID, id, recordType, record);
- replicatedJournal.appendAddRecord(id, recordType, record, sync);
- }
-
- /**
- * @param txID
- * @param id
- * @param recordType
- * @param record
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[])
- */
- public void appendAddRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception
- {
- this.appendAddRecordTransactional(txID, id, recordType, new ByteArrayEncoding(record));
- }
-
- /**
- * @param txID
- * @param id
- * @param recordType
- * @param record
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport)
- */
- public void appendAddRecordTransactional(final long txID,
- final long id,
- final byte recordType,
- final EncodingSupport record) throws Exception
- {
- if (trace)
- {
- System.out.println("Append record TXid = " + id + " recordType = " + recordType);
- }
- replicationManager.appendAddRecordTransactional(journalID, txID, id, recordType, record);
- replicatedJournal.appendAddRecordTransactional(txID, id, recordType, record);
- }
-
- /**
- * @param txID
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean)
- */
- public void appendCommitRecord(final long txID, final boolean sync) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendCommit " + txID);
- }
- replicationManager.appendCommitRecord(journalID, txID);
- replicatedJournal.appendCommitRecord(txID, sync);
- }
-
- /**
- * @param id
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean)
- */
- public void appendDeleteRecord(final long id, final boolean sync) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendDelete " + id);
- }
- replicationManager.appendDeleteRecord(journalID, id);
- replicatedJournal.appendDeleteRecord(id, sync);
- }
-
- /**
- * @param txID
- * @param id
- * @param record
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[])
- */
- public void appendDeleteRecordTransactional(final long txID, final long id, final byte[] record) throws Exception
- {
- this.appendDeleteRecordTransactional(txID, id, new ByteArrayEncoding(record));
- }
-
- /**
- * @param txID
- * @param id
- * @param record
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.hornetq.core.journal.EncodingSupport)
- */
- public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendDelete txID=" + txID + " id=" + id);
- }
- replicationManager.appendDeleteRecordTransactional(journalID, txID, id, record);
- replicatedJournal.appendDeleteRecordTransactional(txID, id, record);
- }
-
- /**
- * @param txID
- * @param id
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long)
- */
- public void appendDeleteRecordTransactional(final long txID, final long id) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendDelete (noencoding) txID=" + txID + " id=" + id);
- }
- replicationManager.appendDeleteRecordTransactional(journalID, txID, id);
- replicatedJournal.appendDeleteRecordTransactional(txID, id);
- }
-
- /**
- * @param txID
- * @param transactionData
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean)
- */
- public void appendPrepareRecord(final long txID, final byte[] transactionData, final boolean sync) throws Exception
- {
- this.appendPrepareRecord(txID, new ByteArrayEncoding(transactionData), sync);
- }
-
- /**
- * @param txID
- * @param transactionData
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean)
- */
- public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendPrepare txID=" + txID);
- }
- replicationManager.appendPrepareRecord(journalID, txID, transactionData);
- replicatedJournal.appendPrepareRecord(txID, transactionData, sync);
- }
-
- /**
- * @param txID
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean)
- */
- public void appendRollbackRecord(final long txID, final boolean sync) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendRollback " + txID);
- }
- replicationManager.appendRollbackRecord(journalID, txID);
- replicatedJournal.appendRollbackRecord(txID, sync);
- }
-
- /**
- * @param id
- * @param recordType
- * @param record
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean)
- */
- public void appendUpdateRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception
- {
- this.appendUpdateRecord(id, recordType, new ByteArrayEncoding(record), sync);
- }
-
- /**
- * @param id
- * @param recordType
- * @param record
- * @param sync
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean)
- */
- public void appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendUpdateRecord id = " + id + " , recordType = " + recordType);
- }
- replicationManager.appendUpdateRecord(journalID, id, recordType, record);
- replicatedJournal.appendUpdateRecord(id, recordType, record, sync);
- }
-
- /**
- * @param txID
- * @param id
- * @param recordType
- * @param record
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[])
- */
- public void appendUpdateRecordTransactional(final long txID,
- final long id,
- final byte recordType,
- final byte[] record) throws Exception
- {
- this.appendUpdateRecordTransactional(txID, id, recordType, new ByteArrayEncoding(record));
- }
-
- /**
- * @param txID
- * @param id
- * @param recordType
- * @param record
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport)
- */
- public void appendUpdateRecordTransactional(final long txID,
- final long id,
- final byte recordType,
- final EncodingSupport record) throws Exception
- {
- if (trace)
- {
- System.out.println("AppendUpdateRecord txid=" + txID + " id = " + id + " , recordType = " + recordType);
- }
- replicationManager.appendUpdateRecordTransactional(journalID, txID, id, recordType, record);
- replicatedJournal.appendUpdateRecordTransactional(txID, id, recordType, record);
- }
-
- /**
- * @param committedRecords
- * @param preparedTransactions
- * @param transactionFailure
- * @return
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback)
- */
- public long load(final List<RecordInfo> committedRecords,
- final List<PreparedTransactionInfo> preparedTransactions,
- final TransactionFailureCallback transactionFailure) throws Exception
- {
- return replicatedJournal.load(committedRecords, preparedTransactions, transactionFailure);
- }
-
- /**
- * @param reloadManager
- * @return
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback)
- */
- public long load(final LoaderCallback reloadManager) throws Exception
- {
- return replicatedJournal.load(reloadManager);
- }
-
- /**
- * @param pages
- * @throws Exception
- * @see org.hornetq.core.journal.Journal#perfBlast(int)
- */
- public void perfBlast(final int pages) throws Exception
- {
- replicatedJournal.perfBlast(pages);
- }
-
- /**
- * @throws Exception
- * @see org.hornetq.core.server.HornetQComponent#start()
- */
- public void start() throws Exception
- {
- replicatedJournal.start();
- }
-
- /**
- * @throws Exception
- * @see org.hornetq.core.server.HornetQComponent#stop()
- */
- public void stop() throws Exception
- {
- replicatedJournal.stop();
- }
-
- /* (non-Javadoc)
- * @see org.hornetq.core.journal.Journal#getAlignment()
- */
- public int getAlignment() throws Exception
- {
- return replicatedJournal.getAlignment();
- }
-
- /* (non-Javadoc)
- * @see org.hornetq.core.server.HornetQComponent#isStarted()
- */
- public boolean isStarted()
- {
- return replicatedJournal.isStarted();
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Modified: branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java
===================================================================
--- branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-10-08 21:40:37 UTC (rev 8070)
+++ branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-10-08 21:41:35 UTC (rev 8071)
@@ -47,7 +47,7 @@
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.remoting.server.impl.RemotingServiceImpl;
import org.hornetq.core.remoting.spi.HornetQBuffer;
-import org.hornetq.core.replication.impl.ReplicatedJournalImpl;
+import org.hornetq.core.replication.impl.ReplicatedJournal;
import org.hornetq.core.replication.impl.ReplicationManagerImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.impl.HornetQServerImpl;
@@ -153,7 +153,7 @@
ReplicationManagerImpl manager = new ReplicationManagerImpl(connectionManager, executor);
manager.start();
- Journal replicatedJournal = new ReplicatedJournalImpl((byte)1, new FakeJournal(), manager);
+ Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(), manager);
replicatedJournal.appendPrepareRecord(1, new FakeData(), false);
@@ -218,7 +218,7 @@
ReplicationManagerImpl manager = new ReplicationManagerImpl(connectionManager, executor);
manager.start();
- Journal replicatedJournal = new ReplicatedJournalImpl((byte)1, new FakeJournal(), manager);
+ Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(), manager);
replicatedJournal.appendPrepareRecord(1, new FakeData(), false);
More information about the hornetq-commits
mailing list