You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/27 15:20:25 UTC
svn commit: r1784587 - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/ br...
Author: kwall
Date: Mon Feb 27 15:20:24 2017
New Revision: 1784587
URL: http://svn.apache.org/viewvc?rev=1784587&view=rev
Log:
QPID-7680: [Dtx] Isolate 0-10 Xid to the 0-10 protocol layer
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/Xid.java
- copied, changed from r1784283, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/Xid.java
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/Xid.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Mon Feb 27 15:20:24 2017
@@ -58,7 +58,7 @@ import org.apache.qpid.server.store.Stor
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.store.Xid;
+import org.apache.qpid.server.txn.Xid;
import org.apache.qpid.server.store.berkeleydb.entry.PreparedTransaction;
import org.apache.qpid.server.store.berkeleydb.entry.QueueEntryKey;
import org.apache.qpid.server.store.berkeleydb.tuple.ByteBufferBinding;
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java Mon Feb 27 15:20:24 2017
@@ -25,7 +25,7 @@ import com.sleepycat.bind.tuple.TupleBin
import com.sleepycat.bind.tuple.TupleInput;
import com.sleepycat.bind.tuple.TupleOutput;
-import org.apache.qpid.server.store.Xid;
+import org.apache.qpid.server.txn.Xid;
public class XidBinding extends TupleBinding<Xid>
{
Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java Mon Feb 27 15:20:24 2017
@@ -56,7 +56,7 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
-import org.apache.qpid.server.store.Xid;
+import org.apache.qpid.server.txn.Xid;
import org.apache.qpid.server.store.berkeleydb.tuple.XidBinding;
import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.CompoundKey;
import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.CompoundKeyBinding;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java Mon Feb 27 15:20:24 2017
@@ -215,6 +215,4 @@ public final class Xid extends Struct {
return result;
}
-
-
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Mon Feb 27 15:20:24 2017
@@ -52,6 +52,7 @@ import org.apache.qpid.server.plugin.Mes
import org.apache.qpid.server.store.handler.DistributedTransactionHandler;
import org.apache.qpid.server.store.handler.MessageHandler;
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
+import org.apache.qpid.server.txn.Xid;
public abstract class AbstractJDBCMessageStore implements MessageStore
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java Mon Feb 27 15:20:24 2017
@@ -39,6 +39,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.store.handler.DistributedTransactionHandler;
import org.apache.qpid.server.store.handler.MessageHandler;
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
+import org.apache.qpid.server.txn.Xid;
/** A simple message store that stores the messages in a thread-safe structure in memory. */
public class MemoryMessageStore implements MessageStore
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java Mon Feb 27 15:20:24 2017
@@ -21,8 +21,6 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class AlreadyKnownDtxException extends DtxException
{
public AlreadyKnownDtxException(Xid id)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java Mon Feb 27 15:20:24 2017
@@ -29,7 +29,6 @@ import org.apache.qpid.server.queue.Base
import org.apache.qpid.server.session.AMQPSession;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
public class DistributedTransaction implements ServerTransaction
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java Mon Feb 27 15:20:24 2017
@@ -37,7 +37,6 @@ import org.apache.qpid.server.store.Stor
import org.apache.qpid.server.store.Transaction;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
public class DtxBranch
{
@@ -342,6 +341,7 @@ public class DtxBranch
_enqueueRecord = enqueueRecord;
}
+ @Override
public MessageEnqueueRecord getEnqueueRecord()
{
return _enqueueRecord;
@@ -370,11 +370,14 @@ public class DtxBranch
{
return _enqueueAction;
}
+
+ @Override
public TransactionLogResource getResource()
{
return _resource;
}
+ @Override
public EnqueueableMessage getMessage()
{
return _message;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java Mon Feb 27 15:20:24 2017
@@ -31,11 +31,10 @@ import org.apache.qpid.server.session.AM
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
public class DtxRegistry
{
- private final Map<ComparableXid, DtxBranch> _branches = new HashMap<ComparableXid, DtxBranch>();
+ private final Map<ComparableXid, DtxBranch> _branches = new HashMap<>();
private final QueueManagingVirtualHost<?> _virtualHost;
public DtxRegistry(final QueueManagingVirtualHost<?> virtualHost)
@@ -317,7 +316,7 @@ public class DtxRegistry
public synchronized List<Xid> recover()
{
- List<Xid> inDoubt = new ArrayList<Xid>();
+ List<Xid> inDoubt = new ArrayList<>();
for(DtxBranch branch : _branches.values())
{
if(branch.getState() == DtxBranch.State.PREPARED)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java Mon Feb 27 15:20:24 2017
@@ -21,8 +21,6 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class IncorrectDtxStateException extends DtxException
{
public IncorrectDtxStateException(String message, Xid id)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java Mon Feb 27 15:20:24 2017
@@ -21,8 +21,6 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class JoinAndResumeDtxException extends DtxException
{
public JoinAndResumeDtxException(Xid id)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java Mon Feb 27 15:20:24 2017
@@ -21,8 +21,6 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class NotAssociatedDtxException extends DtxException
{
public NotAssociatedDtxException(Xid id)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java Mon Feb 27 15:20:24 2017
@@ -21,8 +21,6 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class RollbackOnlyDtxException extends DtxException
{
public RollbackOnlyDtxException(Xid id)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java Mon Feb 27 15:20:24 2017
@@ -21,12 +21,10 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class SuspendAndFailDtxException extends DtxException
{
-public SuspendAndFailDtxException(Xid id)
-{
- super("Cannot end a branch with both suspend and fail set " + id);
-}
+ public SuspendAndFailDtxException(Xid id)
+ {
+ super("Cannot end a branch with both suspend and fail set " + id);
+ }
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java Mon Feb 27 15:20:24 2017
@@ -21,8 +21,6 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class TimeoutDtxException extends DtxException
{
public TimeoutDtxException(Xid id)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java Mon Feb 27 15:20:24 2017
@@ -21,8 +21,6 @@
package org.apache.qpid.server.txn;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
-
public class UnknownDtxBranchException extends DtxException
{
public UnknownDtxBranchException(Xid id)
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/Xid.java (from r1784283, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/Xid.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/Xid.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/Xid.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/Xid.java&r1=1784283&r2=1784587&rev=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/Xid.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/Xid.java Mon Feb 27 15:20:24 2017
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,7 +17,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.store;
+package org.apache.qpid.server.txn;
import java.util.Arrays;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java Mon Feb 27 15:20:24 2017
@@ -58,9 +58,9 @@ import org.apache.qpid.server.store.hand
import org.apache.qpid.server.txn.DtxBranch;
import org.apache.qpid.server.txn.DtxRegistry;
import org.apache.qpid.server.txn.ServerTransaction;
+import org.apache.qpid.server.txn.Xid;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
import org.apache.qpid.server.transport.util.Functions;
public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java Mon Feb 27 15:20:24 2017
@@ -51,9 +51,9 @@ import org.apache.qpid.server.store.hand
import org.apache.qpid.server.txn.DtxBranch;
import org.apache.qpid.server.txn.DtxRegistry;
import org.apache.qpid.server.txn.ServerTransaction;
+import org.apache.qpid.server.txn.Xid;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
import org.apache.qpid.server.transport.util.Functions;
public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java Mon Feb 27 15:20:24 2017
@@ -55,9 +55,9 @@ import org.apache.qpid.server.store.hand
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
import org.apache.qpid.server.txn.DtxBranch;
import org.apache.qpid.server.txn.DtxRegistry;
+import org.apache.qpid.server.txn.Xid;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.server.protocol.v0_10.transport.Xid;
public class SynchronousMessageStoreRecovererTest extends QpidTestCase
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1784587&r1=1784586&r2=1784587&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Mon Feb 27 15:20:24 2017
@@ -83,24 +83,13 @@ import org.apache.qpid.server.model.Cons
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.protocol.v0_10.transport.*;
+import org.apache.qpid.server.protocol.v0_10.transport.Xid;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.protocol.v0_10.transport.Frame;
-import org.apache.qpid.server.txn.AlreadyKnownDtxException;
-import org.apache.qpid.server.txn.AsyncAutoCommitTransaction;
-import org.apache.qpid.server.txn.DistributedTransaction;
-import org.apache.qpid.server.txn.DtxNotSelectedException;
-import org.apache.qpid.server.txn.IncorrectDtxStateException;
-import org.apache.qpid.server.txn.JoinAndResumeDtxException;
-import org.apache.qpid.server.txn.LocalTransaction;
-import org.apache.qpid.server.txn.NotAssociatedDtxException;
-import org.apache.qpid.server.txn.RollbackOnlyDtxException;
-import org.apache.qpid.server.txn.ServerTransaction;
-import org.apache.qpid.server.txn.SuspendAndFailDtxException;
-import org.apache.qpid.server.txn.TimeoutDtxException;
-import org.apache.qpid.server.txn.UnknownDtxBranchException;
+import org.apache.qpid.server.txn.*;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -1326,7 +1315,7 @@ public class ServerSession extends Sessi
DtxNotSelectedException
{
DistributedTransaction distributedTransaction = assertDtxTransaction();
- distributedTransaction.start(xid, join, resume);
+ distributedTransaction.start(toDtxXid(xid), join, resume);
}
@@ -1337,21 +1326,21 @@ public class ServerSession extends Sessi
SuspendAndFailDtxException, TimeoutDtxException
{
DistributedTransaction distributedTransaction = assertDtxTransaction();
- distributedTransaction.end(xid, fail, suspend);
+ distributedTransaction.end(toDtxXid(xid), fail, suspend);
}
public long getTimeoutDtx(Xid xid)
throws UnknownDtxBranchException
{
- return getAddressSpace().getDtxRegistry().getTimeout(xid);
+ return getAddressSpace().getDtxRegistry().getTimeout(toDtxXid(xid));
}
public void setTimeoutDtx(Xid xid, long timeout)
throws UnknownDtxBranchException
{
- getAddressSpace().getDtxRegistry().setTimeout(xid, timeout);
+ getAddressSpace().getDtxRegistry().setTimeout(toDtxXid(xid), timeout);
}
@@ -1359,14 +1348,14 @@ public class ServerSession extends Sessi
throws UnknownDtxBranchException,
IncorrectDtxStateException, StoreException, RollbackOnlyDtxException, TimeoutDtxException
{
- getAddressSpace().getDtxRegistry().prepare(xid);
+ getAddressSpace().getDtxRegistry().prepare(toDtxXid(xid));
}
public void commitDtx(Xid xid, boolean onePhase)
throws UnknownDtxBranchException,
IncorrectDtxStateException, StoreException, RollbackOnlyDtxException, TimeoutDtxException
{
- getAddressSpace().getDtxRegistry().commit(xid, onePhase);
+ getAddressSpace().getDtxRegistry().commit(toDtxXid(xid), onePhase);
}
@@ -1374,18 +1363,25 @@ public class ServerSession extends Sessi
throws UnknownDtxBranchException,
IncorrectDtxStateException, StoreException, TimeoutDtxException
{
- getAddressSpace().getDtxRegistry().rollback(xid);
+ getAddressSpace().getDtxRegistry().rollback(toDtxXid(xid));
}
public void forgetDtx(Xid xid) throws UnknownDtxBranchException, IncorrectDtxStateException
{
- getAddressSpace().getDtxRegistry().forget(xid);
+ getAddressSpace().getDtxRegistry().forget(toDtxXid(xid));
}
public List<Xid> recoverDtx()
{
- return getAddressSpace().getDtxRegistry().recover();
+ List<Xid> xids = new ArrayList<>();
+ Iterator<org.apache.qpid.server.txn.Xid> dtxXids = getAddressSpace().getDtxRegistry().recover().iterator();
+ while(dtxXids.hasNext())
+ {
+ org.apache.qpid.server.txn.Xid dtxXid = dtxXids.next();
+ xids.add(new Xid(dtxXid.getFormat(), dtxXid.getGlobalId(), dtxXid.getBranchId()));
+ }
+ return xids;
}
private DistributedTransaction assertDtxTransaction() throws DtxNotSelectedException
@@ -1956,4 +1952,13 @@ public class ServerSession extends Sessi
}
}
+
+ public static org.apache.qpid.server.txn.Xid toDtxXid(final Xid xid)
+ {
+ return new org.apache.qpid.server.txn.Xid(xid.getFormat(),
+ xid.getGlobalId(),
+ xid.getBranchId());
+ }
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org