merge from master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b3b60d2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b3b60d2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b3b60d2 Branch: refs/heads/ignite-comm-balance-master Commit: 6b3b60d21ae19e8ab7cfd3d71367c1bab91352c1 Parents: 6abc0f4 d20b7f1 Author: Yakov Zhdanov <[email protected]> Authored: Mon Feb 6 17:10:18 2017 +0700 Committer: Yakov Zhdanov <[email protected]> Committed: Mon Feb 6 17:10:18 2017 +0700 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 35 +- assembly/LICENSE_HADOOP | 17 +- examples/schema-import/bin/h2-server.bat | 2 +- examples/schema-import/bin/h2-server.sh | 4 +- .../schema-import/bin/schema-import.properties | 2 +- .../src/main/resources/META-INF/licenses.txt.vm | 7 +- .../stream/camel/IgniteCamelStreamerTest.java | 4 +- .../cassandra/persistence/PojoKeyField.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 8 +- ...BinaryMarshallerInsertStatementSelfTest.java | 2 - ...cBinaryMarshallerMergeStatementSelfTest.java | 2 - .../internal/jdbc2/JdbcMetadataSelfTest.java | 2 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 3 +- .../apache/ignite/IgniteSystemProperties.java | 8 + .../org/apache/ignite/cache/QueryEntity.java | 1 - .../store/jdbc/CacheAbstractJdbcStore.java | 3 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +- .../ignite/internal/MarshallerContextImpl.java | 4 +- .../internal/binary/BinaryEnumObjectImpl.java | 4 +- .../internal/binary/BinaryMarshaller.java | 1 - .../impl/GridRouterCommandLineStartup.java | 4 +- .../cluster/ClusterNodeLocalMapImpl.java | 1 - .../internal/jdbc2/JdbcSqlFieldsQuery.java | 1 - .../ignite/internal/jdbc2/JdbcStatement.java | 2 - .../discovery/GridDiscoveryManager.java | 2 +- .../internal/mxbean/IgniteStandardMXBean.java | 12 +- .../cache/CacheEvictableEntryImpl.java | 4 +- .../processors/cache/CacheMetricsImpl.java | 10 +- .../processors/cache/GridCacheAdapter.java | 10 +- .../cache/GridCacheAffinityManager.java | 60 +-- .../processors/cache/GridCacheAtomicFuture.java | 3 +- .../processors/cache/GridCacheContext.java | 17 - .../cache/GridCacheDeploymentManager.java | 4 +- .../cache/GridCacheEvictionManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 13 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../processors/cache/GridCacheTtlManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 22 - .../processors/cache/QueryCursorImpl.java | 6 +- .../cache/affinity/GridCacheAffinityImpl.java | 16 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../CacheDataStructuresManager.java | 2 +- .../GridDistributedCacheAdapter.java | 3 +- .../distributed/GridDistributedCacheEntry.java | 3 - .../GridDistributedLockResponse.java | 1 - .../dht/GridClientPartitionTopology.java | 1 - .../dht/GridDhtAssignmentFetchFuture.java | 1 - .../distributed/dht/GridDhtCacheAdapter.java | 8 +- .../distributed/dht/GridDhtCacheEntry.java | 2 +- .../distributed/dht/GridDhtGetSingleFuture.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 7 +- .../dht/GridDhtPartitionTopology.java | 1 - .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 8 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 - .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 13 +- .../cache/distributed/dht/GridDhtTxRemote.java | 2 +- .../distributed/dht/GridDhtUnlockRequest.java | 3 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/GridPartitionedSingleGetFuture.java | 2 +- .../GridDhtAtomicAbstractUpdateFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 21 +- .../GridNearAtomicSingleUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 6 +- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../dht/preloader/GridDhtForceKeysFuture.java | 8 +- .../dht/preloader/GridDhtPartitionDemander.java | 16 +- .../dht/preloader/GridDhtPartitionMap2.java | 3 +- .../dht/preloader/GridDhtPartitionSupplier.java | 12 +- .../GridDhtPartitionsExchangeFuture.java | 13 +- .../dht/preloader/GridDhtPreloader.java | 4 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearCacheEntry.java | 6 +- .../distributed/near/GridNearGetFuture.java | 11 +- .../distributed/near/GridNearLockFuture.java | 2 +- ...arOptimisticSerializableTxPrepareFuture.java | 4 +- .../near/GridNearOptimisticTxPrepareFuture.java | 13 +- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTransactionalCache.java | 6 +- .../near/GridNearTxFinishFuture.java | 15 +- .../processors/cache/query/CacheQuery.java | 1 - .../cache/query/GridCacheQueryManager.java | 9 +- .../cache/query/GridCacheSqlQuery.java | 2 - .../continuous/CacheContinuousQueryHandler.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 2 +- .../cache/transactions/IgniteTxAdapter.java | 4 +- .../cache/transactions/IgniteTxEntry.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 3 +- .../cache/transactions/IgniteTxStateImpl.java | 1 - .../cache/transactions/TxDeadlockDetection.java | 2 +- .../cache/transactions/TxEntryValueHolder.java | 6 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../processors/clock/GridClockServer.java | 4 +- .../datastreamer/DataStreamProcessor.java | 3 +- .../datastreamer/DataStreamerImpl.java | 6 +- .../datastructures/GridCacheSetImpl.java | 2 +- .../datastructures/GridSetQueryPredicate.java | 2 +- .../processors/hadoop/HadoopClasspathUtils.java | 4 +- .../internal/processors/igfs/IgfsProcessor.java | 3 +- .../igfs/client/IgfsClientSizeCallable.java | 1 - .../processors/job/GridJobProcessor.java | 2 +- .../platform/PlatformAbstractBootstrap.java | 3 +- .../platform/PlatformConfigurationEx.java | 3 +- .../platform/cache/PlatformCache.java | 12 +- .../platform/utils/PlatformUtils.java | 2 +- .../processors/query/GridQueryProcessor.java | 2 +- .../resource/GridResourceProcessor.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 2 - .../string/GridRedisSetCommandHandler.java | 2 +- .../processors/task/GridTaskWorker.java | 2 +- .../internal/util/GridStripedSpinBusyLock.java | 2 +- .../ignite/internal/util/HostAndPortRange.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 3 +- .../ignite/internal/util/StripedExecutor.java | 2 +- .../visor/node/VisorIgfsConfiguration.java | 1 - .../ignite/lang/IgniteProductVersion.java | 2 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 1 - .../optimized/OptimizedClassDescriptor.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../tcp/TcpCommunicationSpiMBean.java | 1 - .../ignite/spi/discovery/tcp/ClientImpl.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 7 +- .../tcp/internal/TcpDiscoveryStatistics.java | 8 +- .../CacheJdbcPojoStoreAbstractSelfTest.java | 2 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 3 - .../internal/ClusterGroupHostsSelfTest.java | 6 +- .../ComputeJobCancelWithServiceSelfTest.java | 2 +- .../internal/GridContinuousTaskSelfTest.java | 4 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../IgniteClientReconnectApiExceptionTest.java | 6 +- ...niteClientReconnectFailoverAbstractTest.java | 4 +- .../GridDiscoveryManagerAttributesSelfTest.java | 4 +- .../BinaryObjectOffHeapUnswapTemporaryTest.java | 1 - .../cache/CacheAffinityCallSelfTest.java | 8 +- .../cache/CacheGetEntryAbstractTest.java | 2 +- .../CacheSerializableTransactionsTest.java | 6 +- .../CacheStartupInDeploymentModesTest.java | 7 +- .../cache/CacheStopAndDestroySelfTest.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 6 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 48 +- .../processors/cache/GridCacheMvccSelfTest.java | 208 ++++---- .../processors/cache/GridCacheStopSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 3 +- .../cache/GridCacheUtilsSelfTest.java | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 8 +- .../IgniteCacheConfigVariationsFullApiTest.java | 8 +- .../cache/IgniteCachePeekModesAbstractTest.java | 8 +- .../cache/IgniteCacheStoreCollectionTest.java | 1 - ...gniteTopologyValidatorAbstractCacheTest.java | 6 +- .../processors/cache/IgniteTxAbstractTest.java | 3 +- .../cache/IgniteTxConfigCacheSelfTest.java | 2 +- .../IgniteTxExceptionAbstractSelfTest.java | 3 +- .../IgniteTxMultiThreadedAbstractTest.java | 4 +- .../CacheKeepBinaryWithInterceptorTest.java | 1 - ...yAtomicEntryProcessorDeploymentSelfTest.java | 4 +- ...IgniteCacheAbstractExecutionContextTest.java | 2 - ...eAbstractDataStructuresFailoverSelfTest.java | 16 +- ...actQueueFailoverDataConsistencySelfTest.java | 2 +- .../IgniteLockAbstractSelfTest.java | 24 +- .../CacheGetFutureHangsSelfTest.java | 6 +- .../CacheLateAffinityAssignmentTest.java | 2 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 4 +- ...niteCacheClientNodeChangingTopologyTest.java | 20 +- ...teSynchronizationModesMultithreadedTest.java | 8 +- .../IgniteCacheCrossCacheTxFailoverTest.java | 6 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +- ...gniteCachePutRetryTransactionalSelfTest.java | 4 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 3 +- .../GridCacheReplicatedPreloadSelfTest.java | 1 - .../IgniteCacheExpiryPolicyAbstractTest.java | 4 +- ...ContinuousQueryFailoverAbstractSelfTest.java | 6 +- ...dCacheContinuousQueryNodesFilteringTest.java | 2 +- ...IgniteCacheContinuousQueryReconnectTest.java | 12 +- .../TxDeadlockDetectionNoHangsTest.java | 2 +- .../transactions/TxDeadlockDetectionTest.java | 2 +- .../TxOptimisticDeadlockDetectionTest.java | 2 +- .../TxPessimisticDeadlockDetectionTest.java | 2 +- ...ComputeJobExecutionErrorToLogManualTest.java | 4 +- .../datastreamer/DataStreamerImplSelfTest.java | 8 +- .../datastreamer/DataStreamerTimeoutTest.java | 6 +- .../processors/igfs/IgfsAbstractSelfTest.java | 32 +- .../processors/igfs/IgfsFileInfoSelfTest.java | 4 +- .../igfs/IgfsMetaManagerSelfTest.java | 3 +- .../igfs/IgfsModeResolverSelfTest.java | 10 +- .../igfs/benchmark/IgfsBenchmark.java | 4 +- .../cache/GridCacheCommandHandlerSelfTest.java | 1 - ...rviceDeploymentExceptionPropagationTest.java | 2 +- .../GridServiceProcessorStopSelfTest.java | 2 +- .../service/IgniteServiceReassignmentTest.java | 2 +- .../internal/util/IgniteUtilsSelfTest.java | 5 +- .../unsafe/GridOffheapSnapTreeSelfTest.java | 7 +- .../lang/GridMetadataAwareAdapterSelfTest.java | 4 +- .../p2p/GridP2PSameClassLoaderSelfTest.java | 14 +- .../platform/PlatformEventsWriteEventTask.java | 9 - .../local/GridLocalDeploymentSpiSelfTest.java | 6 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 8 +- .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 14 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 3 +- .../testframework/GridSpiTestContext.java | 5 +- .../ignite/testframework/IgniteTestSuite.java | 2 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 2 - ...essagingConfigVariationFullApiTestSuite.java | 4 +- .../ignite/util/mbeans/GridMBeanSelfTest.java | 10 +- .../CacheNoValueClassOnServerTestClient.java | 3 +- .../CacheConfigurationP2PTestClient.java | 3 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 4 +- .../hadoop/igfs/HadoopIgfsEndpoint.java | 4 +- .../HadoopBasicFileSystemFactoryDelegate.java | 2 +- .../hadoop/impl/igfs/HadoopIgfsInProc.java | 40 +- .../hadoop/impl/v2/HadoopV2Context.java | 3 +- .../taskexecutor/HadoopExecutorService.java | 6 +- .../child/HadoopChildProcessRunner.java | 10 +- .../hadoop/impl/HadoopErrorSimulator.java | 12 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 3 +- .../IgniteHadoopFileSystemClientSelfTest.java | 6 +- .../query/h2/GridH2ResultSetIterator.java | 3 +- .../processors/query/h2/IgniteH2Indexing.java | 14 +- .../query/h2/opt/GridH2IndexBase.java | 6 +- .../processors/query/h2/sql/DmlAstUtils.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../query/h2/twostep/msg/GridH2Geometry.java | 2 +- .../cache/BinarySerializationQuerySelfTest.java | 2 - .../CacheRandomOperationsMultithreadedTest.java | 4 +- .../ClientReconnectAfterClusterRestartTest.java | 4 +- .../GridCacheQueryIndexDisabledSelfTest.java | 20 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 3 +- ...eLockPartitionOnAffinityRunAbstractTest.java | 1 - ...PartitionOnAffinityRunAtomicCacheOpTest.java | 11 +- ...niteCacheLockPartitionOnAffinityRunTest.java | 51 +- ...titionOnAffinityRunWithCollisionSpiTest.java | 10 +- .../cache/IgniteCacheMergeSqlQuerySelfTest.java | 1 - .../cache/IgniteCacheOffheapEvictQueryTest.java | 4 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteCacheUpdateSqlQuerySelfTest.java | 2 +- ...niteCacheDistributedQueryCancelSelfTest.java | 4 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 4 +- .../IgniteSqlEntryCacheModeAgnosticTest.java | 140 +++++ .../query/IgniteSqlSchemaIndexingTest.java | 15 +- .../query/IgniteSqlSplitterSelfTest.java | 4 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 4 - .../IgniteCacheQuerySelfTestSuite.java | 2 + .../apache/ignite/stream/jms11/JmsStreamer.java | 4 +- .../ignite/stream/kafka/KafkaStreamer.java | 6 +- .../ignite/stream/kafka/TestKafkaBroker.java | 2 +- .../connect/IgniteSourceConnectorTest.java | 2 +- .../stream/mqtt/IgniteMqttStreamerTest.java | 4 +- .../BundleDelegatingClassLoader.java | 4 +- .../classloaders/ContainerSweepClassLoader.java | 4 +- modules/platforms/cpp/binary/Makefile.am | 1 + .../platforms/cpp/binary/include/Makefile.am | 3 + .../binary/binary_array_identity_resolver.h | 64 +++ .../ignite/binary/binary_identity_resolver.h | 61 +++ .../include/ignite/binary/binary_object.h | 5 +- .../binary/include/ignite/binary/binary_type.h | 16 - .../ignite/impl/binary/binary_object_impl.h | 9 +- .../ignite/impl/binary/binary_type_impl.h | 149 ++++++ .../ignite/impl/binary/binary_type_snapshot.h | 18 +- .../include/ignite/impl/binary/binary_utils.h | 175 +------ .../ignite/impl/binary/binary_writer_impl.h | 11 +- .../ignite/impl/interop/interop_output_stream.h | 10 +- .../cpp/binary/project/vs/binary.vcxproj | 4 + .../binary/project/vs/binary.vcxproj.filters | 12 + .../binary/binary_array_identity_resolver.cpp | 42 ++ .../cpp/binary/src/binary/binary_type.cpp | 4 +- .../src/impl/binary/binary_object_impl.cpp | 10 +- .../src/impl/binary/binary_type_manager.cpp | 12 +- .../cpp/binary/src/impl/binary/binary_utils.cpp | 80 +-- .../src/impl/binary/binary_writer_impl.cpp | 2 - .../src/impl/interop/interop_output_stream.cpp | 5 + modules/platforms/cpp/common/Makefile.am | 5 +- .../platforms/cpp/common/include/Makefile.am | 1 + .../include/ignite/common/platform_utils.h | 79 +++ .../cpp/common/include/ignite/common/utils.h | 251 +++++++-- .../os/linux/src/common/platform_utils.cpp | 81 +++ .../cpp/common/os/linux/src/common/utils.cpp | 148 ------ .../common/os/win/src/common/platform_utils.cpp | 88 ++++ .../cpp/common/os/win/src/common/utils.cpp | 154 ------ .../cpp/common/project/vs/common.vcxproj | 4 +- .../common/project/vs/common.vcxproj.filters | 12 +- .../platforms/cpp/common/src/common/utils.cpp | 153 ++++++ modules/platforms/cpp/core-test/Makefile.am | 4 +- .../cpp/core-test/config/cache-identity.xml | 121 +++++ .../cpp/core-test/config/cache-query.xml | 10 - .../cpp/core-test/include/ignite/test_utils.h | 63 +++ .../cpp/core-test/project/vs/core-test.vcxproj | 4 + .../project/vs/core-test.vcxproj.filters | 15 + .../src/binary_identity_resolver_test.cpp | 522 +++++++++++++++++++ .../cpp/core-test/src/binary_object_test.cpp | 20 +- .../cpp/core-test/src/binary_session_test.cpp | 4 +- .../cpp/core-test/src/cache_query_test.cpp | 149 +++--- .../platforms/cpp/core-test/src/cache_test.cpp | 43 +- .../cpp/core-test/src/continuous_query_test.cpp | 31 +- .../cpp/core-test/src/ignition_test.cpp | 19 +- .../cpp/core-test/src/interop_test.cpp | 42 +- .../platforms/cpp/core-test/src/test_utils.cpp | 79 +++ .../cpp/core-test/src/transactions_test.cpp | 23 +- .../platforms/cpp/core/src/impl/ignite_impl.cpp | 4 +- .../cpp/odbc-test/include/test_utils.h | 51 +- .../cpp/odbc-test/src/api_robustness_test.cpp | 35 +- .../src/application_data_buffer_test.cpp | 24 +- .../cpp/odbc-test/src/queries_test.cpp | 71 +-- .../src/sql_aggregate_functions_test.cpp | 1 + .../src/sql_date_time_functions_test.cpp | 26 +- .../src/sql_esc_convert_function_test.cpp | 4 +- .../src/sql_numeric_functions_test.cpp | 1 + .../cpp/odbc-test/src/sql_outer_join_test.cpp | 1 + .../odbc-test/src/sql_string_functions_test.cpp | 1 + .../odbc-test/src/sql_test_suite_fixture.cpp | 40 +- .../cpp/odbc-test/src/sql_types_test.cpp | 10 +- .../platforms/cpp/odbc-test/src/test_utils.cpp | 60 ++- .../odbc/src/app/application_data_buffer.cpp | 8 +- .../Cache/CacheAbstractTransactionalTest.cs | 168 +++--- .../Transactions/CacheTransactionManager.cs | 1 + .../spark/JavaStandaloneIgniteRDDSelfTest.java | 3 +- .../util/spring/IgniteSpringHelperImpl.java | 8 +- .../ignite/internal/GridFactorySelfTest.java | 2 +- .../internal/IgniteDynamicCacheConfigTest.java | 4 +- .../GridSpringTransactionManagerSelfTest.java | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 2 +- .../twitter/IgniteTwitterStreamerTest.java | 4 +- .../GridUriDeploymentFileProcessorSelfTest.java | 3 +- .../views/templates/agent-download.jade | 2 +- modules/web-console/web-agent/README.txt | 2 +- .../ignite/cache/websession/WebSessionV2.java | 2 +- .../internal/websession/WebSessionSelfTest.java | 6 +- .../apache/ignite/yarn/ApplicationMaster.java | 4 +- .../org/apache/ignite/yarn/IgniteProvider.java | 4 +- .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 2 +- 341 files changed, 3113 insertions(+), 2120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index 6fb8557,f8722d6..9284143 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@@ -836,10 -808,10 +836,10 @@@ public class GridCacheEvictionManager e return; // Don't track non-primary entries if evicts are synchronized. - if (!cctx.isNear() && evictSync && !cctx.affinity().primary(cctx.localNode(), e.partition(), topVer)) + if (!cctx.isNear() && evictSync && !cctx.affinity().primaryByPartition(cctx.localNode(), e.partition(), topVer)) return; - if (!busyLock.enterBusy()) + if (!enterBusy()) return; try { http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6b3b60d2/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java ----------------------------------------------------------------------
