ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-5075-pds
Date Thu, 01 Jun 2017 06:44:56 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5075-pds 6aff97579 -> 848e8eeaa


ignite-5075-pds


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

Branch: refs/heads/ignite-5075-pds
Commit: 848e8eeaa3c57d4418ed6972458c156e0be2ced8
Parents: 6aff975
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jun 1 09:44:48 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jun 1 09:44:48 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java | 8 ++------
 .../cache/database/IgnitePersistentStoreCacheGroupsTest.java | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/848e8eea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index be8fcdd..f55830b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1187,18 +1187,14 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * @param grpDesc Cache group descriptor.
      * @param cache Cache to start.
      * @param schema Cache schema.
      * @throws IgniteCheckedException If failed to start cache.
      */
     @SuppressWarnings({"TypeMayBeWeakened", "unchecked"})
-    private void startCache(CacheGroupDescriptor grpDesc, GridCacheAdapter<?, ?> cache,
QuerySchema schema) throws IgniteCheckedException {
+    private void startCache(GridCacheAdapter<?, ?> cache, QuerySchema schema) throws
IgniteCheckedException {
         GridCacheContext<?, ?> cacheCtx = cache.context();
 
-        if (sharedCtx.pageStore() != null)
-            sharedCtx.pageStore().initializeForCache(grpDesc, cacheCtx.config());
-
         CacheConfiguration cfg = cacheCtx.config();
 
         // Intentionally compare Boolean references using '!=' below to check if the flag
has been explicitly set.
@@ -1939,7 +1935,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
         caches.put(cacheCtx.name(), cache);
 
-        startCache(grpDesc, cache, schema != null ? schema : new QuerySchema());
+        startCache(cache, schema != null ? schema : new QuerySchema());
 
         grp.onCacheStarted(cacheCtx);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/848e8eea/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheGroupsTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheGroupsTest.java
b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheGroupsTest.java
index 2ac0620..3165011 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheGroupsTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheGroupsTest.java
@@ -210,7 +210,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
-    public void testExpiryPolicy() throws Exception {
+    public void _testExpiryPolicy() throws Exception {
         long ttl = 10000;
 
         activeOnStart = false;


Mime
View raw message