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 75AC417C6F for ; Thu, 9 Apr 2015 14:28:53 +0000 (UTC) Received: (qmail 23534 invoked by uid 500); 9 Apr 2015 14:28:37 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 23505 invoked by uid 500); 9 Apr 2015 14:28:37 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 23496 invoked by uid 99); 9 Apr 2015 14:28:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 14:28:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 09 Apr 2015 14:28:08 +0000 Received: (qmail 18232 invoked by uid 99); 9 Apr 2015 14:28:00 -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; Thu, 09 Apr 2015 14:28:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94E2CDFFC0; Thu, 9 Apr 2015 14:28:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 14:28:12 -0000 Message-Id: <510bbf9a39c1408193dc195886f1a6f4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180-1 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/90f91d7d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90f91d7d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90f91d7d Branch: refs/heads/ignite-696 Commit: 90f91d7dbdd8570bae5e9968e2552ed799a23d88 Parents: 27a73f0 682dcd1 Author: ivasilinets Authored: Wed Apr 8 11:51:24 2015 +0300 Committer: ivasilinets Committed: Wed Apr 8 11:51:24 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +- config/hadoop/default-config.xml | 15 +- .../streaming/StreamTransformerExample.java | 3 +- .../src/main/java/org/apache/ignite/Ignite.java | 15 + .../apache/ignite/internal/IgniteKernal.java | 37 ++ .../internal/managers/GridManagerAdapter.java | 34 +- .../cache/DynamicCacheChangeRequest.java | 17 + .../cache/DynamicCacheDescriptor.java | 17 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 349 +++++++++++++++--- .../dht/GridClientPartitionTopology.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 1 + .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 ++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +- .../communication/tcp/TcpCommunicationSpi.java | 14 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- .../resources/META-INF/classnames.properties | 19 +- ...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++ .../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++ ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +----- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 10 + .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../org/apache/ignite/IgniteSpringBean.java | 14 + .../commands/cache/VisorCacheClearCommand.scala | 3 +- .../scala/org/apache/ignite/visor/visor.scala | 12 +- parent/pom.xml | 2 +- pom.xml | 2 + 45 files changed, 1182 insertions(+), 317 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90f91d7d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ----------------------------------------------------------------------