Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5832ed7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5832ed7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5832ed7a Branch: refs/heads/ignite-573 Commit: 5832ed7a82e26342b3cc85da4f863f77786e22ee Parents: 1b59249 f9f649a Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Wed Mar 25 19:53:05 2015 -0700 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Wed Mar 25 19:53:05 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/schema/Demo.java | 2 +- .../starschema/CacheStarSchemaExample.java | 5 +- .../store/dummy/CacheDummyStoreExample.java | 5 +- .../hibernate/CacheHibernateStoreExample.java | 2 +- .../store/jdbc/CacheJdbcStoreExample.java | 2 +- .../misc/schedule/ComputeScheduleExample.java | 2 +- .../misc/schedule/ComputeScheduleExample.java | 6 +- .../examples/ScalarCacheAffinityExample.scala | 8 +-- .../scalar/examples/ScalarCacheExample.scala | 4 +- .../ScalarCachePopularNumbersExample.scala | 6 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../scalar/examples/ScalarClosureExample.scala | 5 +- .../examples/ScalarContinuationExample.scala | 7 ++- .../examples/ScalarCreditRiskExample.scala | 5 +- .../scalar/examples/ScalarJvmCloudExample.scala | 2 +- .../scalar/examples/ScalarPingPongExample.scala | 5 +- .../scalar/examples/ScalarPrimeExample.scala | 4 +- .../scalar/examples/ScalarScheduleExample.scala | 5 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- .../scalar/examples/ScalarTaskExample.scala | 5 +- .../examples/ScalarWorldShortestMapReduce.scala | 5 +- .../ignite/internal/IgniteComponentType.java | 7 +++ .../processors/cache/GridCacheEntryEx.java | 1 + .../processors/cache/GridCacheMapEntry.java | 11 ++-- .../GridDistributedCacheAdapter.java | 16 ++++- .../GridDistributedTxRemoteAdapter.java | 16 +++-- .../dht/GridPartitionedGetFuture.java | 6 +- .../dht/atomic/GridDhtAtomicCache.java | 3 + .../distributed/near/GridNearAtomicCache.java | 2 + .../distributed/near/GridNearCacheEntry.java | 64 ++++++++++++++++---- .../distributed/near/GridNearLockFuture.java | 4 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../processors/query/GridQueryProcessor.java | 15 +++++ .../service/GridServiceProcessor.java | 4 +- .../test/config/load/cache-client-benchmark.xml | 13 ---- ...cheNearUpdateTopologyChangeAbstractTest.java | 13 +++- .../cache/GridCacheAbstractFullApiSelfTest.java | 13 ---- .../GridCacheAbstractRemoveFailureTest.java | 8 ++- .../GridCacheInterceptorAbstractSelfTest.java | 2 + ...GridCacheMixedPartitionExchangeSelfTest.java | 8 +++ .../cache/GridCacheSwapPreloadSelfTest.java | 14 +++-- .../processors/cache/GridCacheTestEntryEx.java | 1 + ...idCacheValueConsistencyAbstractSelfTest.java | 27 ++++++++- .../distributed/GridCacheEventAbstractTest.java | 8 +-- .../dht/GridCacheAtomicNearCacheSelfTest.java | 30 ++++----- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 +- .../ignite/messaging/GridMessagingSelfTest.java | 13 ++-- .../junits/common/GridCommonAbstractTest.java | 18 ++++++ .../IgniteCacheFailoverTestSuite.java | 9 ++- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 - modules/yardstick/config/ignite-base-config.xml | 2 + 51 files changed, 280 insertions(+), 146 deletions(-) ----------------------------------------------------------------------
