alex-rufous commented on a change in pull request #63:
URL: https://github.com/apache/qpid-broker-j/pull/63#discussion_r500679615
##########
File path:
broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
##########
@@ -3520,23 +3521,46 @@ public MessageEnqueueRecord getEnqueueRecord()
destination,
parseSelector(selector),
limit);
- _virtualHost.executeTransaction(transaction);
+ executeTransactionAndLogResults("copyMessages", destination.getName(),
transaction);
return transaction.getModifiedMessageIds();
}
+ private void executeTransactionAndLogResults(final String msg,
Review comment:
The parameter name 'msg' needs to be changed to operationName
Let move transaction parameter to a second position
the destinationName can be renamed into a targetdestinationName
##########
File path:
broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
##########
@@ -3520,23 +3521,46 @@ public MessageEnqueueRecord getEnqueueRecord()
destination,
parseSelector(selector),
limit);
- _virtualHost.executeTransaction(transaction);
+ executeTransactionAndLogResults("copyMessages", destination.getName(),
transaction);
return transaction.getModifiedMessageIds();
}
+ private void executeTransactionAndLogResults(final String msg,
Review comment:
The entire method implementation can be simplified to something like
`
try
{
_virtualHost.executeTransaction(transaction);
}
finally
{
logOperation(String.format("%s : %s: %s: %d",
operationName,
getName(),
ofNullable(destinationName).orElse(""),
transaction.getModifiedMessageIds().size()));
}
`
##########
File path:
broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
##########
@@ -3520,23 +3521,46 @@ public MessageEnqueueRecord getEnqueueRecord()
destination,
parseSelector(selector),
limit);
- _virtualHost.executeTransaction(transaction);
+ executeTransactionAndLogResults("copyMessages", destination.getName(),
transaction);
return transaction.getModifiedMessageIds();
}
+ private void executeTransactionAndLogResults(final String msg,
+ final String destinationName,
+ final
QueueManagingVirtualHost.TransactionalOperation transaction)
+ {
+ int messageCount = 0;
+ if (null != transaction)
+ {
+ _virtualHost.executeTransaction(transaction);
+ messageCount = transaction.getModifiedMessageIds().size();
+ }
+ if (null != destinationName)
+ {
+ logOperation(String.format(msg + "Messages : %s: %s: %d",
+ getName(),
+ destinationName,
+ messageCount));
+ }
+ else
+ {
+ logOperation(String.format(msg + " : %s: %d",
+ getName(),
+ messageCount));
+ }
+ }
+
@Override
public List<Long> deleteMessages(final List<Long> messageIds, final String
selector, int limit)
{
DeleteMessagesTransaction transaction = new
DeleteMessagesTransaction(this,
messageIds,
parseSelector(selector),
limit);
- _virtualHost.executeTransaction(transaction);
-
+ executeTransactionAndLogResults("deleteMessages",null, transaction);
Review comment:
space is missed between parameters
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
