Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fba01d61 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fba01d61 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fba01d61 Branch: refs/heads/ignite-1093-2 Commit: fba01d61b2622f6aae4ae3f7df96285ee0cfcb49 Parents: 5ec703d 60a76bc Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Sep 9 11:50:41 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Sep 9 11:50:41 2015 +0300 ---------------------------------------------------------------------- .../CacheClientPortableQueryExample.java | 4 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +- .../configuration/CacheConfiguration.java | 3 +- .../ignite/internal/GridUpdateNotifier.java | 82 +++++-- .../apache/ignite/internal/IgniteKernal.java | 5 +- .../affinity/GridAffinityProcessor.java | 8 +- .../processors/cache/GridCacheAdapter.java | 11 +- .../processors/cache/GridCacheEntryEx.java | 12 +- .../cache/GridCacheEvictionManager.java | 2 + .../processors/cache/GridCacheMapEntry.java | 11 +- .../cache/GridCacheMvccCandidate.java | 6 +- .../cache/GridCacheSharedContext.java | 7 + .../processors/cache/GridCacheSwapManager.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 14 +- .../distributed/dht/GridDhtLocalPartition.java | 23 +- .../distributed/dht/GridDhtLockFuture.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 22 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 3 + .../colocated/GridDhtColocatedLockFuture.java | 14 +- .../dht/preloader/GridDhtPreloader.java | 20 +- .../distributed/near/GridNearLockFuture.java | 14 +- .../near/GridNearOptimisticTxPrepareFuture.java | 7 +- .../distributed/near/GridNearTxRemote.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 20 +- .../processors/igfs/IgfsDataManager.java | 14 +- .../ignite/GridSuppressedExceptionSelfTest.java | 22 -- .../ignite/internal/GridStartStopSelfTest.java | 13 +- .../internal/GridUpdateNotifierSelfTest.java | 23 +- .../ignite/internal/GridVersionSelfTest.java | 20 +- .../cache/CacheAffinityCallSelfTest.java | 16 +- .../cache/CacheSwapUnswapGetTest.java | 234 +++++++++++++++++++ .../processors/cache/GridCacheMvccSelfTest.java | 29 +-- .../processors/cache/GridCacheStopSelfTest.java | 49 ++-- ...gniteCacheTransactionalStopBusySelfTest.java | 5 - ...GridCacheQueueMultiNodeAbstractSelfTest.java | 34 +-- ...dCacheQueueMultiNodeConsistencySelfTest.java | 58 +++-- .../GridCacheSetFailoverAbstractSelfTest.java | 2 - .../IgniteCacheMessageRecoveryAbstractTest.java | 14 +- .../IgniteCacheTxMessageRecoveryTest.java | 5 - ...CachePartitionedTxMultiThreadedSelfTest.java | 2 +- .../IpcSharedMemoryCrashDetectionSelfTest.java | 2 + .../unsafe/GridUnsafeMemoryPerformanceTest.java | 65 ++++++ .../unsafe/GridUnsafeMemorySelfTest.java | 38 --- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + .../junits/common/GridCommonAbstractTest.java | 59 +++-- .../IgniteCacheFailoverTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 3 + .../h2/GridIndexingSpiAbstractSelfTest.java | 13 -- .../query/h2/sql/BaseH2CompareQueryTest.java | 5 - .../platform/cache/PlatformCache.java | 23 +- .../cache/PlatformCacheEntryProcessorImpl.java | 4 +- scripts/apply-pull-request.sh | 141 ++++++++--- 52 files changed, 834 insertions(+), 368 deletions(-) ----------------------------------------------------------------------