Merge remote-tracking branch 'remotes/origin/ignite-5075-cacheStart' into ignite-5075
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9662712f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9662712f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9662712f Branch: refs/heads/ignite-5075 Commit: 9662712fcb59688f911f5633515fe0abfc83004c Parents: 6dac535 f9aa769 Author: sboikov <[email protected]> Authored: Mon May 15 13:52:09 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon May 15 13:52:09 2017 +0300 ---------------------------------------------------------------------- .../DistributedRegressionExample.java | 149 +++++++++++++++++++ .../cache/GridCacheConcurrentMap.java | 2 +- .../cache/GridCacheConcurrentMapImpl.java | 2 +- .../processors/cache/GridNoStorageCacheMap.java | 2 +- .../dht/GridCachePartitionedConcurrentMap.java | 4 +- .../distributed/dht/GridDhtLocalPartition.java | 4 +- .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../processors/cache/GridCacheLeakTest.java | 4 +- .../cache/eviction/EvictionAbstractTest.java | 2 +- .../IgniteCacheClientNearCacheExpiryTest.java | 2 +- .../apache/ignite/ml/math/util/MatrixUtil.java | 3 +- .../org/apache/ignite/ml/IgniteMLTestSuite.java | 35 +++++ .../ml/math/MathImplDistributedTestSuite.java | 2 +- .../ignite/ml/math/MathImplLocalTestSuite.java | 7 +- .../ignite/ml/math/MathImplMainTestSuite.java | 2 +- .../OLSMultipleLinearRegressionTest.java | 7 + .../ml/regressions/RegressionsTestSuite.java | 32 ++++ .../Binary/BinarySelfTest.cs | 26 ++++ .../Impl/Binary/BinaryReflectiveActions.cs | 6 +- .../BinaryReflectiveSerializerInternal.cs | 9 +- .../Impl/Binary/BinaryUtils.cs | 9 -- .../Binary/DeserializationCallbackProcessor.cs | 11 ++ .../Impl/Binary/SerializableSerializer.cs | 10 +- 23 files changed, 290 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9662712f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9662712f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9662712f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9662712f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java index 4e1d9f2,76c7a15..1b6f998 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java @@@ -99,11 -99,11 +99,11 @@@ public class GridCachePartitionedConcur } /** {@inheritDoc} */ - @Override public int size() { + @Override public int internalSize() { int size = 0; - for (GridDhtLocalPartition part : ctx.topology().currentLocalPartitions()) + for (GridDhtLocalPartition part : grp.topology().currentLocalPartitions()) - size += part.size(); + size += part.internalSize(); return size; } http://git-wip-us.apache.org/repos/asf/ignite/blob/9662712f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index 3119b52,6fb557a..a4537a1 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@@ -246,10 -235,10 +246,10 @@@ public class GridDhtLocalPartition exte * @return {@code True} if partition is empty. */ public boolean isEmpty() { - if (cctx.allowFastEviction()) + if (grp.allowFastEviction()) - return size() == 0; + return internalSize() == 0; - return store.fullSize() == 0 && size() == 0; - return store.size() == 0 && internalSize() == 0; ++ return store.fullSize() == 0 && internalSize() == 0; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/9662712f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 826b2d4,8e79eda..8bb9ba0 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@@ -243,13 -235,13 +243,13 @@@ public class GridDhtPartitionTopologyIm if (dumpCnt++ < GridDhtPartitionsExchangeFuture.DUMP_PENDING_OBJECTS_THRESHOLD) { U.warn(log, "Failed to wait for partition eviction [" + "topVer=" + topVer + - ", cache=" + cctx.name() + + ", group=" + grp.nameForLog() + ", part=" + part.id() + ", partState=" + part.state() + - ", size=" + part.size() + + ", size=" + part.internalSize() + ", reservations=" + part.reservations() + ", grpReservations=" + part.groupReserved() + - ", node=" + cctx.localNodeId() + "]"); + ", node=" + ctx.localNodeId() + "]"); if (IgniteSystemProperties.getBoolean(IGNITE_THREAD_DUMP_ON_EXCHANGE_TIMEOUT, false)) U.dumpThreads(log);
