Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-779
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd3a572a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd3a572a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd3a572a Branch: refs/heads/ignite-157-2 Commit: bd3a572ab38e5c82bc2042d2738f36d9ddd58065 Parents: 3982374 5fb7948 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Apr 27 18:38:05 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Apr 27 18:38:05 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheInvokeResult.java | 24 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheReturn.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../top/GridTopologyCommandHandler.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 20 +- .../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 +- 22 files changed, 368 insertions(+), 1751 deletions(-) ----------------------------------------------------------------------
