[ignite] branch master updated: IGNITE-9981 Web Console: Implemented advanced footer for grid.

2019-04-10 Thread akuznetsov 
This is an automated email from the ASF dual-hosted git repository.

akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new 0d7070d  IGNITE-9981 Web Console: Implemented advanced footer for grid.
0d7070d is described below

commit 0d7070dbde1b354f5f14ae3f55f87c9c16be3ea7
Author: Ilya Borisov 
AuthorDate: Thu Apr 11 10:22:42 2019 +0700

IGNITE-9981 Web Console: Implemented advanced footer for grid.
---
 .../app/components/grid-showing-rows/component.js  |  6 +--
 .../app/components/grid-showing-rows/controller.js | 56 --
 .../app/components/grid-showing-rows/style.scss|  4 ++
 .../components/grid-showing-rows/template.tpl.pug  | 24 ++
 4 files changed, 83 insertions(+), 7 deletions(-)

diff --git 
a/modules/web-console/frontend/app/components/grid-showing-rows/component.js 
b/modules/web-console/frontend/app/components/grid-showing-rows/component.js
index 6cab628..ecb93d0 100644
--- a/modules/web-console/frontend/app/components/grid-showing-rows/component.js
+++ b/modules/web-console/frontend/app/components/grid-showing-rows/component.js
@@ -18,10 +18,10 @@
 import './style.scss';
 import controller from './controller';
 
+import templateUrl from './template.tpl.pug';
+
 export default {
-template: `
-
-`,
+templateUrl,
 controller,
 bindings: {
 gridApi: '<'
diff --git 
a/modules/web-console/frontend/app/components/grid-showing-rows/controller.js 
b/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
index 67c407c..b9e2e8e 100644
--- 
a/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
+++ 
b/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
@@ -18,12 +18,14 @@
 import _ from 'lodash';
 
 export default class {
-static $inject = ['$scope', 'uiGridConstants'];
+static $inject = ['$scope', 'IgniteCopyToClipboard', 
'uiGridExporterService', 'uiGridExporterConstants', 'IgniteMessages', 'CSV'];
 
-constructor($scope, uiGridConstants) {
-Object.assign(this, {$scope, uiGridConstants});
+constructor($scope, IgniteCopyToClipboard, uiGridExporterService, 
uiGridExporterConstants, IgniteMessages, CSV) {
+Object.assign(this, {$scope, IgniteCopyToClipboard, 
uiGridExporterService, uiGridExporterConstants, IgniteMessages, CSV});
 
 this.count = 0;
+this.visible = 0;
+this.selected = 0;
 }
 
 $onChanges(changes) {
@@ -33,15 +35,61 @@ export default class {
 this.gridApi.core.on.rowsVisibleChanged(this.$scope, () => {
 this.applyValues();
 });
+this.gridApi.selection.on.rowSelectionChanged(this.$scope, () => 
this.updateSelectedCount());
+this.gridApi.selection.on.rowSelectionChangedBatch(this.$scope, () 
=> this.updateSelectedCount());
 }
 }
 
+updateSelectedCount() {
+this.selected = this.gridApi.selection.getSelectedCount();
+}
+
 applyValues() {
 if (!this.gridApi.grid.rows.length) {
 this.count = 0;
+this.visible = 0;
+this.selected = 0;
 return;
 }
 
-this.count = _.sumBy(this.gridApi.grid.rows, (row) => 
Number(row.visible));
+this.count = this.gridApi.grid.rows.length;
+this.visible = _.sumBy(this.gridApi.grid.rows, (row) => 
Number(row.visible));
+this.updateSelectedCount();
+}
+
+copyToClipBoard() {
+if (this.count === 0 || !this.gridApi) {
+this.IgniteMessages.showError('No data to be copied');
+return;
+}
+
+const data = [];
+const grid = this.gridApi.grid;
+grid.options.exporterSuppressColumns = [];
+const exportColumnHeaders = 
this.uiGridExporterService.getColumnHeaders(grid, 
this.uiGridExporterConstants.VISIBLE);
+
+grid.rows.forEach((row) => {
+if (!row.visible)
+return;
+
+const values = [];
+
+exportColumnHeaders.forEach((exportCol) => {
+const col = grid.columns.find(({ field }) => field === 
exportCol.name);
+
+if (!col || !col.visible || col.colDef.exporterSuppressExport 
=== true)
+return;
+
+const value = grid.getCellValue(row, col);
+
+values.push({ value });
+});
+
+data.push(values);
+});
+
+const csvContent = 
this.uiGridExporterService.formatAsCsv(exportColumnHeaders, data, 
this.CSV.getSeparator());
+
+this.IgniteCopyToClipboard.copy(csvContent);
 }
 }
diff --git 
a/modules/web-console/frontend/app/components/grid-showing-rows/style.scss 
b/modules/web-console/frontend/app/components/grid-showing-rows/style.scss
index a37f1b5..5893a08 100644
---

[ignite] branch master updated: IGNITE-11716 Web console: Fixed typo in template for "Eviction mode".

2019-04-10 Thread akuznetsov 
This is an automated email from the ASF dual-hosted git repository.

akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new e6f7dad  IGNITE-11716 Web console: Fixed typo in template for 
"Eviction mode".
e6f7dad is described below

commit e6f7dad846881722654285735fffa27c5ab007d6
Author: Alexey Kuznetsov 
AuthorDate: Thu Apr 11 10:05:43 2019 +0700

IGNITE-11716 Web console: Fixed typo in template for "Eviction mode".
---
 .../components/cluster-edit-form/templates/memory.pug  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
 
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
index cfdeb98..7016854 100644
--- 
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
+++ 
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
@@ -165,11 +165,11 @@ ng-show='$ctrl.available(["2.0.0", "2.3.0"])'
 model: '$item.pageEvictionMode',
 name: 
'"MemoryPolicyPageEvictionMode"',
 placeholder: 'DISABLED',
-options: '[\
-{value: "DISABLED", label: 
"DISABLED"},\
-{value: "RANDOM_LRU", label: 
"RANDOM_LRU"},\
-[value: "RANDOM_2_LRU", label: 
"RANDOM_2_LRU"}\
-]',
+options: `[
+{value: "DISABLED", label: 
"DISABLED"},
+{value: "RANDOM_LRU", label: 
"RANDOM_LRU"},
+{value: "RANDOM_2_LRU", label: 
"RANDOM_2_LRU"}
+]`,
 tip: 'An algorithm for memory 
pages eviction\
  \
 DISABLED - Eviction is 
disabled\

[ignite] branch ignite-invokeAll updated (b60cf57 -> 2251633)

2019-04-10 Thread sboikov 
This is an automated email from the ASF dual-hosted git repository.

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


from b60cf57  invokeAll
 add 6ca2476  IGNITE-11636 Web console: Fixed cluster switch logic. #6352
 add 95c6c28  IGNITE-11245 Replace unused IGNITE_BINARY_META_UPDATE_TIMEOUT 
parameter. - Fixes #6130.
 add 9f51dc7  IGNITE-10949 Fix NPE in 
org.apache.ignite.internal.MarshallerContextImpl.CombinedMap - Fixes #5834.
 add a0a15d6  IGNITE-11449: [ML] Umbrella: API for Feature/Label extracting 
(part 1)
 add 70f952c  IGNITE-10997 Fixed @deprecated tag in javadoc
 add 8abb80c  IGNITE-11552: ODBC: Fixed quoted schema handling. This closes 
#6348.
 add 4f5732b  IGNITE-11524: JDBC Thin Driver: fixed statement leak in 
connections. This closes #6265.
 add fecfa26  IGNITE-11638 Web console: Fixed 'Explain query' logic.
 add 2fe45c7  Merge remote-tracking branch 'origin/master'
 add 30a3d23  IGNITE-11605 Recheck metadata difference after put pending 
future - Fixes #6324.
 add 521fbc9  IGNITE-10138 Provide description for operations of 
org.apache.ignite.mxbean.TransactionMetricsMxBean - Fixes #5817.
 add 5f50ada  IGNITE-9812 Discovery tests with expired certificate - Fixes 
#6278.
 add 2ec46c3  IGNITE-11299 Avoid busy wait on processWrite during SSL 
handshake - Fixes #6093.
 add 9a31246  IGNITE-11086 IGNITE_REST_SECURITY_TOKEN_TIMEOUT parameter is 
set in deciseconds instead of seconds - Fixes #5936.
 add ae5d5bf  IGNITE-10900 Print a warning if consistent ID is not set for 
persistent-enabled cluster - Fixes #6145.
 add fd394d8  IGNITE-11127 Handling GridDhtInvalidPartitionException by 
GridCacheTtlManager - Fixes #6338.
 add 18d20a6  IGNITE-8223 GridNearTxLocal.clearPrepareFuture does 
effectively nothing - Fixes #5984.
 add 51ab35f  IGNITE-11631 Fix NPE on server node start and persistence - 
Fixes #6344.
 add f2229b1  IGNITE-11011 Initialize grid disco data components at the end 
of node join process - Fixes #6009.
 add 26f15b8  IGNITE-11646: SQL: Fixed failing H2IndexesSystemViewTest. 
This closes #6361.
 add 4c3c2e5  IGNITE-11431: SQL: Added "SCHEMAS" system view. This closes 
#6237.
 add 9dab4e4  IGNITE-11634: SQL: Fixed anonymous class handling in 
DmlStatementsProcessor. This closes #6349.
 add ab57fbc  IGNITE-11645 Web Console: Fixed failing e2e test.
 add 35a93c7  IGNITE-11536 Add information about possible long GC pause to 
checkpoint started message. - Fixes #6276.
 add af0ad38  IGNITE-11536 Unused imports fix
 add 2fd6580  IGNITE-11135 Web Console: Fixed incorrect time format in the 
chart's tooltip.
 add 9cc6164  IGNITE-11493 Fix test 
CheckpointFreeListTest#testFreeListRestoredCorrectly always fails in 
DiskCompression suite - Fixes #6327.
 add 8d8df72  IGNITE-8376 Cluster activation events added - Fixes #6235.
 add 01c45aa  IGNITE-11259 Web Console: Added missing "enumValues" to 
binary configuration.
 add 5aa1481  IGNITE-10214 Web Console: Improved support for JDBC drivers 
for project generation.
 add 924139d  IGNITE-11643 Optimize GC pressure on 
GridDhtPartitionTopologyImpl#updateRebalanceVersion - Fixes #6354.
 add 7ddf776  IGNITE-9497: [ML] Add Pipeline support to Cross-Validation 
process
 add 73361b6  IGNITE-11598 Added ability to have different rebalance thread 
pool size on different nodes in cluster - Fixes #6357.
 add e2c198d  IGNITE-11465 Multiple client leave/join events may wipe 
affinity assignment history and cause transactions fail - Fixes #6217.
 add 1bf68b0  IGNITE-11655: [ML] OneHotEncoder returns more columns than 
expected (#6376)
 add 9a9c817  IGNITE-11606 Fix index update after index.bin manual removal 
- Fixes #6325.
 add 963a40b  IGNITE-11143: SQL: Improved printout of long-running queries. 
This closes #6353.
 add 70b9e0e  IGNITE-7664: SQL: Throw better error messages for unsupported 
SQL keywords and features. This closes #6138.
 add a309335  IGNITE-11660 Choose correct closure in 
DmlStatementsProcessorTest, more tests - Fixes #6379.
 add a1151a7  IGNITE-11599 Thin client to find valid node for connection 
from the configuration list - Fixes #6368.
 add 0ce456d  IGNITE-11411 Remove tearDown, setUp from 
JUnit3TestLegacySupport (#6227)
 add 94cd19b  IGNITE-11599 Fix test licence header.
 add 27ea976  IGNITE-10104: MVCC: Fixed SFU for REPLICATED caches. This 
closes #6141.
 add 4daa681  IGNITE-11629 Make sure Cassandra driver dependencies present 
in redistributable - Fixes #6375.
 add db38352  IGNITE-11654: [ML] Memory leak in KNNClassificationModel 
(#6392)
 add 003c41e  IGNITE-11647: [ML] ML Vectors should work with all 
Serializable objects besides double
 add 3aa9167  IGNITE-11416 Added DistributedMetaStorage improvements - 
Fixes #6190.
 add 6e36f5c  IGNITE-11569 Enable baseline auto-adjust

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

2019-04-10 Thread sboikov 
This is an automated email from the ASF dual-hosted git repository.

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

commit 22516334e3d7f83cc6cdb0efa96727102182a32e
Merge: b60cf57 b722305
Author: sboikov 
AuthorDate: Wed Apr 10 22:28:48 2019 +0300

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

 .../datagrid/CacheClientBinaryQueryExample.java|  133 +-
 .../examples/datagrid/CacheQueryExample.java   |3 +-
 .../starschema/CacheStarSchemaExample.java |   25 +-
 .../ml/TrainingWithBinaryObjectExample.java|   32 +-
 .../clustering/CustomersClusterizationExample.java |  140 +
 .../ml/clustering/GmmClusterizationExample.java|   92 +-
 .../ml/clustering/KMeansClusterizationExample.java |   62 +-
 .../dataset/AlgorithmSpecificDatasetExample.java   |  101 +-
 .../ml/dataset/CacheBasedDatasetExample.java   |   31 +-
 .../IgniteModelDistributedInferenceExample.java|   76 +-
 .../spark/LogRegFromSparkThroughPMMLExample.java   |   33 +-
 .../modelparser/DecisionTreeFromSparkExample.java  |   55 +-
 .../DecisionTreeRegressionFromSparkExample.java|   62 +-
 .../spark/modelparser/GBTFromSparkExample.java |   51 +-
 .../modelparser/GBTRegressionFromSparkExample.java |   62 +-
 .../spark/modelparser/KMeansFromSparkExample.java  |   62 +-
 .../LinearRegressionFromSparkExample.java  |   62 +-
 .../spark/modelparser/LogRegFromSparkExample.java  |   49 +-
 .../modelparser/RandomForestFromSparkExample.java  |   51 +-
 .../RandomForestRegressionFromSparkExample.java|   62 +-
 .../spark/modelparser/SVMFromSparkExample.java |   51 +-
 .../examples/ml/knn/ANNClassificationExample.java  |  100 +-
 .../examples/ml/knn/IrisClassificationExample.java |   93 +
 .../examples/ml/knn/KNNClassificationExample.java  |   43 +-
 .../examples/ml/knn/KNNRegressionExample.java  |   46 +-
 .../multiclass/OneVsRestClassificationExample.java |  187 +-
 .../DiscreteNaiveBayesTrainerExample.java  |   52 +-
 .../GaussianNaiveBayesTrainerExample.java  |   49 +-
 .../ignite/examples/ml/nn/MLPTrainerExample.java   |  122 +-
 .../ml/preprocessing/BinarizationExample.java  |   34 +-
 .../examples/ml/preprocessing/ImputingExample.java |   38 +-
 .../ImputingWithMostFrequentValuesExample.java |   36 +-
 .../ml/preprocessing/MaxAbsScalerExample.java  |   34 +-
 .../ml/preprocessing/MinMaxScalerExample.java  |   34 +-
 .../ml/preprocessing/NormalizationExample.java |   36 +-
 .../ml/preprocessing/StandardScalerExample.java|   34 +-
 .../linear/BostonHousePricesPredictionExample.java |  113 +
 .../linear/LinearRegressionLSQRTrainerExample.java |   62 +-
 ...gressionLSQRTrainerWithMinMaxScalerExample.java |   57 +-
 .../linear/LinearRegressionSGDTrainerExample.java  |   60 +-
 .../BaggedLogisticRegressionSGDTrainerExample.java |   80 +-
 .../LogisticRegressionSGDTrainerExample.java   |   66 +-
 .../ml/selection/cv/CrossValidationExample.java|  151 +-
 .../ml/selection/scoring/EvaluatorExample.java |   56 +-
 .../selection/scoring/MultipleMetricsExample.java  |   44 +-
 .../selection/scoring/RegressionMetricExample.java |   55 +-
 .../split/TrainTestDatasetSplitterExample.java |   69 +-
 ...eeClassificationTrainerSQLInferenceExample.java |  155 +-
 ...onTreeClassificationTrainerSQLTableExample.java |  163 +-
 .../ml/svm/SVMBinaryClassificationExample.java |   44 +-
 .../DecisionTreeClassificationTrainerExample.java  |  110 +-
 .../tree/DecisionTreeRegressionTrainerExample.java |   74 +-
 .../examples/ml/tree/FraudDetectionExample.java|  125 +
 .../GDBOnTreesClassificationTrainerExample.java|   54 +-
 .../GDBOnTreesRegressionTrainerExample.java|   50 +-
 .../RandomForestClassificationExample.java |   85 +-
 .../RandomForestRegressionExample.java |   99 +-
 .../ml/tutorial/Step_10_Scaling_With_Stacking.java |6 +-
 .../ml/tutorial/Step_1_Read_and_Learn.java |   11 +-
 .../examples/ml/tutorial/Step_2_Imputing.java  |4 +-
 .../examples/ml/tutorial/Step_3_Categorial.java|4 +-
 .../Step_3_Categorial_with_One_Hot_Encoder.java|4 +-
 .../examples/ml/tutorial/Step_4_Add_age_fare.java  |4 +-
 .../examples/ml/tutorial/Step_5_Scaling.java   |4 +-
 .../ml/tutorial/Step_5_Scaling_with_Pipeline.java  |   11 +-
 .../ignite/examples/ml/tutorial/Step_6_KNN.java|4 +-
 .../ml/tutorial/Step_7_Split_train_test.java   |4 +-
 .../ignite/examples/ml/tutorial/Step_8_CV.java |4 +-
 .../ml/tutorial/Step_8_CV_with_Param_Grid.java |4 +-
 .../Step_8_CV_with_Param_Grid_and_metrics.java |   11 +-
 ..._with_Param_Grid_and_metrics_and_pipeline.java} |  111 +-
 .../examples/ml/tutorial/Step_9_Go_to_LogReg.java  |8 +-
 .../ignite/examples/ml/tutorial/TitanicUtils.java  |   13 +-
 .../util/generators/DatasetCreationExamples.java   |   34 +-

[ignite] branch ignite-9720 updated (5ef026f -> 1e142d8)

2019-04-10 Thread sboikov 
This is an automated email from the ASF dual-hosted git repository.

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


from 5ef026f  fix tests
 add 6e36f5c  IGNITE-11569 Enable baseline auto-adjust by default only for 
empty cluster - Fixes #6305.
 add 770e2ba  IGNITE-11574 Fix exchange on NodeLeft event hangs when 
cluster is in transition state - Fixes #6310.
 add e1ab893  IGNITE-11334: SQL: Deprecated SqlQuery in Java. This closes 
#6151.
 add 18af47d  IGNITE-11681 Fix for three failed tests. (#6402)
 add 579036d  IGNITE-10145: [ML] Implement ROC AUC metric (#6394)
 add 448f989  IGNITE-11672 Fix expected message in 
JdbcThinConnectionSelfTest.testInvalidEndpoint - Fixes #6396.
 add e228241  IGNITE-11673: SQL: It looks like security check is missed in 
h2 indexing. This closes #6390.
 add c32c7ac  IGNITE-11632 Correctly handle crc errors in no archiver mode 
- Fixes #6345.
 add 0e6bcd3  IGNITE-9799 Web Console: Removed unused code.
 add 44b0522  IGNITE-9801 Web Console: Export button restyled.
 add 0d93a0b  IGNITE-8368 Web Console: Refactored queries notebooks list.
 add 0af4fdf  IGNITE-11182 Web console: Actualized cluster configuration.
 add 9180be9  IGNITE-11604: SQL: Fixed problem with DROP COLUMN which was 
not able remove a column properly in some cases. This closes #6399.
 add 89ba43f  IGNITE-11604: SQL: Fixed problem with DROP COLUMN which was 
not able remove a column properly in some cases. This closes #6399.
 add 9c721f7  IGNITE-11283 Web console: Actualized cluster configuration.
 add b6a07f6  IGNITE-11284 Web console: Actualized cluster configuration.
 add f3e481f  IGNITE-11354 Web console: Actualized cluster configuration.
 add 83c3703  IGNITE-11361 Web console: Actualized cluster configuration.
 add cf6ce6c  IGNITE-11387 Web console: Actualized cluster configuration.
 add 5642ce6  IGNITE-11385 Web console: Actualized cluster configuration.
 add 8fc2693  IGNITE-11675: [ML] Create additional examples for linear 
regressions, knn and kmeans
 add b1729a2  IGNITE-11386 Web console: Actualized cluster configuration.
 add c2a5d45  IGNITE-11386 Fixed test.
 add b3c59b1  IGNITE-11588: Fixed C++ Query example, if run in cluster.
 add 6363aef  IGNITE-11614 Fix transaction hang when sessionEnd throws an 
exception - Fixes #6401.
 add 82e6c27  IGNITE-11691 Fix IgniteWalSerializerVersionTest - Fixes #6416.
 add 9fb5e46  IGNITE-11525 .NET: Deprecate SqlQuery API (#6415)
 add 7be7492  IGNITE-11226: SQL: Refactored metadata retrieval to avoid 
exposing stateful H2 objects from indexing interface. This closes #6258.
 add 07c4b9b  IGNITE-11625 Skip non-changed affinity optimization for 
starting caches - Fixes #6337.
 add 46592f4  IGNITE-11683 Thread from pool was replaced with new thread to 
avoid further deadlocks. - Fixes #6414.
 add 983843a  IGNITE-835 Fix IgniteCache.lock for PARTITIONED cache without 
near cache - Fixes #6369.
 add 185035e  IGNITE-11149 Update default value for 
IGNITE_DISABLE_WAL_DURING_REBALANCING in javadoc. - Fixes #6050.
 add f10177b  IGNITE-11442: SQL: Moved system views from "IGNITE" to "SYS" 
schema. This is more consistent with another databases. Previous behavior can 
be returned with "-DIGNITE_SQL_SYSTEM_SCHEMA_NAME_IGNITE=true" system property. 
This closes #6395.
 add ce08060  IGNITE-11621 Fixed infinite 'no next node in topology' loop 
in case of connecting nodes - Fixes #6360.
 add 1272339  IGNITE-11640 Fix hang on node stop caused by an incomplete 
checkpoint future - Fixes #6355.
 add c23f6b0  IGNITE-11439: MVCC: Error in transaction mode validation. 
This closes #6397.
 add dce279b  IGNITE-11460: MVCC: Possible race on coordinator changing on 
client reconnection. This closes #6211.
 add 6037a59  IGNITE-11460: MVCC: Possible race on coordinator changing on 
client reconnection. This closes #6211.
 add 0512e86  IGNITE-11710 Web Console: Exposed callback to ui-grid.api for 
manipulations with ui-grid.
 add d18f98e  .NET: Improve assertion in 
DataRegionMetricsTest.TestMemoryMetrics
 add 1a7e62a  IGNITE-8588 .NET: Improve serialization error message when 
derived type hides base type member
 add 438c9e1  IGNITE-11702 Awaiting PME in test. - Fixes #6425.
 add 656b2f1  IGNITE-11706 Avoided undetermined behaviour in test. - Fixes 
#6426.
 add a167a06  IGNITE-11684 Fix 
CacheSerializableTransactionsTest#testGetRemoveTxNearCache2 (and 1) is flaky - 
Fixes #6410.
 add 6808559  IGNITE-10069: SQL: Added test for implicit schema resolution. 
This closes #6424.
 add 47da5df  IGNITE-10669 Properly handle free list corruption errors - 
Fixes #6207.
 add afe7933  IGNITE-10799 Optimize affinity recalculation in case of node 
join or leave - Fixes #6242.
 add 3f0e85f  IGNITE-10896 Add ability to use simultaneous cache filtering

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

2019-04-10 Thread sboikov 
This is an automated email from the ASF dual-hosted git repository.

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

commit 1e142d89b0e8a1172f9d01b741ece8815d887e2a
Merge: 5ef026f b722305
Author: sboikov 
AuthorDate: Wed Apr 10 22:22:13 2019 +0300

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

 .../datagrid/CacheClientBinaryQueryExample.java|  133 +-
 .../examples/datagrid/CacheQueryExample.java   |3 +-
 .../starschema/CacheStarSchemaExample.java |   25 +-
 .../clustering/CustomersClusterizationExample.java |  140 +
 .../examples/ml/knn/IrisClassificationExample.java |   93 +
 .../linear/BostonHousePricesPredictionExample.java |  113 +
 .../examples/ml/tree/FraudDetectionExample.java|  125 +
 .../ignite/examples/sql/SqlQueriesExample.java |   29 +-
 .../internal/jdbc2/JdbcAbstractSchemaCaseTest.java |2 +-
 .../internal/jdbc2/JdbcMetadataSelfTest.java   |  147 +-
 .../jdbc/thin/JdbcThinConnectionSelfTest.java  |2 +-
 .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java |  103 +-
 .../main/java/org/apache/ignite/IgniteCache.java   |2 -
 .../main/java/org/apache/ignite/IgniteCluster.java |6 +
 .../org/apache/ignite/IgniteSystemProperties.java  |7 +-
 .../eviction/lru/LruEvictionPolicyFactory.java |1 -
 .../java/org/apache/ignite/cache/query/Query.java  |2 -
 .../apache/ignite/cache/query/SqlFieldsQuery.java  |3 +-
 .../org/apache/ignite/cache/query/SqlQuery.java|3 +
 .../java/org/apache/ignite/client/ClientCache.java |3 +-
 .../org/apache/ignite/internal/IgniteKernal.java   |   10 +-
 .../cluster/DistributedBaselineConfiguration.java  |  101 +-
 .../internal/cluster/IgniteClusterAsyncImpl.java   |6 +
 .../ignite/internal/cluster/IgniteClusterImpl.java |   38 +-
 .../internal/commandline/CommandHandler.java   |   36 +-
 .../internal/jdbc/thin/JdbcThinStatement.java  |4 +-
 .../ignite/internal/jdbc2/JdbcConnection.java  |   23 +-
 .../internal/jdbc2/JdbcPreparedStatement.java  |   94 +-
 .../internal/jdbc2/JdbcResultSetMetadata.java  |   25 +-
 .../ignite/internal/jdbc2/JdbcStatement.java   |   18 +
 .../jdbc2/JdbcStreamedPreparedStatement.java   |7 +-
 .../internal/managers/IgniteMBeansManager.java |9 +-
 .../processors/affinity/AffinityAssignment.java|5 +
 .../affinity/GridAffinityAssignment.java   |5 +
 .../affinity/GridAffinityAssignmentCache.java  |  126 +-
 .../affinity/GridAffinityAssignmentV2.java |   23 +-
 .../affinity/HistoryAffinityAssignmentImpl.java|   10 +
 .../HistoryAffinityAssignmentShallowCopy.java  |5 +
 .../affinity/IdealAffinityAssignment.java  |  148 +
 .../cache/CacheAffinitySharedManager.java  |  362 ++-
 .../processors/cache/ExchangeDiscoveryEvents.java  |   33 +-
 .../processors/cache/GridCacheAffinityManager.java |2 +-
 .../cache/GridCacheExplicitLockSpan.java   |   31 +-
 .../processors/cache/GridCacheIoManager.java   |   17 +-
 .../processors/cache/GridCacheMapEntry.java|   28 +-
 .../internal/processors/cache/GridCacheMvcc.java   |2 +-
 .../cache/GridCachePartitionExchangeManager.java   |4 +-
 .../processors/cache/GridCacheProcessor.java   |2 +-
 .../dht/preloader/CacheGroupAffinityMessage.java   |2 +-
 .../preloader/GridDhtPartitionsExchangeFuture.java |9 +-
 .../dht/topology/GridDhtPartitionTopologyImpl.java |2 +-
 .../topology/GridDhtPartitionsStateValidator.java  |2 +-
 .../cache/distributed/near/GridNearTxLocal.java|3 +-
 .../processors/cache/mvcc/MvccProcessorImpl.java   |   34 +-
 .../internal/processors/cache/mvcc/MvccUtils.java  |   35 +-
 ...ion.java => CorruptedPersistenceException.java} |   20 +-
 .../GridCacheDatabaseSharedManager.java|  100 +-
 .../persistence/freelist/AbstractFreeList.java |  152 +-
 .../CorruptedFreeListException.java}   |   10 +-
 .../persistence/tree/CorruptedTreeException.java   |4 +-
 .../persistence/wal/FileWriteAheadLogManager.java  |   70 +-
 .../cache/verify/IdleVerifyResultV2.java   |   54 +-
 .../NoMatchingCachesException.java}|   20 +-
 .../verify/VerifyBackupPartitionsDumpTask.java |   38 +
 .../cache/verify/VerifyBackupPartitionsTaskV2.java |  191 +-
 ...Impl.java => BaselineAutoAdjustMXBeanImpl.java} |   23 +-
 .../processors/cluster/BaselineTopology.java   |7 +
 .../processors/cluster/ClusterProcessor.java   |   18 -
 .../cluster/GridClusterStateProcessor.java |  112 +-
 ...tatistic.java => BaselineAutoAdjustStatus.java} |   24 +-
 .../baseline/autoadjust/ChangeTopologyWatcher.java |   10 +-
 ...operty.java => DistributePropertyListener.java} |   22 +-
 .../distributed/DistributedBooleanProperty.java|9 +-
 .../distributed/DistributedComparableProperty.java |4 +-
 .../DistributedConfigurationProcessor.java

[ignite] branch ignite-9720 updated (55a6b2e -> 5ef026f)

2019-04-10 Thread sboikov 
This is an automated email from the ASF dual-hosted git repository.

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


from 55a6b2e  Merge remote-tracking branch 'origin/ignite-9720' into 
ignite-9720
 add db38352  IGNITE-11654: [ML] Memory leak in KNNClassificationModel 
(#6392)
 add 003c41e  IGNITE-11647: [ML] ML Vectors should work with all 
Serializable objects besides double
 add 3aa9167  IGNITE-11416 Added DistributedMetaStorage improvements - 
Fixes #6190.
 new c8cec92  Merge remote-tracking branch 'remotes/origin/master' into 
ignite-9720
 new 5ef026f  fix tests

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:
 .../org/apache/ignite/internal/GridComponent.java  |   9 +-
 .../org/apache/ignite/internal/IgniteFeatures.java |   6 +-
 .../preloader/GridDhtPartitionsExchangeFuture.java |  13 +-
 .../cache/persistence/GridCacheOffheapManager.java |  25 +-
 .../cache/persistence/LazyCacheFreeList.java   |  28 +-
 .../cluster/GridClusterStateProcessor.java |   2 -
 .../ReadableDistributedMetaStorage.java|  47 +-
 .../persistence/DistributedMetaStorageBridge.java  |   8 +-
 .../DistributedMetaStorageClusterNodeData.java |  26 +-
 .../DistributedMetaStorageHistoryCache.java| 228 +++
 .../DistributedMetaStorageHistoryItem.java |  64 +-
 .../persistence/DistributedMetaStorageImpl.java| 753 ++---
 .../DistributedMetaStorageJoiningNodeData.java |  16 +-
 ...ava => DistributedMetaStorageKeyValuePair.java} |  20 +-
 .../DistributedMetaStorageUpdateAckMessage.java|   5 -
 .../persistence/DistributedMetaStorageUtil.java|  24 +-
 .../persistence/DistributedMetaStorageVersion.java |   3 +-
 .../EmptyDistributedMetaStorageBridge.java |  10 +-
 ...InMemoryCachedDistributedMetaStorageBridge.java |  27 +-
 .../NotAvailableDistributedMetaStorageBridge.java  |   8 +-
 .../ReadOnlyDistributedMetaStorageBridge.java  | 107 +--
 .../WritableDistributedMetaStorageBridge.java  |  35 +-
 .../db/checkpoint/CheckpointFreeListTest.java  |  20 +-
 .../DistributedMetaStoragePersistentTest.java  |  94 ++-
 .../metastorage/DistributedMetaStorageTest.java| 111 ++-
 .../DistributedMetaStorageHistoryCacheTest.java| 227 +++
 .../ignite/testsuites/IgniteBasicTestSuite.java|   2 +
 .../ignite/ml/clustering/kmeans/KMeansModel.java   |   2 +-
 .../extractor/impl/BinaryObjectVectorizer.java |   9 +-
 .../java/org/apache/ignite/ml/inference/Model.java |   4 +-
 .../ignite/ml/knn/NNClassificationModel.java   |   2 +-
 .../knn/classification/KNNClassificationModel.java |  15 +
 .../apache/ignite/ml/math/StorageOpsMetrics.java   |  15 +-
 .../ml/math/primitives/matrix/AbstractMatrix.java  |  10 -
 .../ignite/ml/math/primitives/matrix/Matrix.java   |   5 +
 .../ml/math/primitives/matrix/MatrixStorage.java   |   5 +
 .../math/primitives/matrix/impl/SparseMatrix.java  |   2 +-
 .../matrix/storage/DenseMatrixStorage.java |  12 +-
 .../matrix/storage/SparseMatrixStorage.java|  12 +-
 .../matrix/storage/ViewMatrixStorage.java  |  10 -
 .../ml/math/primitives/vector/AbstractVector.java  |  78 ++-
 .../ignite/ml/math/primitives/vector/Vector.java   |  59 +-
 .../ml/math/primitives/vector/VectorStorage.java   |  27 +-
 .../ml/math/primitives/vector/VectorUtils.java |   5 +-
 .../primitives/vector/impl/DelegatingVector.java   |  34 +-
 .../math/primitives/vector/impl/SparseVector.java  |  11 +-
 .../vector/storage/DenseVectorStorage.java | 164 -
 .../vector/storage/SparseVectorStorage.java| 107 ++-
 .../vector/storage/VectorViewStorage.java  |  25 +-
 .../storage/VectorizedViewMatrixStorage.java   |  28 +-
 .../ignite/ml/nn/ReplicatedVectorMatrix.java   |  28 +-
 .../ml/svm/SVMLinearClassificationTrainer.java |  10 +-
 .../ml/dataset/feature/ObjectHistogramTest.java|   4 +-
 .../java/org/apache/ignite/ml/math/BlasTest.java   |   9 +-
 .../ignite/ml/math/MathImplLocalTestSuite.java |   4 +
 .../primitives/matrix/MatrixArrayStorageTest.java  |   7 -
 .../primitives/matrix/MatrixAttributeTest.java |   9 +-
 .../matrix/MatrixViewConstructorTest.java  |   2 -
 .../math/primitives/vector/AbstractVectorTest.java |  20 -
 .../vector/SparseVectorConstructorTest.java|  25 +-
 .../primitives/vector/VectorAttributesTest.java|  20 +-
 .../vector/VectorImplementationsFixtures.java  |   4 +-
 .../vector/VectorImplementationsTest.java  |   3 +-
 .../vector/storage/AbstractStorageTest.java| 147 
 .../vector/storage/DenseVectorStorageTest.java}|  44 +-
 .../vector/storage/SparseVectorStorageTest.java}   |  31 +-

[ignite] 02/02: fix tests

2019-04-10 Thread sboikov 
This is an automated email from the ASF dual-hosted git repository.

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

commit 5ef026f00d2b97d5c5cfc8ec9e0f1efd8b8077d8
Author: sboikov 
AuthorDate: Wed Apr 3 16:26:55 2019 +0300

fix tests
---
 .../cache/persistence/GridCacheOffheapManager.java | 25 ---
 .../cache/persistence/LazyCacheFreeList.java   | 28 --
 .../db/checkpoint/CheckpointFreeListTest.java  | 20 ++--
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 4db3a86..1c09f02 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -1550,10 +1550,29 @@ public class GridCacheOffheapManager extends 
IgniteCacheOffheapManagerImpl imple
 RootPage reuseRoot = metas.reuseListRoot;
 
 freeList = new LazyCacheFreeList() {
-@Override protected CacheFreeList 
createDelegate() throws IgniteCheckedException {
-assert 
grp.shared().database().checkpointLockIsHeldByThread();
+@Override protected CacheFreeList 
createDelegate(boolean create) throws IgniteCheckedException {
+boolean lock = false;
+
+try {
+if (!create) {
+if (reuseRoot.pageId().pageId() == 0L)
+return null;
+
+assert 
!grp.shared().database().checkpointLockIsHeldByThread();
 
-return new PartitionCacheFreeList(grp, partId, 
reuseRoot);
+
grp.shared().database().checkpointReadLock();
+
+lock = true;
+}
+
+assert 
grp.shared().database().checkpointLockIsHeldByThread();
+
+return new PartitionCacheFreeList(grp, partId, 
reuseRoot);
+}
+finally {
+if (lock)
+
grp.shared().database().checkpointReadUnlock();
+}
 }
 };
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/LazyCacheFreeList.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/LazyCacheFreeList.java
index a337a26..9cdb573 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/LazyCacheFreeList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/LazyCacheFreeList.java
@@ -55,28 +55,30 @@ public abstract class LazyCacheFreeList implements 
CacheFreeList {
 
 /** {@inheritDoc} */
 @Override public void insertDataRow(CacheDataRow row, IoStatisticsHolder 
statHolder) throws IgniteCheckedException {
-initDelegateIfNeeded().insertDataRow(row, statHolder);
+initDelegateIfNeeded(true).insertDataRow(row, statHolder);
 }
 
 /** {@inheritDoc} */
 @Override public boolean updateDataRow(long link, CacheDataRow row, 
IoStatisticsHolder statHolder) throws IgniteCheckedException {
-return initDelegateIfNeeded().updateDataRow(link, row, statHolder);
+return initDelegateIfNeeded(true).updateDataRow(link, row, statHolder);
 }
 
 /** {@inheritDoc} */
 @Override public  R updateDataRow(long link, PageHandler 
pageHnd, S arg, IoStatisticsHolder statHolder) throws IgniteCheckedException {
-return (R)initDelegateIfNeeded().updateDataRow(link, pageHnd, arg, 
statHolder);
+return (R)initDelegateIfNeeded(true).updateDataRow(link, pageHnd, arg, 
statHolder);
 }
 
 /** {@inheritDoc} */
 @Override public void removeDataRowByLink(long link, IoStatisticsHolder 
statHolder) throws IgniteCheckedException {
-initDelegateIfNeeded().removeDataRowByLink(link, statHolder);
+initDelegateIfNeeded(true).removeDataRowByLink(link, statHolder);
 }
 
 /** {@inheritDoc} */
 @Override public int emptyDataPages() {
 try {
-return initDelegateIfNeeded().emptyDataPages();
+CacheFreeList freeList = initDelegateIfNeeded(false);
+
+return freeList != null ? freeList.emptyDataPages() : 0;
 }
 catch (IgniteCheckedException e) {
 throw new

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

2019-04-10 Thread sboikov 
This is an automated email from the ASF dual-hosted git repository.

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

commit c8cec928384f29a5db12a5519de251ebada44844
Merge: 55a6b2e 3aa9167
Author: sboikov 
AuthorDate: Wed Apr 3 15:55:09 2019 +0300

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

 .../org/apache/ignite/internal/GridComponent.java  |   9 +-
 .../org/apache/ignite/internal/IgniteFeatures.java |   6 +-
 .../preloader/GridDhtPartitionsExchangeFuture.java |  13 +-
 .../cluster/GridClusterStateProcessor.java |   2 -
 .../ReadableDistributedMetaStorage.java|  47 +-
 .../persistence/DistributedMetaStorageBridge.java  |   8 +-
 .../DistributedMetaStorageClusterNodeData.java |  26 +-
 .../DistributedMetaStorageHistoryCache.java| 228 +++
 .../DistributedMetaStorageHistoryItem.java |  64 +-
 .../persistence/DistributedMetaStorageImpl.java| 753 ++---
 .../DistributedMetaStorageJoiningNodeData.java |  16 +-
 ...ava => DistributedMetaStorageKeyValuePair.java} |  20 +-
 .../DistributedMetaStorageUpdateAckMessage.java|   5 -
 .../persistence/DistributedMetaStorageUtil.java|  24 +-
 .../persistence/DistributedMetaStorageVersion.java |   3 +-
 .../EmptyDistributedMetaStorageBridge.java |  10 +-
 ...InMemoryCachedDistributedMetaStorageBridge.java |  27 +-
 .../NotAvailableDistributedMetaStorageBridge.java  |   8 +-
 .../ReadOnlyDistributedMetaStorageBridge.java  | 107 +--
 .../WritableDistributedMetaStorageBridge.java  |  35 +-
 .../DistributedMetaStoragePersistentTest.java  |  94 ++-
 .../metastorage/DistributedMetaStorageTest.java| 111 ++-
 .../DistributedMetaStorageHistoryCacheTest.java| 227 +++
 .../ignite/testsuites/IgniteBasicTestSuite.java|   2 +
 .../ignite/ml/clustering/kmeans/KMeansModel.java   |   2 +-
 .../extractor/impl/BinaryObjectVectorizer.java |   9 +-
 .../java/org/apache/ignite/ml/inference/Model.java |   4 +-
 .../ignite/ml/knn/NNClassificationModel.java   |   2 +-
 .../knn/classification/KNNClassificationModel.java |  15 +
 .../apache/ignite/ml/math/StorageOpsMetrics.java   |  15 +-
 .../ml/math/primitives/matrix/AbstractMatrix.java  |  10 -
 .../ignite/ml/math/primitives/matrix/Matrix.java   |   5 +
 .../ml/math/primitives/matrix/MatrixStorage.java   |   5 +
 .../math/primitives/matrix/impl/SparseMatrix.java  |   2 +-
 .../matrix/storage/DenseMatrixStorage.java |  12 +-
 .../matrix/storage/SparseMatrixStorage.java|  12 +-
 .../matrix/storage/ViewMatrixStorage.java  |  10 -
 .../ml/math/primitives/vector/AbstractVector.java  |  78 ++-
 .../ignite/ml/math/primitives/vector/Vector.java   |  59 +-
 .../ml/math/primitives/vector/VectorStorage.java   |  27 +-
 .../ml/math/primitives/vector/VectorUtils.java |   5 +-
 .../primitives/vector/impl/DelegatingVector.java   |  34 +-
 .../math/primitives/vector/impl/SparseVector.java  |  11 +-
 .../vector/storage/DenseVectorStorage.java | 164 -
 .../vector/storage/SparseVectorStorage.java| 107 ++-
 .../vector/storage/VectorViewStorage.java  |  25 +-
 .../storage/VectorizedViewMatrixStorage.java   |  28 +-
 .../ignite/ml/nn/ReplicatedVectorMatrix.java   |  28 +-
 .../ml/svm/SVMLinearClassificationTrainer.java |  10 +-
 .../ml/dataset/feature/ObjectHistogramTest.java|   4 +-
 .../java/org/apache/ignite/ml/math/BlasTest.java   |   9 +-
 .../ignite/ml/math/MathImplLocalTestSuite.java |   4 +
 .../primitives/matrix/MatrixArrayStorageTest.java  |   7 -
 .../primitives/matrix/MatrixAttributeTest.java |   9 +-
 .../matrix/MatrixViewConstructorTest.java  |   2 -
 .../math/primitives/vector/AbstractVectorTest.java |  20 -
 .../vector/SparseVectorConstructorTest.java|  25 +-
 .../primitives/vector/VectorAttributesTest.java|  20 +-
 .../vector/VectorImplementationsFixtures.java  |   4 +-
 .../vector/VectorImplementationsTest.java  |   3 +-
 .../vector/storage/AbstractStorageTest.java| 147 
 .../vector/storage/DenseVectorStorageTest.java |  61 ++
 .../vector/storage/SparseVectorStorageTest.java}   |  42 +-
 .../ignite/ml/xgboost/XGModelComposition.java  |   6 +-
 64 files changed, 2101 insertions(+), 786 deletions(-)

[ignite-teamcity-bot] 01/01: Config usability: Migrating everything to branches.json

2019-04-10 Thread dpavlov 
This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch ce-cfg-usability
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git

commit f451fbaa9ba179f6dd324a4fa1af0a5e115948b5
Author: Dmitriy Pavlov 
AuthorDate: Wed Apr 10 20:53:37 2019 +0300

Config usability: Migrating everything to branches.json
---
 conf/branches.json |  5 +-
 .../java/org/apache/ignite/ci/HelperConfig.java| 19 +-
 .../ci/github/pure/GitHubConnectionImpl.java   | 47 +++---
 .../ignite/ci/github/pure/IGitHubConnection.java   |  5 --
 .../ignite/ci/jira/pure/IJiraIntegration.java  |  4 +-
 .../java/org/apache/ignite/ci/jira/pure/Jira.java  |  9 ++-
 .../apache/ignite/ci/tcbot/conf/GitHubConfig.java  | 74 ++
 .../apache/ignite/ci/tcbot/conf/IGitHubConfig.java | 14 
 .../apache/ignite/ci/tcbot/conf/ITcBotConfig.java  |  3 +
 .../ignite/ci/tcbot/conf/ITcServerConfig.java  |  3 +
 .../ignite/ci/tcbot/conf/JiraServerConfig.java |  5 +-
 .../ci/tcbot/conf/LocalFilesBasedConfig.java   |  5 +-
 .../ignite/ci/tcbot/conf/TcServerConfig.java   |  5 +-
 .../org/apache/ignite/ci/web/model/Version.java|  2 +-
 .../apache/ignite/ci/web/rest/TriggerBuilds.java   |  2 +-
 .../ci/tcbot/chain/MockBasedTcBotModule.java   |  2 +-
 16 files changed, 126 insertions(+), 78 deletions(-)

diff --git a/conf/branches.json b/conf/branches.json
index a9df1bd..56f4112 100644
--- a/conf/branches.json
+++ b/conf/branches.json
@@ -1,10 +1,13 @@
 {
+  // Default server (service) code, internal identification
   "primaryServerCode": "apache",
   "tcServers": [
 {
+  //code of current server
   "code": "public",
+
+  // reference to another TC server service code to be used instead.
   "reference": "apache"
-  // reference to another TC server to be used instead.
 }
   ],
   "jiraServers": [
diff --git 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java
index 579ffb9..9184253 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java
@@ -56,7 +56,7 @@ public class HelperConfig {
 /** JIRA authorization token property name. */
 public static final String JIRA_AUTH_TOKEN = "jira.auth_token";
 
-/** JIRA authorization token property name. */
+/** Github API url for the project. */
 public static final String GIT_API_URL = "git.api_url";
 
 /** JIRA URL to build links to tickets. */
@@ -137,23 +137,6 @@ public class HelperConfig {
 }
 
 /**
- * Extract GitHub authorization token from properties.
- *
- * @param props Properties, where token is placed.
- * @return Null or decoded auth token for Github.
- */
-@Nullable public static String prepareGithubHttpAuthToken(Properties 
props) {
-String tok = props.getProperty(GITHUB_AUTH_TOKEN);
-
-if (isNullOrEmpty(tok))
-return null;
-
-tok = PasswordEncoder.decode(tok);
-
-return tok;
-}
-
-/**
  * Extract TeamCity authorization token from properties.
  *
  * @param props Properties, where token is placed.
diff --git 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubConnectionImpl.java
 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubConnectionImpl.java
index ddfce1c..7fd7262 100644
--- 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubConnectionImpl.java
+++ 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubConnectionImpl.java
@@ -48,20 +48,19 @@ class GitHubConnectionImpl implements IGitHubConnection {
 /** Logger. */
 private static final Logger logger = 
LoggerFactory.getLogger(GitHubConnectionImpl.class);
 
-/** URL for git integration. */
-private String gitApiUrl;
-
-/** GitHub authorization token. */
-private String gitAuthTok;
-
+/** Config. */
 @Inject
-ITcBotConfig config;
+private ITcBotConfig cfg;
 
+/** Service (server) code. */
 private String srvCode;
 
-@Nullable public static String parseNextLinkFromLinkRspHeader(String s) {
+/**
+ * @param linkRspHdrVal Value of Link response HTTP header.
+ */
+@Nullable public static String parseNextLinkFromLinkRspHeader(String 
linkRspHdrVal) {
 String nextLink = null;
-StringTokenizer tokenizer = new StringTokenizer(s, ",");
+StringTokenizer tokenizer = new StringTokenizer(linkRspHdrVal, ",");
 for (; tokenizer.hasMoreTokens(); ) {
 String tok = tokenizer.nextToken();
 
@@ -97,19 +96,18 @@ class GitHubConnectionImpl implements IGitHubConnection {
 
 final Properties props = HelperConfig.loadAuthProperties(workDir, 
cfgName);
 
-

[ignite-teamcity-bot] branch ce-cfg-usability created (now f451fba)

2019-04-10 Thread dpavlov 
This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a change to branch ce-cfg-usability
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git.


  at f451fba  Config usability: Migrating everything to branches.json

This branch includes the following new commits:

 new f451fba  Config usability: Migrating everything to branches.json

The 1 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.

[ignite] branch master updated: .NET: Fix sorting in DataRegionMetricsTest.TestMemoryMetrics; minor cleanup

2019-04-10 Thread ptupitsyn 
This is an automated email from the ASF dual-hosted git repository.

ptupitsyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new b722305  .NET: Fix sorting in DataRegionMetricsTest.TestMemoryMetrics; 
minor cleanup
b722305 is described below

commit b7223054569f72d6e6d5605da383a73e53821dbe
Author: Pavel Tupitsyn 
AuthorDate: Wed Apr 10 18:35:47 2019 +0300

.NET: Fix sorting in DataRegionMetricsTest.TestMemoryMetrics; minor cleanup
---
 .../Apache.Ignite.Benchmarks/Binary/BinarizableReadBenchmark.cs  | 1 +
 .../Apache.Ignite.Benchmarks/Binary/BinarizableWriteBenchmark.cs | 5 +++--
 .../dotnet/Apache.Ignite.Core.Tests/Binary/BinaryReaderWriterTest.cs | 2 +-
 .../Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs | 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs   | 4 +++-
 .../Apache.Ignite.Core.Tests/Cache/Query/CacheDmlQueriesTest.cs  | 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheTestStore.cs| 4 +++-
 .../dotnet/Apache.Ignite.Core.Tests/Compute/AbstractTaskTest.cs  | 2 ++
 .../EntityFrameworkCacheInitializationTest.cs| 1 +
 .../examples/Apache.Ignite.Examples/Datagrid/BinaryModeExample.cs| 1 -
 10 files changed, 16 insertions(+), 8 deletions(-)

diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableReadBenchmark.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableReadBenchmark.cs
index 09e588e..058169a 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableReadBenchmark.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableReadBenchmark.cs
@@ -43,6 +43,7 @@ namespace Apache.Ignite.Benchmarks.Binary
 private readonly Address _address = BenchmarkUtils.GetRandomAddress();
 
 /** Pre-allocated model. */
+// ReSharper disable once UnusedMember.Local
 private readonly TestModel _model = new TestModel
 {
 Byte = 5,
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableWriteBenchmark.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableWriteBenchmark.cs
index c4d375f..c2d1cef 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableWriteBenchmark.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Binary/BinarizableWriteBenchmark.cs
@@ -112,11 +112,12 @@ namespace Apache.Ignite.Benchmarks.Binary
 mem.Release();
 }
 }
+
 /// 
 /// Write address.
 /// 
-/// State.
-private void WriteTestModel(BenchmarkState state)
+// ReSharper disable once UnusedMember.Local
+private void WriteTestModel()
 {
 var mem = _memMgr.Allocate();
 
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryReaderWriterTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryReaderWriterTest.cs
index ffbd084..8b11c32 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryReaderWriterTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryReaderWriterTest.cs
@@ -27,7 +27,7 @@ namespace Apache.Ignite.Core.Tests.Binary
 using BinaryWriter = Apache.Ignite.Core.Impl.Binary.BinaryWriter;
 
 /// 
-/// Tests the  and  classes.
+/// Tests the  and  
classes.
 /// 
 public class BinaryReaderWriterTest
 {
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs
index a70d9b7..b52ce04 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs
@@ -439,7 +439,7 @@ namespace Apache.Ignite.Core.Tests.Cache
 
 Assert.AreEqual(TransactionState.MarkedRollback, tx.State);
 
-var ex = Assert.Throws(() => 
tx.Commit());
+Assert.Throws(() => tx.Commit());
 
 tx.Dispose();
 
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
index d2ff32c..fa9a70a 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
@@ -61,7 +61,9 @@ namespace Apache.Ignite.Core.Tests.Cache
 var ignite = StartIgniteWithThreeDataRegions();
 
 // Verify metrics.
-var metrics = ignite.GetDataRegionMetrics().OrderBy(x => 
x.Name).ToArray();
+var metrics = ignite.GetDataRegionMetrics()
+

[ignite] branch master updated: IGNITE-10896 Add ability to use simultaneous cache filtering options with control.sh --cache idle_verify - Fixes #6336.

2019-04-10 Thread irakov 
This is an automated email from the ASF dual-hosted git repository.

irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new 3f0e85f  IGNITE-10896 Add ability to use simultaneous cache filtering 
options with control.sh --cache idle_verify - Fixes #6336.
3f0e85f is described below

commit 3f0e85f2e3d0a5abbc7fbf67c8d9938c90caae2c
Author: denis-chudov 
AuthorDate: Wed Apr 10 16:31:02 2019 +0300

IGNITE-10896 Add ability to use simultaneous cache filtering options with 
control.sh --cache idle_verify - Fixes #6336.

Signed-off-by: Ivan Rakov 
---
 .../internal/commandline/CommandHandler.java   |  36 ++--
 .../cache/verify/IdleVerifyResultV2.java   |  54 --
 .../cache/verify/NoMatchingCachesException.java|  28 +++
 .../verify/VerifyBackupPartitionsDumpTask.java |  38 
 .../cache/verify/VerifyBackupPartitionsTaskV2.java | 191 ---
 .../apache/ignite/util/GridCommandHandlerTest.java | 207 ++---
 6 files changed, 432 insertions(+), 122 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index f0c3ba3..1ddeee2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -138,6 +138,7 @@ import 
org.apache.ignite.plugin.security.SecurityCredentialsProvider;
 import org.apache.ignite.ssl.SslContextFactory;
 
 import static java.lang.Boolean.TRUE;
+import static java.lang.String.format;
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_ENABLE_EXPERIMENTAL_COMMAND;
 import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
 import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
@@ -847,7 +848,7 @@ public class CommandHandler {
 usageCache(LIST, "regexPattern", op(or(GROUP, SEQUENCE)), OP_NODE_ID, 
op(CONFIG), op(OUTPUT_FORMAT, MULTI_LINE));
 usageCache(CONTENTION, "minQueueSize", OP_NODE_ID, op("maxPrint"));
 usageCache(IDLE_VERIFY, op(DUMP), op(SKIP_ZEROS), op(CHECK_CRC),
-op(or(g(EXCLUDE_CACHES, CACHES), g(CACHE_FILTER, 
or(CacheFilterEnum.values())), CACHES)));
+op(EXCLUDE_CACHES, CACHES), op(CACHE_FILTER, 
or(CacheFilterEnum.values())), op(CACHES));
 usageCache(VALIDATE_INDEXES, op(CACHES), OP_NODE_ID, op(or(CHECK_FIRST 
+ " N", CHECK_THROUGH + " K")));
 usageCache(DISTRIBUTION, or(NODE_ID, NULL), op(CACHES), 
op(USER_ATTRIBUTES, "attrName1,...,attrNameN"));
 usageCache(RESET_LOST_PARTITIONS, CACHES);
@@ -1658,7 +1659,11 @@ public class CommandHandler {
 return "Show the keys that are point of contention for 
multiple transactions.";
 
 case IDLE_VERIFY:
-return "Verify counters and hash sums of primary and backup 
partitions for the specified caches on an idle cluster and print out the 
differences, if any.";
+return "Verify counters and hash sums of primary and backup 
partitions for the specified caches/cache groups on an idle cluster and print 
out the differences, if any. " +
+"Cache filtering options configure the set of caches that 
will be processed by " + IDLE_VERIFY + " command. " +
+"Default value for the set of cache names (or cache group 
names) is all cache groups. Default value for " + EXCLUDE_CACHES + " is empty 
set. " +
+"Default value for " + CACHE_FILTER + " is no filtering. 
Therefore, the set of all caches is sequently filtered by cache name " +
+"regexps, by cache type and after all by exclude regexps.";
 
 case VALIDATE_INDEXES:
 return "Validate indexes on an idle cluster and print out the 
keys that are missing in the indexes.";
@@ -1954,7 +1959,7 @@ public class CommandHandler {
 case CMD_PASSWORD:
 pwd = nextArg("Expected password");
 
-log(String.format(pwdArgWarnFmt, CMD_PASSWORD, 
CMD_PASSWORD));
+log(format(pwdArgWarnFmt, CMD_PASSWORD, CMD_PASSWORD));
 
 break;
 
@@ -1981,7 +1986,7 @@ public class CommandHandler {
 case CMD_KEYSTORE_PASSWORD:
 sslKeyStorePassword = nextArg("Expected SSL key store 
password").toCharArray();
 
-log(String.format(pwdArgWarnFmt, 
CMD_KEYSTORE_PASSWORD, CMD_KEYSTORE_PASSWORD));
+log(format(pwdArgWarnFmt, CMD_KEYSTORE_PASSWORD, 
CMD_KEYSTORE_PASSWORD));
 
 break;
 
@@ -1998,7 +2003,7 @@ public class CommandHandler {
 case CMD_TRUSTSTORE_PASSWORD:

[ignite] branch master updated: IGNITE-10799 Optimize affinity recalculation in case of node join or leave - Fixes #6242.

2019-04-10 Thread jokser 
This is an automated email from the ASF dual-hosted git repository.

jokser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new afe7933  IGNITE-10799 Optimize affinity recalculation in case of node 
join or leave - Fixes #6242.
afe7933 is described below

commit afe7933b156d51691997fefd251b76de5ea15e1a
Author: Pavel Kovalenko 
AuthorDate: Wed Apr 10 16:26:30 2019 +0300

IGNITE-10799 Optimize affinity recalculation in case of node join or leave 
- Fixes #6242.

Signed-off-by: Pavel Kovalenko 
---
 .../processors/affinity/AffinityAssignment.java|   5 +
 .../affinity/GridAffinityAssignment.java   |   5 +
 .../affinity/GridAffinityAssignmentCache.java  | 126 +--
 .../affinity/GridAffinityAssignmentV2.java |  23 +-
 .../affinity/HistoryAffinityAssignmentImpl.java|  10 +
 .../HistoryAffinityAssignmentShallowCopy.java  |   5 +
 .../affinity/IdealAffinityAssignment.java  | 148 +
 .../cache/CacheAffinitySharedManager.java  | 362 +
 .../processors/cache/ExchangeDiscoveryEvents.java  |  33 +-
 .../processors/cache/GridCacheAffinityManager.java |   2 +-
 .../dht/preloader/CacheGroupAffinityMessage.java   |   2 +-
 .../preloader/GridDhtPartitionsExchangeFuture.java |   4 +-
 .../dht/topology/GridDhtPartitionTopologyImpl.java |   2 +-
 13 files changed, 616 insertions(+), 111 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java
index 62adaa7..b8b1089 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java
@@ -100,6 +100,11 @@ public interface AffinityAssignment {
 public Set backupPartitions(UUID nodeId);
 
 /**
+ * @return Set of partitions which primary is different to primary in 
ideal assignment.
+ */
+public Set partitionPrimariesDifferentToIdeal();
+
+/**
  * Converts List of Cluster Nodes to HashSet of UUIDs wrapped as 
unmodifiable collection.
  * @param assignmentPart Source assignment per partition.
  * @return List of deduplicated collections if ClusterNode's ids.
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
index 0d68226..8feb39e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
@@ -239,6 +239,11 @@ public class GridAffinityAssignment implements 
AffinityAssignment, Serializable
 return set == null ? Collections.emptySet() : set;
 }
 
+/** {@inheritDoc} */
+@Override public Set partitionPrimariesDifferentToIdeal() {
+return Collections.emptySet();
+}
+
 /**
  * Initializes primary and backup maps.
  */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 0f468ac..95e26b8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -96,13 +96,13 @@ public class GridAffinityAssignmentCache {
 private final ConcurrentNavigableMap affCache;
 
 /** */
-private List> idealAssignment;
+private volatile IdealAffinityAssignment idealAssignment;
 
 /** */
-private BaselineTopology baselineTopology;
+private volatile IdealAffinityAssignment baselineAssignment;
 
 /** */
-private List> baselineAssignment;
+private BaselineTopology baselineTopology;
 
 /** Cache item corresponding to the head topology version. */
 private final AtomicReference head;
@@ -208,7 +208,7 @@ public class GridAffinityAssignmentCache {
 
 assert idealAssignment != null;
 
-GridAffinityAssignmentV2 assignment = new 
GridAffinityAssignmentV2(topVer, affAssignment, idealAssignment);
+GridAffinityAssignmentV2 assignment = new 
GridAffinityAssignmentV2(topVer, affAssignment, idealAssignment.assignment());
 
 HistoryAffinityAssignmentImpl newHistEntry = new 
HistoryAffinityAssignmentImpl(assignment, backups);
 
@@ -238,14 +238,21 @@ public class GridAffinityAssignmentCache {
 /**
  * @param assignment Assignment.
  */
-public void

[ignite] branch master updated: IGNITE-10669 Properly handle free list corruption errors - Fixes #6207.

2019-04-10 Thread jokser 
This is an automated email from the ASF dual-hosted git repository.

jokser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new 47da5df  IGNITE-10669 Properly handle free list corruption errors - 
Fixes #6207.
47da5df is described below

commit 47da5df328a18d0d55ba534b1af541b72df76901
Author: Pavel Kovalenko 
AuthorDate: Wed Apr 10 16:21:46 2019 +0300

IGNITE-10669 Properly handle free list corruption errors - Fixes #6207.

Signed-off-by: Pavel Kovalenko 
---
 ...ion.java => CorruptedPersistenceException.java} |  20 +--
 .../persistence/freelist/AbstractFreeList.java | 152 ++---
 .../CorruptedFreeListException.java}   |  10 +-
 .../persistence/tree/CorruptedTreeException.java   |   4 +-
 .../processors/failure/FailureProcessor.java   |   8 ++
 5 files changed, 122 insertions(+), 72 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/CorruptedTreeException.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CorruptedPersistenceException.java
similarity index 55%
copy from 
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/CorruptedTreeException.java
copy to 
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CorruptedPersistenceException.java
index a6bfb1f..6ba7cb3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/CorruptedTreeException.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CorruptedPersistenceException.java
@@ -15,24 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal.processors.cache.persistence.tree;
-
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.InvalidEnvironmentException;
-import org.jetbrains.annotations.Nullable;
+package org.apache.ignite.internal.processors.cache.persistence;
 
 /**
- * Exception to distinguish {@link BPlusTree} tree broken invariants.
+ * Marker interface to distinguish exceptions that were caused by broken 
persistence datastructures invariants.
  */
-public class CorruptedTreeException extends IgniteCheckedException implements 
InvalidEnvironmentException {
-/** */
-private static final long serialVersionUID = 0L;
-
-/**
- * @param msg Message.
- * @param cause Cause.
- */
-public CorruptedTreeException(String msg, @Nullable Throwable cause) {
-super(msg, cause);
-}
+public interface CorruptedPersistenceException {
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
index 60aefb9..958fb31 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
@@ -475,38 +475,46 @@ public abstract class AbstractFreeList extends PagesList imp
 
 int written = 0;
 
-do {
-if (written != 0)
-memMetrics.incrementLargeEntriesPages();
+try {
+do {
+if (written != 0)
+memMetrics.incrementLargeEntriesPages();
 
-int remaining = rowSize - written;
+int remaining = rowSize - written;
 
-long pageId = 0L;
+long pageId = 0L;
 
-for (int b = remaining < MIN_SIZE_FOR_DATA_PAGE ? 
bucket(remaining, false) + 1 : REUSE_BUCKET; b < BUCKETS; b++) {
-pageId = takeEmptyPage(b, ioVersions(), statHolder);
+for (int b = remaining < MIN_SIZE_FOR_DATA_PAGE ? 
bucket(remaining, false) + 1 : REUSE_BUCKET; b < BUCKETS; b++) {
+pageId = takeEmptyPage(b, ioVersions(), statHolder);
 
-if (pageId != 0L)
-break;
-}
+if (pageId != 0L)
+break;
+}
 
-AbstractDataPageIO initIo = null;
+AbstractDataPageIO initIo = null;
 
-if (pageId == 0L) {
-pageId = allocateDataPage(row.partition());
+if (pageId == 0L) {
+pageId = allocateDataPage(row.partition());
 
-initIo = ioVersions().latest();
-}
-else if (PageIdUtils.tag(pageId) != PageIdAllocator.FLAG_DATA)
-pageId = initReusedPage(pageId, row.partition(), statHolder);
-else
-pageId = PageIdUtils.changePartitionId(pageId, 
(row.partition()));
+

[ignite] branch master updated: IGNITE-10069: SQL: Added test for implicit schema resolution. This closes #6424.

2019-04-10 Thread vozerov 
This is an automated email from the ASF dual-hosted git repository.

vozerov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new 6808559  IGNITE-10069: SQL: Added test for implicit schema resolution. 
This closes #6424.
6808559 is described below

commit 6808559c741cf1a8b2770617d44af4d650c9f815
Author: alapin 
AuthorDate: Wed Apr 10 15:25:43 2019 +0300

IGNITE-10069: SQL: Added test for implicit schema resolution. This closes 
#6424.
---
 .../ignite/internal/processors/query/SqlSchemaSelfTest.java  | 12 
 1 file changed, 12 insertions(+)

diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
index 0a446c2..16bfc2b 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
@@ -328,6 +328,18 @@ public class SqlSchemaSelfTest extends 
AbstractIndexingCommonTest {
 }
 
 /**
+ * Test table creation and data retrieval with implicit schema.
+ */
+@Test
+public void testImplicitSchema() {
+IgniteCache c = node.getOrCreateCache("testCache1");
+
+c.query(new SqlFieldsQuery("CREATE TABLE TEST1 (ID LONG PRIMARY KEY, 
VAL LONG)" +
+" WITH \"template=replicated\";")).getAll();
+c.query(new SqlFieldsQuery("SELECT * FROM TEST1")).getAll();
+}
+
+/**
  * Person key.
  */
 public static class PersonKey {

[ignite] branch master updated: IGNITE-11684 Fix CacheSerializableTransactionsTest#testGetRemoveTxNearCache2 (and 1) is flaky - Fixes #6410.

2019-04-10 Thread dgovorukhin 
This is an automated email from the ASF dual-hosted git repository.

dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new a167a06  IGNITE-11684 Fix 
CacheSerializableTransactionsTest#testGetRemoveTxNearCache2 (and 1) is flaky - 
Fixes #6410.
a167a06 is described below

commit a167a064081329285eab6bb90db26ebd6f0ed344
Author: ibessonov 
AuthorDate: Wed Apr 10 13:37:36 2019 +0300

IGNITE-11684 Fix 
CacheSerializableTransactionsTest#testGetRemoveTxNearCache2 (and 1) is flaky - 
Fixes #6410.

Signed-off-by: Dmitriy Govorukhin 
---
 .../processors/cache/GridCacheMapEntry.java| 28 --
 .../internal/processors/cache/GridCacheMvcc.java   |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

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 2428290..352ca0c 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
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -1735,8 +1736,31 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 
 if (mvcc == null || mvcc.isEmpty(tx.xidVersion()))
 clearReaders();
-else
-clearReader(tx.originatingNodeId());
+else {
+// Optimize memory usage - do not allocate 
additional array.
+List locs = 
mvcc.localCandidatesNoCopy(false);
+
+GridCacheVersion txVer = tx.xidVersion();
+
+UUID originatingNodeId = tx.originatingNodeId();
+
+boolean hasOriginatingNodeId = false;
+
+for (GridCacheMvccCandidate c : locs) {
+if (c.reentry() || Objects.equals(c.version(), 
txVer))
+continue;
+
+if (Objects.equals(c.otherNodeId(), 
originatingNodeId)) {
+hasOriginatingNodeId = true;
+
+break;
+}
+}
+
+// Remove reader only if there are no other active 
transactions from it.
+if (!hasOriginatingNodeId)
+clearReader(originatingNodeId);
+}
 }
 }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 52523b1..9ba8c63 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -1401,7 +1401,7 @@ public final class GridCacheMvcc {
 
 for (GridCacheMvccCandidate c : col) {
 // Don't include reentries.
-if ((!c.reentry() || (reentries && c.reentry())) && 
!U.containsObjectArray(excludeVers, c.version()))
+if ((reentries || !c.reentry()) && 
!U.containsObjectArray(excludeVers, c.version()))
 cands.add(c);
 }

[ignite] branch master updated: IGNITE-11706 Avoided undetermined behaviour in test. - Fixes #6426.

2019-04-10 Thread dgovorukhin 
This is an automated email from the ASF dual-hosted git repository.

dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new 656b2f1  IGNITE-11706 Avoided undetermined behaviour in test. - Fixes 
#6426.
656b2f1 is described below

commit 656b2f112c9949b8d9bd101ec0012c9c5968818d
Author: ibessonov 
AuthorDate: Wed Apr 10 13:34:10 2019 +0300

IGNITE-11706 Avoided undetermined behaviour in test. - Fixes #6426.

Signed-off-by: Dmitriy Govorukhin 
---
 .../processors/metastorage/DistributedMetaStoragePersistentTest.java| 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStoragePersistentTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStoragePersistentTest.java
index 199a7c6..201626d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStoragePersistentTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStoragePersistentTest.java
@@ -40,6 +40,7 @@ import 
org.apache.ignite.testframework.junits.WithSystemProperty;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_BASELINE_AUTO_ADJUST_ENABLED;
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_GLOBAL_METASTORAGE_HISTORY_MAX_BYTES;
 import static 
org.apache.ignite.internal.GridComponent.DiscoveryDataExchangeType.META_STORAGE;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -540,6 +541,7 @@ public class DistributedMetaStoragePersistentTest extends 
DistributedMetaStorage
  * @throws Exception If failed.
  */
 @Test @SuppressWarnings("ThrowableNotThrown")
+@WithSystemProperty(key = IGNITE_BASELINE_AUTO_ADJUST_ENABLED, value = 
"false")
 public void testConflictingData() throws Exception {
 startGrid(0);

[ignite] branch master updated: IGNITE-11702 Awaiting PME in test. - Fixes #6425.

2019-04-10 Thread dgovorukhin 
This is an automated email from the ASF dual-hosted git repository.

dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new 438c9e1  IGNITE-11702 Awaiting PME in test. - Fixes #6425.
438c9e1 is described below

commit 438c9e1865d8ecfe0744621390452369f4676302
Author: ibessonov 
AuthorDate: Wed Apr 10 13:29:56 2019 +0300

IGNITE-11702 Awaiting PME in test. - Fixes #6425.

Signed-off-by: Dmitriy Govorukhin 
---
 .../cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index 196bf32..7b6ec73 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -175,9 +175,11 @@ public class GridCacheNearOnlyTopologySelfTest extends 
GridCommonAbstractTest {
 Ignite ignite = startGrid(i);
 
 if (cilent)
-ignite.createNearCache(DEFAULT_CACHE_NAME, new 
NearCacheConfiguration());
+ignite.createNearCache(DEFAULT_CACHE_NAME, new 
NearCacheConfiguration<>());
 }
 
+awaitPartitionMapExchange();
+
 for (int i = 0; i < 10; i++)
 grid(1).cache(DEFAULT_CACHE_NAME).put(i, i);

[ignite] branch master updated: IGNITE-8588 .NET: Improve serialization error message when derived type hides base type member

2019-04-10 Thread ptupitsyn 
This is an automated email from the ASF dual-hosted git repository.

ptupitsyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new 1a7e62a  IGNITE-8588 .NET: Improve serialization error message when 
derived type hides base type member
1a7e62a is described below

commit 1a7e62a84619a25777e74fd9f5a3d68e9f5f6248
Author: Aleksandr Shapkin <1449488+ashap...@users.noreply.github.com>
AuthorDate: Wed Apr 10 09:49:20 2019 +0300

IGNITE-8588 .NET: Improve serialization error message when derived type 
hides base type member

#6359
---
 .../Binary/BinaryBuilderSelfTest.cs| 69 ++
 .../Binary/BinaryReflectiveSerializerInternal.cs   | 14 -
 2 files changed, 80 insertions(+), 3 deletions(-)

diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
index f03a77a..8931c21 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
@@ -1835,6 +1835,42 @@ namespace Apache.Ignite.Core.Tests.Binary
 
 Assert.AreEqual(new[] {1, 2, 1, 1, 1, 3}, bytes1);
 }
+
+[Test]
+public void TestTypeWithDuplicatePropertyName()
+{
+var marsh = new Marshaller(null);
+TestDelegate action = () => 
marsh.GetDescriptor(typeof(DerivedSamePropertyClass));
+
+var ex = Assert.Throws(action);
+var expectedMessage = "DerivedSamePropertyClass derives from 
BaseSamePropertyClass and hides field Property " +
+  "from the base class. Ignite can not 
serialize two fields with the same name.";
+Assert.AreEqual(expectedMessage, ex.Message);
+}
+
+[Test]
+public void TestIncorrectBinaryFieldMapperException()
+{
+var cfg = new BinaryConfiguration
+{
+TypeConfigurations = new[]
+{
+new BinaryTypeConfiguration
+{
+TypeName = typeof(BaseSamePropertyClass).FullName,
+IdMapper = new IncorrectIdMapper()
+}
+}
+};
+
+// ReSharper disable once ObjectCreationAsStatement
+TestDelegate action = () => new Marshaller(cfg);
+
+var ex = Assert.Throws(action);
+var expectedMessage = "Conflicting field IDs 
[type=BaseSamePropertyClass, field1=Property, field2=BaseName, fieldId=-1])";
+
+Assert.AreEqual(expectedMessage, ex.Message);
+}
 }
 
 /// 
@@ -2179,6 +2215,22 @@ namespace Apache.Ignite.Core.Tests.Binary
 }
 
 /// 
+/// Test incorrect id mapper.
+/// 
+public class IncorrectIdMapper : IBinaryIdMapper
+{
+public int GetTypeId(string typeName)
+{
+return -1;
+}
+
+public int GetFieldId(int typeId, string fieldName)
+{
+return -1;
+}
+}
+
+/// 
 /// Test name mapper.
 /// 
 public class NameMapper : IBinaryNameMapper
@@ -2228,4 +2280,21 @@ namespace Apache.Ignite.Core.Tests.Binary
 /** */
 public int NameMapperTestField { get; set; }
 }
+
+/// 
+/// Base class for testing.
+/// 
+public class BaseSamePropertyClass
+{
+public int Property { get; private set; }
+public string BaseName { get; private set; }
+}
+
+/// 
+/// Derived class that hides base class' property name.
+/// 
+public class DerivedSamePropertyClass : BaseSamePropertyClass
+{
+public new int Property { get; private set; }
+}
 }
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializerInternal.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializerInternal.cs
index 62c19ef..c59bd30 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializerInternal.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializerInternal.cs
@@ -152,9 +152,17 @@ namespace Apache.Ignite.Core.Impl.Binary
 
 if (idMap.ContainsKey(fieldId))
 {
-throw new BinaryObjectException("Conflicting field IDs 
[type=" +
-type.Name + ", field1=" + 
idMap[fieldId] + ", field2=" + fieldName +
-", fieldId=" + fieldId + 
']');
+if (fieldName == idMap[fieldId])
+{
+string baseClassName = field.DeclaringType != null ? 
field.DeclaringType.Name :

[ignite] branch master updated: .NET: Improve assertion in DataRegionMetricsTest.TestMemoryMetrics

2019-04-10 Thread ptupitsyn 
This is an automated email from the ASF dual-hosted git repository.

ptupitsyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
 new d18f98e  .NET: Improve assertion in 
DataRegionMetricsTest.TestMemoryMetrics
d18f98e is described below

commit d18f98ea39deb85c37d03fc0c521faff66886448
Author: Pavel Tupitsyn 
AuthorDate: Wed Apr 10 09:37:29 2019 +0300

.NET: Improve assertion in DataRegionMetricsTest.TestMemoryMetrics
---
 .../Cache/DataRegionMetricsTest.cs| 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
index d977694..d2ff32c 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/DataRegionMetricsTest.cs
@@ -62,7 +62,20 @@ namespace Apache.Ignite.Core.Tests.Cache
 
 // Verify metrics.
 var metrics = ignite.GetDataRegionMetrics().OrderBy(x => 
x.Name).ToArray();
-Assert.AreEqual(6, metrics.Length);  // three defined plus system, 
metastorage and TxLog.
+var names = metrics.Select(x => x.Name).ToArray();
+
+Assert.AreEqual(
+new[]
+{
+"metastoreMemPlc",
+RegionNoMetrics,
+RegionWithMetrics,
+RegionWithMetricsAndPersistence,
+"sysMemPlc",
+"TxLog"
+},
+names,
+string.Join(", ", names));
 
 var emptyMetrics = metrics[1];
 Assert.AreEqual(RegionNoMetrics, emptyMetrics.Name);