You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2020/10/08 08:03:41 UTC
[qpid-broker-j] branch master updated (d3cacdc -> 4f86157)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from d3cacdc NO-JIRA: Report test logs into standard system output when running tests on travis
new 6a14029 QPID-8472:[Broker-J]Improve operational logging for operations on queue
new 4f86157 QPID-8469: [Broker-J][Message Store] The message is already cleaned when the delete listener is called
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../server/store/berkeleydb/AbstractBDBMessageStore.java | 14 +++++++-------
.../java/org/apache/qpid/server/queue/AbstractQueue.java | 14 ++++++++++++--
.../org/apache/qpid/server/store/MemoryMessageStore.java | 6 +++---
.../qpid/server/store/jdbc/AbstractJDBCMessageStore.java | 14 +++++++-------
4 files changed, 29 insertions(+), 19 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8469: [Broker-J][Message Store] The
message is already cleaned when the delete listener is called
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 4f861571ee0107b9f30945e5728492385c3510e3
Author: overmeulen <ov...@murex.com>
AuthorDate: Thu Sep 24 14:15:23 2020 +0200
QPID-8469: [Broker-J][Message Store] The message is already cleaned when the delete listener is called
---
.../server/store/berkeleydb/AbstractBDBMessageStore.java | 14 +++++++-------
.../org/apache/qpid/server/store/MemoryMessageStore.java | 6 +++---
.../qpid/server/store/jdbc/AbstractJDBCMessageStore.java | 14 +++++++-------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 192feda..94d6fb1 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -1217,6 +1217,13 @@ public abstract class AbstractBDBMessageStore implements MessageStore
removeMessage(_messageId, false);
storedSizeChangeOccurred(-getContentSize());
}
+ if (!_messageDeleteListeners.isEmpty())
+ {
+ for (final MessageDeleteListener messageDeleteListener : _messageDeleteListeners)
+ {
+ messageDeleteListener.messageDeleted(this);
+ }
+ }
final T metaData;
long bytesCleared = 0;
@@ -1236,13 +1243,6 @@ public abstract class AbstractBDBMessageStore implements MessageStore
}
_messageDataRef = null;
_inMemorySize.addAndGet(-bytesCleared);
- if (!_messageDeleteListeners.isEmpty())
- {
- for (final MessageDeleteListener messageDeleteListener : _messageDeleteListeners)
- {
- messageDeleteListener.messageDeleted(this);
- }
- }
}
@Override
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
index 668fa2f..657be12 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
@@ -311,9 +311,6 @@ public class MemoryMessageStore implements MessageStore
public void remove()
{
_messages.remove(getMessageNumber());
- int bytesCleared = metaData.getStorableSize() + metaData.getContentSize();
- super.remove();
- _inMemorySize.addAndGet(-bytesCleared);
if (!_messageDeleteListeners.isEmpty())
{
for (final MessageDeleteListener messageDeleteListener : _messageDeleteListeners)
@@ -321,6 +318,9 @@ public class MemoryMessageStore implements MessageStore
messageDeleteListener.messageDeleted(this);
}
}
+ int bytesCleared = metaData.getStorableSize() + metaData.getContentSize();
+ super.remove();
+ _inMemorySize.addAndGet(-bytesCleared);
}
};
_messages.put(storedMemoryMessage.getMessageNumber(), storedMemoryMessage);
diff --git a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
index 21c7d87..7b405d4 100644
--- a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
+++ b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
@@ -1678,6 +1678,13 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
AbstractJDBCMessageStore.this.removeMessageAsync(_messageId);
storedSizeChange(-getContentSize());
}
+ if (!_messageDeleteListeners.isEmpty())
+ {
+ for (final MessageDeleteListener messageDeleteListener : _messageDeleteListeners)
+ {
+ messageDeleteListener.messageDeleted(this);
+ }
+ }
final T metaData;
long bytesCleared = 0;
@@ -1697,13 +1704,6 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
}
_messageDataRef = null;
_inMemorySize.addAndGet(-bytesCleared);
- if (!_messageDeleteListeners.isEmpty())
- {
- for (final MessageDeleteListener messageDeleteListener : _messageDeleteListeners)
- {
- messageDeleteListener.messageDeleted(this);
- }
- }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8472:[Broker-J]Improve operational
logging for operations on queue
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 6a14029726e70903f771457268218eb9a71e2d01
Author: Dedeepya T <de...@yahoo.co.in>
AuthorDate: Mon Oct 5 14:23:07 2020 +0530
QPID-8472:[Broker-J]Improve operational logging for operations on queue
This closes #63
---
.../java/org/apache/qpid/server/queue/AbstractQueue.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 543ad1f..92cad5a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -1826,7 +1826,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
}
txn.commit();
-
+ logOperation(String.format("clearQueue : %s: %d", getName(), count));
return count;
}
@@ -3508,6 +3508,10 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
parseSelector(selector),
limit);
_virtualHost.executeTransaction(transaction);
+ logOperation(String.format("moveMessages : %s: %s: %d",
+ getName(),
+ destination.getName(),
+ transaction.getModifiedMessageIds().size()));
return transaction.getModifiedMessageIds();
}
@@ -3521,6 +3525,10 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
parseSelector(selector),
limit);
_virtualHost.executeTransaction(transaction);
+ logOperation(String.format("copyMessages : %s: %s: %d",
+ getName(),
+ destination.getName(),
+ transaction.getModifiedMessageIds().size()));
return transaction.getModifiedMessageIds();
}
@@ -3533,7 +3541,9 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
parseSelector(selector),
limit);
_virtualHost.executeTransaction(transaction);
-
+ logOperation(String.format("deleteMessages : %s: %d",
+ getName(),
+ transaction.getModifiedMessageIds().size()));
return transaction.getModifiedMessageIds();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org