ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [09/28] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-56
Date Fri, 06 Feb 2015 14:50:49 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index 288877f,a0f5334..014e6be
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@@ -300,14 -302,14 +302,14 @@@ public abstract class GridCacheAbstract
       * @param cnt Entry count.
       * @throws IgniteCheckedException If failed.
       */
 -    private void put(CacheProjection<String, Integer> cache, int cnt) throws Exception
{
 +    private void put(IgniteCache<String, Integer> cache, int cnt) throws Exception
{
          try {
              for (int i = 0; i < cnt; i++)
 -                assertTrue("Failed to put key: 'key" + i + "'",  cache.putx("key" + i, i));
 +                cache.put("key" + i, i);
          }
 -        catch (IgniteCheckedException e) {
 +        catch (CacheException e) {
              // It is ok to fail with topology exception.
-             if (!X.hasCause(e, ClusterTopologyException.class))
+             if (!X.hasCause(e, ClusterTopologyCheckedException.class))
                  throw e;
          }
      }
@@@ -345,14 -348,14 +347,14 @@@
       * @param cnt Entry count.
       * @throws IgniteCheckedException If failed.
       */
 -    private void remove(CacheProjection<String, Integer> cache, int cnt) throws Exception
{
 +    private void remove(IgniteCache<String, Integer> cache, int cnt) throws Exception
{
          try {
              for (int i = 0; i < cnt; i++)
 -                cache.removex("key" + i);
 +                cache.remove("key" + i);
          }
 -        catch (IgniteCheckedException e) {
 +        catch (CacheException e) {
              // It is ok to fail with topology exception.
-             if (!X.hasCause(e, ClusterTopologyException.class))
+             if (!X.hasCause(e, ClusterTopologyCheckedException.class))
                  throw e;
          }
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
index 584cdc1,1c0f479..97e3115
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
@@@ -17,9 -17,7 +17,8 @@@
  
  package org.apache.ignite.internal.processors.cache;
  
 +import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
- import org.apache.ignite.cache.GridCache;
  import org.apache.ignite.cache.store.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
index 1607d19,c5e752e..1b88833
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
@@@ -17,13 -17,11 +17,13 @@@
  
  package org.apache.ignite.internal.processors.cache.distributed.near;
  
 +import com.google.common.collect.*;
 +import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.events.*;
- import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.lang.*;
  
  import javax.cache.expiry.*;
  import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 49719d8,80f8b2a..6bd7b95
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@@ -30,9 -30,7 +30,8 @@@ import org.apache.ignite.lang.*
  import java.util.*;
  import java.util.concurrent.*;
  import java.util.concurrent.atomic.*;
 +import java.util.concurrent.locks.*;
  
- import static org.apache.ignite.events.IgniteEventType.*;
  import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
  import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
index 2cdb4ef,7447370..284cc7f
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
@@@ -29,13 -30,10 +31,11 @@@ import org.apache.ignite.spi.discovery.
  import org.apache.ignite.testframework.junits.common.*;
  
  import java.util.*;
 +import java.util.concurrent.locks.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
- import static org.apache.ignite.cache.CacheMode.*;
  import static org.apache.ignite.cache.CacheDistributionMode.*;
+ import static org.apache.ignite.cache.CacheMode.*;
  import static org.apache.ignite.events.IgniteEventType.*;
  
  /**
@@@ -109,12 -105,16 +109,12 @@@ public class GridCachePartitionedExplic
          for (int checkIdx = 1; checkIdx < GRID_CNT; checkIdx++) {
              info("Check grid index: " + checkIdx);
  
 -            GridCache<Integer, String> checkCache = cache(checkIdx);
 -
 -            assert !checkCache.lock(key, -1);
 -
 -            CacheEntry e = checkCache.entry(key);
 +            IgniteCache<Integer, String> checkCache = jcache(checkIdx);
  
 -            assert e.isLocked() : "Entry is not locked for grid [idx=" + checkIdx + ", entry="
+ e + ']';
 +            assert !checkCache.lock(key).tryLock();
          }
  
-         Collection<IgniteInternalFuture<?>> futs = new LinkedList<>();
+         Collection<IgniteFuture<?>> futs = new LinkedList<>();
  
          for (int i = 1; i < GRID_CNT; i++) {
              futs.add(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
index f00b4b7,3b99d98..ff428f8
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
@@@ -17,9 -17,9 +17,10 @@@
  
  package org.apache.ignite.internal.processors.cache.distributed.near;
  
 +import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.spi.discovery.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
index c497fca,ba05072..0b87210
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
@@@ -23,8 -22,10 +23,9 @@@ import org.apache.ignite.cluster.*
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.processors.cache.*;
  import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.lang.*;
  
  import java.util.*;
 -import java.util.concurrent.atomic.*;
  
  import static org.apache.ignite.cache.CacheMode.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387a3482/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------


Mime
View raw message