Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 88360200C33 for ; Fri, 3 Feb 2017 15:30:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 86C35160B62; Fri, 3 Feb 2017 14:30:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B8F98160B68 for ; Fri, 3 Feb 2017 15:30:08 +0100 (CET) Received: (qmail 22591 invoked by uid 500); 3 Feb 2017 14:30:07 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 22470 invoked by uid 99); 3 Feb 2017 14:30:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2017 14:30:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78DD6E0A74; Fri, 3 Feb 2017 14:30:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: martyntaylor@apache.org To: commits@activemq.apache.org Date: Fri, 03 Feb 2017 14:30:12 -0000 Message-Id: <8bfe0631521241d486832f208f61b8e1@git.apache.org> In-Reply-To: <2bb13526d2694236b0e4f0d604d4e02e@git.apache.org> References: <2bb13526d2694236b0e4f0d604d4e02e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] activemq-artemis git commit: This closes #985 archived-at: Fri, 03 Feb 2017 14:30:09 -0000 This closes #985 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/03a999e3 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/03a999e3 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/03a999e3 Branch: refs/heads/master Commit: 03a999e39dc7fbb38693d13123d1646f97a7625c Parents: 57038ff c039aae Author: Martyn Taylor Authored: Fri Feb 3 14:29:37 2017 +0000 Committer: Martyn Taylor Committed: Fri Feb 3 14:29:37 2017 +0000 ---------------------------------------------------------------------- .../apache/activemq/artemis/cli/Artemis.java | 4 +- .../activemq/artemis/cli/commands/Create.java | 80 ++-- .../artemis/cli/commands/tools/PerfJournal.java | 92 +++++ .../artemis/cli/commands/tools/SyncRecalc.java | 55 --- .../cli/commands/util/SyncCalculation.java | 53 ++- .../apache/activemq/cli/test/ArtemisTest.java | 30 +- .../jdbc/store/file/JDBCSequentialFile.java | 5 - .../store/file/JDBCSequentialFileFactory.java | 6 + .../jdbc/store/journal/JDBCJournalImpl.java | 12 +- .../journal/JMSJournalStorageManagerImpl.java | 6 +- .../UnpooledUnsafeDirectByteBufWrapper.java | 371 ++++++++++++++++++ .../core/io/AbstractSequentialFileFactory.java | 16 + .../artemis/core/io/SequentialFile.java | 2 - .../artemis/core/io/SequentialFileFactory.java | 2 + .../artemis/core/io/aio/AIOSequentialFile.java | 10 +- .../core/io/aio/AIOSequentialFileFactory.java | 37 +- .../artemis/core/io/mapped/MappedFile.java | 95 +++-- .../core/io/mapped/MappedSequentialFile.java | 97 ++--- .../io/mapped/MappedSequentialFileFactory.java | 77 ++-- .../core/io/mapped/TimedSequentialFile.java | 377 +++++++++++++++++++ .../artemis/core/io/nio/NIOSequentialFile.java | 5 - .../artemis/core/io/JournalTptBenchmark.java | 208 ++++++++++ .../core/io/SequentialFileTptBenchmark.java | 203 ++++++++++ .../activemq/artemis/jlibaio/LibaioFile.java | 4 +- .../artemis/core/config/Configuration.java | 2 +- .../artemis/core/config/impl/Validators.java | 4 +- .../deployers/impl/FileConfigurationParser.java | 11 +- .../impl/journal/JournalStorageManager.java | 33 +- .../core/server/ActiveMQServerLogger.java | 6 +- .../artemis/core/server/JournalType.java | 29 +- .../resources/schema/artemis-configuration.xsd | 1 + .../test/resources/artemis-configuration.xsd | 1 + .../integration/journal/AIOJournalImplTest.java | 3 +- .../journal/AIOSequentialFileFactoryTest.java | 2 +- .../journal/MappedImportExportTest.java | 30 ++ .../journal/MappedJournalCompactTest.java | 37 ++ .../journal/MappedJournalImplTest.java | 43 +++ .../MappedSequentialFileFactoryTest.java | 184 +++++++++ .../journal/NIOImportExportTest.java | 6 +- .../journal/NIOJournalCompactTest.java | 2 +- .../journal/ValidateTransactionHealthTest.java | 37 +- .../integration/paging/GlobalPagingTest.java | 4 +- .../tests/integration/paging/PagingTest.java | 12 +- .../unit/core/journal/impl/CleanBufferTest.java | 2 +- .../core/journal/impl/JournalImplTestUnit.java | 3 + .../impl/SequentialFileFactoryTestBase.java | 32 +- .../impl/fakes/FakeSequentialFileFactory.java | 13 +- 47 files changed, 2025 insertions(+), 319 deletions(-) ----------------------------------------------------------------------