You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/02/02 21:01:19 UTC
[1/3] incubator-ignite git commit: Merge branches
'ignite-121-logging' and 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-121-logging
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-121-logging e7562eb3a -> 844bb3aac
Merge branches 'ignite-121-logging' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-121-logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4dc03c36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4dc03c36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4dc03c36
Branch: refs/heads/ignite-121-logging
Commit: 4dc03c3607ac5180a62102458b6a8b666ec00cfe
Parents: 42dc66f ff7ee6d
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Feb 2 17:35:06 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Feb 2 17:35:06 2015 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 22 --
.../ignite/internal/GridKernalContext.java | 8 -
.../ignite/internal/GridKernalContextImpl.java | 12 --
.../org/apache/ignite/internal/IgniteEx.java | 8 -
.../apache/ignite/internal/IgniteKernal.java | 7 -
.../org/apache/ignite/internal/IgnitionEx.java | 1 -
.../GridDeploymentPerLoaderStore.java | 20 +-
.../GridDeploymentPerVersionStore.java | 4 +-
.../processors/cache/GridCacheAdapter.java | 5 +-
.../cache/GridCacheDeploymentManager.java | 161 +++++++-------
.../cache/GridCachePreloaderAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 5 +-
.../processors/cache/GridCacheStoreManager.java | 25 ++-
.../processors/cache/GridCacheSwapManager.java | 3 +-
.../cache/GridCacheWriteBehindStore.java | 21 +-
.../preloader/GridDhtPartitionDemandPool.java | 2 +-
.../processors/interop/GridInteropAware.java | 49 -----
.../interop/GridInteropProcessor.java | 82 -------
.../interop/GridInteropProcessorAdapter.java | 31 ---
.../processors/interop/GridInteropTarget.java | 109 ----------
.../interop/os/GridOsInteropProcessor.java | 80 -------
.../internal/processors/interop/os/package.html | 23 --
.../internal/processors/interop/package.html | 23 --
.../plugin/IgnitePluginProcessor.java | 10 +-
.../streamer/GridStreamProcessor.java | 5 +-
.../processors/streamer/IgniteStreamerEx.java | 3 +-
.../processors/streamer/IgniteStreamerImpl.java | 5 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 10 +-
.../hadoop/GridHadoopCommandLineTest.java | 4 +-
...idHadoopDefaultMapReducePlannerSelfTest.java | 6 -
modules/yardstick/README.md | 67 ++++++
.../config/benchmark-atomic-win.properties | 42 ++++
.../config/benchmark-atomic.properties | 48 +++++
.../config/benchmark-compute-win.properties | 45 ++++
.../config/benchmark-compute.properties | 51 +++++
.../config/benchmark-query-win.properties | 43 ++++
.../yardstick/config/benchmark-query.properties | 49 +++++
.../config/benchmark-tx-win.properties | 42 ++++
.../yardstick/config/benchmark-tx.properties | 48 +++++
.../yardstick/config/benchmark-win.properties | 50 +++++
modules/yardstick/config/benchmark.properties | 61 ++++++
modules/yardstick/config/ignite-base-config.xml | 118 ++++++++++
.../config/ignite-localhost-config.xml | 55 +++++
.../config/ignite-multicast-config.xml | 38 ++++
modules/yardstick/pom.xml | 185 ++++++++++++++++
.../yardstick/IgniteAbstractBenchmark.java | 130 +++++++++++
.../yardstick/IgniteBenchmarkArguments.java | 213 +++++++++++++++++++
.../org/apache/ignite/yardstick/IgniteNode.java | 191 +++++++++++++++++
.../cache/IgniteCacheAbstractBenchmark.java | 44 ++++
.../yardstick/cache/IgniteGetBenchmark.java | 41 ++++
.../yardstick/cache/IgnitePutBenchmark.java | 42 ++++
.../yardstick/cache/IgnitePutGetBenchmark.java | 47 ++++
.../cache/IgnitePutGetTxBenchmark.java | 52 +++++
.../yardstick/cache/IgnitePutTxBenchmark.java | 43 ++++
.../cache/IgniteSqlQueryBenchmark.java | 94 ++++++++
.../cache/IgniteSqlQueryJoinBenchmark.java | 118 ++++++++++
.../cache/IgniteSqlQueryPutBenchmark.java | 86 ++++++++
.../yardstick/cache/model/Organization.java | 110 ++++++++++
.../ignite/yardstick/cache/model/Person.java | 191 +++++++++++++++++
.../yardstick/cache/model/SampleValue.java | 62 ++++++
.../compute/IgniteAffinityCallBenchmark.java | 36 ++++
.../yardstick/compute/IgniteApplyBenchmark.java | 72 +++++++
.../compute/IgniteBroadcastBenchmark.java | 35 +++
.../compute/IgniteExecuteBenchmark.java | 35 +++
.../yardstick/compute/IgniteRunBenchmark.java | 71 +++++++
.../yardstick/compute/model/NoopCallable.java | 41 ++++
.../yardstick/compute/model/NoopTask.java | 97 +++++++++
pom.xml | 9 +-
68 files changed, 2948 insertions(+), 600 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4dc03c36/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
[3/3] incubator-ignite git commit: ignite-121 review
Posted by yz...@apache.org.
ignite-121 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/844bb3aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/844bb3aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/844bb3aa
Branch: refs/heads/ignite-121-logging
Commit: 844bb3aacb009e7f486caab9e12f6b94eaa5e191
Parents: d438957
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Feb 2 23:01:08 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Feb 2 23:01:08 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/IgnitionEx.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/844bb3aa/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 1dcbab9..7380e15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2004,7 +2004,7 @@ public class IgnitionEx {
*/
private IgniteLogger initLogger(@Nullable IgniteLogger cfgLog, UUID nodeId) throws IgniteCheckedException {
try {
- Exception log4jInitException = null;
+ Exception log4jInitErr = null;
if (cfgLog == null) {
Class<?> log4jCls;
@@ -2052,11 +2052,11 @@ public class IgnitionEx {
cfgLog = (IgniteLogger)log4jCls.newInstance();
}
catch (Exception e) {
- log4jInitException = e;
+ log4jInitErr = e;
}
}
- if (log4jCls == null || log4jInitException != null)
+ if (log4jCls == null || log4jInitErr != null)
cfgLog = new IgniteJavaLogger();
}
@@ -2064,9 +2064,9 @@ public class IgnitionEx {
if (cfgLog instanceof IgniteLoggerNodeIdAware)
((IgniteLoggerNodeIdAware)cfgLog).setNodeId(nodeId);
- if (log4jInitException != null)
+ if (log4jInitErr != null)
U.warn(cfgLog, "Failed to initialize IgniteLog4jLogger (falling back to standard java logging): "
- + log4jInitException.getCause());
+ + log4jInitErr.getCause());
return cfgLog;
}
[2/3] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-121-logging' into ignite-121-logging
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-121-logging' into ignite-121-logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4389579
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4389579
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4389579
Branch: refs/heads/ignite-121-logging
Commit: d4389579e19875df256f1cb76030f0a3df967976
Parents: 4dc03c3 e7562eb
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Feb 2 22:51:54 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Feb 2 22:51:54 2015 +0300
----------------------------------------------------------------------
.../impl/GridRouterCommandLineStartup.java | 19 ++++++---
.../org/apache/ignite/internal/IgnitionEx.java | 41 +++++++++++---------
2 files changed, 35 insertions(+), 25 deletions(-)
----------------------------------------------------------------------