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-286 Commit: 5b184857b0659037acb51780bb9b9bf5cb92babb Parents: 78f96a0 ade27b4 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 28 15:41:40 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> 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 ----------------------------------------------------------------------
