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/07/29 10:00:50 UTC

[ignite] branch ignite-11704 updated (8294495 -> 8299a2c)

This is an automated email from the ASF dual-hosted git repository.

sboikov pushed a change to branch ignite-11704
in repository https://gitbox.apache.org/repos/asf/ignite.git.


    from 8294495  ignite-11704
     add 5b4d29c  IGNITE-11979 Add ability to set default parallelism of rebuild indexes in ignite system properties. This closes #6687.
     add ef55e4d  Revert "[ML] Hyper-parameter tuning via Genetic Algorithm (#6713)"
     add dd6abfa  IGNITE-12004 Check nanos precision in all tests, test UPDATE with millis precision, ignore UPDATE test with nanos precision - Fixes #6719.
     new 3435978  Merge remote-tracking branch 'remotes/origin/master' into ignite-11704
     new 8299a2c  ignite-11704

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ml/TrainingWithBinaryObjectExample.java        |   2 -
 .../clustering/CustomersClusterizationExample.java |   6 +-
 .../ml/clustering/GmmClusterizationExample.java    |   5 +-
 .../ml/clustering/KMeansClusterizationExample.java |   6 +-
 .../dataset/AlgorithmSpecificDatasetExample.java   |  35 +-
 .../ml/dataset/CacheBasedDatasetExample.java       |   3 +-
 .../IgniteModelDistributedInferenceExample.java    |  11 +-
 .../examples/ml/inference/ModelStorageExample.java |   2 -
 .../TensorFlowDistributedInferenceExample.java     |   2 -
 .../inference/TensorFlowLocalInferenceExample.java |   1 -
 .../TensorFlowThreadedInferenceExample.java        |   1 -
 .../examples/ml/knn/ANNClassificationExample.java  |   2 -
 .../examples/ml/knn/IrisClassificationExample.java |   6 +-
 .../examples/ml/knn/KNNClassificationExample.java  |  13 +-
 .../examples/ml/knn/KNNRegressionExample.java      |   6 +-
 .../multiclass/OneVsRestClassificationExample.java |   9 +-
 .../DiscreteNaiveBayesTrainerExample.java          |  10 +-
 .../GaussianNaiveBayesTrainerExample.java          |   6 +-
 .../ignite/examples/ml/nn/MLPTrainerExample.java   |   2 -
 .../ml/preprocessing/BinarizationExample.java      |   2 -
 .../examples/ml/preprocessing/ImputingExample.java |   2 -
 .../ml/preprocessing/MaxAbsScalerExample.java      |   4 +-
 .../ml/preprocessing/MinMaxScalerExample.java      |   4 +-
 .../ml/preprocessing/NormalizationExample.java     |   2 -
 .../ml/preprocessing/StandardScalerExample.java    |   4 +-
 .../linear/BostonHousePricesPredictionExample.java |   9 +-
 .../linear/LinearRegressionLSQRTrainerExample.java |  14 +-
 ...gressionLSQRTrainerWithMinMaxScalerExample.java |   9 +-
 .../linear/LinearRegressionSGDTrainerExample.java  |   6 +-
 .../BaggedLogisticRegressionSGDTrainerExample.java |  26 +-
 .../LogisticRegressionSGDTrainerExample.java       |   9 +-
 .../ml/selection/cv/CrossValidationExample.java    |  31 +-
 .../ml/selection/scoring/EvaluatorExample.java     |   6 +-
 .../selection/scoring/MultipleMetricsExample.java  |   6 +-
 .../selection/scoring/RegressionMetricExample.java |   6 +-
 .../split/TrainTestDatasetSplitterExample.java     |   9 +-
 ...eeClassificationTrainerSQLInferenceExample.java |   5 +-
 ...onTreeClassificationTrainerSQLTableExample.java |   5 +-
 .../ml/svm/SVMBinaryClassificationExample.java     |   6 +-
 .../DecisionTreeClassificationTrainerExample.java  |   5 +-
 .../tree/DecisionTreeRegressionTrainerExample.java |   2 -
 .../examples/ml/tree/FraudDetectionExample.java    |   9 +-
 .../GDBOnTreesClassificationTrainerExample.java    |   2 -
 .../GDBOnTreesRegressionTrainerExample.java        |   2 -
 .../RandomForestClassificationExample.java         |  18 +-
 .../RandomForestRegressionExample.java             |  15 +-
 .../ml/tutorial/Step_1_Read_and_Learn.java         |   5 +-
 .../examples/ml/tutorial/Step_2_Imputing.java      |   5 +-
 .../examples/ml/tutorial/Step_3_Categorial.java    |   7 +-
 .../Step_3_Categorial_with_One_Hot_Encoder.java    |   7 +-
 .../examples/ml/tutorial/Step_4_Add_age_fare.java  |   7 +-
 .../examples/ml/tutorial/Step_5_Scaling.java       |   7 +-
 .../ml/tutorial/Step_5_Scaling_with_Pipeline.java  |   5 +-
 .../ignite/examples/ml/tutorial/Step_6_KNN.java    |   5 +-
 .../ml/tutorial/Step_7_Split_train_test.java       |   6 +-
 .../ignite/examples/ml/tutorial/Step_8_CV.java     |  26 +-
 .../ml/tutorial/Step_8_CV_with_Param_Grid.java     |  30 +-
 .../Step_8_CV_with_Param_Grid_and_metrics.java     |  31 +-
 ...V_with_Param_Grid_and_metrics_and_pipeline.java |  30 +-
 .../ml/tutorial/Step_9_Scaling_With_Stacking.java  |  21 +-
 .../ml/tutorial/TutorialStepByStepExample.java     |  12 -
 .../hyperparametertuning/Step_10_RandomSearch.java | 198 ---------
 .../Step_11_Parallel_BrutForce_Search.java         | 202 ---------
 .../Step_12_Parallel_Random_Search.java            | 206 ---------
 .../Step_13_Genetic_Programming_Search.java        | 194 ---------
 ...tep_14_Parallel_Genetic_Programming_Search.java | 200 ---------
 .../ignite/examples/ml/util/DatasetHelper.java     |   2 -
 .../ParametricVectorGeneratorExample.java          |   1 -
 .../util/generators/StandardGeneratorsExample.java |   1 -
 .../generators/VectorGeneratorFamilyExample.java   |   1 -
 .../VectorGeneratorPrimitivesExample.java          |   1 -
 .../ml/xgboost/XGBoostModelParserExample.java      |   2 -
 .../org/apache/ignite/IgniteSystemProperties.java  |   9 +
 .../processors/cache/CacheGroupContext.java        |   7 +
 .../processors/cache/CacheMetricsImpl.java         |   6 +
 .../processors/cache/GridCacheContext.java         |   6 +
 .../processors/cache/GridCacheMapEntry.java        |   5 +
 .../cache/IgniteCacheOffheapManager.java           |   9 +
 .../cache/IgniteCacheOffheapManagerImpl.java       |  29 ++
 .../processors/cache/IncompleteCacheObject.java    |   3 +
 .../dht/topology/GridDhtLocalPartition.java        |  14 +-
 .../dht/topology/PartitionsEvictManager.java       |  18 +
 .../cache/persistence/CacheDataRowAdapter.java     |   4 +-
 .../query/schema/SchemaIndexCacheVisitorImpl.java  |  20 +-
 .../cache/CacheDeferredDeleteSanitySelfTest.java   |   6 +-
 .../visor/verify/ValidateIndexesClosure.java       |   2 +-
 .../IgniteCacheLockPartitionOnAffinityRunTest.java |   4 +-
 .../CacheQueryEntityWithDateTimeApiFieldsTest.java |  56 ++-
 .../query/h2/GridIndexRebuildSelfTest.java         |   2 +-
 .../GridIndexRebuildWithMvccEnabledSelfTest.java   |   2 +-
 .../util/GridCommandHandlerIndexingTest.java       |   2 +-
 .../parallelism/DefaultParallelismStrategy.java    |   6 -
 .../parallelism/NoParallelismStrategy.java         |   5 -
 .../parallelism/ParallelismStrategy.java           |  12 +-
 .../normalization/NormalizationTrainer.java        |   4 +-
 .../logistic/LogisticRegressionSGDTrainer.java     |  12 +-
 .../ml/selection/cv/AbstractCrossValidation.java   | 476 ---------------------
 .../ignite/ml/selection/cv/CrossValidation.java    | 408 ++++++++++++++++--
 .../ml/selection/cv/CrossValidationResult.java     |  31 +-
 .../ml/selection/cv/DebugCrossValidation.java      | 116 -----
 .../ml/selection/paramgrid/BruteForceStrategy.java |  28 --
 .../paramgrid/EvolutionOptimizationStrategy.java   | 142 ------
 .../paramgrid/HyperParameterTuningStrategy.java    |  28 --
 .../ignite/ml/selection/paramgrid/ParamGrid.java   |  48 +--
 .../selection/paramgrid/ParameterSetGenerator.java |   6 +-
 .../ml/selection/paramgrid/RandomStrategy.java     |  84 ----
 .../scoring/cursor/CacheBasedLabelPairCursor.java  |   4 +-
 .../scoring/cursor/LocalLabelPairCursor.java       |   4 +-
 .../ml/selection/scoring/metric/MetricValues.java  |   6 +-
 .../BinaryClassificationMetrics.java               |   4 +-
 .../metric/regression/RegressionMetrics.java       |  10 +-
 .../ml/tree/DecisionTreeClassificationTrainer.java |  18 -
 .../apache/ignite/ml/util/genetic/Chromosome.java  | 110 -----
 .../ignite/ml/util/genetic/CrossoverStrategy.java  |  35 --
 .../ignite/ml/util/genetic/GeneticAlgorithm.java   | 451 -------------------
 .../apache/ignite/ml/util/genetic/Population.java  | 159 -------
 .../ignite/ml/util/genetic/SelectionStrategy.java  |  32 --
 .../ignite/ml/util/genetic/package-info.java       |  23 -
 .../org/apache/ignite/ml/common/TrainerTest.java   |   7 +-
 .../preprocessing/encoding/EncoderTrainerTest.java |  16 +-
 .../ml/selection/cv/CrossValidationTest.java       | 303 +++----------
 .../org/apache/ignite/ml/util/UtilTestSuite.java   |   6 +-
 .../ml/util/genetic/GeneticAlgorithmTest.java      | 100 -----
 .../ignite/ml/util/genetic/PopulationTest.java     | 126 ------
 124 files changed, 881 insertions(+), 3701 deletions(-)
 delete mode 100644 examples/src/main/java/org/apache/ignite/examples/ml/tutorial/hyperparametertuning/Step_10_RandomSearch.java
 delete mode 100644 examples/src/main/java/org/apache/ignite/examples/ml/tutorial/hyperparametertuning/Step_11_Parallel_BrutForce_Search.java
 delete mode 100644 examples/src/main/java/org/apache/ignite/examples/ml/tutorial/hyperparametertuning/Step_12_Parallel_Random_Search.java
 delete mode 100644 examples/src/main/java/org/apache/ignite/examples/ml/tutorial/hyperparametertuning/Step_13_Genetic_Programming_Search.java
 delete mode 100644 examples/src/main/java/org/apache/ignite/examples/ml/tutorial/hyperparametertuning/Step_14_Parallel_Genetic_Programming_Search.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/AbstractCrossValidation.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/DebugCrossValidation.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/selection/paramgrid/BruteForceStrategy.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/selection/paramgrid/EvolutionOptimizationStrategy.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/selection/paramgrid/HyperParameterTuningStrategy.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/selection/paramgrid/RandomStrategy.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/util/genetic/Chromosome.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/util/genetic/CrossoverStrategy.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/util/genetic/GeneticAlgorithm.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/util/genetic/Population.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/util/genetic/SelectionStrategy.java
 delete mode 100644 modules/ml/src/main/java/org/apache/ignite/ml/util/genetic/package-info.java
 delete mode 100644 modules/ml/src/test/java/org/apache/ignite/ml/util/genetic/GeneticAlgorithmTest.java
 delete mode 100644 modules/ml/src/test/java/org/apache/ignite/ml/util/genetic/PopulationTest.java


[ignite] 01/02: Merge remote-tracking branch 'remotes/origin/master' into ignite-11704

Posted by sb...@apache.org.
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 3435978d4b336dd6800b10845f7ea9b3632ab9f4
Merge: 8294495 dd6abfa
Author: sboikov <sb...@apache.org>
AuthorDate: Sun Jul 28 15:40:16 2019 +0300

    Merge remote-tracking branch 'remotes/origin/master' into ignite-11704

 .../ml/TrainingWithBinaryObjectExample.java        |   2 -
 .../clustering/CustomersClusterizationExample.java |   6 +-
 .../ml/clustering/GmmClusterizationExample.java    |   5 +-
 .../ml/clustering/KMeansClusterizationExample.java |   6 +-
 .../dataset/AlgorithmSpecificDatasetExample.java   |  35 +-
 .../ml/dataset/CacheBasedDatasetExample.java       |   3 +-
 .../IgniteModelDistributedInferenceExample.java    |  11 +-
 .../examples/ml/inference/ModelStorageExample.java |   2 -
 .../TensorFlowDistributedInferenceExample.java     |   2 -
 .../inference/TensorFlowLocalInferenceExample.java |   1 -
 .../TensorFlowThreadedInferenceExample.java        |   1 -
 .../examples/ml/knn/ANNClassificationExample.java  |   2 -
 .../examples/ml/knn/IrisClassificationExample.java |   6 +-
 .../examples/ml/knn/KNNClassificationExample.java  |  13 +-
 .../examples/ml/knn/KNNRegressionExample.java      |   6 +-
 .../multiclass/OneVsRestClassificationExample.java |   9 +-
 .../DiscreteNaiveBayesTrainerExample.java          |  10 +-
 .../GaussianNaiveBayesTrainerExample.java          |   6 +-
 .../ignite/examples/ml/nn/MLPTrainerExample.java   |   2 -
 .../ml/preprocessing/BinarizationExample.java      |   2 -
 .../examples/ml/preprocessing/ImputingExample.java |   2 -
 .../ml/preprocessing/MaxAbsScalerExample.java      |   4 +-
 .../ml/preprocessing/MinMaxScalerExample.java      |   4 +-
 .../ml/preprocessing/NormalizationExample.java     |   2 -
 .../ml/preprocessing/StandardScalerExample.java    |   4 +-
 .../linear/BostonHousePricesPredictionExample.java |   9 +-
 .../linear/LinearRegressionLSQRTrainerExample.java |  14 +-
 ...gressionLSQRTrainerWithMinMaxScalerExample.java |   9 +-
 .../linear/LinearRegressionSGDTrainerExample.java  |   6 +-
 .../BaggedLogisticRegressionSGDTrainerExample.java |  26 +-
 .../LogisticRegressionSGDTrainerExample.java       |   9 +-
 .../ml/selection/cv/CrossValidationExample.java    |  31 +-
 .../ml/selection/scoring/EvaluatorExample.java     |   6 +-
 .../selection/scoring/MultipleMetricsExample.java  |   6 +-
 .../selection/scoring/RegressionMetricExample.java |   6 +-
 .../split/TrainTestDatasetSplitterExample.java     |   9 +-
 ...eeClassificationTrainerSQLInferenceExample.java |   5 +-
 ...onTreeClassificationTrainerSQLTableExample.java |   5 +-
 .../ml/svm/SVMBinaryClassificationExample.java     |   6 +-
 .../DecisionTreeClassificationTrainerExample.java  |   5 +-
 .../tree/DecisionTreeRegressionTrainerExample.java |   2 -
 .../examples/ml/tree/FraudDetectionExample.java    |   9 +-
 .../GDBOnTreesClassificationTrainerExample.java    |   2 -
 .../GDBOnTreesRegressionTrainerExample.java        |   2 -
 .../RandomForestClassificationExample.java         |  18 +-
 .../RandomForestRegressionExample.java             |  15 +-
 .../ml/tutorial/Step_1_Read_and_Learn.java         |   5 +-
 .../examples/ml/tutorial/Step_2_Imputing.java      |   5 +-
 .../examples/ml/tutorial/Step_3_Categorial.java    |   7 +-
 .../Step_3_Categorial_with_One_Hot_Encoder.java    |   7 +-
 .../examples/ml/tutorial/Step_4_Add_age_fare.java  |   7 +-
 .../examples/ml/tutorial/Step_5_Scaling.java       |   7 +-
 .../ml/tutorial/Step_5_Scaling_with_Pipeline.java  |   5 +-
 .../ignite/examples/ml/tutorial/Step_6_KNN.java    |   5 +-
 .../ml/tutorial/Step_7_Split_train_test.java       |   6 +-
 .../ignite/examples/ml/tutorial/Step_8_CV.java     |  26 +-
 .../ml/tutorial/Step_8_CV_with_Param_Grid.java     |  30 +-
 .../Step_8_CV_with_Param_Grid_and_metrics.java     |  31 +-
 ...V_with_Param_Grid_and_metrics_and_pipeline.java |  30 +-
 .../ml/tutorial/Step_9_Scaling_With_Stacking.java  |  21 +-
 .../ml/tutorial/TutorialStepByStepExample.java     |  12 -
 .../hyperparametertuning/Step_10_RandomSearch.java | 198 ---------
 .../Step_11_Parallel_BrutForce_Search.java         | 202 ---------
 .../Step_12_Parallel_Random_Search.java            | 206 ---------
 .../Step_13_Genetic_Programming_Search.java        | 194 ---------
 ...tep_14_Parallel_Genetic_Programming_Search.java | 200 ---------
 .../ignite/examples/ml/util/DatasetHelper.java     |   2 -
 .../ParametricVectorGeneratorExample.java          |   1 -
 .../util/generators/StandardGeneratorsExample.java |   1 -
 .../generators/VectorGeneratorFamilyExample.java   |   1 -
 .../VectorGeneratorPrimitivesExample.java          |   1 -
 .../ml/xgboost/XGBoostModelParserExample.java      |   2 -
 .../org/apache/ignite/IgniteSystemProperties.java  |   9 +
 .../query/schema/SchemaIndexCacheVisitorImpl.java  |  20 +-
 .../CacheQueryEntityWithDateTimeApiFieldsTest.java |  56 ++-
 .../parallelism/DefaultParallelismStrategy.java    |   6 -
 .../parallelism/NoParallelismStrategy.java         |   5 -
 .../parallelism/ParallelismStrategy.java           |  12 +-
 .../normalization/NormalizationTrainer.java        |   4 +-
 .../logistic/LogisticRegressionSGDTrainer.java     |  12 +-
 .../ml/selection/cv/AbstractCrossValidation.java   | 476 ---------------------
 .../ignite/ml/selection/cv/CrossValidation.java    | 408 ++++++++++++++++--
 .../ml/selection/cv/CrossValidationResult.java     |  31 +-
 .../ml/selection/cv/DebugCrossValidation.java      | 116 -----
 .../ml/selection/paramgrid/BruteForceStrategy.java |  28 --
 .../paramgrid/EvolutionOptimizationStrategy.java   | 142 ------
 .../paramgrid/HyperParameterTuningStrategy.java    |  28 --
 .../ignite/ml/selection/paramgrid/ParamGrid.java   |  48 +--
 .../selection/paramgrid/ParameterSetGenerator.java |   6 +-
 .../ml/selection/paramgrid/RandomStrategy.java     |  84 ----
 .../scoring/cursor/CacheBasedLabelPairCursor.java  |   4 +-
 .../scoring/cursor/LocalLabelPairCursor.java       |   4 +-
 .../ml/selection/scoring/metric/MetricValues.java  |   6 +-
 .../BinaryClassificationMetrics.java               |   4 +-
 .../metric/regression/RegressionMetrics.java       |  10 +-
 .../ml/tree/DecisionTreeClassificationTrainer.java |  18 -
 .../apache/ignite/ml/util/genetic/Chromosome.java  | 110 -----
 .../ignite/ml/util/genetic/CrossoverStrategy.java  |  35 --
 .../ignite/ml/util/genetic/GeneticAlgorithm.java   | 451 -------------------
 .../apache/ignite/ml/util/genetic/Population.java  | 159 -------
 .../ignite/ml/util/genetic/SelectionStrategy.java  |  32 --
 .../ignite/ml/util/genetic/package-info.java       |  23 -
 .../org/apache/ignite/ml/common/TrainerTest.java   |   7 +-
 .../preprocessing/encoding/EncoderTrainerTest.java |  16 +-
 .../ml/selection/cv/CrossValidationTest.java       | 303 +++----------
 .../org/apache/ignite/ml/util/UtilTestSuite.java   |   6 +-
 .../ml/util/genetic/GeneticAlgorithmTest.java      | 100 -----
 .../ignite/ml/util/genetic/PopulationTest.java     | 126 ------
 108 files changed, 784 insertions(+), 3679 deletions(-)


[ignite] 02/02: ignite-11704

Posted by sb...@apache.org.
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 8299a2cce28247a1ccb344e314884ea92f1e1b3c
Author: sboikov <sb...@apache.org>
AuthorDate: Sun Jul 28 18:10:02 2019 +0300

    ignite-11704
---
 .../processors/cache/CacheGroupContext.java        |  7 ++++++
 .../processors/cache/CacheMetricsImpl.java         |  6 +++++
 .../processors/cache/GridCacheContext.java         |  6 +++++
 .../processors/cache/GridCacheMapEntry.java        |  5 ++++
 .../cache/IgniteCacheOffheapManager.java           |  9 +++++++
 .../cache/IgniteCacheOffheapManagerImpl.java       | 29 ++++++++++++++++++++++
 .../processors/cache/IncompleteCacheObject.java    |  3 +++
 .../dht/topology/GridDhtLocalPartition.java        | 14 +++--------
 .../dht/topology/PartitionsEvictManager.java       | 18 ++++++++++++++
 .../cache/persistence/CacheDataRowAdapter.java     |  4 +--
 .../cache/CacheDeferredDeleteSanitySelfTest.java   |  6 ++---
 .../visor/verify/ValidateIndexesClosure.java       |  2 +-
 .../IgniteCacheLockPartitionOnAffinityRunTest.java |  4 +--
 .../query/h2/GridIndexRebuildSelfTest.java         |  2 +-
 .../GridIndexRebuildWithMvccEnabledSelfTest.java   |  2 +-
 .../util/GridCommandHandlerIndexingTest.java       |  2 +-
 16 files changed, 97 insertions(+), 22 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index cbdb3e8..3a7a445 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -1292,10 +1292,17 @@ public class CacheGroupContext {
         return hasAtomicCaches;
     }
 
+    /**
+     * @return {@code True} if need create temporary tombstones entries for removed data.
+     */
     public boolean supportsTombstone() {
         return !sharedGroup() && !hasAtomicCaches && !mvccEnabled && !isLocal();
     }
 
+    /**
+     * @param part Partition.
+     * @return {@code True} if need create tombstone for remove in given partition.
+     */
     public boolean createTombstone(@Nullable GridDhtLocalPartition part) {
         return part != null && supportsTombstone() && part.state() == GridDhtPartitionState.MOVING;
     }
diff --git 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
index e002037..4e993ef 100644
--- 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
@@ -1013,10 +1013,16 @@ public class CacheMetricsImpl implements CacheMetrics {
             delegate.addPutAndGetTimeNanos(duration);
     }
 
+    /**
+     * Increments tombstones counter.
+     */
     public void tombstoneCreated() {
         tombstones.increment();
     }
 
+    /**
+     * Decrements tombstones counter.
+     */
     public void tombstoneRemoved() {
         tombstones.decrement();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 5ac56db..959095c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -2372,6 +2372,9 @@ public class GridCacheContext<K, V> implements Externalizable {
         }
     }
 
+    /**
+     * Increments tombstones counter.
+     */
     public void tombstoneCreated() {
         GridCacheAdapter cache = this.cache;
 
@@ -2379,6 +2382,9 @@ public class GridCacheContext<K, V> implements Externalizable {
             cache.metrics0().tombstoneCreated();
     }
 
+    /**
+     * Decrements tombstones counter.
+     */
     public void tombstoneRemoved() {
         GridCacheAdapter cache = this.cache;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 08986a9..1133085 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -5711,6 +5711,11 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
         }
     }
 
+    /**
+     * @param row Data row.
+     * @return {@code True} if row expired.
+     * @throws IgniteCheckedException If failed.
+     */
     private boolean checkRowExpired(CacheDataRow row) throws IgniteCheckedException {
         assert row != null;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index 2272439..e068059 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -409,6 +409,11 @@ public interface IgniteCacheOffheapManager {
         GridDhtLocalPartition part
     ) throws IgniteCheckedException;
 
+    /**
+     * @param row Data row.
+     * @return {@code True} if give row is tombstone.
+     * @throws IgniteCheckedException If failed.
+     */
     public boolean isTombstone(@Nullable CacheDataRow row) throws IgniteCheckedException;
 
     /**
@@ -448,6 +453,7 @@ public interface IgniteCacheOffheapManager {
 
     /**
      * @param part Partition number.
+     * @param withTombstones {@code True} if should return tombstone entries.
      * @return Iterator for given partition.
      * @throws IgniteCheckedException If failed.
      */
@@ -959,6 +965,7 @@ public interface IgniteCacheOffheapManager {
             throws IgniteCheckedException;
 
         /**
+         * @param withTombstones {@code True} if should return tombstone entries.
          * @return Data cursor.
          * @throws IgniteCheckedException If failed.
          */
@@ -980,6 +987,7 @@ public interface IgniteCacheOffheapManager {
 
         /**
          * @param cacheId Cache ID.
+         * @param withTombstones {@code True} if should return tombstone entries.
          * @return Data cursor.
          * @throws IgniteCheckedException If failed.
          */
@@ -1021,6 +1029,7 @@ public interface IgniteCacheOffheapManager {
          * @param upper Upper bound.
          * @param x Implementation specific argument, {@code null} always means that we need to return full detached data row.
          * @param snapshot Mvcc snapshot.
+         * @param withTombstones {@code True} if should return tombstone entries.
          * @return Data cursor.
          * @throws IgniteCheckedException If failed.
          */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 6683237..8aa5514 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -632,6 +632,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
         dataStore(part).removeWithTombstone(cctx, key, ver, part);
     }
 
+    /** {@inheritDoc} */
     @Override public boolean isTombstone(CacheDataRow row) throws IgniteCheckedException {
         if (!grp.supportsTombstone())
             return false;
@@ -904,6 +905,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
      * @param dataIt Data store iterator.
      * @param mvccSnapshot Mvcc snapshot.
      * @param dataPageScanEnabled Flag to enable data page scan.
+     * @param withTombstones {@code True} if should return tombstone entries.
      * @return Rows iterator
      */
     private GridCloseableIterator<CacheDataRow> iterator(final int cacheId,
@@ -979,6 +981,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
     /**
      * @param cacheId Cache ID.
      * @param dataIt Data store iterator.
+     * @param withTombstones {@code True} if should return tombstone entries.
      * @return Rows iterator
      */
     private GridCloseableIterator<CacheDataRow> evictionSafeIterator(
@@ -2682,6 +2685,11 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
             /** */
             private CacheDataRow newRow;
 
+            /**
+             * @param cctx Context.
+             * @param key Key.
+             * @param ver Version.
+             */
             RemoveWithTombstone(GridCacheContext cctx, KeyCacheObject key, GridCacheVersion ver) {
                 this.cctx = cctx;
                 this.key = key;
@@ -2753,6 +2761,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
          * @param cctx Cache context.
          * @param key Key.
          * @param oldRow Removed row.
+         * @tombstoneRow Tombstone row (if tombstone was created for remove).
          * @throws IgniteCheckedException If failed.
          */
         private void finishRemove(GridCacheContext cctx,
@@ -2799,6 +2808,11 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
                 pendingTree().removex(new PendingRow(cacheId, oldRow.expireTime(), oldRow.link()));
         }
 
+        /**
+         * @param row Data row.
+         * @return {@code Null} if given row is tombstone, otherwise row itself.
+         * @throws IgniteCheckedException If null.
+         */
         @Nullable private CacheDataRow checkTombstone(@Nullable CacheDataRow row) throws IgniteCheckedException {
             return grp.offheap().isTombstone(row) ? null : row;
         }
@@ -2930,17 +2944,24 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
             return withTombstones ? cur : cursorSkipTombstone(cur);
         }
 
+        /**
+         * @param cur Cursor.
+         * @return Cursor skipping non-tombstone entries.
+         */
         private GridCursor<? extends CacheDataRow> cursorSkipEmpty(final GridCursor<? extends CacheDataRow> cur) {
             if (!grp.supportsTombstone())
                 return cur;
 
             return new GridCursor<CacheDataRow>() {
+                /** */
                 CacheDataRow next;
 
+                /** {@inheritDoc} */
                 @Override public boolean next() throws IgniteCheckedException {
                     while (cur.next()) {
                         CacheDataRow next = cur.get();
 
+                        // If request cursor with RowData.TOMBSTONES, then for non-tombtones all fields are null.
                         if (next.version() != null) {
                             this.next = next;
 
@@ -2951,19 +2972,26 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
                     return false;
                 }
 
+                /** {@inheritDoc} */
                 @Override public CacheDataRow get() {
                     return next;
                 }
             };
         }
 
+        /**
+         * @param cur Cursor.
+         * @return Cursor skipping tombstone entries.
+         */
         private GridCursor<? extends CacheDataRow> cursorSkipTombstone(final GridCursor<? extends CacheDataRow> cur) {
             if (!grp.supportsTombstone())
                 return cur;
 
             return new GridCursor<CacheDataRow>() {
+                /** */
                 CacheDataRow next;
 
+                /** {@inheritDoc} */
                 @Override public boolean next() throws IgniteCheckedException {
                     while (cur.next()) {
                         CacheDataRow next = cur.get();
@@ -2978,6 +3006,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
                     return false;
                 }
 
+                /** {@inheritDoc} */
                 @Override public CacheDataRow get() {
                     return next;
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IncompleteCacheObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IncompleteCacheObject.java
index 5f75125..6b21145 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IncompleteCacheObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IncompleteCacheObject.java
@@ -75,6 +75,9 @@ public class IncompleteCacheObject extends IncompleteObject<CacheObject> {
             super.readData(buf);
     }
 
+    /**
+     * @return Size of already read data.
+     */
     public int dataOffset() {
         return off;
     }
diff --git 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
index 9097463..d9b34c6 100644
--- 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
@@ -176,7 +176,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
     /** Set if topology update sequence should be updated on partition destroy. */
     private boolean updateSeqOnDestroy;
 
-    /** */
+    /** Set if tombstone was created in partition. */
     private volatile boolean tombstoneCreated;
 
     /**
@@ -626,8 +626,8 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
             assert partState == MOVING || partState == LOST;
 
             if (casState(state, OWNING)) {
-                if (grp.supportsTombstone())
-                    submitClearTombstones();
+                if (grp.supportsTombstone() && tombstoneCreated)
+                    grp.shared().evict().clearTombstonesAsync(grp, this);
 
                 return true;
             }
@@ -1136,14 +1136,6 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
     /**
      *
      */
-    private void submitClearTombstones() {
-        if (tombstoneCreated)
-            grp.shared().evict().clearTombstonesAsync(grp, this);
-    }
-
-    /**
-     *
-     */
     public void clearTombstones(EvictionContext evictionCtx) {
         final int stopCheckingFreq = 1000;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
index b2fd276..58db3c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
@@ -105,6 +105,10 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
         }
     }
 
+    /**
+     * @param grp Group context.
+     * @param part Partition to clear tombstones.
+     */
     public void clearTombstonesAsync(CacheGroupContext grp, GridDhtLocalPartition part) {
         if (addAsyncTask(grp, part, TaskType.CLEAR_TOMBSTONES)) {
             if (log.isDebugEnabled())
@@ -303,18 +307,29 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
      *
      */
     private class TasksStatistics {
+        /** */
         private int total;
 
+        /** */
         private int inProgress;
 
+        /**
+         *
+         */
         void taskAdded() {
             total++;
         }
 
+        /**
+         *
+         */
         void taskStarted() {
             inProgress++;
         }
 
+        /**
+         *
+         */
         void taskFinished() {
             total--;
             inProgress--;
@@ -358,6 +373,9 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
             return stop || sharedEvictionCtx.shouldStop();
         }
 
+        /**
+         * @param task Task.
+         */
         void taskAdded(AbstractEvictionTask task) {
             totalTasks.incrementAndGet();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
index c0a421e..a3b876d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
@@ -260,7 +260,7 @@ public class CacheDataRowAdapter implements CacheDataRow {
                         int itemId = itemId(nextLink);
 
                         incomplete = readIncomplete(incomplete, sharedCtx, coctx, pageMem,
-                                grpId, pageAddr, itemId, io, rowData, readCacheId, skipVer);
+                            grpId, pageAddr, itemId, io, rowData, readCacheId, skipVer);
 
                         if (incomplete == null || (rowData == KEY_ONLY && key != null))
                             return;
@@ -378,7 +378,7 @@ public class CacheDataRowAdapter implements CacheDataRow {
      * @param sharedCtx Cache shared context.
      * @param coctx Cache object context.
      * @param buf Buffer.
-     * @param keyOnly {@code true} If need to read only key object.
+     * @param rowData Required row data.
      * @param readCacheId {@code true} If need to read cache ID.
      * @param incomplete Incomplete object.
      * @param skipVer Whether version read should be skipped.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
index 69a19f4..8c2bd1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
@@ -51,10 +51,10 @@ public class CacheDeferredDeleteSanitySelfTest extends GridCommonAbstractTest {
         testDeferredDelete(LOCAL, TRANSACTIONAL, false, false);
 
         testDeferredDelete(PARTITIONED, ATOMIC, false, true);
-        testDeferredDelete(PARTITIONED, TRANSACTIONAL, false, true);
+        testDeferredDelete(PARTITIONED, TRANSACTIONAL, false, false);
 
         testDeferredDelete(REPLICATED, ATOMIC, false, true);
-        testDeferredDelete(REPLICATED, TRANSACTIONAL, false, true);
+        testDeferredDelete(REPLICATED, TRANSACTIONAL, false, false);
 
         // Near
         testDeferredDelete(LOCAL, ATOMIC, true, false);
@@ -64,7 +64,7 @@ public class CacheDeferredDeleteSanitySelfTest extends GridCommonAbstractTest {
         testDeferredDelete(PARTITIONED, TRANSACTIONAL, true, false);
 
         testDeferredDelete(REPLICATED, ATOMIC, true, true);
-        testDeferredDelete(REPLICATED, TRANSACTIONAL, true, true);
+        testDeferredDelete(REPLICATED, TRANSACTIONAL, true, false);
     }
 
     /**
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
index c7fa349..fd4fbc6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
@@ -446,7 +446,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
 
             long partSize = part.dataStore().fullSize();
 
-            GridIterator<CacheDataRow> it = grpCtx.offheap().partitionIterator(part.id());
+            GridIterator<CacheDataRow> it = grpCtx.offheap().partitionIterator(part.id(), false);
 
             Object consId = ignite.context().discovery().localNode().consistentId();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
index 23fe4ba..c6e0575 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
@@ -85,7 +85,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest extends IgniteCacheLockPa
 
         int cnt = 0;
 
-        GridCursor<? extends CacheDataRow> c = pOrgs.dataStore().cursor();
+        GridCursor<? extends CacheDataRow> c = pOrgs.dataStore().cursor(false);
 
         CacheObjectContext ctx = cacheAdapterOrg.context().cacheObjectContext();
 
@@ -120,7 +120,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest extends IgniteCacheLockPa
 
         int cnt = 0;
 
-        GridCursor<? extends CacheDataRow> c = pPers.dataStore().cursor();
+        GridCursor<? extends CacheDataRow> c = pPers.dataStore().cursor(false);
 
         CacheObjectContext ctx = cacheAdapterPers.context().cacheObjectContext();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildSelfTest.java
index b4bb9e9..71588d5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildSelfTest.java
@@ -160,7 +160,7 @@ public class GridIndexRebuildSelfTest extends DynamicIndexAbstractSelfTest {
         assertNotNull(icache);
 
         for (IgniteCacheOffheapManager.CacheDataStore store : icache.context().offheap().cacheDataStores()) {
-            GridCursor<? extends CacheDataRow> cur = store.cursor();
+            GridCursor<? extends CacheDataRow> cur = store.cursor(false);
 
             while (cur.next()) {
                 CacheDataRow row = cur.get();
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildWithMvccEnabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildWithMvccEnabledSelfTest.java
index 7211843..528e5b5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildWithMvccEnabledSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildWithMvccEnabledSelfTest.java
@@ -98,7 +98,7 @@ public class GridIndexRebuildWithMvccEnabledSelfTest extends GridIndexRebuildSel
         CacheObjectContext coCtx = icache.context().cacheObjectContext();
 
         for (IgniteCacheOffheapManager.CacheDataStore store : icache.context().offheap().cacheDataStores()) {
-            GridCursor<? extends CacheDataRow> cur = store.cursor();
+            GridCursor<? extends CacheDataRow> cur = store.cursor(false);
 
             while (cur.next()) {
                 CacheDataRow row = cur.get();
diff --git a/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java b/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
index a6f5456..2752617 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
@@ -374,7 +374,7 @@ public class GridCommandHandlerIndexingTest extends GridCommandHandlerAbstractTe
 
         GridDhtLocalPartition locPart = ctx.topology().localPartitions().get(0);
 
-        GridIterator<CacheDataRow> it = ctx.group().offheap().partitionIterator(locPart.id());
+        GridIterator<CacheDataRow> it = ctx.group().offheap().partitionIterator(locPart.id(), false);
 
         for (int i = 0; i < 500; i++) {
             if (!it.hasNextX()) {