You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/13 08:40:32 UTC
[01/50] incubator-ignite git commit: sprint-3 1.1.0
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709 ec8e09951 -> af3ba54c9
sprint-3 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db7f3d3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db7f3d3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db7f3d3b
Branch: refs/heads/ignite-709
Commit: db7f3d3b9c5229407ea5adf74461f2e7f275934e
Parents: ad2ce58
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 20:19:21 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 20:19:21 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index f38ff9d..f56625a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 1b03acd..7b91aa3 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 057f246..63dd298 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 19d6a25..77f681e 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index d112735..b8bff95 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index cdf2cf2..569dba3 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 6509c47..86af433 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 921775f..4a501b5 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 6a7610c..11446fd 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 9b5bcfb..26c55e7 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index fbd40ce..b76782d 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 2949c34..38dae94 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 04ab11b..b4214bc 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 7322da2..69094ec 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 42c8523..145027d 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 72bf1ff..7a6e361 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index b8840e3..8c48c52 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index ee733ad..2ffd916 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index d420681..69bfeb6 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 9acb521..3bc60be 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index a0bcaaa..e0523e7 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 521c7d0..7d559cc 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 674f22f..58f2e68 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 939966c..ef1eba0 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index c5b9523..e7eb06c 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 04dda81..8b74d41 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 446d7a0..14ebc25 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 108fa62..5bd949b 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db7f3d3b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ebf7c7..c3d3c70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<packaging>pom</packaging>
<properties>
[38/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-699
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-699
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a28a15a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a28a15a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a28a15a
Branch: refs/heads/ignite-709
Commit: 9a28a15a21aedd04165058fc6b493515296ceea5
Parents: b663389 54f4878
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sun Apr 12 11:10:16 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sun Apr 12 11:10:16 2015 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 3 +++
.../cache/affinity/fair/GridFairAffinityFunctionSelfTest.java | 2 --
.../affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java | 3 ++-
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[02/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/232b10ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/232b10ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/232b10ba
Branch: refs/heads/ignite-709
Commit: 232b10ba77cb5fcc939b3240d6ab719d81af68f0
Parents: db7f3d3 baaf8bb
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 20:19:48 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 20:19:48 2015 +0300
----------------------------------------------------------------------
.../resources/META-INF/classnames.properties | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[30/50] incubator-ignite git commit: ignite-727
GridReduceQueryExecutor doesn't compile with JDK 8
Posted by sb...@apache.org.
ignite-727 GridReduceQueryExecutor doesn't compile with JDK 8
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22cee3f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22cee3f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22cee3f2
Branch: refs/heads/ignite-709
Commit: 22cee3f2e686b580da67d9d1b12c4c42600a6099
Parents: aa8912d
Author: agura <ag...@gridgain.com>
Authored: Sat Apr 11 19:42:04 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Sat Apr 11 19:42:04 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22cee3f2/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 02c7c55..b7edd27 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -484,7 +484,7 @@ public class GridReduceQueryExecutor implements GridMessageListener {
Query prepare = (Query)ses.prepare(qry.query(), false);
- List<Parameter> parsedParams = prepare.getParameters();
+ List<org.h2.expression.Parameter> parsedParams = prepare.getParameters();
for (int i = Math.min(parsedParams.size(), qry.parameters().length); --i >= 0; ) {
Object val = qry.parameters()[i];
[27/50] incubator-ignite git commit: ignite-717
Posted by sb...@apache.org.
ignite-717
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa8912d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa8912d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa8912d9
Branch: refs/heads/ignite-709
Commit: aa8912d9f9910f83b46213beec94796d7efba52e
Parents: a22e197
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Sat Apr 11 15:46:07 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Sat Apr 11 15:46:07 2015 +0300
----------------------------------------------------------------------
pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa8912d9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ebf7c7..c068b56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -408,7 +408,6 @@
<outputDirectory>target/release-package/bin</outputDirectory>
<finalName>include</finalName>
<appendAssemblyId>false</appendAssemblyId>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
</configuration>
</execution>
@@ -425,7 +424,6 @@
<outputDirectory>target/release-package/bin</outputDirectory>
<finalName>include</finalName>
<appendAssemblyId>false</appendAssemblyId>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
</configuration>
</execution>
@@ -442,7 +440,6 @@
<outputDirectory>target/release-package</outputDirectory>
<finalName>bin</finalName>
<appendAssemblyId>false</appendAssemblyId>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
</configuration>
</execution>
</executions>
[45/50] incubator-ignite git commit: # sprint-3 - javadoc fixes.
Posted by sb...@apache.org.
# sprint-3 - javadoc fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fcb4a9bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fcb4a9bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fcb4a9bb
Branch: refs/heads/ignite-709
Commit: fcb4a9bb55640736f28f16bea44694bad9dca1c1
Parents: e5742de
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sun Apr 12 20:33:03 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sun Apr 12 20:33:03 2015 -0700
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/IgniteCache.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcb4a9bb/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 9f07b42..d99902a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -270,8 +270,9 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
public void localPromote(Set<? extends K> keys) throws CacheException;
/**
- * Gets the number of all entries cached across all nodes. By default, if {@code peekModes} value isn't defined
- * size across all primary copies of partitioned cache will be returned (for all configured storages).
+ * Gets the number of all entries cached across all nodes. By default, if {@code peekModes} value isn't defined,
+ * only size of primary copies across all nodes will be returned. This behavior is identical to calling
+ * this method with {@link CachePeekMode#PRIMARY} peek mode.
* <p>
* NOTE: this operation is distributed and will query all participating nodes for their cache sizes.
*
@@ -282,8 +283,9 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
public int size(CachePeekMode... peekModes) throws CacheException;
/**
- * Gets the number of all entries cached on this node. By default, if {@code peekModes} value isn't defined
- * size of primary copy of partitioned cache will be returned (for all configured storages).
+ * Gets the number of all entries cached on this node. By default, if {@code peekModes} value isn't defined,
+ * only size of primary copies will be returned. This behavior is identical to calling this method with
+ * {@link CachePeekMode#PRIMARY} peek mode.
*
* @param peekModes Optional peek modes. If not provided, then total cache size is returned.
* @return Cache size on this node.
[44/50] incubator-ignite git commit: # sprint-3 - Updated examples.
Posted by sb...@apache.org.
# sprint-3 - Updated examples.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e5742de5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5742de5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5742de5
Branch: refs/heads/ignite-709
Commit: e5742de5a535b86942b385fef1af4c8c768658da
Parents: da0f193
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sun Apr 12 20:24:39 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sun Apr 12 20:24:39 2015 -0700
----------------------------------------------------------------------
.../apache/ignite/examples/streaming/wordcount/QueryWords.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5742de5/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
index 8f4c6d4..3bd9d3d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
@@ -66,12 +66,8 @@ public class QueryWords {
// Print average count.
List<?> row = stats.get(0);
- int size = stmCache.size();
-
if (row.get(0) != null)
-
- System.out.printf("Query results [total=%d, avg=%.2f, min=%d, max=%d]%n",
- size, row.get(0), row.get(1), row.get(2));
+ System.out.printf("Query results [avg=%.2f, min=%d, max=%d]%n", row.get(0), row.get(1), row.get(2));
// Print top 10 words.
ExamplesUtils.printQueryResults(top10);
[41/50] incubator-ignite git commit: Merge branches 'ignite-699' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sprint-3
Posted by sb...@apache.org.
Merge branches 'ignite-699' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b9273d05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b9273d05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b9273d05
Branch: refs/heads/ignite-709
Commit: b9273d05f058fd8da0faa10ca4787c25dfe7820a
Parents: c8ffaab 9a28a15
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sun Apr 12 13:00:33 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sun Apr 12 13:00:33 2015 +0300
----------------------------------------------------------------------
.../ignite/cache/query/SqlFieldsQuery.java | 24 +++
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 18 +-
.../IgniteCacheColocatedQuerySelfTest.java | 209 +++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 1 +
5 files changed, 246 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[48/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fceebf26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fceebf26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fceebf26
Branch: refs/heads/ignite-709
Commit: fceebf26559068eac36b7395a7c6d51229c33469
Parents: fa04ba5 c7396a5
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sun Apr 12 21:49:03 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sun Apr 12 21:49:03 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/cache/query/ScanQuery.java | 2 +-
.../apache/ignite/cache/query/SqlFieldsQuery.java | 8 ++++----
.../query/h2/sql/GridSqlQuerySplitter.java | 16 ++++++++--------
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[37/50] incubator-ignite git commit: ignite-699
Posted by sb...@apache.org.
ignite-699
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6633893
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6633893
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6633893
Branch: refs/heads/ignite-709
Commit: b6633893f50152507d42c796d1378329b092ff9e
Parents: 9c8160b
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sun Apr 12 11:10:04 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sun Apr 12 11:10:04 2015 +0300
----------------------------------------------------------------------
.../ignite/cache/query/SqlFieldsQuery.java | 24 +++
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 18 +-
.../IgniteCacheColocatedQuerySelfTest.java | 209 +++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 1 +
5 files changed, 246 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6633893/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index 632942c..63b9b6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -39,6 +39,9 @@ public final class SqlFieldsQuery extends Query<List<?>> {
@GridToStringInclude
private Object[] args;
+ /** */
+ private boolean colocated;
+
/**
* Constructs sql fields query.
*
@@ -92,6 +95,27 @@ public final class SqlFieldsQuery extends Query<List<?>> {
return this;
}
+ /**
+ * Checks if this query colocated.
+ *
+ * @return {@code true} If the query is colocated.
+ */
+ public boolean isColocated() {
+ return colocated;
+ }
+
+ /**
+ * Sets flag defining if this query colocated.
+ *
+ * @param colocated Flag value.
+ * @return {@code this} For chaining.
+ */
+ public SqlFieldsQuery setColocated(boolean colocated) {
+ this.colocated = colocated;
+
+ return this;
+ }
+
/** {@inheritDoc} */
@Override public SqlFieldsQuery setPageSize(int pageSize) {
return (SqlFieldsQuery)super.setPageSize(pageSize);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6633893/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 6804f31..f1c10bc 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -786,7 +786,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
Collection<GridQueryFieldMetadata> meta;
try {
- twoStepQry = GridSqlQuerySplitter.split((JdbcPreparedStatement)stmt, qry.getArgs());
+ twoStepQry = GridSqlQuerySplitter.split((JdbcPreparedStatement)stmt, qry.getArgs(), qry.isColocated());
meta = meta(stmt.getMetaData());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6633893/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 79c73f0..20344c0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -71,9 +71,10 @@ public class GridSqlQuerySplitter {
/**
* @param stmt Prepared statement.
* @param params Parameters.
+ * @param colocated Colocated query.
* @return Two step query.
*/
- public static GridCacheTwoStepQuery split(JdbcPreparedStatement stmt, Object[] params) {
+ public static GridCacheTwoStepQuery split(JdbcPreparedStatement stmt, Object[] params, boolean colocated) {
if (params == null)
params = GridCacheSqlQuery.EMPTY_PARAMS;
@@ -140,7 +141,7 @@ public class GridSqlQuerySplitter {
boolean aggregateFound = false;
for (int i = 0, len = mapExps.size(); i < len; i++) // Remember len because mapExps list can grow.
- aggregateFound |= splitSelectExpression(mapExps, rdcExps, colNames, i);
+ aggregateFound |= splitSelectExpression(mapExps, rdcExps, colNames, i, colocated);
// Fill select expressions.
mapQry.clearSelect();
@@ -161,12 +162,14 @@ public class GridSqlQuerySplitter {
for (int col : srcQry.groupColumns())
mapQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
- for (int col : srcQry.groupColumns())
- rdcQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
+ if (!colocated) {
+ for (int col : srcQry.groupColumns())
+ rdcQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
+ }
}
// -- HAVING
- if (srcQry.having() != null) {
+ if (srcQry.having() != null && !colocated) {
// TODO Find aggregate functions in HAVING clause.
rdcQry.whereAnd(column(columnName(srcQry.havingColumn())));
@@ -297,10 +300,11 @@ public class GridSqlQuerySplitter {
* @param rdcSelect Selects for reduce query.
* @param colNames Set of unique top level column names.
* @param idx Index.
+ * @param colocated If it is a colocated query.
* @return {@code true} If aggregate was found.
*/
private static boolean splitSelectExpression(List<GridSqlElement> mapSelect, GridSqlElement[] rdcSelect,
- Set<String> colNames, int idx) {
+ Set<String> colNames, int idx, boolean colocated) {
GridSqlElement el = mapSelect.get(idx);
GridSqlAlias alias = null;
@@ -312,7 +316,7 @@ public class GridSqlQuerySplitter {
el = alias.child();
}
- if (el instanceof GridSqlAggregateFunction) {
+ if (!colocated && el instanceof GridSqlAggregateFunction) {
aggregateFound = true;
GridSqlAggregateFunction agg = (GridSqlAggregateFunction)el;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6633893/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java
new file mode 100644
index 0000000..b6051b7
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java
@@ -0,0 +1,209 @@
+/*
+ * 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.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ */
+public class IgniteCacheColocatedQuerySelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final String QRY =
+ "select productId, sum(price) s, count(1) c " +
+ "from Purchase " +
+ "group by productId " +
+ "having c > ? " +
+ "order by s desc, productId limit ? ";
+
+ /** */
+ private static final int PURCHASES = 1000;
+
+ /** */
+ private static final int PRODUCTS = 10;
+
+ /** */
+ private static final int MAX_PRICE = 5;
+
+ /** */
+ private static final long SEED = ThreadLocalRandom.current().nextLong();
+
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(disco);
+
+ CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+
+ cacheCfg.setCacheMode(PARTITIONED);
+ cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ cacheCfg.setSwapEnabled(false);
+ cacheCfg.setBackups(1);
+ cacheCfg.setIndexedTypes(
+ AffinityUuid.class, Purchase.class
+ );
+
+ cfg.setCacheConfiguration(cacheCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ startGridsMultiThreaded(3);
+
+ X.println("--> seed: " + SEED);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ ignite(0).cache(null).removeAll();
+ }
+
+ /**
+ * @param c Cache.
+ * @param colocated Colocated.
+ * @return Result.
+ */
+ private static List<List<?>> query(IgniteCache<AffinityUuid,Purchase> c, boolean colocated) {
+ return c.query(new SqlFieldsQuery(QRY).setArgs(30, 5).setColocated(colocated)).getAll();
+ }
+
+ /**
+ * Correct affinity.
+ */
+ public void testColocatedQueryRight() {
+ IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(null);
+
+ Random rnd = new GridRandom(SEED);
+
+ for (int i = 0; i < PURCHASES; i++) {
+ Purchase p = new Purchase();
+
+ p.productId = rnd.nextInt(PRODUCTS);
+ p.price = rnd.nextInt(MAX_PRICE);
+
+ c.put(new AffinityUuid(p.productId), p); // Correct affinity.
+ }
+
+ List<List<?>> res1 = query(c, false);
+ List<List<?>> res2 = query(c, true);
+
+ X.println("res1: " + res1);
+ X.println("res2: " + res2);
+
+ assertFalse(res1.isEmpty());
+ assertEquals(res1.toString(), res2.toString()); // TODO fix type conversion issue
+ }
+
+ /**
+ * Correct affinity.
+ */
+ public void testColocatedQueryWrong() {
+ IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(null);
+
+ Random rnd = new GridRandom(SEED);
+
+ for (int i = 0; i < PURCHASES; i++) {
+ Purchase p = new Purchase();
+
+ p.productId = rnd.nextInt(PRODUCTS);
+ p.price = rnd.nextInt(MAX_PRICE);
+
+ c.put(new AffinityUuid(rnd.nextInt(PRODUCTS)), p); // Random affinity.
+ }
+
+ List<List<?>> res1 = query(c, false);
+ List<List<?>> res2 = query(c, true);
+
+ X.println("res1: " + res1);
+ X.println("res2: " + res2);
+
+ assertFalse(res1.isEmpty());
+ assertFalse(res1.equals(res2));
+ }
+
+ /**
+ *
+ */
+ private static class Purchase implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ @QuerySqlField
+ int productId;
+
+ /** */
+ @QuerySqlField
+ int price;
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o) return true;
+
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Purchase purchase = (Purchase)o;
+
+ return productId == purchase.productId && price == purchase.price;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int result = productId;
+
+ result = 31 * result + price;
+
+ return result;
+ }
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6633893/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index d81d766..08f6ed2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -55,6 +55,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class);
suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class);
+ suite.addTestSuite(IgniteCacheColocatedQuerySelfTest.class);
suite.addTestSuite(IgniteCacheLargeResultSelfTest.class);
suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
[26/50] incubator-ignite git commit: # ignite-sprint-3 increased test
timeout
Posted by sb...@apache.org.
# ignite-sprint-3 increased test timeout
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a22e1974
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a22e1974
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a22e1974
Branch: refs/heads/ignite-709
Commit: a22e19744ca30b32bdd081b516cf2d54e4c744e8
Parents: 9b21a97
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 12:55:51 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 12:55:51 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a22e1974/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
index 8c1795b..1a47049 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
@@ -30,6 +30,11 @@ import static org.apache.ignite.transactions.TransactionIsolation.*;
* Multithreaded update test with off heap enabled.
*/
public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return 5 * 60_000;
+ }
+
/**
* @throws Exception If failed.
*/
[12/50] incubator-ignite git commit: # ignite-537
Posted by sb...@apache.org.
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4957a35a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4957a35a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4957a35a
Branch: refs/heads/ignite-709
Commit: 4957a35a2c02096a5e01f4fb06f098334367e621
Parents: b910061
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 22:02:17 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 22:02:17 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4957a35a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 1ab5332..b61a402 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -290,7 +290,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
private ConcurrentLinkedDeque<String> debugLog;
/** Class loaders for event data unmarshalling. */
- private ConcurrentMap<UUID, DiscoveryDeploymentClassLoader> p2pLdrs = new ConcurrentHashMap<>();
+ private transient ConcurrentMap<UUID, DiscoveryDeploymentClassLoader> p2pLdrs = new ConcurrentHashMap<>();
/** {@inheritDoc} */
@IgniteInstanceResource
[06/50] incubator-ignite git commit: # ignite-537
Posted by sb...@apache.org.
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c85175b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c85175b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c85175b7
Branch: refs/heads/ignite-709
Commit: c85175b7ebaf24c0c1cd3519b4c9889ca7efb071
Parents: 876beff
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 20:43:20 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 20:43:20 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c85175b7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 117166f..d9cec3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -2328,19 +2328,23 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
private Map<Integer, byte[]> collectExchangeData(UUID nodeId) throws IgniteSpiException {
Map<Integer, Serializable> data = exchange.collect(nodeId);
- Map<Integer, byte[]> data0 = U.newHashMap(data.size());
+ Map<Integer, byte[]> data0 = null;
- for (Map.Entry<Integer, Serializable> entry : data.entrySet()) {
- try {
- byte[] bytes = marsh.marshal(entry.getValue());
+ if (data != null) {
+ data0 = U.newHashMap(data.size());
- data0.put(entry.getKey(), bytes);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to marshal discovery data " +
- "[comp=" + entry.getKey() + ", data=" + entry.getValue() + ']', e);
+ for (Map.Entry<Integer, Serializable> entry : data.entrySet()) {
+ try {
+ byte[] bytes = marsh.marshal(entry.getValue());
- throw new IgniteSpiException("Failed to marshal discovery data.", e);
+ data0.put(entry.getKey(), bytes);
+ }
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to marshal discovery data " +
+ "[comp=" + entry.getKey() + ", data=" + entry.getValue() + ']', e);
+
+ throw new IgniteSpiException("Failed to marshal discovery data.", e);
+ }
}
}
[09/50] incubator-ignite git commit: # ignite-537
Posted by sb...@apache.org.
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f316e9af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f316e9af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f316e9af
Branch: refs/heads/ignite-709
Commit: f316e9afa523a945d8d02886a896fc6add8d83c6
Parents: c85175b
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 20:58:20 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 20:58:20 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f316e9af/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d9cec3c..bf8cbdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -5462,6 +5462,13 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
/** {@inheritDoc} */
@Override protected Class<?> findClass(String name) throws ClassNotFoundException {
+ try {
+ return U.gridClassLoader().loadClass(name);
+ }
+ catch (ClassNotFoundException ignore) {
+ // Ignore.
+ }
+
lock.readLock().lock();
try {
[47/50] incubator-ignite git commit: # sprint-3 - release notes.
Posted by sb...@apache.org.
# sprint-3 - release notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa04ba58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa04ba58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa04ba58
Branch: refs/heads/ignite-709
Commit: fa04ba58f04aa17b6b311b20047fa46de8bdda77
Parents: fcb4a9b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sun Apr 12 21:48:49 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sun Apr 12 21:48:49 2015 -0700
----------------------------------------------------------------------
RELEASE_NOTES.txt | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa04ba58/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 58ac849..7aeafaf 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,6 +1,19 @@
Apache Ignite Release Notes
===========================
+Apache Ignite In-Memory Data Fabric 1.1
+---------------------------------------
+
+* Fixed SQL Union support
+* Added "collocated" mode for SQL queries.
+* Fixed Word-Count streaming example to produce better results.
+* Added AffinityUuid class for easier generation of unique collocated keys.
+* Added support for cache configuration templates.
+* Added support for (*) star notation in cache names.
+* Removed edtFTPj scanner from URI deployment due to licensing issues.
+* Made deployment scanners for URI-based deployment pluggable.
+* Many stability and fault-tolerance fixes.
+
Apache Ignite In-Memory Data Fabric 1.0
---------------------------------------
[17/50] incubator-ignite git commit: # sprint-3 Fixed Visor tests.
Posted by sb...@apache.org.
# sprint-3 Fixed Visor tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a5990c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a5990c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a5990c9
Branch: refs/heads/ignite-709
Commit: 1a5990c99536580ad934cd916fc64695c86b9350
Parents: 5953786
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sat Apr 11 09:51:17 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sat Apr 11 09:51:17 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/visor/query/VisorQueryTask.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a5990c9/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index b320842..6683205 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -44,7 +44,9 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryArg, IgniteBiTupl
ClusterNode node;
if (taskArg.localCacheNodeId() == null) {
- ClusterGroup prj = ignite.cluster().forDataNodes(cacheName);
+ ClusterGroup prj = (ignite.cluster().localNode().isDaemon())
+ ? ignite.cluster().forRemotes()
+ : ignite.cluster().forDataNodes(cacheName);
if (prj.nodes().isEmpty())
throw new IgniteException("No data nodes for cache: " + escapeName(cacheName));
[49/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-709
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-709
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c285177
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c285177
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c285177
Branch: refs/heads/ignite-709
Commit: 8c2851777b95f45227341cde1229d366ef1e11f1
Parents: ec8e099 fceebf2
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 13 09:20:59 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 13 09:20:59 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 13 +
assembly/release-hadoop.xml | 4 -
bin/ignitevisorcmd.bat | 39 +--
examples/pom.xml | 2 +-
.../streaming/wordcount/CacheConfig.java | 5 +
.../streaming/wordcount/QueryWords.java | 4 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
.../client/ClientReconnectionSelfTest.java | 2 +
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 4 +-
.../java/org/apache/ignite/IgniteCache.java | 19 +-
.../java/org/apache/ignite/IgniteState.java | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 7 +
.../apache/ignite/cache/query/ScanQuery.java | 2 +-
.../ignite/cache/query/SqlFieldsQuery.java | 55 +++-
.../configuration/CacheConfiguration.java | 76 +++--
.../configuration/IgniteConfiguration.java | 16 +-
.../ignite/internal/ClusterMetricsSnapshot.java | 3 -
.../internal/ComputeTaskInternalFuture.java | 2 +-
.../apache/ignite/internal/GridComponent.java | 5 +-
.../ignite/internal/GridJobExecuteRequest.java | 10 +-
.../ignite/internal/GridJobExecuteResponse.java | 4 +-
.../ignite/internal/GridPluginComponent.java | 5 +-
.../apache/ignite/internal/GridTaskMessage.java | 30 --
.../ignite/internal/GridTaskSessionRequest.java | 6 +-
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../client/GridClientConfiguration.java | 14 +-
.../GridClientConnectionManagerAdapter.java | 2 +-
.../router/GridTcpRouterConfiguration.java | 6 +-
.../internal/cluster/ClusterGroupAdapter.java | 150 ++++++++--
.../internal/managers/GridManagerAdapter.java | 8 +-
.../discovery/GridDiscoveryManager.java | 39 ++-
.../eventstorage/GridEventStorageManager.java | 4 +-
.../processors/GridProcessorAdapter.java | 5 +-
.../processors/cache/CacheMetricsImpl.java | 7 +-
.../processors/cache/CacheMetricsSnapshot.java | 223 ++++++++++++++-
.../processors/cache/GridCacheAdapter.java | 12 +-
.../processors/cache/GridCacheContext.java | 6 +-
.../processors/cache/GridCacheProcessor.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 26 ++
.../dht/atomic/GridDhtAtomicCache.java | 6 +-
.../dht/colocated/GridDhtColocatedCache.java | 3 +-
.../GridDhtPartitionsExchangeFuture.java | 3 +
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/local/GridLocalLockFuture.java | 2 +
.../local/atomic/GridLocalAtomicCache.java | 6 +-
.../cache/query/GridCacheQueryAdapter.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 6 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 4 +-
.../processors/igfs/IgfsFileWorker.java | 180 ------------
.../processors/igfs/IgfsFileWorkerBatch.java | 225 ++++++---------
.../processors/igfs/IgfsFileWorkerTask.java | 32 ---
.../internal/processors/igfs/IgfsImpl.java | 150 ++++++----
.../processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 6 +-
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../plugin/IgnitePluginProcessor.java | 13 +-
.../query/GridQueryFieldMetadata.java | 2 +-
.../processors/query/GridQueryProcessor.java | 89 +++---
.../processors/rest/GridRestProcessor.java | 33 +--
.../security/GridSecurityProcessor.java | 13 +-
.../processors/security/SecurityContext.java | 8 +-
.../security/os/GridOsSecurityProcessor.java | 11 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../ignite/internal/util/GridJavaProcess.java | 38 ++-
.../visor/cache/VisorCacheClearTask.java | 3 +
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 2 +-
.../internal/visor/log/VisorLogSearchTask.java | 12 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../node/VisorNodeEventsCollectorTask.java | 3 +
.../node/VisorSegmentationConfiguration.java | 4 +-
.../internal/visor/query/VisorQueryArg.java | 82 ++++++
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 96 +++++++
.../internal/visor/query/VisorQueryField.java | 66 ++++-
.../internal/visor/query/VisorQueryJob.java | 174 ++++++++++++
.../visor/query/VisorQueryNextPageTask.java | 75 +++--
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 283 ++-----------------
.../internal/visor/query/VisorQueryUtils.java | 55 ++--
.../internal/visor/util/VisorTaskUtils.java | 3 +
.../apache/ignite/plugin/PluginProvider.java | 5 +-
.../plugin/security/AuthenticationContext.java | 12 +-
.../security/GridSecurityCredentials.java | 184 ------------
.../GridSecurityCredentialsBasicProvider.java | 44 ---
.../GridSecurityCredentialsProvider.java | 44 ---
.../plugin/security/GridSecurityException.java | 58 ----
.../plugin/security/GridSecurityPermission.java | 69 -----
.../security/GridSecurityPermissionSet.java | 66 -----
.../plugin/security/GridSecuritySubject.java | 62 ----
.../security/GridSecuritySubjectType.java | 48 ----
.../plugin/security/SecurityCredentials.java | 191 +++++++++++++
.../SecurityCredentialsBasicProvider.java | 44 +++
.../security/SecurityCredentialsProvider.java | 44 +++
.../plugin/security/SecurityException.java | 61 ++++
.../plugin/security/SecurityPermission.java | 69 +++++
.../plugin/security/SecurityPermissionSet.java | 66 +++++
.../ignite/plugin/security/SecuritySubject.java | 62 ++++
.../plugin/security/SecuritySubjectType.java | 48 ++++
.../segmentation/GridSegmentationPolicy.java | 47 ---
.../segmentation/GridSegmentationResolver.java | 64 -----
.../plugin/segmentation/SegmentationPolicy.java | 49 ++++
.../segmentation/SegmentationResolver.java | 65 +++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 4 +-
.../spi/discovery/DiscoveryMetricsProvider.java | 10 +
.../spi/discovery/DiscoverySpiDataExchange.java | 5 +-
.../DiscoverySpiNodeAuthenticator.java | 2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 39 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 147 ++++++++--
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 ++
.../tcp/internal/TcpDiscoveryNode.java | 82 +++++-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../messages/TcpDiscoveryHeartbeatMessage.java | 65 +++++
.../TcpDiscoveryJoinRequestMessage.java | 6 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 16 +-
.../ignite/startup/BasicWarmupClosure.java | 9 +-
.../startup/cmdline/CommandLineStartup.java | 7 +-
.../resources/META-INF/classnames.properties | 36 ++-
.../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++
.../fair/GridFairAffinityFunctionSelfTest.java | 2 -
.../IgniteFairAffinityDynamicCacheSelfTest.java | 97 +++++++
.../internal/GridLifecycleAwareSelfTest.java | 2 +-
.../ignite/internal/GridProjectionSelfTest.java | 82 ++++++
.../CacheMetricsForClusterGroupSelfTest.java | 252 +++++++++++++++++
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 5 +
.../GridCacheSetFailoverAbstractSelfTest.java | 2 +
.../continuous/GridEventConsumeSelfTest.java | 3 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 16 +-
.../discovery/AbstractDiscoverySelfTest.java | 4 +-
...ClusterMetricsSnapshotSerializeSelfTest.java | 28 ++
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +-
.../testframework/GridSpiTestContext.java | 4 +-
.../junits/spi/GridSpiAbstractTest.java | 76 +----
.../IgniteCacheMetricsSelfTestSuite.java | 4 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 6 +
modules/extdata/p2p/pom.xml | 2 +-
.../p2p/startcache/CacheAllNodesFilter.java | 31 ++
.../CacheConfigurationP2PTestClient.java | 118 ++++++++
.../tests/p2p/startcache/Organization1.java | 52 ++++
.../tests/p2p/startcache/Organization2.java | 52 ++++
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes
modules/hadoop/pom.xml | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 19 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 18 +-
.../query/h2/twostep/GridMergeIndex.java | 17 +-
.../cache/CacheConfigurationP2PTest.java | 179 ++++++++++++
.../cache/CacheConfigurationP2PTestServer.java | 49 ++++
.../IgniteCacheCollocatedQuerySelfTest.java | 209 ++++++++++++++
.../cache/IgniteCacheLargeResultSelfTest.java | 104 +++++++
.../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../IgniteCacheWithIndexingTestSuite.java | 2 +
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
.../http/jetty/GridJettyRestHandler.java | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
.../ignite/tools/classgen/ClassesGenerator.java | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 19 ++
.../commands/cache/VisorCacheScanCommand.scala | 13 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 51 ++--
187 files changed, 4150 insertions(+), 1994 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c285177/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 7920810,2ab8e8f..f690039
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@@ -1156,58 -1163,19 +1166,64 @@@ public class TcpClientDiscoverySpi exte
}
/**
+ * @param msg Message.
+ */
+ private void processCustomMessage(TcpDiscoveryCustomEventMessage msg) {
+ if (msg.verified()) {
+ DiscoverySpiListener lsnr = TcpClientDiscoverySpi.this.lsnr;
+
+ if (lsnr != null) {
+ TcpDiscoveryNode node = nodeId.equals(getLocalNodeId()) ? locNode : rmtNodes.get(nodeId);
+
+ if (node != null && node.visible())
+ notifyDiscovery(EVT_DISCOVERY_CUSTOM_EVT, topVer, node, allNodes(), msg.message());
+ else if (log.isDebugEnabled())
+ log.debug("Received metrics from unknown node: " + nodeId);
+ }
+ }
+ else {
+ if (getLocalNodeId().equals(msg.creatorNodeId())) {
+ Socket sock0 = sock;
+
+ if (sock0 != null) {
+ try {
+ writeToSocket(sock0, msg);
+
+ if (log.isDebugEnabled())
+ log.debug("Heartbeat message sent [sock=" + sock0 + ", msg=" + msg + ']');
+ }
+ catch (IOException | IgniteCheckedException e) {
+ if (log.isDebugEnabled())
+ U.error(log, "Failed to send custom message [sock=" + sock0 +
+ ", msg=" + msg + ']', e);
+
+ U.closeQuiet(sock0);
+
+ sock = null;
+
+ interrupt();
+ }
+ }
+ else if (log.isDebugEnabled())
+ log.debug("Failed to send custom message (node is disconnected): " + msg);
+ }
+ }
+ }
+
+ /**
* @param nodeId Node ID.
* @param metrics Metrics.
+ * @param cacheMetrics Cache metrics.
* @param tstamp Timestamp.
*/
- private void updateMetrics(UUID nodeId, ClusterMetrics metrics, long tstamp) {
+ private void updateMetrics(UUID nodeId,
+ ClusterMetrics metrics,
+ Map<Integer, CacheMetrics> cacheMetrics,
+ long tstamp)
+ {
assert nodeId != null;
assert metrics != null;
+ assert cacheMetrics != null;
TcpDiscoveryNode node = nodeId.equals(getLocalNodeId()) ? locNode : rmtNodes.get(nodeId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c285177/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
[24/50] incubator-ignite git commit: # ignite-sprint-3 added
ignoreInterrupts for GridDhtColocatedLockFuture (like in
GridDhtColocatedLockFuture)
Posted by sb...@apache.org.
# ignite-sprint-3 added ignoreInterrupts for GridDhtColocatedLockFuture (like in GridDhtColocatedLockFuture)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d333feb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d333feb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d333feb6
Branch: refs/heads/ignite-709
Commit: d333feb6bf4a540b63027fe3a67fc2d795c3ed7d
Parents: 8cf590e
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 12:30:10 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 12:30:10 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/local/GridLocalLockFuture.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d333feb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
index a6aac64..340eb07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
@@ -111,6 +111,8 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean>
this.filter = filter;
this.tx = tx;
+ ignoreInterrupts(true);
+
threadId = tx == null ? Thread.currentThread().getId() : tx.threadId();
lockVer = tx != null ? tx.xidVersion() : cctx.versions().next();
[20/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-721
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-721
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0085a30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0085a30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0085a30
Branch: refs/heads/ignite-709
Commit: c0085a30eb350e0202879fd4443d6dcf716cd7db
Parents: 2d3eac7 df1fbef
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sat Apr 11 00:44:41 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sat Apr 11 00:44:41 2015 -0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../apache/ignite/internal/GridComponent.java | 5 +-
.../ignite/internal/GridPluginComponent.java | 5 +-
.../internal/managers/GridManagerAdapter.java | 4 +-
.../discovery/GridDiscoveryManager.java | 10 +-
.../processors/GridProcessorAdapter.java | 5 +-
.../processors/cache/GridCacheProcessor.java | 4 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 6 +-
.../plugin/IgnitePluginProcessor.java | 13 +-
.../ignite/internal/util/GridJavaProcess.java | 38 +-
.../internal/visor/query/VisorQueryTask.java | 4 +-
.../apache/ignite/plugin/PluginProvider.java | 5 +-
.../spi/discovery/DiscoverySpiDataExchange.java | 5 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 479 +++++++++++++++++--
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 ++
.../tcp/internal/TcpDiscoveryNode.java | 12 +-
.../tcp/messages/TcpDiscoveryClassRequest.java | 55 +++
.../tcp/messages/TcpDiscoveryClassResponse.java | 76 +++
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../TcpDiscoveryJoinRequestMessage.java | 6 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 16 +-
.../CacheMetricsForClusterGroupSelfTest.java | 18 +-
.../continuous/GridEventConsumeSelfTest.java | 3 +-
.../discovery/AbstractDiscoverySelfTest.java | 4 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
modules/extdata/p2p/pom.xml | 2 +-
.../p2p/startcache/CacheAllNodesFilter.java | 31 ++
.../CacheConfigurationP2PTestClient.java | 114 +++++
.../tests/p2p/startcache/Organization1.java | 52 ++
.../tests/p2p/startcache/Organization2.java | 52 ++
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../cache/CacheConfigurationP2PTest.java | 177 +++++++
.../cache/CacheConfigurationP2PTestServer.java | 49 ++
.../IgniteCacheWithIndexingTestSuite.java | 2 +
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
64 files changed, 1248 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
[42/50] incubator-ignite git commit: # Return correct assert.
Posted by sb...@apache.org.
# Return correct assert.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b39fd2a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b39fd2a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b39fd2a4
Branch: refs/heads/ignite-709
Commit: b39fd2a46350d7113cc0db411206dc47d4328aaf
Parents: b9273d0
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun Apr 12 13:21:36 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun Apr 12 13:21:48 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/ClusterMetricsSnapshot.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b39fd2a4/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
index 0b27f12..4d5d146 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
@@ -1308,6 +1308,9 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
buf.putInt(metrics.getOutboundMessagesQueueSize());
buf.putInt(metrics.getTotalNodes());
+ assert !buf.hasRemaining() : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual="
+ + (buf.position() - off) + ']';
+
return buf.position();
}
[22/50] incubator-ignite git commit: IGNITE-721 - Restoring test.
Posted by sb...@apache.org.
IGNITE-721 - Restoring test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf7b9f86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf7b9f86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf7b9f86
Branch: refs/heads/ignite-709
Commit: bf7b9f861add6a9bf73513066938fc49384ad381
Parents: c0085a3
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sat Apr 11 00:47:00 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sat Apr 11 00:47:00 2015 -0700
----------------------------------------------------------------------
.../IgniteFairAffinityDynamicCacheSelfTest.java | 36 +++++++++-----------
1 file changed, 17 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf7b9f86/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
index 90571a4..18b77e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
@@ -70,30 +70,28 @@ public class IgniteFairAffinityDynamicCacheSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testStartStopCache() throws Exception {
- for (int k = 0; k < 10; k++) {
- CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
- cacheCfg.setCacheMode(CacheMode.PARTITIONED);
- cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- cacheCfg.setBackups(1);
- cacheCfg.setName("test");
- cacheCfg.setAffinity(new FairAffinityFunction());
+ cacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ cacheCfg.setBackups(1);
+ cacheCfg.setName("test");
+ cacheCfg.setAffinity(new FairAffinityFunction());
- final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg);
+ final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg);
- for (int i = 0; i < 10_000; i++)
- cache.put(i, i);
+ for (int i = 0; i < 10_000; i++)
+ cache.put(i, i);
- IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() {
- @Override
- public Object call() throws Exception {
- ignite(0).destroyCache(cache.getName());
+ IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ ignite(0).destroyCache(cache.getName());
- return null;
- }
- });
+ return null;
+ }
+ });
- destFut.get(2000L);
- }
+ destFut.get(2000L);
}
}
[31/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-sprint-3
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/572d81bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/572d81bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/572d81bc
Branch: refs/heads/ignite-709
Commit: 572d81bcf87baa3dce5f3d22b44336b5542c1d35
Parents: 22cee3f 1a5e453
Author: agura <ag...@gridgain.com>
Authored: Sat Apr 11 19:42:33 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Sat Apr 11 19:42:33 2015 +0300
----------------------------------------------------------------------
.../cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[15/50] incubator-ignite git commit: # ignite-537
Posted by sb...@apache.org.
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98587c6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98587c6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98587c6c
Branch: refs/heads/ignite-709
Commit: 98587c6cd66c42eee2fd8a27ad0715599ef8665b
Parents: 35537fa
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 00:38:39 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 00:38:39 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 ++++---
.../tcp/messages/TcpDiscoveryCustomEventMessage.java | 14 +++++++++++++-
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98587c6c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 3301303..5392331 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1257,7 +1257,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
msgBytes = marsh.marshal(evt);
- msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), msgBytes));
+ msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, msgBytes));
}
catch (IgniteCheckedException e) {
throw new IgniteSpiException("Failed to marshal custom event: " + evt, e);
@@ -4600,10 +4600,11 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
TcpDiscoveryNode node = ring.node(msg.creatorNodeId());
- Serializable msgObj;
+ Serializable msgObj = msg.message();
try {
- msgObj = marsh.unmarshal(msg.messageBytes(), customMessageClassLoader(node));
+ if (msgObj == null)
+ msgObj = marsh.unmarshal(msg.messageBytes(), customMessageClassLoader(node));
}
catch (IgniteCheckedException e) {
throw new IgniteSpiException("Failed to unmarshal discovery custom message.", e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98587c6c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index 3144b93..4e42f2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
+import java.io.*;
import java.util.*;
/**
@@ -30,19 +31,30 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** */
+ private transient Serializable msg;
+
+ /** */
private final byte[] msgBytes;
/**
* @param creatorNodeId Creator node id.
* @param msgBytes Serialized message.
*/
- public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, byte[] msgBytes) {
+ public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, Serializable msg, byte[] msgBytes) {
super(creatorNodeId);
+ this.msg = msg;
this.msgBytes = msgBytes;
}
/**
+ * @return Message.
+ */
+ public Serializable message() {
+ return msg;
+ }
+
+ /**
* @return Serialized message.
*/
public byte[] messageBytes() {
[13/50] incubator-ignite git commit: # ignite-537
Posted by sb...@apache.org.
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35537fa0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35537fa0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35537fa0
Branch: refs/heads/ignite-709
Commit: 35537fa02b60f404b0f2ecd8620fdc83c7d26a61
Parents: 4957a35
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 22:32:08 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 22:32:08 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35537fa0/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index b61a402..3301303 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -290,6 +290,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
private ConcurrentLinkedDeque<String> debugLog;
/** Class loaders for event data unmarshalling. */
+ @GridToStringExclude
private transient ConcurrentMap<UUID, DiscoveryDeploymentClassLoader> p2pLdrs = new ConcurrentHashMap<>();
/** {@inheritDoc} */
[23/50] incubator-ignite git commit: # sprint-3 - Updated
hadoop-readme.md
Posted by sb...@apache.org.
# sprint-3 - Updated hadoop-readme.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8cf590ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8cf590ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8cf590ed
Branch: refs/heads/ignite-709
Commit: 8cf590ed2399e4ae10b80cfa49ee7f4003884bd9
Parents: 0b24812
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Apr 11 01:17:49 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Apr 11 01:17:49 2015 -0700
----------------------------------------------------------------------
modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8cf590ed/modules/hadoop/docs/hadoop_readme.pdf
----------------------------------------------------------------------
diff --git a/modules/hadoop/docs/hadoop_readme.pdf b/modules/hadoop/docs/hadoop_readme.pdf
index d56d950..ffd8d13 100644
Binary files a/modules/hadoop/docs/hadoop_readme.pdf and b/modules/hadoop/docs/hadoop_readme.pdf differ
[43/50] incubator-ignite git commit: sprint-3 - Renaming colocated ->
collocated. Word-count example fixes.
Posted by sb...@apache.org.
sprint-3 - Renaming colocated -> collocated. Word-count example fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da0f1933
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da0f1933
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da0f1933
Branch: refs/heads/ignite-709
Commit: da0f193301260c6b550de4f33dd6b6a42a675b98
Parents: b39fd2a
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sun Apr 12 18:19:53 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sun Apr 12 18:19:53 2015 -0700
----------------------------------------------------------------------
.../streaming/wordcount/CacheConfig.java | 5 +
.../streaming/wordcount/QueryWords.java | 10 +-
.../ignite/cache/query/SqlFieldsQuery.java | 45 +++-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../IgniteCacheCollocatedQuerySelfTest.java | 209 +++++++++++++++++++
.../IgniteCacheColocatedQuerySelfTest.java | 209 -------------------
.../IgniteCacheQuerySelfTestSuite.java | 2 +-
7 files changed, 259 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da0f1933/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
index 58704ca..bb2a18e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
@@ -18,6 +18,7 @@
package org.apache.ignite.examples.streaming.wordcount;
import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.eviction.fifo.*;
import org.apache.ignite.configuration.*;
import javax.cache.configuration.*;
@@ -43,6 +44,10 @@ public class CacheConfig {
// Sliding window of 1 seconds.
cfg.setExpiryPolicyFactory(FactoryBuilder.factoryOf(new CreatedExpiryPolicy(new Duration(SECONDS, 1))));
+ // Do not allow more than 1 million entries.
+ // Allows to run this example with smaller available memory.
+ cfg.setEvictionPolicy(new FifoEvictionPolicy<>(1_000_000));
+
return cfg;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da0f1933/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
index c32d8e8..8f4c6d4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
@@ -49,7 +49,9 @@ public class QueryWords {
// Select top 10 words.
SqlFieldsQuery top10Qry = new SqlFieldsQuery(
- "select _val, count(_val) as cnt from String group by _val order by cnt desc limit 10");
+ "select _val, count(_val) as cnt from String group by _val order by cnt desc limit 10",
+ true /*collocated*/
+ );
// Select average, min, and max counts among all the words.
SqlFieldsQuery statsQry = new SqlFieldsQuery(
@@ -64,8 +66,12 @@ public class QueryWords {
// Print average count.
List<?> row = stats.get(0);
+ int size = stmCache.size();
+
if (row.get(0) != null)
- System.out.printf("Query results [avg=%.2f, min=%d, max=%d]%n", row.get(0), row.get(1), row.get(2));
+
+ System.out.printf("Query results [total=%d, avg=%.2f, min=%d, max=%d]%n",
+ size, row.get(0), row.get(1), row.get(2));
// Print top 10 words.
ExamplesUtils.printQueryResults(top10);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da0f1933/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index 63b9b6e..1ffd14f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -24,7 +24,21 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import java.util.*;
/**
- * SQL Fields query.
+ * SQL Fields query. This query can return specific fields of data based
+ * on SQL {@code 'select'} clause, as opposed to {@link SqlQuery}, which always returns
+ * the whole key and value objects back.
+ * <h1 class="header">Collocated Flag</h1>
+ * Collocation flag si used for optimization purposes. Whenever Ignite executes
+ * a distributed query, it sends sub-queries to individual cluster members.
+ * If you know in advance that the elements of your query selection are collocated
+ * together on the same node, usually based on some <b>affinity-key</b>, Ignite
+ * can make significant performance and network optimizations.
+ * <p>
+ * For example, in case of Word-Count example, we know that all identical words
+ * are processed on the same cluster member, because we use the {@code word} itself
+ * as affinity key. This allows Ignite to execute the {@code 'limit'} clause on
+ * the remote nodes and bring back only the small data set specified within the 'limit' clause,
+ * instead of the whole query result as would happen in a non-collocated execution.
*
* @see IgniteCache#query(Query)
*/
@@ -39,19 +53,30 @@ public final class SqlFieldsQuery extends Query<List<?>> {
@GridToStringInclude
private Object[] args;
- /** */
- private boolean colocated;
+ /** Collocation flag. */
+ private boolean collocated;
/**
- * Constructs sql fields query.
+ * Constructs SQL fields query.
*
- * @param sql SQL Query.
+ * @param sql SQL query.
*/
public SqlFieldsQuery(String sql) {
setSql(sql);
}
/**
+ * Constructs SQL fields query.
+ *
+ * @param sql SQL query.
+ * @param collocated Collocated flag.
+ */
+ public SqlFieldsQuery(String sql, boolean collocated) {
+ this.sql = sql;
+ this.collocated = collocated;
+ }
+
+ /**
* Gets SQL clause.
*
* @return SQL clause.
@@ -100,18 +125,18 @@ public final class SqlFieldsQuery extends Query<List<?>> {
*
* @return {@code true} If the query is colocated.
*/
- public boolean isColocated() {
- return colocated;
+ public boolean isCollocated() {
+ return collocated;
}
/**
* Sets flag defining if this query colocated.
*
- * @param colocated Flag value.
+ * @param collocated Flag value.
* @return {@code this} For chaining.
*/
- public SqlFieldsQuery setColocated(boolean colocated) {
- this.colocated = colocated;
+ public SqlFieldsQuery setCollocated(boolean collocated) {
+ this.collocated = collocated;
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da0f1933/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index f1c10bc..9372901 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -786,7 +786,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
Collection<GridQueryFieldMetadata> meta;
try {
- twoStepQry = GridSqlQuerySplitter.split((JdbcPreparedStatement)stmt, qry.getArgs(), qry.isColocated());
+ twoStepQry = GridSqlQuerySplitter.split((JdbcPreparedStatement)stmt, qry.getArgs(), qry.isCollocated());
meta = meta(stmt.getMetaData());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da0f1933/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
new file mode 100644
index 0000000..2c4a05c
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
@@ -0,0 +1,209 @@
+/*
+ * 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.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ */
+public class IgniteCacheCollocatedQuerySelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final String QRY =
+ "select productId, sum(price) s, count(1) c " +
+ "from Purchase " +
+ "group by productId " +
+ "having c > ? " +
+ "order by s desc, productId limit ? ";
+
+ /** */
+ private static final int PURCHASES = 1000;
+
+ /** */
+ private static final int PRODUCTS = 10;
+
+ /** */
+ private static final int MAX_PRICE = 5;
+
+ /** */
+ private static final long SEED = ThreadLocalRandom.current().nextLong();
+
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(disco);
+
+ CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+
+ cacheCfg.setCacheMode(PARTITIONED);
+ cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ cacheCfg.setSwapEnabled(false);
+ cacheCfg.setBackups(1);
+ cacheCfg.setIndexedTypes(
+ AffinityUuid.class, Purchase.class
+ );
+
+ cfg.setCacheConfiguration(cacheCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ startGridsMultiThreaded(3);
+
+ X.println("--> seed: " + SEED);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ ignite(0).cache(null).removeAll();
+ }
+
+ /**
+ * @param c Cache.
+ * @param collocated Colocated.
+ * @return Result.
+ */
+ private static List<List<?>> query(IgniteCache<AffinityUuid,Purchase> c, boolean collocated) {
+ return c.query(new SqlFieldsQuery(QRY).setArgs(30, 5).setCollocated(collocated)).getAll();
+ }
+
+ /**
+ * Correct affinity.
+ */
+ public void testColocatedQueryRight() {
+ IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(null);
+
+ Random rnd = new GridRandom(SEED);
+
+ for (int i = 0; i < PURCHASES; i++) {
+ Purchase p = new Purchase();
+
+ p.productId = rnd.nextInt(PRODUCTS);
+ p.price = rnd.nextInt(MAX_PRICE);
+
+ c.put(new AffinityUuid(p.productId), p); // Correct affinity.
+ }
+
+ List<List<?>> res1 = query(c, false);
+ List<List<?>> res2 = query(c, true);
+
+ X.println("res1: " + res1);
+ X.println("res2: " + res2);
+
+ assertFalse(res1.isEmpty());
+ assertEquals(res1.toString(), res2.toString()); // TODO fix type conversion issue
+ }
+
+ /**
+ * Correct affinity.
+ */
+ public void testColocatedQueryWrong() {
+ IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(null);
+
+ Random rnd = new GridRandom(SEED);
+
+ for (int i = 0; i < PURCHASES; i++) {
+ Purchase p = new Purchase();
+
+ p.productId = rnd.nextInt(PRODUCTS);
+ p.price = rnd.nextInt(MAX_PRICE);
+
+ c.put(new AffinityUuid(rnd.nextInt(PRODUCTS)), p); // Random affinity.
+ }
+
+ List<List<?>> res1 = query(c, false);
+ List<List<?>> res2 = query(c, true);
+
+ X.println("res1: " + res1);
+ X.println("res2: " + res2);
+
+ assertFalse(res1.isEmpty());
+ assertFalse(res1.equals(res2));
+ }
+
+ /**
+ *
+ */
+ private static class Purchase implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ @QuerySqlField
+ int productId;
+
+ /** */
+ @QuerySqlField
+ int price;
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o) return true;
+
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Purchase purchase = (Purchase)o;
+
+ return productId == purchase.productId && price == purchase.price;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int result = productId;
+
+ result = 31 * result + price;
+
+ return result;
+ }
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da0f1933/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java
deleted file mode 100644
index b6051b7..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheColocatedQuerySelfTest.java
+++ /dev/null
@@ -1,209 +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.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- */
-public class IgniteCacheColocatedQuerySelfTest extends GridCommonAbstractTest {
- /** */
- private static final String QRY =
- "select productId, sum(price) s, count(1) c " +
- "from Purchase " +
- "group by productId " +
- "having c > ? " +
- "order by s desc, productId limit ? ";
-
- /** */
- private static final int PURCHASES = 1000;
-
- /** */
- private static final int PRODUCTS = 10;
-
- /** */
- private static final int MAX_PRICE = 5;
-
- /** */
- private static final long SEED = ThreadLocalRandom.current().nextLong();
-
- /** */
- private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(ipFinder);
-
- cfg.setDiscoverySpi(disco);
-
- CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
-
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setSwapEnabled(false);
- cacheCfg.setBackups(1);
- cacheCfg.setIndexedTypes(
- AffinityUuid.class, Purchase.class
- );
-
- cfg.setCacheConfiguration(cacheCfg);
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- startGridsMultiThreaded(3);
-
- X.println("--> seed: " + SEED);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- ignite(0).cache(null).removeAll();
- }
-
- /**
- * @param c Cache.
- * @param colocated Colocated.
- * @return Result.
- */
- private static List<List<?>> query(IgniteCache<AffinityUuid,Purchase> c, boolean colocated) {
- return c.query(new SqlFieldsQuery(QRY).setArgs(30, 5).setColocated(colocated)).getAll();
- }
-
- /**
- * Correct affinity.
- */
- public void testColocatedQueryRight() {
- IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(null);
-
- Random rnd = new GridRandom(SEED);
-
- for (int i = 0; i < PURCHASES; i++) {
- Purchase p = new Purchase();
-
- p.productId = rnd.nextInt(PRODUCTS);
- p.price = rnd.nextInt(MAX_PRICE);
-
- c.put(new AffinityUuid(p.productId), p); // Correct affinity.
- }
-
- List<List<?>> res1 = query(c, false);
- List<List<?>> res2 = query(c, true);
-
- X.println("res1: " + res1);
- X.println("res2: " + res2);
-
- assertFalse(res1.isEmpty());
- assertEquals(res1.toString(), res2.toString()); // TODO fix type conversion issue
- }
-
- /**
- * Correct affinity.
- */
- public void testColocatedQueryWrong() {
- IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(null);
-
- Random rnd = new GridRandom(SEED);
-
- for (int i = 0; i < PURCHASES; i++) {
- Purchase p = new Purchase();
-
- p.productId = rnd.nextInt(PRODUCTS);
- p.price = rnd.nextInt(MAX_PRICE);
-
- c.put(new AffinityUuid(rnd.nextInt(PRODUCTS)), p); // Random affinity.
- }
-
- List<List<?>> res1 = query(c, false);
- List<List<?>> res2 = query(c, true);
-
- X.println("res1: " + res1);
- X.println("res2: " + res2);
-
- assertFalse(res1.isEmpty());
- assertFalse(res1.equals(res2));
- }
-
- /**
- *
- */
- private static class Purchase implements Serializable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- @QuerySqlField
- int productId;
-
- /** */
- @QuerySqlField
- int price;
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o) return true;
-
- if (o == null || getClass() != o.getClass()) return false;
-
- Purchase purchase = (Purchase)o;
-
- return productId == purchase.productId && price == purchase.price;
-
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- int result = productId;
-
- result = 31 * result + price;
-
- return result;
- }
- }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da0f1933/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 08f6ed2..fe70c12 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -55,7 +55,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class);
suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class);
- suite.addTestSuite(IgniteCacheColocatedQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheCollocatedQuerySelfTest.class);
suite.addTestSuite(IgniteCacheLargeResultSelfTest.class);
suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
[28/50] incubator-ignite git commit: # ignite-sprint-3 disabled
failing test
Posted by sb...@apache.org.
# ignite-sprint-3 disabled failing test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6dc40035
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6dc40035
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6dc40035
Branch: refs/heads/ignite-709
Commit: 6dc400359256a1d268bba792f11cd909536ae071
Parents: a22e197
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 19:32:01 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 19:32:01 2015 +0300
----------------------------------------------------------------------
.../cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6dc40035/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
index 030fca3..ed3d4eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
@@ -82,6 +82,8 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect
*/
@SuppressWarnings("WhileLoopReplaceableByForEach")
public void testNodeRestart() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-170");
+
IgniteSet<Integer> set = grid(0).set(SET_NAME, config(false));
final int ITEMS = 10_000;
[33/50] incubator-ignite git commit: ignite-718 - minor + test
Posted by sb...@apache.org.
ignite-718 - minor + test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37f8fbe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37f8fbe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37f8fbe9
Branch: refs/heads/ignite-709
Commit: 37f8fbe97d4705d087331e3ba3c9a0595072979d
Parents: 6a53351
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sat Apr 11 20:32:13 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sat Apr 11 20:32:13 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 7 ++
.../query/h2/twostep/GridMergeIndex.java | 12 ++-
.../cache/IgniteCacheLargeResultSelfTest.java | 104 +++++++++++++++++++
3 files changed, 118 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37f8fbe9/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index c4b30d6..ca7857c 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -337,6 +337,13 @@ public final class IgniteSystemProperties {
public static final String IGNITE_JCACHE_DEFAULT_ISOLATED = "IGNITE_CACHE_CLIENT";
/**
+ * Property controlling maximum number of SQL result rows which can be fetched into a merge table.
+ * If there are less rows than this threshold then multiple passes throw a table will be possible,
+ * otherwise only one pass (e.g. only result streaming is possible).
+ */
+ public static final String IGNITE_SQL_MERGE_TABLE_MAX_SIZE = "IGNITE_SQL_MERGE_TABLE_MAX_SIZE";
+
+ /**
* Enforces singleton.
*/
private IgniteSystemProperties() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37f8fbe9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
index 5138013..407341e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
@@ -30,15 +30,17 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
+
/**
* Merge index.
*/
public abstract class GridMergeIndex extends BaseIndex {
/** */
- private static final int MAX_FETCH_SIZE = 100000; // TODO configure
+ private static final int MAX_FETCH_SIZE = getInteger(IGNITE_SQL_MERGE_TABLE_MAX_SIZE, 10_000);
/** All rows number. */
- private final AtomicInteger rowsCnt = new AtomicInteger(0);
+ private final AtomicInteger expectedRowsCnt = new AtomicInteger(0);
/** Remaining rows per source node ID. */
private final ConcurrentMap<UUID, Counter> remainingRows = new ConcurrentHashMap8<>();
@@ -74,7 +76,7 @@ public abstract class GridMergeIndex extends BaseIndex {
/** {@inheritDoc} */
@Override public long getRowCount(Session session) {
- return rowsCnt.get();
+ return expectedRowsCnt.get();
}
/** {@inheritDoc} */
@@ -114,7 +116,7 @@ public abstract class GridMergeIndex extends BaseIndex {
assert !cnt.initialized : "Counter is already initialized.";
cnt.addAndGet(allRows);
- rowsCnt.addAndGet(allRows);
+ expectedRowsCnt.addAndGet(allRows);
// We need this separate flag to handle case when the first source contains only one page
// and it will signal that all remaining counters are zero and fetch is finished.
@@ -167,7 +169,7 @@ public abstract class GridMergeIndex extends BaseIndex {
* @return {@code true} If we have fetched all the remote rows.
*/
public boolean fetchedAll() {
- return fetchedCnt == rowsCnt.get();
+ return fetchedCnt == expectedRowsCnt.get();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37f8fbe9/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
new file mode 100644
index 0000000..3f88ad6
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
@@ -0,0 +1,104 @@
+/*
+ * 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.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ */
+public class IgniteCacheLargeResultSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(disco);
+
+ CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+
+ cacheCfg.setCacheMode(PARTITIONED);
+ cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ cacheCfg.setSwapEnabled(false);
+ cacheCfg.setBackups(1);
+ cacheCfg.setIndexedTypes(
+ Integer.class, Integer.class
+ );
+
+ cfg.setCacheConfiguration(cacheCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ startGridsMultiThreaded(3);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ */
+ public void testLargeResult() {
+ // Fill cache.
+ IgniteCache<Integer,Integer> c = ignite(0).cache(null);
+
+ for (int i = 0; i < 50_000; i++) // default max merge table size is 10000
+ c.put(i, i);
+
+ try(QueryCursor<List<?>> res = c.query(
+ new SqlFieldsQuery("select _val from Integer where _key between ? and ?")
+ .setArgs(10_000, 40_000))){
+
+ int cnt = 0;
+
+ for (List<?> row : res) {
+ cnt++;
+
+ int val = (Integer)row.get(0);
+
+ assertTrue(val >= 10_000 && val <= 40_000);
+ }
+
+ assertEquals(30_001, cnt); // Streaming of a large result works well.
+ }
+
+ // Currently we have no ways to do multiple passes through a merge table.
+ }
+}
[11/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-537
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b9100618
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b9100618
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b9100618
Branch: refs/heads/ignite-709
Commit: b9100618ecdd0626c8942017511589616161631b
Parents: 439af36 c3210d8
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 21:16:40 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 21:16:40 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../ignite/internal/processors/igfs/IgfsOutputStreamImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[14/50] incubator-ignite git commit: ignite-724 Cluster doesn't start
with daemon node and cache metrics enabled
Posted by sb...@apache.org.
ignite-724 Cluster doesn't start with daemon node and cache metrics enabled
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7bb7586b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7bb7586b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7bb7586b
Branch: refs/heads/ignite-709
Commit: 7bb7586b202ee2c6dec8db85e86d6f0c5d94025a
Parents: c3210d8
Author: Andrey Gura <ag...@gridgain.com>
Authored: Fri Apr 10 22:30:19 2015 +0300
Committer: Andrey Gura <ag...@gridgain.com>
Committed: Fri Apr 10 22:55:25 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 1 -
.../discovery/tcp/internal/TcpDiscoveryNode.java | 12 +++++++-----
.../CacheMetricsForClusterGroupSelfTest.java | 18 +++++++++++++++++-
3 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7bb7586b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 4b43fec..6cf6de8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -4330,7 +4330,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
{
assert nodeId != null;
assert metrics != null;
- assert cacheMetrics != null;
TcpDiscoveryNode node = ring.node(nodeId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7bb7586b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index f5c1edb..bb8f051 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -128,8 +128,11 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
* @param metricsProvider Metrics provider.
* @param ver Version.
*/
- public TcpDiscoveryNode(UUID id, Collection<String> addrs, Collection<String> hostNames, int discPort,
- DiscoveryMetricsProvider metricsProvider, IgniteProductVersion ver) {
+ public TcpDiscoveryNode(UUID id,
+ Collection<String> addrs,
+ Collection<String> hostNames, int discPort,
+ DiscoveryMetricsProvider metricsProvider, IgniteProductVersion ver)
+ {
assert id != null;
assert !F.isEmpty(addrs);
assert metricsProvider != null;
@@ -145,6 +148,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
consistentId = U.consistentId(addrs, discPort);
metrics = metricsProvider.metrics();
+ cacheMetrics = metricsProvider.cacheMetrics();
sockAddrs = U.toSocketAddresses(this, discPort);
}
@@ -248,9 +252,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
* @param cacheMetrics Cache metrics.
*/
public void setCacheMetrics(Map<Integer, CacheMetrics> cacheMetrics) {
- assert cacheMetrics != null;
-
- this.cacheMetrics = cacheMetrics;
+ this.cacheMetrics = cacheMetrics != null ? cacheMetrics : Collections.<Integer, CacheMetrics>emptyMap();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7bb7586b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
index 19d7aab..1ba24e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
@@ -56,9 +56,25 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest
/** Cache 2. */
private IgniteCache<Integer, Integer> cache2;
+ /** Daemon grid. */
+ private boolean daemon;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ cfg.setDaemon(daemon);
+
+ return cfg;
+ }
+
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
startGrids(GRID_CNT);
+
+ daemon = true;
+
+ startGrid(GRID_CNT);
}
/** {@inheritDoc} */
@@ -150,7 +166,7 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest
* Wait for {@link EventType#EVT_NODE_METRICS_UPDATED} event will be receieved.
*/
private void awaitMetricsUpdate() throws InterruptedException {
- final CountDownLatch latch = new CountDownLatch(GRID_CNT * 2);
+ final CountDownLatch latch = new CountDownLatch((GRID_CNT + 1) * 2);
IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() {
@Override public boolean apply(Event ignore) {
[46/50] incubator-ignite git commit: ignite-sprint-3 - minor
Posted by sb...@apache.org.
ignite-sprint-3 - minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7396a56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7396a56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7396a56
Branch: refs/heads/ignite-709
Commit: c7396a56092fac4f0ec1458738e3d667ab3ae8fc
Parents: fcb4a9b
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 13 07:21:22 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 13 07:21:22 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/query/ScanQuery.java | 2 +-
.../apache/ignite/cache/query/SqlFieldsQuery.java | 8 ++++----
.../query/h2/sql/GridSqlQuerySplitter.java | 16 ++++++++--------
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7396a56/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
index f2a43eb..688eb2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
@@ -29,7 +29,7 @@ import javax.cache.*;
*
* @see IgniteCache#query(Query)
*/
-public class ScanQuery<K, V> extends Query<Cache.Entry<K, V>> {
+public final class ScanQuery<K, V> extends Query<Cache.Entry<K, V>> {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7396a56/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index 1ffd14f..04131e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -28,7 +28,7 @@ import java.util.*;
* on SQL {@code 'select'} clause, as opposed to {@link SqlQuery}, which always returns
* the whole key and value objects back.
* <h1 class="header">Collocated Flag</h1>
- * Collocation flag si used for optimization purposes. Whenever Ignite executes
+ * Collocation flag is used for optimization purposes. Whenever Ignite executes
* a distributed query, it sends sub-queries to individual cluster members.
* If you know in advance that the elements of your query selection are collocated
* together on the same node, usually based on some <b>affinity-key</b>, Ignite
@@ -121,16 +121,16 @@ public final class SqlFieldsQuery extends Query<List<?>> {
}
/**
- * Checks if this query colocated.
+ * Checks if this query is collocated.
*
- * @return {@code true} If the query is colocated.
+ * @return {@code true} If the query is collocated.
*/
public boolean isCollocated() {
return collocated;
}
/**
- * Sets flag defining if this query colocated.
+ * Sets flag defining if this query is collocated.
*
* @param collocated Flag value.
* @return {@code this} For chaining.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7396a56/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 20344c0..73d7751 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -71,10 +71,10 @@ public class GridSqlQuerySplitter {
/**
* @param stmt Prepared statement.
* @param params Parameters.
- * @param colocated Colocated query.
+ * @param collocated Collocated query.
* @return Two step query.
*/
- public static GridCacheTwoStepQuery split(JdbcPreparedStatement stmt, Object[] params, boolean colocated) {
+ public static GridCacheTwoStepQuery split(JdbcPreparedStatement stmt, Object[] params, boolean collocated) {
if (params == null)
params = GridCacheSqlQuery.EMPTY_PARAMS;
@@ -141,7 +141,7 @@ public class GridSqlQuerySplitter {
boolean aggregateFound = false;
for (int i = 0, len = mapExps.size(); i < len; i++) // Remember len because mapExps list can grow.
- aggregateFound |= splitSelectExpression(mapExps, rdcExps, colNames, i, colocated);
+ aggregateFound |= splitSelectExpression(mapExps, rdcExps, colNames, i, collocated);
// Fill select expressions.
mapQry.clearSelect();
@@ -162,14 +162,14 @@ public class GridSqlQuerySplitter {
for (int col : srcQry.groupColumns())
mapQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
- if (!colocated) {
+ if (!collocated) {
for (int col : srcQry.groupColumns())
rdcQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
}
}
// -- HAVING
- if (srcQry.having() != null && !colocated) {
+ if (srcQry.having() != null && !collocated) {
// TODO Find aggregate functions in HAVING clause.
rdcQry.whereAnd(column(columnName(srcQry.havingColumn())));
@@ -300,11 +300,11 @@ public class GridSqlQuerySplitter {
* @param rdcSelect Selects for reduce query.
* @param colNames Set of unique top level column names.
* @param idx Index.
- * @param colocated If it is a colocated query.
+ * @param collocated If it is a collocated query.
* @return {@code true} If aggregate was found.
*/
private static boolean splitSelectExpression(List<GridSqlElement> mapSelect, GridSqlElement[] rdcSelect,
- Set<String> colNames, int idx, boolean colocated) {
+ Set<String> colNames, int idx, boolean collocated) {
GridSqlElement el = mapSelect.get(idx);
GridSqlAlias alias = null;
@@ -316,7 +316,7 @@ public class GridSqlQuerySplitter {
el = alias.child();
}
- if (!colocated && el instanceof GridSqlAggregateFunction) {
+ if (!collocated && el instanceof GridSqlAggregateFunction) {
aggregateFound = true;
GridSqlAggregateFunction agg = (GridSqlAggregateFunction)el;
[40/50] incubator-ignite git commit: # Added the test to check
compatibility with old nodes.
Posted by sb...@apache.org.
# Added the test to check compatibility with old nodes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c8ffaabb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c8ffaabb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c8ffaabb
Branch: refs/heads/ignite-709
Commit: c8ffaabb96bdd0f4850c8fb1636e2e673722ecdf
Parents: 6864315
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun Apr 12 12:26:57 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun Apr 12 12:26:57 2015 +0300
----------------------------------------------------------------------
...ClusterMetricsSnapshotSerializeSelfTest.java | 28 ++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8ffaabb/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
index a9d6f8c..404c99f 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
@@ -26,6 +26,20 @@ import org.apache.ignite.testframework.junits.common.*;
*/
@GridCommonTest(group = "Utils")
public class ClusterMetricsSnapshotSerializeSelfTest extends GridCommonAbstractTest {
+ /** Metrics serialized by Ignite 1.0 */
+ private static final byte[] METRICS_V1 = {0, 0, 0, 22, 0, 0, 0, 8, 64, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 15, 64,
+ (byte)-32, 0, 0, 0, 0, 0, 26, 0, 0, 0, 14, 64, (byte)-64, 0, 0, 0, 0, 0, 23, 0, 0, 0, 9, 64, 64, 0, 0, 0, 0, 0,
+ 39, 0, 0, 0, 36, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 13, 64, 20, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 12, 64, 16, 0, 0, 0, 0, 0, 0, (byte)-1, (byte)-1, (byte)-1, (byte)-1, 0,
+ 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 1, 64, 65, 0, 0, 0, 0, 0, 0, (byte)-65, (byte)-16, 0, 0,
+ 0, 0, 0, 0, (byte)-65, (byte)-16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0,
+ 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0,
+ 31, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 33,
+ (byte)-1, (byte)-1, (byte)-1, (byte)-1, (byte)-1, (byte)-1, (byte)-1, (byte)-1, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0,
+ 0, 35, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 16, (byte)-1, (byte)-1, (byte)-1, (byte)-1, (byte)-1,
+ (byte)-1, (byte)-1, (byte)-1, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 45, 0, 0,
+ 0, 46, (byte)-1, (byte)-1, (byte)-1, (byte)-1};
+
/** */
public ClusterMetricsSnapshotSerializeSelfTest() {
super(false /*don't start grid*/);
@@ -66,6 +80,15 @@ public class ClusterMetricsSnapshotSerializeSelfTest extends GridCommonAbstractT
}
/**
+ * Checks compatibility with old serialized metrics.
+ */
+ public void testMetricsCompatibility() {
+ ClusterMetrics metrics = ClusterMetricsSnapshot.deserialize(METRICS_V1, 0);
+
+ assert metrics != null;
+ }
+
+ /**
* @return Test metrics.
*/
private ClusterMetrics createMetrics() {
@@ -123,6 +146,11 @@ public class ClusterMetricsSnapshotSerializeSelfTest extends GridCommonAbstractT
return metrics;
}
+ /**
+ * @param obj Object.
+ * @param obj1 Object 1.
+ */
+ @SuppressWarnings("FloatingPointEquality")
private boolean isMetricsEquals(ClusterMetrics obj, ClusterMetrics obj1) {
return
obj.getAverageActiveJobs() == obj1.getAverageActiveJobs() &&
[21/50] incubator-ignite git commit: # ignite-sprint-3 reverted fix
for ignite-537 (cache indexing with p2p did not work properly)
Posted by sb...@apache.org.
# ignite-sprint-3 reverted fix for ignite-537 (cache indexing with p2p did not work properly)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b248129
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b248129
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b248129
Branch: refs/heads/ignite-709
Commit: 0b24812941206112ae62cb2b86db0095f3d87bff
Parents: df1fbef
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 10:40:43 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 10:45:39 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 385 +------------------
.../tcp/messages/TcpDiscoveryClassRequest.java | 55 ---
.../tcp/messages/TcpDiscoveryClassResponse.java | 76 ----
.../CacheConfigurationP2PTestClient.java | 14 +-
.../cache/CacheConfigurationP2PTest.java | 2 +
5 files changed, 32 insertions(+), 500 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b248129/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 81c608a..ed4be4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -51,7 +51,6 @@ import java.net.*;
import java.text.*;
import java.util.*;
import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
import static org.apache.ignite.events.EventType.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
@@ -239,9 +238,9 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
private CheckStatusSender chkStatusSnd;
- /** IP finder and p2p loaders cleaner. */
+ /** IP finder cleaner. */
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
- private DiscoveryCleaner cleaner;
+ private IpFinderCleaner ipFinderCleaner;
/** Statistics printer thread. */
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
@@ -289,10 +288,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
private ConcurrentLinkedDeque<String> debugLog;
- /** Class loaders for event data unmarshalling. */
- @GridToStringExclude
- private transient ConcurrentMap<UUID, DiscoveryDeploymentClassLoader> p2pLdrs = new ConcurrentHashMap<>();
-
/** {@inheritDoc} */
@IgniteInstanceResource
@Override public void injectResources(Ignite ignite) {
@@ -765,9 +760,9 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
chkStatusSnd = new CheckStatusSender();
chkStatusSnd.start();
- if (ipFinder.isShared() || ignite.configuration().isPeerClassLoadingEnabled()) {
- cleaner = new DiscoveryCleaner();
- cleaner.start();
+ if (ipFinder.isShared()) {
+ ipFinderCleaner = new IpFinderCleaner();
+ ipFinderCleaner.start();
}
if (log.isDebugEnabled() && !restart)
@@ -982,8 +977,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
U.interrupt(chkStatusSnd);
U.join(chkStatusSnd, log);
- U.interrupt(cleaner);
- U.join(cleaner, log);
+ U.interrupt(ipFinderCleaner);
+ U.join(ipFinderCleaner, log);
U.interrupt(msgWorker);
U.join(msgWorker, log);
@@ -2011,8 +2006,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
U.interrupt(chkStatusSnd);
U.join(chkStatusSnd, log);
- U.interrupt(cleaner);
- U.join(cleaner, log);
+ U.interrupt(ipFinderCleaner);
+ U.join(ipFinderCleaner, log);
Collection<SocketReader> tmp;
@@ -2110,7 +2105,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
b.append(" Check status sender: ").append(threadStatus(chkStatusSnd)).append(U.nl());
b.append(" HB sender: ").append(threadStatus(hbsSnd)).append(U.nl());
b.append(" Socket timeout worker: ").append(threadStatus(sockTimeoutWorker)).append(U.nl());
- b.append(" Cleaner: ").append(threadStatus(cleaner)).append(U.nl());
+ b.append(" IP finder cleaner: ").append(threadStatus(ipFinderCleaner)).append(U.nl());
b.append(" Stats printer: ").append(threadStatus(statsPrinter)).append(U.nl());
b.append(U.nl());
@@ -2208,120 +2203,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
/**
- * @param req Get class request.
- * @return Get class response.
- */
- private TcpDiscoveryClassResponse processClassRequest(TcpDiscoveryClassRequest req) {
- assert !F.isEmpty(req.className()) : req;
-
- String rsrc = U.classNameToResourceName(req.className());
-
- InputStream in = U.gridClassLoader().getResourceAsStream(rsrc);
-
- byte[] clsBytes = null;
- String err = null;
-
- if (in != null) {
- try {
- GridByteArrayList bytes = new GridByteArrayList(1024);
-
- bytes.readAll(in);
-
- clsBytes = bytes.entireArray();
- }
- catch (IOException e) {
- err = "Failed to load class due IO error [cls=" + req.className() + ", err=" + e + ']';
-
- U.error(log, err, e);
- }
- finally {
- U.close(in, log);
- }
- }
- else {
- if (log.isDebugEnabled())
- log.debug("Failed to find requested class: " + req.className());
-
- err = "Failed to find requested class: " + req.className();
- }
-
- TcpDiscoveryClassResponse res;
-
- if (clsBytes != null)
- res = new TcpDiscoveryClassResponse(getLocalNodeId(), clsBytes);
- else {
- assert err != null;
-
- res = new TcpDiscoveryClassResponse(getLocalNodeId(), err);
- }
-
- return res;
- }
-
- /**
- * @param node Node created event.
- * @return Class loader for custom event unmarshalling.
- */
- @Nullable protected ClassLoader customMessageClassLoader(TcpDiscoveryNode node) {
- assert ignite != null;
-
- if (!ignite.configuration().isPeerClassLoadingEnabled())
- return U.gridClassLoader();
-
- if (node.id().equals(getLocalNodeId()) || node.isClient())
- return U.gridClassLoader();
-
- DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(node.id());
-
- if (ldr == null)
- ldr = F.addIfAbsent(p2pLdrs, node.id(), new DiscoveryDeploymentClassLoader(node));
-
- return ldr;
- }
-
- /**
- * @param joiningNode Joining node.
- * @param nodeId Remote node provided data.
- * @return Class loader for exchange data unmarshalling.
- */
- @Nullable protected ClassLoader exchangeClassLoader(TcpDiscoveryNode joiningNode, UUID nodeId) {
- assert joiningNode != null;
- assert ignite != null;
-
- if (!ignite.configuration().isPeerClassLoadingEnabled())
- return U.gridClassLoader();
-
- if (nodeId.equals(getLocalNodeId()))
- return U.gridClassLoader();
-
- TcpDiscoveryNode node;
-
- if (joiningNode.id().equals(nodeId))
- node = joiningNode;
- else {
- node = ring.node(nodeId);
-
- if (node == null) {
- if (log.isDebugEnabled())
- log.debug("Node provided exchange data left, will use local class loader " +
- "for exchange data [nodeId=" + nodeId + ']');
-
- return U.gridClassLoader();
- }
- }
-
- if (node.isClient()) // Do not support loading from client nodes.
- return U.gridClassLoader();
-
- DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(nodeId);
-
- if (ldr == null)
- ldr = F.addIfAbsent(p2pLdrs, nodeId, new DiscoveryDeploymentClassLoader(node));
-
- return ldr;
- }
-
- /**
* @param nodeId Node ID.
* @return Marshalled exchange data.
* @throws IgniteSpiException If failed.
@@ -2471,19 +2352,18 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
/**
- * Thread that periodically tries to release p2p class loaders connections, cleans
- * IP finder and keeps it in the correct state, unregistering addresses of the nodes
- * that has left the topology.
+ * Thread that cleans IP finder and keeps it in the correct state, unregistering
+ * addresses of the nodes that has left the topology.
* <p>
- * IP finder cleaner should run only on coordinator node and will clean IP finder
+ * This thread should run only on coordinator node and will clean IP finder
* if and only if {@link TcpDiscoveryIpFinder#isShared()} is {@code true}.
*/
- private class DiscoveryCleaner extends IgniteSpiThread {
+ private class IpFinderCleaner extends IgniteSpiThread {
/**
* Constructor.
*/
- private DiscoveryCleaner() {
- super(gridName, "tcp-disco-cleaner", log);
+ private IpFinderCleaner() {
+ super(gridName, "tcp-disco-ip-finder-cleaner", log);
setPriority(threadPri);
}
@@ -2492,21 +2372,11 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
@SuppressWarnings("BusyWait")
@Override protected void body() throws InterruptedException {
if (log.isDebugEnabled())
- log.debug("Tcp discovery cleaner has been started.");
+ log.debug("IP finder cleaner has been started.");
while (!isInterrupted()) {
Thread.sleep(ipFinderCleanFreq);
- for (DiscoveryDeploymentClassLoader ldr : p2pLdrs.values()) {
- if (ring.node(ldr.nodeId()) == null) {
- ldr.onNodeLeft();
-
- p2pLdrs.remove(ldr.nodeId(), ldr);
- }
- else
- ldr.closeConnectionIfNotUsed();
- }
-
if (!isLocalNodeCoordinator())
continue;
@@ -3723,7 +3593,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
Map<Integer, byte[]> data = msg.newNodeDiscoveryData();
if (data != null)
- onExchange(node.id(), node.id(), data, exchangeClassLoader(node, node.id()));
+ onExchange(node.id(), node.id(), data, U.gridClassLoader());
msg.addDiscoveryData(locNodeId, collectExchangeData(node.id()));
}
@@ -3794,12 +3664,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
// Notify outside of synchronized block.
if (dataMap != null) {
- for (Map.Entry<UUID, Map<Integer, byte[]>> entry : dataMap.entrySet()) {
- onExchange(node.id(),
- entry.getKey(),
- entry.getValue(),
- exchangeClassLoader(node, entry.getKey()));
- }
+ for (Map.Entry<UUID, Map<Integer, byte[]>> entry : dataMap.entrySet())
+ onExchange(node.id(), entry.getKey(), entry.getValue(), U.gridClassLoader());
}
}
@@ -4603,7 +4469,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
try {
if (msgObj == null)
- msgObj = marsh.unmarshal(msg.messageBytes(), customMessageClassLoader(node));
+ msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader());
lsnr.onDiscovery(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT,
msg.topologyVersion(),
@@ -5090,13 +4956,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
continue;
}
- else if (msg instanceof TcpDiscoveryClassRequest) {
- TcpDiscoveryClassResponse res = processClassRequest((TcpDiscoveryClassRequest) msg);
-
- writeToSocket(sock, res);
-
- continue;
- }
msgWorker.addMessage(msg);
@@ -5388,206 +5247,4 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
U.closeQuiet(sock);
}
}
-
- /**
- *
- */
- private class DiscoveryDeploymentClassLoader extends ClassLoader {
- /** */
- private final TcpDiscoveryNode node;
-
- /** */
- private Socket sock;
-
- /** */
- private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
- /**
- * @param node Node.
- */
- public DiscoveryDeploymentClassLoader(TcpDiscoveryNode node) {
- super(U.gridClassLoader());
-
- assert !node.isClient() : node;
- assert !node.id().equals(getLocalNodeId()) : node;
-
- this.node = node;
- }
-
- /**
- * @return Target node ID.
- */
- UUID nodeId() {
- return node.id();
- }
-
- /**
- * Node left callback.
- */
- void onNodeLeft() {
- lock.writeLock().lock();
-
- try {
- if (sock != null) {
- if (log.isDebugEnabled())
- log.debug("Closing deployment class loader connection on node left [node=" + node.id() + ']');
-
- U.closeQuiet(sock);
-
- sock = null;
- }
- }
- finally {
- lock.writeLock().unlock();
- }
- }
-
- /**
- * Closes connection if there is no class loading in progress.
- */
- void closeConnectionIfNotUsed() {
- if (lock.writeLock().tryLock()) {
- try {
- if (sock != null) {
- if (log.isDebugEnabled())
- log.debug("Closing idle deployment class loader connection [node=" + node.id() + ']');
-
- U.closeQuiet(sock);
-
- sock = null;
- }
- }
- finally {
- lock.writeLock().unlock();
- }
- }
- }
-
- /** {@inheritDoc} */
- @Override protected Class<?> findClass(String name) throws ClassNotFoundException {
- lock.readLock().lock();
-
- try {
- TcpDiscoveryClassResponse res = requestClass(name);
-
- if (res == null)
- throw new ClassNotFoundException("Failed to load class, can not connect to peer node " +
- "[cls=" + name + ", node=" + node.id() + ']');
-
- if (res.error() != null)
- throw new ClassNotFoundException(res.error());
-
- assert res.classBytes() != null;
-
- return defineClass(name, res.classBytes(), 0, res.classBytes().length);
- }
- finally {
- lock.readLock().unlock();
- }
- }
-
- /**
- * @param name Class name.
- * @return Class response or {@code null} if failed to connect.
- */
- @Nullable private synchronized TcpDiscoveryClassResponse requestClass(String name) {
- TcpDiscoveryClassRequest msg = new TcpDiscoveryClassRequest(getLocalNodeId(), name);
-
- for (int i = 0; i < reconCnt; i++) {
- if (sock == null) {
- sock = connect(node);
-
- if (sock == null)
- break;
- }
-
- try {
- return request(sock, msg);
- }
- catch (IOException | IgniteCheckedException e) {
- U.closeQuiet(sock);
-
- sock = null;
- }
- }
-
- p2pLdrs.remove(node.id(), this);
-
- return null;
- }
-
- /**
- * @param sock Socket.
- * @param msg Message.
- * @return Response.
- * @throws IOException If request failed.
- * @throws IgniteCheckedException If request failed.
- */
- private TcpDiscoveryClassResponse request(Socket sock, TcpDiscoveryClassRequest msg)
- throws IOException, IgniteCheckedException
- {
- long tstamp = U.currentTimeMillis();
-
- writeToSocket(sock, msg);
-
- stats.onMessageSent(msg, U.currentTimeMillis() - tstamp);
-
- TcpDiscoveryClassResponse res = readMessage(sock, null, netTimeout);
-
- stats.onMessageReceived(res);
-
- return res;
- }
-
- /**
- * @param node Node.
- * @return Socket or {@code null} if failed to connect.
- */
- private Socket connect(TcpDiscoveryNode node) {
- Socket sock = null;
-
- for (InetSocketAddress addr : getNodeAddresses(node, U.sameMacs(locNode, node))) {
- sock = connect(addr);
-
- if (sock != null)
- break;
- }
-
- return sock;
- }
-
- /**
- * @param addr Address.
- * @return Socket or {@code null} if failed to connect.
- */
- private Socket connect(InetSocketAddress addr) {
- TcpDiscoveryHandshakeRequest req = new TcpDiscoveryHandshakeRequest(getLocalNodeId());
-
- for (int i = 0; i < reconCnt; i++) {
- Socket sock = null;
-
- long tstamp = U.currentTimeMillis();
-
- try {
- sock = openSocket(addr);
-
- writeToSocket(sock, req);
-
- TcpDiscoveryHandshakeResponse res = readMessage(sock, null, netTimeout);
-
- if (!res.creatorNodeId().equals(node.id()))
- return null;
-
- stats.onClientSocketInitialized(U.currentTimeMillis() - tstamp);
-
- return sock;
- }
- catch (IOException | IgniteCheckedException e) {
- U.closeQuiet(sock);
- }
- }
-
- return null;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b248129/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassRequest.java
deleted file mode 100644
index befe483..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassRequest.java
+++ /dev/null
@@ -1,55 +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.spi.discovery.tcp.messages;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-
-/**
- *
- */
-public class TcpDiscoveryClassRequest extends TcpDiscoveryAbstractMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private String clsName;
-
- /**
- * @param creatorNodeId Creator node ID.
- * @param clsName Class name.
- */
- public TcpDiscoveryClassRequest(UUID creatorNodeId, String clsName) {
- super(creatorNodeId);
-
- this.clsName = clsName;
- }
-
- /**
- * @return Class name.
- */
- public String className() {
- return clsName;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(TcpDiscoveryClassRequest.class, this, "super", super.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b248129/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassResponse.java
deleted file mode 100644
index 3bfe61d..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClassResponse.java
+++ /dev/null
@@ -1,76 +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.spi.discovery.tcp.messages;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- *
- */
-public class TcpDiscoveryClassResponse extends TcpDiscoveryAbstractMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private String errMsg;
-
- /** */
- private byte[] clsBytes;
-
- /**
- * @param creatorNodeId Creator node ID.
- * @param clsBytes Class bytes.
- */
- public TcpDiscoveryClassResponse(UUID creatorNodeId, byte[] clsBytes) {
- super(creatorNodeId);
-
- this.clsBytes = clsBytes;
- }
-
- /**
- * @param creatorNodeId Creator node ID.
- * @param errMsg Error message.
- */
- public TcpDiscoveryClassResponse(UUID creatorNodeId, String errMsg) {
- super(creatorNodeId);
-
- this.errMsg = errMsg;
- }
-
- /**
- * @return Error if class loading failed.
- */
- @Nullable public String error() {
- return errMsg;
- }
-
- /**
- * @return Loaded class bytes.
- */
- public byte[] classBytes() {
- return clsBytes;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(TcpDiscoveryClassResponse.class, this, "super", super.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b248129/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
index be3f3bc..4550e21 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
@@ -80,8 +80,10 @@ public class CacheConfigurationP2PTestClient {
SqlQuery<Integer, Organization1> qry1 = new SqlQuery<>(Organization1.class, "_key >= 0");
- if (cache1.query(qry1).getAll().isEmpty())
- throw new Exception("Query failed.");
+ int cnt = cache1.query(qry1).getAll().size();
+
+ if (cnt != 500)
+ throw new Exception("Unexpected query result: " + cnt);
System.out.println("Sleep some time.");
@@ -97,13 +99,15 @@ public class CacheConfigurationP2PTestClient {
IgniteCache<Integer, Organization2> cache2 = ignite.createCache(ccfg2);
- for (int i = 0; i < 500; i++)
+ for (int i = 0; i < 600; i++)
cache2.put(i, new Organization2("org-" + i));
SqlQuery<Integer, Organization2> qry2 = new SqlQuery<>(Organization2.class, "_key >= 0");
- if (cache2.query(qry2).getAll().isEmpty())
- throw new Exception("Query failed.");
+ cnt = cache2.query(qry2).getAll().size();
+
+ if (cnt != 600)
+ throw new Exception("Unexpected query result: " + cnt);
cache1.close();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b248129/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
index 8f0f4ca..051b94f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
@@ -74,6 +74,8 @@ public class CacheConfigurationP2PTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testCacheConfigurationP2P() throws Exception {
+ fail("Enable when IGNITE-537 is fixed.");
+
try (Ignite ignite = Ignition.start(createConfiguration())) {
final CountDownLatch srvsReadyLatch = new CountDownLatch(2);
[50/50] incubator-ignite git commit: # ignite-709
Posted by sb...@apache.org.
# ignite-709
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af3ba54c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af3ba54c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af3ba54c
Branch: refs/heads/ignite-709
Commit: af3ba54c9e2123747148514fd110410ab25a57f9
Parents: 8c28517
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 13 09:40:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 13 09:40:10 2015 +0300
----------------------------------------------------------------------
...acheTcpClientDiscoveryMultiThreadedTest.java | 182 +++++++++----------
.../GridCacheClientModesAbstractSelfTest.java | 7 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 13 +-
3 files changed, 92 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af3ba54c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
index db2c9fe..8bf55f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
@@ -1,16 +1,24 @@
/*
- * _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ * 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.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -23,21 +31,21 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
- * Tests TcpClientDiscovery SPI with multiple client nodes that interact with a cache concurrently.
+ * Tests {@link TcpClientDiscoverySpi} with multiple client nodes that interact with a cache concurrently.
*/
public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstractSelfTest {
/** Server nodes count. */
- private volatile static int serverNodesCount;
+ private static int srvNodesCnt;
/** Client nodes count. */
- private volatile static int clientNodesCount;
+ private static int clientNodesCnt;
/** Client node or not. */
- private volatile static boolean client;
+ private static boolean client;
/** {@inheritDoc} */
@Override protected int gridCount() {
- return serverNodesCount + clientNodesCount;
+ return srvNodesCnt + clientNodesCnt;
}
/** {@inheritDoc} */
@@ -51,19 +59,23 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
}
/** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTestsStopped();
+ }
+
+ /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
// Filling configuration for client nodes
if (client) {
TcpDiscoveryVmIpFinder clientFinder = new TcpDiscoveryVmIpFinder();
- ArrayList<String> addresses = new ArrayList<>(ipFinder.getRegisteredAddresses().size());
+ ArrayList<String> addrs = new ArrayList<>(ipFinder.getRegisteredAddresses().size());
- for (InetSocketAddress sockAddr : ipFinder.getRegisteredAddresses()) {
- addresses.add(sockAddr.getHostString() + ":" + sockAddr.getPort());
- }
+ for (InetSocketAddress sockAddr : ipFinder.getRegisteredAddresses())
+ addrs.add(sockAddr.getHostString() + ":" + sockAddr.getPort());
- clientFinder.setAddresses(addresses);
+ clientFinder.setAddresses(addrs);
TcpClientDiscoverySpi discoverySpi = new TcpClientDiscoverySpi();
discoverySpi.setIpFinder(clientFinder);
@@ -78,20 +90,6 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
}
/** {@inheritDoc} */
- @SuppressWarnings("unchecked")
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(gridName);
-
- cfg.setCacheStoreFactory(null);
- cfg.setReadThrough(false);
- cfg.setWriteThrough(false);
- cfg.setAffinity(new RendezvousAffinityFunction(false, 32));
- cfg.setBackups(1);
-
- return cfg;
- }
-
- /** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
return PARTITIONED;
}
@@ -100,103 +98,86 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
* @throws Exception If failed.
*/
public void testCacheConcurrentlyWithMultipleClientNodes() throws Exception {
- try {
- serverNodesCount = 3;
- clientNodesCount = 4;
+ srvNodesCnt = 3;
+ clientNodesCnt = 4;
- startServerNodes();
+ startServerNodes();
- client = true;
- startGridsMultiThreaded(serverNodesCount, clientNodesCount);
+ client = true;
- checkTopology(gridCount());
- awaitPartitionMapExchange();
+ startGridsMultiThreaded(srvNodesCnt, clientNodesCnt);
- // Explicitly create near cache for even client nodes
- final boolean[] nearCacheNode = new boolean[clientNodesCount];
- for (int i = serverNodesCount; i < gridCount(); i++) {
- if (i % 2 == 0) {
- grid(i).createNearCache(null, new NearCacheConfiguration<>());
- nearCacheNode[i - serverNodesCount] = true;
- }
- }
+ checkTopology(gridCount());
- super.beforeTest();
+ awaitPartitionMapExchange();
- final AtomicInteger threadsCnt = new AtomicInteger();
+ // Explicitly create near cache for even client nodes
+ for (int i = srvNodesCnt; i < gridCount(); i++)
+ grid(i).createNearCache(null, new NearCacheConfiguration<>());
- IgniteInternalFuture<?> f = multithreadedAsync(
- new Callable<Object>() {
- @Override
- public Object call() throws Exception {
- int clientIdx = serverNodesCount + threadsCnt.getAndIncrement();
- Ignite node = grid(clientIdx);
+ final AtomicInteger threadsCnt = new AtomicInteger();
- assert node.configuration().isClientMode();
+ IgniteInternalFuture<?> f = multithreadedAsync(
+ new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ int clientIdx = srvNodesCnt + threadsCnt.getAndIncrement();
- IgniteCache<Integer, Integer> cache = node.cache(null);
- boolean isNearCacheNode = nearCacheNode[clientIdx - serverNodesCount];
+ Ignite node = grid(clientIdx);
- for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++)
- cache.put(i, i);
+ assert node.configuration().isClientMode();
+ IgniteCache<Integer, Integer> cache = node.cache(null);
- for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++) {
- assertEquals(i, (int) cache.get(i));
+ boolean isNearCacheNode = clientIdx % 2 == 0;
- if (isNearCacheNode)
- assertEquals(i, (int) cache.localPeek(i, CachePeekMode.ONHEAP));
- }
+ for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++)
+ cache.put(i, i);
- stopGrid(clientIdx);
+ for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++) {
+ assertEquals(i, (int)cache.get(i));
- return null;
- }
- },
- clientNodesCount
- );
+ if (isNearCacheNode)
+ assertEquals(i, (int)cache.localPeek(i, CachePeekMode.ONHEAP));
+ }
- f.get();
+ stopGrid(clientIdx);
- }
- finally {
- afterTestsStopped();
- }
+ return null;
+ }
+ },
+ clientNodesCnt
+ );
+
+ f.get();
}
/**
* @throws Exception If failed.
*/
public void testCacheWithServerNodesRestart() throws Exception {
- try {
- serverNodesCount = 3;
- clientNodesCount = 1;
+ srvNodesCnt = 3;
+ clientNodesCnt = 1;
- startServerNodes();
+ startServerNodes();
- client = true;
- Ignite client = startGrid(serverNodesCount);
+ client = true;
- checkTopology(gridCount());
- awaitPartitionMapExchange();
- super.beforeTest();
+ Ignite client = startGrid(srvNodesCnt);
- IgniteCache<Integer, Integer> cache = client.cache(null);
+ checkTopology(gridCount());
- performSimpleOperationsOnCache(cache);
+ IgniteCache<Integer, Integer> cache = client.cache(null);
- // Restart server nodes, client node should reconnect automatically.
- stopServerNodes();
- startServerNodes();
- checkTopology(gridCount());
- awaitPartitionMapExchange();
- super.beforeTest();
+ performSimpleOperationsOnCache(cache);
- performSimpleOperationsOnCache(cache);
- }
- finally {
- afterTestsStopped();
- }
+ // Restart server nodes, client node should reconnect automatically.
+ stopServerNodes();
+
+ startServerNodes();
+
+ checkTopology(gridCount());
+
+ performSimpleOperationsOnCache(cache);
}
/**
@@ -204,15 +185,16 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
*/
private void startServerNodes() throws Exception {
client = false;
- for (int i = 0; i < serverNodesCount; i++)
+
+ for (int i = 0; i < srvNodesCnt; i++)
startGrid(i);
}
/**
- * @throws Exception
+ * @throws Exception If failed.
*/
private void stopServerNodes() throws Exception {
- for (int i = 0; i < serverNodesCount; i++)
+ for (int i = 0; i < srvNodesCnt; i++)
stopGrid(i);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af3ba54c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
index 7a9b3e7..addcdc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
@@ -56,9 +56,10 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- int count = gridCnt.incrementAndGet();
- if ((count == gridCount() && isClientStartedLast()) || (count == 1 && !isClientStartedLast())) {
+ int cnt = gridCnt.incrementAndGet();
+
+ if ((cnt == gridCount() && isClientStartedLast()) || (cnt == 1 && !isClientStartedLast())) {
cfg.setClientMode(true);
nearOnlyGridName = gridName;
@@ -99,7 +100,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst
protected abstract boolean clientOnly();
/**
- * @return boolean {@code true} if client's grid must be started last, {@code false} if it must be started first.
+ * @return boolean {@code True} if client's grid must be started last, {@code false} if it must be started first.
*/
protected boolean isClientStartedLast() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af3ba54c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
index 62e4a1e..607132e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
@@ -24,7 +24,7 @@ import java.net.*;
import java.util.*;
/**
- * Tests TcpClientDiscovery SPI in client modes.
+ * Tests {@link TcpClientDiscoverySpi}.
*/
public abstract class GridCacheClientModesTcpClientDiscoveryAbstractTest extends GridCacheClientModesAbstractSelfTest {
/** {@inheritDoc} */
@@ -38,18 +38,17 @@ public abstract class GridCacheClientModesTcpClientDiscoveryAbstractTest extends
if (cfg.isClientMode() != null && cfg.isClientMode()) {
TcpDiscoveryVmIpFinder clientFinder = new TcpDiscoveryVmIpFinder();
- ArrayList<String> addresses = new ArrayList<>(ipFinder.getRegisteredAddresses().size());
- for (InetSocketAddress sockAddr : ipFinder.getRegisteredAddresses()) {
- addresses.add(sockAddr.getHostString() + ":" + sockAddr.getPort());
- }
+ ArrayList<String> addrs = new ArrayList<>(ipFinder.getRegisteredAddresses().size());
- clientFinder.setAddresses(addresses);
+ for (InetSocketAddress sockAddr : ipFinder.getRegisteredAddresses())
+ addrs.add(sockAddr.getHostString() + ":" + sockAddr.getPort());
+
+ clientFinder.setAddresses(addrs);
TcpClientDiscoverySpi discoverySpi = new TcpClientDiscoverySpi();
discoverySpi.setIpFinder(clientFinder);
-
cfg.setDiscoverySpi(discoverySpi);
}
[35/50] incubator-ignite git commit: ignite-718 - add test to suite
Posted by sb...@apache.org.
ignite-718 - add test to suite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c8160bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c8160bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c8160bf
Branch: refs/heads/ignite-709
Commit: 9c8160bf79fe4f441a212631d6630366648eed8f
Parents: 377349a
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sat Apr 11 20:36:09 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sat Apr 11 20:36:09 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c8160bf/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 57ac209..d81d766 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -55,6 +55,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class);
suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class);
+ suite.addTestSuite(IgniteCacheLargeResultSelfTest.class);
suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
[05/50] incubator-ignite git commit: # ignite-537
Posted by sb...@apache.org.
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/876beff5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/876beff5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/876beff5
Branch: refs/heads/ignite-709
Commit: 876beff516e02c205e69c02d8bbd48811aec15e6
Parents: 0b14239
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 20:36:07 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 20:36:07 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/876beff5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 82a2e59..117166f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -2268,7 +2268,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
return null;
if (node.id().equals(getLocalNodeId()) || node.isClient())
- return U.gridClassLoader();
+ return null;
DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(node.id());
@@ -2291,7 +2291,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
return null;
if (nodeId.equals(getLocalNodeId()))
- return U.gridClassLoader();
+ return null;
TcpDiscoveryNode node;
@@ -2305,12 +2305,12 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
log.debug("Node provided exchange data left, will use local class loader " +
"for exchange data [nodeId=" + nodeId + ']');
- return U.gridClassLoader();
+ return null;
}
}
if (node.isClient()) // Do not support loading from client nodes.
- return U.gridClassLoader();
+ return null;
DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(nodeId);
[19/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df1fbef1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df1fbef1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df1fbef1
Branch: refs/heads/ignite-709
Commit: df1fbef13774cf57c165023255da6b4d3ddaa22d
Parents: 46d1369 1a5990c
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 07:02:03 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 07:02:03 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/visor/query/VisorQueryTask.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[34/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-718
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-718
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/377349af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/377349af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/377349af
Branch: refs/heads/ignite-709
Commit: 377349af5ba0aa766cb68e442318b8fcd39c8d1a
Parents: 37f8fbe 572d81b
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sat Apr 11 20:32:28 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sat Apr 11 20:32:28 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
.../client/ClientReconnectionSelfTest.java | 2 +
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../apache/ignite/internal/GridComponent.java | 5 +-
.../ignite/internal/GridPluginComponent.java | 5 +-
.../internal/managers/GridManagerAdapter.java | 4 +-
.../discovery/GridDiscoveryManager.java | 10 +-
.../processors/GridProcessorAdapter.java | 5 +-
.../processors/cache/GridCacheProcessor.java | 4 +-
.../cache/local/GridLocalLockFuture.java | 2 +
.../continuous/GridContinuousProcessor.java | 4 +-
.../processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 6 +-
.../plugin/IgnitePluginProcessor.java | 13 +-
.../query/GridQueryFieldMetadata.java | 2 +-
.../ignite/internal/util/GridJavaProcess.java | 38 ++-
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 2 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../internal/visor/query/VisorQueryArg.java | 82 ++++++
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 96 +++++++
.../internal/visor/query/VisorQueryField.java | 66 ++++-
.../internal/visor/query/VisorQueryJob.java | 174 ++++++++++++
.../visor/query/VisorQueryNextPageTask.java | 75 +++--
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 283 ++-----------------
.../internal/visor/query/VisorQueryUtils.java | 55 ++--
.../apache/ignite/plugin/PluginProvider.java | 5 +-
.../spi/discovery/DiscoverySpiDataExchange.java | 5 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 110 +++++--
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 ++
.../tcp/internal/TcpDiscoveryNode.java | 12 +-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../TcpDiscoveryJoinRequestMessage.java | 6 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 16 +-
.../ignite/startup/BasicWarmupClosure.java | 9 +-
.../resources/META-INF/classnames.properties | 36 ++-
.../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++
.../IgniteFairAffinityDynamicCacheSelfTest.java | 96 +++++++
.../CacheMetricsForClusterGroupSelfTest.java | 18 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 5 +
.../GridCacheSetFailoverAbstractSelfTest.java | 2 +
.../continuous/GridEventConsumeSelfTest.java | 3 +-
.../discovery/AbstractDiscoverySelfTest.java | 4 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +
modules/extdata/p2p/pom.xml | 2 +-
.../p2p/startcache/CacheAllNodesFilter.java | 31 ++
.../CacheConfigurationP2PTestClient.java | 118 ++++++++
.../tests/p2p/startcache/Organization1.java | 52 ++++
.../tests/p2p/startcache/Organization2.java | 52 ++++
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../cache/CacheConfigurationP2PTest.java | 179 ++++++++++++
.../cache/CacheConfigurationP2PTestServer.java | 49 ++++
.../IgniteCacheWithIndexingTestSuite.java | 2 +
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../commands/cache/VisorCacheScanCommand.scala | 13 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 30 +-
87 files changed, 1522 insertions(+), 515 deletions(-)
----------------------------------------------------------------------
[10/50] incubator-ignite git commit: # ignite-537
Posted by sb...@apache.org.
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/439af365
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/439af365
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/439af365
Branch: refs/heads/ignite-709
Commit: 439af36517d98280805c711eeaf9e24114c3fd6d
Parents: f316e9a
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 21:04:01 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 21:04:01 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 21 ++++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/439af365/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index bf8cbdb..1ab5332 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -2265,10 +2265,10 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
assert ignite != null;
if (!ignite.configuration().isPeerClassLoadingEnabled())
- return null;
+ return U.gridClassLoader();
if (node.id().equals(getLocalNodeId()) || node.isClient())
- return null;
+ return U.gridClassLoader();
DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(node.id());
@@ -2288,10 +2288,10 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
assert ignite != null;
if (!ignite.configuration().isPeerClassLoadingEnabled())
- return null;
+ return U.gridClassLoader();
if (nodeId.equals(getLocalNodeId()))
- return null;
+ return U.gridClassLoader();
TcpDiscoveryNode node;
@@ -2305,12 +2305,12 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
log.debug("Node provided exchange data left, will use local class loader " +
"for exchange data [nodeId=" + nodeId + ']');
- return null;
+ return U.gridClassLoader();
}
}
if (node.isClient()) // Do not support loading from client nodes.
- return null;
+ return U.gridClassLoader();
DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(nodeId);
@@ -5405,6 +5405,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
* @param node Node.
*/
public DiscoveryDeploymentClassLoader(TcpDiscoveryNode node) {
+ super(U.gridClassLoader());
+
assert !node.isClient() : node;
assert !node.id().equals(getLocalNodeId()) : node;
@@ -5462,13 +5464,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
/** {@inheritDoc} */
@Override protected Class<?> findClass(String name) throws ClassNotFoundException {
- try {
- return U.gridClassLoader().loadClass(name);
- }
- catch (ClassNotFoundException ignore) {
- // Ignore.
- }
-
lock.readLock().lock();
try {
[36/50] incubator-ignite git commit: Merge branch ignite-721 into
ignite-sprint-3
Posted by sb...@apache.org.
Merge branch ignite-721 into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/54f48783
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54f48783
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54f48783
Branch: refs/heads/ignite-709
Commit: 54f48783b22faba3820b47d34d0674ca26e33260
Parents: 9c8160b 608975e
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sat Apr 11 12:04:56 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sat Apr 11 12:04:56 2015 -0700
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 3 +++
.../cache/affinity/fair/GridFairAffinityFunctionSelfTest.java | 2 --
.../affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java | 3 ++-
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[39/50] incubator-ignite git commit: # Bug fix: remove unnecessary
assert.
Posted by sb...@apache.org.
# Bug fix: remove unnecessary assert.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68643151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68643151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68643151
Branch: refs/heads/ignite-709
Commit: 686431517f816676ef5bd4d92a86807fb2cb77af
Parents: 54f4878
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun Apr 12 11:23:30 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun Apr 12 11:23:39 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/ClusterMetricsSnapshot.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68643151/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
index 8cfdd8a..0b27f12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
@@ -1308,9 +1308,6 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
buf.putInt(metrics.getOutboundMessagesQueueSize());
buf.putInt(metrics.getTotalNodes());
- assert !buf.hasRemaining() : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual="
- + (buf.position() - off) + ']';
-
return buf.position();
}
@@ -1381,9 +1378,6 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
metrics.setOutboundMessagesQueueSize(buf.getInt());
metrics.setTotalNodes(buf.getInt());
- assert !buf.hasRemaining() : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual="
- + (buf.position() - off) + ']';
-
return metrics;
}
[29/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a5e4537
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a5e4537
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a5e4537
Branch: refs/heads/ignite-709
Commit: 1a5e45376857a019e0da91bc842e915475e078f0
Parents: 6dc4003 aa8912d
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 19:32:35 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 19:32:35 2015 +0300
----------------------------------------------------------------------
pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
[32/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-721
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-721
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/608975ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/608975ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/608975ee
Branch: refs/heads/ignite-709
Commit: 608975ee639054761f0c676f72b526b49cd9400f
Parents: bf7b9f8 572d81b
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sat Apr 11 09:52:55 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sat Apr 11 09:52:55 2015 -0700
----------------------------------------------------------------------
.../client/ClientReconnectionSelfTest.java | 2 +
.../cache/local/GridLocalLockFuture.java | 2 +
.../spi/discovery/tcp/TcpDiscoverySpi.java | 385 +------------------
.../tcp/messages/TcpDiscoveryClassRequest.java | 55 ---
.../tcp/messages/TcpDiscoveryClassResponse.java | 76 ----
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 5 +
.../GridCacheSetFailoverAbstractSelfTest.java | 2 +
.../CacheConfigurationP2PTestClient.java | 14 +-
modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../cache/CacheConfigurationP2PTest.java | 2 +
pom.xml | 3 -
12 files changed, 44 insertions(+), 504 deletions(-)
----------------------------------------------------------------------
[08/50] incubator-ignite git commit: # Last-minute fix to IGFS: we
were throwing IOError in some pretty valid cases what led to missed future
completion and eventual hang.
Posted by sb...@apache.org.
# Last-minute fix to IGFS: we were throwing IOError in some pretty valid cases what led to missed future completion and eventual hang.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3210d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3210d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3210d80
Branch: refs/heads/ignite-709
Commit: c3210d8035bca7dccae2b1accacd7e641c4e8cc6
Parents: 26fa0bf
Author: thatcoach <pp...@list.ru>
Authored: Fri Apr 10 20:57:51 2015 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Fri Apr 10 20:57:51 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../ignite/internal/processors/igfs/IgfsOutputStreamImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3210d80/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
index 30d2cf3..6c35032 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
@@ -312,7 +312,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
}
}
catch (IgniteCheckedException e) {
- throw new IOError(e); // Something unrecoverable.
+ throw new IOException("File to close the file: " + fileInfo.path(), e);
}
finally {
closed = true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3210d80/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
index c5b3e20..298733a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
@@ -262,7 +262,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
exists = meta.exists(fileInfo.id());
}
catch (IgniteCheckedException e) {
- throw new IOError(e); // Something unrecoverable.
+ throw new IOException("File to read file metadata: " + fileInfo.path(), e);
}
if (!exists) {
@@ -330,7 +330,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
exists = !deleted && meta.exists(fileInfo.id());
}
catch (IgniteCheckedException e) {
- throw new IOError(e); // Something unrecoverable.
+ throw new IOException("File to read file metadata: " + fileInfo.path(), e);
}
if (exists) {
@@ -370,7 +370,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
throw new IOException("File was concurrently deleted: " + path);
}
catch (IgniteCheckedException e) {
- throw new IOError(e); // Something unrecoverable.
+ throw new IOException("File to read file metadata: " + fileInfo.path(), e);
}
meta.updateParentListingAsync(parentId, fileInfo.id(), fileName, bytes, modificationTime);
[16/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-537' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-537' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59537866
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59537866
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59537866
Branch: refs/heads/ignite-709
Commit: 59537866520271d27f8191690932e40985970a87
Parents: 7bb7586 98587c6
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 00:51:15 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 00:51:15 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridComponent.java | 5 +-
.../ignite/internal/GridPluginComponent.java | 5 +-
.../internal/managers/GridManagerAdapter.java | 4 +-
.../discovery/GridDiscoveryManager.java | 10 +-
.../processors/GridProcessorAdapter.java | 5 +-
.../processors/cache/GridCacheProcessor.java | 4 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../plugin/IgnitePluginProcessor.java | 13 +-
.../ignite/internal/util/GridJavaProcess.java | 38 +-
.../apache/ignite/plugin/PluginProvider.java | 5 +-
.../spi/discovery/DiscoverySpiDataExchange.java | 5 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 14 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 474 +++++++++++++++++--
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 ++
.../tcp/messages/TcpDiscoveryClassRequest.java | 55 +++
.../tcp/messages/TcpDiscoveryClassResponse.java | 76 +++
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../TcpDiscoveryJoinRequestMessage.java | 6 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 16 +-
.../cache/CacheConfigurationP2PTest.java | 122 +++++
.../cache/CacheConfigurationP2PTestServer.java | 63 +++
.../continuous/GridEventConsumeSelfTest.java | 3 +-
.../discovery/AbstractDiscoverySelfTest.java | 4 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../p2p/startcache/CacheAllNodesFilter.java | 31 ++
.../CacheConfigurationP2PTestClient.java | 155 ++++++
27 files changed, 1082 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59537866/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[18/50] incubator-ignite git commit: # ignite-sprint-3 reverted
ignoring disovery data exchange for daemon nodes (was done in ignite-537)
Posted by sb...@apache.org.
# ignite-sprint-3 reverted ignoring disovery data exchange for daemon nodes (was done in ignite-537)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46d1369c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46d1369c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46d1369c
Branch: refs/heads/ignite-709
Commit: 46d1369c2fb17efec325793ced87276b8be98450
Parents: 5953786
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 05:58:13 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 06:53:57 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpClientDiscoverySpi.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 26 +--
.../cache/CacheConfigurationP2PTest.java | 122 -------------
.../cache/CacheConfigurationP2PTestServer.java | 63 -------
.../CacheConfigurationP2PTestClient.java | 75 ++------
.../tests/p2p/startcache/Organization1.java | 52 ++++++
.../tests/p2p/startcache/Organization2.java | 52 ++++++
.../cache/CacheConfigurationP2PTest.java | 177 +++++++++++++++++++
.../cache/CacheConfigurationP2PTestServer.java | 49 +++++
.../IgniteCacheWithIndexingTestSuite.java | 2 +
10 files changed, 364 insertions(+), 258 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 312b940..2ab8e8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -900,7 +900,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
Map<UUID, Map<Integer, byte[]>> dataMap = msg.oldNodesDiscoveryData();
- if (!locNode.isDaemon() && dataMap != null) {
+ if (dataMap != null) {
for (Map.Entry<UUID, Map<Integer, byte[]>> entry : dataMap.entrySet())
onExchange(newNodeId, entry.getKey(), entry.getValue(), null);
}
@@ -924,7 +924,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
Map<Integer, byte[]> data = msg.newNodeDiscoveryData();
- if (!locNode.isDaemon() && data != null)
+ if (data != null)
onExchange(newNodeId, newNodeId, data, null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index e1b1a92..81c608a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -2211,7 +2211,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
* @param req Get class request.
* @return Get class response.
*/
- private TcpDiscoveryClassResponse processGetClassRequest(TcpDiscoveryClassRequest req) {
+ private TcpDiscoveryClassResponse processClassRequest(TcpDiscoveryClassRequest req) {
assert !F.isEmpty(req.className()) : req;
String rsrc = U.classNameToResourceName(req.className());
@@ -3722,7 +3722,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
Map<Integer, byte[]> data = msg.newNodeDiscoveryData();
- if (!locNode.isDaemon() && data != null)
+ if (data != null)
onExchange(node.id(), node.id(), data, exchangeClassLoader(node, node.id()));
msg.addDiscoveryData(locNodeId, collectExchangeData(node.id()));
@@ -3793,7 +3793,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
// Notify outside of synchronized block.
- if (!locNode.isDaemon() && dataMap != null) {
+ if (dataMap != null) {
for (Map.Entry<UUID, Map<Integer, byte[]>> entry : dataMap.entrySet()) {
onExchange(node.id(),
entry.getKey(),
@@ -4594,7 +4594,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
Collection<ClusterNode> snapshot = hist.get(msg.topologyVersion());
- if (!locNode.isDaemon() && lsnr != null && (spiState == CONNECTED || spiState == DISCONNECTING)) {
+ if (lsnr != null && (spiState == CONNECTED || spiState == DISCONNECTING)) {
assert msg.messageBytes() != null;
TcpDiscoveryNode node = ring.node(msg.creatorNodeId());
@@ -4604,17 +4604,17 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
try {
if (msgObj == null)
msgObj = marsh.unmarshal(msg.messageBytes(), customMessageClassLoader(node));
+
+ lsnr.onDiscovery(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT,
+ msg.topologyVersion(),
+ node,
+ snapshot,
+ hist,
+ msgObj);
}
catch (IgniteCheckedException e) {
- throw new IgniteSpiException("Failed to unmarshal discovery custom message.", e);
+ U.error(log, "Failed to unmarshal discovery custom message.", e);
}
-
- lsnr.onDiscovery(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT,
- msg.topologyVersion(),
- node,
- snapshot,
- hist,
- msgObj);
}
}
@@ -5091,7 +5091,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
continue;
}
else if (msg instanceof TcpDiscoveryClassRequest) {
- TcpDiscoveryClassResponse res = processGetClassRequest((TcpDiscoveryClassRequest)msg);
+ TcpDiscoveryClassResponse res = processClassRequest((TcpDiscoveryClassRequest) msg);
writeToSocket(sock, res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
deleted file mode 100644
index 96b124c..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
+++ /dev/null
@@ -1,122 +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.internal.processors.cache;
-
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-
-/**
- *
- */
-public class CacheConfigurationP2PTest extends GridCommonAbstractTest {
- /** */
- public static final String NODE_START_MSG = "Test external node started";
-
- /** */
- private static final String CLIENT_CLS_NAME =
- "org.apache.ignite.tests.p2p.startcache.CacheConfigurationP2PTestClient";
-
- /**
- * @throws Exception If failed.
- */
- public void testCacheConfigurationP2P() throws Exception {
- final CountDownLatch srvsReadyLatch = new CountDownLatch(2);
-
- final CountDownLatch clientReadyLatch = new CountDownLatch(1);
-
- GridJavaProcess node1 = null;
- GridJavaProcess node2 = null;
- GridJavaProcess clientNode = null;
-
- try {
- node1 = GridJavaProcess.exec(
- CacheConfigurationP2PTestServer.class.getName(), null,
- log,
- new CI1<String>() {
- @Override public void apply(String s) {
- info("Server node1: " + s);
-
- if (s.contains(NODE_START_MSG))
- srvsReadyLatch.countDown();
- }
- },
- null,
- null,
- null
- );
-
- node2 = GridJavaProcess.exec(
- CacheConfigurationP2PTestServer.class.getName(), null,
- log,
- new CI1<String>() {
- @Override public void apply(String s) {
- info("Server node2: " + s);
-
- if (s.contains(NODE_START_MSG))
- srvsReadyLatch.countDown();
- }
- },
- null,
- null,
- null
- );
-
- assertTrue(srvsReadyLatch.await(60, SECONDS));
-
- String str = U.getIgniteHome() + "/modules/extdata/p2p/target/classes/";
-
- clientNode = GridJavaProcess.exec(
- CLIENT_CLS_NAME, null,
- log,
- new CI1<String>() {
- @Override public void apply(String s) {
- info("Client node: " + s);
-
- if (s.contains(NODE_START_MSG))
- clientReadyLatch.countDown();
- }
- },
- null,
- null,
- str
- );
-
- assertTrue(clientReadyLatch.await(60, SECONDS));
-
- int exitCode = clientNode.getProcess().waitFor();
-
- assertEquals("Unexpected exit code", 0, exitCode);
- }
- finally {
- if (node1 != null)
- node1.killProcess();
-
- if (node2 != null)
- node2.killProcess();
-
- if (clientNode != null)
- clientNode.killProcess();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java
deleted file mode 100644
index 490f951..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java
+++ /dev/null
@@ -1,63 +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.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-
-import java.util.*;
-
-/**
- *
- */
-public class CacheConfigurationP2PTestServer {
- /**
- * @param args Arguments.
- * @throws Exception If failed.
- */
- public static void main(String[] args) throws Exception {
- System.out.println("Starting test server node.");
-
- IgniteConfiguration cfg = new IgniteConfiguration();
-
- cfg.setPeerClassLoadingEnabled(true);
-
- cfg.setLocalHost("127.0.0.1");
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder();
-
- ipFinder.setAddresses(Arrays.asList("127.0.0.1:47500..47509"));
-
- disco.setIpFinder(ipFinder);
-
- cfg.setDiscoverySpi(disco);
-
- U.setWorkDirectory(null, U.getIgniteHome());
-
- try (Ignite ignite = Ignition.start(cfg)) {
- System.out.println(CacheConfigurationP2PTest.NODE_START_MSG);
-
- U.sleep(Long.MAX_VALUE);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
index 0634e5f..be3f3bc 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
@@ -18,13 +18,12 @@
package org.apache.ignite.tests.p2p.startcache;
import org.apache.ignite.*;
-import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.cache.query.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import java.io.*;
import java.util.*;
/**
@@ -61,7 +60,7 @@ public class CacheConfigurationP2PTestClient {
int nodes = ignite.cluster().nodes().size();
- if (nodes != 3)
+ if (nodes != 4)
throw new Exception("Unexpected nodes number: " + nodes);
CacheConfiguration<Integer, Organization1> ccfg1 = new CacheConfiguration<>();
@@ -79,6 +78,11 @@ public class CacheConfigurationP2PTestClient {
for (int i = 0; i < 500; i++)
cache1.put(i, new Organization1("org-" + i));
+ SqlQuery<Integer, Organization1> qry1 = new SqlQuery<>(Organization1.class, "_key >= 0");
+
+ if (cache1.query(qry1).getAll().isEmpty())
+ throw new Exception("Query failed.");
+
System.out.println("Sleep some time.");
Thread.sleep(5000); // Sleep some time to wait when connection of p2p loader is closed.
@@ -89,67 +93,22 @@ public class CacheConfigurationP2PTestClient {
ccfg2.setName("cache2");
- ccfg2.setIndexedTypes(Integer.class, Organization1.class);
+ ccfg2.setIndexedTypes(Integer.class, Organization2.class);
IgniteCache<Integer, Organization2> cache2 = ignite.createCache(ccfg2);
- }
- }
- /**
- * Organization class.
- */
- private static class Organization1 implements Serializable {
- /** Organization ID (indexed). */
- @QuerySqlField(index = true)
- private UUID id;
-
- /** Organization name (indexed). */
- @QuerySqlField(index = true)
- private String name;
-
- /**
- * Create organization.
- *
- * @param name Organization name.
- */
- Organization1(String name) {
- id = UUID.randomUUID();
-
- this.name = name;
- }
+ for (int i = 0; i < 500; i++)
+ cache2.put(i, new Organization2("org-" + i));
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Organization [id=" + id + ", name=" + name + ']';
- }
- }
+ SqlQuery<Integer, Organization2> qry2 = new SqlQuery<>(Organization2.class, "_key >= 0");
- /**
- * Organization class.
- */
- private static class Organization2 implements Serializable {
- /** Organization ID (indexed). */
- @QuerySqlField(index = true)
- private UUID id;
-
- /** Organization name (indexed). */
- @QuerySqlField(index = true)
- private String name;
-
- /**
- * Create organization.
- *
- * @param name Organization name.
- */
- Organization2(String name) {
- id = UUID.randomUUID();
-
- this.name = name;
- }
+ if (cache2.query(qry2).getAll().isEmpty())
+ throw new Exception("Query failed.");
+
+ cache1.close();
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Organization [id=" + id + ", name=" + name + ']';
+ cache2.close();
}
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization1.java
new file mode 100644
index 0000000..9c371f1
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization1.java
@@ -0,0 +1,52 @@
+/*
+ * 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.tests.p2p.startcache;
+
+import org.apache.ignite.cache.query.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Organization class.
+ */
+class Organization1 implements Serializable {
+ /** Organization ID (indexed). */
+ @QuerySqlField(index = true)
+ private UUID id;
+
+ /** Organization name (indexed). */
+ @QuerySqlField(index = true)
+ private String name;
+
+ /**
+ * Create organization.
+ *
+ * @param name Organization name.
+ */
+ Organization1(String name) {
+ id = UUID.randomUUID();
+
+ this.name = name;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Organization1 [id=" + id + ", name=" + name + ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization2.java
new file mode 100644
index 0000000..e44ce97
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/Organization2.java
@@ -0,0 +1,52 @@
+/*
+ * 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.tests.p2p.startcache;
+
+import org.apache.ignite.cache.query.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Organization class.
+ */
+class Organization2 implements Serializable {
+ /** Organization ID (indexed). */
+ @QuerySqlField(index = true)
+ private UUID id;
+
+ /** Organization name (indexed). */
+ @QuerySqlField(index = true)
+ private String name;
+
+ /**
+ * Create organization.
+ *
+ * @param name Organization name.
+ */
+ Organization2(String name) {
+ id = UUID.randomUUID();
+
+ this.name = name;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Organization2 [id=" + id + ", name=" + name + ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
new file mode 100644
index 0000000..8f0f4ca
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java
@@ -0,0 +1,177 @@
+/*
+ * 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.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.discovery.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+import static java.util.concurrent.TimeUnit.*;
+
+/**
+ *
+ */
+public class CacheConfigurationP2PTest extends GridCommonAbstractTest {
+ /** */
+ public static final String NODE_START_MSG = "Test external node started";
+
+ /** */
+ private static final String CLIENT_CLS_NAME =
+ "org.apache.ignite.tests.p2p.startcache.CacheConfigurationP2PTestClient";
+
+ /**
+ * @return Configuration.
+ */
+ static IgniteConfiguration createConfiguration() {
+ IgniteConfiguration cfg = new IgniteConfiguration();
+
+ cfg.setPeerClassLoadingEnabled(true);
+
+ cfg.setLocalHost("127.0.0.1");
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinderCleanFrequency(1000);
+
+ TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder();
+
+ ipFinder.setAddresses(Arrays.asList("127.0.0.1:47500..47509"));
+
+ disco.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(disco);
+
+ return cfg;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCacheConfigurationP2P() throws Exception {
+ try (Ignite ignite = Ignition.start(createConfiguration())) {
+ final CountDownLatch srvsReadyLatch = new CountDownLatch(2);
+
+ final CountDownLatch clientReadyLatch = new CountDownLatch(1);
+
+ GridJavaProcess node1 = null;
+ GridJavaProcess node2 = null;
+ GridJavaProcess clientNode = null;
+
+ Collection<String> jvmArgs = Arrays.asList("-ea", "-DIGNITE_QUIET=false");
+
+ try {
+ node1 = GridJavaProcess.exec(
+ CacheConfigurationP2PTestServer.class.getName(),
+ null,
+ log,
+ new CI1<String>() {
+ @Override public void apply(String s) {
+ info("Server node1: " + s);
+
+ if (s.contains(NODE_START_MSG))
+ srvsReadyLatch.countDown();
+ }
+ },
+ null,
+ jvmArgs,
+ null
+ );
+
+ node2 = GridJavaProcess.exec(
+ CacheConfigurationP2PTestServer.class.getName(), null,
+ log,
+ new CI1<String>() {
+ @Override public void apply(String s) {
+ info("Server node2: " + s);
+
+ if (s.contains(NODE_START_MSG))
+ srvsReadyLatch.countDown();
+ }
+ },
+ null,
+ jvmArgs,
+ null
+ );
+
+ assertTrue(srvsReadyLatch.await(60, SECONDS));
+
+ String cp = U.getIgniteHome() + "/modules/extdata/p2p/target/classes/";
+
+ clientNode = GridJavaProcess.exec(
+ CLIENT_CLS_NAME, null,
+ log,
+ new CI1<String>() {
+ @Override public void apply(String s) {
+ info("Client node: " + s);
+
+ if (s.contains(NODE_START_MSG))
+ clientReadyLatch.countDown();
+ }
+ },
+ null,
+ jvmArgs,
+ cp
+ );
+
+ assertTrue(clientReadyLatch.await(60, SECONDS));
+
+ int exitCode = clientNode.getProcess().waitFor();
+
+ assertEquals("Unexpected exit code", 0, exitCode);
+
+ node1.killProcess();
+ node2.killProcess();
+
+ final DiscoverySpi spi = ignite.configuration().getDiscoverySpi();
+
+ boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ Map p2pLdrs = GridTestUtils.getFieldValue(spi, "p2pLdrs");
+
+ log.info("p2pLdrs: " + p2pLdrs.size());
+
+ return p2pLdrs.isEmpty();
+ }
+ }, 10_000);
+
+ assertTrue(wait);
+ }
+ finally {
+ if (node1 != null)
+ node1.killProcess();
+
+ if (node2 != null)
+ node2.killProcess();
+
+ if (clientNode != null)
+ clientNode.killProcess();
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java
new file mode 100644
index 0000000..738f7cb
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTestServer.java
@@ -0,0 +1,49 @@
+/*
+ * 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.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+
+import java.util.*;
+
+/**
+ *
+ */
+public class CacheConfigurationP2PTestServer {
+ /**
+ * @param args Arguments.
+ * @throws Exception If failed.
+ */
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting test server node.");
+
+ IgniteConfiguration cfg = CacheConfigurationP2PTest.createConfiguration();
+
+ U.setWorkDirectory(null, U.getIgniteHome());
+
+ try (Ignite ignite = Ignition.start(cfg)) {
+ System.out.println(CacheConfigurationP2PTest.NODE_START_MSG);
+
+ U.sleep(Long.MAX_VALUE);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46d1369c/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
index ba6fe36..a2ccc82 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
@@ -46,6 +46,8 @@ public class IgniteCacheWithIndexingTestSuite extends TestSuite {
suite.addTestSuite(CacheTtlOnheapAtomicLocalSelfTest.class);
suite.addTestSuite(CacheTtlOnheapAtomicPartitionedSelfTest.class);
+ suite.addTestSuite(CacheConfigurationP2PTest.class);
+
return suite;
}
}
[07/50] incubator-ignite git commit: IGNITE-721 - Fixed NPE in fair
affinity
Posted by sb...@apache.org.
IGNITE-721 - Fixed NPE in fair affinity
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d3eac74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d3eac74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d3eac74
Branch: refs/heads/ignite-709
Commit: 2d3eac747656132ff877c76e70603580f6cc2efb
Parents: 1757473
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Apr 10 10:47:22 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Apr 10 10:47:22 2015 -0700
----------------------------------------------------------------------
.../GridDhtPartitionsExchangeFuture.java | 3 ++
.../fair/GridFairAffinityFunctionSelfTest.java | 2 --
.../IgniteFairAffinityDynamicCacheSelfTest.java | 35 +++++++++++---------
3 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d3eac74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 18f3035..a28f69c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -313,6 +313,9 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
* Rechecks topology.
*/
private void initTopology(GridCacheContext cacheCtx) throws IgniteCheckedException {
+ if (stopping(cacheCtx.cacheId()))
+ return;
+
if (canCalculateAffinity(cacheCtx)) {
if (log.isDebugEnabled())
log.debug("Will recalculate affinity [locNodeId=" + cctx.localNodeId() + ", exchId=" + exchId + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d3eac74/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
index 2dd2a8c..dcf4508 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
@@ -254,8 +254,6 @@ public class GridFairAffinityFunctionSelfTest extends GridCommonAbstractTest {
log().warning("max=" + max + ", min=" + min + ", ideal=" + ideal + ", minDev=" + deviation(min, ideal) + "%, " +
"maxDev=" + deviation(max, ideal) + "%");
-
- assertTrue("max=" + max + ", min=" + min, max - min < (keyBackups + 1) * topSize);
}
private static int deviation(int val, int ideal) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d3eac74/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
index e51be58..90571a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
@@ -70,27 +70,30 @@ public class IgniteFairAffinityDynamicCacheSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testStartStopCache() throws Exception {
- CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
+ for (int k = 0; k < 10; k++) {
+ CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
- cacheCfg.setCacheMode(CacheMode.PARTITIONED);
- cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- cacheCfg.setBackups(1);
- cacheCfg.setName("test");
- cacheCfg.setAffinity(new FairAffinityFunction());
+ cacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ cacheCfg.setBackups(1);
+ cacheCfg.setName("test");
+ cacheCfg.setAffinity(new FairAffinityFunction());
- final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg);
+ final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg);
- for (int i = 0; i < 10_000; i++)
- cache.put(i, i);
+ for (int i = 0; i < 10_000; i++)
+ cache.put(i, i);
- IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() {
- @Override public Object call() throws Exception {
- ignite(0).destroyCache(cache.getName());
+ IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ ignite(0).destroyCache(cache.getName());
- return null;
- }
- });
+ return null;
+ }
+ });
- destFut.get(2000L);
+ destFut.get(2000L);
+ }
}
}
[03/50] incubator-ignite git commit: Merge branch ignite-sprint-3
into ignite-721
Posted by sb...@apache.org.
Merge branch ignite-sprint-3 into ignite-721
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17574737
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17574737
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17574737
Branch: refs/heads/ignite-709
Commit: 1757473754a94e0e3ac0fb75c9767126de278dbb
Parents: b8543dc 232b10b
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Apr 10 10:25:05 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Apr 10 10:25:05 2015 -0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../configuration/CacheConfiguration.java | 7 +-
.../query/GridQueryFieldMetadata.java | 2 +-
.../processors/query/GridQueryProcessor.java | 89 +++---
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 2 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../internal/visor/query/VisorQueryArg.java | 82 ++++++
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 96 +++++++
.../internal/visor/query/VisorQueryField.java | 66 ++++-
.../internal/visor/query/VisorQueryJob.java | 174 ++++++++++++
.../visor/query/VisorQueryNextPageTask.java | 75 +++--
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 281 ++-----------------
.../internal/visor/query/VisorQueryUtils.java | 55 ++--
.../ignite/startup/BasicWarmupClosure.java | 9 +-
.../resources/META-INF/classnames.properties | 36 ++-
.../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 17 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../commands/cache/VisorCacheScanCommand.scala | 13 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 48 ++--
52 files changed, 781 insertions(+), 468 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17574737/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index b023e0d,02f82ce..e167614
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@@ -81,9 -82,11 +82,12 @@@ public class IgniteCacheTestSuite exten
suite.addTestSuite(IgniteCachePrivateExecutionContextTest.class);
suite.addTestSuite(IgniteCacheSharedExecutionContextTest.class);
+ // Warmup closure tests.
+ suite.addTestSuite(IgniteWarmupClosureSelfTest.class);
+
// Affinity tests.
suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class);
+ suite.addTestSuite(GridFairAffinityFunctionSelfTest.class);
suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class);
suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class);
suite.addTestSuite(IgniteCacheAffinitySelfTest.class);
[04/50] incubator-ignite git commit: sprint-3 1.1.0-SNAPSHOT again ...
Posted by sb...@apache.org.
sprint-3 1.1.0-SNAPSHOT again ...
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26fa0bf3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26fa0bf3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26fa0bf3
Branch: refs/heads/ignite-709
Commit: 26fa0bf357d07750da3ca0a95d38fbe65e605554
Parents: 232b10b
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Apr 10 20:32:08 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Apr 10 20:32:08 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index f56625a..f38ff9d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 7b91aa3..1b03acd 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 63dd298..057f246 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 77f681e..19d6a25 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index b8bff95..d112735 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 569dba3..cdf2cf2 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 86af433..6509c47 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 4a501b5..921775f 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 11446fd..6a7610c 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 26c55e7..9b5bcfb 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index b76782d..fbd40ce 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 38dae94..2949c34 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index b4214bc..04ab11b 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 69094ec..7322da2 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 145027d..42c8523 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 7a6e361..72bf1ff 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 8c48c52..b8840e3 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 2ffd916..ee733ad 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 69bfeb6..d420681 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 3bc60be..9acb521 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index e0523e7..a0bcaaa 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 7d559cc..521c7d0 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 58f2e68..674f22f 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index ef1eba0..939966c 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index e7eb06c..c5b9523 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 8b74d41..04dda81 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 14ebc25..446d7a0 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 5bd949b..108fa62 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26fa0bf3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c3d3c70..1ebf7c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
[25/50] incubator-ignite git commit: # ignite-sprint-3 disabled
failing test
Posted by sb...@apache.org.
# ignite-sprint-3 disabled failing test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b21a976
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b21a976
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b21a976
Branch: refs/heads/ignite-709
Commit: 9b21a9763802db62d781d1469678a3f8d596ebeb
Parents: d333feb
Author: sboikov <se...@inria.fr>
Authored: Sat Apr 11 12:36:43 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat Apr 11 12:36:43 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/client/ClientReconnectionSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b21a976/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
index fc781aa..d1c764e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
@@ -183,6 +183,8 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testIdleConnection() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-590");
+
int srvsCnt = 4; // TODO: IGNITE-590 it may be wrong value. Need to investigate after IGNITE-590 will be fixed.
for (int i = 0; i < srvsCnt; i++)