[ignite] Git Push Summary

2018-07-10 Thread agura
Repository: ignite
Updated Tags:  refs/tags/2.6.0-rc1 [created] 1468c3fcb


[ignite] Git Push Summary

2018-07-10 Thread agura
Repository: ignite
Updated Tags:  refs/tags/2.6.0-rc1 [deleted] ef3c98745


[4/4] ignite git commit: IGNITE-8907: [ML] Using vectors in featureExtractor

2018-07-10 Thread chief
IGNITE-8907: [ML] Using vectors in featureExtractor

this closes #4293


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa56a584
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa56a584
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa56a584

Branch: refs/heads/master
Commit: fa56a584ca4ceec0480f8fce3acd5b60e23a2438
Parents: 45ea7eb
Author: Alexey Platonov 
Authored: Tue Jul 10 15:59:46 2018 +0300
Committer: Yury Babak 
Committed: Tue Jul 10 15:59:47 2018 +0300

--
 .../clustering/KMeansClusterizationExample.java |  3 +-
 .../AlgorithmSpecificDatasetExample.java|  3 +-
 .../ml/dataset/CacheBasedDatasetExample.java|  3 +-
 .../ml/dataset/LocalDatasetExample.java |  3 +-
 .../ml/knn/KNNClassificationExample.java| 10 ++---
 .../examples/ml/knn/KNNRegressionExample.java   |  3 +-
 .../examples/ml/nn/MLPTrainerExample.java   |  5 ++-
 .../ml/preprocessing/BinarizationExample.java   |  8 ++--
 .../ml/preprocessing/ImputingExample.java   |  8 ++--
 .../ImputingExampleWithMostFrequentValues.java  |  8 ++--
 .../ml/preprocessing/MinMaxScalerExample.java   | 11 ++---
 .../ml/preprocessing/NormalizationExample.java  |  9 ++--
 .../LinearRegressionLSQRTrainerExample.java |  3 +-
 ...ssionLSQRTrainerWithMinMaxScalerExample.java | 41 +-
 .../LinearRegressionSGDTrainerExample.java  | 10 ++---
 .../LogisticRegressionSGDTrainerSample.java | 10 ++---
 ...gressionMultiClassClassificationExample.java | 36 ++--
 .../ml/selection/cv/CrossValidationExample.java |  3 +-
 .../split/TrainTestDatasetSplitterExample.java  |  3 +-
 .../binary/SVMBinaryClassificationExample.java  | 10 ++---
 .../SVMMultiClassClassificationExample.java | 43 +++
 ...ecisionTreeClassificationTrainerExample.java |  6 +--
 .../DecisionTreeRegressionTrainerExample.java   |  6 +--
 .../GDBOnTreesClassificationTrainerExample.java | 45 ++--
 .../GRBOnTreesRegressionTrainerExample.java | 45 ++--
 .../RandomForestClassificationExample.java  |  6 +--
 .../RandomForestRegressionExample.java  |  6 +--
 .../ml/tutorial/Step_1_Read_and_Learn.java  |  4 +-
 .../examples/ml/tutorial/Step_2_Imputing.java   |  6 ++-
 .../examples/ml/tutorial/Step_3_Categorial.java |  5 ++-
 .../ml/tutorial/Step_4_Add_age_fare.java|  5 ++-
 .../examples/ml/tutorial/Step_5_Scaling.java|  9 ++--
 .../ignite/examples/ml/tutorial/Step_6_KNN.java |  9 ++--
 .../ml/tutorial/Step_7_Split_train_test.java|  9 ++--
 .../ignite/examples/ml/tutorial/Step_8_CV.java  | 11 ++---
 .../ml/tutorial/Step_9_Go_to_LogReg.java| 11 ++---
 .../ml/clustering/kmeans/KMeansTrainer.java |  2 +-
 .../ml/composition/BaggingModelTrainer.java | 15 ---
 .../boosting/GDBBinaryClassifierTrainer.java|  3 +-
 .../boosting/GDBRegressionTrainer.java  |  3 +-
 .../ml/composition/boosting/GDBTrainer.java |  9 ++--
 .../ignite/ml/dataset/DatasetFactory.java   | 25 +--
 .../builder/data/SimpleDatasetDataBuilder.java  | 13 +++---
 .../data/SimpleLabeledDatasetDataBuilder.java   | 13 +++---
 .../java/org/apache/ignite/ml/knn/KNNUtils.java |  3 +-
 .../KNNClassificationTrainer.java   |  3 +-
 .../ml/knn/regression/KNNRegressionTrainer.java |  3 +-
 .../java/org/apache/ignite/ml/math/Vector.java  |  9 
 .../org/apache/ignite/ml/nn/MLPTrainer.java | 11 +++--
 .../binarization/BinarizationPreprocessor.java  | 17 
 .../binarization/BinarizationTrainer.java   |  5 ++-
 .../StringEncoderPreprocessor.java  |  8 ++--
 .../stringencoder/StringEncoderTrainer.java |  3 +-
 .../imputing/ImputerPreprocessor.java   | 23 +-
 .../preprocessing/imputing/ImputerTrainer.java  | 40 -
 .../minmaxscaling/MinMaxScalerPreprocessor.java | 19 +
 .../minmaxscaling/MinMaxScalerTrainer.java  | 25 +--
 .../NormalizationPreprocessor.java  | 21 -
 .../normalization/NormalizationTrainer.java |  5 ++-
 .../linear/FeatureExtractorWrapper.java | 17 
 .../linear/LinearRegressionLSQRTrainer.java |  2 +-
 .../linear/LinearRegressionSGDTrainer.java  | 10 ++---
 .../binomial/LogisticRegressionSGDTrainer.java  |  8 ++--
 .../LogRegressionMultiClassTrainer.java |  3 +-
 .../ignite/ml/selection/cv/CrossValidation.java | 18 
 .../cursor/CacheBasedLabelPairCursor.java   | 11 +++--
 .../scoring/cursor/LocalLabelPairCursor.java|  9 ++--
 .../selection/scoring/evaluator/Evaluator.java  |  4 +-
 ...abeledDatasetPartitionDataBuilderOnHeap.java | 13 +++---
 .../SVMLinearBinaryClassificationTrainer.java   |  8 ++--
 ...VMLinearMultiClassClassificationTrainer.java |  7 +--
 .../ignite/ml/trainers/DatasetTrainer.java  | 11 ++---
 

[3/4] ignite git commit: IGNITE-8907: [ML] Using vectors in featureExtractor

2018-07-10 Thread chief
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java 
b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
index 95d54d8..142baca 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_6_KNN.java
@@ -24,6 +24,7 @@ import org.apache.ignite.Ignition;
 import org.apache.ignite.ml.knn.classification.KNNClassificationModel;
 import org.apache.ignite.ml.knn.classification.KNNClassificationTrainer;
 import org.apache.ignite.ml.knn.classification.KNNStrategy;
+import org.apache.ignite.ml.math.Vector;
 import org.apache.ignite.ml.math.functions.IgniteBiFunction;
 import 
org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
 import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
@@ -52,7 +53,7 @@ public class Step_6_KNN {
 
 IgniteBiFunction lbExtractor = 
(k, v) -> (double) v[1];
 
-IgniteBiFunction 
strEncoderPreprocessor = new StringEncoderTrainer()
+IgniteBiFunction 
strEncoderPreprocessor = new StringEncoderTrainer()
 .encodeFeature(1)
 .encodeFeature(6) // <--- Changed index here
 .fit(ignite,
@@ -60,21 +61,21 @@ public class Step_6_KNN {
 featureExtractor
 );
 
-IgniteBiFunction 
imputingPreprocessor = new ImputerTrainer()
+IgniteBiFunction 
imputingPreprocessor = new ImputerTrainer()
 .fit(ignite,
 dataCache,
 strEncoderPreprocessor
 );
 
 
-IgniteBiFunction 
minMaxScalerPreprocessor = new MinMaxScalerTrainer()
+IgniteBiFunction 
minMaxScalerPreprocessor = new MinMaxScalerTrainer()
 .fit(
 ignite,
 dataCache,
 imputingPreprocessor
 );
 
-IgniteBiFunction 
normalizationPreprocessor = new NormalizationTrainer()
+IgniteBiFunction 
normalizationPreprocessor = new NormalizationTrainer()
 .withP(1)
 .fit(
 ignite,

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
 
b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
index e8641c6..0d8fa67 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_7_Split_train_test.java
@@ -21,6 +21,7 @@ import java.io.FileNotFoundException;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.Ignition;
+import org.apache.ignite.ml.math.Vector;
 import org.apache.ignite.ml.math.functions.IgniteBiFunction;
 import 
org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
 import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
@@ -58,7 +59,7 @@ public class Step_7_Split_train_test {
 TrainTestSplit split = new 
TrainTestDatasetSplitter()
 .split(0.75);
 
-IgniteBiFunction 
strEncoderPreprocessor = new StringEncoderTrainer()
+IgniteBiFunction 
strEncoderPreprocessor = new StringEncoderTrainer()
 .encodeFeature(1)
 .encodeFeature(6) // <--- Changed index here
 .fit(ignite,
@@ -66,21 +67,21 @@ public class Step_7_Split_train_test {
 featureExtractor
 );
 
-IgniteBiFunction 
imputingPreprocessor = new ImputerTrainer()
+IgniteBiFunction 
imputingPreprocessor = new ImputerTrainer()
 .fit(ignite,
 dataCache,
 strEncoderPreprocessor
 );
 
 
-IgniteBiFunction 
minMaxScalerPreprocessor = new MinMaxScalerTrainer()
+IgniteBiFunction 
minMaxScalerPreprocessor = new MinMaxScalerTrainer()
 .fit(
 ignite,
 dataCache,
   

[1/4] ignite git commit: IGNITE-8907: [ML] Using vectors in featureExtractor

2018-07-10 Thread chief
Repository: ignite
Updated Branches:
  refs/heads/master 45ea7eb68 -> fa56a584c


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
--
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
index f83ae7c..e11a669 100644
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
+++ 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.ml.math.VectorUtils;
 import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
 import org.apache.ignite.ml.nn.performance.MnistMLPTestUtil;
 import org.apache.ignite.ml.tree.DecisionTreeClassificationTrainer;
@@ -83,7 +84,7 @@ public class DecisionTreeMNISTIntegrationTest extends 
GridCommonAbstractTest {
 DecisionTreeNode mdl = trainer.fit(
 ignite,
 trainingSet,
-(k, v) -> v.getPixels(),
+(k, v) -> VectorUtils.of(v.getPixels()),
 (k, v) -> (double) v.getLabel()
 );
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java
--
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java
 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java
index c9e9fb2..67456ea 100644
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java
+++ 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.ml.tree.performance;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.ignite.ml.math.VectorUtils;
 import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
 import org.apache.ignite.ml.nn.performance.MnistMLPTestUtil;
 import org.apache.ignite.ml.tree.DecisionTreeClassificationTrainer;
@@ -52,7 +53,7 @@ public class DecisionTreeMNISTTest {
 DecisionTreeNode mdl = trainer.fit(
 trainingSet,
 10,
-(k, v) -> v.getPixels(),
+(k, v) -> VectorUtils.of(v.getPixels()),
 (k, v) -> (double) v.getLabel()
 );
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java
--
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java
 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java
index 2b95d10..eab9152 100644
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java
+++ 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import org.apache.ignite.ml.composition.ModelOnFeaturesSubspace;
 import org.apache.ignite.ml.composition.ModelsComposition;
 import 
org.apache.ignite.ml.composition.predictionsaggregator.OnMajorityPredictionsAggregator;
+import org.apache.ignite.ml.math.VectorUtils;
 import org.apache.ignite.ml.tree.DecisionTreeConditionalNode;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -68,7 +69,7 @@ public class RandomForestClassifierTrainerTest {
 }
 
 RandomForestClassifierTrainer trainer = new 
RandomForestClassifierTrainer(4, 3, 5, 0.3, 4, 0.1);
-ModelsComposition model = trainer.fit(sample, parts, (k, v) -> k, (k, 
v) -> v);
+ModelsComposition model = trainer.fit(sample, parts, (k, v) -> 
VectorUtils.of(k), (k, v) -> v);
 model.getModels().forEach(m -> {
 assertTrue(m instanceof ModelOnFeaturesSubspace);
 assertTrue(((ModelOnFeaturesSubspace) m).getMdl() instanceof 
DecisionTreeConditionalNode);

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestRegressionTrainerTest.java
--
diff --git 

[2/4] ignite git commit: IGNITE-8907: [ML] Using vectors in featureExtractor

2018-07-10 Thread chief
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
--
diff --git 
a/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
 
b/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
index f555e09..8918450 100644
--- 
a/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
+++ 
b/modules/ml/src/main/java/org/apache/ignite/ml/selection/cv/CrossValidation.java
@@ -29,10 +29,10 @@ import 
org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetBuilder;
 import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
 import org.apache.ignite.ml.math.Vector;
 import org.apache.ignite.ml.math.functions.IgniteBiFunction;
-import org.apache.ignite.ml.selection.scoring.metric.Metric;
 import org.apache.ignite.ml.selection.scoring.cursor.CacheBasedLabelPairCursor;
-import org.apache.ignite.ml.selection.scoring.cursor.LocalLabelPairCursor;
 import org.apache.ignite.ml.selection.scoring.cursor.LabelPairCursor;
+import org.apache.ignite.ml.selection.scoring.cursor.LocalLabelPairCursor;
+import org.apache.ignite.ml.selection.scoring.metric.Metric;
 import org.apache.ignite.ml.selection.split.mapper.SHA256UniformMapper;
 import org.apache.ignite.ml.selection.split.mapper.UniformMapper;
 import org.apache.ignite.ml.trainers.DatasetTrainer;
@@ -66,7 +66,7 @@ public class CrossValidation, L, 
K, V> {
  * @return Array of scores of the estimator for each run of the cross 
validation.
  */
 public double[] score(DatasetTrainer trainer, Metric 
scoreCalculator, Ignite ignite,
-  IgniteCache upstreamCache, IgniteBiFunction featureExtractor,
+  IgniteCache upstreamCache, IgniteBiFunction featureExtractor,
   IgniteBiFunction lbExtractor, int cv) {
 return score(trainer, scoreCalculator, ignite, upstreamCache, (k, v) 
-> true, featureExtractor, lbExtractor,
 new SHA256UniformMapper<>(), cv);
@@ -87,7 +87,7 @@ public class CrossValidation, L, 
K, V> {
  */
 public double[] score(DatasetTrainer trainer, Metric 
scoreCalculator, Ignite ignite,
   IgniteCache upstreamCache, 
IgniteBiPredicate filter,
-  IgniteBiFunction featureExtractor, 
IgniteBiFunction lbExtractor, int cv) {
+  IgniteBiFunction featureExtractor, 
IgniteBiFunction lbExtractor, int cv) {
 return score(trainer, scoreCalculator, ignite, upstreamCache, filter, 
featureExtractor, lbExtractor,
 new SHA256UniformMapper<>(), cv);
 }
@@ -108,7 +108,7 @@ public class CrossValidation, L, 
K, V> {
  */
 public double[] score(DatasetTrainer trainer, Metric 
scoreCalculator,
 Ignite ignite, IgniteCache upstreamCache, IgniteBiPredicate filter,
-IgniteBiFunction featureExtractor, IgniteBiFunction lbExtractor,
+IgniteBiFunction featureExtractor, IgniteBiFunction lbExtractor,
 UniformMapper mapper, int cv) {
 
 return score(
@@ -146,7 +146,7 @@ public class CrossValidation, L, 
K, V> {
  * @return Array of scores of the estimator for each run of the cross 
validation.
  */
 public double[] score(DatasetTrainer trainer, Metric 
scoreCalculator, Map upstreamMap,
-  int parts, IgniteBiFunction 
featureExtractor, IgniteBiFunction lbExtractor, int cv) {
+  int parts, IgniteBiFunction 
featureExtractor, IgniteBiFunction lbExtractor, int cv) {
 return score(trainer, scoreCalculator, upstreamMap, (k, v) -> true, 
parts, featureExtractor, lbExtractor,
 new SHA256UniformMapper<>(), cv);
 }
@@ -165,7 +165,7 @@ public class CrossValidation, L, 
K, V> {
  * @return Array of scores of the estimator for each run of the cross 
validation.
  */
 public double[] score(DatasetTrainer trainer, Metric 
scoreCalculator, Map upstreamMap,
-  IgniteBiPredicate filter, int parts, 
IgniteBiFunction featureExtractor,
+  IgniteBiPredicate filter, int parts, 
IgniteBiFunction featureExtractor,
   IgniteBiFunction lbExtractor, int cv) {
 return score(trainer, scoreCalculator, upstreamMap, filter, parts, 
featureExtractor, lbExtractor,
 new SHA256UniformMapper<>(), cv);
@@ -186,7 +186,7 @@ public class CrossValidation, L, 
K, V> {
  * @return Array of scores of the estimator for each run of the cross 
validation.
  */
 public double[] score(DatasetTrainer trainer, Metric 
scoreCalculator, Map upstreamMap,
-  IgniteBiPredicate filter, int parts, 
IgniteBiFunction featureExtractor,
+  IgniteBiPredicate filter, int parts, 
IgniteBiFunction featureExtractor,
   

svn commit: r28028 - /dev/ignite/2.6.0-rc1/

2018-07-10 Thread agura
Author: agura
Date: Tue Jul 10 13:23:42 2018
New Revision: 28028

Log:
New RC 2.6.0-rc1: Binaries

Added:
dev/ignite/2.6.0-rc1/
dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip   (with props)
dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.asc   (with props)
dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.md5
dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.sha512
dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip   (with props)
dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.asc   (with props)
dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.md5
dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.sha512
dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip   (with props)
dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip.asc   (with props)
dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip.md5
dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip.sha512

Added: dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip
==
Binary file - no diff available.

Propchange: dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip
--
svn:mime-type = application/zip

Added: dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.asc
==
Binary file - no diff available.

Propchange: dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.md5
==
--- dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.md5 (added)
+++ dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.md5 Tue Jul 10 13:23:42 
2018
@@ -0,0 +1 @@
+eb2759b3ed2045a104ba78d871f93c2d  apache-ignite-2.6.0-src.zip

Added: dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.sha512
==
--- dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.sha512 (added)
+++ dev/ignite/2.6.0-rc1/apache-ignite-2.6.0-src.zip.sha512 Tue Jul 10 13:23:42 
2018
@@ -0,0 +1 @@
+f95c75d7cc65a11ec85483009ff0c4dae4441d68b65d904b0a0cb2c89a9ba2eb74a586fcc0ca6d88363b450e2b3b847cb98d914f0fcbfc2a9cbf4343cc468f6f
  apache-ignite-2.6.0-src.zip

Added: dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip
==
Binary file - no diff available.

Propchange: dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip
--
svn:mime-type = application/zip

Added: dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.asc
==
Binary file - no diff available.

Propchange: dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.md5
==
--- dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.md5 (added)
+++ dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.md5 Tue Jul 10 
13:23:42 2018
@@ -0,0 +1 @@
+4ab1689a61b2c48987ea2f1b95c4e7f9  apache-ignite-fabric-2.6.0-bin.zip

Added: dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.sha512
==
--- dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.sha512 (added)
+++ dev/ignite/2.6.0-rc1/apache-ignite-fabric-2.6.0-bin.zip.sha512 Tue Jul 10 
13:23:42 2018
@@ -0,0 +1 @@
+7dbd1442073557c5125e500e6a267243af8d72f73352fb67bea4b7ab448b8faa803aae03984d781fd96aa89736943b7540b73aa091055d466605ecbe940c32e3
  apache-ignite-fabric-2.6.0-bin.zip

Added: dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip
==
Binary file - no diff available.

Propchange: dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip
--
svn:mime-type = application/zip

Added: dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip.asc
==
Binary file - no diff available.

Propchange: dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/ignite/2.6.0-rc1/apache-ignite-hadoop-2.6.0-bin.zip.md5

svn commit: r28030 - in /dev/ignite/packages_2.6.0-rc1: ./ apache-ignite-2.6.0-1.noarch.rpm apache-ignite_2.6.0-1_all.deb

2018-07-10 Thread agura
Author: agura
Date: Tue Jul 10 13:27:00 2018
New Revision: 28030

Log:
New RC 2.6.0-rc1: Packages

Added:
dev/ignite/packages_2.6.0-rc1/
dev/ignite/packages_2.6.0-rc1/apache-ignite-2.6.0-1.noarch.rpm   (with 
props)
dev/ignite/packages_2.6.0-rc1/apache-ignite_2.6.0-1_all.deb   (with props)

Added: dev/ignite/packages_2.6.0-rc1/apache-ignite-2.6.0-1.noarch.rpm
==
Binary file - no diff available.

Propchange: dev/ignite/packages_2.6.0-rc1/apache-ignite-2.6.0-1.noarch.rpm
--
svn:mime-type = application/x-rpm

Added: dev/ignite/packages_2.6.0-rc1/apache-ignite_2.6.0-1_all.deb
==
Binary file - no diff available.

Propchange: dev/ignite/packages_2.6.0-rc1/apache-ignite_2.6.0-1_all.deb
--
svn:mime-type = application/vnd.debian.binary-package




ignite git commit: IGNITE-8869: cancel patch - Fixes #4337.

2018-07-10 Thread dpavlov
Repository: ignite
Updated Branches:
  refs/heads/master cb38b5d19 -> 45ea7eb68


IGNITE-8869: cancel patch - Fixes #4337.

Signed-off-by: Dmitriy Pavlov 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45ea7eb6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45ea7eb6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45ea7eb6

Branch: refs/heads/master
Commit: 45ea7eb68efeee803a1c550f4b556bea8e279f15
Parents: cb38b5d
Author: Ivan Daschinskiy 
Authored: Tue Jul 10 10:48:13 2018 +0300
Committer: Dmitriy Pavlov 
Committed: Tue Jul 10 10:48:13 2018 +0300

--
 .../dht/preloader/latch/ExchangeLatchManager.java | 14 +++---
 ...titionsExchangeOnDiscoveryHistoryOverflowTest.java |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/45ea7eb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
index 2573251..7e579cb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
@@ -242,15 +242,15 @@ public class ExchangeLatchManager {
 if (topVer == AffinityTopologyVersion.NONE)
 return discovery.aliveServerNodes();
 else {
-Collection histNodes = 
discovery.topology(topVer.topologyVersion());
+DiscoCache discoCache = discovery.discoCache(topVer);
 
-if (histNodes != null)
-return histNodes.stream().filter(n -> !CU.clientNode(n) && 
!n.isDaemon() && discovery.alive(n))
-.collect(Collectors.toSet());
+if (discoCache != null)
+return discoCache.aliveServerNodes();
 else
-throw new IgniteException("Topology " +topVer + " not found in 
discovery history "
-+ "; consider increasing IGNITE_DISCOVERY_HISTORY_SIZE 
property. Current value is "
-+ 
IgniteSystemProperties.getInteger(IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE,
 -1));
+throw new IgniteException("DiscoCache not found for topology "
++ topVer
++ "; consider increasing IGNITE_DISCOVERY_HISTORY_SIZE 
property. Current value is "
++ 
IgniteSystemProperties.getInteger(IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE,
 -1));
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/45ea7eb6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
index c0896c8..f9d6bf0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
@@ -122,6 +122,8 @@ public class 
PartitionsExchangeOnDiscoveryHistoryOverflowTest extends IgniteCach
  * @throws Exception In case of error.
  */
 public void testDynamicCacheCreation() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-8869 should fail if 
ignite-8869 reverts");
+
 for (int iter = 0; iter < 5; iter++) {
 log.info("Iteration: " + iter);