Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 06F19182A9 for ; Mon, 23 Nov 2015 08:47:44 +0000 (UTC) Received: (qmail 42302 invoked by uid 500); 23 Nov 2015 08:47:43 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42238 invoked by uid 500); 23 Nov 2015 08:47:43 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 42074 invoked by uid 99); 23 Nov 2015 08:47:43 -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; Mon, 23 Nov 2015 08:47:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78812E041C; Mon, 23 Nov 2015 08:47:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 23 Nov 2015 08:47:46 -0000 Message-Id: <0d159b47593a42c992ad65655c927c69@git.apache.org> In-Reply-To: <91d7dd2e79ff41d795b9d768c9d33f1e@git.apache.org> References: <91d7dd2e79ff41d795b9d768c9d33f1e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/12] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-1.5-tx-futs-opts' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5-tx-futs-opts Merge branches 'ignite-1.5' and 'ignite-1.5-tx-futs-opts' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5-tx-futs-opts Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c8ff109 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c8ff109 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c8ff109 Branch: refs/heads/ignite-sql-opt Commit: 1c8ff109555cdd639ac0c8742093c8faf683b835 Parents: d92de42 457ca6f Author: Yakov Zhdanov Authored: Sat Nov 21 17:51:07 2015 +0300 Committer: Yakov Zhdanov Committed: Sat Nov 21 17:51:07 2015 +0300 ---------------------------------------------------------------------- .../internal/direct/DirectByteBufferStream.java | 1499 ----------------- .../internal/direct/DirectMessageReader.java | 144 +- .../internal/direct/DirectMessageWriter.java | 65 +- .../direct/DirectMessageWriterState.java | 123 -- .../direct/state/DirectMessageState.java | 98 ++ .../direct/state/DirectMessageStateItem.java | 28 + .../direct/stream/DirectByteBufferStream.java | 316 ++++ .../stream/v1/DirectByteBufferStreamImplV1.java | 1360 +++++++++++++++ .../stream/v2/DirectByteBufferStreamImplV2.java | 1583 ++++++++++++++++++ .../managers/communication/GridIoManager.java | 64 +- .../processors/cache/GridCacheUtils.java | 39 +- .../CacheDataStructuresManager.java | 2 +- .../GridFutureRemapTimeoutObject.java | 72 - .../dht/GridPartitionedGetFuture.java | 28 +- .../distributed/near/GridNearGetFuture.java | 28 +- .../IgniteTxImplicitSingleStateImpl.java | 29 +- .../IgniteTxRemoteSingleStateImpl.java | 19 +- .../datastructures/DataStructuresProcessor.java | 47 +- .../GridAtomicCacheQueueImpl.java | 126 +- .../GridCacheAtomicReferenceImpl.java | 10 +- .../GridCacheCountDownLatchImpl.java | 15 +- .../datastructures/GridCacheQueueAdapter.java | 32 +- .../GridTransactionalCacheQueueImpl.java | 193 +-- .../ignite/internal/util/IgniteUtils.java | 31 + .../internal/util/ipc/IpcToNioAdapter.java | 14 +- .../util/nio/GridCommunicationClient.java | 4 +- .../internal/util/nio/GridDirectParser.java | 37 +- .../util/nio/GridNioMessageReaderFactory.java | 37 + .../util/nio/GridNioMessageWriterFactory.java | 35 + .../ignite/internal/util/nio/GridNioServer.java | 47 +- .../util/nio/GridShmemCommunicationClient.java | 12 +- .../communication/MessageFormatter.java | 15 +- .../extensions/communication/MessageReader.java | 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 80 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 36 + .../apache/ignite/stream/StreamTransformer.java | 9 +- ...eAbstractDataStructuresFailoverSelfTest.java | 924 +++++----- ...rtitionedDataStructuresFailoverSelfTest.java | 7 +- ...edOffheapDataStructuresFailoverSelfTest.java | 12 +- ...eplicatedDataStructuresFailoverSelfTest.java | 5 - ...gniteAtomicLongChangingTopologySelfTest.java | 2 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 4 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 90 +- .../testframework/GridSpiTestContext.java | 12 +- .../testframework/junits/GridAbstractTest.java | 6 +- .../spring/IgniteTransactionHolder.java | 97 ++ .../spring/SpringTransactionManager.java | 522 ++++++ .../transactions/spring/package-info.java | 22 + .../test/java/config/spring-transactions.xml | 36 + .../testsuites/IgniteSpringTestSuite.java | 5 +- .../GridSpringTransactionManagerSelfTest.java | 165 ++ .../spring/GridSpringTransactionService.java | 68 + parent/pom.xml | 4 +- 56 files changed, 5585 insertions(+), 2711 deletions(-) ----------------------------------------------------------------------