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 B170818F84 for ; Wed, 29 Apr 2015 14:04:31 +0000 (UTC) Received: (qmail 36064 invoked by uid 500); 29 Apr 2015 14:04:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 36033 invoked by uid 500); 29 Apr 2015 14:04:31 -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 36024 invoked by uid 99); 29 Apr 2015 14:04:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 14:04:31 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 14:04:25 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id C1D0F20514 for ; Wed, 29 Apr 2015 14:04:05 +0000 (UTC) Received: (qmail 35709 invoked by uid 99); 29 Apr 2015 14:04:05 -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; Wed, 29 Apr 2015 14:04:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72ECAE0984; Wed, 29 Apr 2015 14:04:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 29 Apr 2015 14:04:08 -0000 Message-Id: <618de89569554939880002f06d1638ae@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/16] incubator-ignite git commit: Merge branches 'ignite-789' and 'ignite-sprint-4'. X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-789' and 'ignite-sprint-4'. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b184857 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b184857 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b184857 Branch: refs/heads/ignite-sprint-4 Commit: 5b184857b0659037acb51780bb9b9bf5cb92babb Parents: 78f96a0 ade27b4 Author: AKuznetsov Authored: Tue Apr 28 15:41:40 2015 +0700 Committer: AKuznetsov Committed: Tue Apr 28 15:41:40 2015 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/Ignition.java | 43 + .../org/apache/ignite/internal/IgnitionEx.java | 156 ++- .../processors/cache/CacheInvokeResult.java | 24 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheReturn.java | 5 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 10 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../top/GridTopologyCommandHandler.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 20 +- .../util/spring/IgniteSpringHelper.java | 49 +- .../DataStreamerMultiThreadedSelfTest.java | 19 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 1284 ------------------ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 235 +++- ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 - ...GridCachePartitionedFieldsQuerySelfTest.java | 115 -- ...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 - ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 + ...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 - .../GridCacheReplicatedFieldsQuerySelfTest.java | 157 --- ...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 - ...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 + .../query/h2/sql/BaseH2CompareQueryTest.java | 32 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../util/spring/IgniteSpringHelperImpl.java | 224 ++- .../IgniteStartFromStreamConfigurationTest.java | 50 + .../testsuites/IgniteSpringTestSuite.java | 2 + 29 files changed, 828 insertions(+), 1825 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b184857/modules/core/src/main/java/org/apache/ignite/Ignition.java ----------------------------------------------------------------------