ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [9/9] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-99
Date Mon, 19 Jan 2015 11:55:50 GMT
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-99

Conflicts:
	modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
	modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/060bede0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/060bede0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/060bede0

Branch: refs/heads/ignite-99
Commit: 060bede0e60ee856e7a18445829059e9480b79a4
Parents: 2f478f1 80b986f
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Jan 19 15:54:54 2015 +0400
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Jan 19 15:54:54 2015 +0400

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCache.java     |   4 +-
 .../processors/cache/IgniteCacheProxy.java      |  76 +++-
 .../processors/cache/CacheInvokeEntry.java      |  14 +
 .../processors/cache/GridCacheMapEntry.java     |  17 +-
 .../cache/transactions/IgniteTxAdapter.java     |  22 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |  18 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 385 +++----------------
 .../cache/GridCacheBasicApiAbstractTest.java    |  91 ++---
 .../GridCacheFinishPartitionsSelfTest.java      |  22 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |  24 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |  28 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |  38 +-
 .../distributed/GridCacheLockAbstractTest.java  |  40 +-
 .../GridCacheMultiNodeLockAbstractTest.java     | 144 +++++--
 .../dht/GridCacheColocatedDebugTest.java        |  26 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   8 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |  16 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |  39 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  42 --
 .../near/GridCacheNearReadersSelfTest.java      |  14 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |   1 +
 .../near/GridCachePartitionedLockSelfTest.java  |  11 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |   7 +-
 .../cache/local/GridCacheLocalLockSelfTest.java |  36 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |  42 +-
 .../ggfs/GridGgfsMetaManagerSelfTest.java       |   6 +-
 26 files changed, 508 insertions(+), 663 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
index e314047,f0abccb..1c6a59c
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
@@@ -353,9 -354,9 +354,9 @@@ public abstract class GridCacheGroupLoc
  
          final UUID affinityKey = primaryKeyForCache(grid(0));
  
 -        final GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1",
affinityKey);
 +        final CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1",
affinityKey);
  
-         final GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 -        final IgniteCache<GridCacheAffinityKey<String>, String> cache = grid(0).jcache(null);
++        final IgniteCache<CacheAffinityKey<String>, String> cache = grid(0).jcache(null);
  
          // Populate cache.
          cache.put(key1, "val1");
@@@ -399,7 -400,8 +400,8 @@@
  
              GridTestUtils.assertThrows(log, new Callable<Object>() {
                  @Override public Object call() throws Exception {
-                     try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED,
0, 1)) {
+                     try (IgniteTx tx = grid(0).transactions().txStartAffinity(null, affinityKey,
concurrency,
 -                        READ_COMMITTED, 0, 1)) {
++                            READ_COMMITTED, 0, 1)) {
                          cache.put(key1, "val01");
  
                          tx.commit();
@@@ -436,11 -438,13 +438,13 @@@
      private void checkSanityCheckDisabled(final IgniteTxConcurrency concurrency) throws
Exception {
          assert !sanityCheckEnabled();
  
-         final UUID affinityKey = primaryKeyForCache(grid(0));
+         GridEx grid = grid(0);
+ 
+         final UUID affinityKey = primaryKeyForCache(grid);
  
 -        final GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1",
affinityKey);
 +        final CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1",
affinityKey);
  
-         final GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 -        final IgniteCache<GridCacheAffinityKey<String>, String> cache = grid.jcache(null);
++        final IgniteCache<CacheAffinityKey<String>, String> cache = grid(0).jcache(null);
  
          // Populate cache.
          cache.put(key1, "val1");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/060bede0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------


Mime
View raw message