tabish121 commented on code in PR #6323:
URL: https://github.com/apache/artemis/pull/6323#discussion_r3076152952
##########
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java:
##########
@@ -191,20 +187,25 @@ protected ReadableBuffer getData() {
@Override
public synchronized int getMemoryEstimate() {
- if (memoryEstimate == -1) {
- if (isPaged) {
- // When the message is paged, we don't take the unmarshalled
application properties because it could be
- // updated at different places. We just keep the estimate simple
when paging.
- memoryEstimate = memoryOffset + (data != null ? data.capacity() :
0);
- } else {
- memoryEstimate = memoryOffset + (data != null ? data.capacity() +
unmarshalledApplicationPropertiesMemoryEstimateFromData(data) : 0);
- }
- originalEstimate = memoryEstimate;
+ if (memoryEstimate == VALUE_NOT_PRESENT) {
+ // This estimation was tested and validated through AMQPGlobalMaxTest
on soak-tests
+ memoryEstimate = MINIMUM_ESTIMATE + (data != null ? data.capacity() +
getApplicationPropertiesEncodingSize(data) * 2 +
getApplicationPropertiesCount() * DataConstants.SIZE_INT : 0);
}
return memoryEstimate;
}
+ private int getApplicationPropertiesEncodingSize(ReadableBuffer data) {
+ ensureScanning();
+
+ // ensureScanning will make sure we know the positions, and we will
return the encoding used based on those positions
+ if (remainingBodyPosition != VALUE_NOT_PRESENT) {
Review Comment:
This method still seems wrong, consider a Message that has sections for
Header, DeliveryAnnotations and MessageAnnotations but no ApplicationProperties
or a Body section, then it would return the buffer capacity - (-1) which is not
the encoding size of ApplicationProperties as there are none. The
getMemoryEstimate() method then adds that value to the base estimate plug the
buffer capacity again leaving with a likely overly large estimate of the
message size.
Add the following test to AMQPMessageTest to see what I mean
```
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
index 8a10f33ce0..4a5c1d9c01 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
@@ -169,6 +169,27 @@ public class AMQPMessageTest {
assertNotNull(decoded.getExtraProperties());
}
+ @Test
+ public void testCreateMessageFromEncodedByteArrayDataWithNoBody() {
+ MessageImpl message = (MessageImpl) Proton.message();
+ MessageAnnotations annotations = new MessageAnnotations(new
LinkedHashMap<>());
+
+ for (int i = 0; i < 100; ++i) {
+
annotations.getValue().put(Symbol.valueOf(TEST_MESSAGE_ANNOTATION_KEY + ":" +
i), TEST_MESSAGE_ANNOTATION_VALUE + ":" + i);
+ }
+
+ message.setMessageAnnotations(annotations);
+ message.setBody(null);
+
+ byte[] encodedProtonMessage = encodeMessage(message);
+
+ AMQPStandardMessage decoded = new AMQPStandardMessage(0,
encodedProtonMessage, null, null);
+
+ final int expectedEstimate = AMQPMessage.MINIMUM_ESTIMATE +
encodedProtonMessage.length;
+
+ assertEquals(expectedEstimate, decoded.getMemoryEstimate());
+ }
+
```
It's likely you want something like this:
```
private int getApplicationPropertiesEncodingSize(ReadableBuffer data) {
ensureScanning();
// ensureScanning will make sure we know the positions, and we will
return the encoding used based on those positions
if (remainingBodyPosition != VALUE_NOT_PRESENT) {
return remainingBodyPosition - applicationPropertiesPosition;
} else if (applicationPropertiesPosition != VALUE_NOT_PRESENT) {
return data.capacity() - applicationPropertiesPosition;
} else {
return 0;
}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
