Merge remote-tracking branch 'remotes/origin/master' into ignite-5578 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8e5f6b7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8e5f6b7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8e5f6b7 Branch: refs/heads/ignite-5578 Commit: d8e5f6b7977a410643b2bf2c773df0ceb26ea051 Parents: c10238b 1be9b40 Author: sboikov <[email protected]> Authored: Tue Jul 11 12:49:50 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Jul 11 12:49:50 2017 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheQueryDdlExample.java | 26 +- .../ignite/examples/datagrid/JdbcExample.java | 135 ++ .../CacheExamplesMultiNodeSelfTest.java | 9 + .../ignite/examples/CacheExamplesSelfTest.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 5 +- .../ignite/internal/binary/BinaryUtils.java | 19 +- .../internal/binary/BinaryWriterExImpl.java | 4 +- .../binary/builder/BinaryBuilderSerializer.java | 6 +- .../GridCachePartitionExchangeManager.java | 42 - .../dht/GridClientPartitionTopology.java | 71 +- .../dht/GridDhtPartitionTopologyImpl.java | 27 +- .../dht/preloader/GridDhtPartitionFullMap.java | 24 +- .../GridDhtPartitionsExchangeFuture.java | 9 +- .../internal/processors/query/QueryUtils.java | 8 +- .../internal/binary/BinaryEnumsSelfTest.java | 71 + .../binary/BinaryMarshallerSelfTest.java | 61 + .../CacheLateAffinityAssignmentTest.java | 2 +- .../sink/flink/FlinkIgniteSinkSelfTest.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 | 18 +- .../Cache/Query/CacheLinqTest.cs | 2084 ------------------ .../Cache/Query/CacheLinqTestSimpleName.cs | 35 - .../Cache/Query/CacheLinqTestSqlEscapeAll.cs | 34 - .../Query/Linq/CacheLinqTest.Aggregates.cs | 91 + .../Cache/Query/Linq/CacheLinqTest.Base.cs | 506 +++++ .../Query/Linq/CacheLinqTest.CompiledQuery.cs | 215 ++ .../Cache/Query/Linq/CacheLinqTest.Contains.cs | 128 ++ .../Cache/Query/Linq/CacheLinqTest.Custom.cs | 107 + .../Cache/Query/Linq/CacheLinqTest.DateTime.cs | 89 + .../Cache/Query/Linq/CacheLinqTest.Functions.cs | 211 ++ .../Query/Linq/CacheLinqTest.Introspection.cs | 145 ++ .../Linq/CacheLinqTest.Join.LocalCollection.cs | 182 ++ .../Cache/Query/Linq/CacheLinqTest.Join.cs | 310 +++ .../Cache/Query/Linq/CacheLinqTest.Misc.cs | 350 +++ .../Cache/Query/Linq/CacheLinqTest.Numerics.cs | 131 ++ .../Cache/Query/Linq/CacheLinqTest.Strings.cs | 91 + .../Cache/Query/Linq/CacheLinqTestSimpleName.cs | 35 + .../Query/Linq/CacheLinqTestSqlEscapeAll.cs | 34 + .../Deployment/CacheGetFunc.cs | 50 + .../Deployment/PeerAssemblyLoadingTest.cs | 24 + .../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 +- .../views/templates/agent-download.tpl.pug | 4 +- 82 files changed, 3515 insertions(+), 2472 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8e5f6b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8e5f6b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ----------------------------------------------------------------------
