This closes #1853
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4ef6e328 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4ef6e328 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4ef6e328 Branch: refs/heads/master Commit: 4ef6e3281dc695258f14a95ea76e1be2e8df62ea Parents: 2eac195 58c4660 Author: Clebert Suconic <[email protected]> Authored: Thu Feb 8 12:10:11 2018 -0500 Committer: Clebert Suconic <[email protected]> Committed: Thu Feb 8 12:10:11 2018 -0500 ---------------------------------------------------------------------- .../activemq/artemis/api/core/Message.java | 11 +- .../api/core/management/QueueControl.java | 58 ++ .../artemis/core/message/impl/CoreMessage.java | 5 + .../core/message/impl/MessageInternalImpl.java | 5 + .../artemis/core/journal/impl/JournalImpl.java | 6 +- .../protocol/amqp/broker/AMQPMessage.java | 13 +- .../core/protocol/openwire/OpenwireMessage.java | 9 +- .../core/management/impl/QueueControlImpl.java | 110 +++- .../artemis/core/paging/PagedMessage.java | 10 + .../core/paging/cursor/PagePosition.java | 4 + .../core/paging/cursor/PageSubscription.java | 9 + .../paging/cursor/PageSubscriptionCounter.java | 16 +- .../core/paging/cursor/PagedReferenceImpl.java | 19 +- .../paging/cursor/impl/PagePositionImpl.java | 22 + .../impl/PageSubscriptionCounterImpl.java | 146 ++++- .../cursor/impl/PageSubscriptionImpl.java | 69 +- .../core/paging/impl/PagedMessageImpl.java | 6 + .../core/paging/impl/PagingStoreImpl.java | 11 +- .../core/persistence/StorageManager.java | 6 +- .../journal/AbstractJournalStorageManager.java | 37 +- .../impl/journal/DescribeJournal.java | 61 +- .../impl/journal/LargeServerMessageImpl.java | 10 +- .../journal/codec/PageCountPendingImpl.java | 5 +- .../impl/journal/codec/PageCountRecord.java | 18 +- .../impl/journal/codec/PageCountRecordInc.java | 18 +- .../impl/nullpm/NullStorageManager.java | 6 +- .../core/postoffice/impl/PostOfficeImpl.java | 2 +- .../core/server/ActiveMQServerLogger.java | 4 + .../artemis/core/server/MessageReference.java | 11 + .../activemq/artemis/core/server/Queue.java | 34 +- .../core/server/ScheduledDeliveryHandler.java | 6 + .../core/server/cluster/impl/BridgeImpl.java | 2 +- .../core/server/impl/LastValueQueue.java | 10 +- .../core/server/impl/MessageReferenceImpl.java | 8 +- .../server/impl/PostOfficeJournalLoader.java | 13 +- .../artemis/core/server/impl/QueueImpl.java | 144 +++- .../server/impl/QueuePendingMessageMetrics.java | 147 +++++ .../impl/ScheduledDeliveryHandlerImpl.java | 29 +- .../impl/ScheduledDeliveryHandlerTest.java | 75 ++- .../transaction/impl/TransactionImplTest.java | 6 +- .../journalcompatibility/forcepaging.groovy | 23 + .../journalcompatibility/ispaging.groovy | 23 + .../main/resources/metrics/queueMetrics.groovy | 37 ++ .../main/resources/servers/artemisServer.groovy | 9 +- .../compatibility/JournalCompatibilityTest.java | 46 +- .../tests/compatibility/VersionedBaseTest.java | 7 +- .../integration/client/AcknowledgeTest.java | 5 + .../integration/client/SendAckFailTest.java | 12 +- .../management/ManagementTestBase.java | 15 + .../management/QueueControlTest.java | 452 +++++++------ .../management/QueueControlUsingCoreTest.java | 55 +- .../integration/paging/PagingCounterTest.java | 21 +- .../AbstractPersistentStatTestSupport.java | 213 ++++++ .../metrics/JournalPageCountSizeTest.java | 144 ++++ .../metrics/JournalPendingMessageTest.java | 651 +++++++++++++++++++ .../unit/core/postoffice/impl/FakeQueue.java | 47 +- .../core/server/impl/fakes/FakeConsumer.java | 4 +- 57 files changed, 2553 insertions(+), 392 deletions(-) ----------------------------------------------------------------------
