You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/31 09:23:41 UTC
[51/51] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-5075' into ignite-5075-pds
Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
# modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
# modules/web-console/frontend/app/modules/agent/AgentManager.service.js
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f0656bb4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f0656bb4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f0656bb4
Branch: refs/heads/ignite-5075-pds
Commit: f0656bb43a958c8ae73414f8eac8f40b0d77308f
Parents: 1305ce9
Author: sboikov <sb...@gridgain.com>
Authored: Wed May 31 12:21:30 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed May 31 12:21:30 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 11 ++++++++---
.../internal/processors/query/h2/IgniteH2Indexing.java | 3 +--
.../database/IgnitePersistentStoreCacheGroupsTest.java | 2 --
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0656bb4/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 667b629..be8fcdd 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
@@ -1197,7 +1197,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
GridCacheContext<?, ?> cacheCtx = cache.context();
if (sharedCtx.pageStore() != null)
- sharedCtx.pageStore().initializeForCache(cacheCtx.config());
+ sharedCtx.pageStore().initializeForCache(grpDesc, cacheCtx.config());
CacheConfiguration cfg = cacheCtx.config();
@@ -1237,8 +1237,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cacheCtx.onStarted();
- if (log.isInfoEnabled()){
- log.info("Started cache [name=" + cfg.getName() +(cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") + ", memoryPolicyName=" + cfg.getMemoryPolicyName() + ", mode=" + cfg.getCacheMode() +", atomicity=" + cfg.getAtomicityMode() + ']');}
+ if (log.isInfoEnabled()) {
+ log.info("Started cache [name=" + cfg.getName() +
+ (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
+ ", memoryPolicyName=" + cfg.getMemoryPolicyName() +
+ ", mode=" + cfg.getCacheMode() +
+ ", atomicity=" + cfg.getAtomicityMode() + ']');
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0656bb4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index f51ddfe..0d4fbbb 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1775,7 +1775,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (s == null)
return Collections.emptySet();
- return s.tables().values();
+ return s.tables();
}
/**
@@ -2366,5 +2366,4 @@ public class IgniteH2Indexing implements GridQueryIndexing {
private interface ClIter<X> extends AutoCloseable, Iterator<X> {
// No-op.
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0656bb4/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 c0c1b01..d2a5177 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
@@ -94,8 +94,6 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
cfg.setBinaryConfiguration(new BinaryConfiguration().setCompactFooter(false));
- cfg.setBinaryConfiguration(new BinaryConfiguration().setCompactFooter(false));
-
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
if (ccfgs != null) {