date:20180417

ignite git commit: IGNITE-8294 Web Console: Move "Beta" ribbon to the left.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 4685ebe5f -> 5efc589fc


IGNITE-8294 Web Console: Move "Beta" ribbon to the left.

(cherry picked from commit 69606e4)


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

Branch: refs/heads/ignite-2.5
Commit: 5efc589fcabffdb29cd6dfe0e7323bc91db47703
Parents: 4685ebe
Author: Ilya Borisov 
Authored: Wed Apr 18 11:39:41 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Apr 18 11:40:31 2018 +0700

--
 .../web-console/frontend/public/stylesheets/style.scss| 10 ++
 modules/web-console/frontend/views/index.pug  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5efc589f/modules/web-console/frontend/public/stylesheets/style.scss
--
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss 
b/modules/web-console/frontend/public/stylesheets/style.scss
index ae1e58c..0c978e9 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -1938,6 +1938,16 @@ treecontrol.tree-classic {
 }
 }
 
+.ribbon-wrapper.left {
+overflow: visible;
+
+.ribbon {
+transform: rotate(-45deg);
+left: -75px;
+top: 10px;
+}
+}
+
 html, body {
 width: 100%;
 min-height: 100vh;

http://git-wip-us.apache.org/repos/asf/ignite/blob/5efc589f/modules/web-console/frontend/views/index.pug
--
diff --git a/modules/web-console/frontend/views/index.pug 
b/modules/web-console/frontend/views/index.pug
index e91af9b..6384592 100644
--- a/modules/web-console/frontend/views/index.pug
+++ b/modules/web-console/frontend/views/index.pug
@@ -39,7 +39,7 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
 
 .splash-wellcome Loading...
 
-.ribbon-wrapper.right(ng-if='!IgniteDemoMode')
+.ribbon-wrapper.left(ng-if='!IgniteDemoMode')
 .ribbon
 label Beta

ignite git commit: IGNITE-8294 Web Console: Move "Beta" ribbon to the left.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/master eda5fe736 -> 69606e424


IGNITE-8294 Web Console: Move "Beta" ribbon to the left.


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

Branch: refs/heads/master
Commit: 69606e4248a69d44f798c9f59865281c19744a69
Parents: eda5fe7
Author: Ilya Borisov 
Authored: Wed Apr 18 11:39:41 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Apr 18 11:39:41 2018 +0700

--
 .../web-console/frontend/public/stylesheets/style.scss| 10 ++
 modules/web-console/frontend/views/index.pug  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/69606e42/modules/web-console/frontend/public/stylesheets/style.scss
--
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss 
b/modules/web-console/frontend/public/stylesheets/style.scss
index ae1e58c..0c978e9 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -1938,6 +1938,16 @@ treecontrol.tree-classic {
 }
 }
 
+.ribbon-wrapper.left {
+overflow: visible;
+
+.ribbon {
+transform: rotate(-45deg);
+left: -75px;
+top: 10px;
+}
+}
+
 html, body {
 width: 100%;
 min-height: 100vh;

http://git-wip-us.apache.org/repos/asf/ignite/blob/69606e42/modules/web-console/frontend/views/index.pug
--
diff --git a/modules/web-console/frontend/views/index.pug 
b/modules/web-console/frontend/views/index.pug
index e91af9b..6384592 100644
--- a/modules/web-console/frontend/views/index.pug
+++ b/modules/web-console/frontend/views/index.pug
@@ -39,7 +39,7 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
 
 .splash-wellcome Loading...
 
-.ribbon-wrapper.right(ng-if='!IgniteDemoMode')
+.ribbon-wrapper.left(ng-if='!IgniteDemoMode')
 .ribbon
 label Beta

ignite git commit: IGNITE-8140 Web Console: Fixed code generation for large numbers in configuration params.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 e394693a7 -> 4685ebe5f


IGNITE-8140 Web Console: Fixed code generation for large numbers in 
configuration params.

(cherry picked from commit eda5fe7)


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

Branch: refs/heads/ignite-2.5
Commit: 4685ebe5f5dda4023980398806e222fada895e26
Parents: e394693
Author: Vasiliy Sisko 
Authored: Wed Apr 18 10:44:44 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Apr 18 10:47:54 2018 +0700

--
 .../generator/ConfigurationGenerator.js | 106 +--
 1 file changed, 53 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4685ebe5/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
--
diff --git 
a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
 
b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
index 45d9ad1..c5f82d3 100644
--- 
a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ 
b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -720,8 +720,8 @@ export default class IgniteConfigurationGenerator {
 .intProperty('connectionTimeout')
 .intProperty('requestTimeout')
 .stringProperty('signerOverride')
-.intProperty('connectionTTL')
-.intProperty('connectionMaxIdleMillis')
+.longProperty('connectionTTL')
+.longProperty('connectionMaxIdleMillis')
 .emptyBeanProperty('dnsResolver')
 .intProperty('responseMetadataCacheSize')
 .emptyBeanProperty('secureRandom')
@@ -790,7 +790,7 @@ export default class IgniteConfigurationGenerator {
 if (!available('2.3.0'))
 return cfg;
 
-cfg.intProperty('longQueryWarningTimeout');
+cfg.longProperty('longQueryWarningTimeout');
 
 if (_.get(cluster, 'clientConnectorConfiguration.enabled') !== true)
 return cfg;
@@ -837,7 +837,7 @@ export default class IgniteConfigurationGenerator {
 
 colSpi.intProperty('activeJobsThreshold')
 .intProperty('waitJobsThreshold')
-.intProperty('messageExpireTime')
+.longProperty('messageExpireTime')
 .intProperty('maximumStealingAttempts')
 .boolProperty('stealingEnabled')
 .emptyBeanProperty('externalCollisionListener')
@@ -892,9 +892,9 @@ export default class IgniteConfigurationGenerator {
 .intProperty('sharedMemoryPort')
 .intProperty('directBuffer')
 .intProperty('directSendBuffer')
-.intProperty('idleConnectionTimeout')
-.intProperty('connectTimeout')
-.intProperty('maxConnectTimeout')
+.longProperty('idleConnectionTimeout')
+.longProperty('connectTimeout')
+.longProperty('maxConnectTimeout')
 .intProperty('reconnectCount')
 .intProperty('socketSendBuffer')
 .intProperty('socketReceiveBuffer')
@@ -903,19 +903,19 @@ export default class IgniteConfigurationGenerator {
 .intProperty('tcpNoDelay')
 .intProperty('ackSendThreshold')
 .intProperty('unacknowledgedMessagesBufferSize')
-.intProperty('socketWriteTimeout')
+.longProperty('socketWriteTimeout')
 .intProperty('selectorsCount')
 .emptyBeanProperty('addressResolver');
 
 if (commSpi.nonEmpty())
 cfg.beanProperty('communicationSpi', commSpi);
 
-cfg.intProperty('networkTimeout')
-.intProperty('networkSendRetryDelay')
+cfg.longProperty('networkTimeout')
+.longProperty('networkSendRetryDelay')
 .intProperty('networkSendRetryCount');
 
 if (available(['1.0.0', '2.3.0']))
-cfg.intProperty('discoveryStartupDelay');
+cfg.longProperty('discoveryStartupDelay');
 
 return cfg;
 }
@@ -930,9 +930,9 @@ export default class IgniteConfigurationGenerator {
 .stringProperty('host')
 .intProperty('port')
 .intProperty('portRange')
-.intProperty('idleTimeout')
-

ignite git commit: IGNITE-8140 Web Console: Fixed code generation for large numbers in configuration params.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/master 56be24b9d -> eda5fe736


IGNITE-8140 Web Console: Fixed code generation for large numbers in 
configuration params.


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

Branch: refs/heads/master
Commit: eda5fe736df920cad305540b500dcaf1a772f2d8
Parents: 56be24b
Author: Vasiliy Sisko 
Authored: Wed Apr 18 10:44:44 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Apr 18 10:44:44 2018 +0700

--
 .../generator/ConfigurationGenerator.js | 106 +--
 1 file changed, 53 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/eda5fe73/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
--
diff --git 
a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
 
b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
index 45d9ad1..c5f82d3 100644
--- 
a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ 
b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -720,8 +720,8 @@ export default class IgniteConfigurationGenerator {
 .intProperty('connectionTimeout')
 .intProperty('requestTimeout')
 .stringProperty('signerOverride')
-.intProperty('connectionTTL')
-.intProperty('connectionMaxIdleMillis')
+.longProperty('connectionTTL')
+.longProperty('connectionMaxIdleMillis')
 .emptyBeanProperty('dnsResolver')
 .intProperty('responseMetadataCacheSize')
 .emptyBeanProperty('secureRandom')
@@ -790,7 +790,7 @@ export default class IgniteConfigurationGenerator {
 if (!available('2.3.0'))
 return cfg;
 
-cfg.intProperty('longQueryWarningTimeout');
+cfg.longProperty('longQueryWarningTimeout');
 
 if (_.get(cluster, 'clientConnectorConfiguration.enabled') !== true)
 return cfg;
@@ -837,7 +837,7 @@ export default class IgniteConfigurationGenerator {
 
 colSpi.intProperty('activeJobsThreshold')
 .intProperty('waitJobsThreshold')
-.intProperty('messageExpireTime')
+.longProperty('messageExpireTime')
 .intProperty('maximumStealingAttempts')
 .boolProperty('stealingEnabled')
 .emptyBeanProperty('externalCollisionListener')
@@ -892,9 +892,9 @@ export default class IgniteConfigurationGenerator {
 .intProperty('sharedMemoryPort')
 .intProperty('directBuffer')
 .intProperty('directSendBuffer')
-.intProperty('idleConnectionTimeout')
-.intProperty('connectTimeout')
-.intProperty('maxConnectTimeout')
+.longProperty('idleConnectionTimeout')
+.longProperty('connectTimeout')
+.longProperty('maxConnectTimeout')
 .intProperty('reconnectCount')
 .intProperty('socketSendBuffer')
 .intProperty('socketReceiveBuffer')
@@ -903,19 +903,19 @@ export default class IgniteConfigurationGenerator {
 .intProperty('tcpNoDelay')
 .intProperty('ackSendThreshold')
 .intProperty('unacknowledgedMessagesBufferSize')
-.intProperty('socketWriteTimeout')
+.longProperty('socketWriteTimeout')
 .intProperty('selectorsCount')
 .emptyBeanProperty('addressResolver');
 
 if (commSpi.nonEmpty())
 cfg.beanProperty('communicationSpi', commSpi);
 
-cfg.intProperty('networkTimeout')
-.intProperty('networkSendRetryDelay')
+cfg.longProperty('networkTimeout')
+.longProperty('networkSendRetryDelay')
 .intProperty('networkSendRetryCount');
 
 if (available(['1.0.0', '2.3.0']))
-cfg.intProperty('discoveryStartupDelay');
+cfg.longProperty('discoveryStartupDelay');
 
 return cfg;
 }
@@ -930,9 +930,9 @@ export default class IgniteConfigurationGenerator {
 .stringProperty('host')
 .intProperty('port')
 .intProperty('portRange')
-.intProperty('idleTimeout')
-.intProperty('idleQueryCursorTimeout')

ignite git commit: IGNITE-8301 testReconnectCacheDestroyedAndCreated should excpect recreated client cache - Fixes #3856.

2018-04-17 Thread dpavlov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 6cea78e4e -> e394693a7


IGNITE-8301 testReconnectCacheDestroyedAndCreated should excpect recreated 
client cache - Fixes #3856.

Signed-off-by: dpavlov 

(cherry picked from commit 56be24b)


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

Branch: refs/heads/ignite-2.5
Commit: e394693a7389b4daff328827abdb1dcd28783f66
Parents: 6cea78e
Author: Maxim Muzafarov 
Authored: Tue Apr 17 21:18:36 2018 +0300
Committer: dpavlov 
Committed: Tue Apr 17 21:20:44 2018 +0300

--
 .../apache/ignite/internal/IgniteClientReconnectCacheTest.java | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e394693a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 3cb82e0..ec5eab2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -894,12 +894,6 @@ public class IgniteClientReconnectCacheTest extends 
IgniteClientReconnectAbstrac
 }
 });
 
-GridTestUtils.assertThrows(log, new Callable() {
-@Override public Object call() throws Exception {
-return clientCache.get(1);
-}
-}, IllegalStateException.class, null);
-
 checkCacheDiscoveryData(srv, client, DEFAULT_CACHE_NAME, true, false, 
false);
 
 IgniteCache clientCache0 = 
client.cache(DEFAULT_CACHE_NAME);

ignite git commit: IGNITE-8301 testReconnectCacheDestroyedAndCreated should excpect recreated client cache - Fixes #3856.

2018-04-17 Thread dpavlov

Repository: ignite
Updated Branches:
  refs/heads/master c3ff274d4 -> 56be24b9d


IGNITE-8301 testReconnectCacheDestroyedAndCreated should excpect recreated 
client cache - Fixes #3856.

Signed-off-by: dpavlov 


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

Branch: refs/heads/master
Commit: 56be24b9dfc14023bacaab63f40e0504b317eda3
Parents: c3ff274
Author: Maxim Muzafarov 
Authored: Tue Apr 17 21:18:36 2018 +0300
Committer: dpavlov 
Committed: Tue Apr 17 21:18:36 2018 +0300

--
 .../apache/ignite/internal/IgniteClientReconnectCacheTest.java | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/56be24b9/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 3cb82e0..ec5eab2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -894,12 +894,6 @@ public class IgniteClientReconnectCacheTest extends 
IgniteClientReconnectAbstrac
 }
 });
 
-GridTestUtils.assertThrows(log, new Callable() {
-@Override public Object call() throws Exception {
-return clientCache.get(1);
-}
-}, IllegalStateException.class, null);
-
 checkCacheDiscoveryData(srv, client, DEFAULT_CACHE_NAME, true, false, 
false);
 
 IgniteCache clientCache0 = 
client.cache(DEFAULT_CACHE_NAME);

ignite git commit: IGNITE-8274 sqlline.sh script uses JAVA_HOME now

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/master c000fbc5b -> c3ff274d4


IGNITE-8274 sqlline.sh script uses JAVA_HOME now

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/master
Commit: c3ff274d4a9a8f228fabfc4bfbe85823e0cc0ec8
Parents: c000fbc
Author: oleg-ostanin 
Authored: Tue Apr 17 20:58:53 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 20:58:53 2018 +0300

--
 modules/sqlline/bin/sqlline.sh | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c3ff274d/modules/sqlline/bin/sqlline.sh
--
diff --git a/modules/sqlline/bin/sqlline.sh b/modules/sqlline/bin/sqlline.sh
index 5745aea..552440d 100644
--- a/modules/sqlline/bin/sqlline.sh
+++ b/modules/sqlline/bin/sqlline.sh
@@ -36,6 +36,11 @@ SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
 source "${SCRIPTS_HOME}"/include/functions.sh
 
 #
+# Discover path to Java executable and check it's version.
+#
+checkJava
+
+#
 # Discover IGNITE_HOME environment variable.
 #
 setIgniteHome
@@ -51,4 +56,4 @@ CP="${IGNITE_LIBS}"
 
 CP="${CP}${SEP}${IGNITE_HOME_TMP}/bin/include/sqlline/*"
 
-java -cp ${CP} sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver $@
\ No newline at end of file
+"$JAVA" -cp ${CP} sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver $@
\ No newline at end of file

ignite git commit: IGNITE-7770 Test testRandomMixedTxConfigurations partialy fixed

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 acfef907d -> 6cea78e4e


IGNITE-7770 Test testRandomMixedTxConfigurations partialy fixed

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-2.5
Commit: 6cea78e4e13fe43555b78dcd683366f54c6816ff
Parents: acfef90
Author: Andrey Kuznetsov 
Authored: Tue Apr 17 19:58:43 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 20:45:02 2018 +0300

--
 .../processors/cache/GridCacheAdapter.java  |  3 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  2 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  2 +-
 .../GridNearPessimisticTxPrepareFuture.java |  2 +-
 .../near/GridNearTxFastFinishFuture.java| 10 ++--
 .../cache/distributed/near/GridNearTxLocal.java | 57 +---
 .../cache/transactions/IgniteTxManager.java |  5 +-
 .../transactions/TxRollbackOnTimeoutTest.java   |  2 +
 8 files changed, 55 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6cea78e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c2d0f42..bd613a1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -104,6 +104,7 @@ import 
org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFi
 import org.apache.ignite.internal.processors.task.GridInternal;
 import 
org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
 import 
org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
 import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -4283,7 +4284,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache

ignite git commit: IGNITE-7770 Test testRandomMixedTxConfigurations partialy fixed

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/master 96cb795f3 -> c000fbc5b


IGNITE-7770 Test testRandomMixedTxConfigurations partialy fixed

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/master
Commit: c000fbc5ba0014a24f3b3a81d1607d66159abdc7
Parents: 96cb795
Author: Andrey Kuznetsov 
Authored: Tue Apr 17 19:58:43 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 20:02:44 2018 +0300

--
 .../processors/cache/GridCacheAdapter.java  |  3 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  2 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  2 +-
 .../GridNearPessimisticTxPrepareFuture.java |  2 +-
 .../near/GridNearTxFastFinishFuture.java| 10 ++--
 .../cache/distributed/near/GridNearTxLocal.java | 57 +---
 .../cache/transactions/IgniteTxManager.java |  5 +-
 .../transactions/TxRollbackOnTimeoutTest.java   |  2 +
 8 files changed, 55 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c000fbc5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c2d0f42..bd613a1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -104,6 +104,7 @@ import 
org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFi
 import org.apache.ignite.internal.processors.task.GridInternal;
 import 
org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
 import 
org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
 import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -4283,7 +4284,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache

ignite git commit: IGNITE-2766 Fix .net test. - Fixes #3853.

2018-04-17 Thread dpavlov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 cd59c8e64 -> acfef907d


IGNITE-2766 Fix .net test. - Fixes #3853.

Signed-off-by: dpavlov 

(cherry picked from commit 96cb795)


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

Branch: refs/heads/ignite-2.5
Commit: acfef907db8204ac93fc235770f36bf7f61269c3
Parents: cd59c8e
Author: Ilya Kasnacheev 
Authored: Tue Apr 17 19:50:51 2018 +0300
Committer: dpavlov 
Committed: Tue Apr 17 19:51:23 2018 +0300

--
 .../platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/acfef907/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
index 7e6222f..274439e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
@@ -98,10 +98,8 @@ namespace Apache.Ignite.Core.Tests
 cache1[1] = 2;
 Assert.AreEqual(2, cache1[1]);
 
-// Check that old cache instance does not work.
-var cacheEx1 = Assert.Throws(() => 
cache.Get(1));
-Assert.IsTrue(cacheEx1.Message.EndsWith("Failed to perform cache 
operation (cache is stopped): cache"), 
-cacheEx1.Message);
+// Check that old cache instance still works.
+Assert.AreEqual(2, cache.Get(1));
 }
 
 ///

ignite git commit: IGNITE-2766 Fix .net test. - Fixes #3853.

2018-04-17 Thread dpavlov

Repository: ignite
Updated Branches:
  refs/heads/master 7b39f1355 -> 96cb795f3


IGNITE-2766 Fix .net test. - Fixes #3853.

Signed-off-by: dpavlov 


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

Branch: refs/heads/master
Commit: 96cb795f3d97af0e3dcb95fa0c81e31257d83431
Parents: 7b39f13
Author: Ilya Kasnacheev 
Authored: Tue Apr 17 19:50:51 2018 +0300
Committer: dpavlov 
Committed: Tue Apr 17 19:50:51 2018 +0300

--
 .../platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/96cb795f/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
index 7e6222f..274439e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
@@ -98,10 +98,8 @@ namespace Apache.Ignite.Core.Tests
 cache1[1] = 2;
 Assert.AreEqual(2, cache1[1]);
 
-// Check that old cache instance does not work.
-var cacheEx1 = Assert.Throws(() => 
cache.Get(1));
-Assert.IsTrue(cacheEx1.Message.EndsWith("Failed to perform cache 
operation (cache is stopped): cache"), 
-cacheEx1.Message);
+// Check that old cache instance still works.
+Assert.AreEqual(2, cache.Get(1));
 }
 
 ///

[14/23] ignite git commit: IGNITE-8292: Broken yardstick compilation.

2018-04-17 Thread agoncharuk

IGNITE-8292: Broken yardstick compilation.

this closes #3840


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

Branch: refs/heads/ignite-7708
Commit: 3cebf9123ed1161822ece503169b361f49293358
Parents: 8c80dce
Author: YuriBabak 
Authored: Tue Apr 17 11:54:41 2018 +0300
Committer: Yury Babak 
Committed: Tue Apr 17 11:54:41 2018 +0300

--
 ...niteKMeansDistributedClustererBenchmark.java | 75 
 .../IgniteKMeansLocalClustererBenchmark.java| 50 -
 .../yardstick/ml/clustering/package-info.java   | 22 --
 3 files changed, 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3cebf912/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
deleted file mode 100644
index de928e8..000
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.ml.clustering;
-
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.ml.clustering.KMeansDistributedClusterer;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
-import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.yardstick.IgniteAbstractBenchmark;
-import org.apache.ignite.yardstick.ml.DataChanger;
-
-/**
- * Ignite benchmark that performs ML Grid operations.
- */
-@SuppressWarnings("unused")
-public class IgniteKMeansDistributedClustererBenchmark extends 
IgniteAbstractBenchmark {
-/** */
-@IgniteInstanceResource
-private Ignite ignite;
-
-/** {@inheritDoc} */
-@Override public boolean test(Map ctx) throws Exception {
-final DataChanger.Scale scale = new DataChanger.Scale();
-
-// Create IgniteThread, we must work with SparseDistributedMatrix 
inside IgniteThread
-// because we create ignite cache internally.
-IgniteThread igniteThread = new 
IgniteThread(ignite.configuration().getIgniteInstanceName(),
-this.getClass().getSimpleName(), new Runnable() {
-/** {@inheritDoc} */
-@Override public void run() {
-// IMPL NOTE originally taken from 
KMeansDistributedClustererTest
-KMeansDistributedClusterer clusterer = new 
KMeansDistributedClusterer(
-new EuclideanDistance(), 1, 1, 1L);
-
-double[] v1 = scale.mutate(new double[] {1959, 325100});
-double[] v2 = scale.mutate(new double[] {1960, 373200});
-
-SparseDistributedMatrix points = new SparseDistributedMatrix(
-2, 2, StorageConstants.ROW_STORAGE_MODE, 
StorageConstants.RANDOM_ACCESS_MODE);
-
-points.setRow(0, v1);
-points.setRow(1, v2);
-
-clusterer.cluster(points, 1);
-
-points.destroy();
-}
-});
-
-igniteThread.start();
-
-igniteThread.join();
-
-return true;
-}
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/3cebf912/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansLocalClustererBenchmark.java

[20/23] ignite git commit: IGNITE-8257 GridFutureAdapterSelfTest#testChaining flaky-fails on TC (rarely)

2018-04-17 Thread agoncharuk

IGNITE-8257 GridFutureAdapterSelfTest#testChaining flaky-fails on TC (rarely)

Signed-off-by: Anton Vinogradov 


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

Branch: refs/heads/ignite-7708
Commit: 1b3a292a013527b53b13ad222da9ea0eabfff891
Parents: 63dc75b
Author: Vitaliy Biryukov 
Authored: Tue Apr 17 16:47:10 2018 +0300
Committer: Anton Vinogradov 
Committed: Tue Apr 17 16:47:10 2018 +0300

--
 .../ignite/internal/util/future/GridFutureAdapterSelfTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1b3a292a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
index 4bc9f01..89f3a03 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
@@ -280,7 +280,7 @@ public class GridFutureAdapterSelfTest extends 
GridCommonAbstractTest {
 
 fut.onDone("result");
 
-assertEquals("result", chain.get(1));
+assertEquals("result", exec == null ? chain.get(1) : chain.get());
 
 // Test exception re-thrown.

[16/23] ignite git commit: IGNITE-8210 Fixed custom event handling for baseline topology change - Fixes #3814.

2018-04-17 Thread agoncharuk

IGNITE-8210 Fixed custom event handling for baseline topology change - Fixes 
#3814.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-7708
Commit: d79c6409bcb8ca3170ce9153db486cac2c537fc4
Parents: 7731669
Author: Sergey Chugunov 
Authored: Tue Apr 17 14:28:47 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 14:28:47 2018 +0300

--
 .../affinity/GridAffinityAssignmentCache.java   |  2 +-
 .../distributed/CacheBaselineTopologyTest.java  | 94 
 2 files changed, 95 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d79c6409/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
--
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 b1899e3..9d5ce05 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
@@ -322,7 +322,7 @@ public class GridAffinityAssignmentCache {
 for (DiscoveryEvent event : events.events()) {
 boolean affinityNode = CU.affinityNode(event.eventNode(), 
nodeFilter);
 
-if (affinityNode) {
+if (affinityNode || event.type() == EVT_DISCOVERY_CUSTOM_EVT) {
 skipCalculation = false;
 
 break;

http://git-wip-us.apache.org/repos/asf/ignite/blob/d79c6409/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index 26502ed..0d59a2d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
 import org.apache.ignite.cache.affinity.AffinityFunction;
 import org.apache.ignite.cache.affinity.AffinityFunctionContext;
 import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
@@ -54,6 +55,7 @@ import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.Gri
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -81,6 +83,12 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
 private boolean delayRebalance;
 
 /** */
+private Map userAttrs;
+
+/** */
+private static final String DATA_NODE = "dataNodeUserAttr";
+
+/** */
 private static final TcpDiscoveryVmIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
 
 /** {@inheritDoc} */
@@ -129,6 +137,9 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
 .setWalMode(WALMode.LOG_ONLY)
 );
 
+if (userAttrs != null)
+cfg.setUserAttributes(userAttrs);
+
 if (client)
 cfg.setClientMode(true);
 
@@ -139,6 +150,89 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
 }
 
 /**
+ * Verifies that rebalance on cache with Node Filter happens when 
BaselineTopology changes.
+ *
+ * @throws Exception
+ */
+public void testRebalanceForCacheWithNodeFilter()

[17/23] ignite git commit: IGNITE-8255 Possible name collisions in WorkersRegistry.

2018-04-17 Thread agoncharuk

IGNITE-8255 Possible name collisions in WorkersRegistry.

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-7708
Commit: b810bd44805b04aa9c6fb3797ecd48b259fa3a8c
Parents: d79c640
Author: Dmitriy Sorokin 
Authored: Tue Apr 17 14:48:44 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 14:48:44 2018 +0300

--
 .../java/org/apache/ignite/internal/worker/WorkersRegistry.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b810bd44/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
index e8d46fb..16676c8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
@@ -36,7 +36,7 @@ public class WorkersRegistry implements GridWorkerListener {
  * @param w Worker.
  */
 public void register(GridWorker w) {
-if (registeredWorkers.putIfAbsent(w.name(), w) != null)
+if (registeredWorkers.putIfAbsent(w.runner().getName(), w) != null)
 throw new IllegalStateException("Worker is already registered 
[worker=" + w + ']');
 }
 
@@ -75,6 +75,6 @@ public class WorkersRegistry implements GridWorkerListener {
 
 /** {@inheritDoc} */
 @Override public void onStopped(GridWorker w) {
-unregister(w.name());
+unregister(w.runner().getName());
 }
 }

[15/23] ignite git commit: IGNITE-8200 Web Console: Override clonedCluster in cluster-edit-form if caches or models have changed. This improves interop with "import from DB" feature, which might updat

2018-04-17 Thread agoncharuk

IGNITE-8200 Web Console: Override clonedCluster in cluster-edit-form if caches 
or models have changed.
This improves interop with "import from DB" feature, which might update 
caches/models of cluster currently opened for editing.
The import dialog works as a separate state, so the form change detection 
mechanism ensures that any changes to the original
cluster are safe and won't interfere with changes made by user in cluster 
edit form.


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

Branch: refs/heads/ignite-7708
Commit: 77316692f14d083138d7515affd2d3f225b709e0
Parents: 3cebf91
Author: Ilya Borisov 
Authored: Tue Apr 17 17:15:57 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 17:15:57 2018 +0700

--
 .../components/cluster-edit-form/controller.js  | 24 +-
 .../cluster-edit-form/controller.spec.js| 81 
 2 files changed, 102 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/77316692/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
--
diff --git 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
index 35b43e0..0207729 100644
--- 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
+++ 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
@@ -17,6 +17,7 @@
 
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
 import _ from 'lodash';
 
 export default class ClusterEditFormController {
@@ -29,9 +30,11 @@ export default class ClusterEditFormController {
 constructor(IgniteLegacyUtils, IgniteEventGroups, IgniteConfirm, 
IgniteVersion, $scope, Clusters, IgniteFormUtils) {
 Object.assign(this, {IgniteLegacyUtils, IgniteEventGroups, 
IgniteConfirm, IgniteVersion, $scope, Clusters, IgniteFormUtils});
 }
+
 $onDestroy() {
 this.subscription.unsubscribe();
 }
+
 $onInit() {
 this.available = this.IgniteVersion.available.bind(this.IgniteVersion);
 
@@ -87,10 +90,9 @@ export default class ClusterEditFormController {
 this.$scope.ui = this.IgniteFormUtils.formUI();
 this.$scope.ui.loadedPanels = ['checkpoint', 'serviceConfiguration', 
'odbcConfiguration'];
 }
+
 $onChanges(changes) {
-if (
-'cluster' in changes && get(this.clonedCluster, '_id') !== 
get(this.cluster, '_id')
-) {
+if ('cluster' in changes && this.shouldOverwriteValue(this.cluster, 
this.clonedCluster)) {
 this.clonedCluster = cloneDeep(changes.cluster.currentValue);
 if (this.$scope.ui && this.$scope.ui.inputForm) {
 this.$scope.ui.inputForm.$setPristine();
@@ -100,14 +102,30 @@ export default class ClusterEditFormController {
 if ('caches' in changes)
 this.cachesMenu = (changes.caches.currentValue || []).map((c) => 
({label: c.name, value: c._id}));
 }
+
+/**
+ * The form should accept incoming cluster value if:
+ * 1. It has different _id ("new" to real id).
+ * 2. Different caches or models (imported from DB).
+ * @param {Object} a Incoming value.
+ * @param {Object} b Current value.
+ */
+shouldOverwriteValue(a, b) {
+return get(a, '_id') !== get(b, '_id') ||
+!isEqual(get(a, 'caches'), get(b, 'caches')) ||
+!isEqual(get(a, 'models'), get(b, 'models'));
+}
+
 getValuesToCompare() {
 return [this.cluster, this.clonedCluster].map(this.Clusters.normalize);
 }
+
 save() {
 if (this.$scope.ui.inputForm.$invalid)
 return 
this.IgniteFormUtils.triggerValidation(this.$scope.ui.inputForm, this.$scope);
 this.onSave({$event: cloneDeep(this.clonedCluster)});
 }
+
 reset = () => this.clonedCluster = cloneDeep(this.cluster);
 confirmAndReset() {
 return this.IgniteConfirm.confirm('Are you sure you want to undo all 
changes for current cluster?')

http://git-wip-us.apache.org/repos/asf/ignite/blob/77316692/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.spec.js
--
diff --git

[05/23] ignite git commit: IGNITE-8169: [ML] Adopt KMeans to the new Partitioned Dataset and cleanup old code

2018-04-17 Thread agoncharuk

IGNITE-8169:
[ML] Adopt KMeans to the new Partitioned Dataset and cleanup old code

this closes #3817


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

Branch: refs/heads/ignite-7708
Commit: 9e21cec024168105fd30bfb3acecf9fd24a52e8c
Parents: 228254a
Author: zaleslaw 
Authored: Mon Apr 16 20:20:49 2018 +0300
Committer: Yury Babak 
Committed: Mon Apr 16 20:20:49 2018 +0300

--
 .../clustering/DatasetWithObviousStructure.java | 105 
 .../ml/clustering/FuzzyCMeansExample.java   | 134 -
 .../ml/clustering/FuzzyCMeansLocalExample.java  |  95 
 .../clustering/KMeansClusterizationExample.java | 226 
 .../KMeansDistributedClustererExample.java  |  97 
 .../clustering/KMeansLocalClustererExample.java | 106 
 .../ignite/ml/FuzzyCMeansModelFormat.java   |  76 ---
 .../org/apache/ignite/ml/KMeansModelFormat.java |  77 ---
 .../ml/clustering/BaseFuzzyCMeansClusterer.java |  90 
 .../ml/clustering/BaseKMeansClusterer.java  |  96 
 .../apache/ignite/ml/clustering/Clusterer.java  |  33 --
 .../ml/clustering/ClusterizationModel.java  |  29 --
 .../FuzzyCMeansDistributedClusterer.java| 512 ---
 .../clustering/FuzzyCMeansLocalClusterer.java   | 254 -
 .../ignite/ml/clustering/FuzzyCMeansModel.java  |  88 
 .../clustering/KMeansDistributedClusterer.java  | 306 ---
 .../ml/clustering/KMeansLocalClusterer.java | 177 ---
 .../ignite/ml/clustering/KMeansModel.java   | 113 
 .../ignite/ml/clustering/WeightedClusterer.java |  38 --
 .../ignite/ml/clustering/kmeans/Clusterer.java  |  33 ++
 .../clustering/kmeans/ClusterizationModel.java  |  29 ++
 .../ml/clustering/kmeans/KMeansModel.java   | 112 
 .../ml/clustering/kmeans/KMeansModelFormat.java |  79 +++
 .../ml/clustering/kmeans/KMeansTrainer.java | 320 
 .../ml/clustering/kmeans/package-info.java  |  22 +
 .../preprocessing/LabellingMachine.java |  41 --
 .../ml/structures/preprocessing/Normalizer.java |  80 ---
 .../org/apache/ignite/ml/LocalModelsTest.java   |  26 +-
 .../ml/clustering/ClusteringTestSuite.java  |   7 +-
 .../FuzzyCMeansDistributedClustererTest.java| 180 ---
 .../FuzzyCMeansLocalClustererTest.java  | 202 
 ...KMeansDistributedClustererTestMultiNode.java | 138 -
 ...MeansDistributedClustererTestSingleNode.java | 198 ---
 .../ml/clustering/KMeansLocalClustererTest.java |  46 --
 .../ignite/ml/clustering/KMeansModelTest.java   |  63 +++
 .../ignite/ml/clustering/KMeansTrainerTest.java |  73 +++
 .../apache/ignite/ml/clustering/KMeansUtil.java |  33 --
 37 files changed, 977 insertions(+), 3357 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9e21cec0/examples/src/main/java/org/apache/ignite/examples/ml/clustering/DatasetWithObviousStructure.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/ml/clustering/DatasetWithObviousStructure.java
 
b/examples/src/main/java/org/apache/ignite/examples/ml/clustering/DatasetWithObviousStructure.java
deleted file mode 100644
index 5cd0e09..000
--- 
a/examples/src/main/java/org/apache/ignite/examples/ml/clustering/DatasetWithObviousStructure.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.ml.clustering;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import org.apache.ignite.ml.math.Matrix;
-import org.apache.ignite.ml.math.Vector;
-import org.apache.ignite.ml.math.VectorUtils;
-import

[12/23] ignite git commit: IGNITE-8292: Broken yardstick compilation.

2018-04-17 Thread agoncharuk

IGNITE-8292: Broken yardstick compilation.

this closes #3838


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

Branch: refs/heads/ignite-7708
Commit: e76fcb4a538aece58498f43d7e82b2054ca96c51
Parents: 5614621
Author: YuriBabak 
Authored: Tue Apr 17 11:22:14 2018 +0300
Committer: Yury Babak 
Committed: Tue Apr 17 11:22:14 2018 +0300

--
 ...uzzyCMeansDistributedClustererBenchmark.java | 130 ---
 ...gniteFuzzyCMeansLocalClustererBenchmark.java |  93 -
 2 files changed, 223 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e76fcb4a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
deleted file mode 100644
index e356746..000
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.ml.clustering;
-
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.ml.clustering.BaseFuzzyCMeansClusterer;
-import org.apache.ignite.ml.clustering.FuzzyCMeansDistributedClusterer;
-import org.apache.ignite.ml.clustering.FuzzyCMeansModel;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.distances.DistanceMeasure;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
-import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.yardstick.IgniteAbstractBenchmark;
-import org.apache.ignite.yardstick.ml.DataChanger;
-
-/**
- * Ignite benchmark that performs ML Grid operations.
- */
-@SuppressWarnings("unused")
-public class IgniteFuzzyCMeansDistributedClustererBenchmark extends 
IgniteAbstractBenchmark {
-/** */
-@IgniteInstanceResource
-private Ignite ignite;
-
-/** {@inheritDoc} */
-@Override public boolean test(Map ctx) throws Exception {
-// Create IgniteThread, we must work with SparseDistributedMatrix 
inside IgniteThread
-// because we create ignite cache internally.
-IgniteThread igniteThread = new 
IgniteThread(ignite.configuration().getIgniteInstanceName(),
-this.getClass().getSimpleName(), new Runnable() {
-/** {@inheritDoc} */
-@Override public void run() {
-// IMPL NOTE originally taken from FuzzyCMeansExample.
-// Distance measure that computes distance between two points.
-DistanceMeasure distanceMeasure = new EuclideanDistance();
-
-// "Fuzziness" - specific constant that is used in membership 
calculation (1.0+-eps ~ K-Means).
-double exponentialWeight = 2.0;
-
-// Condition that indicated when algorithm must stop.
-// In this example algorithm stops if memberships have changed 
insignificantly.
-BaseFuzzyCMeansClusterer.StopCondition stopCond =
-BaseFuzzyCMeansClusterer.StopCondition.STABLE_MEMBERSHIPS;
-
-// Maximum difference between new and old membership values 
with which algorithm will continue to work.
-double maxDelta = 0.01;
-
-// The maximum number of FCM iterations.
-int maxIterations = 50;
-
-

[22/23] ignite git commit: IGNITE-8033 Fixed flaky failure of TxOptimisticDeadlockDetectionCrossCacheTest

2018-04-17 Thread agoncharuk

IGNITE-8033 Fixed flaky failure of TxOptimisticDeadlockDetectionCrossCacheTest

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-7708
Commit: 7b39f1355cf7b0d4169622cec2936184168aba99
Parents: 2edcb22
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 18:27:53 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 18:50:15 2018 +0300

--
 ...timisticDeadlockDetectionCrossCacheTest.java | 147 +++
 1 file changed, 50 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b39f135/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
index 5d1374c..056b093 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
@@ -18,30 +18,21 @@
 package org.apache.ignite.internal.processors.cache.transactions;
 
 import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
 import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.managers.communication.GridIoMessage;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.internal.util.GridConcurrentHashSet;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteInClosure;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.IgniteSpiException;
-import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -57,9 +48,6 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
  *
  */
 public class TxOptimisticDeadlockDetectionCrossCacheTest extends 
GridCommonAbstractTest {
-/** Nodes count. */
-private static final int NODES_CNT = 2;
-
 /** {@inheritDoc} */
 @SuppressWarnings("unchecked")
 @Override protected IgniteConfiguration getConfiguration(String 
igniteInstanceName) throws Exception {
@@ -73,10 +61,6 @@ public class TxOptimisticDeadlockDetectionCrossCacheTest 
extends GridCommonAbstr
 cfg.setDiscoverySpi(discoSpi);
 }
 
-TcpCommunicationSpi commSpi = new TestCommunicationSpi();
-
-cfg.setCommunicationSpi(commSpi);
-
 CacheConfiguration ccfg0 = defaultCacheConfiguration();
 
 ccfg0.setName("cache0");
@@ -96,42 +80,46 @@ public class TxOptimisticDeadlockDetectionCrossCacheTest 
extends GridCommonAbstr
 return cfg;
 }
 
-/** {@inheritDoc} */
-@Override protected void beforeTestsStarted() throws Exception {
-super.beforeTestsStarted();
-
-startGrids(NODES_CNT);
-}
-
-/** {@inheritDoc} */
-@Override protected void afterTestsStopped() throws

[08/23] ignite git commit: IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new tests.

2018-04-17 Thread agoncharuk

IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new 
tests.


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

Branch: refs/heads/ignite-7708
Commit: 1cfc9897f41e8d8b48510029e7b650b2ed699c9a
Parents: 737933e
Author: Alexey Kuznetsov 
Authored: Tue Apr 17 11:46:45 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 11:46:45 2018 +0700

--
 .../client/suite/IgniteClientTestSuite.java |  6 +-
 .../JettyRestProcessorAbstractSelfTest.java | 60 ++-
 ...ettyRestProcessorAuthenticationSelfTest.java | 45 ++-
 ...rocessorAuthenticationWithCredsSelfTest.java | 32 
 ...rocessorAuthenticationWithTokenSelfTest.java | 80 
 .../processors/rest/GridRestCommand.java|  3 +
 .../processors/rest/GridRestProcessor.java  | 26 ---
 .../auth/AuthenticationCommandHandler.java  | 70 +
 .../rest/handlers/auth/package-info.java| 22 ++
 .../http/jetty/GridJettyRestHandler.java| 55 +++---
 10 files changed, 322 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1cfc9897/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 79fcf38..163f89a 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -49,7 +49,8 @@ import 
org.apache.ignite.internal.client.util.ClientByteUtilsTest;
 import org.apache.ignite.internal.client.util.ClientConsistentHashSelfTest;
 import org.apache.ignite.internal.client.util.ClientJavaHasherSelfTest;
 import 
org.apache.ignite.internal.processors.rest.ClientMemcachedProtocolSelfTest;
-import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithCredsSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithTokenSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorSignedSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorUnsignedSelfTest;
 import org.apache.ignite.internal.processors.rest.RestBinaryProtocolSelfTest;
@@ -87,7 +88,8 @@ public class IgniteClientTestSuite extends TestSuite {
 // Test jetty rest processor
 suite.addTestSuite(JettyRestProcessorSignedSelfTest.class);
 suite.addTestSuite(JettyRestProcessorUnsignedSelfTest.class);
-suite.addTestSuite(JettyRestProcessorAuthenticationSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithCredsSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithTokenSelfTest.class);
 
 // Test TCP rest processor with original memcache client.
 suite.addTestSuite(ClientMemcachedProtocolSelfTest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cfc9897/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 5dc44c4..e36447b 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -294,14 +294,19 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 
 /**
  * @param content Content to check.
+ * @return JSON node with actual response.
  */
-private JsonNode jsonCacheOperationResponse(String content, boolean bulk) 
throws IOException {
+protected JsonNode assertResponseSucceeded(String content, boolean bulk) 
throws IOException {
 assertNotNull(content);
 assertFalse(content.isEmpty());
 
 JsonNode node = JSON_MAPPER.readTree(content);
 
-

[11/23] ignite git commit: IGNITE-8291 Web Console: Fixed Docker file generation.

2018-04-17 Thread agoncharuk

IGNITE-8291 Web Console: Fixed Docker file generation.


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

Branch: refs/heads/ignite-7708
Commit: 5614621d1e1c0e84fe7915459961851f354fba88
Parents: bbc439b
Author: Ilya Borisov 
Authored: Tue Apr 17 15:01:36 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 15:01:36 2018 +0700

--
 .../configuration/generator/Docker.service.js   |  94 ++--
 .../generator/Docker.service.spec.js| 133 +
 modules/web-console/frontend/package-lock.json  | 550 ++-
 modules/web-console/frontend/package.json   |   1 +
 4 files changed, 475 insertions(+), 303 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5614621d/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
--
diff --git 
a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
 
b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
index ea49c41..8b03e9a 100644
--- 
a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
+++ 
b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 
+import {outdent} from 'outdent/lib';
+import VersionService from 'app/services/Version.service';
+import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
+import get from 'lodash/get';
+
+const version = new VersionService();
+
+const ALPINE_DOCKER_SINCE = '2.1.0';
+
 /**
  * Docker file generation entry point.
  */
@@ -29,10 +38,10 @@ export default class IgniteDockerGenerator {
  * @returns {String}
  */
 from(cluster, targetVer) {
-return [
-'# Start from Apache Ignite image.',
-`FROM apacheignite/ignite:${targetVer.ignite}`
-].join('\n');
+return outdent`
+# Start from Apache Ignite image.',
+FROM apacheignite/ignite:${targetVer.ignite}
+`;
 }
 
 /**
@@ -42,36 +51,59 @@ export default class IgniteDockerGenerator {
  * @param {Object} targetVer Target version.
  */
 generate(cluster, targetVer) {
+return outdent`
+${this.from(cluster, targetVer)}
+
+# Set config uri for node.
+ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml
+
+# Copy optional libs.
+ENV OPTION_LIBS ${this.optionLibs(cluster, targetVer).join(',')}
+
+# Update packages and install maven.
+${this.packages(cluster, targetVer)}
+
+# Append project to container.
+ADD . ${cluster.name}
+
+# Build project in container.
+RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests
+
+# Copy project jars to node classpath.
+RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\
+   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} 
$IGNITE_HOME/libs/${cluster.name} \\;
+`;
+}
+
+optionLibs(cluster, targetVer) {
 return [
-this.from(cluster, targetVer),
-'',
-'# Set config uri for node.',
-`ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml`,
-'',
-'# Copy ignite-http-rest from optional.',
-'ENV OPTION_LIBS ignite-rest-http',
-'',
-'# Update packages and install maven.',
-'RUN \\',
-'   apt-get update &&\\',
-'   apt-get install -y maven',
-'',
-'# Append project to container.',
-`ADD . ${cluster.name}`,
-'',
-'# Build project in container.',
-`RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests`,
-'',
-'# Copy project jars to node classpath.',
-`RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\`,
-`   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} 
$IGNITE_HOME/libs/${cluster.name} \\;`
-].join('\n');
+'ignite-rest-http',
+get(POM_DEPENDENCIES, [get(cluster, 'discovery.kind'), 
'artifactId'])
+].filter(Boolean);
+}
+
+packages(cluster, targetVer) {
+return version.since(targetVer.ignite, ALPINE_DOCKER_SINCE)
+? outdent`
+RUN set -x \\
+&& apk add --no-cache \\
+openjdk8
+
+RUN apk

[19/23] ignite git commit: IGNITE-8282 Direct IO: support fdatasync, which does not flush modified metadata - Fixes #3833.

2018-04-17 Thread agoncharuk

IGNITE-8282 Direct IO: support fdatasync, which does not flush modified 
metadata - Fixes #3833.

Signed-off-by: dpavlov 


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

Branch: refs/heads/ignite-7708
Commit: 63dc75b85b12f1c7bea796714c1e88925c16b1ab
Parents: e254e65
Author: dpavlov 
Authored: Tue Apr 17 16:25:37 2018 +0300
Committer: dpavlov 
Committed: Tue Apr 17 16:25:37 2018 +0300

--
 .../persistence/file/AlignedBuffersDirectFileIO.java  |  6 +-
 .../cache/persistence/file/IgniteNativeIoLib.java | 10 ++
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/63dc75b8/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
--
diff --git 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
index 681426c..0168d2a 100644
--- 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
+++ 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
@@ -471,7 +471,11 @@ public class AlignedBuffersDirectFileIO implements FileIO {
 
 /** {@inheritDoc} */
 @Override public void force(boolean withMetadata) throws IOException {
-if (IgniteNativeIoLib.fsync(fdCheckOpened()) < 0)
+int fd = fdCheckOpened();
+
+int res = withMetadata ? IgniteNativeIoLib.fsync(fd) : 
IgniteNativeIoLib.fdatasync(fd);
+
+if (res < 0)
 throw new IOException(String.format("Error fsync()'ing %s, got 
%s", file, getLastError()));
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/63dc75b8/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
--
diff --git 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
index 47f1e6a..65ef8d7 100644
--- 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
+++ 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
@@ -316,6 +316,16 @@ public class IgniteNativeIoLib {
 public static native int fsync(int fd);
 
 /**
+ * Synchronize a file's in-core state with storage device. See "man 2 
fsync".
+ *
+ * Similar to {@link #fsync(int)}, but does not flush modified metadata 
unless that metadata is needed in order to allow a subsequent data retrieval to 
be correctly handled
+ *
+ * @param fd file descriptor.
+ * @return On success return zero. On error, -1 is returned, and errno is 
set appropriately.
+ */
+public static native int fdatasync(int fd);
+
+/**
  * Allocates size bytes and places the address of the allocated memory in 
{@code memptr}.
  * The address of the allocated memory will be a multiple of {@code 
alignment}.
  *

[13/23] ignite git commit: IGNITE-8285 Web console: Removed debug output.

2018-04-17 Thread agoncharuk

IGNITE-8285 Web console: Removed debug output.


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

Branch: refs/heads/ignite-7708
Commit: 8c80dce3b8601ffc123cb6dec0255b66e4576272
Parents: e76fcb4
Author: Ilya Borisov 
Authored: Tue Apr 17 15:46:10 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 15:46:10 2018 +0700

--
 modules/web-console/frontend/app/components/page-configure/index.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8c80dce3/modules/web-console/frontend/app/components/page-configure/index.js
--
diff --git 
a/modules/web-console/frontend/app/components/page-configure/index.js 
b/modules/web-console/frontend/app/components/page-configure/index.js
index 3209ede..34b8cfe 100644
--- a/modules/web-console/frontend/app/components/page-configure/index.js
+++ b/modules/web-console/frontend/app/components/page-configure/index.js
@@ -164,7 +164,6 @@ export default angular
 state: actionsWindow.filter((a) => 
!actions.includes(a)).reduce(ConfigureState._combinedReducer, {})
 };
 })
-.debug('UNDOED')
 .do((a) => ConfigureState.dispatchAction(a))
 .subscribe();
 ConfigEffects.connect();

[21/23] ignite git commit: IGNITE-8021 Delete cache config files when cache is destroyed - Fixes #3697.

2018-04-17 Thread agoncharuk

IGNITE-8021 Delete cache config files when cache is destroyed - Fixes #3697.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-7708
Commit: 2edcb22fbb566981097733af6470ed6dde8e786b
Parents: 1b3a292
Author: Ivan Daschinskiy 
Authored: Tue Apr 17 18:05:42 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 18:05:42 2018 +0300

--
 .../pagemem/store/IgnitePageStoreManager.java   |   9 +
 .../processors/cache/GridCacheProcessor.java|  11 +
 .../persistence/file/FilePageStoreManager.java  |  47 +++
 ...eConfigurationDataAfterDestroyCacheTest.java | 326 +++
 .../pagemem/NoOpPageStoreManager.java   |   5 +
 .../ignite/testsuites/IgnitePdsTestSuite.java   |   2 +
 6 files changed, 400 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2edcb22f/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
index 1b46bf9..0fc9f94 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
@@ -193,6 +193,15 @@ public interface IgnitePageStoreManager extends 
GridCacheSharedManager, IgniteCh
  * @throws IgniteCheckedException If failed.
  */
 public void storeCacheData(StoredCacheData cacheData, boolean overwrite) 
throws IgniteCheckedException;
+
+/**
+ * Remove cache configuration data file.
+ *
+ * @param cacheData Cache configuration.
+ * @throws IgniteCheckedException If failed.
+ */
+public void removeCacheData(StoredCacheData cacheData) throws 
IgniteCheckedException;
+
 /**
  * @param grpId Cache group ID.
  * @return {@code True} if index store for given cache group existed 
before node started.

http://git-wip-us.apache.org/repos/asf/ignite/blob/2edcb22f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 36edd72..bceb8c7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1284,6 +1284,17 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 
 U.stopLifecycleAware(log, lifecycleAwares(ctx.group(), 
cache.configuration(), ctx.store().configuredStore()));
 
+IgnitePageStoreManager pageStore;
+
+if (destroy && (pageStore = sharedCtx.pageStore()) != null) {
+try {
+pageStore.removeCacheData(new 
StoredCacheData(ctx.config()));
+} catch (IgniteCheckedException e) {
+U.error(log, "Failed to delete cache configuration data 
while destroying cache" +
+"[cache=" + ctx.name() + "]", e);
+}
+}
+
 if (log.isInfoEnabled()) {
 if (ctx.group().sharedGroup())
 log.info("Stopped cache [cacheName=" + cache.name() + ", 
group=" + ctx.group().name() + ']');

http://git-wip-us.apache.org/repos/asf/ignite/blob/2edcb22f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
index 6313eac..837f3d0 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.io.InputStream;

[23/23] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-7708

2018-04-17 Thread agoncharuk

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into 
ignite-7708


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

Branch: refs/heads/ignite-7708
Commit: 7bde53f30008826ebb5da6341b5a803c598d1428
Parents: d08d007 7b39f13
Author: Alexey Goncharuk 
Authored: Tue Apr 17 18:58:42 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 18:58:42 2018 +0300

--
 .../clustering/DatasetWithObviousStructure.java | 105 
 .../ml/clustering/FuzzyCMeansExample.java   | 134 -
 .../ml/clustering/FuzzyCMeansLocalExample.java  |  95 
 .../clustering/KMeansClusterizationExample.java | 226 
 .../KMeansDistributedClustererExample.java  |  97 
 .../clustering/KMeansLocalClustererExample.java | 106 
 .../OptimizeMakeChangeTerminateCriteria.java|   2 +-
 .../genetic/movie/MovieTerminateCriteria.java   |   2 +-
 .../client/suite/IgniteClientTestSuite.java |   6 +-
 .../JettyRestProcessorAbstractSelfTest.java |  60 +-
 ...ettyRestProcessorAuthenticationSelfTest.java |  45 +-
 ...rocessorAuthenticationWithCredsSelfTest.java |  32 ++
 ...rocessorAuthenticationWithTokenSelfTest.java |  80 +++
 .../org/apache/ignite/cache/QueryEntity.java| 179 +-
 .../apache/ignite/cache/QueryEntityPatch.java   | 118 
 .../pagemem/store/IgnitePageStoreManager.java   |   9 +
 .../affinity/GridAffinityAssignmentCache.java   |   2 +-
 .../cache/CacheJoinNodeDiscoveryData.java   |  15 +-
 .../processors/cache/ClusterCachesInfo.java | 428 +++
 .../cache/DynamicCacheDescriptor.java   |  28 +
 .../processors/cache/GridCacheProcessor.java| 105 +++-
 .../processors/cache/GridCacheTtlManager.java   |  10 +-
 .../GridCacheDatabaseSharedManager.java |   9 +-
 .../persistence/file/FilePageStoreManager.java  |  47 ++
 .../cluster/GridClusterStateProcessor.java  |   8 +-
 .../internal/processors/query/QueryField.java   |  10 +
 .../internal/processors/query/QuerySchema.java  |  84 ++-
 .../processors/query/QuerySchemaPatch.java  |  96 
 .../processors/rest/GridRestCommand.java|   3 +
 .../processors/rest/GridRestProcessor.java  |  26 +-
 .../auth/AuthenticationCommandHandler.java  |  70 +++
 .../rest/handlers/auth/package-info.java|  22 +
 .../ignite/internal/worker/WorkersRegistry.java |   4 +-
 ...erActivateDeactivateTestWithPersistence.java |  18 +-
 .../distributed/CacheBaselineTopologyTest.java  |  94 
 ...eConfigurationDataAfterDestroyCacheTest.java | 326 +++
 .../pagemem/NoOpPageStoreManager.java   |   5 +
 ...timisticDeadlockDetectionCrossCacheTest.java | 147 ++---
 .../util/future/GridFutureAdapterSelfTest.java  |   2 +-
 .../junits/common/GridCommonAbstractTest.java   |   2 +-
 .../ignite/testsuites/IgnitePdsTestSuite.java   |   2 +
 .../file/AlignedBuffersDirectFileIO.java|   6 +-
 .../persistence/file/IgniteNativeIoLib.java |  10 +
 .../cache/IgniteDynamicSqlRestoreTest.java  | 529 ++
 ...ynamicColumnsAbstractConcurrentSelfTest.java |   3 +-
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 .../ignite/ml/FuzzyCMeansModelFormat.java   |  76 ---
 .../org/apache/ignite/ml/KMeansModelFormat.java |  77 ---
 .../ml/clustering/BaseFuzzyCMeansClusterer.java |  90 ---
 .../ml/clustering/BaseKMeansClusterer.java  |  96 
 .../apache/ignite/ml/clustering/Clusterer.java  |  33 --
 .../ml/clustering/ClusterizationModel.java  |  29 -
 .../FuzzyCMeansDistributedClusterer.java| 512 -
 .../clustering/FuzzyCMeansLocalClusterer.java   | 254 -
 .../ignite/ml/clustering/FuzzyCMeansModel.java  |  88 ---
 .../clustering/KMeansDistributedClusterer.java  | 306 ---
 .../ml/clustering/KMeansLocalClusterer.java | 177 --
 .../ignite/ml/clustering/KMeansModel.java   | 113 
 .../ignite/ml/clustering/WeightedClusterer.java |  38 --
 .../ignite/ml/clustering/kmeans/Clusterer.java  |  33 ++
 .../clustering/kmeans/ClusterizationModel.java  |  29 +
 .../ml/clustering/kmeans/KMeansModel.java   | 112 
 .../ml/clustering/kmeans/KMeansModelFormat.java |  79 +++
 .../ml/clustering/kmeans/KMeansTrainer.java | 320 +++
 .../ml/clustering/kmeans/package-info.java  |  22 +
 .../ignite/ml/genetic/utils/GAGridUtils.java|  27 -
 .../preprocessing/LabellingMachine.java |  41 --
 .../ml/structures/preprocessing/Normalizer.java |  80 ---
 .../org/apache/ignite/ml/LocalModelsTest.java   |  26 +-
 .../ml/clustering/ClusteringTestSuite.java  |   7 +-
 .../FuzzyCMeansDistributedClustererTest.java| 180 --

[10/23] ignite git commit: IGNITE-8048 Store dynamic indexes to cache data on node join - Fixes #3719.

2018-04-17 Thread agoncharuk

IGNITE-8048 Store dynamic indexes to cache data on node join - Fixes #3719.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-7708
Commit: bbc439b892a145a0b50b7b5dfd8c989d9868a1e1
Parents: e5c3f89
Author: Anton Kalashnikov 
Authored: Tue Apr 17 10:30:52 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 10:30:52 2018 +0300

--
 .../org/apache/ignite/cache/QueryEntity.java| 177 ++-
 .../apache/ignite/cache/QueryEntityPatch.java   | 118 +
 .../cache/CacheJoinNodeDiscoveryData.java   |  15 +-
 .../processors/cache/ClusterCachesInfo.java | 428 +++
 .../cache/DynamicCacheDescriptor.java   |  28 +
 .../processors/cache/GridCacheProcessor.java|  94 +++-
 .../cluster/GridClusterStateProcessor.java  |   8 +-
 .../internal/processors/query/QueryField.java   |  10 +
 .../internal/processors/query/QuerySchema.java  |  84 ++-
 .../processors/query/QuerySchemaPatch.java  |  96 
 ...erActivateDeactivateTestWithPersistence.java |  18 +-
 .../cache/IgniteDynamicSqlRestoreTest.java  | 529 +++
 ...ynamicColumnsAbstractConcurrentSelfTest.java |   3 +-
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 14 files changed, 1481 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bbc439b8/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java 
b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index 976bd67..37a7f15 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.cache;
 
+import javax.cache.CacheException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -27,23 +28,29 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import javax.cache.CacheException;
+import java.util.UUID;
 import org.apache.ignite.cache.query.annotations.QueryGroupIndex;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
 import org.apache.ignite.cache.query.annotations.QueryTextField;
 import 
org.apache.ignite.internal.processors.cache.query.QueryEntityClassProperty;
 import 
org.apache.ignite.internal.processors.cache.query.QueryEntityTypeDescriptor;
 import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
+import org.apache.ignite.internal.processors.query.QueryField;
 import org.apache.ignite.internal.processors.query.QueryUtils;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstractOperation;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaAlterTableAddColumnOperation;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaIndexCreateOperation;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import static java.util.Collections.unmodifiableMap;
@@ -153,6 +160,172 @@ public class QueryEntity implements Serializable {
 }
 
 /**
+ * Make query entity patch. This patch can only add properties to entity 
and can't remove them.
+ * Other words, the patch will contain only add operations(e.g. add 
column, create index) and not remove ones.
+ *
+ * @param target Query entity to which this entity should be expanded.
+ * @return Patch which contains operations for expanding this entity.
+ */
+@NotNull public QueryEntityPatch makePatch(QueryEntity target) {
+if (target == null)
+return QueryEntityPatch.empty();
+
+StringBuilder conflicts = new StringBuilder();
+
+checkEquals(conflicts, "keyType", keyType, target.keyType);
+checkEquals(conflicts, "valType", valType, target.valType);
+checkEquals(conflicts, "keyFieldName", keyFieldName,

[06/23] ignite git commit: IGNITE-8242: Remove method GAGridUtils.getGenesForChromosome() as problematic when Chromosome contains duplicate genes. GAGridUtils.getGenesInOrderForChromosome() will be us

2018-04-17 Thread agoncharuk

IGNITE-8242: Remove method GAGridUtils.getGenesForChromosome()
as problematic when Chromosome contains duplicate genes.
GAGridUtils.getGenesInOrderForChromosome() will be used instead.

this closes #3813


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

Branch: refs/heads/ignite-7708
Commit: baaef27661971ff093d861d699e43167602e11cf
Parents: 9e21cec
Author: Turik Campbell 
Authored: Mon Apr 16 20:43:49 2018 +0300
Committer: Yury Babak 
Committed: Mon Apr 16 20:43:49 2018 +0300

--
 .../OptimizeMakeChangeTerminateCriteria.java|  2 +-
 .../genetic/movie/MovieTerminateCriteria.java   |  2 +-
 .../ignite/ml/genetic/utils/GAGridUtils.java| 27 
 3 files changed, 2 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/baaef276/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
 
b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
index a4ea263..ab3f462 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java
@@ -58,7 +58,7 @@ public class OptimizeMakeChangeTerminateCriteria implements 
ITerminateCriteria {
 igniteLogger.info("Generation: " + currentGeneration);
 igniteLogger.info("Fittest is Chromosome Key: " + fittestChromosome);
 igniteLogger.info("Chromsome: " + fittestChromosome);
-printCoins(GAGridUtils.getGenesForChromosome(ignite, 
fittestChromosome));
+printCoins(GAGridUtils.getGenesInOrderForChromosome(ignite, 
fittestChromosome));
 igniteLogger.info("Avg Chromsome Fitness: " + averageFitnessScore);
 
igniteLogger.info("##");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/baaef276/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
--
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
 
b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
index 747d514..34a7331 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java
@@ -61,7 +61,7 @@ public class MovieTerminateCriteria implements 
ITerminateCriteria {
 igniteLogger.info("Generation: " + currentGeneration);
 igniteLogger.info("Fittest is Chromosome Key: " + fittestChromosome);
 igniteLogger.info("Chromsome: " + fittestChromosome);
-printMovies(GAGridUtils.getGenesForChromosome(ignite, 
fittestChromosome));
+printMovies(GAGridUtils.getGenesInOrderForChromosome(ignite, 
fittestChromosome));
 
igniteLogger.info("##");
 
 if (!(fittestChromosome.getFitnessScore() > 32)) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/baaef276/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
--
diff --git 
a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java 
b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
index 326cdda..e27ddac 100644
--- 
a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
+++ 
b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java
@@ -60,33 +60,6 @@ public class GAGridUtils {
 }
 
 /**
- * @param ignite Ignite
- * @param chromosome Chromosome
- * @return List of Genes
- */
-public static List getGenesForChromosome(Ignite ignite, Chromosome 
chromosome) {
-List genes = new ArrayList();
-IgniteCache cache = 
ignite.cache(GAGridConstants.GENE_CACHE);
-StringBuffer sbSqlClause = new StringBuffer();
-sbSqlClause.append("_key IN ");
-String sqlInClause = Arrays.toString(chromosome.getGenes());
-
-

[18/23] ignite git commit: IGNITE-8166 PME hangs when error occurs during checkpoint

2018-04-17 Thread agoncharuk

IGNITE-8166 PME hangs when error occurs during checkpoint

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-7708
Commit: e254e6588b7983ed8c13832a5512e662fb8c4215
Parents: b810bd4
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 15:56:36 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 15:56:36 2018 +0300

--
 .../cache/persistence/GridCacheDatabaseSharedManager.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e254e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index caf27b7..a371aa8 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3667,7 +3667,14 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
 private GridFutureAdapter cpBeginFut = new GridFutureAdapter<>();
 
 /** */
-private GridFutureAdapter cpFinishFut = new GridFutureAdapter<>();
+private GridFutureAdapter cpFinishFut = new GridFutureAdapter() {
+@Override protected boolean onDone(@Nullable Void res, @Nullable 
Throwable err, boolean cancel) {
+if (err != null && !cpBeginFut.isDone())
+cpBeginFut.onDone(err);
+
+return super.onDone(res, err, cancel);
+}
+};
 
 /** */
 private volatile boolean nextSnapshot;

[02/23] ignite git commit: IGNITE-8246 Fix for cast exception when using printPartitionState method - Fixes #3816.

2018-04-17 Thread agoncharuk

IGNITE-8246 Fix for cast exception when using printPartitionState method - 
Fixes #3816.

Signed-off-by: dpavlov 


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

Branch: refs/heads/ignite-7708
Commit: 228254ae317a6a1eb8897ad78a5f55967407be58
Parents: 9557f6d
Author: Maxim Muzafarov 
Authored: Mon Apr 16 19:13:28 2018 +0300
Committer: dpavlov 
Committed: Mon Apr 16 19:13:28 2018 +0300

--
 .../ignite/testframework/junits/common/GridCommonAbstractTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/228254ae/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 71abb95..9f2f8c4 100755
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -866,7 +866,7 @@ public abstract class GridCommonAbstractTest extends 
GridAbstractTest {
 .append(" res=").append(f.isDone() ? f.get() : "N/A")
 .append(" topVer=")
 .append((U.hasField(f, "topVer") ?
-String.valueOf(U.field(f, "topVer")) : "[unknown] may 
be it is finished future"))
+String.valueOf(U.field(f, "topVer")) : 
"[unknown] may be it is finished future"))
 .append("\n");
 
 Map> remaining = 
U.field(f, "remaining");

[07/23] ignite git commit: IGNITE-7972 Fixed NPE in TTL manager on unwindEvicts. - Fixes #3810.

2018-04-17 Thread agoncharuk

IGNITE-7972 Fixed NPE in TTL manager on unwindEvicts. - Fixes #3810.

Signed-off-by: dpavlov 


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

Branch: refs/heads/ignite-7708
Commit: 737933e6db33f7f74005f3783d81d4bd7331c21d
Parents: baaef27
Author: Andrey V. Mashenkov 
Authored: Mon Apr 16 20:43:36 2018 +0300
Committer: dpavlov 
Committed: Mon Apr 16 20:48:28 2018 +0300

--
 .../internal/processors/cache/GridCacheTtlManager.java| 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/737933e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
index b6f54a1..d36485a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
@@ -40,8 +40,8 @@ public class GridCacheTtlManager extends 
GridCacheManagerAdapter {
 /** Entries pending removal. */
 private GridConcurrentSkipListSetEx pendingEntries;
 
-/** */
-private boolean eagerTtlEnabled;
+/** See {@link CacheConfiguration#isEagerTtl()}. */
+private volatile boolean eagerTtlEnabled;
 
 /** */
 private GridCacheContext dhtCtx;
@@ -166,6 +166,12 @@ public class GridCacheTtlManager extends 
GridCacheManagerAdapter {
  * @return {@code True} if unprocessed expired entries remains.
  */
 public boolean expire(int amount) {
+// TTL manager is not initialized or eagerTtl disabled for cache.
+if (!eagerTtlEnabled)
+return false;
+
+assert cctx != null;
+
 long now = U.currentTimeMillis();
 
 try {

[04/23] ignite git commit: IGNITE-8169: [ML] Adopt KMeans to the new Partitioned Dataset and cleanup old code

2018-04-17 Thread agoncharuk

http://git-wip-us.apache.org/repos/asf/ignite/blob/9e21cec0/modules/ml/src/main/java/org/apache/ignite/ml/clustering/FuzzyCMeansModel.java
--
diff --git 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/FuzzyCMeansModel.java
 
b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/FuzzyCMeansModel.java
deleted file mode 100644
index 70009cb..000
--- 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/FuzzyCMeansModel.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.ml.clustering;
-
-import java.util.Arrays;
-import org.apache.ignite.ml.Exportable;
-import org.apache.ignite.ml.Exporter;
-import org.apache.ignite.ml.FuzzyCMeansModelFormat;
-import org.apache.ignite.ml.math.Vector;
-import org.apache.ignite.ml.math.distances.DistanceMeasure;
-
-/** This class incapsulates result of clusterization. */
-public class FuzzyCMeansModel implements ClusterizationModel, 
Exportable {
-/** Centers of clusters. */
-private Vector[] centers;
-
-/** Distance measure. */
-private DistanceMeasure measure;
-
-/**
- * Constructor that creates FCM model by centers and measure.
- *
- * @param centers Array of centers.
- * @param measure Distance measure.
- */
-public FuzzyCMeansModel(Vector[] centers, DistanceMeasure measure) {
-this.centers = Arrays.copyOf(centers, centers.length);
-this.measure = measure;
-}
-
-/** Distance measure used while clusterization. */
-public DistanceMeasure distanceMeasure() {
-return measure;
-}
-
-/** @inheritDoc */
-@Override public int clustersCount() {
-return centers.length;
-}
-
-/** @inheritDoc */
-@Override public Vector[] centers() {
-return Arrays.copyOf(centers, centers.length);
-}
-
-/**
- * Predict closest center index for a given vector.
- *
- * @param val Vector.
- * @return Index of the closest center or -1 if it can't be found.
- */
-@Override public Integer apply(Vector val) {
-int idx = -1;
-double minDistance = Double.POSITIVE_INFINITY;
-
-for (int i = 0; i < centers.length; i++) {
-double currDistance = measure.compute(val, centers[i]);
-if (currDistance < minDistance) {
-minDistance = currDistance;
-idx = i;
-}
-}
-
-return idx;
-}
-
-/** {@inheritDoc} */
-@Override public  void saveModel(Exporter 
exporter, P path) {
-FuzzyCMeansModelFormat mdlData = new FuzzyCMeansModelFormat(centers, 
measure);
-
-exporter.save(mdlData, path);
-}
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/9e21cec0/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
--
diff --git 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
 
b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
deleted file mode 100644
index 5595b4c..000
--- 
a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/KMeansDistributedClusterer.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package

[09/23] ignite git commit: IGNITE-8287 Change position on signup inputs on page-sign-in.

2018-04-17 Thread agoncharuk

IGNITE-8287 Change position on signup inputs on page-sign-in.


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

Branch: refs/heads/ignite-7708
Commit: e5c3f893aee0200d8956ae9263ec6ce1326e3c29
Parents: 1cfc989
Author: Ilya Borisov 
Authored: Tue Apr 17 14:12:39 2018 +0700
Committer: Andrey Novikov 
Committed: Tue Apr 17 14:12:39 2018 +0700

--
 .../app/components/page-signin/style.scss   | 10 +
 .../app/components/page-signin/template.pug | 39 ++--
 2 files changed, 29 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3f893/modules/web-console/frontend/app/components/page-signin/style.scss
--
diff --git a/modules/web-console/frontend/app/components/page-signin/style.scss 
b/modules/web-console/frontend/app/components/page-signin/style.scss
index 7e13ffe..8ea143a 100644
--- a/modules/web-console/frontend/app/components/page-signin/style.scss
+++ b/modules/web-console/frontend/app/components/page-signin/style.scss
@@ -35,4 +35,14 @@ page-sign-in {
 background-color: #ff;
 color: #44;
 }
+
+.ps-grid {
+display: grid;
+grid-gap: 10px;
+grid-template-columns: 1fr 1fr;
+
+.ps-grid-full-width {
+grid-column: 1 / 3;
+}
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3f893/modules/web-console/frontend/app/components/page-signin/template.pug
--
diff --git 
a/modules/web-console/frontend/app/components/page-signin/template.pug 
b/modules/web-console/frontend/app/components/page-signin/template.pug
index 9a8b3ba..58d8571 100644
--- a/modules/web-console/frontend/app/components/page-signin/template.pug
+++ b/modules/web-console/frontend/app/components/page-signin/template.pug
@@ -27,10 +27,9 @@ section
 .row
 .col-xs-12.col-md-11
 -var form = '$ctrl.form_signup'
-form(name=form novalidate)
-.settings-row
-h3 Don't Have An Account?
-.settings-row
+h3 Don't Have An Account?
+form.ps-grid(name=form novalidate)
+.ps-grid-full-width
 +form-field__email({
 label: 'Email:',
 model: '$ctrl.data.signup.email',
@@ -42,7 +41,7 @@ section
 ng-model-options='{allowInvalid: true}'
 )
 +form-field__error({error: 'server', 
message: `{{$ctrl.serverErrors.signup}}`})
-.settings-row
+div
 +form-field__password({
 label: 'Password:',
 model: '$ctrl.data.signup.password',
@@ -52,7 +51,7 @@ section
 })(
 ignite-on-enter-focus-move='confirmInput'
 )
-.settings-row
+div
 +form-field__password({
 label: 'Confirm:',
 model: 'confirm',
@@ -63,7 +62,7 @@ section
 ignite-on-enter-focus-move='firstNameInput'
 ignite-match='$ctrl.data.signup.password'
 )
-.settings-row
+div
 +form-field__text({
 label: 'First name:',
 model: '$ctrl.data.signup.firstName',
@@ -73,7 +72,7 @@ section
 })(
 ignite-on-enter-focus-move='lastNameInput'
 )
-.settings-row
+div
 +form-field__text({
 label: 'Last name:',
 model: '$ctrl.data.signup.lastName',
@@ -83,17 +82,7 @@ section
 })(

[03/23] ignite git commit: IGNITE-8169: [ML] Adopt KMeans to the new Partitioned Dataset and cleanup old code

2018-04-17 Thread agoncharuk

http://git-wip-us.apache.org/repos/asf/ignite/blob/9e21cec0/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestSingleNode.java
--
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestSingleNode.java
 
b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestSingleNode.java
deleted file mode 100644
index 705db7a..000
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestSingleNode.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.ml.clustering;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.Vector;
-import org.apache.ignite.ml.math.VectorUtils;
-import org.apache.ignite.ml.math.distances.DistanceMeasure;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
-import org.apache.ignite.ml.math.functions.Functions;
-import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
-import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Assert;
-
-import static 
org.apache.ignite.ml.clustering.KMeansUtil.checkIsInEpsilonNeighbourhood;
-
-/**
- * This test checks logic of clustering (checks for clusters structures).
- */
-public class KMeansDistributedClustererTestSingleNode extends 
GridCommonAbstractTest {
-/**
- * Number of nodes in grid. We should use 1 in this test because otherwise 
algorithm will be unstable
- * (We cannot guarantee the order in which results are returned from each 
node).
- */
-private static final int NODE_COUNT = 1;
-
-/** Grid instance. */
-private Ignite ignite;
-
-/**
- * Default constructor.
- */
-public KMeansDistributedClustererTestSingleNode() {
-super(false);
-}
-
-/**
- * {@inheritDoc}
- */
-@Override protected void beforeTest() throws Exception {
-ignite = grid(NODE_COUNT);
-}
-
-/** {@inheritDoc} */
-@Override protected void beforeTestsStarted() throws Exception {
-for (int i = 1; i <= NODE_COUNT; i++)
-startGrid(i);
-}
-
-/** {@inheritDoc} */
-@Override protected void afterTestsStopped() throws Exception {
-stopAllGrids();
-}
-
-/** */
-public void testPerformClusterAnalysisDegenerate() {
-
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
-
-KMeansDistributedClusterer clusterer = new 
KMeansDistributedClusterer(new EuclideanDistance(), 1, 1, 1L);
-
-double[] v1 = new double[] {1959, 325100};
-double[] v2 = new double[] {1960, 373200};
-
-SparseDistributedMatrix points = new SparseDistributedMatrix(2, 2, 
StorageConstants.ROW_STORAGE_MODE,
-StorageConstants.RANDOM_ACCESS_MODE);
-
-points.setRow(0, v1);
-points.setRow(1, v2);
-
-KMeansModel mdl = clusterer.cluster(points, 1);
-
-Assert.assertEquals(1, mdl.centers().length);
-Assert.assertEquals(2, mdl.centers()[0].size());
-}
-
-/** */
-public void testClusterizationOnDatasetWithObviousStructure() throws 
IOException {
-
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
-
-int ptsCnt = 1;
-int squareSideLen = 1;
-
-Random rnd = new Random(123456L);
-
-// Let centers be in the vertices of square.
-Map centers = new HashMap<>();
-centers.put(100, new DenseLocalOnHeapVector(new double[] {0.0, 0.0}));
-centers.put(900, new

[01/23] ignite git commit: IGNITE-8280 Fix of NPE on some cases at the QueryEntity.getDecimalInfo - Fixes #3831.

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-7708 d08d0073d -> 7bde53f30


IGNITE-8280 Fix of NPE on some cases at the QueryEntity.getDecimalInfo - Fixes 
#3831.

Signed-off-by: dpavlov 


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

Branch: refs/heads/ignite-7708
Commit: 9557f6dcbbe5d86d892ffaca5a9bb66cc5401e84
Parents: 7586cfd
Author: tledkov-gridgain 
Authored: Mon Apr 16 18:45:11 2018 +0300
Committer: dpavlov 
Committed: Mon Apr 16 18:45:11 2018 +0300

--
 .../core/src/main/java/org/apache/ignite/cache/QueryEntity.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9557f6dc/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java 
b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index aff3461..976bd67 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -405,7 +405,7 @@ public class QueryEntity implements Serializable {
  * @return Set of names of fields that must have non-null values.
  */
 public Map> getDecimalInfo() {
-return unmodifiableMap(decimalInfo);
+return decimalInfo == null ? Collections.emptyMap() : 
unmodifiableMap(decimalInfo);
 }
 
 /**

ignite git commit: IGNITE-8033 Fixed flaky failure of TxOptimisticDeadlockDetectionCrossCacheTest

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 8428b0e63 -> cd59c8e64


IGNITE-8033 Fixed flaky failure of TxOptimisticDeadlockDetectionCrossCacheTest

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-2.5
Commit: cd59c8e64f05ca03c7da8dc35d027a14fcebf250
Parents: 8428b0e
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 18:27:53 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 18:51:33 2018 +0300

--
 ...timisticDeadlockDetectionCrossCacheTest.java | 147 +++
 1 file changed, 50 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cd59c8e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
index 5d1374c..056b093 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
@@ -18,30 +18,21 @@
 package org.apache.ignite.internal.processors.cache.transactions;
 
 import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
 import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.managers.communication.GridIoMessage;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.internal.util.GridConcurrentHashSet;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteInClosure;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.IgniteSpiException;
-import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -57,9 +48,6 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
  *
  */
 public class TxOptimisticDeadlockDetectionCrossCacheTest extends 
GridCommonAbstractTest {
-/** Nodes count. */
-private static final int NODES_CNT = 2;
-
 /** {@inheritDoc} */
 @SuppressWarnings("unchecked")
 @Override protected IgniteConfiguration getConfiguration(String 
igniteInstanceName) throws Exception {
@@ -73,10 +61,6 @@ public class TxOptimisticDeadlockDetectionCrossCacheTest 
extends GridCommonAbstr
 cfg.setDiscoverySpi(discoSpi);
 }
 
-TcpCommunicationSpi commSpi = new TestCommunicationSpi();
-
-cfg.setCommunicationSpi(commSpi);
-
 CacheConfiguration ccfg0 = defaultCacheConfiguration();
 
 ccfg0.setName("cache0");
@@ -96,42 +80,46 @@ public class TxOptimisticDeadlockDetectionCrossCacheTest 
extends GridCommonAbstr
 return cfg;
 }
 
-/** {@inheritDoc} */
-@Override protected void beforeTestsStarted() throws Exception {
-super.beforeTestsStarted();
-
-startGrids(NODES_CNT);
-}
-

ignite git commit: IGNITE-8033 Fixed flaky failure of TxOptimisticDeadlockDetectionCrossCacheTest

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/master 2edcb22fb -> 7b39f1355


IGNITE-8033 Fixed flaky failure of TxOptimisticDeadlockDetectionCrossCacheTest

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/master
Commit: 7b39f1355cf7b0d4169622cec2936184168aba99
Parents: 2edcb22
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 18:27:53 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 18:50:15 2018 +0300

--
 ...timisticDeadlockDetectionCrossCacheTest.java | 147 +++
 1 file changed, 50 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b39f135/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
index 5d1374c..056b093 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionCrossCacheTest.java
@@ -18,30 +18,21 @@
 package org.apache.ignite.internal.processors.cache.transactions;
 
 import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
 import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.managers.communication.GridIoMessage;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.internal.util.GridConcurrentHashSet;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteInClosure;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.IgniteSpiException;
-import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -57,9 +48,6 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
  *
  */
 public class TxOptimisticDeadlockDetectionCrossCacheTest extends 
GridCommonAbstractTest {
-/** Nodes count. */
-private static final int NODES_CNT = 2;
-
 /** {@inheritDoc} */
 @SuppressWarnings("unchecked")
 @Override protected IgniteConfiguration getConfiguration(String 
igniteInstanceName) throws Exception {
@@ -73,10 +61,6 @@ public class TxOptimisticDeadlockDetectionCrossCacheTest 
extends GridCommonAbstr
 cfg.setDiscoverySpi(discoSpi);
 }
 
-TcpCommunicationSpi commSpi = new TestCommunicationSpi();
-
-cfg.setCommunicationSpi(commSpi);
-
 CacheConfiguration ccfg0 = defaultCacheConfiguration();
 
 ccfg0.setName("cache0");
@@ -96,42 +80,46 @@ public class TxOptimisticDeadlockDetectionCrossCacheTest 
extends GridCommonAbstr
 return cfg;
 }
 
-/** {@inheritDoc} */
-@Override protected void beforeTestsStarted() throws Exception {
-super.beforeTestsStarted();
-
-startGrids(NODES_CNT);
-}
-
-/**

[1/2] ignite git commit: IGNITE-7708 Debug

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-7708 470573df1 -> d08d0073d


IGNITE-7708 Debug


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

Branch: refs/heads/ignite-7708
Commit: b121a9f20b494f93863cf1ce0b6777b70a94bfde
Parents: 470573d
Author: Alexey Goncharuk 
Authored: Tue Apr 17 18:03:29 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 18:03:29 2018 +0300

--
 .../ignite/testframework/junits/GridAbstractTest.java | 10 ++
 .../junits/IgniteConfigVariationsAbstractTest.java|  8 
 2 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b121a9f2/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 2e2cc98..2bd4ba1 100755
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -2403,6 +2403,9 @@ public abstract class GridAbstractTest extends TestCase {
 private boolean reset;
 
 /** */
+private Exception clsInitFailEx;
+
+/** */
 private IgniteTestResources rsrcs;
 
 /**
@@ -2471,6 +2474,13 @@ public abstract class GridAbstractTest extends TestCase {
 }
 
 /**
+ * @param clsInitFailEx Class initialization failed exception.
+ */
+public void setClassInitializationFailedException(Exception 
clsInitFailEx) {
+this.clsInitFailEx = clsInitFailEx;
+}
+
+/**
  * @param stopped Stopped flag.
  */
 public void setStopped(int stopped) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/b121a9f2/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
index c4862bb..a907c0e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
@@ -82,15 +82,15 @@ public abstract class IgniteConfigVariationsAbstractTest 
extends GridCommonAbstr
 @Override protected void beforeTestsStarted() throws Exception {
 assert testsCfg != null;
 
-FileUtils.deleteDirectory(workDir);
-
-info("Ignite's 'work' directory has been cleaned.");
-
 if (Ignition.allGrids().size() != testsCfg.gridCount()) {
 info("All nodes will be stopped, new " + testsCfg.gridCount() + " 
nodes will be started.");
 
 Ignition.stopAll(true);
 
+FileUtils.deleteDirectory(workDir);
+
+info("Ignite's 'work' directory has been cleaned.");
+
 startGrids(testsCfg.gridCount());
 
 for (int i = 0; i < testsCfg.gridCount(); i++)

[2/2] ignite git commit: IGNITE-7708 Debug

2018-04-17 Thread agoncharuk

IGNITE-7708 Debug


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

Branch: refs/heads/ignite-7708
Commit: d08d0073dfb12d3793f70e020e9be2a3c88e8c66
Parents: b121a9f
Author: Alexey Goncharuk 
Authored: Tue Apr 17 18:24:36 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 18:24:36 2018 +0300

--
 .../testframework/junits/GridAbstractTest.java  | 22 +++-
 1 file changed, 17 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d08d0073/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 2bd4ba1..1b72306 100755
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -612,7 +612,7 @@ public abstract class GridAbstractTest extends TestCase {
 catch (Exception | Error t) {
 t.printStackTrace();
 
-
getTestCounters().setStopped(getTestCounters().getNumberOfTests() - 1);
+getTestCounters().setClassInitializationFailedException(t);
 
 try {
 tearDown();
@@ -629,6 +629,8 @@ public abstract class GridAbstractTest extends TestCase {
 info(">>> Starting test: " + testDescription() + " <<<");
 
 try {
+getTestCounters().checkClassInitialized();
+
 beforeTest();
 }
 catch (Exception | Error t) {
@@ -1687,7 +1689,9 @@ public abstract class GridAbstractTest extends TestCase {
 finally {
 serializedObj.clear();
 
-if (isLastTest()) {
+boolean lastTest = isLastTest();
+
+if (lastTest) {
 info(">>> Stopping test class: " + testClassDescription() + " 
<<<");
 
 TestCounters counters = getTestCounters();
@@ -1725,7 +1729,7 @@ public abstract class GridAbstractTest extends TestCase {
 
 cleanReferences();
 
-   if (isLastTest() && isSafeTopology() && stopGridErr)
+   if (lastTest && isSafeTopology() && stopGridErr)
throw new RuntimeException("Not all Ignite instances has been 
stopped. Please, see log for details.");
 }
 }
@@ -2403,7 +2407,7 @@ public abstract class GridAbstractTest extends TestCase {
 private boolean reset;
 
 /** */
-private Exception clsInitFailEx;
+private Throwable clsInitFailEx;
 
 /** */
 private IgniteTestResources rsrcs;
@@ -2476,11 +2480,19 @@ public abstract class GridAbstractTest extends TestCase 
{
 /**
  * @param clsInitFailEx Class initialization failed exception.
  */
-public void setClassInitializationFailedException(Exception 
clsInitFailEx) {
+public void setClassInitializationFailedException(Throwable 
clsInitFailEx) {
 this.clsInitFailEx = clsInitFailEx;
 }
 
 /**
+ * @throws IgniteCheckedException If test class initialization failed.
+ */
+public void checkClassInitialized() throws IgniteCheckedException {
+if (clsInitFailEx != null)
+throw new IgniteCheckedException("Test class initialization 
failed", clsInitFailEx);
+}
+
+/**
  * @param stopped Stopped flag.
  */
 public void setStopped(int stopped) {

ignite git commit: IGNITE-8021 Delete cache config files when cache is destroyed - Fixes #3697.

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/master 1b3a292a0 -> 2edcb22fb


IGNITE-8021 Delete cache config files when cache is destroyed - Fixes #3697.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/master
Commit: 2edcb22fbb566981097733af6470ed6dde8e786b
Parents: 1b3a292
Author: Ivan Daschinskiy 
Authored: Tue Apr 17 18:05:42 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 18:05:42 2018 +0300

--
 .../pagemem/store/IgnitePageStoreManager.java   |   9 +
 .../processors/cache/GridCacheProcessor.java|  11 +
 .../persistence/file/FilePageStoreManager.java  |  47 +++
 ...eConfigurationDataAfterDestroyCacheTest.java | 326 +++
 .../pagemem/NoOpPageStoreManager.java   |   5 +
 .../ignite/testsuites/IgnitePdsTestSuite.java   |   2 +
 6 files changed, 400 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2edcb22f/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
index 1b46bf9..0fc9f94 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
@@ -193,6 +193,15 @@ public interface IgnitePageStoreManager extends 
GridCacheSharedManager, IgniteCh
  * @throws IgniteCheckedException If failed.
  */
 public void storeCacheData(StoredCacheData cacheData, boolean overwrite) 
throws IgniteCheckedException;
+
+/**
+ * Remove cache configuration data file.
+ *
+ * @param cacheData Cache configuration.
+ * @throws IgniteCheckedException If failed.
+ */
+public void removeCacheData(StoredCacheData cacheData) throws 
IgniteCheckedException;
+
 /**
  * @param grpId Cache group ID.
  * @return {@code True} if index store for given cache group existed 
before node started.

http://git-wip-us.apache.org/repos/asf/ignite/blob/2edcb22f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 36edd72..bceb8c7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1284,6 +1284,17 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 
 U.stopLifecycleAware(log, lifecycleAwares(ctx.group(), 
cache.configuration(), ctx.store().configuredStore()));
 
+IgnitePageStoreManager pageStore;
+
+if (destroy && (pageStore = sharedCtx.pageStore()) != null) {
+try {
+pageStore.removeCacheData(new 
StoredCacheData(ctx.config()));
+} catch (IgniteCheckedException e) {
+U.error(log, "Failed to delete cache configuration data 
while destroying cache" +
+"[cache=" + ctx.name() + "]", e);
+}
+}
+
 if (log.isInfoEnabled()) {
 if (ctx.group().sharedGroup())
 log.info("Stopped cache [cacheName=" + cache.name() + ", 
group=" + ctx.group().name() + ']');

http://git-wip-us.apache.org/repos/asf/ignite/blob/2edcb22f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
index 6313eac..837f3d0 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
+++

ignite git commit: IGNITE-8282 Direct IO: support fdatasync, which does not flush modified metadata - Fixes #3833.

2018-04-17 Thread dpavlov

Repository: ignite
Updated Branches:
  refs/heads/master e254e6588 -> 63dc75b85


IGNITE-8282 Direct IO: support fdatasync, which does not flush modified 
metadata - Fixes #3833.

Signed-off-by: dpavlov 


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

Branch: refs/heads/master
Commit: 63dc75b85b12f1c7bea796714c1e88925c16b1ab
Parents: e254e65
Author: dpavlov 
Authored: Tue Apr 17 16:25:37 2018 +0300
Committer: dpavlov 
Committed: Tue Apr 17 16:25:37 2018 +0300

--
 .../persistence/file/AlignedBuffersDirectFileIO.java  |  6 +-
 .../cache/persistence/file/IgniteNativeIoLib.java | 10 ++
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/63dc75b8/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
--
diff --git 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
index 681426c..0168d2a 100644
--- 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
+++ 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java
@@ -471,7 +471,11 @@ public class AlignedBuffersDirectFileIO implements FileIO {
 
 /** {@inheritDoc} */
 @Override public void force(boolean withMetadata) throws IOException {
-if (IgniteNativeIoLib.fsync(fdCheckOpened()) < 0)
+int fd = fdCheckOpened();
+
+int res = withMetadata ? IgniteNativeIoLib.fsync(fd) : 
IgniteNativeIoLib.fdatasync(fd);
+
+if (res < 0)
 throw new IOException(String.format("Error fsync()'ing %s, got 
%s", file, getLastError()));
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/63dc75b8/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
--
diff --git 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
index 47f1e6a..65ef8d7 100644
--- 
a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
+++ 
b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoLib.java
@@ -316,6 +316,16 @@ public class IgniteNativeIoLib {
 public static native int fsync(int fd);
 
 /**
+ * Synchronize a file's in-core state with storage device. See "man 2 
fsync".
+ *
+ * Similar to {@link #fsync(int)}, but does not flush modified metadata 
unless that metadata is needed in order to allow a subsequent data retrieval to 
be correctly handled
+ *
+ * @param fd file descriptor.
+ * @return On success return zero. On error, -1 is returned, and errno is 
set appropriately.
+ */
+public static native int fdatasync(int fd);
+
+/**
  * Allocates size bytes and places the address of the allocated memory in 
{@code memptr}.
  * The address of the allocated memory will be a multiple of {@code 
alignment}.
  *

ignite git commit: IGNITE-8166 PME hangs when error occurs during checkpoint

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 a7dbea160 -> b762d681b


IGNITE-8166 PME hangs when error occurs during checkpoint

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-2.5
Commit: b762d681b97ea121a8321eb66bf02f89a1d177cd
Parents: a7dbea1
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 15:56:36 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 16:00:29 2018 +0300

--
 .../cache/persistence/GridCacheDatabaseSharedManager.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b762d681/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index 5beaafc..16d3292 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3606,7 +3606,14 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
 private GridFutureAdapter cpBeginFut = new GridFutureAdapter<>();
 
 /** */
-private GridFutureAdapter cpFinishFut = new GridFutureAdapter<>();
+private GridFutureAdapter cpFinishFut = new GridFutureAdapter() {
+@Override protected boolean onDone(@Nullable Void res, @Nullable 
Throwable err, boolean cancel) {
+if (err != null && !cpBeginFut.isDone())
+cpBeginFut.onDone(err);
+
+return super.onDone(res, err, cancel);
+}
+};
 
 /** */
 private volatile boolean nextSnapshot;

ignite git commit: IGNITE-8166 PME hangs when error occurs during checkpoint

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/master b810bd448 -> e254e6588


IGNITE-8166 PME hangs when error occurs during checkpoint

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/master
Commit: e254e6588b7983ed8c13832a5512e662fb8c4215
Parents: b810bd4
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 15:56:36 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 15:56:36 2018 +0300

--
 .../cache/persistence/GridCacheDatabaseSharedManager.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e254e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index caf27b7..a371aa8 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3667,7 +3667,14 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
 private GridFutureAdapter cpBeginFut = new GridFutureAdapter<>();
 
 /** */
-private GridFutureAdapter cpFinishFut = new GridFutureAdapter<>();
+private GridFutureAdapter cpFinishFut = new GridFutureAdapter() {
+@Override protected boolean onDone(@Nullable Void res, @Nullable 
Throwable err, boolean cancel) {
+if (err != null && !cpBeginFut.isDone())
+cpBeginFut.onDone(err);
+
+return super.onDone(res, err, cancel);
+}
+};
 
 /** */
 private volatile boolean nextSnapshot;

ignite git commit: IGNITE-7708 Debug

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-7708 8bdc26e5c -> 470573df1


IGNITE-7708 Debug


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

Branch: refs/heads/ignite-7708
Commit: 470573df141bfa598109d370ca2cd209dfd4244f
Parents: 8bdc26e
Author: Alexey Goncharuk 
Authored: Tue Apr 17 15:09:36 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 15:09:36 2018 +0300

--
 .../org/apache/ignite/testframework/junits/GridAbstractTest.java | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/470573df/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 38fa75c..2e2cc98 100755
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1988,8 +1988,6 @@ public abstract class GridAbstractTest extends TestCase {
 /** {@inheritDoc} */
 @SuppressWarnings({"ProhibitedExceptionDeclared"})
 @Override protected void runTest() throws Throwable {
-info("Begin runTest: " + testDescription());
-
 final AtomicReference ex = new AtomicReference<>();
 
 Thread runner = new IgniteThread(getTestIgniteInstanceName(), 
"test-runner", new Runnable() {
@@ -2009,8 +2007,6 @@ public abstract class GridAbstractTest extends TestCase {
 
 runner.join(isDebug() ? 0 : getTestTimeout());
 
-info("Done runTest: " + testDescription());
-
 if (runner.isAlive()) {
 U.error(log,
 "Test has been timed out and will be interrupted (threads dump 
will be taken before interruption) [" +

ignite git commit: IGNITE-8255 Possible name collisions in WorkersRegistry.

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 86d3f196e -> a7dbea160


IGNITE-8255 Possible name collisions in WorkersRegistry.

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/ignite-2.5
Commit: a7dbea16064bbd52907a770bb40c3a2445313db2
Parents: 86d3f19
Author: Dmitriy Sorokin 
Authored: Tue Apr 17 14:48:44 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 14:58:13 2018 +0300

--
 .../java/org/apache/ignite/internal/worker/WorkersRegistry.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a7dbea16/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
index e8d46fb..16676c8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
@@ -36,7 +36,7 @@ public class WorkersRegistry implements GridWorkerListener {
  * @param w Worker.
  */
 public void register(GridWorker w) {
-if (registeredWorkers.putIfAbsent(w.name(), w) != null)
+if (registeredWorkers.putIfAbsent(w.runner().getName(), w) != null)
 throw new IllegalStateException("Worker is already registered 
[worker=" + w + ']');
 }
 
@@ -75,6 +75,6 @@ public class WorkersRegistry implements GridWorkerListener {
 
 /** {@inheritDoc} */
 @Override public void onStopped(GridWorker w) {
-unregister(w.name());
+unregister(w.runner().getName());
 }
 }

ignite git commit: IGNITE-8255 Possible name collisions in WorkersRegistry.

2018-04-17 Thread agura

Repository: ignite
Updated Branches:
  refs/heads/master d79c6409b -> b810bd448


IGNITE-8255 Possible name collisions in WorkersRegistry.

Signed-off-by: Andrey Gura 


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

Branch: refs/heads/master
Commit: b810bd44805b04aa9c6fb3797ecd48b259fa3a8c
Parents: d79c640
Author: Dmitriy Sorokin 
Authored: Tue Apr 17 14:48:44 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 14:48:44 2018 +0300

--
 .../java/org/apache/ignite/internal/worker/WorkersRegistry.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b810bd44/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
index e8d46fb..16676c8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/worker/WorkersRegistry.java
@@ -36,7 +36,7 @@ public class WorkersRegistry implements GridWorkerListener {
  * @param w Worker.
  */
 public void register(GridWorker w) {
-if (registeredWorkers.putIfAbsent(w.name(), w) != null)
+if (registeredWorkers.putIfAbsent(w.runner().getName(), w) != null)
 throw new IllegalStateException("Worker is already registered 
[worker=" + w + ']');
 }
 
@@ -75,6 +75,6 @@ public class WorkersRegistry implements GridWorkerListener {
 
 /** {@inheritDoc} */
 @Override public void onStopped(GridWorker w) {
-unregister(w.name());
+unregister(w.runner().getName());
 }
 }

ignite git commit: IGNITE-8210 Fixed custom event handling for baseline topology change - Fixes #3814.

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 83e54311f -> 86d3f196e


IGNITE-8210 Fixed custom event handling for baseline topology change - Fixes 
#3814.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-2.5
Commit: 86d3f196e436095f277bb9b3e2c32293185db634
Parents: 83e5431
Author: Sergey Chugunov 
Authored: Tue Apr 17 14:28:47 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 14:34:38 2018 +0300

--
 .../affinity/GridAffinityAssignmentCache.java   |  2 +-
 .../distributed/CacheBaselineTopologyTest.java  | 94 
 2 files changed, 95 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/86d3f196/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
--
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 18edd02..427d603 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
@@ -315,7 +315,7 @@ public class GridAffinityAssignmentCache {
 for (DiscoveryEvent event : events.events()) {
 boolean affinityNode = CU.affinityNode(event.eventNode(), 
nodeFilter);
 
-if (affinityNode) {
+if (affinityNode || event.type() == EVT_DISCOVERY_CUSTOM_EVT) {
 skipCalculation = false;
 
 break;

http://git-wip-us.apache.org/repos/asf/ignite/blob/86d3f196/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index 26502ed..0d59a2d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
 import org.apache.ignite.cache.affinity.AffinityFunction;
 import org.apache.ignite.cache.affinity.AffinityFunctionContext;
 import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
@@ -54,6 +55,7 @@ import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.Gri
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -81,6 +83,12 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
 private boolean delayRebalance;
 
 /** */
+private Map userAttrs;
+
+/** */
+private static final String DATA_NODE = "dataNodeUserAttr";
+
+/** */
 private static final TcpDiscoveryVmIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
 
 /** {@inheritDoc} */
@@ -129,6 +137,9 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
 .setWalMode(WALMode.LOG_ONLY)
 );
 
+if (userAttrs != null)
+cfg.setUserAttributes(userAttrs);
+
 if (client)
 cfg.setClientMode(true);
 
@@ -139,6 +150,89 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
 }
 
 /**
+ * Verifies that rebalance on cache with Node Filter happens when 
BaselineTopology changes.
+ *
+

ignite git commit: IGNITE-8200 Web Console: Override clonedCluster in cluster-edit-form if caches or models have changed. This improves interop with "import from DB" feature, which might update caches

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 733a62bcb -> 83e54311f


IGNITE-8200 Web Console: Override clonedCluster in cluster-edit-form if caches 
or models have changed.
This improves interop with "import from DB" feature, which might update 
caches/models of cluster currently opened for editing.
The import dialog works as a separate state, so the form change detection 
mechanism ensures that any changes to the original
cluster are safe and won't interfere with changes made by user in cluster 
edit form.

(cherry picked from commit 7731669)


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

Branch: refs/heads/ignite-2.5
Commit: 83e54311fce1d46279c6ddd687ced6f7c9f17ff6
Parents: 733a62b
Author: Ilya Borisov 
Authored: Tue Apr 17 17:15:57 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 17:27:27 2018 +0700

--
 .../components/cluster-edit-form/controller.js  | 24 +-
 .../cluster-edit-form/controller.spec.js| 81 
 2 files changed, 102 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/83e54311/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
--
diff --git 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
index 35b43e0..0207729 100644
--- 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
+++ 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
@@ -17,6 +17,7 @@
 
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
 import _ from 'lodash';
 
 export default class ClusterEditFormController {
@@ -29,9 +30,11 @@ export default class ClusterEditFormController {
 constructor(IgniteLegacyUtils, IgniteEventGroups, IgniteConfirm, 
IgniteVersion, $scope, Clusters, IgniteFormUtils) {
 Object.assign(this, {IgniteLegacyUtils, IgniteEventGroups, 
IgniteConfirm, IgniteVersion, $scope, Clusters, IgniteFormUtils});
 }
+
 $onDestroy() {
 this.subscription.unsubscribe();
 }
+
 $onInit() {
 this.available = this.IgniteVersion.available.bind(this.IgniteVersion);
 
@@ -87,10 +90,9 @@ export default class ClusterEditFormController {
 this.$scope.ui = this.IgniteFormUtils.formUI();
 this.$scope.ui.loadedPanels = ['checkpoint', 'serviceConfiguration', 
'odbcConfiguration'];
 }
+
 $onChanges(changes) {
-if (
-'cluster' in changes && get(this.clonedCluster, '_id') !== 
get(this.cluster, '_id')
-) {
+if ('cluster' in changes && this.shouldOverwriteValue(this.cluster, 
this.clonedCluster)) {
 this.clonedCluster = cloneDeep(changes.cluster.currentValue);
 if (this.$scope.ui && this.$scope.ui.inputForm) {
 this.$scope.ui.inputForm.$setPristine();
@@ -100,14 +102,30 @@ export default class ClusterEditFormController {
 if ('caches' in changes)
 this.cachesMenu = (changes.caches.currentValue || []).map((c) => 
({label: c.name, value: c._id}));
 }
+
+/**
+ * The form should accept incoming cluster value if:
+ * 1. It has different _id ("new" to real id).
+ * 2. Different caches or models (imported from DB).
+ * @param {Object} a Incoming value.
+ * @param {Object} b Current value.
+ */
+shouldOverwriteValue(a, b) {
+return get(a, '_id') !== get(b, '_id') ||
+!isEqual(get(a, 'caches'), get(b, 'caches')) ||
+!isEqual(get(a, 'models'), get(b, 'models'));
+}
+
 getValuesToCompare() {
 return [this.cluster, this.clonedCluster].map(this.Clusters.normalize);
 }
+
 save() {
 if (this.$scope.ui.inputForm.$invalid)
 return 
this.IgniteFormUtils.triggerValidation(this.$scope.ui.inputForm, this.$scope);
 this.onSave({$event: cloneDeep(this.clonedCluster)});
 }
+
 reset = () => this.clonedCluster = cloneDeep(this.cluster);
 confirmAndReset() {
 return this.IgniteConfirm.confirm('Are you sure you want to undo all 
changes for current cluster?')

ignite git commit: IGNITE-8200 Web Console: Override clonedCluster in cluster-edit-form if caches or models have changed. This improves interop with "import from DB" feature, which might update caches

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/master 3cebf9123 -> 77316692f


IGNITE-8200 Web Console: Override clonedCluster in cluster-edit-form if caches 
or models have changed.
This improves interop with "import from DB" feature, which might update 
caches/models of cluster currently opened for editing.
The import dialog works as a separate state, so the form change detection 
mechanism ensures that any changes to the original
cluster are safe and won't interfere with changes made by user in cluster 
edit form.


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

Branch: refs/heads/master
Commit: 77316692f14d083138d7515affd2d3f225b709e0
Parents: 3cebf91
Author: Ilya Borisov 
Authored: Tue Apr 17 17:15:57 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 17:15:57 2018 +0700

--
 .../components/cluster-edit-form/controller.js  | 24 +-
 .../cluster-edit-form/controller.spec.js| 81 
 2 files changed, 102 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/77316692/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
--
diff --git 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
index 35b43e0..0207729 100644
--- 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
+++ 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js
@@ -17,6 +17,7 @@
 
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
 import _ from 'lodash';
 
 export default class ClusterEditFormController {
@@ -29,9 +30,11 @@ export default class ClusterEditFormController {
 constructor(IgniteLegacyUtils, IgniteEventGroups, IgniteConfirm, 
IgniteVersion, $scope, Clusters, IgniteFormUtils) {
 Object.assign(this, {IgniteLegacyUtils, IgniteEventGroups, 
IgniteConfirm, IgniteVersion, $scope, Clusters, IgniteFormUtils});
 }
+
 $onDestroy() {
 this.subscription.unsubscribe();
 }
+
 $onInit() {
 this.available = this.IgniteVersion.available.bind(this.IgniteVersion);
 
@@ -87,10 +90,9 @@ export default class ClusterEditFormController {
 this.$scope.ui = this.IgniteFormUtils.formUI();
 this.$scope.ui.loadedPanels = ['checkpoint', 'serviceConfiguration', 
'odbcConfiguration'];
 }
+
 $onChanges(changes) {
-if (
-'cluster' in changes && get(this.clonedCluster, '_id') !== 
get(this.cluster, '_id')
-) {
+if ('cluster' in changes && this.shouldOverwriteValue(this.cluster, 
this.clonedCluster)) {
 this.clonedCluster = cloneDeep(changes.cluster.currentValue);
 if (this.$scope.ui && this.$scope.ui.inputForm) {
 this.$scope.ui.inputForm.$setPristine();
@@ -100,14 +102,30 @@ export default class ClusterEditFormController {
 if ('caches' in changes)
 this.cachesMenu = (changes.caches.currentValue || []).map((c) => 
({label: c.name, value: c._id}));
 }
+
+/**
+ * The form should accept incoming cluster value if:
+ * 1. It has different _id ("new" to real id).
+ * 2. Different caches or models (imported from DB).
+ * @param {Object} a Incoming value.
+ * @param {Object} b Current value.
+ */
+shouldOverwriteValue(a, b) {
+return get(a, '_id') !== get(b, '_id') ||
+!isEqual(get(a, 'caches'), get(b, 'caches')) ||
+!isEqual(get(a, 'models'), get(b, 'models'));
+}
+
 getValuesToCompare() {
 return [this.cluster, this.clonedCluster].map(this.Clusters.normalize);
 }
+
 save() {
 if (this.$scope.ui.inputForm.$invalid)
 return 
this.IgniteFormUtils.triggerValidation(this.$scope.ui.inputForm, this.$scope);
 this.onSave({$event: cloneDeep(this.clonedCluster)});
 }
+
 reset = () => this.clonedCluster = cloneDeep(this.cluster);
 confirmAndReset() {
 return this.IgniteConfirm.confirm('Are you sure you want to undo all 
changes for current cluster?')

http://git-wip-us.apache.org/repos/asf/ignite/blob/77316692/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.spec.js

ignite git commit: IGNITE-7708 Debug

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-7708 af17e63df -> 8bdc26e5c


IGNITE-7708 Debug


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

Branch: refs/heads/ignite-7708
Commit: 8bdc26e5c6bece363a644fba158047ebfd6321cf
Parents: af17e63
Author: Alexey Goncharuk 
Authored: Tue Apr 17 13:03:49 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 13:03:49 2018 +0300

--
 .../apache/ignite/testframework/junits/GridAbstractTest.java | 4 
 .../testframework/junits/common/GridCommonAbstractTest.java  | 8 
 2 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8bdc26e5/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 2e2cc98..38fa75c 100755
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1988,6 +1988,8 @@ public abstract class GridAbstractTest extends TestCase {
 /** {@inheritDoc} */
 @SuppressWarnings({"ProhibitedExceptionDeclared"})
 @Override protected void runTest() throws Throwable {
+info("Begin runTest: " + testDescription());
+
 final AtomicReference ex = new AtomicReference<>();
 
 Thread runner = new IgniteThread(getTestIgniteInstanceName(), 
"test-runner", new Runnable() {
@@ -2007,6 +2009,8 @@ public abstract class GridAbstractTest extends TestCase {
 
 runner.join(isDebug() ? 0 : getTestTimeout());
 
+info("Done runTest: " + testDescription());
+
 if (runner.isAlive()) {
 U.error(log,
 "Test has been timed out and will be interrupted (threads dump 
will be taken before interruption) [" +

http://git-wip-us.apache.org/repos/asf/ignite/blob/8bdc26e5/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 71abb95..0750281 100755
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -473,6 +473,8 @@ public abstract class GridCommonAbstractTest extends 
GridAbstractTest {
 
 /** {@inheritDoc} */
 @Override protected final void setUp() throws Exception {
+info("Starting setUp: " + testDescription());
+
 // Disable SSL hostname verifier.
 HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
 @Override public boolean verify(String s, SSLSession sslSes) {
@@ -483,13 +485,19 @@ public abstract class GridCommonAbstractTest extends 
GridAbstractTest {
 getTestCounters().incrementStarted();
 
 super.setUp();
+
+info("Done setUp: " + testDescription());
 }
 
 /** {@inheritDoc} */
 @Override protected final void tearDown() throws Exception {
+info("Starting tearDown: " + testDescription());
+
 getTestCounters().incrementStopped();
 
 super.tearDown();
+
+info("Done tearDown: " + testDescription());
 }
 
 /** {@inheritDoc} */

ignite git commit: IGNITE-8287 Change position on signup inputs on page-sign-in.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 4846e967e -> 733a62bcb


IGNITE-8287 Change position on signup inputs on page-sign-in.

(cherry picked from commit e5c3f89)


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

Branch: refs/heads/ignite-2.5
Commit: 733a62bcb6c0d9381a496f07417c10c7edea6d7c
Parents: 4846e96
Author: Ilya Borisov 
Authored: Tue Apr 17 14:12:39 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 16:10:32 2018 +0700

--
 .../app/components/page-signin/style.scss   | 10 +
 .../app/components/page-signin/template.pug | 39 ++--
 2 files changed, 29 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/733a62bc/modules/web-console/frontend/app/components/page-signin/style.scss
--
diff --git a/modules/web-console/frontend/app/components/page-signin/style.scss 
b/modules/web-console/frontend/app/components/page-signin/style.scss
index 7e13ffe..8ea143a 100644
--- a/modules/web-console/frontend/app/components/page-signin/style.scss
+++ b/modules/web-console/frontend/app/components/page-signin/style.scss
@@ -35,4 +35,14 @@ page-sign-in {
 background-color: #ff;
 color: #44;
 }
+
+.ps-grid {
+display: grid;
+grid-gap: 10px;
+grid-template-columns: 1fr 1fr;
+
+.ps-grid-full-width {
+grid-column: 1 / 3;
+}
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/733a62bc/modules/web-console/frontend/app/components/page-signin/template.pug
--
diff --git 
a/modules/web-console/frontend/app/components/page-signin/template.pug 
b/modules/web-console/frontend/app/components/page-signin/template.pug
index 9a8b3ba..58d8571 100644
--- a/modules/web-console/frontend/app/components/page-signin/template.pug
+++ b/modules/web-console/frontend/app/components/page-signin/template.pug
@@ -27,10 +27,9 @@ section
 .row
 .col-xs-12.col-md-11
 -var form = '$ctrl.form_signup'
-form(name=form novalidate)
-.settings-row
-h3 Don't Have An Account?
-.settings-row
+h3 Don't Have An Account?
+form.ps-grid(name=form novalidate)
+.ps-grid-full-width
 +form-field__email({
 label: 'Email:',
 model: '$ctrl.data.signup.email',
@@ -42,7 +41,7 @@ section
 ng-model-options='{allowInvalid: true}'
 )
 +form-field__error({error: 'server', 
message: `{{$ctrl.serverErrors.signup}}`})
-.settings-row
+div
 +form-field__password({
 label: 'Password:',
 model: '$ctrl.data.signup.password',
@@ -52,7 +51,7 @@ section
 })(
 ignite-on-enter-focus-move='confirmInput'
 )
-.settings-row
+div
 +form-field__password({
 label: 'Confirm:',
 model: 'confirm',
@@ -63,7 +62,7 @@ section
 ignite-on-enter-focus-move='firstNameInput'
 ignite-match='$ctrl.data.signup.password'
 )
-.settings-row
+div
 +form-field__text({
 label: 'First name:',
 model: '$ctrl.data.signup.firstName',
@@ -73,7 +72,7 @@ section
 })(
 ignite-on-enter-focus-move='lastNameInput'
 )
-.settings-row
+div
 +form-field__text({
 label: 'Last name:',
 model: '$ctrl.data.signup.lastName',
@@

ignite git commit: IGNITE-8292: Broken yardstick compilation.

2018-04-17 Thread chief

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 3d2556bc7 -> 4846e967e


IGNITE-8292: Broken yardstick compilation.

this closes #3840

(cherry picked from commit 3cebf91)


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

Branch: refs/heads/ignite-2.5
Commit: 4846e967e4cb7a174880a2956e807505a78fd441
Parents: 3d2556b
Author: YuriBabak 
Authored: Tue Apr 17 11:54:41 2018 +0300
Committer: Yury Babak 
Committed: Tue Apr 17 11:56:01 2018 +0300

--
 ...niteKMeansDistributedClustererBenchmark.java | 75 
 .../IgniteKMeansLocalClustererBenchmark.java| 50 -
 .../yardstick/ml/clustering/package-info.java   | 22 --
 3 files changed, 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4846e967/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
deleted file mode 100644
index de928e8..000
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.ml.clustering;
-
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.ml.clustering.KMeansDistributedClusterer;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
-import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.yardstick.IgniteAbstractBenchmark;
-import org.apache.ignite.yardstick.ml.DataChanger;
-
-/**
- * Ignite benchmark that performs ML Grid operations.
- */
-@SuppressWarnings("unused")
-public class IgniteKMeansDistributedClustererBenchmark extends 
IgniteAbstractBenchmark {
-/** */
-@IgniteInstanceResource
-private Ignite ignite;
-
-/** {@inheritDoc} */
-@Override public boolean test(Map ctx) throws Exception {
-final DataChanger.Scale scale = new DataChanger.Scale();
-
-// Create IgniteThread, we must work with SparseDistributedMatrix 
inside IgniteThread
-// because we create ignite cache internally.
-IgniteThread igniteThread = new 
IgniteThread(ignite.configuration().getIgniteInstanceName(),
-this.getClass().getSimpleName(), new Runnable() {
-/** {@inheritDoc} */
-@Override public void run() {
-// IMPL NOTE originally taken from 
KMeansDistributedClustererTest
-KMeansDistributedClusterer clusterer = new 
KMeansDistributedClusterer(
-new EuclideanDistance(), 1, 1, 1L);
-
-double[] v1 = scale.mutate(new double[] {1959, 325100});
-double[] v2 = scale.mutate(new double[] {1960, 373200});
-
-SparseDistributedMatrix points = new SparseDistributedMatrix(
-2, 2, StorageConstants.ROW_STORAGE_MODE, 
StorageConstants.RANDOM_ACCESS_MODE);
-
-points.setRow(0, v1);
-points.setRow(1, v2);
-
-clusterer.cluster(points, 1);
-
-points.destroy();
-}
-});
-
-igniteThread.start();
-
-igniteThread.join();
-
-return true;
-}
-}

ignite git commit: IGNITE-8292: Broken yardstick compilation.

2018-04-17 Thread chief

Repository: ignite
Updated Branches:
  refs/heads/master 8c80dce3b -> 3cebf9123


IGNITE-8292: Broken yardstick compilation.

this closes #3840


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

Branch: refs/heads/master
Commit: 3cebf9123ed1161822ece503169b361f49293358
Parents: 8c80dce
Author: YuriBabak 
Authored: Tue Apr 17 11:54:41 2018 +0300
Committer: Yury Babak 
Committed: Tue Apr 17 11:54:41 2018 +0300

--
 ...niteKMeansDistributedClustererBenchmark.java | 75 
 .../IgniteKMeansLocalClustererBenchmark.java| 50 -
 .../yardstick/ml/clustering/package-info.java   | 22 --
 3 files changed, 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3cebf912/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
deleted file mode 100644
index de928e8..000
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteKMeansDistributedClustererBenchmark.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.ml.clustering;
-
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.ml.clustering.KMeansDistributedClusterer;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
-import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.yardstick.IgniteAbstractBenchmark;
-import org.apache.ignite.yardstick.ml.DataChanger;
-
-/**
- * Ignite benchmark that performs ML Grid operations.
- */
-@SuppressWarnings("unused")
-public class IgniteKMeansDistributedClustererBenchmark extends 
IgniteAbstractBenchmark {
-/** */
-@IgniteInstanceResource
-private Ignite ignite;
-
-/** {@inheritDoc} */
-@Override public boolean test(Map ctx) throws Exception {
-final DataChanger.Scale scale = new DataChanger.Scale();
-
-// Create IgniteThread, we must work with SparseDistributedMatrix 
inside IgniteThread
-// because we create ignite cache internally.
-IgniteThread igniteThread = new 
IgniteThread(ignite.configuration().getIgniteInstanceName(),
-this.getClass().getSimpleName(), new Runnable() {
-/** {@inheritDoc} */
-@Override public void run() {
-// IMPL NOTE originally taken from 
KMeansDistributedClustererTest
-KMeansDistributedClusterer clusterer = new 
KMeansDistributedClusterer(
-new EuclideanDistance(), 1, 1, 1L);
-
-double[] v1 = scale.mutate(new double[] {1959, 325100});
-double[] v2 = scale.mutate(new double[] {1960, 373200});
-
-SparseDistributedMatrix points = new SparseDistributedMatrix(
-2, 2, StorageConstants.ROW_STORAGE_MODE, 
StorageConstants.RANDOM_ACCESS_MODE);
-
-points.setRow(0, v1);
-points.setRow(1, v2);
-
-clusterer.cluster(points, 1);
-
-points.destroy();
-}
-});
-
-igniteThread.start();
-
-igniteThread.join();
-
-return true;
-}
-}

ignite git commit: IGNITE-8285 Web console: Removed debug output.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 d0997d774 -> 3d2556bc7


IGNITE-8285 Web console: Removed debug output.

(cherry picked from commit 8c80dce)


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

Branch: refs/heads/ignite-2.5
Commit: 3d2556bc73eff6c5ccd52af1bea88b6016358db8
Parents: d0997d7
Author: Ilya Borisov 
Authored: Tue Apr 17 15:46:10 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 15:49:05 2018 +0700

--
 modules/web-console/frontend/app/components/page-configure/index.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3d2556bc/modules/web-console/frontend/app/components/page-configure/index.js
--
diff --git 
a/modules/web-console/frontend/app/components/page-configure/index.js 
b/modules/web-console/frontend/app/components/page-configure/index.js
index 3209ede..34b8cfe 100644
--- a/modules/web-console/frontend/app/components/page-configure/index.js
+++ b/modules/web-console/frontend/app/components/page-configure/index.js
@@ -164,7 +164,6 @@ export default angular
 state: actionsWindow.filter((a) => 
!actions.includes(a)).reduce(ConfigureState._combinedReducer, {})
 };
 })
-.debug('UNDOED')
 .do((a) => ConfigureState.dispatchAction(a))
 .subscribe();
 ConfigEffects.connect();

ignite git commit: IGNITE-8285 Web console: Removed debug output.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/master e76fcb4a5 -> 8c80dce3b


IGNITE-8285 Web console: Removed debug output.


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

Branch: refs/heads/master
Commit: 8c80dce3b8601ffc123cb6dec0255b66e4576272
Parents: e76fcb4
Author: Ilya Borisov 
Authored: Tue Apr 17 15:46:10 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 15:46:10 2018 +0700

--
 modules/web-console/frontend/app/components/page-configure/index.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8c80dce3/modules/web-console/frontend/app/components/page-configure/index.js
--
diff --git 
a/modules/web-console/frontend/app/components/page-configure/index.js 
b/modules/web-console/frontend/app/components/page-configure/index.js
index 3209ede..34b8cfe 100644
--- a/modules/web-console/frontend/app/components/page-configure/index.js
+++ b/modules/web-console/frontend/app/components/page-configure/index.js
@@ -164,7 +164,6 @@ export default angular
 state: actionsWindow.filter((a) => 
!actions.includes(a)).reduce(ConfigureState._combinedReducer, {})
 };
 })
-.debug('UNDOED')
 .do((a) => ConfigureState.dispatchAction(a))
 .subscribe();
 ConfigEffects.connect();

ignite git commit: IGNITE-8292: Broken yardstick compilation.

2018-04-17 Thread chief

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 2883ff4e9 -> d0997d774


IGNITE-8292: Broken yardstick compilation.

this closes #3838

(cherry picked from commit e76fcb4)


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

Branch: refs/heads/ignite-2.5
Commit: d0997d7740ea1114b4c8236f225d989de98e2f10
Parents: 2883ff4
Author: YuriBabak 
Authored: Tue Apr 17 11:22:14 2018 +0300
Committer: Yury Babak 
Committed: Tue Apr 17 11:23:00 2018 +0300

--
 ...uzzyCMeansDistributedClustererBenchmark.java | 130 ---
 ...gniteFuzzyCMeansLocalClustererBenchmark.java |  93 -
 2 files changed, 223 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d0997d77/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
deleted file mode 100644
index e356746..000
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.ml.clustering;
-
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.ml.clustering.BaseFuzzyCMeansClusterer;
-import org.apache.ignite.ml.clustering.FuzzyCMeansDistributedClusterer;
-import org.apache.ignite.ml.clustering.FuzzyCMeansModel;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.distances.DistanceMeasure;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
-import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.yardstick.IgniteAbstractBenchmark;
-import org.apache.ignite.yardstick.ml.DataChanger;
-
-/**
- * Ignite benchmark that performs ML Grid operations.
- */
-@SuppressWarnings("unused")
-public class IgniteFuzzyCMeansDistributedClustererBenchmark extends 
IgniteAbstractBenchmark {
-/** */
-@IgniteInstanceResource
-private Ignite ignite;
-
-/** {@inheritDoc} */
-@Override public boolean test(Map ctx) throws Exception {
-// Create IgniteThread, we must work with SparseDistributedMatrix 
inside IgniteThread
-// because we create ignite cache internally.
-IgniteThread igniteThread = new 
IgniteThread(ignite.configuration().getIgniteInstanceName(),
-this.getClass().getSimpleName(), new Runnable() {
-/** {@inheritDoc} */
-@Override public void run() {
-// IMPL NOTE originally taken from FuzzyCMeansExample.
-// Distance measure that computes distance between two points.
-DistanceMeasure distanceMeasure = new EuclideanDistance();
-
-// "Fuzziness" - specific constant that is used in membership 
calculation (1.0+-eps ~ K-Means).
-double exponentialWeight = 2.0;
-
-// Condition that indicated when algorithm must stop.
-// In this example algorithm stops if memberships have changed 
insignificantly.
-BaseFuzzyCMeansClusterer.StopCondition stopCond =
-BaseFuzzyCMeansClusterer.StopCondition.STABLE_MEMBERSHIPS;
-
-// Maximum difference between new and old membership values 
with which algorithm will continue to work.
-double

ignite git commit: IGNITE-8292: Broken yardstick compilation.

2018-04-17 Thread chief

Repository: ignite
Updated Branches:
  refs/heads/master 5614621d1 -> e76fcb4a5


IGNITE-8292: Broken yardstick compilation.

this closes #3838


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

Branch: refs/heads/master
Commit: e76fcb4a538aece58498f43d7e82b2054ca96c51
Parents: 5614621
Author: YuriBabak 
Authored: Tue Apr 17 11:22:14 2018 +0300
Committer: Yury Babak 
Committed: Tue Apr 17 11:22:14 2018 +0300

--
 ...uzzyCMeansDistributedClustererBenchmark.java | 130 ---
 ...gniteFuzzyCMeansLocalClustererBenchmark.java |  93 -
 2 files changed, 223 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e76fcb4a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
deleted file mode 100644
index e356746..000
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/ml/clustering/IgniteFuzzyCMeansDistributedClustererBenchmark.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.ml.clustering;
-
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.ml.clustering.BaseFuzzyCMeansClusterer;
-import org.apache.ignite.ml.clustering.FuzzyCMeansDistributedClusterer;
-import org.apache.ignite.ml.clustering.FuzzyCMeansModel;
-import org.apache.ignite.ml.math.StorageConstants;
-import org.apache.ignite.ml.math.distances.DistanceMeasure;
-import org.apache.ignite.ml.math.distances.EuclideanDistance;
-import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.yardstick.IgniteAbstractBenchmark;
-import org.apache.ignite.yardstick.ml.DataChanger;
-
-/**
- * Ignite benchmark that performs ML Grid operations.
- */
-@SuppressWarnings("unused")
-public class IgniteFuzzyCMeansDistributedClustererBenchmark extends 
IgniteAbstractBenchmark {
-/** */
-@IgniteInstanceResource
-private Ignite ignite;
-
-/** {@inheritDoc} */
-@Override public boolean test(Map ctx) throws Exception {
-// Create IgniteThread, we must work with SparseDistributedMatrix 
inside IgniteThread
-// because we create ignite cache internally.
-IgniteThread igniteThread = new 
IgniteThread(ignite.configuration().getIgniteInstanceName(),
-this.getClass().getSimpleName(), new Runnable() {
-/** {@inheritDoc} */
-@Override public void run() {
-// IMPL NOTE originally taken from FuzzyCMeansExample.
-// Distance measure that computes distance between two points.
-DistanceMeasure distanceMeasure = new EuclideanDistance();
-
-// "Fuzziness" - specific constant that is used in membership 
calculation (1.0+-eps ~ K-Means).
-double exponentialWeight = 2.0;
-
-// Condition that indicated when algorithm must stop.
-// In this example algorithm stops if memberships have changed 
insignificantly.
-BaseFuzzyCMeansClusterer.StopCondition stopCond =
-BaseFuzzyCMeansClusterer.StopCondition.STABLE_MEMBERSHIPS;
-
-// Maximum difference between new and old membership values 
with which algorithm will continue to work.
-double maxDelta = 0.01;
-
-// The maximum

ignite git commit: IGNITE-7708 Debug

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-7708 69d67f01b -> af17e63df


IGNITE-7708 Debug


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

Branch: refs/heads/ignite-7708
Commit: af17e63df5542e005344249e77b419c8ba1915a9
Parents: 69d67f0
Author: Alexey Goncharuk 
Authored: Tue Apr 17 11:21:51 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 11:21:51 2018 +0300

--
 .../ConfigVariationsTestSuiteBuilder.java   |  6 +++---
 .../testframework/junits/GridAbstractTest.java  | 22 +---
 .../IgniteConfigVariationsAbstractTest.java |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/af17e63d/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java
index 94e56c9..a2a4a96 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java
@@ -225,15 +225,15 @@ public class ConfigVariationsTestSuiteBuilder {
 boolean startCache = i == 0;
 boolean stopCache = i + 1 == testedNodeCnt;
 
-System.out.println("Building multi-node test suite [clsSuffix=" + 
cfg.description() +
-", testedNode=" + i + ", stopNodes=" + stopNodes + ']');
-
 VariationsTestsConfig cfg0 = new VariationsTestsConfig(
 cfg.configurationFactory(),
 cfg.description() + "-node-" + i,
 stopNodes, startCache, stopCache, cfg.cacheStartMode(), 
cfg.gridCount(), i, withClients,
 !skipWaitParMapExchange);
 
+System.out.println("Building multi-node test suite [clsSuffix=" + 
cfg0.description() +
+", testedNode=" + i + ", stopNodes=" + stopNodes + ']');
+
 suite.addTest(new IgniteConfigVariationsTestSuite(cls, cfg0));
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/af17e63d/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index d3999be..2e2cc98 100755
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -574,9 +574,8 @@ public abstract class GridAbstractTest extends TestCase {
 
 TestCounters cntrs = getTestCounters();
 
-if (isDebug())
-info("Test counters [numOfTests=" + cntrs.getNumberOfTests() + ", 
started=" + cntrs.getStarted() +
-", stopped=" + cntrs.getStopped() + ']');
+info("Test counters [numOfTests=" + cntrs.getNumberOfTests() + ", 
started=" + cntrs.getStarted() +
+", stopped=" + cntrs.getStopped() + ']');
 
 if (cntrs.isReset()) {
 info("Resetting test counters.");
@@ -1680,7 +1679,7 @@ public abstract class GridAbstractTest extends TestCase {
 TestCounters cntrs = getTestCounters();
 
 info("Test counters [numOfTests=" + cntrs.getNumberOfTests() + ", 
started=" + cntrs.getStarted() +
-", stopped=" + cntrs.getStopped() + ']');
+", stopped=" + cntrs.getStopped() + ", test=" + this + ']');
 
 try {
 afterTest();
@@ -2501,16 +2500,25 @@ public abstract class GridAbstractTest extends TestCase 
{
 if (numOfTests == -1) {
 GridAbstractTest this0 = GridAbstractTest.this;
 
+info("Counting the number of tests in the test: " + 
GridAbstractTest.this + " " + this0.testDescription());
+
 int cnt;
 
-if (this0.forceTestCnt)
+if (this0.forceTestCnt) {
 cnt = this0.testCnt;
+
+info("Number of tests is enforced: " + this0.testCnt);
+}
 else {
 cnt = 0;
 
-

ignite git commit: IGNITE-8291 Web Console: Fixed Docker file generation.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 7457fd319 -> 2883ff4e9


IGNITE-8291 Web Console: Fixed Docker file generation.

(cherry picked from commit 5614621)


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

Branch: refs/heads/ignite-2.5
Commit: 2883ff4e958747916e7d9eec671100c366cad66b
Parents: 7457fd3
Author: Ilya Borisov 
Authored: Tue Apr 17 15:01:36 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 15:04:01 2018 +0700

--
 .../configuration/generator/Docker.service.js   |  94 ++--
 .../generator/Docker.service.spec.js| 133 +
 modules/web-console/frontend/package-lock.json  | 550 ++-
 modules/web-console/frontend/package.json   |   1 +
 4 files changed, 475 insertions(+), 303 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2883ff4e/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
--
diff --git 
a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
 
b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
index ea49c41..8b03e9a 100644
--- 
a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
+++ 
b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 
+import {outdent} from 'outdent/lib';
+import VersionService from 'app/services/Version.service';
+import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
+import get from 'lodash/get';
+
+const version = new VersionService();
+
+const ALPINE_DOCKER_SINCE = '2.1.0';
+
 /**
  * Docker file generation entry point.
  */
@@ -29,10 +38,10 @@ export default class IgniteDockerGenerator {
  * @returns {String}
  */
 from(cluster, targetVer) {
-return [
-'# Start from Apache Ignite image.',
-`FROM apacheignite/ignite:${targetVer.ignite}`
-].join('\n');
+return outdent`
+# Start from Apache Ignite image.',
+FROM apacheignite/ignite:${targetVer.ignite}
+`;
 }
 
 /**
@@ -42,36 +51,59 @@ export default class IgniteDockerGenerator {
  * @param {Object} targetVer Target version.
  */
 generate(cluster, targetVer) {
+return outdent`
+${this.from(cluster, targetVer)}
+
+# Set config uri for node.
+ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml
+
+# Copy optional libs.
+ENV OPTION_LIBS ${this.optionLibs(cluster, targetVer).join(',')}
+
+# Update packages and install maven.
+${this.packages(cluster, targetVer)}
+
+# Append project to container.
+ADD . ${cluster.name}
+
+# Build project in container.
+RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests
+
+# Copy project jars to node classpath.
+RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\
+   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} 
$IGNITE_HOME/libs/${cluster.name} \\;
+`;
+}
+
+optionLibs(cluster, targetVer) {
 return [
-this.from(cluster, targetVer),
-'',
-'# Set config uri for node.',
-`ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml`,
-'',
-'# Copy ignite-http-rest from optional.',
-'ENV OPTION_LIBS ignite-rest-http',
-'',
-'# Update packages and install maven.',
-'RUN \\',
-'   apt-get update &&\\',
-'   apt-get install -y maven',
-'',
-'# Append project to container.',
-`ADD . ${cluster.name}`,
-'',
-'# Build project in container.',
-`RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests`,
-'',
-'# Copy project jars to node classpath.',
-`RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\`,
-`   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} 
$IGNITE_HOME/libs/${cluster.name} \\;`
-].join('\n');
+'ignite-rest-http',
+get(POM_DEPENDENCIES, [get(cluster, 'discovery.kind'), 
'artifactId'])
+].filter(Boolean);
+}
+
+packages(cluster, targetVer) {
+return version.since(targetVer.ignite, ALPINE_DOCKER_SINCE)
+? outdent`
+

ignite git commit: IGNITE-8291 Web Console: Fixed Docker file generation.

2018-04-17 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/master bbc439b89 -> 5614621d1


IGNITE-8291 Web Console: Fixed Docker file generation.


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

Branch: refs/heads/master
Commit: 5614621d1e1c0e84fe7915459961851f354fba88
Parents: bbc439b
Author: Ilya Borisov 
Authored: Tue Apr 17 15:01:36 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 15:01:36 2018 +0700

--
 .../configuration/generator/Docker.service.js   |  94 ++--
 .../generator/Docker.service.spec.js| 133 +
 modules/web-console/frontend/package-lock.json  | 550 ++-
 modules/web-console/frontend/package.json   |   1 +
 4 files changed, 475 insertions(+), 303 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5614621d/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
--
diff --git 
a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
 
b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
index ea49c41..8b03e9a 100644
--- 
a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
+++ 
b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 
+import {outdent} from 'outdent/lib';
+import VersionService from 'app/services/Version.service';
+import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
+import get from 'lodash/get';
+
+const version = new VersionService();
+
+const ALPINE_DOCKER_SINCE = '2.1.0';
+
 /**
  * Docker file generation entry point.
  */
@@ -29,10 +38,10 @@ export default class IgniteDockerGenerator {
  * @returns {String}
  */
 from(cluster, targetVer) {
-return [
-'# Start from Apache Ignite image.',
-`FROM apacheignite/ignite:${targetVer.ignite}`
-].join('\n');
+return outdent`
+# Start from Apache Ignite image.',
+FROM apacheignite/ignite:${targetVer.ignite}
+`;
 }
 
 /**
@@ -42,36 +51,59 @@ export default class IgniteDockerGenerator {
  * @param {Object} targetVer Target version.
  */
 generate(cluster, targetVer) {
+return outdent`
+${this.from(cluster, targetVer)}
+
+# Set config uri for node.
+ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml
+
+# Copy optional libs.
+ENV OPTION_LIBS ${this.optionLibs(cluster, targetVer).join(',')}
+
+# Update packages and install maven.
+${this.packages(cluster, targetVer)}
+
+# Append project to container.
+ADD . ${cluster.name}
+
+# Build project in container.
+RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests
+
+# Copy project jars to node classpath.
+RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\
+   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} 
$IGNITE_HOME/libs/${cluster.name} \\;
+`;
+}
+
+optionLibs(cluster, targetVer) {
 return [
-this.from(cluster, targetVer),
-'',
-'# Set config uri for node.',
-`ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml`,
-'',
-'# Copy ignite-http-rest from optional.',
-'ENV OPTION_LIBS ignite-rest-http',
-'',
-'# Update packages and install maven.',
-'RUN \\',
-'   apt-get update &&\\',
-'   apt-get install -y maven',
-'',
-'# Append project to container.',
-`ADD . ${cluster.name}`,
-'',
-'# Build project in container.',
-`RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests`,
-'',
-'# Copy project jars to node classpath.',
-`RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\`,
-`   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} 
$IGNITE_HOME/libs/${cluster.name} \\;`
-].join('\n');
+'ignite-rest-http',
+get(POM_DEPENDENCIES, [get(cluster, 'discovery.kind'), 
'artifactId'])
+].filter(Boolean);
+}
+
+packages(cluster, targetVer) {
+return version.since(targetVer.ignite, ALPINE_DOCKER_SINCE)
+? outdent`
+RUN set -x \\
+&& apk

ignite git commit: IGNITE-8048 Store dynamic indexes to cache data on node join - Fixes #3719.

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 6ee5e9fe8 -> 7457fd319


IGNITE-8048 Store dynamic indexes to cache data on node join - Fixes #3719.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-2.5
Commit: 7457fd319a372d54de68271be7fddbb634cb6070
Parents: 6ee5e9f
Author: Anton Kalashnikov 
Authored: Tue Apr 17 10:30:52 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 10:41:53 2018 +0300

--
 .../org/apache/ignite/cache/QueryEntity.java| 175 +-
 .../apache/ignite/cache/QueryEntityPatch.java   | 118 +
 .../cache/CacheJoinNodeDiscoveryData.java   |  15 +-
 .../processors/cache/ClusterCachesInfo.java | 428 +++
 .../cache/DynamicCacheDescriptor.java   |  28 +
 .../processors/cache/GridCacheProcessor.java|  94 +++-
 .../cluster/GridClusterStateProcessor.java  |   8 +-
 .../internal/processors/query/QuerySchema.java  |  84 ++-
 .../processors/query/QuerySchemaPatch.java  |  96 
 ...erActivateDeactivateTestWithPersistence.java |  18 +-
 .../cache/IgniteDynamicSqlRestoreTest.java  | 529 +++
 ...ynamicColumnsAbstractConcurrentSelfTest.java |   3 +-
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 13 files changed, 1470 insertions(+), 128 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7457fd31/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java 
b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index 0065bae..81fd50b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -26,9 +26,11 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.UUID;
 import javax.cache.CacheException;
 import org.apache.ignite.cache.query.annotations.QueryGroupIndex;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
@@ -36,12 +38,17 @@ import 
org.apache.ignite.cache.query.annotations.QueryTextField;
 import 
org.apache.ignite.internal.processors.cache.query.QueryEntityClassProperty;
 import 
org.apache.ignite.internal.processors.cache.query.QueryEntityTypeDescriptor;
 import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
+import org.apache.ignite.internal.processors.query.QueryField;
 import org.apache.ignite.internal.processors.query.QueryUtils;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstractOperation;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaAlterTableAddColumnOperation;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaIndexCreateOperation;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -144,6 +151,172 @@ public class QueryEntity implements Serializable {
 }
 
 /**
+ * Make query entity patch. This patch can only add properties to entity 
and can't remove them.
+ * Other words, the patch will contain only add operations(e.g. add 
column, create index) and not remove ones.
+ *
+ * @param target Query entity to which this entity should be expanded.
+ * @return Patch which contains operations for expanding this entity.
+ */
+@NotNull public QueryEntityPatch makePatch(QueryEntity target) {
+if (target == null)
+return QueryEntityPatch.empty();
+
+StringBuilder conflicts = new StringBuilder();
+
+checkEquals(conflicts, "keyType", keyType, target.keyType);
+checkEquals(conflicts, "valType", valType, target.valType);
+checkEquals(conflicts, "keyFieldName", keyFieldName, 
target.keyFieldName);
+checkEquals(conflicts, "valueFieldName", valueFieldName, 
target.valueFieldName);
+checkEquals(conflicts, "tableName", tableName, target.tableName);
+
+List queryFieldsToAdd =

ignite git commit: IGNITE-8048 Store dynamic indexes to cache data on node join - Fixes #3719.

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/master e5c3f893a -> bbc439b89


IGNITE-8048 Store dynamic indexes to cache data on node join - Fixes #3719.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/master
Commit: bbc439b892a145a0b50b7b5dfd8c989d9868a1e1
Parents: e5c3f89
Author: Anton Kalashnikov 
Authored: Tue Apr 17 10:30:52 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 10:30:52 2018 +0300

--
 .../org/apache/ignite/cache/QueryEntity.java| 177 ++-
 .../apache/ignite/cache/QueryEntityPatch.java   | 118 +
 .../cache/CacheJoinNodeDiscoveryData.java   |  15 +-
 .../processors/cache/ClusterCachesInfo.java | 428 +++
 .../cache/DynamicCacheDescriptor.java   |  28 +
 .../processors/cache/GridCacheProcessor.java|  94 +++-
 .../cluster/GridClusterStateProcessor.java  |   8 +-
 .../internal/processors/query/QueryField.java   |  10 +
 .../internal/processors/query/QuerySchema.java  |  84 ++-
 .../processors/query/QuerySchemaPatch.java  |  96 
 ...erActivateDeactivateTestWithPersistence.java |  18 +-
 .../cache/IgniteDynamicSqlRestoreTest.java  | 529 +++
 ...ynamicColumnsAbstractConcurrentSelfTest.java |   3 +-
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 14 files changed, 1481 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bbc439b8/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java 
b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index 976bd67..37a7f15 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.cache;
 
+import javax.cache.CacheException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -27,23 +28,29 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import javax.cache.CacheException;
+import java.util.UUID;
 import org.apache.ignite.cache.query.annotations.QueryGroupIndex;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
 import org.apache.ignite.cache.query.annotations.QueryTextField;
 import 
org.apache.ignite.internal.processors.cache.query.QueryEntityClassProperty;
 import 
org.apache.ignite.internal.processors.cache.query.QueryEntityTypeDescriptor;
 import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
+import org.apache.ignite.internal.processors.query.QueryField;
 import org.apache.ignite.internal.processors.query.QueryUtils;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstractOperation;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaAlterTableAddColumnOperation;
+import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaIndexCreateOperation;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import static java.util.Collections.unmodifiableMap;
@@ -153,6 +160,172 @@ public class QueryEntity implements Serializable {
 }
 
 /**
+ * Make query entity patch. This patch can only add properties to entity 
and can't remove them.
+ * Other words, the patch will contain only add operations(e.g. add 
column, create index) and not remove ones.
+ *
+ * @param target Query entity to which this entity should be expanded.
+ * @return Patch which contains operations for expanding this entity.
+ */
+@NotNull public QueryEntityPatch makePatch(QueryEntity target) {
+if (target == null)
+return QueryEntityPatch.empty();
+
+StringBuilder conflicts = new StringBuilder();
+
+checkEquals(conflicts, "keyType", keyType, target.keyType);
+checkEquals(conflicts, "valType", valType,

ignite git commit: IGNITE-7708 Debug

2018-04-17 Thread agoncharuk

Repository: ignite
Updated Branches:
  refs/heads/ignite-7708 34490b290 -> 69d67f01b


IGNITE-7708 Debug


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

Branch: refs/heads/ignite-7708
Commit: 69d67f01b1ba957d34d7abea22e5229730ff14d6
Parents: 34490b2
Author: Alexey Goncharuk 
Authored: Tue Apr 17 10:28:42 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Apr 17 10:28:42 2018 +0300

--
 .../junits/IgniteConfigVariationsAbstractTest.java  | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/69d67f01/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
index 9b5b116..f1ca8f8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.testframework.configvariations.VariationsTestsConfig;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -665,8 +666,15 @@ public abstract class IgniteConfigVariationsAbstractTest 
extends GridCommonAbstr
 protected boolean isCompatible() throws Exception {
 switch (dataMode) {
 case BINARILIZABLE:
-case PLANE_OBJECT:
-return !(getConfiguration().getMarshaller() instanceof 
JdkMarshaller);
+case PLANE_OBJECT: {
+IgniteConfiguration cfg = getConfiguration();
+Marshaller marsh = cfg.getMarshaller();
+
+U.debug(log, "Running check [instance=" + 
getTestIgniteInstanceName() + ", cfg=" + cfg +
+", marsh=" + marsh + ", dataMode=" + dataMode + "]");
+
+return !(marsh instanceof JdkMarshaller);
+}
 }
 return false;
 }

ignite git commit: IGNITE-8287 Change position on signup inputs on page-sign-in.

2018-04-17 Thread anovikov

Repository: ignite
Updated Branches:
  refs/heads/master 1cfc9897f -> e5c3f893a


IGNITE-8287 Change position on signup inputs on page-sign-in.


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

Branch: refs/heads/master
Commit: e5c3f893aee0200d8956ae9263ec6ce1326e3c29
Parents: 1cfc989
Author: Ilya Borisov 
Authored: Tue Apr 17 14:12:39 2018 +0700
Committer: Andrey Novikov 
Committed: Tue Apr 17 14:12:39 2018 +0700

--
 .../app/components/page-signin/style.scss   | 10 +
 .../app/components/page-signin/template.pug | 39 ++--
 2 files changed, 29 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3f893/modules/web-console/frontend/app/components/page-signin/style.scss
--
diff --git a/modules/web-console/frontend/app/components/page-signin/style.scss 
b/modules/web-console/frontend/app/components/page-signin/style.scss
index 7e13ffe..8ea143a 100644
--- a/modules/web-console/frontend/app/components/page-signin/style.scss
+++ b/modules/web-console/frontend/app/components/page-signin/style.scss
@@ -35,4 +35,14 @@ page-sign-in {
 background-color: #ff;
 color: #44;
 }
+
+.ps-grid {
+display: grid;
+grid-gap: 10px;
+grid-template-columns: 1fr 1fr;
+
+.ps-grid-full-width {
+grid-column: 1 / 3;
+}
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3f893/modules/web-console/frontend/app/components/page-signin/template.pug
--
diff --git 
a/modules/web-console/frontend/app/components/page-signin/template.pug 
b/modules/web-console/frontend/app/components/page-signin/template.pug
index 9a8b3ba..58d8571 100644
--- a/modules/web-console/frontend/app/components/page-signin/template.pug
+++ b/modules/web-console/frontend/app/components/page-signin/template.pug
@@ -27,10 +27,9 @@ section
 .row
 .col-xs-12.col-md-11
 -var form = '$ctrl.form_signup'
-form(name=form novalidate)
-.settings-row
-h3 Don't Have An Account?
-.settings-row
+h3 Don't Have An Account?
+form.ps-grid(name=form novalidate)
+.ps-grid-full-width
 +form-field__email({
 label: 'Email:',
 model: '$ctrl.data.signup.email',
@@ -42,7 +41,7 @@ section
 ng-model-options='{allowInvalid: true}'
 )
 +form-field__error({error: 'server', 
message: `{{$ctrl.serverErrors.signup}}`})
-.settings-row
+div
 +form-field__password({
 label: 'Password:',
 model: '$ctrl.data.signup.password',
@@ -52,7 +51,7 @@ section
 })(
 ignite-on-enter-focus-move='confirmInput'
 )
-.settings-row
+div
 +form-field__password({
 label: 'Confirm:',
 model: 'confirm',
@@ -63,7 +62,7 @@ section
 ignite-on-enter-focus-move='firstNameInput'
 ignite-match='$ctrl.data.signup.password'
 )
-.settings-row
+div
 +form-field__text({
 label: 'First name:',
 model: '$ctrl.data.signup.firstName',
@@ -73,7 +72,7 @@ section
 })(
 ignite-on-enter-focus-move='lastNameInput'
 )
-.settings-row
+div
 +form-field__text({
 label: 'Last name:',
 model: '$ctrl.data.signup.lastName',
@@ -83,17 +82,7 @@ section

63 matches

Mail list logo