You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2019/08/26 18:08:38 UTC
[ignite] 01/02: Merge remote-tracking branch
'remotes/origin/master' into ignite-11704
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-11704
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 323ef8e12684b0fc73452c152242fe4dc123e244
Merge: 1da9dc3 7e73098
Author: sboikov <sb...@apache.org>
AuthorDate: Mon Aug 26 20:11:40 2019 +0300
Merge remote-tracking branch 'remotes/origin/master' into ignite-11704
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
RELEASE_NOTES.txt | 13 +
.../examples/ml/knn/ANNClassificationExample.java | 3 +-
.../examples/ml/knn/IrisClassificationExample.java | 17 +-
.../examples/ml/knn/KNNClassificationExample.java | 13 +-
.../examples/ml/knn/KNNRegressionExample.java | 13 +-
.../selection/scoring/RegressionMetricExample.java | 12 +-
.../ignite/examples/ml/tutorial/Step_6_KNN.java | 11 +-
.../internal/jdbc2/JdbcStreamingSelfTest.java | 56 ++
.../ignite/jdbc/JdbcErrorsAbstractSelfTest.java | 55 ++
.../thin/JdbcThinStreamingAbstractSelfTest.java | 8 +
.../DiskPageCompressionIntegrationTest.java | 8 +-
.../main/java/org/apache/ignite/IgniteCluster.java | 15 +
.../org/apache/ignite/IgniteSystemProperties.java | 16 +-
.../org/apache/ignite/internal/IgniteFeatures.java | 9 +
.../org/apache/ignite/internal/IgniteKernal.java | 219 +++--
.../org/apache/ignite/internal/IgnitionEx.java | 14 +-
.../internal/TransactionMetricsMxBeanImpl.java | 4 +
.../internal/client/GridClientClusterState.java | 14 +
.../client/impl/GridClientClusterStateImpl.java | 22 +-
.../impl/connection/GridClientConnection.java | 22 +
.../connection/GridClientNioTcpConnection.java | 18 +
.../ClusterReadOnlyModeCheckedException.java | 78 ++
.../internal/cluster/DetachedClusterNode.java | 4 +-
.../internal/cluster/IgniteClusterAsyncImpl.java | 10 +
.../ignite/internal/cluster/IgniteClusterImpl.java | 58 +-
.../internal/commandline/BaselineCommand.java | 2 +-
...java => ClusterReadOnlyModeDisableCommand.java} | 47 +-
....java => ClusterReadOnlyModeEnableCommand.java} | 47 +-
.../ignite/internal/commandline/CommandList.java | 8 +-
.../ignite/internal/commandline/StateCommand.java | 13 +-
.../ignite/internal/commandline/TxCommands.java | 2 +-
.../ignite/internal/jdbc2/JdbcBatchUpdateTask.java | 9 +-
.../communication/AbstractTransmission.java | 111 +++
.../managers/communication/ChunkReceiver.java | 115 +++
.../managers/communication/FileReceiver.java | 129 +++
.../managers/communication/FileSender.java | 172 ++++
.../managers/communication/GridIoManager.java | 1019 +++++++++++++++++++-
.../communication/GridIoMessageFactory.java | 5 +
.../communication/SessionChannelMessage.java | 136 +++
.../communication/TransmissionHandler.java | 76 ++
.../managers/communication/TransmissionMeta.java | 197 ++++
.../managers/communication/TransmissionPolicy.java | 43 +
.../communication/TransmissionReceiver.java | 71 ++
.../managers/discovery/ClusterMetricsImpl.java | 57 +-
.../internal/metric/IoStatisticsHolderCache.java | 4 +-
.../internal/metric/IoStatisticsHolderIndex.java | 4 +-
.../internal/pagemem/wal/record/PageSnapshot.java | 5 -
.../affinity/GridAffinityAssignmentV2.java | 15 +-
.../affinity/HistoryAffinityAssignmentImpl.java | 7 +-
.../processors/cache/CacheGroupMetricsImpl.java | 4 +-
.../cache/CacheJoinNodeDiscoveryData.java | 7 +
.../processors/cache/CacheMetricsImpl.java | 138 +--
.../internal/processors/cache/CachesRegistry.java | 33 +-
.../processors/cache/ClusterCachesInfo.java | 70 +-
.../cache/DynamicCacheChangeRequest.java | 15 +-
.../processors/cache/GridCacheMapEntry.java | 16 +-
.../internal/processors/cache/GridCacheMvcc.java | 43 +-
.../processors/cache/GridCacheMvccCandidate.java | 41 +-
.../processors/cache/GridCacheMvccManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 1017 ++-----------------
.../processors/cache/GridCacheSharedManager.java | 8 +
.../cache/GridCacheSharedManagerAdapter.java | 15 +
.../internal/processors/cache/GridCacheUtils.java | 7 +
.../processors/cache/GridLocalConfigManager.java | 333 +++++++
.../cache/IgniteCacheOffheapManagerImpl.java | 35 +-
.../processors/cache/StateChangeRequest.java | 7 +
.../cache/ValidationOnNodeJoinUtils.java | 754 +++++++++++++++
.../cache/distributed/GridCacheTxFinishSync.java | 366 -------
.../distributed/GridDistributedCacheEntry.java | 18 +-
.../dht/GridDhtTopologyFutureAdapter.java | 6 +-
.../dht/GridDhtTxAbstractEnlistFuture.java | 1 -
.../distributed/dht/GridDhtTxPrepareFuture.java | 25 +-
.../dht/colocated/GridDhtColocatedLockFuture.java | 56 +-
.../dht/topology/GridDhtLocalPartition.java | 19 +-
.../dht/topology/GridDhtPartitionTopologyImpl.java | 23 +-
.../cache/distributed/near/GridNearCacheEntry.java | 2 +-
.../cache/distributed/near/GridNearLockFuture.java | 37 +-
.../distributed/near/GridNearTxEnlistFuture.java | 16 +-
.../distributed/near/GridNearTxFinishFuture.java | 3 -
.../cache/distributed/near/GridNearTxLocal.java | 6 -
.../near/GridNearTxQueryEnlistFuture.java | 21 +-
.../near/GridNearTxQueryResultsEnlistFuture.java | 16 +-
.../cache/local/GridLocalCacheEntry.java | 19 +-
.../cache/persistence/DataRegionMetricsImpl.java | 24 +-
.../cache/persistence/DataStorageMetricsImpl.java | 2 +-
.../GridCacheDatabaseSharedManager.java | 96 +-
.../cache/persistence/PageStoreWriter.java | 40 +
.../processors/cache/persistence/file/FileIO.java | 27 +
.../cache/persistence/file/FileIODecorator.java | 12 +
.../cache/persistence/file/RandomAccessFileIO.java | 17 +
...eWrite.java => DelayedDirtyPageStoreWrite.java} | 14 +-
.../pagemem/DelayedPageReplacementTracker.java | 19 +-
.../cache/persistence/pagemem/PageMemoryEx.java | 20 +-
.../cache/persistence/pagemem/PageMemoryImpl.java | 160 ++-
.../cache/persistence/tree/BPlusTree.java | 5 +-
.../cache/persistence/tree/io/PageIO.java | 39 +-
.../cache/persistence/wal/crc/FastCrc.java | 27 +-
.../wal/reader/StandaloneGridKernalContext.java | 9 +-
.../cache/query/GridCacheQueryMetricsAdapter.java | 20 +-
.../cache/query/IgniteQueryErrorCode.java | 6 +
.../cache/transactions/IgniteTransactionsImpl.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 4 +-
.../cache/transactions/IgniteTxHandler.java | 2 -
.../cache/transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 122 +--
.../transactions/TransactionMetricsAdapter.java | 196 +++-
.../cache/version/GridCacheVersionManager.java | 19 +
.../cluster/ChangeGlobalStateMessage.java | 23 +-
.../cluster/DiscoveryDataClusterState.java | 43 +-
.../cluster/GridClusterStateProcessor.java | 242 ++++-
.../cluster/IGridClusterStateProcessor.java | 32 +
.../processors/datastreamer/DataStreamerImpl.java | 21 +-
.../processors/metric/GridMetricManager.java | 13 +-
.../processors/metric/impl/HitRateMetric.java | 7 +-
.../processors/metric/impl/IntMetricImpl.java | 5 +
.../internal/processors/odbc/SqlStateCode.java | 8 +
.../processors/query/QueryIndexDescriptorImpl.java | 2 +-
.../internal/processors/rest/GridRestCommand.java | 9 +
.../processors/rest/GridRestProcessor.java | 2 +
.../message/GridClientReadOnlyModeRequest.java | 95 ++
.../GridChangeReadOnlyModeCommandHandler.java | 101 ++
.../rest/protocols/tcp/GridTcpRestNioListener.java | 21 +
.../GridRestReadOnlyChangeModeRequest.java} | 36 +-
.../processors/task/GridTaskProcessor.java | 26 +-
.../apache/ignite/internal/util/IgniteUtils.java | 18 +-
.../util/{ => collection}/BitSetIntSet.java | 112 ++-
.../internal/util/collection/ImmutableIntSet.java | 206 ++++
.../internal/util/collection/IntHashMap.java | 309 ++++++
.../ignite/internal/util/collection/IntMap.java | 85 ++
.../internal/util/collection/IntRWHashMap.java | 141 +++
.../ignite/internal/util/collection/IntSet.java} | 22 +-
.../ignite/internal/util/nio/GridNioServer.java | 21 +-
.../util/nio/GridSelectorNioSessionImpl.java | 21 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 29 +
.../ignite/mxbean/TransactionMetricsMxBean.java | 4 +
.../tcp/TcpCommunicationMetricsListener.java | 3 +
.../spi/communication/tcp/TcpCommunicationSpi.java | 203 +++-
.../tcp/internal/CommunicationListenerEx.java} | 24 +-
.../communication/tcp/internal/ConnectionKey.java | 8 +
.../ignite/spi/discovery/tcp/ServerImpl.java | 165 +++-
.../TcpDiscoveryClientMetricsUpdateMessage.java | 5 -
.../messages/TcpDiscoveryMetricsUpdateMessage.java | 5 -
.../messages/TcpDiscoveryStatusCheckMessage.java | 3 +-
.../eventstorage/memory/MemoryEventStorageSpi.java | 2 +-
.../org/apache/ignite/spi/metric/LongMetric.java | 10 -
.../ignite/spi/metric/MetricExporterSpi.java | 4 +-
...xExporterSpi.java => JmxMetricExporterSpi.java} | 2 +-
.../ignite/spi/metric/jmx/MetricRegistryMBean.java | 2 +-
.../ignite/transactions/TransactionMetrics.java | 3 +-
.../main/resources/META-INF/classnames.properties | 6 +-
modules/core/src/test/config/tests.properties | 4 +-
.../internal/GridTaskFailoverAffinityRunTest.java | 3 +-
.../ignite/internal/TaskNodeRestartTest.java | 3 +-
...anImplTest.java => TransactionMetricsTest.java} | 37 +-
.../commandline/CommandHandlerParsingTest.java | 253 ++---
.../internal/managers/GridManagerStopSelfTest.java | 4 +
.../GridIoManagerFileTransmissionSelfTest.java | 981 +++++++++++++++++++
.../internal/metric/IoStatisticsSelfTest.java | 13 +-
...rSpiTest.java => JmxMetricExporterSpiTest.java} | 24 +-
.../ignite/internal/metric/MetricsSelfTest.java | 39 +-
.../affinity/GridAffinityAssignmentV2Test.java | 4 +-
.../cache/CacheLockCandidatesThreadTest.java | 133 +++
.../cache/ClusterReadOnlyModeAbstractTest.java | 70 +-
.../processors/cache/ClusterReadOnlyModeTest.java | 204 ++--
.../cache/ClusterReadOnlyModeTestUtils.java | 185 ++++
.../cache/MvccCacheGroupMetricsTest.java | 9 +
.../distributed/CacheBaselineTopologyTest.java | 68 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 26 +-
...java => IgniteAbstractTxSuspendResumeTest.java} | 502 +++-------
.../IgniteOptimisticTxSuspendResumeTest.java | 643 +-----------
.../IgnitePessimisticTxSuspendResumeTest.java | 146 ++-
.../dht/GridCacheTxNodeFailureSelfTest.java | 84 ++
.../dht/IgniteCachePutRetryAbstractSelfTest.java | 2 +-
.../cache/mvcc/CacheMvccTransactionsTest.java | 45 +-
...niteBaselineAffinityTopologyActivationTest.java | 33 -
.../IgnitePdsCacheRebalancingAbstractTest.java | 59 +-
...itePdsCacheStartStopWithFreqCheckpointTest.java | 5 +-
.../IgnitePdsContinuousRestartTest.java | 35 +-
.../persistence/IgnitePdsCorruptedIndexTest.java | 16 +-
.../persistence/IgnitePdsDestroyCacheTest.java | 3 +
.../IgnitePdsExchangeDuringCheckpointTest.java | 7 +-
.../cache/persistence/IgnitePdsPageSizesTest.java | 2 +-
.../IgnitePdsRecoveryAfterFileCorruptionTest.java | 46 +-
.../persistence/db/IgnitePdsPageEvictionTest.java | 16 +-
...gnitePdsRebalancingOnNotStableTopologyTest.java | 9 +-
.../db/IgnitePdsWholeClusterRestartTest.java | 11 +-
.../db/checkpoint/CheckpointFreeListTest.java | 11 +-
.../IgnitePdsCacheDestroyDuringCheckpointTest.java | 5 +-
.../db/file/IgnitePdsCacheIntegrationTest.java | 14 +-
...CheckpointSimulationWithRealCpDisabledTest.java | 15 +-
.../wal/IgniteNodeStoppedDuringDisableWALTest.java | 45 +-
...eWalFlushMultiNodeFailoverAbstractSelfTest.java | 59 +-
.../db/wal/IgniteWalIteratorSwitchSegmentTest.java | 7 -
.../IgnitePageMemReplaceDelayedWriteUnitTest.java | 7 +-
.../persistence/pagemem/NoOpPageStoreManager.java | 5 +
.../cache/persistence/pagemem/NoOpWALManager.java | 5 +
.../persistence/pagemem/PageMemoryImplTest.java | 254 ++++-
.../cluster/ClusterReadOnlyModeNodeJoinTest.java | 76 ++
.../cluster/ClusterReadOnlyModeSelfTest.java | 328 +++++++
.../database/IgniteDbPutGetAbstractTest.java | 31 +-
.../util/collection/AbstractBaseIntMapTest.java | 248 +++++
.../util/{ => collection}/BitSetIntSetTest.java | 188 ++--
.../util/collection/ImmutableIntSetTest.java | 92 ++
.../internal/util/collection/IntHashMapTest.java | 126 +++
.../util/collection/IntRWHashMapTest.java} | 20 +-
.../GridMarshallerMappingConsistencyTest.java | 2 +-
...SessionSetJobAttributeWaitListenerSelfTest.java | 3 +-
.../discovery/tcp/IgniteMetricsOverflowTest.java | 171 ++++
.../tcp/TcpDiscoveryMultiThreadedTest.java | 9 +-
.../testframework/junits/GridAbstractTest.java | 7 +-
.../junits/multijvm/IgniteClusterProcessProxy.java | 12 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 9 +-
.../IgniteCacheMetricsSelfTestSuite.java | 4 +-
.../ignite/testsuites/IgniteCacheTestSuite9.java | 4 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 4 +
.../ignite/testsuites/IgnitePdsMvccTestSuite3.java | 23 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 5 +-
.../ignite/util/GridCommandHandlerSslTest.java | 3 +-
.../apache/ignite/util/GridCommandHandlerTest.java | 66 ++
.../processors/query/h2/IgniteH2Indexing.java | 12 +
.../processors/query/h2/SchemaManager.java | 6 +
.../processors/query/h2/database/H2Tree.java | 8 +-
.../processors/query/h2/database/H2TreeIndex.java | 28 +-
.../processors/query/h2/dml/DmlBatchSender.java | 13 +
.../processors/query/h2/opt/GridH2Table.java | 96 +-
...acheLockPartitionOnAffinityRunAbstractTest.java | 7 +-
.../cache/IgniteDynamicSqlRestoreTest.java | 2 +-
.../processors/cache/index/BasicIndexTest.java | 567 ++++++++++-
.../DynamicIndexAbstractConcurrentSelfTest.java | 7 +-
.../cache/index/DynamicIndexAbstractSelfTest.java | 17 +
.../mvcc/CacheMvccReplicatedSqlTxQueriesTest.java | 2 +-
.../cache/mvcc/CacheMvccSqlUpdateCountersTest.java | 2 +-
.../db/IgniteCacheGroupsWithRestartsTest.java | 118 ++-
.../persistence/db/IgniteTcBotInitNewPageTest.java | 18 +-
.../persistence/db/wal/IgniteWalRecoveryTest.java | 13 +-
.../cache/ttl/CacheTtlReadOnlyModeSelfTest.java | 123 +++
.../query/SqlPartOfComplexPkLookupTest.java | 116 +++
.../IgniteBinaryCacheQueryTestSuite2.java | 5 +-
.../IgniteCacheWithIndexingTestSuite.java | 2 +
.../cache/GridJtaTransactionManagerSelfTest.java | 26 +-
.../ignite/ml/clustering/kmeans/KMeansTrainer.java | 8 +-
.../boosting/GDBBinaryClassifierTrainer.java | 2 +-
.../DefaultLearningEnvironmentBuilder.java | 27 +-
.../ignite/ml/environment/LearningEnvironment.java | 7 +
.../ml/environment/LearningEnvironmentBuilder.java | 8 +
.../java/org/apache/ignite/ml/knn/KNNModel.java | 93 ++
.../ignite/ml/knn/KNNPartitionDataBuilder.java | 91 ++
.../java/org/apache/ignite/ml/knn/KNNTrainer.java | 139 +++
.../ignite/ml/knn/NNClassificationModel.java | 43 +-
.../ignite/ml/knn/ann/ANNClassificationModel.java | 22 +-
.../ml/knn/ann/ANNClassificationTrainer.java | 8 +-
.../apache/ignite/ml/knn/ann/ANNModelFormat.java | 21 +-
.../{classification => ann}/KNNModelFormat.java | 23 +-
.../knn/classification/KNNClassificationModel.java | 219 +++--
.../classification/KNNClassificationTrainer.java | 42 +-
.../ignite/ml/knn/classification/NNStrategy.java | 29 -
.../ml/knn/regression/KNNRegressionModel.java | 135 +--
.../ml/knn/regression/KNNRegressionTrainer.java | 37 +-
.../apache/ignite/ml/knn/{ => utils}/KNNUtils.java | 8 +-
.../ignite/ml/knn/utils/PointWithDistance.java | 61 ++
.../ignite/ml/knn/utils/PointWithDistanceUtil.java | 95 ++
.../ml/knn/utils/indices/ArraySpatialIndex.java | 70 ++
.../ml/knn/utils/indices/BallTreeSpatialIndex.java | 393 ++++++++
.../ml/knn/utils/indices/KDTreeSpatialIndex.java | 194 ++++
.../ignite/ml/knn/utils/indices/SpatialIndex.java} | 32 +-
.../ml/knn/utils/indices/SpatialIndexType.java} | 21 +-
.../utils/package-info.java} | 15 +-
.../ml/preprocessing/encoding/EncoderTrainer.java | 70 +-
.../ml/preprocessing/encoding/EncoderType.java | 5 +-
.../frequency/FrequencyEncoderPreprocessor.java | 89 ++
.../package-info.java} | 15 +-
.../ignite/ml/structures/LabeledVectorSet.java | 2 +-
.../LabeledDatasetPartitionDataBuilderOnHeap.java | 4 +-
.../ml/svm/SVMLinearClassificationTrainer.java | 6 +-
.../apache/ignite/ml/common/CollectionsTest.java | 14 +-
.../apache/ignite/ml/common/LocalModelsTest.java | 39 +-
.../ignite/ml/knn/ANNClassificationTest.java | 32 +-
.../ignite/ml/knn/KNNClassificationTest.java | 107 +-
.../apache/ignite/ml/knn/KNNRegressionTest.java | 95 +-
.../org/apache/ignite/ml/knn/KNNTestSuite.java | 7 +-
.../ml/knn/utils/ArraySpatialIndexTest.java} | 17 +-
.../ml/knn/utils/BallTreeSpatialIndexTest.java} | 17 +-
.../ml/knn/utils/KDTreeSpatialIndexTest.java} | 17 +-
.../ignite/ml/knn/utils/SpatialIndexTest.java | 104 ++
.../ml/preprocessing/PreprocessingTestSuite.java | 4 +-
.../preprocessing/encoding/EncoderTrainerTest.java | 31 +
.../encoding/FrequencyEncoderPreprocessorTest.java | 82 ++
.../BinaryClassificationEvaluatorTest.java | 19 +-
.../scoring/evaluator/RegressionEvaluatorTest.java | 14 +-
.../{knn => structures}/LabeledVectorSetTest.java | 6 +-
.../ignite/ml/structures/StructuresTestSuite.java | 3 +-
.../util/generators/DataStreamGeneratorTest.java | 6 +-
.../ApiParity/BinaryParityTest.cs | 3 +-
.../ApiParity/CacheAffinityParityTest.cs | 3 +-
.../ApiParity/CacheConfigurationParityTest.cs | 1 +
.../ApiParity/CacheMetricsParityTest.cs | 3 +-
.../ApiParity/CacheParityTest.cs | 3 +-
.../ClientConnectorConfigurationParityTest.cs | 3 +-
.../ApiParity/ClusterMetricsParityTest.cs | 3 +-
.../ApiParity/ClusterNodeParityTest.cs | 3 +-
.../ApiParity/ClusterParityTest.cs | 8 +-
.../ApiParity/ComputeParityTest.cs | 3 +-
.../ApiParity/DataRegionConfigurationParityTest.cs | 3 +-
.../ApiParity/DataRegionMetricsParityTest.cs | 3 +-
.../DataStorageConfigurationParityTest.cs | 3 +-
.../ApiParity/DataStorageMetricsParityTest.cs | 3 +-
.../ApiParity/EventsParityTest.cs | 3 +-
.../ApiParity/IgniteConfigurationParityTest.cs | 8 +-
.../ApiParity/IgniteParityTest.cs | 3 +-
.../ApiParity/MessagingParityTest.cs | 3 +-
.../ApiParity/ParityTest.cs | 8 +-
.../QueryEntityConfigurationParityTest.cs | 1 +
.../ApiParity/ServicesParityTest.cs | 3 +-
.../ApiParity/StreamerParityTest.cs | 1 +
.../ApiParity/TcpCommunicationSpiParityTest.cs | 1 +
.../ApiParity/TransactionMetricsParityTest.cs | 3 +-
.../ApiParity/TransactionsParityTest.cs | 1 +
.../Cache/PersistenceTest.cs | 28 +-
.../Query/Linq/CacheLinqTest.CompiledQuery.cs | 65 +-
.../Cache/Query/Linq/CacheLinqTest.Functions.cs | 7 +-
.../Apache.Ignite.Core/Apache.Ignite.Core.csproj | 4 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 6 -
.../IgniteConfigurationSection.xsd | 5 -
.../Apache.Ignite.Core/Metric/Package-Info.cs | 26 -
.../Impl/CacheQueryExpressionVisitor.cs | 22 +-
...ZookeeperDiscoveryCommunicationFailureTest.java | 2 +-
...perDiscoveryTopologyChangeAndReconnectTest.java | 4 +-
packaging/deb/changelog | 6 +
packaging/rpm/apache-ignite.spec | 5 +-
329 files changed, 14043 insertions(+), 4807 deletions(-)
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 4e993ef,eefcb19..81db757
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@@ -28,10 -27,11 +27,13 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState;
import org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore;
import org.apache.ignite.internal.processors.metric.MetricRegistry;
+import org.apache.ignite.internal.processors.metric.impl.HitRateMetric;
+import org.apache.ignite.internal.processors.metric.impl.LongAdderMetric;
import org.apache.ignite.internal.processors.metric.impl.AtomicLongMetric;
+ import org.apache.ignite.internal.processors.metric.impl.HitRateMetric;
import org.apache.ignite.internal.processors.metric.impl.MetricUtils;
+ import org.apache.ignite.internal.util.collection.ImmutableIntSet;
+ import org.apache.ignite.internal.util.collection.IntSet;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
index f098e99,a827f02fb..808d4b9
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
@@@ -61,8 -59,9 +61,10 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.query.GridQueryRowCacheCleaner;
import org.apache.ignite.internal.util.GridLongList;
+ import org.apache.ignite.internal.util.collection.IntMap;
+ import org.apache.ignite.internal.util.collection.IntRWHashMap;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridCursor;
import org.apache.ignite.internal.util.lang.GridIterator;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.LT;