You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/12/21 15:54:39 UTC
svn commit: r1775480 - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/consumer/
broker-core/src/main/java/org/apache/qpid/server/message/
broker-core/src/main/java/o...
Author: lquack
Date: Wed Dec 21 15:54:39 2016
New Revision: 1775480
URL: http://svn.apache.org/viewvc?rev=1775480&view=rev
Log:
QPID-7576: [Java Broker] Avoid double loading of metadata for messages with on disk representation.
* Move caching of contentSize from AbstractServerMessageImpl to StoredMessage
* get persistence information from QueueEntry instead of metadata
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.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/StoredMemoryMessage.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.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=1775480&r1=1775479&r2=1775480&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 Wed Dec 21 15:54:39 2016
@@ -1027,7 +1027,7 @@ public abstract class AbstractBDBMessage
{
private final long _messageId;
-
+ private final int _contentSize;
private MessageDataRef<T> _messageDataRef;
StoredBDBMessage(long messageId, T metaData)
@@ -1047,6 +1047,7 @@ public abstract class AbstractBDBMessage
{
_messageDataRef = new MessageDataSoftRef<>(metaData, null);
}
+ _contentSize = metaData.getContentSize();
}
@Override
@@ -1170,6 +1171,12 @@ public abstract class AbstractBDBMessage
return content;
}
+ @Override
+ public int getContentSize()
+ {
+ return _contentSize;
+ }
+
synchronized void store(Transaction txn)
{
if (!stored())
@@ -1221,15 +1228,19 @@ public abstract class AbstractBDBMessage
public synchronized void remove()
{
checkMessageStoreOpen();
- Collection<QpidByteBuffer> data = _messageDataRef.getData();
-
- final T metaData = getMetaData();
- int delta = metaData.getContentSize();
if(stored())
{
removeMessage(_messageId, false);
- storedSizeChangeOccurred(-delta);
+ storedSizeChangeOccurred(-getContentSize());
+ }
+
+ final T metaData;
+ if ((metaData =_messageDataRef.getMetaData()) != null)
+ {
+ metaData.dispose();
}
+
+ Collection<QpidByteBuffer> data = _messageDataRef.getData();
if(data != null)
{
_messageDataRef.setData(null);
@@ -1238,7 +1249,6 @@ public abstract class AbstractBDBMessage
buf.dispose();
}
}
- metaData.dispose();
_messageDataRef = null;
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java Wed Dec 21 15:54:39 2016
@@ -205,13 +205,15 @@ public abstract class AbstractConsumerTa
@Override
public final long send(final MessageInstanceConsumer consumer, MessageInstance entry, boolean batch)
{
+ // NoAck consumer might delete the message during doSend so we must locally cache the size
+ final long messageSize = entry.getMessage().getSize();
doSend(consumer, entry, batch);
if (consumer.acquires())
{
entry.makeAcquisitionStealable();
}
- return entry.getMessage().getSize();
+ return messageSize;
}
protected abstract void doSend(final MessageInstanceConsumer consumer, MessageInstance entry, boolean batch);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java Wed Dec 21 15:54:39 2016
@@ -42,26 +42,24 @@ public abstract class AbstractServerMess
private static final AtomicReferenceFieldUpdater<AbstractServerMessageImpl, Collection> _resourcesUpdater =
AtomicReferenceFieldUpdater.newUpdater(AbstractServerMessageImpl.class, Collection.class,"_resources");
- private final long _size;
-
private volatile int _referenceCount = 0;
private final StoredMessage<T> _handle;
private final Object _connectionReference;
+ @SuppressWarnings("unused")
private volatile Collection<UUID> _resources;
- public AbstractServerMessageImpl(StoredMessage<T> handle, Object connectionReference, final long size)
+ public AbstractServerMessageImpl(StoredMessage<T> handle, Object connectionReference)
{
_handle = handle;
_connectionReference = connectionReference;
- _size = size;
}
@Override
public long getSize()
{
- return _size;
+ return _handle.getContentSize();
}
public StoredMessage<T> getStoredMessage()
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java Wed Dec 21 15:54:39 2016
@@ -251,6 +251,8 @@ public interface MessageInstance
boolean isHeld();
+ boolean isPersistent();
+
ServerMessage getMessage();
InstanceProperties getInstanceProperties();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java Wed Dec 21 15:54:39 2016
@@ -55,14 +55,14 @@ public class InternalMessage extends Abs
final InternalMessageHeader header,
final Object messageBody)
{
- super(handle, null, handle.getMetaData().getContentSize());
+ super(handle, null);
_header = header;
_messageBody = messageBody;
}
InternalMessage(final StoredMessage<InternalMessageMetaData> msg)
{
- super(msg, null, msg.getMetaData().getContentSize());
+ super(msg, null);
_header = msg.getMetaData().getHeader();
Collection<QpidByteBuffer> bufs = msg.getContent(0, (int)getSize());
@@ -235,6 +235,12 @@ public class InternalMessage extends Abs
}
@Override
+ public int getContentSize()
+ {
+ return bytes.length;
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java Wed Dec 21 15:54:39 2016
@@ -90,7 +90,7 @@ abstract class AbstractQueueEntryList im
case DELETED:
queueStatistics.removeFromQueue(size);
queueStatistics.addToDequeued(size);
- if(_forcePersistent || (_respectPersistent && entry.getMessage().isPersistent()))
+ if(_forcePersistent || (_respectPersistent && entry.isPersistent()))
{
queueStatistics.addToPersistentDequeued(size);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java Wed Dec 21 15:54:39 2016
@@ -709,12 +709,19 @@ public abstract class QueueEntryImpl imp
_flags |= PERSISTENT_FLAG;
}
+ @Override
public boolean isRedelivered()
{
return (_flags & REDELIVERED_FLAG) != 0;
}
@Override
+ public boolean isPersistent()
+ {
+ return (_flags & PERSISTENT_FLAG) != 0;
+ }
+
+ @Override
public MessageReference newMessageReference()
{
try
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=1775480&r1=1775479&r2=1775480&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 Wed Dec 21 15:54:39 2016
@@ -1410,6 +1410,7 @@ public abstract class AbstractJDBCMessag
{
private final long _messageId;
+ private final int _contentSize;
private MessageDataRef<T> _messageDataRef;
@@ -1433,6 +1434,7 @@ public abstract class AbstractJDBCMessag
{
_messageDataRef = new MessageDataSoftRef<>(metaData, null);
}
+ _contentSize = metaData.getContentSize();
}
@@ -1564,6 +1566,12 @@ public abstract class AbstractJDBCMessag
return content;
}
+ @Override
+ public int getContentSize()
+ {
+ return _contentSize;
+ }
+
synchronized void store(final Connection conn) throws SQLException
{
if (!stored())
@@ -1598,7 +1606,7 @@ public abstract class AbstractJDBCMessag
{
store(conn);
conn.commit();
- storedSizeChange(getMetaData().getContentSize());
+ storedSizeChange(getContentSize());
}
catch (SQLException e)
{
@@ -1616,15 +1624,19 @@ public abstract class AbstractJDBCMessag
getLogger().debug("REMOVE called on message: {}", _messageId);
checkMessageStoreOpen();
- Collection<QpidByteBuffer> data = _messageDataRef.getData();
-
- final T metaData = getMetaData();
- int delta = metaData.getContentSize();
if(stored())
{
AbstractJDBCMessageStore.this.removeMessage(_messageId);
- storedSizeChange(-delta);
+ storedSizeChange(-getContentSize());
}
+
+ final T metaData;
+ if ((metaData = _messageDataRef.getMetaData()) != null)
+ {
+ metaData.dispose();
+ }
+
+ Collection<QpidByteBuffer> data = _messageDataRef.getData();
if(data != null)
{
_messageDataRef.setData(null);
@@ -1633,7 +1645,6 @@ public abstract class AbstractJDBCMessag
buf.dispose();
}
}
- metaData.dispose();
_messageDataRef = null;
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java Wed Dec 21 15:54:39 2016
@@ -29,6 +29,7 @@ import org.apache.qpid.bytebuffer.QpidBy
public class StoredMemoryMessage<T extends StorableMessageMetaData> implements StoredMessage<T>, MessageHandle<T>
{
private final long _messageNumber;
+ private final int _contentSize;
private QpidByteBuffer _content;
private T _metaData;
@@ -36,6 +37,7 @@ public class StoredMemoryMessage<T exten
{
_messageNumber = messageNumber;
_metaData = metaData;
+ _contentSize = _metaData.getContentSize();
}
public long getMessageNumber()
@@ -94,6 +96,12 @@ public class StoredMemoryMessage<T exten
return Collections.singleton(_content.view(offset, length));
}
+ @Override
+ public int getContentSize()
+ {
+ return _contentSize;
+ }
+
public T getMetaData()
{
return _metaData;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java Wed Dec 21 15:54:39 2016
@@ -32,6 +32,7 @@ public interface StoredMessage<M extends
Collection<QpidByteBuffer> getContent(int offset, int length);
+ int getContentSize();
void remove();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java Wed Dec 21 15:54:39 2016
@@ -400,6 +400,12 @@ public abstract class AbstractSystemMess
}
@Override
+ public boolean isPersistent()
+ {
+ return false;
+ }
+
+ @Override
public ServerMessage getMessage()
{
return _message;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java Wed Dec 21 15:54:39 2016
@@ -38,7 +38,7 @@ public class AbstractServerMessageTest e
public TestMessage(final StoredMessage<T> handle,
final Object connectionReference)
{
- super(handle, connectionReference, 0);
+ super(handle, connectionReference);
}
@Override
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java Wed Dec 21 15:54:39 2016
@@ -167,6 +167,7 @@ public class MockMessageInstance impleme
return null;
}
+ @Override
public boolean isPersistent()
{
return false;
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.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/MessageConverter_Internal_to_v0_10.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java Wed Dec 21 15:54:39 2016
@@ -92,6 +92,12 @@ public class MessageConverter_Internal_t
}
@Override
+ public int getContentSize()
+ {
+ return messageContent.length;
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.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/MessageConverter_v0_10.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java Wed Dec 21 15:54:39 2016
@@ -96,6 +96,12 @@ public class MessageConverter_v0_10 impl
}
@Override
+ public int getContentSize()
+ {
+ return messageMetaData_0_10.getContentSize();
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.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/MessageTransferMessage.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java Wed Dec 21 15:54:39 2016
@@ -38,7 +38,7 @@ public class MessageTransferMessage exte
public MessageTransferMessage(StoredMessage<MessageMetaData_0_10> storeMessage, Object connectionRef)
{
- super(storeMessage, connectionRef, storeMessage.getMetaData().getSize());
+ super(storeMessage, connectionRef);
}
private MessageMetaData_0_10 getMetaData()
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java Wed Dec 21 15:54:39 2016
@@ -44,7 +44,7 @@ public class AMQMessage extends Abstract
public AMQMessage(StoredMessage<MessageMetaData> handle, Object connectionReference)
{
- super(handle, connectionReference, handle.getMetaData().getContentSize());
+ super(handle, connectionReference);
}
public MessageMetaData getMessageMetaData()
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java Wed Dec 21 15:54:39 2016
@@ -102,6 +102,12 @@ public class MessageConverter_Internal_t
}
@Override
+ public int getContentSize()
+ {
+ return messageContent.length;
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java Wed Dec 21 15:54:39 2016
@@ -298,6 +298,12 @@ public abstract class MessageConverter_t
}
@Override
+ public int getContentSize()
+ {
+ return _metaData.getContentSize();
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java Wed Dec 21 15:54:39 2016
@@ -61,13 +61,13 @@ public class Message_1_0 extends Abstrac
public Message_1_0(final StoredMessage<MessageMetaData_1_0> storedMessage)
{
- super(storedMessage, null, storedMessage.getMetaData().getContentSize());
+ super(storedMessage, null);
}
public Message_1_0(final StoredMessage<MessageMetaData_1_0> storedMessage,
final Object connectionReference)
{
- super(storedMessage, connectionReference, storedMessage.getMetaData().getContentSize());
+ super(storedMessage, connectionReference);
}
public String getInitialRoutingAddress()
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java Wed Dec 21 15:54:39 2016
@@ -102,6 +102,12 @@ public class MessageConverter_1_0_to_v0_
}
@Override
+ public int getContentSize()
+ {
+ return messageContent.length;
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java Wed Dec 21 15:54:39 2016
@@ -208,6 +208,12 @@ public class MessageConverter_0_10_to_0_
}
@Override
+ public int getContentSize()
+ {
+ return metaData.getContentSize();
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java Wed Dec 21 15:54:39 2016
@@ -94,6 +94,12 @@ public class MessageConverter_0_8_to_0_1
}
@Override
+ public int getContentSize()
+ {
+ return messageMetaData_0_10.getContentSize();
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java Wed Dec 21 15:54:39 2016
@@ -103,6 +103,12 @@ public class MessageConverter_1_0_to_v0_
}
@Override
+ public int getContentSize()
+ {
+ return messageContent.length;
+ }
+
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Wed Dec 21 15:54:39 2016
@@ -1711,6 +1711,12 @@ class ManagementNode implements MessageS
}
@Override
+ public boolean isPersistent()
+ {
+ return false;
+ }
+
+ @Override
public ServerMessage getMessage()
{
return _message;
Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java?rev=1775480&r1=1775479&r2=1775480&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java Wed Dec 21 15:54:39 2016
@@ -231,6 +231,12 @@ class ManagementResponse implements Mess
}
@Override
+ public boolean isPersistent()
+ {
+ return false;
+ }
+
+ @Override
public ServerMessage getMessage()
{
return _message;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org