Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5757
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/71834092 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/71834092 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/71834092 Branch: refs/heads/ignite-5757 Commit: 71834092b9718785146f3fda6b6e01e9b3e85211 Parents: 91e6bb4 f575a245 Author: Alexey Goncharuk <[email protected]> Authored: Tue Aug 1 12:26:25 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Aug 1 12:26:25 2017 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 18 +- LICENSE | 7 + examples/pom.xml | 2 +- .../ml/math/matrix/ExampleMatrixStorage.java | 6 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/cassandra/pom.xml | 2 +- modules/cassandra/serializers/pom.xml | 4 +- modules/cassandra/store/pom.xml | 4 +- modules/clients/pom.xml | 2 +- .../client/suite/IgniteClientTestSuite.java | 2 + .../JettyRestProcessorAbstractSelfTest.java | 50 +- .../tcp/redis/RedisProtocolServerSelfTest.java | 110 ++ .../tcp/redis/RedisProtocolStringSelfTest.java | 19 - modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../ignite/compute/ComputeJobAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 5 - .../apache/ignite/internal/IgniteKernal.java | 8 +- .../org/apache/ignite/internal/IgnitionEx.java | 37 +- .../ignite/internal/MarshallerContextImpl.java | 4 +- .../ignite/internal/binary/BinaryContext.java | 1 + .../ignite/internal/binary/BinaryUtils.java | 19 +- .../internal/binary/GridBinaryMarshaller.java | 3 + .../managers/communication/GridIoPolicy.java | 3 + .../discovery/GridDiscoveryManager.java | 38 +- .../eventstorage/GridEventStorageManager.java | 14 + .../affinity/GridAffinityProcessor.java | 2 +- .../cache/CacheAffinitySharedManager.java | 66 +- .../processors/cache/CacheObjectUtils.java | 4 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../GridCachePartitionExchangeManager.java | 57 +- .../cache/GridCacheSharedContext.java | 6 +- .../binary/CacheObjectBinaryProcessorImpl.java | 8 +- .../dht/GridClientPartitionTopology.java | 30 +- .../cache/distributed/dht/GridDhtGetFuture.java | 14 +- .../dht/GridDhtPartitionTopology.java | 21 +- .../dht/GridDhtPartitionTopologyImpl.java | 79 +- .../dht/atomic/DhtAtomicUpdateResult.java | 131 +++ .../dht/atomic/GridDhtAtomicCache.java | 382 +++---- .../GridNearAtomicAbstractUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../preloader/GridDhtPartitionExchangeId.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 162 +-- .../preloader/GridDhtPartitionsFullMessage.java | 4 +- ...arOptimisticSerializableTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 2 +- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 6 +- .../cache/local/GridLocalLockFuture.java | 5 - .../GridCacheDatabaseSharedManager.java | 6 +- .../freelist/io/PagesListMetaIO.java | 2 +- .../cache/query/GridCacheQueryManager.java | 41 +- .../cache/query/GridCacheQueryResponse.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 12 +- .../cache/transactions/IgniteTxHandler.java | 125 +- .../IgniteTxImplicitSingleStateImpl.java | 2 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../IgniteTxRemoteStateAdapter.java | 2 +- .../cache/transactions/IgniteTxState.java | 2 +- .../cache/transactions/IgniteTxStateImpl.java | 2 +- .../processors/igfs/IgfsDataManager.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 2 +- .../processors/job/GridJobProcessor.java | 10 +- .../platform/PlatformAbstractTarget.java | 6 +- .../processors/platform/PlatformIgnition.java | 5 +- .../platform/PlatformNoopProcessor.java | 132 --- .../processors/platform/PlatformProcessor.java | 216 ---- .../platform/PlatformProcessorImpl.java | 554 +++++---- .../platform/PlatformTargetProxy.java | 11 + .../platform/PlatformTargetProxyImpl.java | 79 +- .../platform/cluster/PlatformClusterGroup.java | 29 + .../datastructures/PlatformAtomicReference.java | 13 +- .../transactions/PlatformTransactions.java | 2 +- .../platform/utils/PlatformUtils.java | 3 +- .../processors/rest/GridRestCommand.java | 3 + .../handlers/cache/GridCacheCommandHandler.java | 127 ++- .../server/GridRedisFlushCommandHandler.java | 117 ++ .../string/GridRedisIncrDecrCommandHandler.java | 2 +- .../protocols/tcp/redis/GridRedisCommand.java | 6 +- .../tcp/redis/GridRedisNioListener.java | 2 + .../service/GridServiceProcessor.java | 2 +- .../timeout/GridTimeoutProcessor.java | 18 +- .../ignite/internal/util/IgniteUtils.java | 27 +- .../internal/util/MutableSingletonList.java | 53 + .../util/StripedCompositeReadWriteLock.java | 6 +- .../ignite/internal/util/StripedExecutor.java | 4 +- .../ignite/internal/util/nio/GridNioServer.java | 14 +- .../cache/VisorCacheMetricsCollectorTask.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 102 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../spi/failover/always/AlwaysFailoverSpi.java | 2 +- .../org/apache/ignite/thread/IgniteThread.java | 35 +- .../ignite/thread/IgniteThreadFactory.java | 15 +- .../ignite/thread/IgniteThreadPoolExecutor.java | 141 +-- .../core/src/main/resources/ignite.properties | 2 +- .../internal/IgniteComputeJobOneThreadTest.java | 75 ++ .../BinaryObjectBuilderAdditionalSelfTest.java | 2 +- .../cache/CacheConnectionLeakStoreTxTest.java | 291 +++++ .../IgniteCacheBinaryObjectsScanSelfTest.java | 9 +- ...acheBinaryObjectsScanWithEventsSelfTest.java | 30 + .../IgniteClusterActivateDeactivateTest.java | 9 +- .../cache/IgniteDynamicCacheMultinodeTest.java | 171 +++ .../GridCacheBinaryObjectsAbstractSelfTest.java | 28 + .../CacheLateAffinityAssignmentTest.java | 36 +- .../distributed/CachePartitionStateTest.java | 410 +++++++ ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../IgniteTxRemoveTimeoutObjectsTest.java | 194 ++++ .../TestCacheNodeExcludingFilter.java | 53 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 - .../GridCachePartitionedTxSalvageSelfTest.java | 8 +- ...cingDelayedPartitionMapExchangeSelfTest.java | 58 +- .../db/IgnitePdsCacheRestoreTest.java | 208 ++++ .../ScanQueryOffheapExpiryPolicySelfTest.java | 114 ++ .../timeout/GridTimeoutProcessorSelfTest.java | 68 +- .../loadtests/colocation/GridTestMain.java | 45 - .../marshaller/GridMarshallerResourceBean.java | 5 +- .../plugin/PlatformTestPluginTarget.java | 7 +- .../junits/common/GridCommonAbstractTest.java | 6 +- .../testsuites/IgniteCacheTestSuite3.java | 4 +- .../testsuites/IgniteCacheTestSuite4.java | 4 + .../testsuites/IgniteCacheTestSuite6.java | 38 + .../testsuites/IgniteComputeGridTestSuite.java | 3 + .../ignite/testsuites/IgnitePdsTestSuite.java | 8 +- .../GridThreadPoolExecutorServiceSelfTest.java | 9 +- modules/docker/2.1.0/Dockerfile | 46 + modules/docker/2.1.0/run.sh | 51 + modules/docker/Dockerfile | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flink/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate-4.2/pom.xml | 2 +- modules/hibernate-5.1/pom.xml | 2 +- modules/hibernate-core/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../IgniteBinaryCacheQueryTestSuite.java | 2 + .../IgniteCacheQuerySelfTestSuite2.java | 3 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- .../processors/cache/jta/CacheJtaResource.java | 20 +- .../cache/AbstractCacheJtaSelfTest.java | 183 --- .../GridPartitionedCacheJtaFactorySelfTest.java | 41 - ...rtitionedCacheJtaFactoryUseSyncSelfTest.java | 32 - ...titionedCacheJtaLookupClassNameSelfTest.java | 83 -- .../GridReplicatedCacheJtaFactorySelfTest.java | 32 - ...eplicatedCacheJtaFactoryUseSyncSelfTest.java | 32 - ...plicatedCacheJtaLookupClassNameSelfTest.java | 32 - .../cache/jta/AbstractCacheJtaSelfTest.java | 248 ++++ .../GridPartitionedCacheJtaFactorySelfTest.java | 41 + ...rtitionedCacheJtaFactoryUseSyncSelfTest.java | 32 + ...titionedCacheJtaLookupClassNameSelfTest.java | 83 ++ .../GridReplicatedCacheJtaFactorySelfTest.java | 32 + ...eplicatedCacheJtaFactoryUseSyncSelfTest.java | 32 + ...plicatedCacheJtaLookupClassNameSelfTest.java | 32 + .../processors/cache/jta/package-info.java | 22 + .../ignite/testsuites/IgniteJtaTestSuite.java | 12 +- modules/kafka/pom.xml | 2 +- modules/kubernetes/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- .../apache/ignite/mesos/ClusterProperties.java | 4 +- modules/ml/README.txt | 6 + modules/ml/licenses/bsd3.txt | 51 + modules/ml/pom.xml | 28 +- .../clustering/KMeansDistributedClusterer.java | 6 +- .../ml/clustering/KMeansLocalClusterer.java | 2 +- .../java/org/apache/ignite/ml/math/Blas.java | 454 ++++++++ .../apache/ignite/ml/math/DistanceMeasure.java | 2 +- .../ignite/ml/math/EuclideanDistance.java | 3 +- .../org/apache/ignite/ml/math/MathUtils.java | 1 + .../java/org/apache/ignite/ml/math/Matrix.java | 31 + .../apache/ignite/ml/math/MatrixStorage.java | 12 +- .../apache/ignite/ml/math/OrderedMatrix.java | 24 + .../java/org/apache/ignite/ml/math/Vector.java | 8 + .../org/apache/ignite/ml/math/VectorUtils.java | 7 +- .../decompositions/CholeskyDecomposition.java | 11 +- .../math/decompositions/EigenDecomposition.java | 2 +- .../ml/math/decompositions/LUDecomposition.java | 2 +- .../ml/math/decompositions/QRDecomposition.java | 2 +- .../exceptions/MathIllegalNumberException.java | 8 +- .../IgniteIntDoubleToDoubleBiFunction.java | 27 + .../functions/IgniteIntIntToIntBiFunction.java | 27 + .../ml/math/functions/IgniteTriFunction.java | 35 + .../apache/ignite/ml/math/impls/CacheUtils.java | 198 +++- .../ml/math/impls/matrix/AbstractMatrix.java | 148 ++- .../ignite/ml/math/impls/matrix/BlockEntry.java | 50 + .../ml/math/impls/matrix/CacheMatrix.java | 9 +- .../impls/matrix/DenseLocalOffHeapMatrix.java | 29 + .../impls/matrix/DenseLocalOnHeapMatrix.java | 61 +- .../matrix/SparseBlockDistributedMatrix.java | 208 ++++ .../impls/matrix/SparseDistributedMatrix.java | 55 +- .../impls/matrix/SparseLocalOnHeapMatrix.java | 27 + .../storage/matrix/ArrayMatrixStorage.java | 86 +- .../storage/matrix/BaseBlockMatrixKey.java | 41 + .../impls/storage/matrix/BlockMatrixKey.java | 144 +++ .../storage/matrix/BlockMatrixStorage.java | 440 +++++++ .../storage/matrix/CacheMatrixStorage.java | 6 + .../matrix/DenseOffHeapMatrixStorage.java | 10 +- .../storage/matrix/DiagonalMatrixStorage.java | 17 + .../storage/matrix/FunctionMatrixStorage.java | 6 + .../impls/storage/matrix/MapWrapperStorage.java | 1 + .../storage/matrix/MatrixDelegateStorage.java | 43 +- .../storage/matrix/PivotedMatrixStorage.java | 5 + .../storage/matrix/RandomMatrixStorage.java | 6 + .../matrix/SparseDistributedMatrixStorage.java | 17 +- .../matrix/SparseLocalOnHeapMatrixStorage.java | 41 +- .../vector/DenseLocalOffHeapVectorStorage.java | 2 +- .../vector/SparseLocalOffHeapVectorStorage.java | 2 +- .../vector/SparseLocalOnHeapVectorStorage.java | 14 +- .../impls/vector/AbstractReadOnlyVector.java | 6 + .../ml/math/impls/vector/AbstractVector.java | 8 + .../ml/math/impls/vector/CacheVector.java | 4 +- .../ml/math/impls/vector/DelegatingVector.java | 6 + .../ml/math/impls/vector/MapWrapperVector.java | 1 - .../ml/math/impls/vector/SparseLocalVector.java | 45 +- .../ignite/ml/math/impls/vector/VectorView.java | 2 +- .../ignite/ml/math/statistics/Variance.java | 1 + .../ignite/ml/math/statistics/package-info.java | 22 + .../org/apache/ignite/ml/math/util/MapUtil.java | 2 +- .../apache/ignite/ml/math/util/MatrixUtil.java | 72 +- .../ignite/ml/math/util/package-info.java | 22 + .../java/org/apache/ignite/ml/package-info.java | 22 + .../AbstractMultipleLinearRegression.java | 4 +- .../OLSMultipleLinearRegression.java | 2 +- .../java/org/apache/ignite/ml/TestUtils.java | 2 +- .../KMeansDistributedClustererTest.java | 15 +- .../org/apache/ignite/ml/math/BlasTest.java | 346 ++++++ .../ml/math/MathImplDistributedTestSuite.java | 2 + .../ignite/ml/math/MathImplMainTestSuite.java | 3 +- .../ignite/ml/math/benchmark/MathBenchmark.java | 2 +- .../ml/math/benchmark/VectorBenchmarkTest.java | 2 +- .../decompositions/EigenDecompositionTest.java | 2 +- .../math/impls/matrix/MatrixAttributeTest.java | 2 - .../impls/matrix/MatrixImplementationsTest.java | 7 +- .../impls/matrix/MatrixViewConstructorTest.java | 2 +- .../SparseDistributedBlockMatrixTest.java | 379 +++++++ .../matrix/SparseDistributedMatrixTest.java | 32 +- .../storage/matrix/MatrixArrayStorageTest.java | 6 +- .../matrix/MatrixStorageImplementationTest.java | 2 +- .../math/impls/vector/AbstractVectorTest.java | 4 +- .../PivotedVectorViewConstructorTest.java | 2 +- .../math/impls/vector/VectorAttributesTest.java | 2 +- .../ml/math/impls/vector/VectorFoldMapTest.java | 2 +- .../impls/vector/VectorImplementationsTest.java | 12 +- .../math/impls/vector/VectorIterableTest.java | 2 +- .../math/impls/vector/VectorToMatrixTest.java | 7 +- .../OLSMultipleLinearRegressionTest.java | 6 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/configure.acrel | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- .../core/include/ignite/cache/query/query_sql.h | 4 + .../ignite/cache/query/query_sql_fields.h | 4 + .../platforms/cpp/core/include/ignite/ignite.h | 6 +- .../include/ignite/impl/compute/compute_impl.h | 5 +- .../cpp/core/include/ignite/impl/ignite_impl.h | 84 +- .../ignite/impl/interop/interop_target.h | 16 +- modules/platforms/cpp/core/src/ignition.cpp | 23 +- .../cpp/core/src/impl/ignite_environment.cpp | 37 +- .../platforms/cpp/core/src/impl/ignite_impl.cpp | 49 +- .../core/src/impl/interop/interop_target.cpp | 18 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../cpp/jni/include/ignite/jni/exports.h | 32 +- .../platforms/cpp/jni/include/ignite/jni/java.h | 75 +- modules/platforms/cpp/jni/project/vs/module.def | 31 +- modules/platforms/cpp/jni/src/exports.cpp | 120 +- modules/platforms/cpp/jni/src/java.cpp | 537 +-------- .../cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +- .../cpp/odbc/install/ignite-odbc-x86.wxs | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Binary/BinaryCompactFooterInteropTest.cs | 29 +- .../Cache/CacheAbstractTransactionalTest.cs | 53 +- .../Plugin/PluginTest.cs | 13 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 7 +- .../Apache.Ignite.Core.csproj | 5 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 21 +- .../Impl/Binary/BinaryProcessor.cs | 6 +- .../Impl/Binary/BinaryWriterExtensions.cs | 107 ++ .../Cache/Affinity/PlatformAffinityFunction.cs | 7 +- .../Impl/Cache/CacheAffinityImpl.cs | 18 +- .../Impl/Cache/CacheEnumerator.cs | 8 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 115 +- .../Impl/Cache/Query/AbstractQueryCursor.cs | 12 +- .../Continuous/ContinuousQueryHandleImpl.cs | 12 +- .../Impl/Cache/Query/FieldsQueryCursor.cs | 6 +- .../Impl/Cache/Query/QueryCursor.cs | 5 +- .../Impl/Cluster/ClusterGroupImpl.cs | 138 ++- .../Impl/Common/DelegateTypeDescriptor.cs | 9 +- .../Impl/Common/Listenable.cs | 8 +- .../Impl/Compute/ComputeImpl.cs | 18 +- .../Impl/DataStructures/AtomicLong.cs | 9 +- .../Impl/DataStructures/AtomicReference.cs | 8 +- .../Impl/DataStructures/AtomicSequence.cs | 9 +- .../Impl/Datastream/DataStreamerImpl.cs | 11 +- .../Impl/Datastream/StreamReceiverHolder.cs | 13 +- .../Apache.Ignite.Core/Impl/Events/Events.cs | 11 +- .../Impl/IPlatformTargetInternal.cs | 102 ++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 301 ++--- .../Apache.Ignite.Core/Impl/Log/JavaLogger.cs | 23 +- .../Impl/Messaging/Messaging.cs | 10 +- .../Impl/PlatformDisposableTargetAdapter.cs | 75 ++ .../Impl/PlatformJniTarget.cs | 536 +++++++++ .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 1070 ------------------ .../Impl/PlatformTargetAdapter.cs | 534 +++++++++ .../Impl/Plugin/PluginContext.cs | 7 +- .../Impl/Services/Services.cs | 19 +- .../Impl/Transactions/TransactionsImpl.cs | 29 +- .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 94 +- .../Impl/Unmanaged/UnmanagedCallbacks.cs | 10 +- .../Impl/Unmanaged/UnmanagedUtils.cs | 315 +----- .../Interop/IPlatformTarget.cs | 15 + .../NuGet/LINQPad/ComputeExample.linq | 1 + .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +- modules/rest-http/pom.xml | 2 +- modules/rocketmq/pom.xml | 5 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring-data/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/storm/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 20 +- modules/visor-plugins/pom.xml | 2 +- modules/web-console/backend/middlewares/api.js | 38 +- .../frontend/app/modules/user/user.module.js | 2 +- modules/web-console/pom.xml | 2 +- modules/web-console/web-agent/pom.xml | 2 +- modules/web/ignite-appserver-test/pom.xml | 2 +- modules/web/ignite-websphere-test/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../cache/websession/WebSessionFilter.java | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zeromq/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 373 files changed, 9686 insertions(+), 5203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/71834092/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/71834092/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 ccbe263,a8e13a0..880a102 --- 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 @@@ -739,12 -747,11 +749,12 @@@ public class GridDhtPartitionTopologyIm "[part=" + p + ", topVer=" + topVer + ", this.topVer=" + this.topVer + ']'); } else if (loc != null && state == RENTING && !showRenting) - throw new GridDhtInvalidPartitionException(p, "Adding entry to partition that is concurrently evicted " + - "[part=" + p + ", shouldBeMoving=" + loc.reload() + "]"); + throw new GridDhtInvalidPartitionException(p, "Adding entry to partition that is concurrently " + + "evicted [part=" + p + ", shouldBeMoving=" + loc.reload() + ", belongs=" + belongs + + ", topVer=" + topVer + ", curTopVer=" + this.topVer + "]"); if (loc == null) { - if (!treatAllPartAsLoc && !belongs) + if (!belongs) throw new GridDhtInvalidPartitionException(p, "Creating partition which does not belong to " + "local node (often may be caused by inconsistent 'key.hashCode()' implementation) " + "[part=" + p + ", topVer=" + topVer + ", this.topVer=" + this.topVer + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/71834092/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ----------------------------------------------------------------------
