Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-341
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23d965fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23d965fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23d965fc Branch: refs/heads/ignite-430 Commit: 23d965fc1e8ee426fd5d9c4b6eee427709819ea9 Parents: e832467 571273e Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 10:21:43 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 10:21:43 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheQueryExample.java | 12 +- .../datagrid/CacheTransactionExample.java | 6 +- .../src/main/java/org/apache/ignite/Ignite.java | 84 +++++---- .../java/org/apache/ignite/IgniteCache.java | 59 +++--- .../java/org/apache/ignite/IgniteCluster.java | 4 +- .../java/org/apache/ignite/IgniteCompute.java | 161 +++++++---------- .../java/org/apache/ignite/IgniteEvents.java | 60 ++++--- .../java/org/apache/ignite/IgniteMessaging.java | 56 +++--- .../java/org/apache/ignite/IgniteServices.java | 40 +++-- .../org/apache/ignite/IgniteTransactions.java | 26 ++- .../apache/ignite/cache/CacheInterceptor.java | 3 +- .../apache/ignite/cache/affinity/Affinity.java | 49 ++--- .../org/apache/ignite/cluster/ClusterGroup.java | 180 +++++++++---------- .../org/apache/ignite/cluster/ClusterNode.java | 49 +++-- .../cluster/ClusterTopologyException.java | 2 +- .../configuration/CacheConfiguration.java | 3 - .../configuration/IgniteConfiguration.java | 32 ++-- .../discovery/GridDiscoveryManager.java | 3 +- .../processors/cache/GridCacheEntryEx.java | 1 + .../processors/cache/GridCacheMapEntry.java | 11 +- .../GridDistributedTxRemoteAdapter.java | 16 +- .../GridFutureRemapTimeoutObject.java | 73 ++++++++ .../dht/GridPartitionedGetFuture.java | 26 ++- .../dht/atomic/GridDhtAtomicCache.java | 3 + .../distributed/near/GridNearAtomicCache.java | 2 + .../distributed/near/GridNearCacheEntry.java | 22 +-- .../distributed/near/GridNearGetFuture.java | 77 ++------ .../distributed/near/GridNearLockFuture.java | 4 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../processors/query/GridQueryProcessor.java | 4 +- .../service/GridServiceProcessor.java | 4 +- .../org/apache/ignite/lang/IgnitePredicate.java | 3 +- .../apache/ignite/transactions/Transaction.java | 8 +- .../processors/cache/GridCacheTestEntryEx.java | 1 + .../cache/IgniteDynamicCacheStartSelfTest.java | 33 ++++ .../ignite/messaging/GridMessagingSelfTest.java | 13 +- 36 files changed, 599 insertions(+), 533 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23d965fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23d965fc/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ----------------------------------------------------------------------
