Merge branch 'ignite-2.1.2' into ignite-5479
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4775b3d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4775b3d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4775b3d3 Branch: refs/heads/ignite-5479 Commit: 4775b3d381b3247a095ccd95e21dbda6088df835 Parents: e273e4d 1942db3 Author: Pavel Tupitsyn <ptupit...@apache.org> Authored: Tue Jul 11 14:27:25 2017 +0300 Committer: Pavel Tupitsyn <ptupit...@apache.org> Committed: Tue Jul 11 14:27:25 2017 +0300 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 42 ----- .../dht/GridClientPartitionTopology.java | 71 ++++--- .../dht/GridDhtPartitionTopologyImpl.java | 27 ++- .../dht/preloader/GridDhtPartitionFullMap.java | 24 +-- .../GridDhtPartitionsExchangeFuture.java | 9 +- .../persistence/pagemem/PageMemoryImpl.java | 86 ++++----- .../cache/persistence/wal/FileInput.java | 3 + .../utils/PlatformConfigurationUtils.java | 4 - .../internal/processors/query/QueryUtils.java | 8 +- .../CacheLateAffinityAssignmentTest.java | 2 +- ...oreQueryWithMultipleClassesPerCacheTest.java | 185 +++++++++++++++++++ .../IgnitePdsWithIndexingTestSuite.java | 2 + modules/ml/pom.xml | 3 +- .../main/java/org/apache/ignite/ml/Model.java | 1 - .../ml/clustering/BaseKMeansClusterer.java | 2 - .../apache/ignite/ml/clustering/Clusterer.java | 3 +- .../clustering/KMeansDistributedClusterer.java | 46 ++--- .../ml/clustering/KMeansLocalClusterer.java | 11 +- .../apache/ignite/ml/math/DistanceMeasure.java | 1 - .../ignite/ml/math/EuclideanDistance.java | 2 +- .../java/org/apache/ignite/ml/math/Matrix.java | 2 - .../java/org/apache/ignite/ml/math/Tracer.java | 1 - .../org/apache/ignite/ml/math/VectorUtils.java | 4 +- .../math/exceptions/ConvergenceException.java | 5 +- .../exceptions/MathIllegalStateException.java | 4 +- .../ignite/ml/math/functions/Functions.java | 8 +- .../apache/ignite/ml/math/impls/CacheUtils.java | 23 ++- .../ml/math/impls/matrix/AbstractMatrix.java | 2 - .../impls/matrix/SparseDistributedMatrix.java | 4 +- .../impls/storage/matrix/MapWrapperStorage.java | 7 +- .../matrix/SparseDistributedMatrixStorage.java | 7 +- .../vector/SparseLocalOnHeapVectorStorage.java | 8 +- .../ml/math/impls/vector/MapWrapperVector.java | 3 +- .../apache/ignite/ml/math/util/MatrixUtil.java | 1 - .../ignite/ml/math/d3-matrix-template.html | 2 + .../ignite/ml/math/d3-vector-template.html | 2 + .../org/apache/ignite/ml/IgniteMLTestSuite.java | 4 +- .../ml/clustering/ClusteringTesetSuite.java | 32 ---- .../ml/clustering/ClusteringTestSuite.java | 32 ++++ .../KMeansDistributedClustererTest.java | 28 ++- .../ignite/ml/math/MathImplLocalTestSuite.java | 1 - .../org/apache/ignite/ml/math/TracerTest.java | 3 + .../matrix/SparseDistributedMatrixTest.java | 24 ++- .../OLSMultipleLinearRegressionTest.java | 2 +- .../Apache.Ignite.Core.Tests.csproj | 1 + .../Cache/Query/CacheQueriesTest.cs | 18 +- .../Config/cache-query.xml | 1 - .../Deployment/CacheGetFunc.cs | 50 +++++ .../Deployment/PeerAssemblyLoadingTest.cs | 24 +++ .../IgniteConfigurationSerializerTest.cs | 2 - .../IgniteConfigurationTest.cs | 3 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 13 +- .../org/apache/ignite/spark/IgniteRDD.scala | 6 +- .../apache/ignite/spark/impl/IgniteSqlRDD.scala | 6 +- .../spark/JavaEmbeddedIgniteRDDSelfTest.java | 5 - modules/web-console/frontend/app/app.js | 2 + .../cluster-select/cluster-select.controller.js | 72 ++++---- .../cluster-select/cluster-select.pug | 10 +- .../frontend/app/filters/id8.filter.js | 20 ++ .../app/modules/agent/AgentManager.service.js | 4 +- .../configuration/generator/Maven.service.js | 10 +- .../views/templates/agent-download.tpl.pug | 4 +- 62 files changed, 617 insertions(+), 375 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4775b3d3/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ----------------------------------------------------------------------