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/12/08 07:15:43 UTC
[1/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-zk
Repository: ignite
Updated Branches:
refs/heads/ignite-zk-alpha [created] f6fb5603b
Merge remote-tracking branch 'remotes/origin/master' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ffdd076
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ffdd076
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ffdd076
Branch: refs/heads/ignite-zk-alpha
Commit: 2ffdd0761b9bdab38410a7abae691db952a3a786
Parents: f50c7cc a7893b6
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 8 10:02:01 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 8 10:02:01 2017 +0300
----------------------------------------------------------------------
.../clustering/DatasetWithObviousStructure.java | 105 +
.../KMeansDistributedClustererExample.java | 95 +
.../clustering/KMeansLocalClustererExample.java | 106 +
.../examples/ml/clustering/package-info.java | 2 +-
.../decompositions/QRDecompositionExample.java | 82 +
.../DistributedRegressionExample.java | 149 --
.../examples/ml/math/trees/MNISTExample.java | 261 ---
.../examples/ml/math/trees/package-info.java | 22 -
.../apache/ignite/examples/ml/package-info.java | 22 +
.../DistributedRegressionExample.java | 149 ++
.../DistributedRegressionModelExample.java | 134 ++
.../examples/ml/regression/package-info.java | 22 +
.../ignite/examples/ml/trees/MNISTExample.java | 261 +++
.../ignite/examples/ml/trees/package-info.java | 22 +
modules/compatibility/pom.xml | 11 +
.../apache/ignite/internal/GridLoggerProxy.java | 9 +
.../apache/ignite/internal/IgniteKernal.java | 13 +
.../logger/platform/PlatformLogger.java | 15 +
.../processors/cache/ClusterCachesInfo.java | 8 +-
.../AtomicDataStructureProxy.java | 16 +-
.../ignite/internal/visor/cache/VisorCache.java | 94 +-
.../node/VisorExecutorServiceConfiguration.java | 18 +-
.../visor/node/VisorNodeDataCollectorJob.java | 9 +-
.../node/VisorNodeDataCollectorTaskArg.java | 47 +-
.../internal/visor/query/VisorQueryTaskArg.java | 2 +-
.../internal/visor/util/VisorTaskUtils.java | 139 ++
.../org/apache/ignite/logger/NullLogger.java | 6 +
.../apache/ignite/logger/java/JavaLogger.java | 17 +
.../sharedfs/TcpDiscoverySharedFsIpFinder.java | 34 +-
.../processors/cache/CacheComparatorTest.java | 48 +
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 4 -
...PartitionedQueueCreateMultiNodeSelfTest.java | 2 -
.../ignite/logger/java/JavaLoggerTest.java | 5 +
.../junits/logger/GridTestLog4jLogger.java | 21 +-
.../testsuites/IgniteCacheTestSuite2.java | 3 +
.../ignite/development/utils/package-info.java | 22 +
.../cache/index/AbstractSchemaSelfTest.java | 18 +
modules/kubernetes/config/example-kube.xml | 2 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 40 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 13 +
.../logger/log4j/GridLog4jInitializedTest.java | 7 +-
.../logger/log4j/GridLog4jLoggingFileTest.java | 13 +-
.../logger/log4j/GridLog4jLoggingPathTest.java | 12 +-
.../logger/log4j/GridLog4jLoggingUrlTest.java | 15 +-
.../log4j/GridLog4jNotInitializedTest.java | 5 +
.../ignite/testsuites/IgniteLog4jTestSuite.java | 6 +
.../ignite/logger/log4j2/Log4J2Logger.java | 20 +-
.../logger/log4j2/Log4j2LoggerSelfTest.java | 19 +-
.../ml/math/decompositions/QRDSolver.java | 197 ++
.../ml/math/decompositions/QRDecomposition.java | 54 +-
.../AbstractMultipleLinearRegression.java | 20 +
.../OLSMultipleLinearRegression.java | 41 +-
.../OLSMultipleLinearRegressionModel.java | 77 +
.../OLSMultipleLinearRegressionModelFormat.java | 46 +
.../OLSMultipleLinearRegressionTrainer.java | 62 +
.../columnbased/caches/package-info.java | 22 +
.../org/apache/ignite/ml/util/package-info.java | 22 +
.../org/apache/ignite/ml/IgniteMLTestSuite.java | 3 +-
.../org/apache/ignite/ml/LocalModelsTest.java | 99 +-
...KMeansDistributedClustererTestMultiNode.java | 15 +-
...MeansDistributedClustererTestSingleNode.java | 15 +-
.../apache/ignite/ml/clustering/KMeansUtil.java | 6 +-
.../ignite/ml/math/MathImplLocalTestSuite.java | 2 +
.../ml/math/decompositions/QRDSolverTest.java | 87 +
...tedBlockOLSMultipleLinearRegressionTest.java | 38 +-
...tributedOLSMultipleLinearRegressionTest.java | 38 +-
.../OLSMultipleLinearRegressionModelTest.java | 53 +
.../ml/regressions/RegressionsTestSuite.java | 5 +-
.../Apache.Ignite.Benchmarks.csproj | 2 +
.../Interop/PlatformBenchmarkBase.cs | 21 +
.../ThinClient/ThinClientGetBenchmark.cs | 63 +
.../ThinClient/ThinClientPutBenchmark.cs | 59 +
.../Apache.Ignite.Core.Tests.csproj | 5 +
.../ApiParity/CacheMetricsParityTest.cs | 64 +
.../ApiParity/ClusterMetricsParityTest.cs | 47 +
.../ApiParity/DataRegionMetricsParityTest.cs | 54 +
.../ApiParity/DataStorageMetricsParityTest.cs | 38 +
.../ApiParity/ParityTest.cs | 4 +-
.../ApiParity/TransactionMetricsParityTest.cs | 39 +
.../apache/ignite/logger/slf4j/Slf4jLogger.java | 6 +
.../commands/cache/VisorCacheCommand.scala | 5 +
.../commands/common/VisorConsoleCommand.scala | 4 +-
.../config/VisorConfigurationCommand.scala | 2 +-
.../commands/tasks/VisorTasksCommand.scala | 1 +
.../scala/org/apache/ignite/visor/visor.scala | 158 +-
modules/web-console/backend/app/agentSocket.js | 2 +-
.../web-console/backend/app/agentsHandler.js | 51 +-
.../web-console/backend/app/browsersHandler.js | 7 +
modules/web-console/backend/app/mongo.js | 1 +
modules/web-console/backend/package.json | 3 +-
modules/web-console/frontend/app/app.js | 12 +-
.../app/components/bs-select-menu/style.scss | 4 +-
.../cluster-select/cluster-select.controller.js | 64 -
.../cluster-select/cluster-select.pug | 47 -
.../cluster-select/cluster-select.scss | 30 -
.../app/components/cluster-select/index.js | 29 -
.../components/cluster-selector/component.js | 25 +
.../components/cluster-selector/controller.js | 62 +
.../app/components/cluster-selector/index.js | 23 +
.../app/components/cluster-selector/style.scss | 66 +
.../components/cluster-selector/template.pug | 75 +
.../app/components/ignite-icon/directive.js | 10 +-
.../app/components/ignite-icon/index.js | 2 +
.../app/components/ignite-icon/service.js | 32 +
.../app/components/list-editable/controller.js | 2 +-
.../components/page-queries/Notebook.data.js | 168 ++
.../components/page-queries/Notebook.service.js | 74 +
.../app/components/page-queries/controller.js | 1938 ++++++++++++++++++
.../app/components/page-queries/index.js | 62 +
.../page-queries/notebook.controller.js | 62 +
.../app/components/page-queries/style.scss | 36 +
.../components/page-queries/template.tpl.pug | 385 ++++
.../app/modules/agent/AgentManager.service.js | 57 +-
.../frontend/app/modules/sql/Notebook.data.js | 168 --
.../app/modules/sql/Notebook.service.js | 74 -
.../app/modules/sql/notebook.controller.js | 62 -
.../frontend/app/modules/sql/sql.controller.js | 1887 -----------------
.../frontend/app/modules/sql/sql.module.js | 61 -
.../frontend/app/primitives/switcher/index.pug | 2 +-
.../frontend/app/primitives/switcher/index.scss | 69 +-
.../frontend/views/includes/header-right.pug | 2 -
.../web-console/frontend/views/sql/sql.tpl.pug | 381 ----
.../console/agent/handlers/ClusterListener.java | 178 +-
.../ignite/console/agent/rest/RestExecutor.java | 63 +-
.../apache/ignite/yarn/ApplicationMaster.java | 9 +-
125 files changed, 6206 insertions(+), 3698 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ffdd076/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
[2/2] ignite git commit: zk
Posted by sb...@apache.org.
zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6fb5603
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6fb5603
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6fb5603
Branch: refs/heads/ignite-zk-alpha
Commit: f6fb5603bb9565b9e1067354c069624d5a379007
Parents: 2ffdd07
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 8 10:09:01 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 8 10:09:01 2017 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6fb5603/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 2e97aed..91d5fdd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -706,6 +706,7 @@ public class ZookeeperDiscoveryImpl {
", instanceName=" + locNode.attribute(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME) +
", joinDataSize=" + joinDataBytes.length +
", joinDataPartCnt=" + rtState.joinDataPartCnt +
+ ", consistentId=" + locNode.consistentId() +
", initTime=" + (System.currentTimeMillis() - startTime) +
", nodePath=" + rtState.locNodeZkPath + ']');