You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/09/08 19:09:35 UTC
[45/45] ignite git commit: Merge branch 'ignite-1.4' of
github.com:apache/ignite into ignite-264
Merge branch 'ignite-1.4' of github.com:apache/ignite into ignite-264
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b737d70
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b737d70
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b737d70
Branch: refs/heads/ignite-264
Commit: 1b737d702c029a2bf6c764634e50a18cb41b9aec
Parents: 17c8636 e4e39af
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Sep 8 09:50:58 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Sep 8 09:50:58 2015 -0700
----------------------------------------------------------------------
.../CacheClientPortableQueryExample.java | 4 +-
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +-
.../configuration/CacheConfiguration.java | 3 +-
.../ignite/internal/GridUpdateNotifier.java | 82 +++++--
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../ignite/internal/MarshallerContextImpl.java | 31 +--
.../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 +-
.../visor/cache/VisorCacheStartTask.java | 6 +-
.../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 +++++++++++++++++++
...cheAbstractFullApiMultithreadedSelfTest.java | 69 +++---
.../processors/cache/GridCacheMvccSelfTest.java | 29 +--
.../IgniteDaemonNodeMarshallerCacheTest.java | 10 +
...GridCacheQueueMultiNodeAbstractSelfTest.java | 34 +--
...dCacheQueueMultiNodeConsistencySelfTest.java | 58 +++--
.../GridCacheSetFailoverAbstractSelfTest.java | 2 -
.../IgniteCacheMessageRecoveryAbstractTest.java | 14 +-
.../IgniteCacheTxMessageRecoveryTest.java | 5 -
...PartitionedFullApiMultithreadedSelfTest.java | 5 -
...CachePartitionedTxMultiThreadedSelfTest.java | 2 +-
...eReplicatedFullApiMultithreadedSelfTest.java | 5 -
...dCacheLocalFullApiMultithreadedSelfTest.java | 5 -
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +
.../unsafe/GridUnsafeMemoryPerformanceTest.java | 65 ++++++
.../unsafe/GridUnsafeMemorySelfTest.java | 38 ---
.../tcp/TcpDiscoveryMultiThreadedTest.java | 2 +
.../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 +-
parent/pom.xml | 1 +
scripts/apply-pull-request.sh | 141 ++++++++---
57 files changed, 844 insertions(+), 377 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b737d70/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index 70e1c8e,f2bb8fa..cdf8eca
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@@ -1846,8 -1838,7 +1838,7 @@@ public class GridCacheMvccSelfTest exte
private void info(Iterable<GridCacheMvccCandidate> cands) {
info("Collection of candidates: ");
- for (GridCacheMvccCandidate c : cands) {
+ for (GridCacheMvccCandidate c : cands)
info(">>> " + c);
- }
}
-}
+}