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/26 09:05:55 UTC
[8/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5075
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
# modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/118a02c1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/118a02c1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/118a02c1
Branch: refs/heads/ignite-5075
Commit: 118a02c12d5a2755429684346b165b6fca5ad97e
Parents: c540513 bdd43ff
Author: sboikov <sb...@gridgain.com>
Authored: Fri May 26 12:01:27 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri May 26 12:01:27 2017 +0300
----------------------------------------------------------------------
doap_Ignite.rdf | 2 +
.../src/main/java/org/apache/ignite/Ignite.java | 18 +-
.../configuration/CacheConfiguration.java | 5 +-
.../MemoryPolicyConfiguration.java | 96 +++++-
.../org/apache/ignite/internal/IgniteEx.java | 27 ++
.../apache/ignite/internal/IgniteKernal.java | 38 ++-
.../processors/cache/ClusterCachesInfo.java | 10 +-
.../processors/cache/ExchangeActions.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 51 +--
.../IgniteCacheDatabaseSharedManager.java | 40 +++
.../cache/database/MemoryMetricsImpl.java | 31 +-
.../processors/query/GridQueryProcessor.java | 52 +++
.../handlers/cache/GridCacheCommandHandler.java | 8 +-
...iteMarshallerCacheClassNameConflictTest.java | 9 +-
.../cache/MemoryPolicyConfigValidationTest.java | 62 +++-
.../processors/igfs/IgfsIgniteMock.java | 24 ++
.../ignite/testframework/GridTestUtils.java | 6 +-
.../config/GridTestProperties.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../junits/multijvm/IgniteProcessProxy.java | 18 ++
.../ignite/testsuites/IgniteBasicTestSuite.java | 13 +-
.../testsuites/IgniteBinaryBasicTestSuite.java | 75 +----
...iteBinarySimpleNameMapperBasicTestSuite.java | 3 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 55 +++-
.../query/h2/sql/GridSqlCreateTable.java | 153 +++++++++
.../query/h2/sql/GridSqlDropTable.java | 79 +++++
.../query/h2/sql/GridSqlQueryParser.java | 260 +++++++++++++++
.../cache/index/H2DynamicTableSelfTest.java | 320 +++++++++++++++++++
.../query/h2/sql/GridQueryParsingTest.java | 284 +++++++++++++++-
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../Impl/CacheFieldsQueryExecutor.cs | 39 ---
.../Impl/CacheQueryableBase.cs | 14 +-
.../Impl/ICacheQueryableInternal.cs | 6 -
.../org/apache/ignite/IgniteSpringBean.java | 7 +
.../yardstick/IgniteBenchmarkArguments.java | 11 +
.../org/apache/ignite/yardstick/IgniteNode.java | 5 +
.../apache/ignite/yardstick/io/FileUtils.java | 64 ++++
37 files changed, 1704 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/118a02c1/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/118a02c1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/118a02c1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/118a02c1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index a5f6f1e,d94c41f..e28edfb
--- 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
@@@ -1222,12 -1164,10 +1222,8 @@@ public class GridCacheProcessor extend
cacheCtx.onStarted();
- if (log.isInfoEnabled()) {
- log.info("Started cache [name=" + cfg.getName() +
- (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
- ", memoryPolicyName=" + cfg.getMemoryPolicyName() +
- ", mode=" + cfg.getCacheMode() + ']');
- }
- if (log.isInfoEnabled())
- log.info("Started cache [name=" + U.maskName(cfg.getName()) +
- ", 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/118a02c1/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/118a02c1/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------
diff --cc modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 9c1b17a,74413f5..511b61b
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@@ -427,13 -426,13 +431,20 @@@ public class IgniteBenchmarkArguments
}
/**
+ * @return Flag for cleaning working directory.
+ */
+ public boolean cleanWorkDirectory() {
+ return cleanWorkDirectory;
+ }
+
+ /**
+ * @return Name of cache group to be set for caches.
+ */
+ @Nullable public String cacheGroup() {
+ return cacheGrp;
+ }
+
+ /**
* @return Description.
*/
public String description() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/118a02c1/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------