ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [11/50] [abbrv] incubator-ignite git commit: # ignite-6 merge from sprint-1
Date Thu, 05 Feb 2015 11:50:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
index f999894,a498a3e..2195f24
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
@@@ -18,19 -18,15 +18,14 @@@
  package org.apache.ignite.internal.processors.cache.datastructures;
  
  import org.apache.ignite.*;
 +import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.datastructures.*;
  import org.apache.ignite.configuration.*;
- import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.processors.cache.*;
 +import org.apache.ignite.internal.processors.datastructures.*;
- import org.apache.ignite.spi.discovery.tcp.*;
- import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
- import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+ import org.apache.ignite.internal.util.typedef.*;
 -import org.apache.ignite.spi.discovery.tcp.*;
 -import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 -import org.apache.ignite.testframework.junits.common.*;
 +import org.apache.ignite.testframework.*;
  import org.apache.ignite.transactions.*;
- import org.apache.ignite.internal.util.typedef.*;
- import org.apache.ignite.testframework.junits.common.*;
  import org.jetbrains.annotations.*;
  
  import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
index ae9ed12,c79e61c..8fd941d
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
@@@ -18,7 -18,10 +18,9 @@@
  package org.apache.ignite.internal.processors.cache.datastructures;
  
  import org.apache.ignite.*;
 -import org.apache.ignite.cache.datastructures.*;
  import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.resources.*;
  import org.apache.ignite.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index e1bca83,723a7ab..abb9c71
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@@ -24,11 -24,8 +24,10 @@@ import org.apache.ignite.cache.datastru
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.processors.cache.*;
 +import org.apache.ignite.internal.util.lang.*;
- import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
 +import org.apache.ignite.marshaller.optimized.*;
  import org.apache.ignite.testframework.*;
  
  import java.util.*;
@@@ -115,21 -93,17 +114,21 @@@ public abstract class GridCacheSetAbstr
          assertSetIteratorsCleared();
  
          for (int i = 0; i < gridCount(); i++) {
-             GridKernal grid = (GridKernal)grid(i);
+             IgniteKernal grid = (IgniteKernal)grid(i);
  
 -            GridCacheDataStructuresManager ds = grid.internalCache(null).context().dataStructures();
 +            for (GridCache cache : grid.caches()) {
 +                CacheDataStructuresManager dsMgr = grid.internalCache(cache.name()).context().dataStructures();
  
 -            Map map = GridTestUtils.getFieldValue(ds, "setsMap");
 +                Map map = GridTestUtils.getFieldValue(dsMgr, "setsMap");
  
 -            assertEquals("Set not removed [grid=" + i + ", map=" + map + ']', 0, map.size());
 +                assertEquals("Set not removed [grid=" + i + ", map=" + map + ']', 0, map.size());
  
 -            map = GridTestUtils.getFieldValue(ds, "setDataMap");
 +                map = GridTestUtils.getFieldValue(dsMgr, "setDataMap");
  
 -            assertEquals("Set data not removed [grid=" + i + ", map=" + map + ']', 0, map.size());
 +                assertEquals("Set data not removed [grid=" + i + ", cache=" + cache.name()
+ ", map=" + map + ']',
 +                    0,
 +                    map.size());
 +            }
          }
      }
  
@@@ -138,17 -112,48 +137,17 @@@
       */
      private void assertSetIteratorsCleared() {
          for (int i = 0; i < gridCount(); i++) {
-             GridKernal grid = (GridKernal) grid(i);
+             IgniteKernal grid = (IgniteKernal) grid(i);
  
 -            GridCacheQueryManager queries = grid.internalCache(null).context().queries();
 -
 -            Map map = GridTestUtils.getFieldValue(queries, GridCacheQueryManager.class,
"qryIters");
 +            for (GridCache cache : grid.caches()) {
 +                GridCacheQueryManager queries = grid.internalCache(cache.name()).context().queries();
  
 -            for (Object obj : map.values())
 -                assertEquals("Iterators not removed for grid " + i, 0, ((Map) obj).size());
 -        }
 -    }
 -
 -    /** {@inheritDoc} */
 -    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
 -        IgniteConfiguration cfg = super.getConfiguration(gridName);
 +                Map map = GridTestUtils.getFieldValue(queries, GridCacheQueryManager.class,
"qryIters");
  
 -        if (cacheMode() == PARTITIONED) {
 -            CacheConfiguration ccfg1 = cacheConfiguration(gridName);
 -
 -            CacheConfiguration ccfg2 = cacheConfiguration(gridName);
 -
 -            ccfg2.setName("noBackupsCache");
 -            ccfg2.setBackups(0);
 -
 -            cfg.setCacheConfiguration(ccfg1, ccfg2);
 +                for (Object obj : map.values())
 +                    assertEquals("Iterators not removed for grid " + i, 0, ((Map) obj).size());
 +            }
          }
 -
 -        return cfg;
 -    }
 -
 -    /** {@inheritDoc} */
 -    @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception
{
 -        CacheConfiguration ccfg = super.cacheConfiguration(gridName);
 -
 -        ccfg.setPreloadMode(SYNC);
 -        ccfg.setWriteSynchronizationMode(FULL_SYNC);
 -
 -        return ccfg;
 -    }
 -
 -    /** {@inheritDoc} */
 -    @Override protected CacheDistributionMode distributionMode() {
 -        return PARTITIONED_ONLY;
      }
  
      /** {@inheritDoc} */
@@@ -804,11 -803,9 +803,11 @@@
  
          int cnt = 0;
  
 +        GridCacheContext cctx = GridTestUtils.getFieldValue(set0, "cctx");
 +
          for (int i = 0; i < gridCount(); i++) {
              Iterator<GridCacheEntryEx<Object, Object>> entries =
-                     ((GridKernal)grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator();
 -                    ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
++                    ((IgniteKernal)grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator();
  
              while (entries.hasNext()) {
                  GridCacheEntryEx<Object, Object> entry = entries.next();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index cebdc21,c930c1c..c56532c
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@@ -19,10 -19,14 +19,10 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.datastructures.*;
  import org.apache.ignite.configuration.*;
 -import org.apache.ignite.internal.*;
 -import org.apache.ignite.spi.discovery.tcp.*;
 -import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 -import org.apache.ignite.testframework.junits.common.*;
 +import org.apache.ignite.internal.processors.cache.datastructures.*;
- import org.apache.ignite.lang.*;
  import org.apache.ignite.transactions.*;
++import org.apache.ignite.internal.*;
  
  import java.util.*;
  import java.util.concurrent.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
index 687ea0c,b1f97a8..d382ac7
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
@@@ -20,10 -20,10 +20,10 @@@ package org.apache.ignite.internal.proc
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
 -import org.apache.ignite.cache.datastructures.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.configuration.*;
 +import org.apache.ignite.internal.processors.cache.datastructures.*;
- import org.apache.ignite.lang.*;
+ import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.processors.affinity.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index 4f57adb,cb554ea..df60674
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@@ -24,8 -24,10 +24,9 @@@ import org.apache.ignite.cache.affinity
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.processors.cache.*;
 -import org.apache.ignite.internal.processors.cache.datastructures.*;
 -import org.apache.ignite.internal.util.typedef.*;
 +import org.apache.ignite.internal.processors.datastructures.*;
  import org.apache.ignite.lang.*;
++import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 1c12d07,0eb851c..79f3ddd
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@@ -26,9 -25,12 +25,13 @@@ import org.apache.ignite.cluster.*
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
  import org.apache.ignite.internal.*;
+ import org.apache.ignite.internal.cluster.*;
  import org.apache.ignite.internal.processors.cache.*;
 +import org.apache.ignite.internal.processors.datastructures.*;
+ import org.apache.ignite.internal.processors.continuous.*;
  import org.apache.ignite.internal.util.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.optimized.*;
  import org.apache.ignite.spi.discovery.tcp.*;

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 6f9590f,72329b7..a10bbfd
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@@ -20,9 -20,9 +20,8 @@@ package org.apache.ignite.loadtests.dat
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.consistenthash.*;
 -import org.apache.ignite.cache.datastructures.*;
  import org.apache.ignite.cache.eviction.lru.*;
  import org.apache.ignite.configuration.*;
- import org.apache.ignite.transactions.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
index 79a62f4,ed54a86..2b4b81d
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
@@@ -40,21 -40,26 +40,26 @@@ public class GridDsiLifecycleBean imple
      private ApplicationContext springCtx;
  
      /** {@inheritDoc} */
-     @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException
{
-         switch (evt) {
-             case BEFORE_GRID_START:
-                 break;
+     @Override public void onLifecycleEvent(LifecycleEventType evt) {
+         try {
+             switch (evt) {
+                 case BEFORE_GRID_START:
+                     break;
  
-             case AFTER_GRID_START:
-                 ignite.atomicSequence("ID", 0, true);
+                 case AFTER_GRID_START:
 -                    ignite.cache("PARTITIONED_CACHE").dataStructures().atomicSequence("ID",
0, true);
++                    ignite.atomicSequence("ID", 0, true);
  
-                 break;
+                     break;
  
-             case BEFORE_GRID_STOP:
-                 break;
+                 case BEFORE_GRID_STOP:
+                     break;
  
-             case AFTER_GRID_STOP:
-                 break;
+                 case AFTER_GRID_STOP:
+                     break;
+             }
+         }
+         catch (Exception e) {
+             throw new IgniteException(e);
          }
      }
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
index cb2b21f,3f42a0c..3708ab5
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
@@@ -20,26 -20,26 +20,24 @@@ package org.apache.ignite.marshaller
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
--import org.apache.ignite.cache.datastructures.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.compute.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
  import org.apache.ignite.internal.*;
+ import org.apache.ignite.internal.executor.*;
  import org.apache.ignite.internal.processors.cache.*;
- import org.apache.ignite.internal.processors.datastructures.*;
+ import org.apache.ignite.internal.processors.cache.affinity.*;
 -import org.apache.ignite.internal.processors.cache.datastructures.*;
+ import org.apache.ignite.internal.processors.service.*;
  import org.apache.ignite.internal.processors.streamer.*;
+ import org.apache.ignite.internal.product.*;
  import org.apache.ignite.internal.util.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.optimized.*;
- import org.apache.ignite.internal.product.*;
+ import org.apache.ignite.p2p.*;
  import org.apache.ignite.streamer.*;
  import org.apache.ignite.streamer.window.*;
- import org.apache.ignite.internal.executor.*;
- import org.apache.ignite.internal.processors.cache.affinity.*;
- import org.apache.ignite.internal.processors.service.*;
- import org.apache.ignite.p2p.*;
- import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.testframework.*;
  import org.apache.ignite.testframework.junits.common.*;
  import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6ca063f/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------


Mime
View raw message