You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/12/22 11:39:26 UTC
[01/50] [abbrv] ignite git commit: 1.5.0-final-SNAPSHOT
Repository: ignite
Updated Branches:
refs/heads/ignite-gg-10837 880435751 -> f00030d16
1.5.0-final-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9087f019
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9087f019
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9087f019
Branch: refs/heads/ignite-gg-10837
Commit: 9087f019d06b3c7a35376590177868877311fec2
Parents: 916f59a
Author: Ignite Teamcity <ig...@apache.org>
Authored: Thu Dec 17 12:33:20 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Thu Dec 17 12:33:20 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/src/main/resources/ignite.properties | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flume/pom.xml | 2 +-
modules/gce/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/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
modules/osgi-karaf/pom.xml | 2 +-
modules/osgi-paxlogging/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++--
.../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++--
.../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
.../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++--
.../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/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 +-
modules/yarn/pom.xml | 2 +-
modules/zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
64 files changed, 71 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 41a5b6f..f123855 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index 40f20a3..f2cfbeb 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -35,7 +35,7 @@
</properties>
<artifactId>ignite-schema-import-demo</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 68a6c4b..c143c67 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/apache-license-gen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml
index fac37b1..154d43b 100644
--- a/modules/apache-license-gen/pom.xml
+++ b/modules/apache-license-gen/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-apache-license-gen</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index b3a4286..b4e8816 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/camel/pom.xml
----------------------------------------------------------------------
diff --git a/modules/camel/pom.xml b/modules/camel/pom.xml
index 7b73f1d..6a574af 100644
--- a/modules/camel/pom.xml
+++ b/modules/camel/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-camel</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 002e6c4..cd8ae10 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index f81db04..175b3b2 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ignite-cloud</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index c9d0be7..d124c42 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index c8702bd..56c1ff3 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<repositories>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index 866bbc9..3568cd4 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-ignite.version=1.5.0-b2-SNAPSHOT
+ignite.version=1.5.0-final-SNAPSHOT
ignite.build=0
ignite.revision=DEV
ignite.rel.date=01011970
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 26d7d06..2525ab6 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.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/extdata/uri/modules/uri-dependency/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/modules/uri-dependency/pom.xml b/modules/extdata/uri/modules/uri-dependency/pom.xml
index 3eea056..9de066c 100644
--- a/modules/extdata/uri/modules/uri-dependency/pom.xml
+++ b/modules/extdata/uri/modules/uri-dependency/pom.xml
@@ -27,7 +27,7 @@
<artifactId>ignite-extdata-uri-dep</artifactId>
<packaging>jar</packaging>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 118a045..99fd120 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -32,7 +32,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/flume/pom.xml
----------------------------------------------------------------------
diff --git a/modules/flume/pom.xml b/modules/flume/pom.xml
index 871ca1b..2f856f8 100644
--- a/modules/flume/pom.xml
+++ b/modules/flume/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-flume</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index f9d79f4..b05e1ff 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-gce</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 69eb9a0..eb9b89a 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 00b18e7..103d402 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 01cd464..dcfe133 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index d108842..7efabcd 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 7c95748..d11fdcc 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/jms11/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
index 030b546..db2d6e9 100644
--- a/modules/jms11/pom.xml
+++ b/modules/jms11/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jms11</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index c69b6cc..10756aa 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/modules/kafka/pom.xml b/modules/kafka/pom.xml
index 97df51c..f99f3c0 100644
--- a/modules/kafka/pom.xml
+++ b/modules/kafka/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-kafka</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index e22d50c..29230c0 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/log4j2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j2/pom.xml b/modules/log4j2/pom.xml
index 21fb4b3..15d56ea 100644
--- a/modules/log4j2/pom.xml
+++ b/modules/log4j2/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j2</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/mesos/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index 1901ec6..1d55b30 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mesos</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml
index 24c98b9..9f5cf8b 100644
--- a/modules/mqtt/pom.xml
+++ b/modules/mqtt/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mqtt</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/osgi-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-karaf/pom.xml b/modules/osgi-karaf/pom.xml
index 68e0c12..46cd239 100644
--- a/modules/osgi-karaf/pom.xml
+++ b/modules/osgi-karaf/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi-karaf</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/osgi-paxlogging/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-paxlogging/pom.xml b/modules/osgi-paxlogging/pom.xml
index 7695349..8d23b25 100644
--- a/modules/osgi-paxlogging/pom.xml
+++ b/modules/osgi-paxlogging/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi-paxlogging</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index ade8fd6..a08c7a0 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/cpp/common/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/common/configure.ac b/modules/platforms/cpp/common/configure.ac
index 9dfb0a3..f354f1a 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.2], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.10000], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/cpp/core-test/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/configure.ac b/modules/platforms/cpp/core-test/configure.ac
index 2a3e125..80072a8 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.0.2], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.10000], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/cpp/core/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/configure.ac b/modules/platforms/cpp/core/configure.ac
index 368fcac..aa4cbde 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.0.2], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.10000], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/cpp/examples/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/examples/configure.ac b/modules/platforms/cpp/examples/configure.ac
index a75e5f3..4c8316a 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ examples],[1.5.0.2],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ examples],[1.5.0.10000],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/cpp/ignite/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/ignite/configure.ac b/modules/platforms/cpp/ignite/configure.ac
index 3a85d9d..6da472e 100644
--- a/modules/platforms/cpp/ignite/configure.ac
+++ b/modules/platforms/cpp/ignite/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Runner], [1.5.0.2], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Runner], [1.5.0.10000], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index 3318641..384f61c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("8fae8395-7e91-411a-a78f-44d6d3fed0fc")]
-[assembly: AssemblyVersion("1.5.0.2")]
-[assembly: AssemblyFileVersion("1.5.0.2")]
+[assembly: AssemblyVersion("1.5.0.10000")]
+[assembly: AssemblyFileVersion("1.5.0.10000")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index 88b7a23..c7b9898 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -45,5 +45,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.2")]
-[assembly: AssemblyFileVersion("1.5.0.2")]
+[assembly: AssemblyVersion("1.5.0.10000")]
+[assembly: AssemblyFileVersion("1.5.0.10000")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 9d32327..0c74e95 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("de8dd5cc-7c7f-4a09-80d5-7086d9416a7b")]
-[assembly: AssemblyVersion("1.5.0.2")]
-[assembly: AssemblyFileVersion("1.5.0.2")]
+[assembly: AssemblyVersion("1.5.0.10000")]
+[assembly: AssemblyFileVersion("1.5.0.10000")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 4fb0458..3512810 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
[assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")]
-[assembly: AssemblyVersion("1.5.0.2")]
-[assembly: AssemblyFileVersion("1.5.0.2")]
+[assembly: AssemblyVersion("1.5.0.10000")]
+[assembly: AssemblyFileVersion("1.5.0.10000")]
[assembly: CLSCompliant(true)]
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
index bd2d2ad..f6257f9 100644
--- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("0f9702ec-da7d-4ce5-b4b7-73310c885355")]
-[assembly: AssemblyVersion("1.5.0.2")]
-[assembly: AssemblyFileVersion("1.5.0.2")]
+[assembly: AssemblyVersion("1.5.0.10000")]
+[assembly: AssemblyFileVersion("1.5.0.10000")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
index 082dde2..fa82d17 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
[assembly: Guid("41a0cb95-3435-4c78-b867-900b28e2c9ee")]
-[assembly: AssemblyVersion("1.5.0.2")]
-[assembly: AssemblyFileVersion("1.5.0.2")]
+[assembly: AssemblyVersion("1.5.0.10000")]
+[assembly: AssemblyFileVersion("1.5.0.10000")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
index cc08601..e1748ec 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Reflection;
[assembly: Guid("ce65ec7c-d3cf-41ad-8f45-f90d5af68d77")]
-[assembly: AssemblyVersion("1.5.0.2")]
-[assembly: AssemblyFileVersion("1.5.0.2")]
+[assembly: AssemblyVersion("1.5.0.10000")]
+[assembly: AssemblyFileVersion("1.5.0.10000")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 6d5166a..1709c2c 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.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/scalar-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index c75880d..05b66f1 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar_2.10</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index cdabc4b..8be03df 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 1435121..5246938 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 3fe9ad3..ff6387d 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.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 27b4cda..aba43b9 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/spark-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml
index faeb45f..79db055 100644
--- a/modules/spark-2.10/pom.xml
+++ b/modules/spark-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark_2.10</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/spark/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index 780397c..b79e0ec 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index f1b9bc1..0c73598 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 70091e7..b67252d 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index c259cce..3f71641 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/twitter/pom.xml b/modules/twitter/pom.xml
index 60e415f..21b360d 100644
--- a/modules/twitter/pom.xml
+++ b/modules/twitter/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-twitter</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index cf51bfa..fcd2b49 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/visor-console-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml
index a4e50cb..e4c29f8 100644
--- a/modules/visor-console-2.10/pom.xml
+++ b/modules/visor-console-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console_2.10</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index f686238..ccdba4f 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.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 4d63db7..4403e08 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.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 401a1cc..9a7e81d 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 8c3e4c1..9c0f594 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml
index a726321..348c72e 100644
--- a/modules/yarn/pom.xml
+++ b/modules/yarn/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yarn</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/modules/zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index 6a5bc70..8879ec3 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-zookeeper</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/9087f019/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 97d5f6f..7bc9492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
- <version>1.5.0-b2-SNAPSHOT</version>
+ <version>1.5.0-final-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
[25/50] [abbrv] ignite git commit: IGNITE-2210: Fixed
testMethodAnnotationWithoutGet - it cannot work with BinaryMarshaller at the
moment.
Posted by nt...@apache.org.
IGNITE-2210: Fixed testMethodAnnotationWithoutGet - it cannot work with BinaryMarshaller at the moment.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48a1e0a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48a1e0a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48a1e0a9
Branch: refs/heads/ignite-gg-10837
Commit: 48a1e0a949aadcf28729b27b5413f53cff905981
Parents: 10bb798
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 16:08:24 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 16:08:24 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheAbstractFieldsQuerySelfTest.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a1e0a9/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index 4c952fc..926d294 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -846,15 +846,17 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
* @throws Exception If failed.
*/
public void testMethodAnnotationWithoutGet() throws Exception {
- QueryCursor<List<?>> qry = grid(0).cache(null)
- .query(new SqlFieldsQuery("select methodField from Organization where methodField='name-A'")
- .setPageSize(10));
+ if (!binaryMarshaller) {
+ QueryCursor<List<?>> qry = grid(0).cache(null)
+ .query(new SqlFieldsQuery("select methodField from Organization where methodField='name-A'")
+ .setPageSize(10));
- List<List<?>> flds = qry.getAll();
+ List<List<?>> flds = qry.getAll();
- assertEquals(1, flds.size());
+ assertEquals(1, flds.size());
- assertEquals("name-A", flds.get(0).get(0));
+ assertEquals("name-A", flds.get(0).get(0));
+ }
}
/**
[22/50] [abbrv] ignite git commit: fixed compilation error for Java 8
Posted by nt...@apache.org.
fixed compilation error for Java 8
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d391daaf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d391daaf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d391daaf
Branch: refs/heads/ignite-gg-10837
Commit: d391daaf24f0f1545e223d6d47d58ba8c592e850
Parents: 32cec99
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Dec 18 15:09:55 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Dec 18 15:09:55 2015 +0300
----------------------------------------------------------------------
.../processors/cache/BinarySerializationQuerySelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d391daaf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
index 1eba7d1..669c482 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
@@ -221,7 +221,7 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest {
Cache.Entry res = (Cache.Entry)iter.next();
assertEquals(2, res.getKey());
- assertEquals(20, U.field(res.getValue(), "val"));
+ assertEquals(Integer.valueOf(20), U.field(res.getValue(), "val"));
assert !iter.hasNext();
[40/50] [abbrv] ignite git commit: ignite-1.5 Added
CacheConfiguration.storeKeepBinary flag support in Visor.
Posted by nt...@apache.org.
ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5ed0d0e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5ed0d0e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5ed0d0e
Branch: refs/heads/ignite-gg-10837
Commit: c5ed0d0e23329b8badb594e6f625eb58a24e2392
Parents: d8576b8
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 22 14:14:43 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 22 14:14:43 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheStoreConfiguration.java | 13 ++++++++++++-
.../visor/commands/cache/VisorCacheCommand.scala | 1 +
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5ed0d0e/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
index f2d5961..38a419a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
@@ -65,6 +65,9 @@ public class VisorCacheStoreConfiguration implements Serializable {
/** Number of threads that will perform cache flushing. */
private int flushThreadCnt;
+ /** Keep binary in store flag. */
+ private boolean storeKeepBinary;
+
/**
* @param ignite Ignite instance.
* @param ccfg Cache configuration.
@@ -81,6 +84,7 @@ public class VisorCacheStoreConfiguration implements Serializable {
cfg.store = compactClass(store);
cfg.storeFactory = compactClass(ccfg.getCacheStoreFactory());
+ cfg.storeKeepBinary = ccfg.isStoreKeepBinary();
cfg.readThrough = ccfg.isReadThrough();
cfg.writeThrough = ccfg.isWriteThrough();
@@ -123,6 +127,13 @@ public class VisorCacheStoreConfiguration implements Serializable {
}
/**
+ * @return Keep binary in store flag.
+ */
+ public boolean storeKeepBinary() {
+ return storeKeepBinary;
+ }
+
+ /**
* @return Whether cache should operate in read-through mode.
*/
public boolean readThrough() {
@@ -175,4 +186,4 @@ public class VisorCacheStoreConfiguration implements Serializable {
@Override public String toString() {
return S.toString(VisorCacheStoreConfiguration.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5ed0d0e/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 0d8d036..57f7066 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -866,6 +866,7 @@ object VisorCacheCommand {
cacheT += ("Store Enabled", bool2Str(storeCfg.enabled()))
cacheT += ("Store Class", safe(storeCfg.store()))
cacheT += ("Store Factory Class", storeCfg.storeFactory())
+ cacheT += ("Store Keep Binary", storeCfg.storeKeepBinary())
cacheT += ("Store Read Through", bool2Str(storeCfg.readThrough()))
cacheT += ("Store Write Through", bool2Str(storeCfg.writeThrough()))
[45/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by nt...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bbdb2024
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bbdb2024
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bbdb2024
Branch: refs/heads/ignite-gg-10837
Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3
Parents: 627134b 3aa6f82
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Dec 22 11:29:06 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Dec 22 11:29:06 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/IgniteCacheProxy.java | 3 +--
.../visor/cache/VisorCacheStoreConfiguration.java | 13 ++++++++++++-
.../visor/commands/cache/VisorCacheCommand.scala | 1 +
.../yardstick/config/benchmark-multicast.properties | 2 +-
4 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[34/50] [abbrv] ignite git commit: .NET: Removed unnecessary
"Contains" word from namespace descriptions.
Posted by nt...@apache.org.
.NET: Removed unnecessary "Contains" word from namespace descriptions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12d1528f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12d1528f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12d1528f
Branch: refs/heads/ignite-gg-10837
Commit: 12d1528fb705c4d3812a5a5ccaeb6dee6a924422
Parents: 359bf21
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 21 16:55:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 21 16:55:56 2015 +0300
----------------------------------------------------------------------
modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs | 2 +-
modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs | 2 +-
.../Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs | 2 +-
.../dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs | 2 +-
.../dotnet/Apache.Ignite.Core/Cache/Store/Package-Info.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/Cluster/Package-Info.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/Compute/Package-Info.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/Datastream/Package-Info.cs | 2 +-
modules/platforms/dotnet/Apache.Ignite.Core/Events/Package-Info.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/Lifecycle/Package-Info.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/Messaging/Package-Info.cs | 2 +-
modules/platforms/dotnet/Apache.Ignite.Core/Package-Info.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/Resource/Package-Info.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/Services/Package-Info.cs | 2 +-
.../dotnet/Apache.Ignite.Core/Transactions/Package-Info.cs | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
index fd01160..c949b50 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains Ignite Binary Objects API classes.
+/// Ignite Binary Objects API classes.
/// </summary>
namespace Apache.Ignite.Core.Binary
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
index 4dd7439..ae7355c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains main Data Grid APIs.
+/// Main Data Grid APIs.
/// </summary>
namespace Apache.Ignite.Core.Cache
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
index 2ba6dfe..81b02bf 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains APIs for creating and executing cache continuous queries.
+/// APIs for creating and executing cache continuous queries.
/// </summary>
namespace Apache.Ignite.Core.Cache.Query.Continuous
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
index 2e83364..4c4ecb5 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains APIs for creating and executing cache queries.
+/// APIs for creating and executing cache queries.
/// </summary>
namespace Apache.Ignite.Core.Cache.Query
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/Package-Info.cs
index c2772a4..910ba76 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains cache store interfaces.
+/// Cache store interfaces.
/// </summary>
namespace Apache.Ignite.Core.Cache.Store
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/Package-Info.cs
index b62fa40..9064bfe 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains cluster-related classes.
+/// Cluster-related classes.
/// </summary>
namespace Apache.Ignite.Core.Cluster
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Compute/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/Package-Info.cs
index 2221c5f..47a714c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains Compute Grid functionality.
+/// Compute Grid functionality.
/// </summary>
namespace Apache.Ignite.Core.Compute
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Datastream/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Datastream/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Datastream/Package-Info.cs
index 9d7790e..7f631b9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Datastream/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Datastream/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains Ignite Streamer classes.
+/// Ignite Streamer classes.
/// </summary>
namespace Apache.Ignite.Core.Datastream
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Events/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Events/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Events/Package-Info.cs
index e832b74..2b517f6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Events/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Events/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains Event Subscription functionality together with various events emitted by Ignite.
+/// Event Subscription functionality together with various events emitted by Ignite.
/// </summary>
namespace Apache.Ignite.Core.Events
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Lifecycle/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Lifecycle/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Lifecycle/Package-Info.cs
index ca743ea..29dcc9e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Lifecycle/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Lifecycle/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains lifecycle-related classes.
+/// Lifecycle-related classes.
/// </summary>
namespace Apache.Ignite.Core.Lifecycle
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Messaging/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Messaging/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Messaging/Package-Info.cs
index b991821..cf191db 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Messaging/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Messaging/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains Topic-based Messaging functionality.
+/// Topic-based Messaging functionality.
/// </summary>
namespace Apache.Ignite.Core.Messaging
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Package-Info.cs
index 8f6421e..a3cfea7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains Ignite APIs.
+/// Ignite APIs.
/// </summary>
namespace Apache.Ignite.Core
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Resource/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Resource/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Resource/Package-Info.cs
index dbf4101..d6fef06 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Resource/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Resource/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains attributes to inject resources into user-defined code such as tasks, jobs, entry processors.
+/// Attributes to inject resources into user-defined code such as tasks, jobs, entry processors.
/// </summary>
namespace Apache.Ignite.Core.Resource
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Services/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Services/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Services/Package-Info.cs
index 435b930..7b1e6a6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Services/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Services/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains Managed Services APIs.
+/// Managed Services APIs.
/// </summary>
namespace Apache.Ignite.Core.Services
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d1528f/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/Package-Info.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/Package-Info.cs
index e63c2c6..564a000 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/Package-Info.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/Package-Info.cs
@@ -18,7 +18,7 @@
#pragma warning disable 1587 // invalid XML comment
/// <summary>
-/// Contains transaction-related classes.
+/// Transaction-related classes.
/// </summary>
namespace Apache.Ignite.Core.Transactions
{
[06/50] [abbrv] ignite git commit: Ignite-2087
Posted by nt...@apache.org.
Ignite-2087
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd1f506e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd1f506e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd1f506e
Branch: refs/heads/ignite-gg-10837
Commit: bd1f506eaa618f803b39461f5198091d7cbea3a4
Parents: e7e4a48
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Dec 17 14:27:16 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Dec 17 14:27:16 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +++++++++++++++-----
.../java/org/apache/ignite/IgniteSpring.java | 4 +-
3 files changed, 43 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 84ed2cd..6e09d72 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -114,7 +114,7 @@ public class CacheManager implements javax.cache.CacheManager {
ignite = (IgniteKernal)IgnitionEx.start(cfg);
}
else
- ignite = (IgniteKernal)IgnitionEx.start(uri.toURL());
+ ignite = (IgniteKernal)IgnitionEx.start(uri.toURL(), clsLdr);
kernalGateway = ignite.context().gateway();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4f6c6d9..5153fb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -495,7 +495,7 @@ public class IgnitionEx {
URL url = U.resolveIgniteUrl(DFLT_CFG);
if (url != null)
- return start(DFLT_CFG, null, springCtx);
+ return start(DFLT_CFG, null, springCtx, null);
U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?): " + DFLT_CFG);
@@ -581,7 +581,7 @@ public class IgnitionEx {
return start(cfg);
}
else
- return start(springCfgPath, gridName, null);
+ return start(springCfgPath, gridName, null, null);
}
/**
@@ -697,6 +697,7 @@ public class IgnitionEx {
* @param springCfgPath Spring XML configuration file path or URL. This cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this context.
* If provided, this context can be injected into grid tasks and grid jobs using
* {@link SpringApplicationContextResource @SpringApplicationContextResource} annotation.
@@ -707,10 +708,10 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(String springCfgPath, @Nullable String gridName,
- @Nullable GridSpringResourceContext springCtx) throws IgniteCheckedException {
+ @Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader ldr) throws IgniteCheckedException {
URL url = U.resolveSpringUrl(springCfgPath);
- return start(url, gridName, springCtx);
+ return start(url, gridName, springCtx, ldr);
}
/**
@@ -730,7 +731,28 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl) throws IgniteCheckedException {
- return start(springCfgUrl, null, null);
+ return start(springCfgUrl, null, null, null);
+ }
+
+ /**
+ * Starts all grids specified within given Spring XML configuration file URL. If grid with given name
+ * is already started, then exception is thrown. In this case all instances that may
+ * have been started so far will be stopped too.
+ * <p>
+ * Usually Spring XML configuration file will contain only one Grid definition. Note that
+ * Grid configuration bean(s) is retrieved form configuration file by type, so the name of
+ * the Grid configuration bean is ignored.
+ *
+ * @param springCfgUrl Spring XML configuration file URL. This cannot be {@code null}.
+ * @param ldr Optional class loader that will be used by default.
+ * @return Started grid. If Spring configuration contains multiple grid instances,
+ * then the 1st found instance is returned.
+ * @throws IgniteCheckedException If grid could not be started or configuration
+ * read. This exception will be thrown also if grid with given name has already
+ * been started or Spring XML configuration file is invalid.
+ */
+ public static Ignite start(URL springCfgUrl, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+ return start(springCfgUrl, null, null, ldr);
}
/**
@@ -745,6 +767,7 @@ public class IgnitionEx {
* @param springCfgUrl Spring XML configuration file URL. This cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this context.
* If provided, this context can be injected into grid tasks and grid jobs using
* {@link SpringApplicationContextResource @SpringApplicationContextResource} annotation.
@@ -755,7 +778,7 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl, @Nullable String gridName,
- @Nullable GridSpringResourceContext springCtx) throws IgniteCheckedException {
+ @Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader ldr) throws IgniteCheckedException {
A.notNull(springCfgUrl, "springCfgUrl");
boolean isLog4jUsed = U.gridClassLoader().getResource("org/apache/log4j/Appender.class") != null;
@@ -789,7 +812,7 @@ public class IgnitionEx {
U.removeJavaNoOpLogger(savedHnds);
}
- return startConfigurations(cfgMap, springCfgUrl, gridName, springCtx);
+ return startConfigurations(cfgMap, springCfgUrl, gridName, springCtx, ldr);
}
/**
@@ -809,7 +832,7 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(InputStream springCfgStream) throws IgniteCheckedException {
- return start(springCfgStream, null, null);
+ return start(springCfgStream, null, null, null);
}
/**
@@ -824,6 +847,7 @@ public class IgnitionEx {
* @param springCfgStream Input stream containing Spring XML configuration. This cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this context.
* If provided, this context can be injected into grid tasks and grid jobs using
* {@link SpringApplicationContextResource @SpringApplicationContextResource} annotation.
@@ -834,7 +858,7 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(InputStream springCfgStream, @Nullable String gridName,
- @Nullable GridSpringResourceContext springCtx) throws IgniteCheckedException {
+ @Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader ldr) throws IgniteCheckedException {
A.notNull(springCfgStream, "springCfgUrl");
boolean isLog4jUsed = U.gridClassLoader().getResource("org/apache/log4j/Appender.class") != null;
@@ -868,7 +892,7 @@ public class IgnitionEx {
U.removeJavaNoOpLogger(savedHnds);
}
- return startConfigurations(cfgMap, null, gridName, springCtx);
+ return startConfigurations(cfgMap, null, gridName, springCtx, ldr);
}
/**
@@ -878,6 +902,7 @@ public class IgnitionEx {
* @param springCfgUrl Spring XML configuration file URL.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context.
+ * @param ldr Optional class loader that will be used by default.
* @return Started grid.
* @throws IgniteCheckedException If failed.
*/
@@ -885,7 +910,8 @@ public class IgnitionEx {
IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> cfgMap,
URL springCfgUrl,
@Nullable String gridName,
- @Nullable GridSpringResourceContext springCtx)
+ @Nullable GridSpringResourceContext springCtx,
+ @Nullable ClassLoader ldr)
throws IgniteCheckedException {
List<IgniteNamedInstance> grids = new ArrayList<>(cfgMap.size());
@@ -896,6 +922,9 @@ public class IgnitionEx {
if (cfg.getGridName() == null && !F.isEmpty(gridName))
cfg.setGridName(gridName);
+ if (ldr != null && cfg.getClassLoader() == null)
+ cfg.setClassLoader(ldr);
+
// Use either user defined context or our one.
IgniteNamedInstance grid = start0(
new GridStartContext(cfg, springCfgUrl, springCtx == null ? cfgMap.get2() : springCtx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
index 9c70591..ddb44a7 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
@@ -87,7 +87,7 @@ public class IgniteSpring {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(String springCfgPath, @Nullable ApplicationContext springCtx) throws IgniteCheckedException {
- return IgnitionEx.start(springCfgPath, null, new GridSpringResourceContextImpl(springCtx));
+ return IgnitionEx.start(springCfgPath, null, new GridSpringResourceContextImpl(springCtx), null);
}
/**
@@ -111,6 +111,6 @@ public class IgniteSpring {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl, @Nullable ApplicationContext springCtx) throws IgniteCheckedException {
- return IgnitionEx.start(springCfgUrl, null, new GridSpringResourceContextImpl(springCtx));
+ return IgnitionEx.start(springCfgUrl, null, new GridSpringResourceContextImpl(springCtx), null);
}
}
\ No newline at end of file
[32/50] [abbrv] ignite git commit: IGNITE-2184: Updated .NET/CPP
version update procedure.
Posted by nt...@apache.org.
IGNITE-2184: Updated .NET/CPP version update procedure.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/359bf214
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/359bf214
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/359bf214
Branch: refs/heads/ignite-gg-10837
Commit: 359bf2142627b1dbe26e00da1fb1ac071d71b4ce
Parents: 6edeccd
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Mon Dec 21 15:33:43 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 21 15:33:43 2015 +0300
----------------------------------------------------------------------
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Apache.Ignite/Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
pom.xml | 42 ++++++++++----------
8 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index 384f61c..f250841 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index c7b9898..97941e1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -47,3 +47,4 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 0c74e95..7e0ba0b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 3512810..4e22fb7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
[assembly: CLSCompliant(true)]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
index f6257f9..aa2297d 100644
--- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
index fa82d17..0d5ce64 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
index e1748ec..9fb948b 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Reflection;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7bc9492..c728f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -779,27 +779,18 @@
function setClientVersion(ggVer, clientVer) {
var p = project.getProperty(ggVer);
- var pos = p.search("-");
+ var digitVer = /\d+\.\d+\.\d+/.exec(p);
- if (pos > 0)
+ if (digitVer != null)
{
- var suffix = p.substring(pos);
+ // Date of the last major release
+ var startDate = new Date(2015,1,1);
- var ver = 0;
+ // Number of hours since the last major release
+ var buildNum = Math.round((new Date() - startDate)/(3600*1000));
+ var ver = digitVer[0] + "." + buildNum;
- var beta = /-b([0-9]+)/.exec(suffix);
- if (beta !== null)
- ver += parseInt(beta[1]);
-
- var patch = /-p([0-9]+)/.exec(suffix);
- if (patch !== null)
- ver += parseInt(patch[1]) * 100;
-
- if (suffix.search("final") > 0)
- ver += 10000;
-
- var resVer = p.substring(0, pos) +"." + ver;
- project.setProperty(clientVer, resVer);
+ project.setProperty(clientVer, ver);
}
else
project.setProperty(clientVer, p);
@@ -820,7 +811,7 @@
<echo message="${new.client.version}" />
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(\[assembly:\s*Assembly\w*Version\w*\(")\d.\d.\d(.\d)?("\)\])" />
+ <regexp pattern="(\[assembly:\s*Assembly\w*Version\w*\(")\d+\.\d+\.\d+(\.\d+)?("\)\])" />
<substitution expression="\1${new.client.version}\3" />
<fileset dir="${basedir}/">
<include name="**/AssemblyInfo.cs" />
@@ -828,9 +819,18 @@
</fileset>
</replaceregexp>
+ <replaceregexp byline="true" encoding="UTF-8">
+ <regexp pattern="(\[assembly:\s*AssemblyInformationalVersion\w*\(").*?("\)\])" />
+ <substitution expression="\1${new.ignite.version}\2" />
+ <fileset dir="${basedir}/">
+ <include name="**/AssemblyInfo.cs" />
+ <include name="**/AssemblyInfo.cpp" />
+ </fileset>
+ </replaceregexp>
+
<echo message="Update ignite.version in cpp client" />
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(AC_INIT.+\[)\d.\d.\d.*?(\].+)" />
+ <regexp pattern="(AC_INIT.+\[)\d+\.\d+\.\d+.*?(\].+)" />
<substitution expression="\1${new.client.version}\2" />
<fileset dir="${basedir}/">
<include name="**/configure.ac" />
@@ -838,7 +838,7 @@
</replaceregexp>
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(define GG_VERSION_STR_WIN ")\d.\d.\d(.\d)?(")" />
+ <regexp pattern="(define GG_VERSION_STR_WIN ")\d+\.\d+\.\d+(\.\d+)?(")" />
<substitution expression="\1${new.client.version}\3" />
<fileset dir="${basedir}/">
<include name="**/resource.h" />
@@ -846,7 +846,7 @@
</replaceregexp>
<replaceregexp byline="true" encoding="UTF-16">
- <regexp pattern="(Version", ")\d.\d.\d.\d(")" />
+ <regexp pattern="(Version", ")\d+\.\d+\.\d+\.\d+(")" />
<substitution expression="\1${new.client.version}\2" />
<fileset dir="${basedir}/">
<include name="**/Resource.rc" />
[11/50] [abbrv] ignite git commit: IGNITE-2100: Fixed serilaization
of Externalizable. Now queries work in all modes.
Posted by nt...@apache.org.
IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/057ad5bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/057ad5bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/057ad5bb
Branch: refs/heads/ignite-gg-10837
Commit: 057ad5bb4d054cba90932ff5614a928b623d44cc
Parents: 1f484ea
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Dec 17 17:00:29 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Dec 17 17:00:29 2015 +0300
----------------------------------------------------------------------
.../binary/BinaryReflectiveSerializer.java | 33 ++
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../internal/binary/BinaryClassDescriptor.java | 124 ++----
.../ignite/internal/binary/BinaryContext.java | 109 ++++-
.../internal/binary/BinaryFieldAccessor.java | 3 -
.../ignite/internal/binary/BinaryUtils.java | 49 ++-
.../ignite/internal/binary/BinaryWriteMode.java | 3 -
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java | 204 ++++++---
.../binary/BinaryFieldsAbstractSelfTest.java | 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 3 +-
.../binary/BinaryMarshallerSelfTest.java | 34 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 33 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 +++++++++++++++++++
...onQueryWithReflectiveSerializerSelfTest.java | 28 ++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java | 119 +++++-
26 files changed, 995 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
new file mode 100644
index 0000000..fd0f841
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+/**
+ * Binary serializer which writes object fields using reflection. Transient fields are not written.
+ */
+public class BinaryReflectiveSerializer implements BinarySerializer {
+ /** {@inheritDoc} */
+ @Override public void writeBinary(Object obj, BinaryWriter writer) throws BinaryObjectException {
+ assert false : "Method should not be called directly.";
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readBinary(Object obj, BinaryReader reader) throws BinaryObjectException {
+ assert false : "Method should not be called directly.";
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
index a694eaf..a00c061 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
@@ -17,9 +17,10 @@
package org.apache.ignite.binary;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.BinaryConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
/**
* Defines configuration properties for a specific binary type. Providing per-type
@@ -42,12 +43,27 @@ public class BinaryTypeConfiguration {
private boolean isEnum;
/**
+ * Constructor.
*/
public BinaryTypeConfiguration() {
// No-op.
}
/**
+ * Copying constructor.
+ *
+ * @param other Other instance.
+ */
+ public BinaryTypeConfiguration(BinaryTypeConfiguration other) {
+ A.notNull(other, "other");
+
+ typeName = other.typeName;
+ idMapper = other.idMapper;
+ serializer = other.serializer;
+ isEnum = other.isEnum;
+ }
+
+ /**
* @param typeName Class name.
*/
public BinaryTypeConfiguration(String typeName) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
index ee6321c..c745ed8 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
@@ -64,6 +64,7 @@ public class AffinityKey<K> implements Externalizable {
private K key;
/** Affinity key. */
+ @AffinityKeyMapped
@GridToStringInclude
private Object affKey;
@@ -126,7 +127,6 @@ public class AffinityKey<K> implements Externalizable {
*
* @return Affinity key to use for affinity mapping.
*/
- @AffinityKeyMapped
@SuppressWarnings({"unchecked"})
public <T> T affinityKey() {
A.notNull(key, "key");
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 4a93bf6..eac1874 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -17,15 +17,24 @@
package org.apache.ignite.internal.binary;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.binary.BinaryIdMapper;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.BinaryReflectiveSerializer;
+import org.apache.ignite.binary.BinarySerializer;
+import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.Unsafe;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.ArrayList;
@@ -36,18 +45,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.binary.BinaryIdMapper;
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.binary.BinarySerializer;
-import org.apache.ignite.binary.Binarylizable;
-import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
-import org.apache.ignite.internal.util.GridUnsafe;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.MarshallerExclusions;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.jetbrains.annotations.Nullable;
-import sun.misc.Unsafe;
import static java.lang.reflect.Modifier.isStatic;
import static java.lang.reflect.Modifier.isTransient;
@@ -65,7 +62,7 @@ public class BinaryClassDescriptor {
/** */
private final Class<?> cls;
- /** */
+ /** Configured serializer. */
private final BinarySerializer serializer;
/** ID mapper. */
@@ -127,7 +124,6 @@ public class BinaryClassDescriptor {
* @param serializer Serializer.
* @param metaDataEnabled Metadata enabled flag.
* @param registered Whether typeId has been successfully registered by MarshallerContext or not.
- * @param predefined Whether the class is predefined or not.
* @throws BinaryObjectException In case of error.
*/
BinaryClassDescriptor(
@@ -140,13 +136,19 @@ public class BinaryClassDescriptor {
@Nullable BinaryIdMapper idMapper,
@Nullable BinarySerializer serializer,
boolean metaDataEnabled,
- boolean registered,
- boolean predefined
+ boolean registered
) throws BinaryObjectException {
assert ctx != null;
assert cls != null;
assert idMapper != null;
+ // If serializer is not defined at this point, then we have to user OptimizedMarshaller.
+ useOptMarshaller = serializer == null;
+
+ // Reset reflective serializer so that we rely on existing reflection-based serialization.
+ if (serializer instanceof BinaryReflectiveSerializer)
+ serializer = null;
+
this.ctx = ctx;
this.cls = cls;
this.typeId = typeId;
@@ -161,10 +163,10 @@ public class BinaryClassDescriptor {
excluded = MarshallerExclusions.isExcluded(cls);
- useOptMarshaller = !predefined && initUseOptimizedMarshallerFlag();
-
if (excluded)
mode = BinaryWriteMode.EXCLUSION;
+ else if (useOptMarshaller)
+ mode = BinaryWriteMode.OBJECT; // Will not be used anywhere.
else {
if (cls == BinaryEnumObjectImpl.class)
mode = BinaryWriteMode.BINARY_ENUM;
@@ -172,6 +174,14 @@ public class BinaryClassDescriptor {
mode = serializer != null ? BinaryWriteMode.BINARY : BinaryUtils.mode(cls);
}
+ if (useOptMarshaller && userType) {
+ U.quietAndWarn(ctx.log(), "Class \"" + cls.getName() + "\" cannot be written in binary format because " +
+ "it either implements Externalizable interface or have writeObject/readObject methods. Please " +
+ "ensure that all nodes have this class in classpath. To enable binary serialization either " +
+ "implement " + Binarylizable.class.getSimpleName() + " interface or set explicit serializer using " +
+ "BinaryTypeConfiguration.setSerializer() method.");
+ }
+
switch (mode) {
case P_BYTE:
case P_BOOLEAN:
@@ -224,7 +234,6 @@ public class BinaryClassDescriptor {
break;
case BINARY:
- case EXTERNALIZABLE:
ctor = constructor(cls);
fields = null;
stableFieldsMeta = null;
@@ -267,8 +276,11 @@ public class BinaryClassDescriptor {
schemaBuilder.addField(fieldId);
- if (metaDataEnabled)
+ if (metaDataEnabled) {
+ assert stableFieldsMeta != null;
+
stableFieldsMeta.put(name, fieldInfo.mode().typeId());
+ }
}
}
}
@@ -284,8 +296,7 @@ public class BinaryClassDescriptor {
throw new BinaryObjectException("Invalid mode: " + mode);
}
- if (mode == BinaryWriteMode.BINARY || mode == BinaryWriteMode.EXTERNALIZABLE ||
- mode == BinaryWriteMode.OBJECT) {
+ if (mode == BinaryWriteMode.BINARY || mode == BinaryWriteMode.OBJECT) {
readResolveMtd = U.findNonPublicMethod(cls, "readResolve");
writeReplaceMtd = U.findNonPublicMethod(cls, "writeReplace");
}
@@ -608,25 +619,6 @@ public class BinaryClassDescriptor {
break;
- case EXTERNALIZABLE:
- if (preWrite(writer, obj)) {
- writer.rawWriter();
-
- try {
- ((Externalizable)obj).writeExternal(writer);
-
- postWrite(writer, obj);
- }
- catch (IOException e) {
- throw new BinaryObjectException("Failed to write Externalizable object: " + obj, e);
- }
- finally {
- writer.popSchema();
- }
- }
-
- break;
-
case OBJECT:
if (preWrite(writer, obj)) {
try {
@@ -672,21 +664,6 @@ public class BinaryClassDescriptor {
break;
- case EXTERNALIZABLE:
- res = newInstance();
-
- reader.setHandle(res);
-
- try {
- ((Externalizable)res).readExternal(reader);
- }
- catch (IOException | ClassNotFoundException e) {
- throw new BinaryObjectException("Failed to read Externalizable object: " +
- res.getClass().getName(), e);
- }
-
- break;
-
case OBJECT:
res = newInstance();
@@ -785,29 +762,4 @@ public class BinaryClassDescriptor {
throw new BinaryObjectException("Failed to get constructor for class: " + cls.getName(), e);
}
}
-
- /**
- * Determines whether to use {@link OptimizedMarshaller} for serialization or
- * not.
- *
- * @return {@code true} if to use, {@code false} otherwise.
- */
- @SuppressWarnings("unchecked")
- private boolean initUseOptimizedMarshallerFlag() {
- for (Class c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
- try {
- Method writeObj = c.getDeclaredMethod("writeObject", ObjectOutputStream.class);
- Method readObj = c.getDeclaredMethod("readObject", ObjectInputStream.class);
-
- if (!Modifier.isStatic(writeObj.getModifiers()) && !Modifier.isStatic(readObj.getModifiers()) &&
- writeObj.getReturnType() == void.class && readObj.getReturnType() == void.class)
- return true;
- }
- catch (NoSuchMethodException ignored) {
- // No-op.
- }
- }
-
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 7f9bacf..abe283e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -18,18 +18,22 @@
package org.apache.ignite.internal.binary;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
import org.apache.ignite.binary.BinaryIdMapper;
import org.apache.ignite.binary.BinaryInvalidTypeException;
import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.BinaryReflectiveSerializer;
import org.apache.ignite.binary.BinarySerializer;
import org.apache.ignite.binary.BinaryType;
import org.apache.ignite.binary.BinaryTypeConfiguration;
import org.apache.ignite.cache.CacheKeyConfiguration;
+import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.affinity.AffinityKeyMapped;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey;
import org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey;
@@ -126,8 +130,11 @@ public class BinaryContext implements Externalizable {
/** */
private IgniteConfiguration igniteCfg;
+ /** Logger. */
+ private IgniteLogger log;
+
/** */
- private final OptimizedMarshaller optmMarsh = new OptimizedMarshaller();
+ private final OptimizedMarshaller optmMarsh = new OptimizedMarshaller(false);
/** Compact footer flag. */
private boolean compactFooter;
@@ -145,13 +152,15 @@ public class BinaryContext implements Externalizable {
/**
* @param metaHnd Meta data handler.
* @param igniteCfg Ignite configuration.
+ * @param log Logger.
*/
- public BinaryContext(BinaryMetadataHandler metaHnd, IgniteConfiguration igniteCfg) {
+ public BinaryContext(BinaryMetadataHandler metaHnd, IgniteConfiguration igniteCfg, IgniteLogger log) {
assert metaHnd != null;
assert igniteCfg != null;
this.metaHnd = metaHnd;
this.igniteCfg = igniteCfg;
+ this.log = log;
gridName = igniteCfg.getGridName();
@@ -194,22 +203,37 @@ public class BinaryContext implements Externalizable {
registerPredefinedType(Timestamp[].class, GridBinaryMarshaller.TIMESTAMP_ARR);
registerPredefinedType(Object[].class, GridBinaryMarshaller.OBJ_ARR);
+ // Special collections.
registerPredefinedType(ArrayList.class, 0);
registerPredefinedType(LinkedList.class, 0);
registerPredefinedType(HashSet.class, 0);
registerPredefinedType(LinkedHashSet.class, 0);
-
registerPredefinedType(HashMap.class, 0);
registerPredefinedType(LinkedHashMap.class, 0);
+ // Classes with overriden default serialization flag.
+ registerPredefinedType(AffinityKey.class, 0);
+
registerPredefinedType(GridMapEntry.class, 60);
registerPredefinedType(IgniteBiTuple.class, 61);
registerPredefinedType(T2.class, 62);
+ registerPredefinedType(BinaryObjectImpl.class, 0);
+ registerPredefinedType(BinaryObjectOffheapImpl.class, 0);
+ registerPredefinedType(BinaryMetadataKey.class, 0);
+ registerPredefinedType(BinaryMetadata.class, 0);
+
// IDs range [200..1000] is used by Ignite internal APIs.
}
/**
+ * @return Logger.
+ */
+ public IgniteLogger log() {
+ return log;
+ }
+
+ /**
* @return Marshaller.
*/
public BinaryMarshaller marshaller() {
@@ -217,6 +241,21 @@ public class BinaryContext implements Externalizable {
}
/**
+ * Check whether class must be deserialized anyway.
+ *
+ * @param cls Class.
+ * @return {@code True} if must be deserialized.
+ */
+ public boolean mustDeserialize(Class cls) {
+ BinaryClassDescriptor desc = descByCls.get(cls);
+
+ if (desc == null)
+ return marshCtx.isSystemType(cls.getName()) || serializerForClass(cls) == null;
+ else
+ return desc.useOptimizedMarshaller();
+ }
+
+ /**
* @return Ignite configuration.
*/
public IgniteConfiguration configuration(){
@@ -504,8 +543,7 @@ public class BinaryContext implements Externalizable {
BinaryInternalIdMapper.defaultInstance(),
null,
false,
- true, /* registered */
- false /* predefined */
+ true /* registered */
);
BinaryClassDescriptor old = descByCls.putIfAbsent(cls, desc);
@@ -541,6 +579,8 @@ public class BinaryContext implements Externalizable {
throw new BinaryObjectException("Failed to register class.", e);
}
+ BinarySerializer serializer = serializerForClass(cls);
+
String affFieldName = affinityFieldName(cls);
BinaryClassDescriptor desc = new BinaryClassDescriptor(this,
@@ -550,10 +590,9 @@ public class BinaryContext implements Externalizable {
typeName,
affFieldName,
idMapper,
- null,
+ serializer,
true,
- registered,
- false /* predefined */
+ registered
);
if (!deserialize) {
@@ -576,6 +615,30 @@ public class BinaryContext implements Externalizable {
}
/**
+ * Get serializer for class taking in count default one.
+ *
+ * @param cls Class.
+ * @return Serializer for class or {@code null} if none exists.
+ */
+ private @Nullable BinarySerializer serializerForClass(Class cls) {
+ BinarySerializer serializer = defaultSerializer();
+
+ if (serializer == null && canUseReflectiveSerializer(cls))
+ serializer = new BinaryReflectiveSerializer();
+
+ return serializer;
+ }
+
+ /**
+ * @return Default serializer.
+ */
+ private BinarySerializer defaultSerializer() {
+ BinaryConfiguration binCfg = igniteCfg.getBinaryConfiguration();
+
+ return binCfg != null ? binCfg.getSerializer() : null;
+ }
+
+ /**
* @param cls Collection class.
* @return Collection type ID.
*/
@@ -700,6 +763,9 @@ public class BinaryContext implements Externalizable {
public BinaryClassDescriptor registerPredefinedType(Class<?> cls, int id) {
String typeName = typeName(cls.getName());
+ if (id == 0)
+ id = BinaryInternalIdMapper.defaultInstance().typeId(typeName);
+
BinaryClassDescriptor desc = new BinaryClassDescriptor(
this,
cls,
@@ -708,10 +774,9 @@ public class BinaryContext implements Externalizable {
typeName,
null,
BinaryInternalIdMapper.defaultInstance(),
- null,
+ new BinaryReflectiveSerializer(),
false,
- true, /* registered */
- true /* predefined */
+ true /* registered */
);
predefinedTypeNames.put(typeName, id);
@@ -770,6 +835,14 @@ public class BinaryContext implements Externalizable {
Collection<BinarySchema> schemas = null;
if (cls != null) {
+ if (serializer == null) {
+ // At this point we must decide whether to rely on Java serialization mechanics or not.
+ // If no serializer is provided, we examine the class and if it doesn't contain non-trivial
+ // serialization logic we are safe to fallback to reflective binary serialization.
+ if (canUseReflectiveSerializer(cls))
+ serializer = new BinaryReflectiveSerializer();
+ }
+
BinaryClassDescriptor desc = new BinaryClassDescriptor(
this,
cls,
@@ -780,8 +853,7 @@ public class BinaryContext implements Externalizable {
idMapper,
serializer,
true,
- true, /* registered */
- false /* predefined */
+ true /* registered */
);
fieldsMeta = desc.fieldsMeta();
@@ -797,6 +869,16 @@ public class BinaryContext implements Externalizable {
}
/**
+ * Check whether reflective serializer can be used for class.
+ *
+ * @param cls Class.
+ * @return {@code True} if reflective serializer can be used.
+ */
+ private static boolean canUseReflectiveSerializer(Class cls) {
+ return BinaryUtils.isBinarylizable(cls) || !BinaryUtils.isCustomJavaSerialization(cls);
+ }
+
+ /**
* Create binary field.
*
* @param typeId Type ID.
@@ -1059,6 +1141,7 @@ public class BinaryContext implements Externalizable {
idMapper = other.idMapper;
serializer = other.serializer;
affKeyFieldName = other.affKeyFieldName;
+ isEnum = other.isEnum;
canOverride = other.canOverride;
}
else if (!other.canOverride)
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index 8050edd..2d69cbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -105,7 +105,6 @@ public abstract class BinaryFieldAccessor {
case OBJECT_ARR:
case BINARY_OBJ:
case BINARY:
- case EXTERNALIZABLE:
return new DefaultFinalClassAccessor(field, id, mode, false);
default:
@@ -624,7 +623,6 @@ public abstract class BinaryFieldAccessor {
break;
case BINARY:
- case EXTERNALIZABLE:
case OBJECT:
writer.writeObjectField(val);
@@ -825,7 +823,6 @@ public abstract class BinaryFieldAccessor {
break;
case BINARY:
- case EXTERNALIZABLE:
case OBJECT:
val = reader.readObject(id);
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 9e5260b..8cb4b38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -34,7 +34,11 @@ import org.jsr166.ConcurrentHashMap8;
import java.io.ByteArrayInputStream;
import java.io.Externalizable;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.Timestamp;
@@ -952,8 +956,6 @@ public class BinaryUtils {
return BinaryWriteMode.BINARY_OBJ;
else if (Binarylizable.class.isAssignableFrom(cls))
return BinaryWriteMode.BINARY;
- else if (Externalizable.class.isAssignableFrom(cls))
- return BinaryWriteMode.EXTERNALIZABLE;
else if (isSpecialCollection(cls))
return BinaryWriteMode.COL;
else if (isSpecialMap(cls))
@@ -1838,6 +1840,49 @@ public class BinaryUtils {
}
/**
+ * Check if class is binarylizable.
+ *
+ * @param cls Class.
+ * @return {@code True} if binarylizable.
+ */
+ public static boolean isBinarylizable(Class cls) {
+ for (Class c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
+ if (Binarylizable.class.isAssignableFrom(c))
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Determines whether class contains custom Java serialization logic.
+ *
+ * @param cls Class.
+ * @return {@code true} if custom Java serialization logic exists, {@code false} otherwise.
+ */
+ @SuppressWarnings("unchecked")
+ public static boolean isCustomJavaSerialization(Class cls) {
+ for (Class c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
+ if (Externalizable.class.isAssignableFrom(c))
+ return true;
+
+ try {
+ Method writeObj = c.getDeclaredMethod("writeObject", ObjectOutputStream.class);
+ Method readObj = c.getDeclaredMethod("readObject", ObjectInputStream.class);
+
+ if (!Modifier.isStatic(writeObj.getModifiers()) && !Modifier.isStatic(readObj.getModifiers()) &&
+ writeObj.getReturnType() == void.class && readObj.getReturnType() == void.class)
+ return true;
+ }
+ catch (NoSuchMethodException ignored) {
+ // No-op.
+ }
+ }
+
+ return false;
+ }
+
+ /**
* Enum type.
*/
private static class EnumType {
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
index 90127f4..30e0458 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
@@ -151,9 +151,6 @@ public enum BinaryWriteMode {
BINARY(GridBinaryMarshaller.BINARY_OBJ),
/** */
- EXTERNALIZABLE(GridBinaryMarshaller.OBJ),
-
- /** */
OBJECT(GridBinaryMarshaller.OBJ),
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java
index 1f2678b..32ab2a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java
@@ -27,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
/**
* Key for binary meta data.
*/
-class BinaryMetadataKey extends GridCacheUtilityKey<BinaryMetadataKey> implements Externalizable {
+public class BinaryMetadataKey extends GridCacheUtilityKey<BinaryMetadataKey> implements Externalizable {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index e77b85a..6aee7a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -206,7 +206,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm
BinaryMarshaller pMarh0 = (BinaryMarshaller)marsh;
- binaryCtx = new BinaryContext(metaHnd, ctx.config());
+ binaryCtx = new BinaryContext(metaHnd, ctx.config(), ctx.log(BinaryContext.class));
IgniteUtils.invoke(BinaryMarshaller.class, pMarh0, "setBinaryContext", binaryCtx,
ctx.config());
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index 4ac3536..c068d59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@ -36,6 +36,7 @@ import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStrea
import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration;
import org.apache.ignite.internal.binary.BinaryMarshaller;
@@ -241,7 +242,8 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur
@SuppressWarnings("deprecation")
private static GridBinaryMarshaller marshaller() {
try {
- BinaryContext ctx = new BinaryContext(BinaryNoopMetadataHandler.instance(), new IgniteConfiguration());
+ BinaryContext ctx =
+ new BinaryContext(BinaryNoopMetadataHandler.instance(), new IgniteConfiguration(), new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 0412b4c..28b854c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -17,35 +17,13 @@
package org.apache.ignite.internal.processors.query;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
-import javax.cache.Cache;
-import javax.cache.CacheException;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.binary.BinaryField;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryType;
+import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.cache.CacheTypeMetadata;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
@@ -55,15 +33,16 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.events.CacheQueryExecutedEvent;
-import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.GridProcessorAdapter;
import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.CacheObjectContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
+import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
import org.apache.ignite.internal.processors.cache.query.CacheQueryType;
import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
@@ -87,6 +66,31 @@ import org.apache.ignite.spi.indexing.IndexingQueryFilter;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+
import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED;
import static org.apache.ignite.internal.IgniteComponentType.INDEXING;
import static org.apache.ignite.internal.processors.query.GridQueryIndexType.FULLTEXT;
@@ -193,6 +197,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
idx.registerCache(ccfg);
try {
+ List<Class<?>> mustDeserializeClss = null;
+
+ boolean binaryEnabled = ctx.cacheObjects().isBinaryEnabled(ccfg);
+
+ CacheObjectContext coCtx = binaryEnabled ? ctx.cacheObjects().contextForCache(ccfg) : null;
+
if (!F.isEmpty(ccfg.getQueryEntities())) {
for (QueryEntity qryEntity : ccfg.getQueryEntities()) {
if (F.isEmpty(qryEntity.getValueType()))
@@ -202,14 +212,23 @@ public class GridQueryProcessor extends GridProcessorAdapter {
// Key and value classes still can be available if they are primitive or JDK part.
// We need that to set correct types for _key and _val columns.
- Class<?> keyCls = U.classForName(qryEntity.getKeyType(), Object.class);
+ Class<?> keyCls = U.classForName(qryEntity.getKeyType(), null);
Class<?> valCls = U.classForName(qryEntity.getValueType(), null);
+ // If local node has the classes and they are externalizable, we must use reflection properties.
+ boolean keyMustDeserialize = mustDeserializeBinary(keyCls);
+ boolean valMustDeserialize = mustDeserializeBinary(valCls);
+
+ boolean keyOrValMustDeserialize = keyMustDeserialize || valMustDeserialize;
+
+ if (keyCls == null)
+ keyCls = Object.class;
+
String simpleValType = valCls == null ? typeName(qryEntity.getValueType()) : typeName(valCls);
desc.name(simpleValType);
- if (ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+ if (binaryEnabled && !keyOrValMustDeserialize) {
// Safe to check null.
if (SQL_TYPES.contains(valCls))
desc.valueClass(valCls);
@@ -234,10 +253,21 @@ public class GridQueryProcessor extends GridProcessorAdapter {
desc.keyClass(keyCls);
}
+ if (binaryEnabled && keyOrValMustDeserialize) {
+ if (mustDeserializeClss == null)
+ mustDeserializeClss = new ArrayList<>();
+
+ if (keyMustDeserialize)
+ mustDeserializeClss.add(keyCls);
+
+ if (valMustDeserialize)
+ mustDeserializeClss.add(valCls);
+ }
+
TypeId typeId;
TypeId altTypeId = null;
- if (valCls == null || ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+ if (valCls == null || (binaryEnabled && !keyOrValMustDeserialize)) {
processBinaryMeta(qryEntity, desc);
typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(qryEntity.getValueType()));
@@ -246,7 +276,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
altTypeId = new TypeId(ccfg.getName(), valCls);
}
else {
- processClassMeta(qryEntity, desc);
+ processClassMeta(qryEntity, desc, coCtx);
typeId = new TypeId(ccfg.getName(), valCls);
altTypeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(qryEntity.getValueType()));
@@ -276,12 +306,21 @@ public class GridQueryProcessor extends GridProcessorAdapter {
// Key and value classes still can be available if they are primitive or JDK part.
// We need that to set correct types for _key and _val columns.
- Class<?> keyCls = U.classForName(meta.getKeyType(), Object.class);
+ Class<?> keyCls = U.classForName(meta.getKeyType(), null);
Class<?> valCls = U.classForName(meta.getValueType(), null);
+ // If local node has the classes and they are externalizable, we must use reflection properties.
+ boolean keyMustDeserialize = mustDeserializeBinary(keyCls);
+ boolean valMustDeserialize = mustDeserializeBinary(valCls);
+
+ boolean keyOrValMustDeserialize = keyMustDeserialize || valMustDeserialize;
+
+ if (keyCls == null)
+ keyCls = Object.class;
+
desc.name(meta.getSimpleValueType());
- if (ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+ if (binaryEnabled && !keyOrValMustDeserialize) {
// Safe to check null.
if (SQL_TYPES.contains(valCls))
desc.valueClass(valCls);
@@ -298,10 +337,21 @@ public class GridQueryProcessor extends GridProcessorAdapter {
desc.keyClass(keyCls);
}
+ if (binaryEnabled && keyOrValMustDeserialize) {
+ if (mustDeserializeClss == null)
+ mustDeserializeClss = new ArrayList<>();
+
+ if (keyMustDeserialize)
+ mustDeserializeClss.add(keyCls);
+
+ if (valMustDeserialize)
+ mustDeserializeClss.add(valCls);
+ }
+
TypeId typeId;
TypeId altTypeId = null;
- if (valCls == null || ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+ if (valCls == null || (binaryEnabled && !keyOrValMustDeserialize)) {
processBinaryMeta(meta, desc);
typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(meta.getValueType()));
@@ -310,7 +360,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
altTypeId = new TypeId(ccfg.getName(), valCls);
}
else {
- processClassMeta(meta, desc);
+ processClassMeta(meta, desc, coCtx);
typeId = new TypeId(ccfg.getName(), valCls);
altTypeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(meta.getValueType()));
@@ -327,6 +377,15 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
// Indexed types must be translated to CacheTypeMetadata in CacheConfiguration.
+
+ if (mustDeserializeClss != null) {
+ U.quietAndWarn(log, "Some classes in query configuration cannot be written in binary format " +
+ "because they either implement Externalizable interface or have writeObject/readObject methods. " +
+ "Instances of these classes will be deserialized in order to build indexes. Please ensure that " +
+ "all nodes have these classes in classpath. To enable binary serialization either implement " +
+ Binarylizable.class.getSimpleName() + " interface or set explicit serializer using " +
+ "BinaryTypeConfiguration.setSerializer() method: " + mustDeserializeClss);
+ }
}
catch (IgniteCheckedException | RuntimeException e) {
idx.unregisterCache(ccfg);
@@ -336,6 +395,22 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
+ * Check whether type still must be deserialized when binary marshaller is set.
+ *
+ * @param cls Class.
+ * @return {@code True} if will be deserialized.
+ */
+ private boolean mustDeserializeBinary(Class cls) {
+ if (cls != null && ctx.config().getMarshaller() instanceof BinaryMarshaller) {
+ CacheObjectBinaryProcessorImpl proc0 = (CacheObjectBinaryProcessorImpl)ctx.cacheObjects();
+
+ return proc0.binaryContext().mustDeserialize(cls);
+ }
+ else
+ return false;
+ }
+
+ /**
* @param ccfg Cache configuration.
* @param desc Type descriptor.
* @throws IgniteCheckedException If failed.
@@ -1185,9 +1260,10 @@ public class GridQueryProcessor extends GridProcessorAdapter {
*
* @param meta Type metadata.
* @param d Type descriptor.
+ * @param coCtx Cache object context.
* @throws IgniteCheckedException If failed.
*/
- private void processClassMeta(CacheTypeMetadata meta, TypeDescriptor d)
+ private void processClassMeta(CacheTypeMetadata meta, TypeDescriptor d, CacheObjectContext coCtx)
throws IgniteCheckedException {
Map<String,String> aliases = meta.getAliases();
@@ -1201,13 +1277,13 @@ public class GridQueryProcessor extends GridProcessorAdapter {
assert valCls != null;
for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet())
- addToIndex(d, keyCls, valCls, entry.getKey(), entry.getValue(), 0, IndexType.ASC, null, aliases);
+ addToIndex(d, keyCls, valCls, entry.getKey(), entry.getValue(), 0, IndexType.ASC, null, aliases, coCtx);
for (Map.Entry<String, Class<?>> entry : meta.getDescendingFields().entrySet())
- addToIndex(d, keyCls, valCls, entry.getKey(), entry.getValue(), 0, IndexType.DESC, null, aliases);
+ addToIndex(d, keyCls, valCls, entry.getKey(), entry.getValue(), 0, IndexType.DESC, null, aliases, coCtx);
for (String txtField : meta.getTextFields())
- addToIndex(d, keyCls, valCls, txtField, String.class, 0, IndexType.TEXT, null, aliases);
+ addToIndex(d, keyCls, valCls, txtField, String.class, 0, IndexType.TEXT, null, aliases, coCtx);
Map<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>> grps = meta.getGroups();
@@ -1226,7 +1302,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
descending = false;
addToIndex(d, keyCls, valCls, idxField.getKey(), idxField.getValue().get1(), order,
- descending ? IndexType.DESC : IndexType.ASC, idxName, aliases);
+ descending ? IndexType.DESC : IndexType.ASC, idxName, aliases, coCtx);
order++;
}
@@ -1239,7 +1315,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
valCls,
entry.getKey(),
entry.getValue(),
- aliases);
+ aliases,
+ coCtx);
d.addProperty(prop, false);
}
@@ -1266,7 +1343,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
int idxOrder,
IndexType idxType,
String idxName,
- Map<String,String> aliases
+ Map<String,String> aliases,
+ CacheObjectContext coCtx
) throws IgniteCheckedException {
String propName;
Class<?> propCls;
@@ -1281,7 +1359,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
valCls,
pathStr,
resType,
- aliases);
+ aliases,
+ coCtx);
d.addProperty(prop, false);
@@ -1410,7 +1489,11 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param d Type descriptor.
* @throws IgniteCheckedException If failed.
*/
- private void processClassMeta(QueryEntity qryEntity, TypeDescriptor d) throws IgniteCheckedException {
+ private void processClassMeta(
+ QueryEntity qryEntity,
+ TypeDescriptor d,
+ CacheObjectContext coCtx
+ ) throws IgniteCheckedException {
Map<String,String> aliases = qryEntity.getAliases();
if (aliases == null)
@@ -1422,7 +1505,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
d.valueClass(),
entry.getKey(),
U.classForName(entry.getValue(), Object.class),
- aliases);
+ aliases,
+ coCtx);
d.addProperty(prop, false);
@@ -1524,16 +1608,17 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If failed.
*/
private static ClassProperty buildClassProperty(Class<?> keyCls, Class<?> valCls, String pathStr, Class<?> resType,
- Map<String,String> aliases) throws IgniteCheckedException {
+ Map<String,String> aliases, CacheObjectContext coCtx) throws IgniteCheckedException {
ClassProperty res = buildClassProperty(
true,
keyCls,
pathStr,
resType,
- aliases);
+ aliases,
+ coCtx);
if (res == null) // We check key before value consistently with BinaryProperty.
- res = buildClassProperty(false, valCls, pathStr, resType, aliases);
+ res = buildClassProperty(false, valCls, pathStr, resType, aliases, coCtx);
if (res == null)
throw new IgniteCheckedException("Failed to initialize property '" + pathStr + "' for " +
@@ -1552,7 +1637,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @return Property instance corresponding to the given path.
*/
static ClassProperty buildClassProperty(boolean key, Class<?> cls, String pathStr, Class<?> resType,
- Map<String,String> aliases) {
+ Map<String,String> aliases, CacheObjectContext coCtx) {
String[] path = pathStr.split("\\.");
ClassProperty res = null;
@@ -1576,7 +1661,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
ClassProperty tmp = null;
try {
- tmp = new ClassProperty(cls.getMethod(bld.toString()), key, alias);
+ tmp = new ClassProperty(cls.getMethod(bld.toString()), key, alias, coCtx);
}
catch (NoSuchMethodException ignore) {
// No-op.
@@ -1584,7 +1669,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (tmp == null) {
try {
- tmp = new ClassProperty(cls.getDeclaredField(prop), key, alias);
+ tmp = new ClassProperty(cls.getDeclaredField(prop), key, alias, coCtx);
}
catch (NoSuchFieldException ignored) {
// No-op.
@@ -1593,7 +1678,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (tmp == null) {
try {
- tmp = new ClassProperty(cls.getMethod(prop), key, alias);
+ tmp = new ClassProperty(cls.getMethod(prop), key, alias, coCtx);
}
catch (NoSuchMethodException ignored) {
// No-op.
@@ -1733,12 +1818,15 @@ public class GridQueryProcessor extends GridProcessorAdapter {
/** */
private boolean key;
+ /** */
+ private CacheObjectContext coCtx;
+
/**
* Constructor.
*
* @param member Element.
*/
- ClassProperty(Member member, boolean key, String name) {
+ ClassProperty(Member member, boolean key, String name, @Nullable CacheObjectContext coCtx) {
this.member = member;
this.key = key;
@@ -1749,11 +1837,13 @@ public class GridQueryProcessor extends GridProcessorAdapter {
((AccessibleObject) member).setAccessible(true);
field = member instanceof Field;
+
+ this.coCtx = coCtx;
}
/** {@inheritDoc} */
@Override public Object value(Object key, Object val) throws IgniteCheckedException {
- Object x = this.key ? key : val;
+ Object x = unwrap(this.key ? key : val);
if (parent != null)
x = parent.value(key, val);
@@ -1778,6 +1868,16 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
}
+ /**
+ * Unwraps cache object, if needed.
+ *
+ * @param o Object to unwrap.
+ * @return Unwrapped object.
+ */
+ private Object unwrap(Object o) {
+ return coCtx == null ? o : o instanceof CacheObject ? ((CacheObject)o).value(coCtx, false) : o;
+ }
+
/** {@inheritDoc} */
@Override public String name() {
return name;
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index 943c5aa..fd095e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -47,7 +48,8 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
* @throws Exception If failed.
*/
protected BinaryMarshaller createMarshaller() throws Exception {
- BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration());
+ BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
+ new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
index 0e3749c..265d283 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.binary.BinaryTypeConfiguration;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -46,7 +47,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration());
+ ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(), new NullLogger());
marsh = new BinaryMarshaller();
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index b83bbad..fcd511b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -76,6 +76,7 @@ import org.apache.ignite.internal.util.lang.GridMapEntry;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -435,23 +436,6 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testExternalizableHashCode() throws Exception {
- SimpleExternalizable sim1 = new SimpleExternalizable("Simple");
- SimpleExternalizable sim2 = new SimpleExternalizable("Simple");
-
- BinaryMarshaller marsh = binaryMarshaller();
-
- BinaryObjectImpl sim1Binary = marshal(sim1, marsh);
- BinaryObjectImpl sim2Binary = marshal(sim2, marsh);
-
- assertEquals(sim1.hashCode(), sim2.hashCode());
- assertEquals(sim1.hashCode(), sim1Binary.hashCode());
- assertEquals(sim2.hashCode(), sim2Binary.hashCode());
- }
-
- /**
- * @throws Exception If failed.
- */
public void testExternalizableInEnclosing() throws Exception {
SimpleEnclosingObject obj = new SimpleEnclosingObject();
obj.simpl = new SimpleExternalizable("field");
@@ -797,6 +781,13 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private String name;
/**
+ * {@link Externalizable} support.
+ */
+ public TestQueue() {
+ // No-op.
+ }
+
+ /**
* @param name Name.
*/
public TestQueue(String name) {
@@ -2690,7 +2681,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
iCfg.setBinaryConfiguration(bCfg);
- BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), iCfg);
+ BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), iCfg, new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
@@ -4067,6 +4058,13 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private String field;
/**
+ * {@link Externalizable} support.
+ */
+ public SimpleExternalizable() {
+ // No-op.
+ }
+
+ /**
* @param field Field.
*/
public SimpleExternalizable(String field) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
index e433ec0..2b0051e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.MarshallerContextAdapter;
import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import java.io.Externalizable;
@@ -46,7 +47,7 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
IgniteConfiguration cfg = new IgniteConfiguration();
- BinaryContext context = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg);
+ BinaryContext context = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg, new NullLogger());
IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", context, cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
index 2887afa..ae0cfa0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -451,7 +452,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
iCfg.setBinaryConfiguration(bCfg);
- BinaryContext ctx = new BinaryContext(BinaryNoopMetadataHandler.instance(), iCfg);
+ BinaryContext ctx = new BinaryContext(BinaryNoopMetadataHandler.instance(), iCfg, new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
index d29440e..6f73e0f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
@@ -21,6 +21,7 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import javax.cache.Cache;
@@ -414,7 +415,10 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
/**
*
*/
- public static class TestKey implements Externalizable {
+ public static class TestKey implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
/** */
private int key;
@@ -471,18 +475,6 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeInt(key);
- out.writeInt(field);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- key = in.readInt();
- field = in.readInt();
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return "TestKey [field=" + field + ", key=" + key + ']';
}
@@ -491,7 +483,10 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
/**
*
*/
- public static class TestValue implements Externalizable {
+ public static class TestValue implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
/** */
private int val;
@@ -541,16 +536,6 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
@Override public int hashCode() {
return val;
}
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeInt(val);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- val = in.readInt();
- }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
index d1f7826..c7a6a55 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.binary.BinaryNoopMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest;
import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.internal.binary.BinaryMarshaller;
@@ -39,7 +40,7 @@ public class GridBinaryCacheEntryMemorySizeSelfTest extends GridCacheEntryMemory
IgniteConfiguration iCfg = new IgniteConfiguration();
- BinaryContext pCtx = new BinaryContext(BinaryNoopMetadataHandler.instance(), iCfg);
+ BinaryContext pCtx = new BinaryContext(BinaryNoopMetadataHandler.instance(), iCfg, new NullLogger());
IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", pCtx, iCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
index 3038cba..a3df301 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.spi.checkpoint.cache.CacheCheckpointSpi;
@@ -96,7 +97,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract
cfg.setCheckpointSpi(spi);
if (cfg.getMarshaller() instanceof BinaryMarshaller) {
- BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg);
+ BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg, new NullLogger());
Marshaller marsh = cfg.getMarshaller();
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index 2367688..c49c730 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -55,6 +55,7 @@ import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.builder.BinaryObjectBuilderImpl;
import org.apache.ignite.internal.processors.cacheobject.NoOpBinary;
import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.plugin.IgnitePlugin;
import org.apache.ignite.plugin.PluginNotFoundException;
@@ -295,7 +296,7 @@ public class IgniteMock implements Ignite {
if (ctx == null) {
/** {@inheritDoc} */
- ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), configuration()) {
+ ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), configuration(), new NullLogger()) {
@Override public int typeId(String typeName) {
return typeName.hashCode();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 4e3f326..13d5fbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
@@ -264,7 +265,8 @@ public class IgniteTestResources {
marsh.setContext(new MarshallerContextTestImpl());
if (marsh instanceof BinaryMarshaller) {
- BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration());
+ BinaryContext ctx =
+ new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(), new NullLogger());
IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, new IgniteConfiguration());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
new file mode 100644
index 0000000..1eba7d1
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
@@ -0,0 +1,416 @@
+/*
+ * 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.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.BinaryReader;
+import org.apache.ignite.binary.BinaryReflectiveSerializer;
+import org.apache.ignite.binary.BinaryTypeConfiguration;
+import org.apache.ignite.binary.BinaryWriter;
+import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.configuration.BinaryConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import javax.cache.Cache;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Test for query with BinaryMarshaller and different serialization modes.
+ */
+public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest {
+ /** Ignite instance. */
+ private Ignite ignite;
+
+ /** Cache. */
+ private IgniteCache<Integer, Object> cache;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ IgniteConfiguration cfg = new IgniteConfiguration();
+
+ cfg.setLocalHost("127.0.0.1");
+
+ TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+ discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
+ cfg.setDiscoverySpi(discoSpi);
+
+ cfg.setMarshaller(new BinaryMarshaller());
+
+ if (useReflectiveSerializer()) {
+ BinaryTypeConfiguration binTypCfg1 = new BinaryTypeConfiguration(EntityPlain.class.getName());
+ BinaryTypeConfiguration binTypCfg2 = new BinaryTypeConfiguration(EntitySerializable.class.getName());
+ BinaryTypeConfiguration binTypCfg3 = new BinaryTypeConfiguration(EntityExternalizable.class.getName());
+ BinaryTypeConfiguration binTypCfg4 = new BinaryTypeConfiguration(EntityBinarylizable.class.getName());
+ BinaryTypeConfiguration binTypCfg5 = new BinaryTypeConfiguration(EntityWriteReadObject.class.getName());
+
+ binTypCfg1.setSerializer(new BinaryReflectiveSerializer());
+ binTypCfg2.setSerializer(new BinaryReflectiveSerializer());
+ binTypCfg3.setSerializer(new BinaryReflectiveSerializer());
+ binTypCfg4.setSerializer(new BinaryReflectiveSerializer());
+ binTypCfg5.setSerializer(new BinaryReflectiveSerializer());
+
+ List<BinaryTypeConfiguration> binTypCfgs = new ArrayList<>();
+
+ binTypCfgs.add(binTypCfg1);
+ binTypCfgs.add(binTypCfg2);
+ binTypCfgs.add(binTypCfg3);
+ binTypCfgs.add(binTypCfg4);
+ binTypCfgs.add(binTypCfg5);
+
+ BinaryConfiguration binCfg = new BinaryConfiguration();
+
+ binCfg.setTypeConfigurations(binTypCfgs);
+
+ cfg.setBinaryConfiguration(binCfg);
+ }
+
+ CacheConfiguration cacheCfg = new CacheConfiguration();
+
+ cacheCfg.setName(null);
+ cacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC);
+
+ List<CacheTypeMetadata> metas = new ArrayList<>();
+
+ metas.add(metaForClass(EntityPlain.class));
+ metas.add(metaForClass(EntitySerializable.class));
+ metas.add(metaForClass(EntityExternalizable.class));
+ metas.add(metaForClass(EntityBinarylizable.class));
+ metas.add(metaForClass(EntityWriteReadObject.class));
+
+ cacheCfg.setTypeMetadata(metas);
+
+ cfg.setCacheConfiguration(cacheCfg);
+
+ ignite = Ignition.start(cfg);
+
+ cache = ignite.cache(null);
+ }
+
+ /**
+ * Create type metadata for class.
+ *
+ * @param cls Class.
+ * @return Type metadata.
+ */
+ private static CacheTypeMetadata metaForClass(Class cls) {
+ CacheTypeMetadata meta = new CacheTypeMetadata();
+
+ meta.setKeyType(Integer.class);
+ meta.setValueType(cls);
+ meta.setAscendingFields(Collections.<String, Class<?>>singletonMap("val", Integer.class));
+
+ return meta;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ G.stopAll(true);
+
+ ignite = null;
+ cache = null;
+ }
+
+ /**
+ * Test plain type.
+ *
+ * @throws Exception If failed.
+ */
+ public void testPlain() throws Exception {
+ check(EntityPlain.class);
+ }
+
+ /**
+ * Test Serializable type.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSerializable() throws Exception {
+ check(EntitySerializable.class);
+ }
+
+ /**
+ * Test Externalizable type.
+ *
+ * @throws Exception If failed.
+ */
+ public void testExternalizable() throws Exception {
+ check(EntityExternalizable.class);
+ }
+
+ /**
+ * Test Binarylizable type.
+ *
+ * @throws Exception If failed.
+ */
+ public void testBinarylizable() throws Exception {
+ check(EntityBinarylizable.class);
+ }
+
+ /**
+ * Test type with readObject/writeObject methods.
+ *
+ * @throws Exception If failed.
+ */
+ public void testWriteReadObject() throws Exception {
+ check(EntityWriteReadObject.class);
+ }
+
+ /**
+ * Internal check routine.
+ *
+ * @param cls Entity class.
+ * @throws Exception If failed.
+ */
+ @SuppressWarnings("unchecked")
+ private void check(Class cls) throws Exception {
+ cache.put(1, createInstance(cls, 10));
+ cache.put(2, createInstance(cls, 20));
+ cache.put(3, createInstance(cls, 30));
+
+ Iterator iter = cache.query(new SqlQuery(cls, "val=20")).iterator();
+
+ assert iter.hasNext();
+
+ Cache.Entry res = (Cache.Entry)iter.next();
+
+ assertEquals(2, res.getKey());
+ assertEquals(20, U.field(res.getValue(), "val"));
+
+ assert !iter.hasNext();
+
+ iter = cache.query(
+ new SqlFieldsQuery("SELECT p.val FROM " + cls.getSimpleName() + " p WHERE p.val=20")).iterator();
+
+ assert iter.hasNext();
+
+ List<Object> fieldsRes = (List<Object>)iter.next();
+
+ assertEquals(20, fieldsRes.get(0));
+
+ assert !iter.hasNext();
+ }
+
+ /**
+ * Create object instance.
+ *
+ * @param cls Class.
+ * @param val Value.
+ * @return Instance.
+ */
+ private static Object createInstance(Class cls, int val) {
+ if (cls.equals(EntityPlain.class))
+ return new EntityPlain(val);
+ else if (cls.equals(EntitySerializable.class))
+ return new EntitySerializable(val);
+ else if (cls.equals(EntityExternalizable.class))
+ return new EntityExternalizable(val);
+ else if (cls.equals(EntityBinarylizable.class))
+ return new EntityBinarylizable(val);
+ else
+ return new EntityWriteReadObject(val);
+ }
+
+ /**
+ * @return Whether reflective serializer should be used.
+ */
+ protected boolean useReflectiveSerializer() {
+ return false;
+ }
+
+ /**
+ * Plain entry.
+ */
+ private static class EntityPlain {
+ /** Value. */
+ public int val;
+
+ /**
+ * Default constructor.
+ */
+ public EntityPlain() {
+ // No-op.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param val Value.
+ */
+ public EntityPlain(int val) {
+ this.val = val;
+ }
+ }
+
+ /**
+ * Serializable entity.
+ */
+ private static class EntitySerializable implements Serializable {
+ /** Value. */
+ public int val;
+
+ /**
+ * Default constructor.
+ */
+ public EntitySerializable() {
+ // No-op.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param val Value.
+ */
+ public EntitySerializable(int val) {
+ this.val = val;
+ }
+ }
+
+ /**
+ * Serializable entity.
+ */
+ private static class EntityExternalizable implements Externalizable {
+ /** Value. */
+ public int val;
+
+ /**
+ * Default constructor.
+ */
+ public EntityExternalizable() {
+ // No-op.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param val Value.
+ */
+ public EntityExternalizable(int val) {
+ this.val = val;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeInt(val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ val = in.readInt();
+ }
+ }
+
+ /**
+ * Serializable entity.
+ */
+ private static class EntityBinarylizable implements Binarylizable {
+ /** Value. */
+ public int val;
+
+ /**
+ * Default constructor.
+ */
+ public EntityBinarylizable() {
+ // No-op.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param val Value.
+ */
+ public EntityBinarylizable(int val) {
+ this.val = val;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
+ writer.writeInt("val", val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
+ val = reader.readInt("val");
+ }
+ }
+
+ /**
+ * Serializable entity.
+ */
+ private static class EntityWriteReadObject implements Serializable {
+ /** Value. */
+ public int val;
+
+ /**
+ * Default constructor.
+ */
+ public EntityWriteReadObject() {
+ // No-op.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param val Value.
+ */
+ public EntityWriteReadObject(int val) {
+ this.val = val;
+ }
+
+ /** {@inheritDoc} */
+ private void writeObject(ObjectOutputStream s) throws IOException{
+ s.writeInt(val);
+ }
+
+ /** {@inheritDoc} */
+ private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException {
+ val = s.readInt();
+ }
+ }
+}
[49/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' into
ignite-gg-10837
Posted by nt...@apache.org.
Merge branch 'ignite-1.5' into ignite-gg-10837
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/22045428
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/22045428
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/22045428
Branch: refs/heads/ignite-gg-10837
Commit: 220454282292215df2123f9603c43ed0398e3a4d
Parents: 8804357 1039bf6
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Dec 22 13:23:29 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Dec 22 13:23:29 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 1 +
bin/ignitevisorcmd.bat | 1 +
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
.../hibernate/CacheHibernateStoreExample.java | 8 +
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 7 +-
...ComputeClientBinaryTaskExecutionExample.java | 4 +-
.../CacheClientBinaryPutGetExample.java | 6 +-
.../datagrid/CacheClientBinaryQueryExample.java | 10 +-
.../store/auto/CacheBinaryAutoStoreExample.java | 9 +-
.../datagrid/CacheEntryProcessorExample.java | 157 ++
.../examples/datagrid/CacheQueryExample.java | 15 +-
.../store/dummy/CacheDummyPersonStore.java | 113 --
.../store/dummy/CacheDummyStoreExample.java | 133 --
.../datagrid/store/dummy/package-info.java | 22 -
.../store/jdbc/CacheJdbcPersonStore.java | 43 +-
.../store/jdbc/CacheJdbcStoreExample.java | 24 +-
.../store/spring/CacheSpringPersonStore.java | 29 +-
.../store/spring/CacheSpringStoreExample.java | 12 +-
.../datagrid/store/spring/package-info.java | 2 +-
.../apache/ignite/examples/model/Address.java | 72 +
.../apache/ignite/examples/model/Employee.java | 93 +
.../ignite/examples/model/EmployeeKey.java | 93 +
.../ignite/examples/model/Organization.java | 85 +-
.../ignite/examples/model/OrganizationType.java | 32 +
.../apache/ignite/examples/model/Person.java | 2 +-
.../ignite/examples/model/binary/Address.java | 72 -
.../ignite/examples/model/binary/Employee.java | 93 -
.../examples/model/binary/EmployeeKey.java | 93 -
.../examples/model/binary/Organization.java | 93 -
.../examples/model/binary/OrganizationType.java | 32 -
.../ignite/examples/model/package-info.java | 23 +
.../streaming/StreamVisitorExample.java | 40 +-
.../datagrid/CacheEntryProcessorExample.java | 147 ++
.../ScalarCacheEntryProcessorExample.scala | 125 ++
.../examples/ScalarSnowflakeSchemaExample.scala | 31 +-
.../ignite/examples/CacheExamplesSelfTest.java | 18 +-
.../java8/examples/CacheExamplesSelfTest.java | 8 +
.../tests/examples/ScalarExamplesSelfTest.scala | 5 +
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 4 +-
.../ClientAbstractConnectivitySelfTest.java | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 7 +-
.../src/main/java/org/apache/ignite/Ignite.java | 19 +
.../java/org/apache/ignite/IgniteCache.java | 8 +-
.../org/apache/ignite/binary/BinaryObject.java | 15 +
.../binary/BinaryReflectiveSerializer.java | 33 +
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../org/apache/ignite/cache/CacheManager.java | 4 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../configuration/CacheConfiguration.java | 63 +-
.../apache/ignite/internal/IgniteKernal.java | 38 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +-
.../internal/binary/BinaryClassDescriptor.java | 181 +-
.../ignite/internal/binary/BinaryContext.java | 123 +-
.../internal/binary/BinaryEnumObjectImpl.java | 7 +
.../internal/binary/BinaryFieldAccessor.java | 3 -
.../internal/binary/BinaryObjectExImpl.java | 7 +
.../internal/binary/BinaryObjectImpl.java | 20 +-
.../binary/BinaryObjectOffheapImpl.java | 7 +
.../ignite/internal/binary/BinaryUtils.java | 60 +-
.../ignite/internal/binary/BinaryWriteMode.java | 4 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../discovery/GridDiscoveryManager.java | 4 +-
.../processors/cache/CacheEntryImpl.java | 6 +-
.../processors/cache/CacheEntryImplEx.java | 17 +-
.../processors/cache/CacheObjectAdapter.java | 3 +
.../processors/cache/GridCacheProcessor.java | 12 +-
.../cache/GridCacheSharedContext.java | 20 +
.../processors/cache/GridCacheUtils.java | 18 +-
.../processors/cache/IgniteCacheProxy.java | 8 +-
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../CacheDataStructuresManager.java | 5 +-
.../dht/CacheDistributedGetFutureAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 7 +-
.../dht/GridPartitionedGetFuture.java | 15 +-
.../dht/GridPartitionedSingleGetFuture.java | 15 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 46 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 25 +
.../colocated/GridDhtColocatedLockFuture.java | 2 +-
.../dht/preloader/GridDhtPreloader.java | 31 +-
.../distributed/near/GridNearAtomicCache.java | 3 +
.../distributed/near/GridNearGetFuture.java | 17 +-
.../distributed/near/GridNearLockFuture.java | 30 +-
...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +-
.../cache/query/GridCacheQueryManager.java | 8 +-
.../cache/query/GridCacheQueryRequest.java | 12 +-
.../cache/store/CacheOsStoreManager.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 23 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../datastreamer/DataStreamerUpdateJob.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java | 214 ++-
.../service/GridServiceProcessor.java | 30 +-
.../processors/task/GridTaskWorker.java | 8 +-
.../ignite/internal/util/IgniteUtils.java | 6 +-
.../internal/util/lang/GridNodePredicate.java | 13 +-
.../ignite/internal/util/nio/GridNioServer.java | 11 +-
.../util/nio/GridSelectorNioSessionImpl.java | 7 +
.../cache/VisorCacheQueryConfiguration.java | 11 +
.../cache/VisorCacheStoreConfiguration.java | 13 +-
.../internal/visor/query/VisorQueryJob.java | 10 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 50 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +-
.../TcpDiscoveryMulticastIpFinder.java | 12 +-
.../core/src/main/resources/ignite.properties | 3 +-
.../ignite/internal/ClusterGroupSelfTest.java | 32 +-
.../IgniteClientReconnectCacheTest.java | 33 +-
.../ignite/internal/TaskNodeRestartTest.java | 230 +++
.../binary/BinaryFieldsAbstractSelfTest.java | 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 3 +-
.../binary/BinaryMarshallerSelfTest.java | 144 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../CacheSerializableTransactionsTest.java | 16 +
.../cache/CacheStopAndDestroySelfTest.java | 2 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 8 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 33 +-
...IgniteCacheAtomicPutAllFailoverSelfTest.java | 1 +
...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 +++
.../IgniteCacheBinaryObjectsScanSelfTest.java | 137 ++
.../cache/IgniteCacheNearLockValueSelfTest.java | 11 +-
.../cache/IgniteCachePutAllRestartTest.java | 2 +-
.../cache/IgniteCacheSerializationSelfTest.java | 112 ++
.../IgniteCacheStoreValueAbstractTest.java | 2 +-
.../IgniteStartCacheInTransactionSelfTest.java | 39 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../GridCacheBinaryStoreAbstractSelfTest.java | 2 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 8 +-
.../CacheGetInsideLockChangingTopologyTest.java | 477 +++++
.../IgniteCacheSizeFailoverTest.java | 4 +-
...gniteAtomicLongChangingTopologySelfTest.java | 8 +-
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 -
...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 -
.../near/NearCacheSyncUpdateTest.java | 167 ++
.../GridCacheRebalancingSyncSelfTest.java | 12 +-
.../random/RandomEvictionPolicySelfTest.java | 4 +-
.../BinaryTxCacheLocalEntriesSelfTest.java | 2 +-
.../GridServiceProcessorProxySelfTest.java | 3 +-
.../GridServiceProcessorStopSelfTest.java | 18 +-
.../ServicePredicateAccessCacheTest.java | 155 ++
.../IgniteMessagingWithClientTest.java | 2 -
.../GridSessionCheckpointAbstractSelfTest.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 30 +-
...CommunicationRecoveryAckClosureSelfTest.java | 39 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 18 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../IgniteCacheFailoverTestSuite3.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 2 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../IgniteSpiDiscoverySelfTestSuite.java | 6 +
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flume/pom.xml | 2 +-
modules/gce/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 | 118 +-
.../processors/query/h2/sql/GridSqlQuery.java | 3 +
.../query/h2/sql/GridSqlQuerySplitter.java | 113 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 ++++
...onQueryWithReflectiveSerializerSelfTest.java | 28 +
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 68 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 300 ++-
...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 ++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 10 +-
.../local/IgniteCacheLocalQuerySelfTest.java | 2 +-
.../query/IgniteSqlSchemaIndexingTest.java | 240 +++
.../query/IgniteSqlSplitterSelfTest.java | 55 +-
.../query/h2/sql/GridQueryParsingTest.java | 9 +-
.../IgniteBinaryCacheQueryTestSuite.java | 124 +-
.../IgniteCacheQuerySelfTestSuite.java | 2 +
modules/jcl/pom.xml | 2 +-
modules/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
modules/osgi-karaf/pom.xml | 2 +-
modules/osgi-paxlogging/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/platforms/cpp/common/configure.ac | 2 +-
.../common/include/ignite/common/concurrent.h | 2 +-
.../cpp/common/include/ignite/common/utils.h | 1 -
.../cpp/common/os/win/src/concurrent_os.cpp | 26 +-
modules/platforms/cpp/common/src/java.cpp | 20 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
.../platforms/cpp/core-test/src/cache_test.cpp | 4 +-
modules/platforms/cpp/core/configure.ac | 2 +-
.../cpp/core/include/ignite/binary/binary.h | 5 +
.../core/include/ignite/binary/binary_consts.h | 5 +
.../include/ignite/binary/binary_containers.h | 5 +
.../include/ignite/binary/binary_raw_reader.h | 5 +
.../include/ignite/binary/binary_raw_writer.h | 5 +
.../core/include/ignite/binary/binary_reader.h | 5 +
.../core/include/ignite/binary/binary_type.h | 21 +-
.../core/include/ignite/binary/binary_writer.h | 5 +
.../cpp/core/include/ignite/cache/cache.h | 17 +-
.../cpp/core/include/ignite/cache/cache_entry.h | 5 +
.../core/include/ignite/cache/cache_peek_mode.h | 5 +
.../cpp/core/include/ignite/cache/query/query.h | 5 +
.../include/ignite/cache/query/query_argument.h | 6 +
.../include/ignite/cache/query/query_cursor.h | 5 +
.../ignite/cache/query/query_fields_cursor.h | 5 +
.../ignite/cache/query/query_fields_row.h | 5 +
.../include/ignite/cache/query/query_scan.h | 33 +-
.../core/include/ignite/cache/query/query_sql.h | 5 +
.../ignite/cache/query/query_sql_fields.h | 5 +
.../include/ignite/cache/query/query_text.h | 43 +-
.../platforms/cpp/core/include/ignite/guid.h | 5 +
.../platforms/cpp/core/include/ignite/ignite.h | 5 +
.../core/include/ignite/ignite_configuration.h | 5 +
.../cpp/core/include/ignite/ignite_error.h | 5 +
.../cpp/core/include/ignite/ignition.h | 9 +-
.../core/include/ignite/impl/cache/cache_impl.h | 6 +-
.../cpp/core/include/ignite/impl/operations.h | 8 +-
modules/platforms/cpp/core/namespaces.dox | 53 +
modules/platforms/cpp/cpp.dxg | 4 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 5 +-
.../Properties/AssemblyInfo.cs | 5 +-
.../native-client-test-cache-parallel-store.xml | 2 +-
.../Config/native-client-test-cache-store.xml | 6 +-
.../Examples/ExamplesTest.cs | 4 +-
.../Properties/AssemblyInfo.cs | 5 +-
.../Services/ServicesTest.cs | 23 +-
.../Apache.Ignite.Core.csproj | 19 +
.../Binary/IBinaryRawReader.cs | 4 +-
.../Apache.Ignite.Core/Binary/IBinaryReader.cs | 25 +-
.../Apache.Ignite.Core/Binary/Package-Info.cs | 26 +
.../Cache/Event/Package-Info.cs | 26 +
.../Cache/Expiry/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Cache/Package-Info.cs | 26 +
.../Cache/Query/Continuous/Package-Info.cs | 26 +
.../Cache/Query/Package-Info.cs | 26 +
.../Cache/Store/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Cluster/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Common/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Compute/IComputeTask.cs | 11 +-
.../Apache.Ignite.Core/Compute/Package-Info.cs | 26 +
.../DataStructures/Package-Info.cs | 26 +
.../Datastream/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Events/Package-Info.cs | 26 +
.../Impl/Binary/BinaryReader.cs | 13 +-
.../Impl/Binary/BinaryUtils.cs | 4 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 -
.../Lifecycle/Package-Info.cs | 26 +
.../Messaging/Package-Info.cs | 26 +
.../dotnet/Apache.Ignite.Core/Package-Info.cs | 36 +
.../Properties/AssemblyInfo.cs | 5 +-
.../Apache.Ignite.Core/Resource/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Services/Package-Info.cs | 26 +
.../Transactions/Package-Info.cs | 26 +
modules/platforms/dotnet/Apache.Ignite.dxg | 4 +-
modules/platforms/dotnet/Apache.Ignite.sln | 1 +
.../Apache.Ignite/Properties/AssemblyInfo.cs | 5 +-
modules/platforms/dotnet/dotnet.dxg | 1795 ------------------
.../Apache.Ignite.Examples.csproj | 1 -
.../Datagrid/CrossPlatformExample.cs | 205 --
.../Messaging/MessagingExample.cs | 6 +-
.../Properties/AssemblyInfo.cs | 5 +-
.../Properties/AssemblyInfo.cs | 5 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 11 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
.../ignite/schema/generator/CodeGenerator.java | 7 +-
.../schema/test/AbstractSchemaImportTest.java | 18 +
.../org/apache/ignite/schema/test/model/Tst.txt | 506 +++++
.../apache/ignite/schema/test/model/TstKey.txt | 96 +
.../schema/test/model/ignite-type-metadata.xml | 180 ++
.../test/parser/DbMetadataParserTest.java | 17 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteSpring.java | 4 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../commands/cache/VisorCacheCommand.scala | 14 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
.../config/benchmark-multicast.properties | 2 +-
modules/yardstick/pom.xml | 2 +-
.../cache/IgnitePutGetBatchBenchmark.java | 15 +-
.../cache/IgnitePutGetTxBatchBenchmark.java | 15 +-
modules/yarn/pom.xml | 2 +-
modules/zookeeper/pom.xml | 2 +-
parent/pom.xml | 1 +
pom.xml | 44 +-
317 files changed, 7249 insertions(+), 3800 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
[20/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by nt...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24eccb87
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24eccb87
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24eccb87
Branch: refs/heads/ignite-gg-10837
Commit: 24eccb87f7657703390caefe00b06b5a6db08506
Parents: 7ff4759 1a2ebdd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 12:44:15 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 12:44:15 2015 +0300
----------------------------------------------------------------------
.../ClientAbstractConnectivitySelfTest.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../processors/task/GridTaskWorker.java | 8 +-
.../internal/util/lang/GridNodePredicate.java | 13 +-
.../ignite/internal/util/nio/GridNioServer.java | 11 +-
.../util/nio/GridSelectorNioSessionImpl.java | 7 +
.../TcpDiscoveryMulticastIpFinder.java | 12 +-
.../ignite/internal/ClusterGroupSelfTest.java | 32 ++-
.../IgniteClientReconnectCacheTest.java | 7 +-
.../ignite/internal/TaskNodeRestartTest.java | 230 +++++++++++++++++++
...IgniteCacheBinaryEntryProcessorSelfTest.java | 4 +-
.../IgniteCacheSizeFailoverTest.java | 4 +-
.../random/RandomEvictionPolicySelfTest.java | 4 +-
.../GridServiceProcessorStopSelfTest.java | 18 +-
.../IgniteMessagingWithClientTest.java | 2 -
.../GridSessionCheckpointAbstractSelfTest.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
19 files changed, 342 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
[42/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by nt...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a91996e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a91996e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a91996e
Branch: refs/heads/ignite-gg-10837
Commit: 6a91996e328ad29dde03b68622517360cb7a7ffb
Parents: 8c2b674 c5ed0d0
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 22 10:17:06 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 22 10:17:06 2015 +0300
----------------------------------------------------------------------
.../visor/cache/VisorCacheStoreConfiguration.java | 13 ++++++++++++-
.../visor/commands/cache/VisorCacheCommand.scala | 1 +
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[27/50] [abbrv] ignite git commit: Minor fix.
Posted by nt...@apache.org.
Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a34bcc8a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a34bcc8a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a34bcc8a
Branch: refs/heads/ignite-gg-10837
Commit: a34bcc8ac44c7db168e49a336596396389b00e1e
Parents: ece33ec
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 17:40:33 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 17:40:33 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/CacheObjectAdapter.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a34bcc8a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
index df20646..70f5ea6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
@@ -33,6 +33,9 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public abstract class CacheObjectAdapter implements CacheObject, Externalizable {
/** */
+ private static final long serialVersionUID = 2006765505127197251L;
+
+ /** */
@GridToStringInclude
@GridDirectTransient
protected Object val;
[14/50] [abbrv] ignite git commit: Fixed CacheEntry toString()
Posted by nt...@apache.org.
Fixed CacheEntry toString()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4b547bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4b547bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4b547bd
Branch: refs/heads/ignite-gg-10837
Commit: a4b547bd11ca3bf4a5cdfaac3ad01936cf6e995e
Parents: e1b2cf2
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Thu Dec 17 17:07:26 2015 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Thu Dec 17 17:07:26 2015 -0800
----------------------------------------------------------------------
.../internal/processors/cache/CacheEntryImpl.java | 6 +++---
.../processors/cache/CacheEntryImplEx.java | 17 ++++++++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index 71c684a..48649d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -81,10 +81,10 @@ public class CacheEntryImpl<K, V> implements Cache.Entry<K, V>, Externalizable {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public <T> T unwrap(Class<T> cls) {
- if(cls.isAssignableFrom(getClass()))
+ if (cls.isAssignableFrom(getClass()))
return cls.cast(this);
- if (ver != null && cls.isAssignableFrom(CacheEntry.class))
+ if (cls.isAssignableFrom(CacheEntry.class))
return (T)new CacheEntryImplEx<>(key, val, ver);
throw new IllegalArgumentException("Unwrapping to class is not supported: " + cls);
@@ -106,4 +106,4 @@ public class CacheEntryImpl<K, V> implements Cache.Entry<K, V>, Externalizable {
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index f3e6c18..1c7111a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -78,7 +78,18 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
/** {@inheritDoc} */
public String toString() {
- return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ", topVer=" + ver.topologyVersion() +
- ", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ", updateTime=" + ver.globalTime() + ']';
+ String res = "CacheEntry [key=" + getKey() +
+ ", val=" + getValue();
+
+ if (ver != null) {
+ res += ", topVer=" + ver.topologyVersion() +
+ ", nodeOrder=" + ver.nodeOrder() +
+ ", order=" + ver.order() +
+ ", updateTime=" + ver.globalTime();
+ }
+ else
+ res += ", ver=n/a";
+
+ return res + ']';
}
-}
\ No newline at end of file
+}
[02/50] [abbrv] ignite git commit: .NET MessagingExample: improved
docs.
Posted by nt...@apache.org.
.NET MessagingExample: improved docs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfa84c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfa84c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfa84c82
Branch: refs/heads/ignite-gg-10837
Commit: dfa84c821eaef8de1486c8074d959c5c3ae24ae7
Parents: 7f35bc6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Dec 17 12:51:27 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Dec 17 12:51:27 2015 +0300
----------------------------------------------------------------------
.../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfa84c82/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
index 3c74a42..3fafd8f 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
@@ -26,10 +26,10 @@ namespace Apache.Ignite.Examples.Messaging
/// <summary>
/// Example demonstrating Ignite messaging. Should be run with standalone Apache Ignite.NET node.
/// <para />
- /// 1) Run %IGNITE_HOME%/platforms/dotnet/Apache.Ignite/bin/${Platform]/${Configuration}/Apache.Ignite.exe:
+ /// 1) Build the project Apache.Ignite.ExamplesDll (select it -> right-click -> Build).
+ /// Apache.Ignite.ExamplesDll.dll must appear in %IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration} folder;
+ /// 2) Run %IGNITE_HOME%/platforms/dotnet/bin/Apache.Ignite.exe:
/// Apache.Ignite.exe -IgniteHome="%IGNITE_HOME%" -springConfigUrl=platforms\dotnet\examples\config\example-compute.xml -assembly=[path_to_Apache.Ignite.ExamplesDll.dll]
- /// 2) Build the project Apache.Ignite.ExamplesDll (select it -> right-click -> Build).
- /// Apache.Ignite.ExamplesDll.dll must appear in %IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration} folder.
/// 3) Set this class as startup object (Apache.Ignite.Examples project -> right-click -> Properties ->
/// Application -> Startup object);
/// 4) Start example (F5 or Ctrl+F5).
[10/50] [abbrv] ignite git commit: IGNITE-2100: Fixed serilaization
of Externalizable. Now queries work in all modes.
Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
new file mode 100644
index 0000000..b905646
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ * Test for query with BinaryMarshaller and different serialization modes and with reflective serializer.
+ */
+public class BinarySerializationQueryWithReflectiveSerializerSelfTest extends BinarySerializationQuerySelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean useReflectiveSerializer() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 64a1115..cae7f0c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery<TestKey, String>(String.class, "field like '" + key + "'")).getAll();
- assertTrue("p2p marshalling failed, but error response was not sent", binaryMarshaller());
+ fail("p2p marshalling failed, but error response was not sent");
}
catch (CacheException e) {
- assertFalse("Unexpected exception: " + e, binaryMarshaller());
+ // No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 786b5b8..6abc2d4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -18,31 +18,85 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest;
import org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest;
import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest;
import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest;
import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest;
import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest;
+import org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheCrossCacheQuerySelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexDisabledSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexingDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheQueryInternalKeysSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheQuerySerializationSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheReduceQueryMultithreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteBinaryObjectFieldsQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheCollocatedQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheDuplicateEntityConfigurationSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheFieldsQueryNoDataSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheLargeResultSelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheNoClassQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapEvictQueryTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapTieredMultithreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheP2pUnmarshallingQueryErrorTest;
import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheQueryIndexSelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheQueryLoadSelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest;
+import org.apache.ignite.internal.processors.cache.SqlFieldsQuerySelfTest;
import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryDuplicateIndexObjectPartitionedAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryDuplicateIndexObjectPartitionedTransactionalSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicFieldsQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicNearEnabledFieldsQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicNearEnabledQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedFieldsQueryP2PEnabledSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedFieldsQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedQueryP2PDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedSnapshotEnabledQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartSelfTest2;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedFieldsQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQueryP2PDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalAtomicQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalFieldsQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicReplicatedSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxReplicatedSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicNearEnabledSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicP2PDisabledSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryLocalAtomicSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryLocalSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedOnlySelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedP2PDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedOneNodeSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedP2PDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryTxSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientReconnectTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientTxReconnectTest;
+import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryAtomicSelfTest;
+import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryLocalSelfTest;
+import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryPartitionedSelfTest;
+import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryReplicatedSelfTest;
+import org.apache.ignite.internal.processors.query.IgniteSqlSplitterSelfTest;
import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest;
import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest;
import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest;
@@ -63,32 +117,90 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
TestSuite suite = new TestSuite("Grid Cache Query Test Suite using BinaryMarshaller");
- // Parsing
+ // Serialization.
+ suite.addTestSuite(BinarySerializationQuerySelfTest.class);
+ suite.addTestSuite(BinarySerializationQueryWithReflectiveSerializerSelfTest.class);
+
+ // Parsing.
suite.addTestSuite(GridQueryParsingTest.class);
+ // Config.
+ suite.addTestSuite(IgniteCacheDuplicateEntityConfigurationSelfTest.class);
+
// Queries tests.
+ suite.addTestSuite(IgniteSqlSplitterSelfTest.class);
suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class);
+ suite.addTestSuite(IgniteCacheQueryLoadSelfTest.class);
+ suite.addTestSuite(IgniteCacheLocalQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheLocalAtomicQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheReplicatedQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheReplicatedQueryP2PDisabledSelfTest.class);
+ suite.addTestSuite(IgniteCachePartitionedQuerySelfTest.class);
+ suite.addTestSuite(IgniteCachePartitionedSnapshotEnabledQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheAtomicQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledQuerySelfTest.class);
+ suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class);
suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class);
+ suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class);
+ suite.addTestSuite(IgniteCacheCollocatedQuerySelfTest.class);
suite.addTestSuite(IgniteCacheLargeResultSelfTest.class);
+ suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
+ suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest.class);
suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
-
+ suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
+ suite.addTestSuite(IgniteCacheOffheapEvictQueryTest.class);
+ suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class);
+ suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class);
+ suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest2.class);
+ suite.addTestSuite(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class);
suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
+ suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
+ suite.addTestSuite(GridCacheQuerySerializationSelfTest.class);
+ // Scan queries.
+ suite.addTestSuite(CacheScanPartitionQueryFallbackSelfTest.class);
// Fields queries.
+ suite.addTestSuite(SqlFieldsQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheLocalFieldsQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheReplicatedFieldsQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.class);
+ suite.addTestSuite(IgniteCachePartitionedFieldsQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheAtomicFieldsQuerySelfTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledFieldsQuerySelfTest.class);
+ suite.addTestSuite(IgniteCachePartitionedFieldsQueryP2PEnabledSelfTest.class);
suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class);
- suite.addTestSuite(IgniteBinaryObjectFieldsQuerySelfTest.class);
// Continuous queries.
+ suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class);
+ suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class);
+ suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class);
+ suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class);
+ suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class);
+ suite.addTestSuite(GridCacheContinuousQueryTxSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class);
+ suite.addTestSuite(GridCacheContinuousQueryReplicatedOneNodeSelfTest.class);
+ suite.addTestSuite(IgniteCacheContinuousQueryClientTest.class);
+ suite.addTestSuite(IgniteCacheContinuousQueryClientReconnectTest.class);
+ suite.addTestSuite(IgniteCacheContinuousQueryClientTxReconnectTest.class);
+ suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.class);
+ suite.addTestSuite(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class);
+ suite.addTestSuite(CacheContinuousQueryFailoverTxSelfTest.class);
+ suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedSelfTest.class);
+
+ // Reduce fields queries.
+ suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class);
+ suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class);
+ suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class);
+ suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class);
suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
@@ -110,6 +222,7 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
//Unmarshallig query test.
suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class);
+ suite.addTestSuite(IgniteCacheNoClassQuerySelfTest.class);
suite.addTestSuite(GridCacheBinaryDuplicateIndexObjectPartitionedAtomicSelfTest.class);
suite.addTestSuite(GridCacheBinaryDuplicateIndexObjectPartitionedTransactionalSelfTest.class);
[08/50] [abbrv] ignite git commit: fixed
https://issues.apache.org/jira/browse/IGNITE-2175
Posted by nt...@apache.org.
fixed https://issues.apache.org/jira/browse/IGNITE-2175
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3223b05c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3223b05c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3223b05c
Branch: refs/heads/ignite-gg-10837
Commit: 3223b05c082732ad77462f00cb09d24af2d768f7
Parents: c1e2926
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Dec 17 15:07:21 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Dec 17 15:07:21 2015 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheQueryExample.java | 11 +++---
.../streaming/StreamVisitorExample.java | 40 +++++++++++++++-----
2 files changed, 36 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 2d86cde..ace7395 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -22,6 +22,7 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.query.QueryCursor;
@@ -126,12 +127,12 @@ public class CacheQueryExample {
* Example for scan query based on a predicate.
*/
private static void scanQuery() {
- IgniteCache<AffinityKey<Long>, Person> cache = Ignition.ignite().cache(PERSON_CACHE);
+ IgniteCache<BinaryObject, BinaryObject> cache = Ignition.ignite().cache(PERSON_CACHE).withKeepBinary();
- ScanQuery<AffinityKey<Long>, Person> scan = new ScanQuery<>(
- new IgniteBiPredicate<AffinityKey<Long>, Person>() {
- @Override public boolean apply(AffinityKey<Long> key, Person person) {
- return person.salary <= 1000;
+ ScanQuery<BinaryObject, BinaryObject> scan = new ScanQuery<>(
+ new IgniteBiPredicate<BinaryObject, BinaryObject>() {
+ @Override public boolean apply(BinaryObject key, BinaryObject person) {
+ return person.<Double>field("salary") <= 1000;
}
}
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index f2e1e9f..819cfea 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -25,6 +25,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -75,21 +77,39 @@ public class StreamVisitorExample {
// Instead we update the instruments in the 'instCache'.
// Since both, 'instCache' and 'mktCache' use the same key, updates are collocated.
mktStmr.receiver(new StreamVisitor<String, Double>() {
- @Override
- public void apply(IgniteCache<String, Double> cache, Map.Entry<String, Double> e) {
+ @Override public void apply(IgniteCache<String, Double> cache, Map.Entry<String, Double> e) {
String symbol = e.getKey();
Double tick = e.getValue();
- Instrument inst = instCache.get(symbol);
+ IgniteCache<String, BinaryObject> binInstCache = ignite.cache("instCache").withKeepBinary();
- if (inst == null)
- inst = new Instrument(symbol);
+ BinaryObject inst = binInstCache.get(symbol);
- // Don't populate market cache, as we don't use it for querying.
- // Update cached instrument based on the latest market tick.
- inst.update(tick);
+ BinaryObjectBuilder instBuilder;
- instCache.put(symbol, inst);
+ if (inst == null) {
+ instBuilder = ignite.binary().builder("Instrument");
+
+ // Constructor logic.
+ instBuilder.setField(
+ "symbol",
+ symbol);
+ }
+ else
+ instBuilder = inst.toBuilder();
+
+ // Instrument.update() logic.
+ Double open = instBuilder.<Double>getField("open");
+
+ if (open == null || open == 0)
+ instBuilder.setField("open", tick);
+
+ instBuilder.setField("latest", tick);
+
+ // Build instrument object.
+ inst = instBuilder.build();
+
+ binInstCache.put(symbol, inst);
}
});
@@ -168,4 +188,4 @@ public class StreamVisitorExample {
this.latest = price;
}
}
-}
\ No newline at end of file
+}
[26/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by nt...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ece33ec4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ece33ec4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ece33ec4
Branch: refs/heads/ignite-gg-10837
Commit: ece33ec4fa7f8c0d53014bda02ab0b7c1a89eef2
Parents: 48a1e0a bda0b19
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 16:08:46 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 16:08:46 2015 +0300
----------------------------------------------------------------------
...ComputeClientBinaryTaskExecutionExample.java | 4 +-
.../CacheClientBinaryPutGetExample.java | 6 +-
.../datagrid/CacheClientBinaryQueryExample.java | 10 +--
.../examples/datagrid/CacheQueryExample.java | 4 +-
.../apache/ignite/examples/model/Address.java | 72 +++++++++++++++
.../apache/ignite/examples/model/Employee.java | 93 ++++++++++++++++++++
.../ignite/examples/model/EmployeeKey.java | 93 ++++++++++++++++++++
.../ignite/examples/model/Organization.java | 85 ++++++++++++++++--
.../ignite/examples/model/OrganizationType.java | 32 +++++++
.../apache/ignite/examples/model/Person.java | 2 +-
.../ignite/examples/model/binary/Address.java | 72 ---------------
.../ignite/examples/model/binary/Employee.java | 93 --------------------
.../examples/model/binary/EmployeeKey.java | 93 --------------------
.../examples/model/binary/Organization.java | 93 --------------------
.../examples/model/binary/OrganizationType.java | 32 -------
.../ignite/examples/model/package-info.java | 23 +++++
.../ignite/internal/binary/BinaryContext.java | 16 +++-
17 files changed, 417 insertions(+), 406 deletions(-)
----------------------------------------------------------------------
[39/50] [abbrv] ignite git commit: ignite-1.5 Minor javadocs.
Posted by nt...@apache.org.
ignite-1.5 Minor javadocs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8576b8f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8576b8f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8576b8f
Branch: refs/heads/ignite-gg-10837
Commit: d8576b8f9850b53c240bd21fab7fe19abd717225
Parents: da24df9
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 22 11:14:17 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 22 11:14:17 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/visor/query/VisorQueryJob.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8576b8f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index dcca671..0f2f82e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -216,8 +216,14 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten
* Wrapper for cache iterator to behave like {@link QueryCursor}.
*/
private static class VisorNearCacheCursor<T> implements QueryCursor<T> {
+ /** Wrapped iterator. */
private final Iterator<T> it;
+ /**
+ * Wrapping constructor.
+ *
+ * @param it Near cache iterator to wrap.
+ */
private VisorNearCacheCursor(Iterator<T> it) {
this.it = it;
}
[18/50] [abbrv] ignite git commit: IGNITE-2199: Java 8 compile error
fix (ambiguous reference to assertEquals) - Fixes #351.
Posted by nt...@apache.org.
IGNITE-2199: Java 8 compile error fix (ambiguous reference to assertEquals) - Fixes #351.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a2ebdd0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a2ebdd0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a2ebdd0
Branch: refs/heads/ignite-gg-10837
Commit: 1a2ebdd0bef4a3dd68551ccda09111c1646c76c6
Parents: b1f9065
Author: shtykh_roman <rs...@yahoo.com>
Authored: Fri Dec 18 12:27:40 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Dec 18 12:27:40 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheBinaryEntryProcessorSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2ebdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
index 8e20c3e..a6c2b44 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
@@ -162,11 +162,11 @@ public class IgniteCacheBinaryEntryProcessorSelfTest extends GridCommonAbstractT
assertEquals("updated-" + i, updated.stringValue());
BinaryObject updatedBinary = nodeBinaryCache.get(i);
- assertEquals(i + 1, updatedBinary.field("val"));
+ assertEquals(new Integer(i + 1), updatedBinary.field("val"));
assertEquals("updated-" + i, updatedBinary.field("strVal"));
updatedBinary = nodeBinaryCache.get(-(i + 1));
- assertEquals(i + 1, updatedBinary.field("val"));
+ assertEquals(new Integer(i + 1), updatedBinary.field("val"));
assertEquals("updated-" + i, updatedBinary.field("strVal"));
}
}
[44/50] [abbrv] ignite git commit: IGNITE-2213: Fixed serialization
of duplicate fields.
Posted by nt...@apache.org.
IGNITE-2213: Fixed serialization of duplicate fields.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/627134b2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/627134b2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/627134b2
Branch: refs/heads/ignite-gg-10837
Commit: 627134b25ca730d7a7dbcec9facde158c5d15dc3
Parents: d8576b8
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Dec 22 11:28:44 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Dec 22 11:28:44 2015 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryClassDescriptor.java | 56 ++++++++--
.../ignite/internal/binary/BinaryUtils.java | 11 ++
.../binary/BinaryMarshallerSelfTest.java | 110 +++++++++++++++++++
.../IgniteBinaryCacheQueryTestSuite.java | 3 +-
4 files changed, 169 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 1eb3882..1105809 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -35,6 +35,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.ArrayList;
@@ -44,11 +45,9 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
-import static java.lang.reflect.Modifier.isStatic;
-import static java.lang.reflect.Modifier.isTransient;
-
/**
* Binary class descriptor.
*/
@@ -250,21 +249,24 @@ public class BinaryClassDescriptor {
BinarySchema.Builder schemaBuilder = BinarySchema.Builder.newBuilder();
+ Set<String> duplicates = duplicateFields(cls);
+
Collection<String> names = new HashSet<>();
Collection<Integer> ids = new HashSet<>();
for (Class<?> c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
for (Field f : c.getDeclaredFields()) {
- int mod = f.getModifiers();
-
- if (!isStatic(mod) && !isTransient(mod)) {
+ if (serializeField(f)) {
f.setAccessible(true);
String name = f.getName();
- if (!names.add(name))
- throw new BinaryObjectException("Duplicate field name [fieldName=" + name +
- ", cls=" + cls.getName() + ']');
+ if (duplicates.contains(name))
+ name = BinaryUtils.qualifiedFieldName(c, name);
+
+ boolean added = names.add(name);
+
+ assert added : name;
int fieldId = idMapper.fieldId(typeId, name);
@@ -308,6 +310,42 @@ public class BinaryClassDescriptor {
}
/**
+ * Find all fields with duplicate names in the class.
+ *
+ * @param cls Class.
+ * @return Fields with duplicate names.
+ */
+ private static Set<String> duplicateFields(Class cls) {
+ Set<String> all = new HashSet<>();
+ Set<String> duplicates = new HashSet<>();
+
+ for (Class<?> c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
+ for (Field f : c.getDeclaredFields()) {
+ if (serializeField(f)) {
+ String name = f.getName();
+
+ if (!all.add(name))
+ duplicates.add(name);
+ }
+ }
+ }
+
+ return duplicates;
+ }
+
+ /**
+ * Whether the field must be serialized.
+ *
+ * @param f Field.
+ * @return {@code True} if must be serialized.
+ */
+ private static boolean serializeField(Field f) {
+ int mod = f.getModifiers();
+
+ return !Modifier.isStatic(mod) && !Modifier.isTransient(mod);
+ }
+
+ /**
* @return {@code True} if enum.
*/
boolean isEnum() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 8cb4b38..62a9d26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -1883,6 +1883,17 @@ public class BinaryUtils {
}
/**
+ * Create qualified field name.
+ *
+ * @param cls Class.
+ * @param fieldName Field name.
+ * @return Qualified field name.
+ */
+ public static String qualifiedFieldName(Class cls, String fieldName) {
+ return cls.getName() + "." + fieldName;
+ }
+
+ /**
* Enum type.
*/
private static class EnumType {
http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index fcd511b..ac9771f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -54,6 +54,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
import junit.framework.Assert;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.binary.BinaryCollectionFactory;
+import org.apache.ignite.binary.BinaryField;
import org.apache.ignite.binary.BinaryIdMapper;
import org.apache.ignite.binary.BinaryMapFactory;
import org.apache.ignite.binary.BinaryObject;
@@ -63,6 +64,7 @@ import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.BinaryRawWriter;
import org.apache.ignite.binary.BinaryReader;
import org.apache.ignite.binary.BinarySerializer;
+import org.apache.ignite.binary.BinaryType;
import org.apache.ignite.binary.BinaryTypeConfiguration;
import org.apache.ignite.binary.BinaryWriter;
import org.apache.ignite.binary.Binarylizable;
@@ -2315,6 +2317,63 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
+ * Test duplicate fields.
+ *
+ * @throws Exception If failed.
+ */
+ public void testDuplicateFields() throws Exception {
+ BinaryMarshaller marsh = binaryMarshaller();
+
+ DuplicateFieldsB obj = new DuplicateFieldsB(1, 2);
+
+ BinaryObjectImpl objBin = marshal(obj, marsh);
+
+ String fieldName = "x";
+ String fieldNameA = DuplicateFieldsA.class.getName() + "." + fieldName;
+ String fieldNameB = DuplicateFieldsB.class.getName() + "." + fieldName;
+
+ // Check "hasField".
+ assert !objBin.hasField(fieldName);
+ assert objBin.hasField(fieldNameA);
+ assert objBin.hasField(fieldNameB);
+
+ // Check direct field access.
+ assertNull(objBin.field(fieldName));
+ assertEquals(1, objBin.field(fieldNameA));
+ assertEquals(2, objBin.field(fieldNameB));
+
+ // Check metadata.
+ BinaryType type = objBin.type();
+
+ Collection<String> fieldNames = type.fieldNames();
+
+ assertEquals(2, fieldNames.size());
+
+ assert !fieldNames.contains(fieldName);
+ assert fieldNames.contains(fieldNameA);
+ assert fieldNames.contains(fieldNameB);
+
+ // Check field access through type.
+ BinaryField field = type.field(fieldName);
+ BinaryField fieldA = type.field(fieldNameA);
+ BinaryField fieldB = type.field(fieldNameB);
+
+ assert !field.exists(objBin);
+ assert fieldA.exists(objBin);
+ assert fieldB.exists(objBin);
+
+ assertNull(field.value(objBin));
+ assertEquals(1, fieldA.value(objBin));
+ assertEquals(2, fieldB.value(objBin));
+
+ // Check object deserialization.
+ DuplicateFieldsB deserialized = objBin.deserialize();
+
+ assertEquals(obj.xA(), deserialized.xA());
+ assertEquals(obj.xB(), deserialized.xB());
+ }
+
+ /**
*
*/
private static interface SomeItf {
@@ -4120,6 +4179,57 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
+ * Class B for duplicate fields test.
+ */
+ private static class DuplicateFieldsA {
+ /** Field. */
+ int x;
+
+ /**
+ * Constructor.
+ *
+ * @param x Field.
+ */
+ protected DuplicateFieldsA(int x) {
+ this.x = x;
+ }
+
+ /**
+ * @return A's field.
+ */
+ public int xA() {
+ return x;
+ }
+ }
+
+ /**
+ * Class B for duplicate fields test.
+ */
+ private static class DuplicateFieldsB extends DuplicateFieldsA {
+ /** Field. */
+ int x;
+
+ /**
+ * Constructor.
+ *
+ * @param xA Field for parent class.
+ * @param xB Field for current class.
+ */
+ public DuplicateFieldsB(int xA, int xB) {
+ super(xA);
+
+ this.x = xB;
+ }
+
+ /**
+ * @return B's field.
+ */
+ public int xB() {
+ return x;
+ }
+ }
+
+ /**
*
*/
private static class DecimalReflective {
http://git-wip-us.apache.org/repos/asf/ignite/blob/627134b2/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 1f5d6d1..b145a90 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -18,6 +18,7 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest;
import org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest;
import org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest;
@@ -32,7 +33,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexingDisable
import org.apache.ignite.internal.processors.cache.GridCacheQueryInternalKeysSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheQuerySerializationSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheReduceQueryMultithreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteBinaryObjectFieldsQuerySelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheBinaryObjectsScanSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheCollocatedQuerySelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheDuplicateEntityConfigurationSelfTest;
@@ -101,7 +101,6 @@ import org.apache.ignite.internal.processors.query.IgniteSqlSplitterSelfTest;
import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest;
import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest;
import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest;
import org.apache.ignite.testframework.config.GridTestProperties;
[21/50] [abbrv] ignite git commit: IGNITE-2123: Need to add
EntryProcessorExample to cache examples
Posted by nt...@apache.org.
IGNITE-2123: Need to add EntryProcessorExample to cache examples
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32cec994
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32cec994
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32cec994
Branch: refs/heads/ignite-gg-10837
Commit: 32cec99465e667e98010da87140a9eb80bfca743
Parents: 24eccb8
Author: Roman Shtykh <ap...@gmail.com>
Authored: Fri Dec 18 15:09:00 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Dec 18 15:09:00 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 1 +
.../datagrid/CacheEntryProcessorExample.java | 157 +++++++++++++++++++
.../datagrid/CacheEntryProcessorExample.java | 147 +++++++++++++++++
.../ScalarCacheEntryProcessorExample.scala | 125 +++++++++++++++
.../ignite/examples/CacheExamplesSelfTest.java | 8 +
.../java8/examples/CacheExamplesSelfTest.java | 8 +
.../tests/examples/ScalarExamplesSelfTest.scala | 5 +
7 files changed, 451 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 243ec18..b0822c9 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -18,6 +18,7 @@ Apache Ignite In-Memory Data Fabric 1.5
* Fixed and improved cache types configuration.
* Fixed cache rebalancing.
* Many stability and fault-tolerance fixes.
+* Added example to demonstrate the usage of EntryProcessor.
Complete list of closed issues: https://issues.apache.org/jira/issues/?jql=project%20%3D%20IGNITE%20AND%20fixVersion%20%3D%201.5%20AND%20status%20%3D%20closed
http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java
new file mode 100644
index 0000000..38d9631
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEntryProcessorExample.java
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.datagrid;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+
+/**
+ * This example demonstrates the simplest code that populates the distributed cache
+ * and co-locates simple closure execution with each key. The goal of this particular
+ * example is to provide the simplest code example of this logic using EntryProcessor.
+ * <p>
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}.
+ * <p>
+ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will
+ * start node with {@code examples/config/example-ignite.xml} configuration.
+ */
+public class CacheEntryProcessorExample {
+ /** Cache name. */
+ private static final String CACHE_NAME = CacheEntryProcessorExample.class.getSimpleName();
+
+ /** Number of keys. */
+ private static final int KEY_CNT = 20;
+
+ /** Keys predefined set. */
+ private static final Set<Integer> KEYS_SET;
+
+ /**
+ * Initializes keys set that is used in bulked operations in the example.
+ */
+ static {
+ KEYS_SET = new HashSet<>();
+
+ for (int i = 0; i < KEY_CNT; i++)
+ KEYS_SET.add(i);
+ }
+
+ /**
+ * Executes example.
+ *
+ * @param args Command line arguments, none required.
+ * @throws IgniteException If example execution failed.
+ */
+ public static void main(String[] args) throws IgniteException {
+ try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
+ System.out.println();
+ System.out.println(">>> Entry processor example started.");
+
+ try (IgniteCache<Integer, Integer> cache = ignite.getOrCreateCache(CACHE_NAME)) {
+ // Demonstrates usage of EntryProcessor.invoke(...) method.
+ populateEntriesWithInvoke(cache);
+
+ // Demonstrates usage of EntryProcessor.invokeAll(...) method.
+ incrementEntriesWithInvokeAll(cache);
+ }
+ }
+ }
+
+ /**
+ * Populates cache with values using {@link IgniteCache#invoke(Object, EntryProcessor, Object...)} method.
+ *
+ * @param cache Cache that must be populated.
+ */
+ private static void populateEntriesWithInvoke(IgniteCache<Integer, Integer> cache) {
+ // Must be no entry in the cache at this point.
+ printCacheEntries(cache);
+
+ System.out.println("");
+ System.out.println(">> Populating the cache using EntryProcessor.");
+
+ // Invokes EntryProcessor for every key sequentially.
+ for (int i = 0; i < KEY_CNT; i++) {
+ cache.invoke(i, new EntryProcessor<Integer, Integer, Object>() {
+ @Override public Object process(MutableEntry<Integer, Integer> entry,
+ Object... objects) throws EntryProcessorException {
+ // Initializes entry's value if it's not set.
+ if (entry.getValue() == null)
+ entry.setValue((entry.getKey() + 1) * 10);
+
+ return null;
+ }
+ });
+ }
+
+ // Print outs entries that are set using the EntryProcessor above.
+ printCacheEntries(cache);
+ }
+
+ /**
+ * Increments values of entries stored in the cache using
+ * {@link IgniteCache#invokeAll(Set, EntryProcessor, Object...)} method.
+ *
+ * @param cache Cache instance.
+ */
+ private static void incrementEntriesWithInvokeAll(IgniteCache<Integer, Integer> cache) {
+ System.out.println("");
+ System.out.println(">> Incrementing values in the cache using EntryProcessor.");
+
+ // Using EntryProcessor.invokeAll to increment every value in place.
+ cache.invokeAll(KEYS_SET, new EntryProcessor<Integer, Integer, Object>() {
+ @Override public Object process(MutableEntry<Integer, Integer> entry,
+ Object... arguments) throws EntryProcessorException {
+
+ entry.setValue(entry.getValue() + 5);
+
+ return null;
+ }
+ });
+
+ // Print outs entries that are incremented using the EntryProcessor above.
+ printCacheEntries(cache);
+ }
+
+ /**
+ * Prints out all the entries that are stored in a cache.
+ *
+ * @param cache Cache.
+ */
+ private static void printCacheEntries(IgniteCache<Integer, Integer> cache) {
+ System.out.println();
+ System.out.println(">>> Entries in the cache.");
+
+ Map<Integer, Integer> entries = cache.getAll(KEYS_SET);
+
+ if (entries.isEmpty())
+ System.out.println("No entries in the cache.");
+ else {
+ for (Map.Entry<Integer, Integer> entry : entries.entrySet())
+ System.out.println("Entry [key=" + entry.getKey() + ", value=" + entry.getValue() + ']');
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheEntryProcessorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheEntryProcessorExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheEntryProcessorExample.java
new file mode 100644
index 0000000..fd07fa5
--- /dev/null
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheEntryProcessorExample.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.java8.datagrid;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+
+/**
+ * This example demonstrates the simplest code that populates the distributed cache and co-locates simple closure
+ * execution with each key. The goal of this particular example is to provide the simplest code example of this logic
+ * using EntryProcessor.
+ * <p>
+ * Remote nodes should always be started with special configuration file which enables P2P
+ * class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}.
+ * <p>
+ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will start node with
+ * {@code examples/config/example-ignite.xml} configuration.
+ */
+public class CacheEntryProcessorExample {
+ /** Cache name. */
+ private static final String CACHE_NAME = CacheEntryProcessorExample.class.getSimpleName();
+
+ /** Number of keys. */
+ private static final int KEY_CNT = 20;
+
+ /** Set of predefined keys. */
+ private static final Set<Integer> KEYS_SET;
+
+ /**
+ * Initializes keys set that is used in bulked operations in the example.
+ */
+ static {
+ KEYS_SET = new HashSet<>();
+
+ for (int i = 0; i < KEY_CNT; i++)
+ KEYS_SET.add(i);
+ }
+
+ /**
+ * Executes example.
+ *
+ * @param args Command line arguments, none required.
+ * @throws IgniteException If example execution failed.
+ */
+ public static void main(String[] args) throws IgniteException {
+ try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
+ System.out.println();
+ System.out.println(">>> Entry processor example started.");
+
+ try (IgniteCache<Integer, Integer> cache = ignite.getOrCreateCache(CACHE_NAME)) {
+ // Demonstrates usage of EntryProcessor.invoke(...) method.
+ populateEntriesWithInvoke(cache);
+
+ // Demonstrates usage of EntryProcessor.invokeAll(...) method.
+ incrementEntriesWithInvokeAll(cache);
+ }
+ }
+ }
+
+ /**
+ * Populates cache with values using {@link IgniteCache#invoke(Object, EntryProcessor, Object...)} method.
+ *
+ * @param cache Cache that must be populated.
+ */
+ private static void populateEntriesWithInvoke(IgniteCache<Integer, Integer> cache) {
+ // Must be no entry in the cache at this point.
+ printCacheEntries(cache);
+
+ System.out.println("");
+ System.out.println(">> Populating the cache using EntryProcessor.");
+
+ // Invokes EntryProcessor for every key sequentially.
+ for (int i = 0; i < KEY_CNT; i++) {
+ cache.invoke(i, (entry, object) -> {
+ // Initializes entry's value if it's not set.
+ if (entry.getValue() == null)
+ entry.setValue((entry.getKey() + 1) * 10);
+ return null;
+ });
+ }
+
+ // Print outs entries that are set using the EntryProcessor above.
+ printCacheEntries(cache);
+ }
+
+ /**
+ * Increments values of entries stored in the cache using {@link IgniteCache#invokeAll(Set, EntryProcessor,
+ * Object...)} method.
+ *
+ * @param cache Cache instance.
+ */
+ private static void incrementEntriesWithInvokeAll(IgniteCache<Integer, Integer> cache) {
+ System.out.println("");
+ System.out.println(">> Incrementing values in the cache using EntryProcessor.");
+
+ // Using EntryProcessor.invokeAll to increment every value in place.
+ cache.invokeAll(KEYS_SET, (entry, object) -> {
+ entry.setValue(entry.getValue() + 5);
+
+ return null;
+ });
+
+ // Print outs entries that are incremented using the EntryProcessor above.
+ printCacheEntries(cache);
+ }
+
+ /**
+ * Prints out all the entries that are stored in a cache.
+ *
+ * @param cache Cache.
+ */
+ private static void printCacheEntries(IgniteCache<Integer, Integer> cache) {
+ System.out.println();
+ System.out.println(">>> Entries in the cache.");
+
+ Map<Integer, Integer> entries = cache.getAll(KEYS_SET);
+
+ if (entries.isEmpty())
+ System.out.println("No entries in the cache.");
+ else {
+ for (Map.Entry<Integer, Integer> entry : entries.entrySet())
+ System.out.println("Entry [key=" + entry.getKey() + ", value=" + entry.getValue() + ']');
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheEntryProcessorExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheEntryProcessorExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheEntryProcessorExample.scala
new file mode 100644
index 0000000..ffcbbfd
--- /dev/null
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheEntryProcessorExample.scala
@@ -0,0 +1,125 @@
+/*
+ * 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.scalar.examples
+
+import javax.cache.processor.{EntryProcessor, MutableEntry}
+
+import org.apache.ignite.IgniteCache
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+
+/**
+ * This example demonstrates the simplest code that populates the distributed cache
+ * and co-locates simple closure execution with each key. The goal of this particular
+ * example is to provide the simplest code example of this logic using EntryProcessor.
+ * <p>
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}.
+ * <p>
+ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will
+ * start node with {@code examples/config/example-ignite.xml} configuration.
+ */
+object ScalarCacheEntryProcessorExample extends App {
+ /** Configuration file name. */
+ private val CONFIG = "examples/config/example-ignite.xml"
+
+ /** Name of cache. */
+ private val CACHE_NAME = ScalarCacheEntryProcessorExample.getClass.getSimpleName
+
+ /** Number of keys. */
+ private val KEY_CNT = 20
+
+ /** Type alias. */
+ type Cache = IgniteCache[String, Int]
+
+ /*
+ * Note that in case of `LOCAL` configuration,
+ * since there is no distribution, values may come back as `nulls`.
+ */
+ scalar(CONFIG) {
+ println()
+ println(">>> Entry processor example started.")
+
+ val cache = createCache$[String, Int](CACHE_NAME)
+
+ try {
+ populateEntriesWithInvoke(cache)
+
+ checkEntriesInCache(cache)
+
+ incrementEntriesWithInvoke(cache)
+
+ checkEntriesInCache(cache)
+ }
+ finally {
+ cache.destroy()
+ }
+ }
+
+ private def checkEntriesInCache(cache: Cache) {
+ println()
+ println(">>> Entries in the cache.")
+
+ (0 until KEY_CNT).foreach(i =>
+ println("Entry: " + cache.get(i.toString)))
+ }
+
+ /**
+ * Runs jobs on primary nodes with {@link IgniteCache#invoke(Object, CacheEntryProcessor, Object...)} to create
+ * entries when they don't exist.
+ *
+ * @param cache Cache to populate.
+ */
+ private def populateEntriesWithInvoke(cache: Cache) {
+ (0 until KEY_CNT).foreach(i =>
+ cache.invoke(i.toString,
+ new EntryProcessor[String, Int, Object]() {
+ override def process(e: MutableEntry[String, Int], args: AnyRef*): Object = {
+ if (e.getValue == null)
+ e.setValue(i)
+
+ null
+ }
+ }
+ )
+ )
+ }
+
+ /**
+ * Runs jobs on primary nodes with {@link IgniteCache#invoke(Object, CacheEntryProcessor, Object...)} to increment
+ * entries values.
+ *
+ * @param cache Cache to populate.
+ */
+ private def incrementEntriesWithInvoke(cache: Cache) {
+ println()
+ println(">>> Incrementing values.")
+
+ (0 until KEY_CNT).foreach(i =>
+ cache.invoke(i.toString,
+ new EntryProcessor[String, Int, Object]() {
+ override def process(e: MutableEntry[String, Int], args: AnyRef*): Object = {
+ Option(e.getValue) foreach (v => e.setValue(v + 1))
+
+ null
+ }
+ }
+ )
+ )
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
index 050c59f..39c2ea6 100644
--- a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.examples;
import org.apache.ignite.examples.datagrid.CacheAffinityExample;
+import org.apache.ignite.examples.datagrid.CacheEntryProcessorExample;
import org.apache.ignite.examples.datagrid.CacheApiExample;
import org.apache.ignite.examples.datagrid.CacheContinuousQueryExample;
import org.apache.ignite.examples.datagrid.CacheDataStreamerExample;
@@ -49,6 +50,13 @@ public class CacheExamplesSelfTest extends GridAbstractExamplesTest {
/**
* @throws Exception If failed.
*/
+ public void testCacheEntryProcessorExample() throws Exception {
+ CacheEntryProcessorExample.main(EMPTY_ARGS);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testCacheAtomicLongExample() throws Exception {
IgniteAtomicLongExample.main(EMPTY_ARGS);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
index 4446521..e44fec3 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.java8.examples;
import org.apache.ignite.examples.java8.datagrid.CacheAffinityExample;
+import org.apache.ignite.examples.java8.datagrid.CacheEntryProcessorExample;
import org.apache.ignite.examples.java8.datagrid.CacheApiExample;
import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
@@ -36,6 +37,13 @@ public class CacheExamplesSelfTest extends GridAbstractExamplesTest {
CacheAffinityExample.main(EMPTY_ARGS);
}
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCacheEntryProcessorExample() throws Exception {
+ CacheEntryProcessorExample.main(EMPTY_ARGS);
+ }
+
// TODO: IGNITE-711 next example(s) should be implemented for java 8
// or testing method(s) should be removed if example(s) does not applicable for java 8.
// /**
http://git-wip-us.apache.org/repos/asf/ignite/blob/32cec994/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
----------------------------------------------------------------------
diff --git a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
index ef56434..94c41ad 100644
--- a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
+++ b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
@@ -35,6 +35,11 @@ class ScalarExamplesSelfTest extends GridAbstractExamplesTest with JUnitSuiteLik
}
/** */
+ def testScalarCacheEntryProcessorExample() {
+ ScalarCacheEntryProcessorExample.main(EMPTY_ARGS)
+ }
+
+ /** */
def testScalarCacheExample() {
ScalarCacheExample.main(EMPTY_ARGS)
}
[37/50] [abbrv] ignite git commit: ignite-2205 - clause HAVING
doesn't work for count - Fixes #357.
Posted by nt...@apache.org.
ignite-2205 - clause HAVING doesn't work for count - Fixes #357.
Signed-off-by: S.Vladykin <sv...@gridgain.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0cdb596
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0cdb596
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0cdb596
Branch: refs/heads/ignite-gg-10837
Commit: a0cdb59645ce0a84344c6c92b9695c1a26e2a824
Parents: 81458f5
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Dec 21 19:58:29 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Dec 21 19:58:29 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridSqlQuery.java | 3 +
.../query/h2/sql/GridSqlQuerySplitter.java | 65 ++++++++++++++------
.../query/IgniteSqlSplitterSelfTest.java | 52 ++++++++++++++++
.../query/h2/sql/GridQueryParsingTest.java | 9 +--
4 files changed, 103 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index ddcb40b..d9784c8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -163,6 +163,9 @@ public abstract class GridSqlQuery {
if (expr == null) // For plain select should never be null, for union H2 itself can't parse query.
throw new IllegalStateException("Failed to build query: " + buff.toString());
+ if (expr instanceof GridSqlAlias)
+ expr = expr.child();
+
buff.append('=').append(StringUtils.unEnclose(expr.getSQL()));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/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 0c9c8fe..727c2c7 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
@@ -50,6 +50,9 @@ public class GridSqlQuerySplitter {
/** */
private static final String COLUMN_PREFIX = "__C";
+ /** */
+ private static final String HAVING_COLUMN = "__H";
+
/**
* @param idx Index of table.
* @return Table.
@@ -158,14 +161,17 @@ public class GridSqlQuerySplitter {
List<GridSqlElement> mapExps = F.addAll(new ArrayList<GridSqlElement>(mapQry.allColumns()),
mapQry.columns(false));
- GridSqlElement[] rdcExps = new GridSqlElement[mapQry.visibleColumns()];
+ final int visibleCols = mapQry.visibleColumns();
+ final int havingCol = mapQry.havingColumn();
+
+ List<GridSqlElement> rdcExps = new ArrayList<>(visibleCols);
Set<String> colNames = new HashSet<>();
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, collocated);
+ aggregateFound |= splitSelectExpression(mapExps, rdcExps, colNames, i, collocated, i == havingCol);
// Fill select expressions.
mapQry.clearColumns();
@@ -173,10 +179,13 @@ public class GridSqlQuerySplitter {
for (GridSqlElement exp : mapExps) // Add all map expressions as visible.
mapQry.addColumn(exp, true);
- for (GridSqlElement rdcExp : rdcExps) // Add corresponding visible reduce columns.
- rdcQry.addColumn(rdcExp, true);
+ for (int i = 0; i < visibleCols; i++) // Add visible reduce columns.
+ rdcQry.addColumn(rdcExps.get(i), true);
+
+ for (int i = visibleCols; i < rdcExps.size(); i++) // Add invisible reduce columns (HAVING).
+ rdcQry.addColumn(rdcExps.get(i), false);
- for (int i = rdcExps.length; i < mapExps.size(); i++) // Add all extra map columns as invisible reduce columns.
+ for (int i = rdcExps.size(); i < mapExps.size(); i++) // Add all extra map columns as invisible reduce columns.
rdcQry.addColumn(column(((GridSqlAlias)mapExps.get(i)).alias()), false);
// -- GROUP BY
@@ -184,9 +193,18 @@ public class GridSqlQuerySplitter {
rdcQry.groupColumns(mapQry.groupColumns());
// -- HAVING
- if (mapQry.havingColumn() >= 0 && !collocated) {
+ if (havingCol >= 0 && !collocated) {
// TODO IGNITE-1140 - Find aggregate functions in HAVING clause or rewrite query to put all aggregates to SELECT clause.
- rdcQry.whereAnd(column(columnName(mapQry.havingColumn())));
+ // We need to find HAVING column in reduce query.
+ for (int i = visibleCols; i < rdcQry.allColumns(); i++) {
+ GridSqlElement c = rdcQry.column(i);
+
+ if (c instanceof GridSqlAlias && HAVING_COLUMN.equals(((GridSqlAlias)c).alias())) {
+ rdcQry.havingColumn(i);
+
+ break;
+ }
+ }
mapQry.havingColumn(-1);
}
@@ -452,10 +470,11 @@ public class GridSqlQuerySplitter {
* @param colNames Set of unique top level column names.
* @param idx Index.
* @param collocated If it is a collocated query.
+ * @param isHaving If it is a HAVING expression.
* @return {@code true} If aggregate was found.
*/
- private static boolean splitSelectExpression(List<GridSqlElement> mapSelect, GridSqlElement[] rdcSelect,
- Set<String> colNames, final int idx, boolean collocated) {
+ private static boolean splitSelectExpression(List<GridSqlElement> mapSelect, List<GridSqlElement> rdcSelect,
+ Set<String> colNames, final int idx, boolean collocated, boolean isHaving) {
GridSqlElement el = mapSelect.get(idx);
GridSqlAlias alias = null;
@@ -471,16 +490,15 @@ public class GridSqlQuerySplitter {
aggregateFound = true;
if (alias == null)
- alias = alias(columnName(idx), el);
+ alias = alias(isHaving ? HAVING_COLUMN : columnName(idx), el);
// We can update original alias here as well since it will be dropped from mapSelect.
splitAggregates(alias, 0, mapSelect, idx, true);
- if (idx < rdcSelect.length)
- rdcSelect[idx] = alias;
+ set(rdcSelect, idx, alias);
}
else {
- String mapColAlias = columnName(idx);
+ String mapColAlias = isHaving ? HAVING_COLUMN : columnName(idx);
String rdcColAlias;
if (alias == null) // Original column name for reduce column.
@@ -491,20 +509,29 @@ public class GridSqlQuerySplitter {
// Always wrap map column into generated alias.
mapSelect.set(idx, alias(mapColAlias, el)); // `el` is known not to be an alias.
- if (idx < rdcSelect.length) { // SELECT __C0 AS original_alias
- GridSqlElement rdcEl = column(mapColAlias);
+ // SELECT __C0 AS original_alias
+ GridSqlElement rdcEl = column(mapColAlias);
- if (colNames.add(rdcColAlias)) // To handle column name duplication (usually wildcard for few tables).
- rdcEl = alias(rdcColAlias, rdcEl);
+ if (colNames.add(rdcColAlias)) // To handle column name duplication (usually wildcard for few tables).
+ rdcEl = alias(rdcColAlias, rdcEl);
- rdcSelect[idx] = rdcEl;
- }
+ set(rdcSelect, idx, rdcEl);
}
return aggregateFound;
}
/**
+ * @param list List.
+ * @param idx Index.
+ * @param item Element.
+ */
+ private static <Z> void set(List<Z> list, int idx, Z item) {
+ assert list.size() == idx;
+ list.add(item);
+ }
+
+ /**
* @param el Expression.
* @return {@code true} If expression contains aggregates.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 5702649..d0e2780 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -20,8 +20,11 @@ package org.apache.ignite.internal.processors.query;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
@@ -31,6 +34,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.GridRandom;
import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -203,6 +207,54 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
}
/**
+ * Test HAVING clause.
+ */
+ public void testHaving() {
+ IgniteCache<Integer, Integer> c = ignite(0).getOrCreateCache(cacheConfig("ints", true,
+ Integer.class, Integer.class));
+
+ try {
+ Random rnd = new GridRandom();
+
+ Map<Integer, AtomicLong> cntMap = new HashMap<>();
+
+ for (int i = 0; i < 1000; i++) {
+ int v = (int)(50 * rnd.nextGaussian());
+
+ c.put(i, v);
+
+ AtomicLong cnt = cntMap.get(v);
+
+ if (cnt == null)
+ cntMap.put(v, cnt = new AtomicLong());
+
+ cnt.incrementAndGet();
+ }
+
+ assertTrue(cntMap.size() > 10);
+
+ String sqlQry = "select _val, count(*) cnt from Integer group by _val having cnt > ?";
+
+ X.println("Plan: " + c.query(new SqlFieldsQuery("explain " + sqlQry).setArgs(0)).getAll());
+
+ for (int i = -1; i <= 1001; i += 10) {
+ List<List<?>> res = c.query(new SqlFieldsQuery(sqlQry).setArgs(i)).getAll();
+
+ for (List<?> row : res) {
+ int v = (Integer)row.get(0);
+ long cnt = (Long)row.get(1);
+
+ assertTrue(cnt + " > " + i, cnt > i);
+ assertEquals(cntMap.get(v).longValue(), cnt);
+ }
+ }
+ }
+ finally {
+ c.destroy();
+ }
+ }
+
+ /**
* @param c Cache.
* @param qry Query.
* @param args Arguments.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cdb596/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 2be5d1a..ce1f241 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -199,7 +199,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select p.name, ? from Person p where name regexp ? and p.old < ?");
- checkQuery("select count(*) as a from Person");
+ checkQuery("select count(*) as a from Person having a > 10");
checkQuery("select count(*) as a, count(p.*), count(p.name) from Person p");
checkQuery("select count(distinct p.name) from Person p");
checkQuery("select name, count(*) cnt from Person group by name order by cnt desc limit 10");
@@ -316,12 +316,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
GridSqlQueryParser ses = new GridSqlQueryParser();
- String res;
-
- if (prepared instanceof Query)
- res = ses.parse((Query) prepared).getSQL();
- else
- throw new UnsupportedOperationException();
+ String res = ses.parse(prepared).getSQL();
System.out.println(normalizeSql(res));
[29/50] [abbrv] ignite git commit: IGNITE-2169 Fixed incorrect null
schema generation.
Posted by nt...@apache.org.
IGNITE-2169 Fixed incorrect null schema generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58b55b53
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58b55b53
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58b55b53
Branch: refs/heads/ignite-gg-10837
Commit: 58b55b53f15f0752c8fff97e31b94984a67d081b
Parents: 0c7dfec
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Dec 21 10:20:37 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Dec 21 10:20:37 2015 +0700
----------------------------------------------------------------------
.../ignite/schema/generator/CodeGenerator.java | 7 +-
.../schema/test/AbstractSchemaImportTest.java | 18 +
.../org/apache/ignite/schema/test/model/Tst.txt | 506 +++++++++++++++++++
.../apache/ignite/schema/test/model/TstKey.txt | 96 ++++
.../schema/test/model/ignite-type-metadata.xml | 180 +++++++
.../test/parser/DbMetadataParserTest.java | 17 +-
6 files changed, 820 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index 0e52acc..769c7d9 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -606,8 +606,11 @@ public class CodeGenerator {
add2(src, "jdbcType.setCacheName(cacheName);");
- // Database info.
- add2(src, "jdbcType.setDatabaseSchema(\"" + pojo.schema() + "\");");
+ // Database schema.
+ if (pojo.schema() != null)
+ add2(src, "jdbcType.setDatabaseSchema(\"" + pojo.schema() + "\");");
+
+ // Database table.
add2(src, "jdbcType.setDatabaseTable(\"" + tbl + "\");");
// Java info.
http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
index bf0f94a..97f0f87 100644
--- a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
+++ b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
@@ -97,6 +97,24 @@ public abstract class AbstractSchemaImportTest extends TestCase {
" tsCol TIMESTAMP," +
" arrCol BINARY(10))");
+ stmt.executeUpdate("CREATE SCHEMA IF NOT EXISTS TESTSCHEMA");
+
+ stmt.executeUpdate("CREATE TABLE IF NOT EXISTS TESTSCHEMA.TST(pk INTEGER PRIMARY KEY, " +
+ " boolCol BOOLEAN NOT NULL," +
+ " byteCol TINYINT NOT NULL," +
+ " shortCol SMALLINT NOT NULL," +
+ " intCol INTEGER NOT NULL, " +
+ " longCol BIGINT NOT NULL," +
+ " floatCol REAL NOT NULL," +
+ " doubleCol DOUBLE NOT NULL," +
+ " doubleCol2 DOUBLE NOT NULL, " +
+ " bigDecimalCol DECIMAL(10, 0)," +
+ " strCol VARCHAR(10)," +
+ " dateCol DATE," +
+ " timeCol TIME," +
+ " tsCol TIMESTAMP, " +
+ " arrCol BINARY(10))");
+
conn.commit();
U.closeQuiet(stmt);
http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt
new file mode 100644
index 0000000..23d61d0
--- /dev/null
+++ b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/Tst.txt
@@ -0,0 +1,506 @@
+/*
+ * 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.schema.test.model;
+
+import java.io.*;
+
+/**
+ * Tst definition.
+ *
+ * Code generated by Apache Ignite Schema Import utility: 01/27/2015.
+ */
+public class Tst implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Value for pk. */
+ private int pk;
+
+ /** Value for boolcol. */
+ private boolean boolcol;
+
+ /** Value for bytecol. */
+ private byte bytecol;
+
+ /** Value for shortcol. */
+ private short shortcol;
+
+ /** Value for intcol. */
+ private int intcol;
+
+ /** Value for longcol. */
+ private long longcol;
+
+ /** Value for floatcol. */
+ private float floatcol;
+
+ /** Value for doublecol. */
+ private double doublecol;
+
+ /** Value for doublecol2. */
+ private double doublecol2;
+
+ /** Value for bigdecimalcol. */
+ private java.math.BigDecimal bigdecimalcol;
+
+ /** Value for strcol. */
+ private String strcol;
+
+ /** Value for datecol. */
+ private java.sql.Date datecol;
+
+ /** Value for timecol. */
+ private java.sql.Time timecol;
+
+ /** Value for tscol. */
+ private java.sql.Timestamp tscol;
+
+ /** Value for arrcol. */
+ private Object arrcol;
+
+ /**
+ * Empty constructor.
+ */
+ public Tst() {
+ // No-op.
+ }
+
+ /**
+ * Full constructor.
+ */
+ public Tst(
+ int pk,
+ boolean boolcol,
+ byte bytecol,
+ short shortcol,
+ int intcol,
+ long longcol,
+ float floatcol,
+ double doublecol,
+ double doublecol2,
+ java.math.BigDecimal bigdecimalcol,
+ String strcol,
+ java.sql.Date datecol,
+ java.sql.Time timecol,
+ java.sql.Timestamp tscol,
+ Object arrcol
+ ) {
+ this.pk = pk;
+ this.boolcol = boolcol;
+ this.bytecol = bytecol;
+ this.shortcol = shortcol;
+ this.intcol = intcol;
+ this.longcol = longcol;
+ this.floatcol = floatcol;
+ this.doublecol = doublecol;
+ this.doublecol2 = doublecol2;
+ this.bigdecimalcol = bigdecimalcol;
+ this.strcol = strcol;
+ this.datecol = datecol;
+ this.timecol = timecol;
+ this.tscol = tscol;
+ this.arrcol = arrcol;
+ }
+
+ /**
+ * Gets pk.
+ *
+ * @return Value for pk.
+ */
+ public int getPk() {
+ return pk;
+ }
+
+ /**
+ * Sets pk.
+ *
+ * @param pk New value for pk.
+ */
+ public void setPk(int pk) {
+ this.pk = pk;
+ }
+
+ /**
+ * Gets boolcol.
+ *
+ * @return Value for boolcol.
+ */
+ public boolean getBoolcol() {
+ return boolcol;
+ }
+
+ /**
+ * Sets boolcol.
+ *
+ * @param boolcol New value for boolcol.
+ */
+ public void setBoolcol(boolean boolcol) {
+ this.boolcol = boolcol;
+ }
+
+ /**
+ * Gets bytecol.
+ *
+ * @return Value for bytecol.
+ */
+ public byte getBytecol() {
+ return bytecol;
+ }
+
+ /**
+ * Sets bytecol.
+ *
+ * @param bytecol New value for bytecol.
+ */
+ public void setBytecol(byte bytecol) {
+ this.bytecol = bytecol;
+ }
+
+ /**
+ * Gets shortcol.
+ *
+ * @return Value for shortcol.
+ */
+ public short getShortcol() {
+ return shortcol;
+ }
+
+ /**
+ * Sets shortcol.
+ *
+ * @param shortcol New value for shortcol.
+ */
+ public void setShortcol(short shortcol) {
+ this.shortcol = shortcol;
+ }
+
+ /**
+ * Gets intcol.
+ *
+ * @return Value for intcol.
+ */
+ public int getIntcol() {
+ return intcol;
+ }
+
+ /**
+ * Sets intcol.
+ *
+ * @param intcol New value for intcol.
+ */
+ public void setIntcol(int intcol) {
+ this.intcol = intcol;
+ }
+
+ /**
+ * Gets longcol.
+ *
+ * @return Value for longcol.
+ */
+ public long getLongcol() {
+ return longcol;
+ }
+
+ /**
+ * Sets longcol.
+ *
+ * @param longcol New value for longcol.
+ */
+ public void setLongcol(long longcol) {
+ this.longcol = longcol;
+ }
+
+ /**
+ * Gets floatcol.
+ *
+ * @return Value for floatcol.
+ */
+ public float getFloatcol() {
+ return floatcol;
+ }
+
+ /**
+ * Sets floatcol.
+ *
+ * @param floatcol New value for floatcol.
+ */
+ public void setFloatcol(float floatcol) {
+ this.floatcol = floatcol;
+ }
+
+ /**
+ * Gets doublecol.
+ *
+ * @return Value for doublecol.
+ */
+ public double getDoublecol() {
+ return doublecol;
+ }
+
+ /**
+ * Sets doublecol.
+ *
+ * @param doublecol New value for doublecol.
+ */
+ public void setDoublecol(double doublecol) {
+ this.doublecol = doublecol;
+ }
+
+ /**
+ * Gets doublecol2.
+ *
+ * @return Value for doublecol2.
+ */
+ public double getDoublecol2() {
+ return doublecol2;
+ }
+
+ /**
+ * Sets doublecol2.
+ *
+ * @param doublecol2 New value for doublecol2.
+ */
+ public void setDoublecol2(double doublecol2) {
+ this.doublecol2 = doublecol2;
+ }
+
+ /**
+ * Gets bigdecimalcol.
+ *
+ * @return Value for bigdecimalcol.
+ */
+ public java.math.BigDecimal getBigdecimalcol() {
+ return bigdecimalcol;
+ }
+
+ /**
+ * Sets bigdecimalcol.
+ *
+ * @param bigdecimalcol New value for bigdecimalcol.
+ */
+ public void setBigdecimalcol(java.math.BigDecimal bigdecimalcol) {
+ this.bigdecimalcol = bigdecimalcol;
+ }
+
+ /**
+ * Gets strcol.
+ *
+ * @return Value for strcol.
+ */
+ public String getStrcol() {
+ return strcol;
+ }
+
+ /**
+ * Sets strcol.
+ *
+ * @param strcol New value for strcol.
+ */
+ public void setStrcol(String strcol) {
+ this.strcol = strcol;
+ }
+
+ /**
+ * Gets datecol.
+ *
+ * @return Value for datecol.
+ */
+ public java.sql.Date getDatecol() {
+ return datecol;
+ }
+
+ /**
+ * Sets datecol.
+ *
+ * @param datecol New value for datecol.
+ */
+ public void setDatecol(java.sql.Date datecol) {
+ this.datecol = datecol;
+ }
+
+ /**
+ * Gets timecol.
+ *
+ * @return Value for timecol.
+ */
+ public java.sql.Time getTimecol() {
+ return timecol;
+ }
+
+ /**
+ * Sets timecol.
+ *
+ * @param timecol New value for timecol.
+ */
+ public void setTimecol(java.sql.Time timecol) {
+ this.timecol = timecol;
+ }
+
+ /**
+ * Gets tscol.
+ *
+ * @return Value for tscol.
+ */
+ public java.sql.Timestamp getTscol() {
+ return tscol;
+ }
+
+ /**
+ * Sets tscol.
+ *
+ * @param tscol New value for tscol.
+ */
+ public void setTscol(java.sql.Timestamp tscol) {
+ this.tscol = tscol;
+ }
+
+ /**
+ * Gets arrcol.
+ *
+ * @return Value for arrcol.
+ */
+ public Object getArrcol() {
+ return arrcol;
+ }
+
+ /**
+ * Sets arrcol.
+ *
+ * @param arrcol New value for arrcol.
+ */
+ public void setArrcol(Object arrcol) {
+ this.arrcol = arrcol;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (!(o instanceof Tst))
+ return false;
+
+ Tst that = (Tst)o;
+
+ if (pk != that.pk)
+ return false;
+
+ if (boolcol != that.boolcol)
+ return false;
+
+ if (bytecol != that.bytecol)
+ return false;
+
+ if (shortcol != that.shortcol)
+ return false;
+
+ if (intcol != that.intcol)
+ return false;
+
+ if (longcol != that.longcol)
+ return false;
+
+ if (Float.compare(floatcol, that.floatcol) != 0)
+ return false;
+
+ if (Double.compare(doublecol, that.doublecol) != 0)
+ return false;
+
+ if (Double.compare(doublecol2, that.doublecol2) != 0)
+ return false;
+
+ if (bigdecimalcol != null ? !bigdecimalcol.equals(that.bigdecimalcol) : that.bigdecimalcol != null)
+ return false;
+
+ if (strcol != null ? !strcol.equals(that.strcol) : that.strcol != null)
+ return false;
+
+ if (datecol != null ? !datecol.equals(that.datecol) : that.datecol != null)
+ return false;
+
+ if (timecol != null ? !timecol.equals(that.timecol) : that.timecol != null)
+ return false;
+
+ if (tscol != null ? !tscol.equals(that.tscol) : that.tscol != null)
+ return false;
+
+ if (arrcol != null ? !arrcol.equals(that.arrcol) : that.arrcol != null)
+ return false;
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int res = pk;
+
+ res = 31 * res + (boolcol ? 1 : 0);
+
+ res = 31 * res + (int)bytecol;
+
+ res = 31 * res + (int)shortcol;
+
+ res = 31 * res + intcol;
+
+ res = 31 * res + (int)(longcol ^ (longcol >>> 32));
+
+ res = 31 * res + (floatcol != +0.0f ? Float.floatToIntBits(floatcol) : 0);
+
+ long ig_hash_temp = Double.doubleToLongBits(doublecol);
+
+ res = 31 * res + (int)(ig_hash_temp ^ (ig_hash_temp >>> 32));
+
+ ig_hash_temp = Double.doubleToLongBits(doublecol2);
+
+ res = 31 * res + (int)(ig_hash_temp ^ (ig_hash_temp >>> 32));
+
+ res = 31 * res + (bigdecimalcol != null ? bigdecimalcol.hashCode() : 0);
+
+ res = 31 * res + (strcol != null ? strcol.hashCode() : 0);
+
+ res = 31 * res + (datecol != null ? datecol.hashCode() : 0);
+
+ res = 31 * res + (timecol != null ? timecol.hashCode() : 0);
+
+ res = 31 * res + (tscol != null ? tscol.hashCode() : 0);
+
+ res = 31 * res + (arrcol != null ? arrcol.hashCode() : 0);
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Tst [pk=" + pk +
+ ", boolcol=" + boolcol +
+ ", bytecol=" + bytecol +
+ ", shortcol=" + shortcol +
+ ", intcol=" + intcol +
+ ", longcol=" + longcol +
+ ", floatcol=" + floatcol +
+ ", doublecol=" + doublecol +
+ ", doublecol2=" + doublecol2 +
+ ", bigdecimalcol=" + bigdecimalcol +
+ ", strcol=" + strcol +
+ ", datecol=" + datecol +
+ ", timecol=" + timecol +
+ ", tscol=" + tscol +
+ ", arrcol=" + arrcol +
+ "]";
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/TstKey.txt
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/TstKey.txt b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/TstKey.txt
new file mode 100644
index 0000000..e2ce3c0
--- /dev/null
+++ b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/TstKey.txt
@@ -0,0 +1,96 @@
+/*
+ * 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.schema.test.model;
+
+import java.io.*;
+
+/**
+ * TstKey definition.
+ *
+ * Code generated by Apache Ignite Schema Import utility: 01/27/2015.
+ */
+public class TstKey implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Value for pk. */
+ private int pk;
+
+ /**
+ * Empty constructor.
+ */
+ public TstKey() {
+ // No-op.
+ }
+
+ /**
+ * Full constructor.
+ */
+ public TstKey(
+ int pk
+ ) {
+ this.pk = pk;
+ }
+
+ /**
+ * Gets pk.
+ *
+ * @return Value for pk.
+ */
+ public int getPk() {
+ return pk;
+ }
+
+ /**
+ * Sets pk.
+ *
+ * @param pk New value for pk.
+ */
+ public void setPk(int pk) {
+ this.pk = pk;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (!(o instanceof TstKey))
+ return false;
+
+ TstKey that = (TstKey)o;
+
+ if (pk != that.pk)
+ return false;
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int res = pk;
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "TstKey [pk=" + pk +
+ "]";
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
index f03f24f..92d065c 100644
--- a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
+++ b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
@@ -314,6 +314,148 @@
</list>
</property>
</bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="databaseSchema" value="TESTSCHEMA"/>
+ <property name="databaseTable" value="TST"/>
+ <property name="keyType" value="org.apache.ignite.schema.test.model.TstKey"/>
+ <property name="valueType" value="org.apache.ignite.schema.test.model.Tst"/>
+ <property name="keyFields">
+ <list>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="PK"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="pk"/>
+ </bean>
+ </list>
+ </property>
+ <property name="valueFields">
+ <list>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="PK"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="pk"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.BOOLEAN"/>
+ </property>
+ <property name="databaseFieldName" value="BOOLCOL"/>
+ <property name="javaFieldType" value="boolean"/>
+ <property name="javaFieldName" value="boolcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TINYINT"/>
+ </property>
+ <property name="databaseFieldName" value="BYTECOL"/>
+ <property name="javaFieldType" value="byte"/>
+ <property name="javaFieldName" value="bytecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.SMALLINT"/>
+ </property>
+ <property name="databaseFieldName" value="SHORTCOL"/>
+ <property name="javaFieldType" value="short"/>
+ <property name="javaFieldName" value="shortcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="INTCOL"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="intcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.BIGINT"/>
+ </property>
+ <property name="databaseFieldName" value="LONGCOL"/>
+ <property name="javaFieldType" value="long"/>
+ <property name="javaFieldName" value="longcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.REAL"/>
+ </property>
+ <property name="databaseFieldName" value="FLOATCOL"/>
+ <property name="javaFieldType" value="float"/>
+ <property name="javaFieldName" value="floatcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DOUBLE"/>
+ </property>
+ <property name="databaseFieldName" value="DOUBLECOL"/>
+ <property name="javaFieldType" value="double"/>
+ <property name="javaFieldName" value="doublecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DOUBLE"/>
+ </property>
+ <property name="databaseFieldName" value="DOUBLECOL2"/>
+ <property name="javaFieldType" value="double"/>
+ <property name="javaFieldName" value="doublecol2"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DECIMAL"/>
+ </property>
+ <property name="databaseFieldName" value="BIGDECIMALCOL"/>
+ <property name="javaFieldType" value="java.math.BigDecimal"/>
+ <property name="javaFieldName" value="bigdecimalcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.VARCHAR"/>
+ </property>
+ <property name="databaseFieldName" value="STRCOL"/>
+ <property name="javaFieldType" value="java.lang.String"/>
+ <property name="javaFieldName" value="strcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DATE"/>
+ </property>
+ <property name="databaseFieldName" value="DATECOL"/>
+ <property name="javaFieldType" value="java.sql.Date"/>
+ <property name="javaFieldName" value="datecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TIME"/>
+ </property>
+ <property name="databaseFieldName" value="TIMECOL"/>
+ <property name="javaFieldType" value="java.sql.Time"/>
+ <property name="javaFieldName" value="timecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TIMESTAMP"/>
+ </property>
+ <property name="databaseFieldName" value="TSCOL"/>
+ <property name="javaFieldType" value="java.sql.Timestamp"/>
+ <property name="javaFieldName" value="tscol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.VARBINARY"/>
+ </property>
+ <property name="databaseFieldName" value="ARRCOL"/>
+ <property name="javaFieldType" value="java.lang.Object"/>
+ <property name="javaFieldName" value="arrcol"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
</list>
</property>
</bean>
@@ -393,4 +535,42 @@
</list>
</property>
</bean>
+ <bean class="org.apache.ignite.cache.QueryEntity">
+ <property name="keyType" value="org.apache.ignite.schema.test.model.TstKey"/>
+ <property name="valueType" value="org.apache.ignite.schema.test.model.Tst"/>
+ <property name="fields">
+ <util:map map-class="java.util.LinkedHashMap">
+ <entry key="pk" value="int"/>
+ <entry key="boolcol" value="boolean"/>
+ <entry key="bytecol" value="byte"/>
+ <entry key="shortcol" value="short"/>
+ <entry key="intcol" value="int"/>
+ <entry key="longcol" value="long"/>
+ <entry key="floatcol" value="float"/>
+ <entry key="doublecol" value="double"/>
+ <entry key="doublecol2" value="double"/>
+ <entry key="bigdecimalcol" value="java.math.BigDecimal"/>
+ <entry key="strcol" value="java.lang.String"/>
+ <entry key="datecol" value="java.sql.Date"/>
+ <entry key="timecol" value="java.sql.Time"/>
+ <entry key="tscol" value="java.sql.Timestamp"/>
+ <entry key="arrcol" value="java.lang.Object"/>
+ </util:map>
+ </property>
+ <property name="indexes">
+ <list>
+ <bean class="org.apache.ignite.cache.QueryIndex">
+ <property name="name" value="PRIMARY_KEY_1"/>
+ <property name="indexType">
+ <util:constant static-field="org.apache.ignite.cache.QueryIndexType.SORTED"/>
+ </property>
+ <property name="fields">
+ <map>
+ <entry key="PK" value="true"/>
+ </map>
+ </property>
+ </bean>
+ </list>
+ </property>
+ </bean>
</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/58b55b53/modules/schema-import/src/test/java/org/apache/ignite/schema/test/parser/DbMetadataParserTest.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/parser/DbMetadataParserTest.java b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/parser/DbMetadataParserTest.java
index 6a2bf1d..a954029 100644
--- a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/parser/DbMetadataParserTest.java
+++ b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/parser/DbMetadataParserTest.java
@@ -102,10 +102,19 @@ public class DbMetadataParserTest extends AbstractSchemaImportTest {
}
/**
+ * Check that type has not null full db name.
+ *
+ * @param type Type to check.
+ */
+ public void checkSchemaHasFullDbName(PojoDescriptor type) {
+ assertNotNull("The DB schema should have a non-null fullDbName", type.fullDbName());
+ }
+
+ /**
* Test that metadata generated correctly.
*/
public void testCheckMetadata() {
- assertEquals("Metadata should contain 3 element", 3, pojos.size());
+ assertEquals("Metadata should contain 5 elements", 5, pojos.size());
Iterator<PojoDescriptor> it = pojos.iterator();
@@ -117,5 +126,9 @@ public class DbMetadataParserTest extends AbstractSchemaImportTest {
checkType(it.next());
checkType(it.next());
+
+ checkSchemaHasFullDbName(it.next());
+
+ checkType(it.next());
}
-}
\ No newline at end of file
+}
[41/50] [abbrv] ignite git commit: ignite-1.5 Fixed benchmark
configuration.
Posted by nt...@apache.org.
ignite-1.5 Fixed benchmark configuration.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c2b6740
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c2b6740
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c2b6740
Branch: refs/heads/ignite-gg-10837
Commit: 8c2b6740c43b3e32c424d2862155ce384fbafe51
Parents: d8576b8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 22 10:16:37 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 22 10:16:37 2015 +0300
----------------------------------------------------------------------
modules/yardstick/config/benchmark-multicast.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8c2b6740/modules/yardstick/config/benchmark-multicast.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-multicast.properties b/modules/yardstick/config/benchmark-multicast.properties
index 03cfddb..def652a 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -89,7 +89,7 @@ j=10
CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-optim-repRead-put-get-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-pessim-repRead-put-get-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serial-put-get-1-backup,\
[17/50] [abbrv] ignite git commit: ignite-1.5 Properly handle
duplicated job responses in GridTaskWorker.onResponse. Use correct
'initialRebalanceFuture' for client nodes.
Posted by nt...@apache.org.
ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse. Use correct 'initialRebalanceFuture' for client nodes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1f90655
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1f90655
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1f90655
Branch: refs/heads/ignite-gg-10837
Commit: b1f906555cea8990dd39e8050ca4348f09da7f7f
Parents: 301e7a1
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 12:08:20 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 12:08:20 2015 +0300
----------------------------------------------------------------------
.../ClientAbstractConnectivitySelfTest.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../processors/task/GridTaskWorker.java | 8 +-
.../internal/util/lang/GridNodePredicate.java | 13 +-
.../ignite/internal/util/nio/GridNioServer.java | 11 +-
.../util/nio/GridSelectorNioSessionImpl.java | 7 +
.../TcpDiscoveryMulticastIpFinder.java | 12 +-
.../ignite/internal/ClusterGroupSelfTest.java | 32 ++-
.../IgniteClientReconnectCacheTest.java | 7 +-
.../ignite/internal/TaskNodeRestartTest.java | 230 +++++++++++++++++++
.../IgniteCacheSizeFailoverTest.java | 4 +-
.../random/RandomEvictionPolicySelfTest.java | 4 +-
.../GridServiceProcessorStopSelfTest.java | 18 +-
.../IgniteMessagingWithClientTest.java | 2 -
.../GridSessionCheckpointAbstractSelfTest.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
18 files changed, 340 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
index ef18a29..8207ccf 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
@@ -134,7 +134,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr
/**
* Simple test of address list filtering.
- * @throws Exception
+ * @throws Exception If failed.
*/
public void testResolveReachableOneAddress() throws Exception {
InetAddress addr = InetAddress.getByAddress(new byte[] {127, 0, 0, 1} );
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 9039ed8..75168a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -626,7 +626,15 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
/** {@inheritDoc} */
@Override public final ClusterGroup forRandom() {
- return ids != null ? forNodeId(F.rand(ids)) : forNode(F.rand(nodes()));
+ if (!F.isEmpty(ids))
+ return forNodeId(F.rand(ids));
+
+ Collection<ClusterNode> nodes = nodes();
+
+ if (nodes.isEmpty())
+ return new ClusterGroupAdapter(ctx, null, Collections.<UUID>emptySet());
+
+ return forNode(F.rand(nodes));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 9a6246f..c46a66c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -482,7 +482,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** {@inheritDoc} */
@Override public IgniteInternalFuture<?> initialRebalanceFuture() {
- return cctx.kernalContext().clientNode() ? new GridFinishedFuture<>(true) : initRebalanceFut;
+ return cctx.kernalContext().clientNode() ? startFut : initRebalanceFut;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index 9315d7c..59d3f90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -696,8 +696,9 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
if (log.isDebugEnabled())
U.warn(log, "Received response for unknown child job (was job presumed failed?): " + res);
- selfOccupied = true;
+ res = delayedRess.poll();
+ // We can not return here because there can be more delayed messages in the queue.
continue;
}
@@ -708,7 +709,10 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
if (log.isDebugEnabled())
log.debug("Received redundant response for a job (will ignore): " + res);
- return;
+ res = delayedRess.poll();
+
+ // We can not return here because there can be more delayed messages in the queue.
+ continue;
}
if (!jobRes.getNode().id().equals(res.getNodeId())) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
index 4ce0b35..edec862 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
@@ -100,13 +100,18 @@ public class GridNodePredicate implements IgnitePredicate<ClusterNode>, Iterable
public GridNodePredicate(@Nullable ClusterNode... nodes) {
if (F.isEmpty(nodes))
ids = Collections.emptySet();
- else if (nodes.length == 1)
- ids = Collections.singleton(nodes[0].id());
+ else if (nodes.length == 1) {
+ ClusterNode node = nodes[0];
+
+ ids = node != null ? Collections.singleton(node.id()) : Collections.<UUID>emptySet();
+ }
else {
ids = U.newHashSet(nodes.length);
- for (ClusterNode n : nodes)
- ids.add(n.id());
+ for (ClusterNode n : nodes) {
+ if (n != null)
+ ids.add(n.id());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 53cec84..be28c30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -425,10 +425,10 @@ public class GridNioServer<T> {
int msgCnt = sys ? ses.offerSystemFuture(fut) : ses.offerFuture(fut);
- IgniteInClosure<IgniteException> ackClosure;
+ IgniteInClosure<IgniteException> ackC;
- if (!sys && (ackClosure = ses.removeMeta(ACK_CLOSURE.ordinal())) != null)
- fut.ackClosure(ackClosure);
+ if (!sys && (ackC = ses.removeMeta(ACK_CLOSURE.ordinal())) != null)
+ fut.ackClosure(ackC);
if (ses.closed()) {
if (ses.removeFuture(fut))
@@ -1609,15 +1609,14 @@ public class GridNioServer<T> {
sessions.remove(ses);
- if (closed)
- ses.onServerStopped();
-
SelectionKey key = ses.key();
// Shutdown input and output so that remote client will see correct socket close.
Socket sock = ((SocketChannel)key.channel()).socket();
if (ses.setClosed()) {
+ ses.onClosed();
+
if (directBuf) {
if (ses.writeBuffer() != null)
((DirectBuffer)ses.writeBuffer()).cleaner().clean();
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
index 6b1f6a7..deb7d2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
@@ -294,6 +294,13 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl {
*
*/
void onServerStopped() {
+ onClosed();
+ }
+
+ /**
+ *
+ */
+ void onClosed() {
if (sem != null)
sem.release(1_000_000);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index 77bb99d..8402cbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -136,6 +136,9 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
/** */
private boolean mcastErr;
+ @GridToStringExclude
+ private Set<InetSocketAddress> locNodeAddrs;
+
/**
* Constructs new IP finder.
*/
@@ -369,6 +372,8 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
}
if (!clientMode) {
+ locNodeAddrs = new HashSet<>(addrs);
+
if (addrSnds.isEmpty()) {
try {
// Create non-bound socket if local host is loopback or failed to create sockets explicitly
@@ -403,8 +408,11 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
else
mcastErr = true;
}
- else
+ else {
assert addrSnds.isEmpty() : addrSnds;
+
+ locNodeAddrs = Collections.emptySet();
+ }
}
/** {@inheritDoc} */
@@ -607,7 +615,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
U.close(sock);
}
- if (!rmtAddrs.isEmpty())
+ if (rmtAddrs.size() > locNodeAddrs.size())
break;
if (i < addrReqAttempts - 1) // Wait some time before re-sending address request.
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
index d916d78..18eb3b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
@@ -109,6 +109,10 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
}
assertEquals(oldest.node(), ignite.cluster().forNode(node).node());
+
+ ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent", "val");
+
+ assertEquals(0, emptyGrp.forOldest().nodes().size());
}
/**
@@ -130,6 +134,10 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
}
assertEquals(youngest.node(), ignite.cluster().forNode(node).node());
+
+ ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent", "val");
+
+ assertEquals(0, emptyGrp.forYoungest().nodes().size());
}
/**
@@ -187,8 +195,7 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
assertEquals(grid(gridMaxOrder(clusterSize, false)).localNode().id(), oddYoungest.node().id());
assertEquals(grid(2).localNode().id(), oddOldest.node().id());
- try (Ignite g4 = startGrid(NODES_CNT);
- Ignite g5 = startGrid(NODES_CNT + 1))
+ try (Ignite g4 = startGrid(NODES_CNT); Ignite g5 = startGrid(NODES_CNT + 1))
{
clusterSize = g4.cluster().nodes().size();
@@ -241,6 +248,27 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
}
/**
+ * @throws Exception If failed.
+ */
+ public void testEmptyGroup() throws Exception {
+ ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent", "val");
+
+ assertEquals(0, emptyGrp.forOldest().nodes().size());
+ assertEquals(0, emptyGrp.forYoungest().nodes().size());
+ assertEquals(0, emptyGrp.forAttribute("nonExistent2", "val").nodes().size());
+ assertEquals(0, emptyGrp.forCacheNodes("cacheName").nodes().size());
+ assertEquals(0, emptyGrp.forClientNodes("cacheName").nodes().size());
+ assertEquals(0, emptyGrp.forClients().nodes().size());
+ assertEquals(0, emptyGrp.forDaemons().nodes().size());
+ assertEquals(0, emptyGrp.forDataNodes("cacheName").nodes().size());
+ assertEquals(0, emptyGrp.forRandom().nodes().size());
+ assertEquals(0, emptyGrp.forRemotes().nodes().size());
+ assertEquals(0, emptyGrp.forServers().nodes().size());
+ assertEquals(0, emptyGrp.forHost(ignite.cluster().localNode()).nodes().size());
+ assertEquals(0, emptyGrp.forHost("127.0.0.1").nodes().size());
+ }
+
+ /**
* @param cnt Count.
* @param even Even.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 5dbf75a..5234d6e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -73,6 +73,9 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -169,6 +172,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setName("nearCache");
+ ccfg.setAtomicWriteOrderMode(PRIMARY);
final IgniteCache<Object, Object> nearCache = client.getOrCreateCache(ccfg, new NearCacheConfiguration<>());
@@ -786,8 +790,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) {
CacheAtomicWriteOrderMode[] writeOrders =
- atomicityMode == ATOMIC ? CacheAtomicWriteOrderMode.values() :
- new CacheAtomicWriteOrderMode[]{CacheAtomicWriteOrderMode.CLOCK};
+ atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{CLOCK};
for (CacheAtomicWriteOrderMode writeOrder : writeOrders) {
for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
new file mode 100644
index 0000000..1e3b213
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
@@ -0,0 +1,230 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ *
+ */
+public class TaskNodeRestartTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final int NODES = 3;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGridsMultiThreaded(NODES);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+
+ super.afterTestsStopped();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTaskNodeRestart() throws Exception {
+ final AtomicBoolean finished = new AtomicBoolean();
+
+ final AtomicInteger stopIdx = new AtomicInteger();
+
+ IgniteInternalFuture<?> restartFut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ int idx = stopIdx.getAndIncrement();
+
+ int node = NODES + idx;
+
+ while (!finished.get()) {
+ log.info("Start node: " + node);
+
+ startGrid(node);
+
+ U.sleep(300);
+
+ log.info("Stop node: " + node);
+
+ stopGrid(node);
+ }
+
+ return null;
+ }
+ }, 2, "stop-thread");
+
+ IgniteInternalFuture<?> fut = null;
+
+ try {
+ final long stopTime = System.currentTimeMillis() + 60_000;
+
+ final AtomicInteger idx = new AtomicInteger();
+
+ fut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ int node = idx.getAndIncrement() % NODES;
+
+ Ignite ignite = ignite(node);
+
+ log.info("Start thread: " + ignite.name());
+
+ IgniteCompute compute = ignite.compute();
+
+ while (U.currentTimeMillis() < stopTime) {
+ try {
+ compute.broadcast(new TestCallable());
+
+ compute.call(new TestCallable());
+
+ compute.execute(new TestTask1(), null);
+
+ compute.execute(new TestTask2(), null);
+ }
+ catch (IgniteException e) {
+ log.info("Error: " + e);
+ }
+ }
+
+ return null;
+ }
+ }, 20, "test-thread");
+
+ fut.get(90_000);
+
+ finished.set(true);
+
+ restartFut.get();
+ }
+ finally {
+ finished.set(true);
+
+ if (fut != null)
+ fut.cancel();
+
+ restartFut.get(5000);
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestTask1 extends ComputeTaskAdapter<Void, Void> {
+ /** {@inheritDoc} */
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Void arg)
+ throws IgniteException {
+ Map<TestJob, ClusterNode> jobs = new HashMap<>();
+
+ for (ClusterNode node : subgrid)
+ jobs.put(new TestJob(), node);
+
+ return jobs;
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteException {
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestTask2 implements ComputeTask<Void, Void> {
+ /** {@inheritDoc} */
+ @Nullable public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Void arg)
+ throws IgniteException {
+ Map<TestJob, ClusterNode> jobs = new HashMap<>();
+
+ for (ClusterNode node : subgrid)
+ jobs.put(new TestJob(), node);
+
+ return jobs;
+ }
+
+ /** {@inheritDoc} */
+ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
+ return ComputeJobResultPolicy.WAIT;
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Void reduce(List<ComputeJobResult> results) {
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestJob extends ComputeJobAdapter {
+ /** {@inheritDoc} */
+ @Override public Object execute() throws IgniteException {
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestCallable implements IgniteCallable<Void> {
+ /** {@inheritDoc} */
+ @Nullable @Override public Void call() throws Exception {
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
index 1738a0d..5d074e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
@@ -82,7 +82,7 @@ public class IgniteCacheSizeFailoverTest extends GridCommonAbstractTest {
IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
- int idx = cntr.getAndIncrement();
+ int idx = cntr.getAndIncrement() % 2;
IgniteCache<Object, Object> cache = ignite(idx).cache(null);
@@ -97,7 +97,7 @@ public class IgniteCacheSizeFailoverTest extends GridCommonAbstractTest {
return null;
}
- }, 2, "size-thread");
+ }, 10, "size-thread");
try {
for (int i = 0; i < 10; i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
index af04cdc..a253a25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
@@ -197,7 +197,9 @@ public class RandomEvictionPolicySelfTest extends
}
}, 10);
- assert g.cache(null).size() <= max;
+ int size = g.cache(null).size();
+
+ assertTrue("Unexpected cache size [size=" + size + ", max=" + max + ']', size <= max);
info(policy(0));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
index 16ea5e4..dfea37a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteServices;
import org.apache.ignite.Ignition;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.services.Service;
import org.apache.ignite.services.ServiceContext;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -31,6 +32,13 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
* Tests that {@link GridServiceProcessor} completes deploy/undeploy futures during node stop.
*/
public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ super.afterTest();
+ }
+
/**
* @throws Exception If failed.
*/
@@ -43,6 +51,8 @@ public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
Thread t = new Thread(new Runnable() {
@Override public void run() {
+ Thread.currentThread().setName("deploy-thread");
+
IgniteServices svcs = ignite.services();
IgniteServices services = svcs.withAsync();
@@ -69,13 +79,19 @@ public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
Ignition.stopAll(true);
- assertTrue("Deploy future isn't completed", finishLatch.await(15, TimeUnit.SECONDS));
+ boolean wait = finishLatch.await(15, TimeUnit.SECONDS);
+
+ if (!wait)
+ U.dumpThreads(log);
+
+ assertTrue("Deploy future isn't completed", wait);
}
/**
* Simple map service.
*/
public interface TestService {
+ // No-op.
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
index 62f4c1a..e885f48 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
@@ -78,8 +78,6 @@ public class IgniteMessagingWithClientTest extends GridCommonAbstractTest implem
* @throws Exception If failed.
*/
public void testMessageSendWithClientJoin() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-996");
-
startGrid(0);
Ignite ignite1 = startGrid(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
index 06cbf1c..c087d38 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.compute.ComputeTaskSessionScope;
import org.apache.ignite.compute.ComputeTaskSplitAdapter;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.TaskSessionResource;
@@ -55,7 +56,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
private static final int SPLIT_COUNT = 5;
/** */
- private static CountDownLatch taskLatch;
+ private static volatile CountDownLatch taskLatch;
/** */
protected GridSessionCheckpointAbstractSelfTest() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 5475f25..5af0596 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -980,7 +980,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
}
}
- assertTrue("GridTcpDiscoveryMulticastIpFinder should register port." , found);
+ assertTrue("TcpDiscoveryMulticastIpFinder should register port." , found);
}
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 23f2edc..e2c7e26 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -65,6 +65,7 @@ import org.apache.ignite.internal.IgniteComputeEmptyClusterGroupTest;
import org.apache.ignite.internal.IgniteComputeTopologyExceptionTest;
import org.apache.ignite.internal.IgniteExecutorServiceTest;
import org.apache.ignite.internal.IgniteExplicitImplicitDeploymentSelfTest;
+import org.apache.ignite.internal.TaskNodeRestartTest;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManagerSelfTest;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointTaskSelfTest;
import org.apache.ignite.internal.managers.communication.GridCommunicationManagerListenersSelfTest;
@@ -144,6 +145,7 @@ public class IgniteComputeGridTestSuite {
suite.addTestSuite(IgniteComputeEmptyClusterGroupTest.class);
suite.addTestSuite(IgniteComputeTopologyExceptionTest.class);
suite.addTestSuite(GridTaskFailoverAffinityRunTest.class);
+ suite.addTestSuite(TaskNodeRestartTest.class);
return suite;
}
[03/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by nt...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/914b727b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/914b727b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/914b727b
Branch: refs/heads/ignite-gg-10837
Commit: 914b727b3ed2a8dbdbd98c442016c188f37ea057
Parents: dfa84c8 9087f01
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Dec 17 12:52:00 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Dec 17 12:52:00 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 35 +++++++------
.../processors/cache/GridCacheUtils.java | 18 +------
.../core/src/main/resources/ignite.properties | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flume/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++++++++++++++++++--
modules/jcl/pom.xml | 2 +-
modules/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
modules/osgi-karaf/pom.xml | 2 +-
modules/osgi-paxlogging/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/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 +-
modules/yarn/pom.xml | 2 +-
modules/zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
67 files changed, 142 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
[04/50] [abbrv] ignite git commit: #Muting hanging test,
created ticket.
Posted by nt...@apache.org.
#Muting hanging test, created ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e599f44b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e599f44b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e599f44b
Branch: refs/heads/ignite-gg-10837
Commit: e599f44b2f8b90b9dde0de8e374f42cec8b61358
Parents: 914b727
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Dec 17 13:28:38 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Dec 17 13:28:38 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheStopAndDestroySelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e599f44b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 061a374..515ae87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -539,6 +539,8 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearClose() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-2189");
+
IgniteCache<String, String> cache0 = grid(0).getOrCreateCache(getNearConfig());
// GridDhtTxPrepareRequest requests to Client node will be counted.
[33/50] [abbrv] ignite git commit: 1.5.0-final-SNAPSHOT
Posted by nt...@apache.org.
1.5.0-final-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5869237
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5869237
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5869237
Branch: refs/heads/ignite-gg-10837
Commit: e5869237561eda9e57cb3e7c86deb7f83a8275fd
Parents: 359bf21
Author: Ignite Teamcity <ig...@apache.org>
Authored: Mon Dec 21 15:53:50 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Mon Dec 21 15:53:50 2015 +0300
----------------------------------------------------------------------
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++--
.../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++--
.../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
.../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++--
.../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
12 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/common/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/common/configure.ac b/modules/platforms/cpp/common/configure.ac
index f354f1a..b032282 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.10000], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7768], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/core-test/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/configure.ac b/modules/platforms/cpp/core-test/configure.ac
index 80072a8..b500ea4 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.0.10000], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7768], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/core/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/configure.ac b/modules/platforms/cpp/core/configure.ac
index aa4cbde..dc7c2c7 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.0.10000], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7768], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/examples/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/examples/configure.ac b/modules/platforms/cpp/examples/configure.ac
index 4c8316a..3f47fef 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ examples],[1.5.0.10000],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ examples],[1.5.0.7768],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/cpp/ignite/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/ignite/configure.ac b/modules/platforms/cpp/ignite/configure.ac
index 6da472e..dcc7e08 100644
--- a/modules/platforms/cpp/ignite/configure.ac
+++ b/modules/platforms/cpp/ignite/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Runner], [1.5.0.10000], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Runner], [1.5.0.7768], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index f250841..456967d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
[assembly: Guid("8fae8395-7e91-411a-a78f-44d6d3fed0fc")]
-[assembly: AssemblyVersion("1.5.0.10000")]
-[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyVersion("1.5.0.7768")]
+[assembly: AssemblyFileVersion("1.5.0.7768")]
[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index 97941e1..20be151 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -45,6 +45,6 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.10000")]
-[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyVersion("1.5.0.7768")]
+[assembly: AssemblyFileVersion("1.5.0.7768")]
[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 7e0ba0b..eef598e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
[assembly: Guid("de8dd5cc-7c7f-4a09-80d5-7086d9416a7b")]
-[assembly: AssemblyVersion("1.5.0.10000")]
-[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyVersion("1.5.0.7768")]
+[assembly: AssemblyFileVersion("1.5.0.7768")]
[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 4e22fb7..73cc115 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
[assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")]
-[assembly: AssemblyVersion("1.5.0.10000")]
-[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyVersion("1.5.0.7768")]
+[assembly: AssemblyFileVersion("1.5.0.7768")]
[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
[assembly: CLSCompliant(true)]
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
index aa2297d..282640a 100644
--- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
[assembly: Guid("0f9702ec-da7d-4ce5-b4b7-73310c885355")]
-[assembly: AssemblyVersion("1.5.0.10000")]
-[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyVersion("1.5.0.7768")]
+[assembly: AssemblyFileVersion("1.5.0.7768")]
[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
index 0d5ce64..41782d6 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
[assembly: Guid("41a0cb95-3435-4c78-b867-900b28e2c9ee")]
-[assembly: AssemblyVersion("1.5.0.10000")]
-[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyVersion("1.5.0.7768")]
+[assembly: AssemblyFileVersion("1.5.0.7768")]
[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5869237/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
index 9fb948b..e85d425 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Reflection;
[assembly: Guid("ce65ec7c-d3cf-41ad-8f45-f90d5af68d77")]
-[assembly: AssemblyVersion("1.5.0.10000")]
-[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyVersion("1.5.0.7768")]
+[assembly: AssemblyFileVersion("1.5.0.7768")]
[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
[47/50] [abbrv] ignite git commit: 1.5.0.final-SNAPSHOT
Posted by nt...@apache.org.
1.5.0.final-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa48b89e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa48b89e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa48b89e
Branch: refs/heads/ignite-gg-10837
Commit: fa48b89ec77a0095364d37371d52f544593572d5
Parents: 3ee0966
Author: Ignite Teamcity <ig...@apache.org>
Authored: Tue Dec 22 12:43:03 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Tue Dec 22 12:43:03 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/src/main/resources/ignite.properties | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flume/pom.xml | 2 +-
modules/gce/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/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
modules/osgi-karaf/pom.xml | 2 +-
modules/osgi-paxlogging/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 6 +++---
.../Properties/AssemblyInfo.cs | 6 +++---
.../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 6 +++---
.../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 6 +++---
.../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 6 +++---
.../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 6 +++---
.../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 6 +++---
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/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 +-
modules/yarn/pom.xml | 2 +-
modules/zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
64 files changed, 78 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index f123855..5b8c36a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index f2cfbeb..6abff1a 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -35,7 +35,7 @@
</properties>
<artifactId>ignite-schema-import-demo</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index c143c67..375628f 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/apache-license-gen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml
index 154d43b..d49a4f0 100644
--- a/modules/apache-license-gen/pom.xml
+++ b/modules/apache-license-gen/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-apache-license-gen</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index b4e8816..16a25d8 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/camel/pom.xml
----------------------------------------------------------------------
diff --git a/modules/camel/pom.xml b/modules/camel/pom.xml
index 6a574af..0e0b535 100644
--- a/modules/camel/pom.xml
+++ b/modules/camel/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-camel</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index cd8ae10..1f4555f 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index 175b3b2..20df4b9 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ignite-cloud</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index d124c42..50dbbc1 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 56c1ff3..f09f099 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<repositories>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index 3568cd4..6210489 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-ignite.version=1.5.0-final-SNAPSHOT
+ignite.version=1.5.0.final-SNAPSHOT
ignite.build=0
ignite.revision=DEV
ignite.rel.date=01011970
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 2525ab6..bfca85a 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.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/extdata/uri/modules/uri-dependency/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/modules/uri-dependency/pom.xml b/modules/extdata/uri/modules/uri-dependency/pom.xml
index 9de066c..53bf0b2 100644
--- a/modules/extdata/uri/modules/uri-dependency/pom.xml
+++ b/modules/extdata/uri/modules/uri-dependency/pom.xml
@@ -27,7 +27,7 @@
<artifactId>ignite-extdata-uri-dep</artifactId>
<packaging>jar</packaging>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 99fd120..c775a8d 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -32,7 +32,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/flume/pom.xml
----------------------------------------------------------------------
diff --git a/modules/flume/pom.xml b/modules/flume/pom.xml
index 2f856f8..4b3eb49 100644
--- a/modules/flume/pom.xml
+++ b/modules/flume/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-flume</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index b05e1ff..a725a8b 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-gce</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index eb9b89a..cfa9065 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 103d402..0cd553d 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index dcfe133..1eaf6f2 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 7efabcd..246462d 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index d11fdcc..1efb50d 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/jms11/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
index db2d6e9..793ae23 100644
--- a/modules/jms11/pom.xml
+++ b/modules/jms11/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jms11</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 10756aa..d7a5666 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/modules/kafka/pom.xml b/modules/kafka/pom.xml
index f99f3c0..85a2605 100644
--- a/modules/kafka/pom.xml
+++ b/modules/kafka/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-kafka</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 29230c0..ae8ab8c 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/log4j2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j2/pom.xml b/modules/log4j2/pom.xml
index 15d56ea..115a21d 100644
--- a/modules/log4j2/pom.xml
+++ b/modules/log4j2/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j2</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/mesos/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index 1d55b30..0c5286e 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mesos</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml
index 9f5cf8b..54f29c3 100644
--- a/modules/mqtt/pom.xml
+++ b/modules/mqtt/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mqtt</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/osgi-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-karaf/pom.xml b/modules/osgi-karaf/pom.xml
index 46cd239..11fcd38 100644
--- a/modules/osgi-karaf/pom.xml
+++ b/modules/osgi-karaf/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi-karaf</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/osgi-paxlogging/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-paxlogging/pom.xml b/modules/osgi-paxlogging/pom.xml
index 8d23b25..f2531d7 100644
--- a/modules/osgi-paxlogging/pom.xml
+++ b/modules/osgi-paxlogging/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi-paxlogging</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index a08c7a0..6348e4c 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/cpp/common/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/common/configure.ac b/modules/platforms/cpp/common/configure.ac
index b032282..ab05420 100644
--- a/modules/platforms/cpp/common/configure.ac
+++ b/modules/platforms/cpp/common/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7768], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7789], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/cpp/core-test/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/configure.ac b/modules/platforms/cpp/core-test/configure.ac
index b500ea4..3bf7c16 100644
--- a/modules/platforms/cpp/core-test/configure.ac
+++ b/modules/platforms/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.0.7768], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7789], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/cpp/core/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/configure.ac b/modules/platforms/cpp/core/configure.ac
index dc7c2c7..b9bc7f1 100644
--- a/modules/platforms/cpp/core/configure.ac
+++ b/modules/platforms/cpp/core/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.0.7768], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7789], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/cpp/examples/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/examples/configure.ac b/modules/platforms/cpp/examples/configure.ac
index 3f47fef..bda7e4f 100644
--- a/modules/platforms/cpp/examples/configure.ac
+++ b/modules/platforms/cpp/examples/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Ingnite C++ examples],[1.5.0.7768],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ examples],[1.5.0.7789],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/cpp/ignite/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/ignite/configure.ac b/modules/platforms/cpp/ignite/configure.ac
index dcc7e08..6d3a5f1 100644
--- a/modules/platforms/cpp/ignite/configure.ac
+++ b/modules/platforms/cpp/ignite/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Runner], [1.5.0.7768], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Runner], [1.5.0.7789], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index 456967d..869b090 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
[assembly: Guid("8fae8395-7e91-411a-a78f-44d6d3fed0fc")]
-[assembly: AssemblyVersion("1.5.0.7768")]
-[assembly: AssemblyFileVersion("1.5.0.7768")]
-[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
+[assembly: AssemblyVersion("1.5.0.7789")]
+[assembly: AssemblyFileVersion("1.5.0.7789")]
+[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index 20be151..edf867d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -45,6 +45,6 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.7768")]
-[assembly: AssemblyFileVersion("1.5.0.7768")]
-[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
+[assembly: AssemblyVersion("1.5.0.7789")]
+[assembly: AssemblyFileVersion("1.5.0.7789")]
+[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index eef598e..41b2aac 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
[assembly: Guid("de8dd5cc-7c7f-4a09-80d5-7086d9416a7b")]
-[assembly: AssemblyVersion("1.5.0.7768")]
-[assembly: AssemblyFileVersion("1.5.0.7768")]
-[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
+[assembly: AssemblyVersion("1.5.0.7789")]
+[assembly: AssemblyFileVersion("1.5.0.7789")]
+[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 73cc115..8eac438 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -33,9 +33,9 @@ using System.Runtime.InteropServices;
[assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")]
-[assembly: AssemblyVersion("1.5.0.7768")]
-[assembly: AssemblyFileVersion("1.5.0.7768")]
-[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
+[assembly: AssemblyVersion("1.5.0.7789")]
+[assembly: AssemblyFileVersion("1.5.0.7789")]
+[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
[assembly: CLSCompliant(true)]
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
index 282640a..08d2a9f 100644
--- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
[assembly: Guid("0f9702ec-da7d-4ce5-b4b7-73310c885355")]
-[assembly: AssemblyVersion("1.5.0.7768")]
-[assembly: AssemblyFileVersion("1.5.0.7768")]
-[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
+[assembly: AssemblyVersion("1.5.0.7789")]
+[assembly: AssemblyFileVersion("1.5.0.7789")]
+[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
index 41782d6..b4c0490 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
[assembly: Guid("41a0cb95-3435-4c78-b867-900b28e2c9ee")]
-[assembly: AssemblyVersion("1.5.0.7768")]
-[assembly: AssemblyFileVersion("1.5.0.7768")]
-[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
+[assembly: AssemblyVersion("1.5.0.7789")]
+[assembly: AssemblyFileVersion("1.5.0.7789")]
+[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
index e85d425..06815ed 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Reflection;
[assembly: Guid("ce65ec7c-d3cf-41ad-8f45-f90d5af68d77")]
-[assembly: AssemblyVersion("1.5.0.7768")]
-[assembly: AssemblyFileVersion("1.5.0.7768")]
-[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
+[assembly: AssemblyVersion("1.5.0.7789")]
+[assembly: AssemblyFileVersion("1.5.0.7789")]
+[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 1709c2c..4523d3b 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.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/scalar-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index 05b66f1..0cc030d 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar_2.10</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 8be03df..8a503e4 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 5246938..1abf75e 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index ff6387d..97b1d3a 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.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index aba43b9..65c1e2b 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/spark-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml
index 79db055..bfbd711 100644
--- a/modules/spark-2.10/pom.xml
+++ b/modules/spark-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark_2.10</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/spark/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index b79e0ec..aefd4b8 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 0c73598..e6c0d7f 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index b67252d..348e9ad 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 3f71641..35d6237 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/twitter/pom.xml b/modules/twitter/pom.xml
index 21b360d..a98ad20 100644
--- a/modules/twitter/pom.xml
+++ b/modules/twitter/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-twitter</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index fcd2b49..5c39e54 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/visor-console-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml
index e4c29f8..7b73bb4 100644
--- a/modules/visor-console-2.10/pom.xml
+++ b/modules/visor-console-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console_2.10</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index ccdba4f..126de56 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.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 4403e08..8a38515 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.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 9a7e81d..ee90a5f 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 9c0f594..357d21c 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml
index 348c72e..bf89a6a 100644
--- a/modules/yarn/pom.xml
+++ b/modules/yarn/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yarn</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/modules/zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index 8879ec3..96fb1fc 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-zookeeper</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa48b89e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c728f51..51271b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
- <version>1.5.0-final-SNAPSHOT</version>
+ <version>1.5.0.final-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
[09/50] [abbrv] ignite git commit: #Added test.
Posted by nt...@apache.org.
#Added test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f484ea1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f484ea1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f484ea1
Branch: refs/heads/ignite-gg-10837
Commit: 1f484ea17ced36b44c2b78201674c302a484db5e
Parents: 3223b05
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Dec 17 15:36:23 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Dec 17 15:36:23 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheSerializationSelfTest.java | 112 +++++++++++++++++++
1 file changed, 112 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f484ea1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
new file mode 100644
index 0000000..2c8c3bc
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+
+/**
+ *
+ */
+public class IgniteCacheSerializationSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final int NODES = 3;
+
+ /** */
+ private static final int CLIENT = NODES - 1;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ if (getTestGridName(CLIENT).equals(gridName))
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+
+ super.afterTestsStopped();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGrids(NODES);
+ }
+
+ /**
+ * @param cacheMode Cache mode.
+ * @param atomicityMode Atomicity mode.
+ * @return Cache configuration.
+ */
+ private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheMode cacheMode, CacheAtomicityMode atomicityMode) {
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+
+ ccfg.setCacheMode(cacheMode);
+ ccfg.setAtomicityMode(atomicityMode);
+
+ ccfg.setBackups(1);
+
+ return ccfg;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSerializeClosure() throws Exception {
+ Ignite client = ignite(CLIENT);
+
+ final IgniteCache<Integer, Integer> clientCache = client.createCache(cacheConfiguration(PARTITIONED, ATOMIC));
+
+ try {
+ client.compute(client.cluster().forRemotes().forRandom()).call(new IgniteCallable<Object>() {
+ @Override public Object call() throws Exception {
+ clientCache.withKeepBinary();
+ clientCache.withSkipStore();
+
+ return null;
+ }
+ });
+ }
+ finally {
+ client.destroyCache(null);
+ }
+ }
+}
[48/50] [abbrv] ignite git commit: IGNITE-2226
Posted by nt...@apache.org.
IGNITE-2226
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1039bf69
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1039bf69
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1039bf69
Branch: refs/heads/ignite-gg-10837
Commit: 1039bf69e94c07e5e8d26860f0df2037caab79a7
Parents: fa48b89
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Dec 22 13:18:33 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Dec 22 13:18:33 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1039bf69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51271b3..4bdad1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,7 +821,7 @@
<replaceregexp byline="true" encoding="UTF-8">
<regexp pattern="(\[assembly:\s*AssemblyInformationalVersion\w*\(").*?("\)\])" />
- <substitution expression="\1${new.ignite.version}\2" />
+ <substitution expression="\1${new.ignite.version.fixed}\2" />
<fileset dir="${basedir}/">
<include name="**/AssemblyInfo.cs" />
<include name="**/AssemblyInfo.cpp" />
[30/50] [abbrv] ignite git commit: ignite-1.5 Fixed client discovery
impl to skip node failed message processing while disconnected.
Posted by nt...@apache.org.
ignite-1.5 Fixed client discovery impl to skip node failed message processing while disconnected.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4687d9f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4687d9f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4687d9f
Branch: refs/heads/ignite-gg-10837
Commit: d4687d9f636b38736d327351ca4b22c3262a2ae8
Parents: 58b55b5
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 21 10:19:51 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 21 10:19:51 2015 +0300
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 4 +-
.../dht/preloader/GridDhtPreloader.java | 29 ------------
.../ignite/spi/discovery/tcp/ClientImpl.java | 48 +++++++++++---------
.../IgniteClientReconnectCacheTest.java | 26 +++++++++--
.../cache/IgniteCachePutAllRestartTest.java | 2 +-
5 files changed, 53 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4687d9f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 92d66d7..72a2bef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -1641,7 +1641,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
if (cache == null) {
throw new IgniteException("Failed to resolve nodes topology [cacheName=" + cacheName +
- ", topVer=" + topVer + ", history=" + discoCacheHist.keySet() +
+ ", topVer=" + topVer +
+ ", history=" + discoCacheHist.keySet() +
+ ", snap=" + snap +
", locNode=" + ctx.discovery().localNode() + ']');
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4687d9f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index c46a66c..f0054e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -48,7 +48,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
-import org.apache.ignite.internal.util.GridAtomicLong;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -92,9 +91,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** */
private GridDhtPartitionTopology top;
- /** Topology version. */
- private final GridAtomicLong topVer = new GridAtomicLong();
-
/** Force key futures. */
private final ConcurrentMap<IgniteUuid, GridDhtForceKeysFuture<?, ?>> forceKeyFuts = newMap();
@@ -149,11 +145,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
assert e.type() != EVT_NODE_JOINED || n.order() > loc.order() : "Node joined with smaller-than-local " +
"order [newOrder=" + n.order() + ", locOrder=" + loc.order() + ']';
- boolean set = topVer.setIfGreater(e.topologyVersion());
-
- assert set : "Have you configured TcpDiscoverySpi for your in-memory data grid? [newVer=" +
- e.topologyVersion() + ", curVer=" + topVer.get() + ", evt=" + e + ']';
-
if (e.type() == EVT_NODE_LEFT || e.type() == EVT_NODE_FAILED) {
for (GridDhtAssignmentFetchFuture fut : pendingAssignmentFetchFuts.values())
fut.onNodeLeft(e.eventNode().id());
@@ -238,20 +229,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
}
/** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- if (log.isDebugEnabled())
- log.debug("DHT rebalancer onKernalStart callback.");
-
- ClusterNode loc = cctx.localNode();
-
- assert loc.metrics().getStartTime() > 0;
-
- final long startTopVer = loc.order();
-
- topVer.setIfGreater(startTopVer);
- }
-
- /** {@inheritDoc} */
@Override public void preloadPredicate(IgnitePredicate<GridCacheEntryInfo> preloadPred) {
super.preloadPredicate(preloadPred);
@@ -382,12 +359,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** {@inheritDoc} */
@Override public void onReconnected() {
startFut = new GridFutureAdapter<>();
-
- long topVer0 = cctx.kernalContext().discovery().topologyVersion();
-
- assert topVer0 > 0 : topVer0;
-
- topVer.set(topVer0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4687d9f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 8f6c8a9..850cc24 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -1828,36 +1828,42 @@ class ClientImpl extends TcpDiscoveryImpl {
return;
}
- if (!getLocalNodeId().equals(msg.creatorNodeId())) {
- TcpDiscoveryNode node = rmtNodes.remove(msg.failedNodeId());
+ if (nodeAdded()) {
+ if (!getLocalNodeId().equals(msg.creatorNodeId())) {
+ TcpDiscoveryNode node = rmtNodes.remove(msg.failedNodeId());
- if (node == null) {
- if (log.isDebugEnabled())
- log.debug("Discarding node failed message since node is not found [msg=" + msg + ']');
+ if (node == null) {
+ if (log.isDebugEnabled())
+ log.debug("Discarding node failed message since node is not found [msg=" + msg + ']');
- return;
- }
+ return;
+ }
- Collection<ClusterNode> top = updateTopologyHistory(msg.topologyVersion(), msg);
+ Collection<ClusterNode> top = updateTopologyHistory(msg.topologyVersion(), msg);
- if (state != CONNECTED) {
- if (log.isDebugEnabled())
- log.debug("Discarding node failed message (join process is not finished): " + msg);
+ if (state != CONNECTED) {
+ if (log.isDebugEnabled())
+ log.debug("Discarding node failed message (join process is not finished): " + msg);
- return;
- }
+ return;
+ }
- if (msg.warning() != null) {
- ClusterNode creatorNode = rmtNodes.get(msg.creatorNodeId());
+ if (msg.warning() != null) {
+ ClusterNode creatorNode = rmtNodes.get(msg.creatorNodeId());
- U.warn(log, "Received EVT_NODE_FAILED event with warning [" +
- "nodeInitiatedEvt=" + (creatorNode != null ? creatorNode : msg.creatorNodeId()) +
- ", msg=" + msg.warning() + ']');
- }
+ U.warn(log, "Received EVT_NODE_FAILED event with warning [" +
+ "nodeInitiatedEvt=" + (creatorNode != null ? creatorNode : msg.creatorNodeId()) +
+ ", msg=" + msg.warning() + ']');
+ }
- notifyDiscovery(EVT_NODE_FAILED, msg.topologyVersion(), node, top);
+ notifyDiscovery(EVT_NODE_FAILED, msg.topologyVersion(), node, top);
- spi.stats.onNodeFailed();
+ spi.stats.onNodeFailed();
+ }
+ }
+ else {
+ if (log.isDebugEnabled())
+ log.debug("Ignore topology message, local node not added to topology: " + msg);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4687d9f/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 5234d6e..ad6c46f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -1088,7 +1088,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
clientMode = true;
- final int CLIENTS = 2;
+ final int CLIENTS = 5;
List<Ignite> clients = new ArrayList<>();
@@ -1103,12 +1103,14 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
int nodes = SRV_CNT + CLIENTS;
int srvNodes = SRV_CNT;
- for (int iter = 0; iter < 3; iter++) {
+ for (int iter = 0; iter < 5; iter++) {
log.info("Iteration: " + iter);
reconnectClientNodes(log, clients, grid(0), null);
- for (Ignite client : clients) {
+ final int expNodes = CLIENTS + srvNodes;
+
+ for (final Ignite client : clients) {
IgniteCache<Object, Object> cache = client.cache(null);
assertNotNull(cache);
@@ -1117,6 +1119,14 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
assertEquals(1, cache.get(client.name()));
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ ClusterGroup grp = client.cluster().forCacheNodes(null);
+
+ return grp.nodes().size() == expNodes;
+ }
+ }, 5000);
+
ClusterGroup grp = client.cluster().forCacheNodes(null);
assertEquals(CLIENTS + srvNodes, grp.nodes().size());
@@ -1127,7 +1137,15 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
}
for (int i = 0; i < nodes; i++) {
- Ignite ignite = grid(i);
+ final Ignite ignite = grid(i);
+
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ ClusterGroup grp = ignite.cluster().forCacheNodes(null);
+
+ return grp.nodes().size() == expNodes;
+ }
+ }, 5000);
ClusterGroup grp = ignite.cluster().forCacheNodes(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4687d9f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
index 3e124f3..96a396c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
@@ -121,7 +121,7 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest {
iter++;
- if (iter % 10 == 0)
+ if (iter % 1000 == 0)
log.info("Iteration: " + iter);
}
[38/50] [abbrv] ignite git commit: ignite-1979 Support case
insensitive nonquoted cache names in SQL - Fixes #324.
Posted by nt...@apache.org.
ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.
Signed-off-by: S.Vladykin <sv...@gridgain.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da24df99
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da24df99
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da24df99
Branch: refs/heads/ignite-gg-10837
Commit: da24df99525b796a79fdb55997efe1c9bd515a5d
Parents: a0cdb59
Author: vershov <ve...@gridgain.com>
Authored: Tue Dec 22 00:08:37 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Dec 22 00:08:37 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 44 +++-
.../ignite/internal/util/IgniteUtils.java | 6 +-
.../cache/VisorCacheQueryConfiguration.java | 11 +
.../processors/query/h2/IgniteH2Indexing.java | 118 ++++++---
.../query/h2/sql/GridSqlQuerySplitter.java | 48 ++--
.../query/IgniteSqlSchemaIndexingTest.java | 240 +++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../commands/cache/VisorCacheCommand.scala | 13 +-
8 files changed, 416 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index be1240c..d52662e 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -365,15 +365,18 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
private IgnitePredicate<ClusterNode> nodeFilter;
/** */
- private boolean sqlEscapeAll;
+ private String sqlSchema;
/** */
- private transient Class<?>[] indexedTypes;
+ private boolean sqlEscapeAll;
/** */
private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE;
/** */
+ private transient Class<?>[] indexedTypes;
+
+ /** */
private boolean snapshotableIdx;
/** Copy on read flag. */
@@ -466,6 +469,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
rebalanceTimeout = cc.getRebalanceTimeout();
rebalanceThrottle = cc.getRebalanceThrottle();
snapshotableIdx = cc.isSnapshotableIndex();
+ sqlSchema = cc.getSqlSchema();
sqlEscapeAll = cc.isSqlEscapeAll();
sqlFuncCls = cc.getSqlFunctionClasses();
sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize();
@@ -1770,7 +1774,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets timeout in milliseconds after which long query warning will be printed.
+ * Sets timeout in milliseconds after which long query warning will be printed.
*
* @param longQryWarnTimeout Timeout in milliseconds.
* @return {@code this} for chaining.
@@ -1782,6 +1786,40 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
+ * Gets custom name of the sql schema. If custom sql schema is not set then {@code null} will be returned and
+ * quoted case sensitive name will be used as sql schema.
+ *
+ * @return Schema name for current cache according to SQL ANSI-99. Could be {@code null}.
+ */
+ @Nullable public String getSqlSchema() {
+ return sqlSchema;
+ }
+
+ /**
+ * Sets sql schema to be used for current cache. This name will correspond to SQL ANSI-99 standard.
+ * Nonquoted identifiers are not case sensitive. Quoted identifiers are case sensitive.
+ * <p/>
+ * Be aware of using the same string in case sensitive and case insensitive manner simultaneously, since
+ * behaviour for such case is not specified.
+ * <p/>
+ * When sqlSchema is not specified, quoted {@code cacheName} is used instead.
+ * <p/>
+ * {@code sqlSchema} could not be an empty string. Has to be {@code "\"\""} instead.
+ *
+ * @param sqlSchema Schema name for current cache according to SQL ANSI-99. Should not be {@code null}.
+ *
+ * @return {@code this} for chaining.
+ */
+ public CacheConfiguration<K, V> setSqlSchema(String sqlSchema) {
+ A.ensure((sqlSchema != null), "Schema could not be null.");
+ A.ensure(!sqlSchema.isEmpty(), "Schema could not be empty.");
+
+ this.sqlSchema = sqlSchema;
+
+ return this;
+ }
+
+ /**
* If {@code true} all the SQL table and field names will be escaped with double quotes like
* ({@code "tableName"."fieldsName"}). This enforces case sensitivity for field names and
* also allows having special characters in table and field names.
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index e74b3f0..be4851d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -4243,11 +4243,11 @@ public abstract class IgniteUtils {
/**
* Mask component name to make sure that it is not {@code null}.
*
- * @param cacheName Component name to mask, possibly {@code null}.
+ * @param name Component name to mask, possibly {@code null}.
* @return Component name.
*/
- public static String maskName(@Nullable String cacheName) {
- return cacheName == null ? "default" : cacheName;
+ public static String maskName(@Nullable String name) {
+ return name == null ? "default" : name;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
index cbb97a5..a779db4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
@@ -35,6 +35,9 @@ public class VisorCacheQueryConfiguration implements Serializable {
private long longQryWarnTimeout;
/** */
+ private String sqlSchema;
+
+ /** */
private boolean sqlEscapeAll;
/** */
@@ -69,6 +72,7 @@ public class VisorCacheQueryConfiguration implements Serializable {
cfg.sqlFuncClss = compactClasses(ccfg.getSqlFunctionClasses());
cfg.longQryWarnTimeout = ccfg.getLongQueryWarningTimeout();
+ cfg.sqlSchema = ccfg.getSqlSchema();
cfg.sqlEscapeAll = ccfg.isSqlEscapeAll();
cfg.indexedTypes = compactClasses(ccfg.getIndexedTypes());
cfg.sqlOnheapRowCacheSize = ccfg.getSqlOnheapRowCacheSize();
@@ -91,6 +95,13 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
+ * @return Schema name, which is used by SQL engine for SQL statements generation.
+ */
+ public String sqlSchema() {
+ return sqlSchema;
+ }
+
+ /**
* @return {@code true} if SQL engine generate SQL statements with escaped names.
*/
public boolean sqlEscapeAll() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/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 8625be9..dead526 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
@@ -195,6 +195,12 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** */
private static final Field COMMAND_FIELD;
+ /** */
+ private static final char ESC_CH = '\"';
+
+ /** */
+ private static final String ESC_STR = ESC_CH + "" + ESC_CH;
+
/**
* Command in H2 prepared statement.
*/
@@ -236,6 +242,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** */
private GridReduceQueryExecutor rdcQryExec;
+ /** space name -> schema name */
+ private final Map<String, String> space2schema = new ConcurrentHashMap8<>();
+
/** */
private final ThreadLocal<ConnectionWrapper> connCache = new ThreadLocal<ConnectionWrapper>() {
@Nullable @Override public ConnectionWrapper get() {
@@ -360,7 +369,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
try {
stmt = c.connection().createStatement();
- stmt.executeUpdate("SET SCHEMA \"" + schema + '"');
+ stmt.executeUpdate("SET SCHEMA " + schema);
if (log.isDebugEnabled())
log.debug("Set schema: " + schema);
@@ -386,7 +395,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @throws IgniteCheckedException If failed to create db schema.
*/
private void createSchema(String schema) throws IgniteCheckedException {
- executeStatement("INFORMATION_SCHEMA", "CREATE SCHEMA IF NOT EXISTS \"" + schema + '"');
+ executeStatement("INFORMATION_SCHEMA", "CREATE SCHEMA IF NOT EXISTS " + schema);
if (log.isDebugEnabled())
log.debug("Created H2 schema for index database: " + schema);
@@ -399,7 +408,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @throws IgniteCheckedException If failed to create db schema.
*/
private void dropSchema(String schema) throws IgniteCheckedException {
- executeStatement("INFORMATION_SCHEMA", "DROP SCHEMA IF EXISTS \"" + schema + '"');
+ executeStatement("INFORMATION_SCHEMA", "DROP SCHEMA IF EXISTS " + schema);
if (log.isDebugEnabled())
log.debug("Dropped H2 schema for index database: " + schema);
@@ -642,7 +651,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (log.isDebugEnabled())
log.debug("Removing query index table: " + tbl.fullTableName());
- Connection c = connectionForThread(tbl.schema());
+ Connection c = connectionForThread(tbl.schemaName());
Statement stmt = null;
@@ -767,6 +776,22 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/**
+ * Stores rule for constructing schemaName according to cache configuration.
+ *
+ * @param ccfg Cache configuration.
+ * @return Proper schema name according to ANSI-99 standard.
+ */
+ private static String schemaNameFromCacheConf(CacheConfiguration<?,?> ccfg) {
+ if (ccfg.getSqlSchema() == null)
+ return escapeName(ccfg.getName(), true);
+
+ if (ccfg.getSqlSchema().charAt(0) == ESC_CH)
+ return ccfg.getSqlSchema();
+
+ return ccfg.isSqlEscapeAll() ? escapeName(ccfg.getSqlSchema(), true) : ccfg.getSqlSchema().toUpperCase();
+ }
+
+ /**
* Executes sql query.
*
* @param conn Connection,.
@@ -865,9 +890,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @return Result set.
* @throws IgniteCheckedException If failed.
*/
- private ResultSet executeQuery(String space, String qry, @Nullable Collection<Object> params,
- TableDescriptor tbl) throws IgniteCheckedException {
- Connection conn = connectionForThread(tbl.schema());
+ private ResultSet executeQuery(String space, String qry, @Nullable Collection<Object> params, TableDescriptor tbl)
+ throws IgniteCheckedException {
+ Connection conn = connectionForThread(tbl.schemaName());
String sql = generateQuery(qry, tbl);
@@ -1027,7 +1052,8 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
try {
- twoStepQry = GridSqlQuerySplitter.split((JdbcPreparedStatement)stmt, qry.getArgs(), qry.isCollocated());
+ twoStepQry = GridSqlQuerySplitter.split(
+ (JdbcPreparedStatement)stmt, qry.getArgs(), qry.isCollocated(), this);
meta = meta(stmt.getMetaData());
}
@@ -1174,6 +1200,16 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/**
+ * Returns empty string, if {@code nullableString} is empty.
+ *
+ * @param nullableString String for convertion. Could be null.
+ * @return Non null string. Could be empty.
+ */
+ private static String emptyIfNull(String nullableString) {
+ return nullableString == null ? "" : nullableString;
+ }
+
+ /**
* Escapes name to be valid SQL identifier. Currently just replaces '.' and '$' sign with '_'.
*
* @param name Name.
@@ -1181,8 +1217,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @return Escaped name.
*/
private static String escapeName(String name, boolean escapeAll) {
+ if (name == null) // It is possible only for a cache name.
+ return ESC_STR;
+
if (escapeAll)
- return "\"" + name + "\"";
+ return ESC_CH + name + ESC_CH;
SB sb = null;
@@ -1304,24 +1343,32 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* Gets database schema from space.
*
- * @param space Space name.
- * @return Schema name.
+ * @param space Space name. {@code null} would be converted to an empty string.
+ * @return Schema name. Should not be null since we should not fail for an invalid space name.
*/
- public static String schema(@Nullable String space) {
- if (space == null)
- return "";
-
- return space;
+ private String schema(@Nullable String space) {
+ return emptyIfNull(space2schema.get(emptyIfNull(space)));
}
/**
- * @param schema Schema.
- * @return Space name.
+ * Gets space name from database schema.
+ *
+ * @param schemaName Schema name. Could not be null. Could be empty.
+ * @return Space name. Could be null.
*/
- public static String space(String schema) {
- assert schema != null;
+ public String space(String schemaName) {
+ assert schemaName != null;
+
+ Schema schema = schemas.get(schemaName);
+
+ // For the compatibility with conversion from """" to "" inside h2 lib
+ if (schema == null) {
+ assert schemaName.isEmpty() || schemaName.charAt(0) != ESC_CH;
+
+ schema = schemas.get(escapeName(schemaName, true));
+ }
- return "".equals(schema) ? null : schema;
+ return schema.spaceName;
}
/** {@inheritDoc} */
@@ -1427,7 +1474,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
rdcQryExec.start(ctx, this);
}
- // TODO https://issues.apache.org/jira/browse/IGNITE-751
+ // TODO https://issues.apache.org/jira/browse/IGNITE-2139
// registerMBean(gridName, this, GridH2IndexingSpiMBean.class);
}
@@ -1485,7 +1532,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (log.isDebugEnabled())
log.debug("Stopping cache query index...");
-// unregisterMBean(); TODO
+// unregisterMBean(); TODO https://issues.apache.org/jira/browse/IGNITE-2139
for (Schema schema : schemas.values()) {
for (TableDescriptor desc : schema.tbls.values()) {
@@ -1501,6 +1548,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
conns.clear();
schemas.clear();
+ space2schema.clear();
try (Connection c = DriverManager.getConnection(dbUrl);
Statement s = c.createStatement()) {
@@ -1516,12 +1564,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@Override public void registerCache(CacheConfiguration<?,?> ccfg) throws IgniteCheckedException {
- String schema = schema(ccfg.getName());
+ String schema = schemaNameFromCacheConf(ccfg);
- if (schemas.putIfAbsent(schema, new Schema(ccfg.getName(),
+ if (schemas.putIfAbsent(schema, new Schema(ccfg.getName(), schema,
ccfg.getOffHeapMaxMemory() >= 0 || ccfg.getMemoryMode() == CacheMemoryMode.OFFHEAP_TIERED ?
new GridUnsafeMemory(0) : null, ccfg)) != null)
- throw new IgniteCheckedException("Cache already registered: " + U.maskName(ccfg.getName()));
+ throw new IgniteCheckedException("Schema for cache already registered: " + U.maskName(ccfg.getName()));
+
+ space2schema.put(emptyIfNull(ccfg.getName()), schema);
createSchema(schema);
@@ -1531,10 +1581,10 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@Override public void unregisterCache(CacheConfiguration<?, ?> ccfg) {
String schema = schema(ccfg.getName());
-
Schema rmv = schemas.remove(schema);
if (rmv != null) {
+ space2schema.remove(rmv.spaceName);
mapQryExec.onCacheStop(ccfg.getName());
try {
@@ -1855,15 +1905,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
this.type = type;
this.schema = schema;
- fullTblName = '\"' + IgniteH2Indexing.schema(schema.spaceName) + "\"." +
- escapeName(type.name(), schema.escapeAll());
+ fullTblName = schema.schemaName + "." + escapeName(type.name(), schema.escapeAll());
}
/**
* @return Schema name.
*/
- public String schema() {
- return IgniteH2Indexing.schema(schema.spaceName);
+ public String schemaName() {
+ return schema.schemaName;
}
/**
@@ -2129,6 +2178,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
private final String spaceName;
/** */
+ private final String schemaName;
+
+ /** */
private final GridUnsafeMemory offheap;
/** */
@@ -2142,11 +2194,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* @param spaceName Space name.
+ * @param schemaName Schema name.
* @param offheap Offheap memory.
* @param ccfg Cache configuration.
*/
- private Schema(@Nullable String spaceName, GridUnsafeMemory offheap, CacheConfiguration<?,?> ccfg) {
+ private Schema(@Nullable String spaceName, String schemaName, GridUnsafeMemory offheap, CacheConfiguration<?,?> ccfg) {
this.spaceName = spaceName;
+ this.schemaName = schemaName;
this.offheap = offheap;
this.ccfg = ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/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 727c2c7..3d9c10a 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
@@ -138,18 +138,19 @@ public class GridSqlQuerySplitter {
* @param stmt Prepared statement.
* @param params Parameters.
* @param collocated Collocated query.
+ * @param igniteH2Indexing Indexing implementation.
* @return Two step query.
*/
- public static GridCacheTwoStepQuery split(JdbcPreparedStatement stmt, Object[] params, boolean collocated) {
+ public static GridCacheTwoStepQuery split(JdbcPreparedStatement stmt, Object[] params, boolean collocated, IgniteH2Indexing igniteH2Indexing) {
if (params == null)
params = GridCacheSqlQuery.EMPTY_PARAMS;
- Set<String> spaces = new HashSet<>();
+ Set<String> schemas = new HashSet<>();
// Map query will be direct reference to the original query AST.
// Thus all the modifications will be performed on the original AST, so we should be careful when
// nullifying or updating things, have to make sure that we will not need them in the original form later.
- final GridSqlSelect mapQry = wrapUnion(collectAllSpaces(GridSqlQueryParser.parse(stmt), spaces));
+ final GridSqlSelect mapQry = wrapUnion(collectAllSpaces(GridSqlQueryParser.parse(stmt), schemas));
final boolean explain = mapQry.explain();
@@ -258,6 +259,11 @@ public class GridSqlQuerySplitter {
map.parameterIndexes(toIntArray(paramIdxs));
+ Set<String> spaces = new HashSet<>(schemas.size());
+
+ for (String schema : schemas)
+ spaces.add(igniteH2Indexing.space(schema));
+
// Build resulting two step query.
GridCacheTwoStepQuery res = new GridCacheTwoStepQuery(spaces, rdc, rdcQry.simpleQuery()).addMapQuery(map);
@@ -309,25 +315,25 @@ public class GridSqlQuerySplitter {
/**
* @param qry Query.
- * @param spaces Space names.
+ * @param schemas Shemas' names.
* @return Query.
*/
- private static GridSqlQuery collectAllSpaces(GridSqlQuery qry, Set<String> spaces) {
+ private static GridSqlQuery collectAllSpaces(GridSqlQuery qry, Set<String> schemas) {
if (qry instanceof GridSqlUnion) {
GridSqlUnion union = (GridSqlUnion)qry;
- collectAllSpaces(union.left(), spaces);
- collectAllSpaces(union.right(), spaces);
+ collectAllSpaces(union.left(), schemas);
+ collectAllSpaces(union.right(), schemas);
}
else {
GridSqlSelect select = (GridSqlSelect)qry;
- collectAllSpacesInFrom(select.from(), spaces);
+ collectAllSpacesInFrom(select.from(), schemas);
for (GridSqlElement el : select.columns(false))
- collectAllSpacesInSubqueries(el, spaces);
+ collectAllSpacesInSubqueries(el, schemas);
- collectAllSpacesInSubqueries(select.where(), spaces);
+ collectAllSpacesInSubqueries(select.where(), schemas);
}
return qry;
@@ -335,26 +341,26 @@ public class GridSqlQuerySplitter {
/**
* @param from From element.
- * @param spaces Space names.
+ * @param schemas Shemas' names.
*/
- private static void collectAllSpacesInFrom(GridSqlElement from, Set<String> spaces) {
+ private static void collectAllSpacesInFrom(GridSqlElement from, Set<String> schemas) {
assert from != null;
if (from instanceof GridSqlJoin) {
// Left and right.
- collectAllSpacesInFrom(from.child(0), spaces);
- collectAllSpacesInFrom(from.child(1), spaces);
+ collectAllSpacesInFrom(from.child(0), schemas);
+ collectAllSpacesInFrom(from.child(1), schemas);
}
else if (from instanceof GridSqlTable) {
String schema = ((GridSqlTable)from).schema();
if (schema != null)
- spaces.add(IgniteH2Indexing.space(schema));
+ schemas.add(schema);
}
else if (from instanceof GridSqlSubquery)
- collectAllSpaces(((GridSqlSubquery)from).select(), spaces);
+ collectAllSpaces(((GridSqlSubquery)from).select(), schemas);
else if (from instanceof GridSqlAlias)
- collectAllSpacesInFrom(from.child(), spaces);
+ collectAllSpacesInFrom(from.child(), schemas);
else if (!(from instanceof GridSqlFunction))
throw new IllegalStateException(from.getClass().getName() + " : " + from.getSQL());
}
@@ -362,18 +368,18 @@ public class GridSqlQuerySplitter {
/**
* Searches spaces in subqueries in SELECT and WHERE clauses.
* @param el Element.
- * @param spaces Space names.
+ * @param schemas Schemas' names.
*/
- private static void collectAllSpacesInSubqueries(GridSqlElement el, Set<String> spaces) {
+ private static void collectAllSpacesInSubqueries(GridSqlElement el, Set<String> schemas) {
if (el instanceof GridSqlAlias)
el = el.child();
if (el instanceof GridSqlOperation || el instanceof GridSqlFunction) {
for (GridSqlElement child : el)
- collectAllSpacesInSubqueries(child, spaces);
+ collectAllSpacesInSubqueries(child, schemas);
}
else if (el instanceof GridSqlSubquery)
- collectAllSpaces(((GridSqlSubquery)el).select(), spaces);
+ collectAllSpaces(((GridSqlSubquery)el).select(), schemas);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java
new file mode 100644
index 0000000..5c9acb5
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java
@@ -0,0 +1,240 @@
+/*
+ * 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.query;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * Tests {@link IgniteH2Indexing} support {@link CacheConfiguration#setSqlSchema(String)} configuration.
+ */
+@SuppressWarnings("unchecked")
+public class IgniteSqlSchemaIndexingTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration() throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration();
+
+ cfg.setPeerClassLoadingEnabled(false);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(disco);
+
+ return cfg;
+ }
+
+ /**
+ * @param name Cache name.
+ * @param partitioned Partition or replicated cache.
+ * @param idxTypes Indexed types.
+ * @return Cache configuration.
+ */
+ private static CacheConfiguration cacheConfig(String name, boolean partitioned, Class<?>... idxTypes) {
+ return new CacheConfiguration()
+ .setName(name)
+ .setCacheMode(partitioned ? CacheMode.PARTITIONED : CacheMode.REPLICATED)
+ .setAtomicityMode(CacheAtomicityMode.ATOMIC)
+ .setBackups(1)
+ .setIndexedTypes(Integer.class, Fact.class);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ * Tests collision for case insensitive sqlScheme.
+ *
+ * @throws Exception If failed.
+ */
+ public void testCaseSensitive() throws Exception {
+ //TODO rewrite with dynamic cache creation, and GRID start in #beforeTest after resolve of
+ //https://issues.apache.org/jira/browse/IGNITE-1094
+
+ GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ final CacheConfiguration cfg = cacheConfig("InSensitiveCache", true, Integer.class, Integer.class)
+ .setSqlSchema("InsensitiveCache");
+ final CacheConfiguration collisionCfg = cacheConfig("InsensitiveCache", true, Integer.class, Integer.class)
+ .setSqlSchema("Insensitivecache");
+ IgniteConfiguration icfg = new IgniteConfiguration()
+ .setLocalHost("127.0.0.1")
+ .setCacheConfiguration(cfg, collisionCfg);
+
+ Ignition.start(icfg);
+
+ return null;
+ }
+ }, IgniteException.class, "Schema for cache already registered");
+ }
+
+ /**
+ * Tests unregistration of previous scheme.
+ *
+ * @throws Exception If failed.
+ */
+ public void testCacheUnregistration() throws Exception {
+ startGridsMultiThreaded(3, true);
+
+ final CacheConfiguration<Integer, Fact> cfg = cacheConfig("Insensitive_Cache", true, Integer.class, Fact.class)
+ .setSqlSchema("Insensitive_Cache");
+ final CacheConfiguration<Integer, Fact> collisionCfg = cacheConfig("InsensitiveCache", true, Integer.class, Fact.class)
+ .setSqlSchema("Insensitive_Cache");
+
+ IgniteCache<Integer, Fact> cache = ignite(0).createCache(cfg);
+
+ SqlFieldsQuery qry = new SqlFieldsQuery("select f.id, f.name " +
+ "from InSENSitive_Cache.Fact f");
+
+ cache.put(1, new Fact(1, "cacheInsensitive"));
+
+ for (List<?> row : cache.query(qry)) {
+ assertEquals(2, row.size());
+ assertEquals(1, row.get(0));
+ assertEquals("cacheInsensitive", row.get(1));
+ }
+
+ ignite(0).destroyCache(cache.getName());
+
+ cache = ignite(0).createCache(collisionCfg); // Previous collision should be removed by now.
+
+ cache.put(1, new Fact(1, "cacheInsensitive"));
+ cache.put(2, new Fact(2, "ThisIsANewCache"));
+ cache.put(3, new Fact(3, "With3RecordsAndAnotherName"));
+
+ assertEquals(3, cache.query(qry).getAll().size());
+
+ ignite(0).destroyCache(cache.getName());
+ }
+
+ /**
+ * Tests escapeAll and sqlSchema apposition.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSchemaEscapeAll() throws Exception {
+ startGridsMultiThreaded(3, true);
+
+ final CacheConfiguration<Integer, Fact> cfg = cacheConfig("simpleSchema", true, Integer.class, Fact.class)
+ .setSqlSchema("SchemaName1")
+ .setSqlEscapeAll(true);
+
+ final CacheConfiguration<Integer, Fact> cfgEsc = cacheConfig("escapedSchema", true, Integer.class, Fact.class)
+ .setSqlSchema("\"SchemaName2\"")
+ .setSqlEscapeAll(true);
+
+ escapeCheckSchemaName(ignite(0).createCache(cfg), log, cfg.getSqlSchema());
+
+ escapeCheckSchemaName(ignite(0).createCache(cfgEsc), log, "SchemaName2");
+
+ ignite(0).destroyCache(cfg.getName());
+ ignite(0).destroyCache(cfgEsc.getName());
+ }
+
+ /**
+ * Executes query with and without escaped schema name.
+ * @param cache cache for querying
+ * @param log logger for assertThrows
+ * @param schemaName - schema name without quotes for testing
+ */
+ private static void escapeCheckSchemaName(final IgniteCache<Integer, Fact> cache, IgniteLogger log, String schemaName) {
+ final SqlFieldsQuery qryWrong = new SqlFieldsQuery("select f.id, f.name " +
+ "from " + schemaName.toUpperCase() + ".Fact f");
+
+ cache.put(1, new Fact(1, "cacheInsensitive"));
+
+ GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ cache.query(qryWrong);
+ return null;
+ }
+ }, IgniteException.class, "Failed to parse query");
+
+ SqlFieldsQuery qryCorrect = new SqlFieldsQuery("select f.\"id\", f.\"name\" " +
+ "from \""+schemaName+"\".\"Fact\" f");
+
+ for ( List<?> row : cache.query(qryCorrect)) {
+ assertEquals(2, row.size());
+ assertEquals(1, row.get(0));
+ assertEquals("cacheInsensitive", row.get(1));
+ }
+ }
+
+ // TODO add tests with dynamic cache unregistration, after resolve of https://issues.apache.org/jira/browse/IGNITE-1094
+
+ /** Test class as query entity */
+ private static class Fact {
+ /** Primary key. */
+ @QuerySqlField
+ private int id;
+
+ @QuerySqlField
+ private String name;
+
+ /**
+ * Constructs a fact.
+ *
+ * @param id fact ID.
+ * @param name fact name.
+ */
+ Fact(int id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ /**
+ * Gets fact ID.
+ *
+ * @return fact ID.
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * Gets fact name.
+ *
+ * @return Fact name.
+ */
+ public String getName() {
+ return name;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/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 fc88c75..7c8d1d7 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
@@ -92,6 +92,7 @@ import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceF
import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryLocalSelfTest;
import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryPartitionedSelfTest;
import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryReplicatedSelfTest;
+import org.apache.ignite.internal.processors.query.IgniteSqlSchemaIndexingTest;
import org.apache.ignite.internal.processors.query.IgniteSqlSplitterSelfTest;
import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest;
import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest;
@@ -117,6 +118,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
// Queries tests.
suite.addTestSuite(IgniteSqlSplitterSelfTest.class);
+ suite.addTestSuite(IgniteSqlSchemaIndexingTest.class);
suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class);
suite.addTestSuite(IgniteCacheQueryLoadSelfTest.class);
suite.addTestSuite(IgniteCacheLocalQuerySelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/da24df99/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 90c2de0..0d8d036 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -17,23 +17,21 @@
package org.apache.ignite.visor.commands.cache
+import java.lang.{Boolean => JavaBoolean}
+import java.util.{Collection => JavaCollection, Collections, UUID}
+
import org.apache.ignite._
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.internal.util.typedef._
+import org.apache.ignite.internal.visor.cache._
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.apache.ignite.lang.IgniteBiTuple
import org.apache.ignite.visor.VisorTag
import org.apache.ignite.visor.commands.cache.VisorCacheCommand._
import org.apache.ignite.visor.commands.common.VisorTextTable
import org.apache.ignite.visor.visor._
-
import org.jetbrains.annotations._
-import java.lang.{Boolean => JavaBoolean}
-import java.util.{Collection => JavaCollection, Collections, UUID}
-
-import org.apache.ignite.internal.visor.cache._
-import org.apache.ignite.internal.visor.util.VisorTaskUtils._
-
import scala.collection.JavaConversions._
import scala.language.{implicitConversions, reflectiveCalls}
@@ -890,6 +888,7 @@ object VisorCacheCommand {
cacheT += ("Expiry Policy Factory Class Name", safe(cfg.expiryPolicyFactory()))
cacheT +=("Query Execution Time Threshold", queryCfg.longQueryWarningTimeout())
+ cacheT +=("Query Schema Name", queryCfg.sqlSchema())
cacheT +=("Query Escaped Names", bool2Str(queryCfg.sqlEscapeAll()))
cacheT +=("Query Onheap Cache Size", queryCfg.sqlOnheapRowCacheSize())
[19/50] [abbrv] ignite git commit: Failed test
IgniteSqlSplitterSelfTest.testFunctionNpe: Added reference to a ticket.
Posted by nt...@apache.org.
Failed test IgniteSqlSplitterSelfTest.testFunctionNpe: Added reference to a ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ff47599
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ff47599
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ff47599
Branch: refs/heads/ignite-gg-10837
Commit: 7ff475999116174852222e3562b8de73e943bd78
Parents: 301e7a1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 12:43:55 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 12:43:55 2015 +0300
----------------------------------------------------------------------
.../internal/processors/query/IgniteSqlSplitterSelfTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ff47599/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 865a0fd..5702649 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -230,7 +230,8 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
*
*/
public void testFunctionNpe() {
- // TODO IGNITE-1886
+ assert false : "https://issues.apache.org/jira/browse/IGNITE-1886";
+
IgniteCache<Integer, User> userCache = ignite(0).createCache(
cacheConfig("UserCache", true, Integer.class, User.class));
IgniteCache<Integer, UserOrder> userOrderCache = ignite(0).createCache(
[43/50] [abbrv] ignite git commit: IGNITE-2190 - Fixing
deserialization during scan query.
Posted by nt...@apache.org.
IGNITE-2190 - Fixing deserialization during scan query.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3aa6f828
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3aa6f828
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3aa6f828
Branch: refs/heads/ignite-gg-10837
Commit: 3aa6f828318ac90b73ced040ae031efad763073e
Parents: 6a91996
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Dec 22 11:08:21 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Dec 22 11:08:21 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/IgniteCacheProxy.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3aa6f828/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 3dada6f..271a2cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -460,8 +460,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
if (filter instanceof ScanQuery) {
IgniteBiPredicate<K, V> p = ((ScanQuery)filter).getFilter();
- qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL, ((ScanQuery)filter).getPartition(),
- isKeepBinary);
+ qry = ctx.queries().createScanQuery(p, ((ScanQuery)filter).getPartition(), isKeepBinary);
if (grp != null)
qry.projection(grp);
[15/50] [abbrv] ignite git commit: ignite-2204 Disabled hanging test.
Posted by nt...@apache.org.
ignite-2204 Disabled hanging test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5a56da6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5a56da6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5a56da6
Branch: refs/heads/ignite-gg-10837
Commit: d5a56da6b2503ef06cd3620a24f487988c2be5e2
Parents: a4b547b
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 09:40:35 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 09:40:35 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/CacheGetInsideLockChangingTopologyTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5a56da6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
index 7073a94..03502d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
@@ -357,6 +357,8 @@ public class CacheGetInsideLockChangingTopologyTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testMultithreaded() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-2204");
+
final AtomicBoolean finished = new AtomicBoolean();
final int NEW_NODE = SRVS + CLIENTS;
[46/50] [abbrv] ignite git commit: IGNITE-2229 - Added test for the
ticket.
Posted by nt...@apache.org.
IGNITE-2229 - Added test for the ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ee09661
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ee09661
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ee09661
Branch: refs/heads/ignite-gg-10837
Commit: 3ee096613bbbe9538de949cfe20fafd7d2471de1
Parents: bbdb202
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Dec 22 12:20:39 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Dec 22 12:21:22 2015 +0300
----------------------------------------------------------------------
...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++++++++++++++++++
1 file changed, 145 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ee09661/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
new file mode 100644
index 0000000..5921ba0
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
@@ -0,0 +1,145 @@
+/*
+ * 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 java.util.Arrays;
+import java.util.LinkedHashMap;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.QueryIndexType;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.TextQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+
+/**
+ * TODO https://issues.apache.org/jira/browse/IGNITE-2229
+ * Tests cache in-place modification logic with iterative value increment.
+ */
+public class IgniteCacheFullTextQueryNodeJoiningSelfTest extends GridCommonAbstractTest {
+ /** IP finder. */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** Number of nodes to test on. */
+ private static final int GRID_CNT = 3;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ CacheConfiguration cache = new CacheConfiguration();
+
+ cache.setCacheMode(PARTITIONED);
+ cache.setAtomicityMode(atomicityMode());
+ cache.setWriteSynchronizationMode(FULL_SYNC);
+ cache.setBackups(1);
+
+ QueryEntity qryEntity = new QueryEntity();
+
+ qryEntity.setKeyType(AffinityKey.class.getName());
+ qryEntity.setValueType(IndexedEntity.class.getName());
+
+ LinkedHashMap<String, String> fields = new LinkedHashMap<>();
+
+ fields.put("val", String.class.getName());
+
+ qryEntity.setFields(fields);
+
+ qryEntity.setIndexes(Arrays.asList(new QueryIndex("val", QueryIndexType.FULLTEXT)));
+
+ cache.setQueryEntities(Arrays.asList(qryEntity));
+
+ cfg.setCacheConfiguration(cache);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(IP_FINDER);
+
+ TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
+
+ commSpi.setSharedMemoryPort(-1);
+
+ cfg.setCommunicationSpi(commSpi);
+
+ cfg.setDiscoverySpi(disco);
+
+ return cfg;
+ }
+
+ /**
+ * @return Atomicity mode.
+ */
+ protected CacheAtomicityMode atomicityMode() {
+ return TRANSACTIONAL;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFullTextQueryNodeJoin() throws Exception {
+ for (int r = 0; r < 5; r++) {
+ startGrids(GRID_CNT);
+
+ try {
+ for (int i = 0; i < 1000; i++) {
+ IndexedEntity entity = new IndexedEntity("indexed " + i);
+
+ grid(0).cache(null).put(new AffinityKey<>(i, i), entity);
+ }
+
+ Ignite started = startGrid(GRID_CNT);
+
+ for (int i = 0; i < 100; i++) {
+ QueryCursor<Cache.Entry<AffinityKey<Integer>, IndexedEntity>> res = started.cache(null)
+ .query(new TextQuery<AffinityKey<Integer>, IndexedEntity>(IndexedEntity.class, "indexed"));
+
+ assertEquals(1000, res.getAll().size());
+ }
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+ }
+
+ /** */
+ private static class IndexedEntity {
+ /** */
+ private String val;
+
+ /**
+ * @param val Value.
+ */
+ private IndexedEntity(String val) {
+ this.val = val;
+ }
+ }
+}
\ No newline at end of file
[24/50] [abbrv] ignite git commit: Fixed a single query test.
Posted by nt...@apache.org.
Fixed a single query test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10bb798d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10bb798d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10bb798d
Branch: refs/heads/ignite-gg-10837
Commit: 10bb798d11fe806657412b5f1ae8a917d13f6ee8
Parents: d391daa
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 15:54:29 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 15:54:29 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 54 ++++++++++++++++----
1 file changed, 44 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/10bb798d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index 07e44da..4c952fc 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
import org.apache.ignite.internal.processors.datastructures.GridCacheAtomicLongValue;
@@ -84,6 +85,9 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
/** Flag indicating if starting node should have cache. */
protected boolean hasCache;
+ /** Whether BinaryMarshaller is set. */
+ protected boolean binaryMarshaller;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -206,6 +210,11 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
}
/** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ binaryMarshaller = grid(0).configuration().getMarshaller() instanceof BinaryMarshaller;
+ }
+
+ /** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
}
@@ -249,31 +258,56 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
assert types.contains("String");
assert types.contains("Integer");
- assert AffinityKey.class.getName().equals(meta.keyClass("Person"));
+ if (binaryMarshaller) {
+ assert Object.class.getName().equals(meta.keyClass("Person"));
+ assert Object.class.getName().equals(meta.valueClass("Person"));
+ assert Object.class.getName().equals(meta.valueClass("Organization"));
+ }
+ else {
+ assert AffinityKey.class.getName().equals(meta.keyClass("Person"));
+ assert Person.class.getName().equals(meta.valueClass("Person"));
+ assert Organization.class.getName().equals(meta.valueClass("Organization"));
+ }
+
assert String.class.getName().equals(meta.keyClass("Organization"));
assert String.class.getName().equals(meta.keyClass("String"));
-
- assert Person.class.getName().equals(meta.valueClass("Person"));
- assert Organization.class.getName().equals(meta.valueClass("Organization"));
assert String.class.getName().equals(meta.valueClass("String"));
Map<String, String> fields = meta.fields("Person");
assert fields != null;
assert fields.size() == 5;
- assert AffinityKey.class.getName().equals(fields.get("_KEY"));
- assert Person.class.getName().equals(fields.get("_VAL"));
+
+ if (binaryMarshaller) {
+ assert Object.class.getName().equals(fields.get("_KEY"));
+ assert Object.class.getName().equals(fields.get("_VAL"));
+ assert Integer.class.getName().equals(fields.get("AGE"));
+ assert Integer.class.getName().equals(fields.get("ORGID"));
+ }
+ else {
+ assert AffinityKey.class.getName().equals(fields.get("_KEY"));
+ assert Person.class.getName().equals(fields.get("_VAL"));
+ assert int.class.getName().equals(fields.get("AGE"));
+ assert int.class.getName().equals(fields.get("ORGID"));
+ }
+
assert String.class.getName().equals(fields.get("NAME"));
- assert int.class.getName().equals(fields.get("AGE"));
- assert int.class.getName().equals(fields.get("ORGID"));
fields = meta.fields("Organization");
assert fields != null;
assertEquals("Fields: " + fields, 5, fields.size());
+
+ if (binaryMarshaller) {
+ assert Object.class.getName().equals(fields.get("_VAL"));
+ assert Integer.class.getName().equals(fields.get("ID"));
+ }
+ else {
+ assert Organization.class.getName().equals(fields.get("_VAL"));
+ assert int.class.getName().equals(fields.get("ID"));
+ }
+
assert String.class.getName().equals(fields.get("_KEY"));
- assert Organization.class.getName().equals(fields.get("_VAL"));
- assert int.class.getName().equals(fields.get("ID"));
assert String.class.getName().equals(fields.get("NAME"));
fields = meta.fields("String");
[35/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by nt...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28486809
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28486809
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28486809
Branch: refs/heads/ignite-gg-10837
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 21 16:56:22 2015 +0300
----------------------------------------------------------------------
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++--
.../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++--
.../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
.../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++--
.../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
12 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[05/50] [abbrv] ignite git commit: IGNITE-2188 Incorrect links in
platform .Net documentation
Posted by nt...@apache.org.
IGNITE-2188 Incorrect links in platform .Net documentation
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e4a486
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e4a486
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e4a486
Branch: refs/heads/ignite-gg-10837
Commit: e7e4a48677832aba35bf2828d23d16e5ce7a0093
Parents: e599f44
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Thu Dec 17 13:55:45 2015 +0300
Committer: Pavel Tupitsyn <pt...@gridgain.com>
Committed: Thu Dec 17 13:55:45 2015 +0300
----------------------------------------------------------------------
modules/platforms/dotnet/Apache.Ignite.dxg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e7e4a486/modules/platforms/dotnet/Apache.Ignite.dxg
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.dxg b/modules/platforms/dotnet/Apache.Ignite.dxg
index e33e7d6..6337d83 100644
--- a/modules/platforms/dotnet/Apache.Ignite.dxg
+++ b/modules/platforms/dotnet/Apache.Ignite.dxg
@@ -299,7 +299,7 @@ MARKDOWN_SUPPORT = YES
# globally by setting AUTOLINK_SUPPORT to NO.
# The default value is: YES.
-AUTOLINK_SUPPORT = YES
+AUTOLINK_SUPPORT = NO
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
# to include (a tag file for) the STL sources as input, then you should set this
[28/50] [abbrv] ignite git commit: IGNITE-2187: CPP: Added
documentation for files.
Posted by nt...@apache.org.
IGNITE-2187: CPP: Added documentation for files.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c7dfec5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c7dfec5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c7dfec5
Branch: refs/heads/ignite-gg-10837
Commit: 0c7dfec5d802832b0798c1982a543fd85af50acc
Parents: a34bcc8
Author: isapego <is...@gridgain.com>
Authored: Fri Dec 18 18:04:46 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 18:04:46 2015 +0300
----------------------------------------------------------------------
modules/platforms/cpp/core/impl/doxygen.h | 53 --------------------
.../cpp/core/include/ignite/binary/binary.h | 5 ++
.../core/include/ignite/binary/binary_consts.h | 5 ++
.../include/ignite/binary/binary_containers.h | 5 ++
.../include/ignite/binary/binary_raw_reader.h | 5 ++
.../include/ignite/binary/binary_raw_writer.h | 5 ++
.../core/include/ignite/binary/binary_reader.h | 5 ++
.../core/include/ignite/binary/binary_type.h | 17 +++++++
.../core/include/ignite/binary/binary_writer.h | 5 ++
.../cpp/core/include/ignite/cache/cache.h | 5 ++
.../cpp/core/include/ignite/cache/cache_entry.h | 5 ++
.../core/include/ignite/cache/cache_peek_mode.h | 5 ++
.../cpp/core/include/ignite/cache/query/query.h | 5 ++
.../include/ignite/cache/query/query_argument.h | 6 +++
.../include/ignite/cache/query/query_cursor.h | 5 ++
.../ignite/cache/query/query_fields_cursor.h | 5 ++
.../ignite/cache/query/query_fields_row.h | 5 ++
.../include/ignite/cache/query/query_scan.h | 5 ++
.../core/include/ignite/cache/query/query_sql.h | 5 ++
.../ignite/cache/query/query_sql_fields.h | 5 ++
.../include/ignite/cache/query/query_text.h | 5 ++
.../platforms/cpp/core/include/ignite/guid.h | 5 ++
.../platforms/cpp/core/include/ignite/ignite.h | 5 ++
.../core/include/ignite/ignite_configuration.h | 5 ++
.../cpp/core/include/ignite/ignite_error.h | 5 ++
.../cpp/core/include/ignite/ignition.h | 5 ++
modules/platforms/cpp/core/namespaces.dox | 53 ++++++++++++++++++++
27 files changed, 191 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/impl/doxygen.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/impl/doxygen.h b/modules/platforms/cpp/core/impl/doxygen.h
deleted file mode 100644
index ed237f6..0000000
--- a/modules/platforms/cpp/core/impl/doxygen.h
+++ /dev/null
@@ -1,53 +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.
- */
-
-/**
- * \mainpage Apache Ignite C++
- *
- * Apache Ignite In-Memory Data Fabric is a high-performance, integrated and distributed in-memory platform for
- * computing and transacting on large-scale data sets in real-time, orders of magnitude faster than possible with
- * traditional disk-based or flash-based technologies.
- */
-
- /**
- * Apache %Ignite API.
- */
- namespace ignite
- {
- /**
- * %Ignite Binary Objects API.
- */
- namespace binary
- {
- // Empty.
- }
-
- /**
- * %Ignite %Cache API.
- */
- namespace cache
- {
- /**
- * Contains APIs for creating and executing cache queries.
- */
- namespace query
- {
- // Empty.
- }
- }
- }
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary.h b/modules/platforms/cpp/core/include/ignite/binary/binary.h
index 15476fe..1ffa3e5 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Includes all binary API headers.
+ */
+
#ifndef _IGNITE_BINARY
#define _IGNITE_BINARY
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h b/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
index 7f0fd1e..db7cc38 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares specific binary constatants
+ */
+
#ifndef _IGNITE_BINARY_CONSTS
#define _IGNITE_BINARY_CONSTS
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary_containers.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_containers.h b/modules/platforms/cpp/core/include/ignite/binary/binary_containers.h
index 61b7265..94b2c81 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_containers.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_containers.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares binary reader and writer types for the collections.
+ */
+
#ifndef _IGNITE_BINARY_CONTAINERS
#define _IGNITE_BINARY_CONTAINERS
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary_raw_reader.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_raw_reader.h b/modules/platforms/cpp/core/include/ignite/binary/binary_raw_reader.h
index eb39c2d..d986225 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_raw_reader.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_raw_reader.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::binary::BinaryRawReader class.
+ */
+
#ifndef _IGNITE_BINARY_RAW_READER
#define _IGNITE_BINARY_RAW_READER
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary_raw_writer.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_raw_writer.h b/modules/platforms/cpp/core/include/ignite/binary/binary_raw_writer.h
index 2c3e75b..9bbf4ed 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_raw_writer.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_raw_writer.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::binary::BinaryRawWriter class.
+ */
+
#ifndef _IGNITE_BINARY_RAW_WRITER
#define _IGNITE_BINARY_RAW_WRITER
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary_reader.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_reader.h b/modules/platforms/cpp/core/include/ignite/binary/binary_reader.h
index 75d2384..e991d4e 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_reader.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_reader.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::binary::BinaryReader class.
+ */
+
#ifndef _IGNITE_BINARY_READER
#define _IGNITE_BINARY_READER
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary_type.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_type.h b/modules/platforms/cpp/core/include/ignite/binary/binary_type.h
index 353b3bb..636171e 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_type.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_type.h
@@ -15,6 +15,12 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::binary::BinaryType class template and helping macros
+ * to declare binary type specialisation for user types.
+ */
+
#ifndef _IGNITE_BINARY_TYPE
#define _IGNITE_BINARY_TYPE
@@ -25,6 +31,7 @@
#include "ignite/ignite_error.h"
/**
+ * @def IGNITE_BINARY_TYPE_START(T)
* Start binary type definition.
*/
#define IGNITE_BINARY_TYPE_START(T) \
@@ -33,12 +40,14 @@ struct BinaryType<T> \
{
/**
+ * @def IGNITE_BINARY_TYPE_END
* End binary type definition.
*/
#define IGNITE_BINARY_TYPE_END \
};
/**
+ * @def IGNITE_BINARY_GET_TYPE_ID_AS_CONST(id)
* Implementation of GetTypeId() which returns predefined constant.
*/
#define IGNITE_BINARY_GET_TYPE_ID_AS_CONST(id) \
@@ -48,6 +57,7 @@ int32_t GetTypeId() \
}
/**
+ * @def IGNITE_BINARY_GET_TYPE_ID_AS_HASH(typeName)
* Implementation of GetTypeId() which returns hash of passed type name.
*/
#define IGNITE_BINARY_GET_TYPE_ID_AS_HASH(typeName) \
@@ -57,6 +67,7 @@ int32_t GetTypeId() \
}
/**
+ * @def IGNITE_BINARY_GET_TYPE_NAME_AS_IS(typeName)
* Implementation of GetTypeName() which returns type name as is.
*/
#define IGNITE_BINARY_GET_TYPE_NAME_AS_IS(typeName) \
@@ -66,6 +77,7 @@ std::string GetTypeName() \
}
/**
+ * @def IGNITE_BINARY_GET_FIELD_ID_AS_HASH
* Default implementation of GetFieldId() function which returns Java-way hash code of the string.
*/
#define IGNITE_BINARY_GET_FIELD_ID_AS_HASH \
@@ -75,6 +87,7 @@ int32_t GetFieldId(const char* name) \
}
/**
+ * @def IGNITE_BINARY_GET_HASH_CODE_ZERO(T)
* Implementation of GetHashCode() function which always returns 0.
*/
#define IGNITE_BINARY_GET_HASH_CODE_ZERO(T) \
@@ -84,6 +97,7 @@ int32_t GetHashCode(const T& obj) \
}
/**
+ * @def IGNITE_BINARY_IS_NULL_FALSE(T)
* Implementation of IsNull() function which always returns false.
*/
#define IGNITE_BINARY_IS_NULL_FALSE(T) \
@@ -93,6 +107,7 @@ bool IsNull(const T& obj) \
}
/**
+ * @def IGNITE_BINARY_IS_NULL_IF_NULLPTR(T)
* Implementation of IsNull() function which return true if passed object is null pointer.
*/
#define IGNITE_BINARY_IS_NULL_IF_NULLPTR(T) \
@@ -102,6 +117,7 @@ bool IsNull(const T& obj) \
}
/**
+ * @def IGNITE_BINARY_GET_NULL_DEFAULT_CTOR(T)
* Implementation of GetNull() function which returns an instance created with defult constructor.
*/
#define IGNITE_BINARY_GET_NULL_DEFAULT_CTOR(T) \
@@ -111,6 +127,7 @@ T GetNull() \
}
/**
+ * @def IGNITE_BINARY_GET_NULL_NULLPTR(T)
* Implementation of GetNull() function which returns NULL pointer.
*/
#define IGNITE_BINARY_GET_NULL_NULLPTR(T) \
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/binary/binary_writer.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_writer.h b/modules/platforms/cpp/core/include/ignite/binary/binary_writer.h
index 0c7cc68..475f454 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_writer.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_writer.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::binary::BinaryWriter class.
+ */
+
#ifndef _IGNITE_BINARY_WRITER
#define _IGNITE_BINARY_WRITER
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/cache.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/cache.h b/modules/platforms/cpp/core/include/ignite/cache/cache.h
index ad23d62..6727293 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/cache.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/cache.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::Cache class.
+ */
+
#ifndef _IGNITE_CACHE
#define _IGNITE_CACHE
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/cache_entry.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/cache_entry.h b/modules/platforms/cpp/core/include/ignite/cache/cache_entry.h
index d6d244d..9ca3946 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/cache_entry.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/cache_entry.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::CacheEntry class.
+ */
+
#ifndef _IGNITE_CACHE_ENTRY
#define _IGNITE_CACHE_ENTRY
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/cache_peek_mode.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/cache_peek_mode.h b/modules/platforms/cpp/core/include/ignite/cache/cache_peek_mode.h
index be61887..192013d 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/cache_peek_mode.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/cache_peek_mode.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::CachePeekMode enum.
+ */
+
#ifndef _IGNITE_CACHE_PEEK_MODE
#define _IGNITE_CACHE_PEEK_MODE
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query.h b/modules/platforms/cpp/core/include/ignite/cache/query/query.h
index c469e85..de7578e 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Includes all query API headers.
+ */
+
#ifndef _IGNITE_QUERY
#define _IGNITE_QUERY
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_argument.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_argument.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_argument.h
index 37871c9..5cd22a6 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_argument.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_argument.h
@@ -15,6 +15,12 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::QueryArgument class template and
+ * ignite::cache::query::QueryArgumentBase interface.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_ARGUMENT
#define _IGNITE_CACHE_QUERY_ARGUMENT
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
index 4ef2405..6f507d2 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::QueryCursor class template.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_CURSOR
#define _IGNITE_CACHE_QUERY_CURSOR
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
index 8410c81..b74ae5a 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::QueryFieldsCursor class.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_FIELDS_CURSOR
#define _IGNITE_CACHE_QUERY_FIELDS_CURSOR
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
index 1e70a8d..bb10e9e 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::QueryFieldsRow class.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_FIELDS_ROW
#define _IGNITE_CACHE_QUERY_FIELDS_ROW
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_scan.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_scan.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_scan.h
index fa47269..7bd6bbb 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_scan.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_scan.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::ScanQuery class.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_SCAN
#define _IGNITE_CACHE_QUERY_SCAN
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
index 8feb785..186e6e3 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::SqlQuery class.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_SQL
#define _IGNITE_CACHE_QUERY_SQL
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_sql_fields.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql_fields.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql_fields.h
index e720cdf..7076595 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql_fields.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql_fields.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::SqlFieldsQuery class.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_SQL_FIELDS
#define _IGNITE_CACHE_QUERY_SQL_FIELDS
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/cache/query/query_text.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_text.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_text.h
index 4494883..b68f65e 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_text.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_text.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::cache::query::TextQuery class.
+ */
+
#ifndef _IGNITE_CACHE_QUERY_TEXT
#define _IGNITE_CACHE_QUERY_TEXT
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/guid.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/guid.h b/modules/platforms/cpp/core/include/ignite/guid.h
index 9469769..a9999e7 100644
--- a/modules/platforms/cpp/core/include/ignite/guid.h
+++ b/modules/platforms/cpp/core/include/ignite/guid.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::Guid class.
+ */
+
#ifndef _IGNITE_GUID
#define _IGNITE_GUID
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/ignite.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/ignite.h b/modules/platforms/cpp/core/include/ignite/ignite.h
index f194b1a..25b9f0c 100644
--- a/modules/platforms/cpp/core/include/ignite/ignite.h
+++ b/modules/platforms/cpp/core/include/ignite/ignite.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::Ignite class.
+ */
+
#ifndef _IGNITE
#define _IGNITE
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/ignite_configuration.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/ignite_configuration.h b/modules/platforms/cpp/core/include/ignite/ignite_configuration.h
index c4c6c8e..e46e2bd 100644
--- a/modules/platforms/cpp/core/include/ignite/ignite_configuration.h
+++ b/modules/platforms/cpp/core/include/ignite/ignite_configuration.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::IgniteConfiguration class.
+ */
+
#ifndef _IGNITE_CONFIGURATION
#define _IGNITE_CONFIGURATION
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/ignite_error.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/ignite_error.h b/modules/platforms/cpp/core/include/ignite/ignite_error.h
index b1fc772..3b192b1 100644
--- a/modules/platforms/cpp/core/include/ignite/ignite_error.h
+++ b/modules/platforms/cpp/core/include/ignite/ignite_error.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::IgniteError class.
+ */
+
#ifndef _IGNITE_ERROR
#define _IGNITE_ERROR
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/include/ignite/ignition.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/ignition.h b/modules/platforms/cpp/core/include/ignite/ignition.h
index f0046b0..fe594ec 100644
--- a/modules/platforms/cpp/core/include/ignite/ignition.h
+++ b/modules/platforms/cpp/core/include/ignite/ignition.h
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * @file
+ * Declares ignite::Ignition class.
+ */
+
#ifndef _IGNITE_IGNITION
#define _IGNITE_IGNITION
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c7dfec5/modules/platforms/cpp/core/namespaces.dox
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/namespaces.dox b/modules/platforms/cpp/core/namespaces.dox
new file mode 100644
index 0000000..ed237f6
--- /dev/null
+++ b/modules/platforms/cpp/core/namespaces.dox
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+/**
+ * \mainpage Apache Ignite C++
+ *
+ * Apache Ignite In-Memory Data Fabric is a high-performance, integrated and distributed in-memory platform for
+ * computing and transacting on large-scale data sets in real-time, orders of magnitude faster than possible with
+ * traditional disk-based or flash-based technologies.
+ */
+
+ /**
+ * Apache %Ignite API.
+ */
+ namespace ignite
+ {
+ /**
+ * %Ignite Binary Objects API.
+ */
+ namespace binary
+ {
+ // Empty.
+ }
+
+ /**
+ * %Ignite %Cache API.
+ */
+ namespace cache
+ {
+ /**
+ * Contains APIs for creating and executing cache queries.
+ */
+ namespace query
+ {
+ // Empty.
+ }
+ }
+ }
+
\ No newline at end of file
[31/50] [abbrv] ignite git commit: IGNITE-2215: .NET: Use standard
Action and Func instead of custom delegates in binary readers.
Posted by nt...@apache.org.
IGNITE-2215: .NET: Use standard Action and Func instead of custom delegates in binary readers.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6edeccde
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6edeccde
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6edeccde
Branch: refs/heads/ignite-gg-10837
Commit: 6edeccde24a2897363ee905e3cc5cef10e2f47ce
Parents: d4687d9
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Mon Dec 21 14:58:04 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 21 14:58:04 2015 +0300
----------------------------------------------------------------------
.../Binary/IBinaryRawReader.cs | 4 ++--
.../Apache.Ignite.Core/Binary/IBinaryReader.cs | 25 ++------------------
.../Impl/Binary/BinaryReader.cs | 13 +++++-----
.../Impl/Binary/BinaryUtils.cs | 4 ++--
4 files changed, 12 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6edeccde/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
index a719e36..40ed754 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryRawReader.cs
@@ -205,7 +205,7 @@ namespace Apache.Ignite.Core.Binary
/// <param name="factory">Factory.</param>
/// <param name="adder">Adder.</param>
/// <returns>Collection.</returns>
- ICollection ReadCollection(CollectionFactory factory, CollectionAdder adder);
+ ICollection ReadCollection(Func<int, ICollection> factory, Action<ICollection, object> adder);
/// <summary>
/// Read dictionary.
@@ -218,6 +218,6 @@ namespace Apache.Ignite.Core.Binary
/// </summary>
/// <param name="factory">Factory.</param>
/// <returns>Dictionary.</returns>
- IDictionary ReadDictionary(DictionaryFactory factory);
+ IDictionary ReadDictionary(Func<int, IDictionary> factory);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6edeccde/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
index 2ccbbc0..4de3e92 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/IBinaryReader.cs
@@ -21,27 +21,6 @@ namespace Apache.Ignite.Core.Binary
using System.Collections;
/// <summary>
- /// Delegate for collection creation.
- /// </summary>
- /// <param name="size">Collection size.</param>
- /// <returns>Collection.</returns>
- public delegate ICollection CollectionFactory(int size);
-
- /// <summary>
- /// Delegate for adding element to collection.
- /// </summary>
- /// <param name="col">Collection.</param>
- /// <param name="elem">Element to add.</param>
- public delegate void CollectionAdder(ICollection col, object elem);
-
- /// <summary>
- /// Delegate for dictionary creation.
- /// </summary>
- /// <param name="size">Dictionary size.</param>
- /// <returns>Dictionary.</returns>
- public delegate IDictionary DictionaryFactory(int size);
-
- /// <summary>
/// Reader for binary objects.
/// </summary>
public interface IBinaryReader
@@ -253,7 +232,7 @@ namespace Apache.Ignite.Core.Binary
/// <param name="factory">Factory.</param>
/// <param name="adder">Adder.</param>
/// <returns>Collection.</returns>
- ICollection ReadCollection(string fieldName, CollectionFactory factory, CollectionAdder adder);
+ ICollection ReadCollection(string fieldName, Func<int, ICollection> factory, Action<ICollection, object> adder);
/// <summary>
/// Read named dictionary.
@@ -268,7 +247,7 @@ namespace Apache.Ignite.Core.Binary
/// <param name="fieldName">Field name.</param>
/// <param name="factory">Factory.</param>
/// <returns>Dictionary.</returns>
- IDictionary ReadDictionary(string fieldName, DictionaryFactory factory);
+ IDictionary ReadDictionary(string fieldName, Func<int, IDictionary> factory);
/// <summary>
/// Get raw reader.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6edeccde/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
index 7b887a9..105589a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
@@ -484,15 +484,14 @@ namespace Apache.Ignite.Core.Impl.Binary
}
/** <inheritdoc /> */
- public ICollection ReadCollection(string fieldName, CollectionFactory factory,
- CollectionAdder adder)
+ public ICollection ReadCollection(string fieldName, Func<int, ICollection> factory,
+ Action<ICollection, object> adder)
{
return ReadField(fieldName, r => BinaryUtils.ReadCollection(r, factory, adder), BinaryUtils.TypeCollection);
}
/** <inheritdoc /> */
- public ICollection ReadCollection(CollectionFactory factory,
- CollectionAdder adder)
+ public ICollection ReadCollection(Func<int, ICollection> factory, Action<ICollection, object> adder)
{
return Read(r => BinaryUtils.ReadCollection(r, factory, adder), BinaryUtils.TypeCollection);
}
@@ -506,17 +505,17 @@ namespace Apache.Ignite.Core.Impl.Binary
/** <inheritdoc /> */
public IDictionary ReadDictionary()
{
- return ReadDictionary((DictionaryFactory)null);
+ return ReadDictionary((Func<int, IDictionary>) null);
}
/** <inheritdoc /> */
- public IDictionary ReadDictionary(string fieldName, DictionaryFactory factory)
+ public IDictionary ReadDictionary(string fieldName, Func<int, IDictionary> factory)
{
return ReadField(fieldName, r => BinaryUtils.ReadDictionary(r, factory), BinaryUtils.TypeDictionary);
}
/** <inheritdoc /> */
- public IDictionary ReadDictionary(DictionaryFactory factory)
+ public IDictionary ReadDictionary(Func<int, IDictionary> factory)
{
return Read(r => BinaryUtils.ReadDictionary(r, factory), BinaryUtils.TypeDictionary);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6edeccde/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
index 1ae5722..1c85e31 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
@@ -1104,7 +1104,7 @@ namespace Apache.Ignite.Core.Impl.Binary
* <returns>Collection.</returns>
*/
public static ICollection ReadCollection(BinaryReader ctx,
- CollectionFactory factory, CollectionAdder adder)
+ Func<int, ICollection> factory, Action<ICollection, object> adder)
{
IBinaryStream stream = ctx.Stream;
@@ -1181,7 +1181,7 @@ namespace Apache.Ignite.Core.Impl.Binary
* <param name="factory">Factory delegate.</param>
* <returns>Dictionary.</returns>
*/
- public static IDictionary ReadDictionary(BinaryReader ctx, DictionaryFactory factory)
+ public static IDictionary ReadDictionary(BinaryReader ctx, Func<int, IDictionary> factory)
{
IBinaryStream stream = ctx.Stream;
[07/50] [abbrv] ignite git commit: minor
Posted by nt...@apache.org.
minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e29266
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e29266
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e29266
Branch: refs/heads/ignite-gg-10837
Commit: c1e292667154d99eaa7e2621fc811b3d916e09a6
Parents: bd1f506
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Dec 17 14:47:05 2015 +0300
----------------------------------------------------------------------
.../internal/processors/datastreamer/DataStreamerUpdateJob.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e29266/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index c49087f..c2ab0c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -168,4 +168,4 @@ class DataStreamerUpdateJob implements GridPlainCallable<Object> {
ctx.security().authorize(cacheName, perm, null);
}
-}
\ No newline at end of file
+}
[13/50] [abbrv] ignite git commit: Fixed cache store examples
Posted by nt...@apache.org.
Fixed cache store examples
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b2cf28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b2cf28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b2cf28
Branch: refs/heads/ignite-gg-10837
Commit: e1b2cf2840b1451dbfc0bbef4540e5a9edaf6c35
Parents: 889b268
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Thu Dec 17 16:05:09 2015 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Thu Dec 17 16:05:09 2015 -0800
----------------------------------------------------------------------
.../hibernate/CacheHibernateStoreExample.java | 8 +
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 7 +-
.../store/spring/CacheSpringPersonStore.java | 118 ++++++++++++++
.../store/spring/CacheSpringStoreExample.java | 155 +++++++++++++++++++
.../datagrid/store/spring/package-info.java | 22 +++
6 files changed, 311 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index 71c4f68..db34eaf 100644
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++ b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
import org.apache.ignite.transactions.Transaction;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -39,6 +40,13 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
* <p>
* This example uses {@link CacheHibernatePersonStore} as a persistent store.
* <p>
+ * To start the example, you should:
+ * <ul>
+ * <li>Start H2 database TCP server using {@link DbH2ServerStartup}.</li>
+ * <li>Start a few nodes using {@link ExampleNodeStartup}.</li>
+ * <li>Start example using {@link CacheHibernateStoreExample}.</li>
+ * </ul>
+ * <p>
* Remote nodes can be started with {@link ExampleNodeStartup} in another JVM which will
* start node with {@code examples/config/example-ignite.xml} configuration.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
index 1314b71..0728a03 100644
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
+++ b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
@@ -23,12 +23,12 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-access="field">
- <class name="org.apache.ignite.examples.model.Person" table="PERSONS">
+ <class name="org.apache.ignite.examples.model.Person" table="PERSON">
<!-- ID. -->
<id name="id"/>
<!-- We only map data we are interested in. -->
- <property name="firstName"/>
- <property name="lastName"/>
+ <property name="firstName" column="first_name"/>
+ <property name="lastName" column="last_name"/>
</class>
</hibernate-mapping>
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
index 80a43e7..7bf70af 100644
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
+++ b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
@@ -26,8 +26,11 @@
-->
<hibernate-configuration>
<session-factory>
- <!-- Database connection settings (private in-memory database). -->
- <property name="connection.url">jdbc:h2:mem:example;DB_CLOSE_DELAY=-1</property>
+ <!-- Database connection URL. -->
+ <property name="connection.url">jdbc:h2:tcp://localhost/mem:ExampleDb</property>
+
+ <!-- Database connection username. -->
+ <property name="connection.username">sa</property>
<!-- Only validate the database schema on startup in production mode. -->
<property name="hbm2ddl.auto">update</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
new file mode 100644
index 0000000..c4b52bb
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.datagrid.store.spring;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.h2.jdbcx.JdbcConnectionPool;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowCallbackHandler;
+import org.springframework.jdbc.core.RowMapper;
+
+/**
+ * Example of {@link CacheStore} implementation that uses JDBC
+ * transaction with cache transactions and maps {@link Long} to {@link Person}.
+ */
+public class CacheSpringPersonStore extends CacheStoreAdapter<Long, Person> {
+ /** Data source. */
+ public static final DataSource DATA_SRC =
+ JdbcConnectionPool.create("jdbc:h2:tcp://localhost/mem:ExampleDb", "sa", "");
+
+ /** Spring JDBC template. */
+ private JdbcTemplate jdbcTemplate;
+
+ /**
+ * Constructor.
+ *
+ * @throws IgniteException If failed.
+ */
+ public CacheSpringPersonStore() throws IgniteException {
+ jdbcTemplate = new JdbcTemplate(DATA_SRC);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Person load(Long key) {
+ System.out.println(">>> Store load [key=" + key + ']');
+
+ try {
+ return jdbcTemplate.queryForObject("select * from PERSON where id = ?", new RowMapper<Person>() {
+ @Override public Person mapRow(ResultSet rs, int rowNum) throws SQLException {
+ return new Person(rs.getLong(1), rs.getString(2), rs.getString(3));
+ }
+ }, key);
+ }
+ catch (EmptyResultDataAccessException ignored) {
+ return null;
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) {
+ Long key = entry.getKey();
+ Person val = entry.getValue();
+
+ System.out.println(">>> Store write [key=" + key + ", val=" + val + ']');
+
+ int updated = jdbcTemplate.update("update PERSON set first_name = ?, last_name = ? where id = ?",
+ val.firstName, val.lastName, val.id);
+
+ if (updated == 0) {
+ jdbcTemplate.update("insert into PERSON (id, first_name, last_name) values (?, ?, ?)",
+ val.id, val.firstName, val.lastName);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void delete(Object key) {
+ System.out.println(">>> Store delete [key=" + key + ']');
+
+ jdbcTemplate.update("delete from PERSON where id = ?", key);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void loadCache(final IgniteBiInClosure<Long, Person> clo, Object... args) {
+ if (args == null || args.length == 0 || args[0] == null)
+ throw new CacheLoaderException("Expected entry count parameter is not provided.");
+
+ int entryCnt = (Integer)args[0];
+
+ final AtomicInteger cnt = new AtomicInteger();
+
+ jdbcTemplate.query("select * from PERSON limit ?", new RowCallbackHandler() {
+ @Override public void processRow(ResultSet rs) throws SQLException {
+ Person person = new Person(rs.getLong(1), rs.getString(2), rs.getString(3));
+
+ clo.apply(person.id, person);
+
+ cnt.incrementAndGet();
+ }
+ }, entryCnt);
+
+ System.out.println(">>> Loaded " + cnt + " values into cache.");
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java
new file mode 100644
index 0000000..5380fce
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.datagrid.store.spring;
+
+import java.util.UUID;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.FactoryBuilder;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cache.store.spring.CacheSpringStoreSessionListener;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+
+/**
+ * Demonstrates usage of cache with underlying persistent store configured.
+ * <p>
+ * This example uses {@link CacheSpringPersonStore} as a persistent store.
+ * <p>
+ * To start the example, you should:
+ * <ul>
+ * <li>Start H2 database TCP server using {@link DbH2ServerStartup}.</li>
+ * <li>Start a few nodes using {@link ExampleNodeStartup}.</li>
+ * <li>Start example using {@link CacheSpringStoreExample}.</li>
+ * </ul>
+ * <p>
+ * Remote nodes can be started with {@link ExampleNodeStartup} in another JVM which will
+ * start node with {@code examples/config/example-ignite.xml} configuration.
+ */
+public class CacheSpringStoreExample {
+ /** Cache name. */
+ private static final String CACHE_NAME = CacheSpringStoreExample.class.getSimpleName();
+
+ /** Heap size required to run this example. */
+ public static final int MIN_MEMORY = 1024 * 1024 * 1024;
+
+ /** Number of entries to load. */
+ private static final int ENTRY_COUNT = 100_000;
+
+ /** Global person ID to use across entire example. */
+ private static final Long id = Math.abs(UUID.randomUUID().getLeastSignificantBits());
+
+ /**
+ * Executes example.
+ *
+ * @param args Command line arguments, none required.
+ * @throws IgniteException If example execution failed.
+ */
+ public static void main(String[] args) throws IgniteException {
+ ExamplesUtils.checkMinMemory(MIN_MEMORY);
+
+ // To start ignite with desired configuration uncomment the appropriate line.
+ try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
+ System.out.println();
+ System.out.println(">>> Cache store example started.");
+
+ CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>(CACHE_NAME);
+
+ // Set atomicity as transaction, since we are showing transactions in example.
+ cacheCfg.setAtomicityMode(TRANSACTIONAL);
+
+ // Configure Spring store.
+ cacheCfg.setCacheStoreFactory(FactoryBuilder.factoryOf(CacheSpringPersonStore.class));
+
+ // Configure Spring session listener.
+ cacheCfg.setCacheStoreSessionListenerFactories(new Factory<CacheStoreSessionListener>() {
+ @Override public CacheStoreSessionListener create() {
+ CacheSpringStoreSessionListener lsnr = new CacheSpringStoreSessionListener();
+
+ lsnr.setDataSource(CacheSpringPersonStore.DATA_SRC);
+
+ return lsnr;
+ }
+ });
+
+ cacheCfg.setReadThrough(true);
+ cacheCfg.setWriteThrough(true);
+
+ try (IgniteCache<Long, Person> cache = ignite.getOrCreateCache(cacheCfg)) {
+ // Make initial cache loading from persistent store. This is a
+ // distributed operation and will call CacheStore.loadCache(...)
+ // method on all nodes in topology.
+ loadCache(cache);
+
+ // Start transaction and execute several cache operations with
+ // read/write-through to persistent store.
+ executeTransaction(cache);
+ }
+ }
+ }
+
+ /**
+ * Makes initial cache loading.
+ *
+ * @param cache Cache to load.
+ */
+ private static void loadCache(IgniteCache<Long, Person> cache) {
+ long start = System.currentTimeMillis();
+
+ // Start loading cache from persistent store on all caching nodes.
+ cache.loadCache(null, ENTRY_COUNT);
+
+ long end = System.currentTimeMillis();
+
+ System.out.println(">>> Loaded " + cache.size() + " keys with backups in " + (end - start) + "ms.");
+ }
+
+ /**
+ * Executes transaction with read/write-through to persistent store.
+ *
+ * @param cache Cache to execute transaction on.
+ */
+ private static void executeTransaction(IgniteCache<Long, Person> cache) {
+ try (Transaction tx = Ignition.ignite().transactions().txStart()) {
+ Person val = cache.get(id);
+
+ System.out.println("Read value: " + val);
+
+ val = cache.getAndPut(id, new Person(id, "Isaac", "Newton"));
+
+ System.out.println("Overwrote old value: " + val);
+
+ val = cache.get(id);
+
+ System.out.println("Read value: " + val);
+
+ tx.commit();
+ }
+
+ System.out.println("Read value after commit: " + cache.get(id));
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java
new file mode 100644
index 0000000..211239f
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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 description. -->
+ * Contains Spring-based cache store implementation.
+ */
+package org.apache.ignite.examples.datagrid.store.spring;
[36/50] [abbrv] ignite git commit: IGNITE-2190 - Fixing
deserialization during scan query. - Fixes #355.
Posted by nt...@apache.org.
IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/81458f51
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/81458f51
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/81458f51
Branch: refs/heads/ignite-gg-10837
Commit: 81458f51c40f58b169da178bd7a572d3c9fe01ff
Parents: 2848680
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Dec 21 18:54:38 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Dec 21 18:54:38 2015 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryObjectImpl.java | 20 +-
.../processors/cache/IgniteCacheProxy.java | 5 +-
.../cache/query/GridCacheQueryManager.java | 8 +-
.../processors/query/GridQueryProcessor.java | 10 +-
.../IgniteCacheBinaryObjectsScanSelfTest.java | 137 +++++++++
.../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +++++++++++++------
.../IgniteCacheReplicatedQuerySelfTest.java | 10 +-
.../local/IgniteCacheLocalQuerySelfTest.java | 2 +-
.../IgniteBinaryCacheQueryTestSuite.java | 2 +
9 files changed, 379 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 2342766..d712eb8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -532,7 +532,8 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
* @return Object.
*/
private Object deserializeValue(@Nullable CacheObjectContext coCtx) {
- BinaryReaderExImpl reader = reader(null);
+ BinaryReaderExImpl reader = reader(null,
+ coCtx != null ? coCtx.kernalContext().config().getClassLoader() : null);
Object obj0 = reader.deserialize();
@@ -560,10 +561,23 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
* @param rCtx Reader context.
* @return Reader.
*/
- private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx) {
+ private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx, @Nullable ClassLoader ldr) {
+ if (ldr == null)
+ ldr = ctx.configuration().getClassLoader();
+
return new BinaryReaderExImpl(ctx,
BinaryHeapInputStream.create(arr, start),
- ctx.configuration().getClassLoader(),
+ ldr,
rCtx);
}
+
+ /**
+ * Create new reader for this object.
+ *
+ * @param rCtx Reader context.
+ * @return Reader.
+ */
+ private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx) {
+ return reader(rCtx, null);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 1768ecf..3dada6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -618,7 +618,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
validate(qry);
- CacheOperationContext opCtxCall = ctx.operationContextPerCall();
+ final CacheOperationContext opCtxCall = ctx.operationContextPerCall();
if (qry instanceof ContinuousQuery)
return (QueryCursor<R>)queryContinuous((ContinuousQuery<K, V>)qry, qry.isLocal(),
@@ -630,7 +630,8 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
if (isReplicatedDataNode() || ctx.isLocal() || qry.isLocal())
return (QueryCursor<R>)new QueryCursorImpl<>(new Iterable<Cache.Entry<K, V>>() {
@Override public Iterator<Cache.Entry<K, V>> iterator() {
- return ctx.kernalContext().query().queryLocal(ctx, p);
+ return ctx.kernalContext().query().queryLocal(ctx, p,
+ opCtxCall != null && opCtxCall.isKeepBinary());
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 15502a0..8f0cab7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -807,8 +807,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
throws IgniteCheckedException {
IgniteInternalCache<K, V> prj0 = cctx.cache();
- if (qry.keepBinary())
- prj0 = prj0.keepBinary();
+ prj0 = prj0.keepBinary();
final IgniteInternalCache<K, V> prj = prj0;
@@ -863,7 +862,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
@Override public K next() {
KeyCacheObject key = iter0.next();
- return key.value(cctx.cacheObjectContext(), false);
+ return (K)cctx.unwrapBinaryIfNeeded(key, true);
}
@Override public void remove() {
@@ -906,8 +905,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
CacheObject cacheVal =
entry != null ? entry.peek(true, false, false, topVer, expiryPlc) : null;
- // TODO 950 nocopy
- val = (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheVal, qry.keepBinary());
+ val = (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheVal, true);
}
catch (GridCacheEntryRemovedException e) {
val = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 28b854c..7d1311f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -841,7 +841,11 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param qry Query.
* @return Cursor.
*/
- public <K, V> Iterator<Cache.Entry<K, V>> queryLocal(final GridCacheContext<?, ?> cctx, final SqlQuery qry) {
+ public <K, V> Iterator<Cache.Entry<K, V>> queryLocal(
+ final GridCacheContext<?, ?> cctx,
+ final SqlQuery qry,
+ final boolean keepBinary
+ ) {
if (!busyLock.enterBusy())
throw new IllegalStateException("Failed to execute query (grid is stopping).");
@@ -887,8 +891,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
IgniteBiTuple<K, V> t = i.next();
return new CacheEntryImpl<>(
- t.getKey(),
- t.getValue());
+ (K)cctx.unwrapBinaryIfNeeded(t.getKey(), keepBinary, false),
+ (V)cctx.unwrapBinaryIfNeeded(t.getValue(), keepBinary, false));
}
@Override public void remove() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java
new file mode 100644
index 0000000..07f3833
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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 java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ *
+ */
+public class IgniteCacheBinaryObjectsScanSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final String PERSON_CLS_NAME = "org.apache.ignite.tests.p2p.cache.Person";
+
+ /** */
+ private static final String PERSON_KEY_CLS_NAME = "org.apache.ignite.tests.p2p.cache.PersonKey";
+
+ /** */
+ private static ClassLoader ldr;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ ldr = getExternalClassLoader();
+
+ startGrids(3);
+
+ startGrid("client");
+
+ populateCache(ldr);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ ldr = null;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+
+ discoSpi.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(discoSpi);
+ cfg.setIncludeEventTypes(new int[0]);
+
+ cfg.setMarshaller(null);
+ cfg.setPeerClassLoadingEnabled(false);
+
+ if ("client".equals(gridName)) {
+ cfg.setClientMode(true);
+
+ cfg.setClassLoader(ldr);
+ }
+
+ return cfg;
+ }
+
+ /**
+ * @param ldr Class loader.
+ * @throws Exception If failed.
+ */
+ private void populateCache(ClassLoader ldr) throws Exception {
+ Class<?> keyCls = ldr.loadClass(PERSON_KEY_CLS_NAME);
+ Class<?> cls = ldr.loadClass(PERSON_CLS_NAME);
+
+ Ignite client = grid("client");
+
+ CacheConfiguration<Object, Object> cfg = new CacheConfiguration<>("testCache");
+
+ IgniteCache<Object, Object> cache = client.getOrCreateCache(cfg);
+
+ for (int i = 0; i < 100; i++) {
+ Object key = keyCls.newInstance();
+
+ GridTestUtils.setFieldValue(key, "id", i);
+
+ cache.put(key, cls.newInstance());
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testScanNoClasses() throws Exception {
+ Ignite client = grid("client");
+
+ IgniteCache<Object, Object> cache = client.cache("testCache");
+
+ List<Cache.Entry<Object, Object>> entries = cache.query(new ScanQuery<>()).getAll();
+
+ assertEquals(100, entries.size());
+
+ for (Cache.Entry<Object, Object> entry : entries) {
+ assertEquals(PERSON_KEY_CLS_NAME, entry.getKey().getClass().getName());
+ assertEquals(PERSON_CLS_NAME, entry.getValue().getClass().getName());
+ }
+
+ entries = cache.query(new ScanQuery<>(1)).getAll();
+
+ assertFalse(entries.isEmpty());
+
+ for (Cache.Entry<Object, Object> entry : entries) {
+ assertEquals(PERSON_KEY_CLS_NAME, entry.getKey().getClass().getName());
+ assertEquals(PERSON_CLS_NAME, entry.getValue().getClass().getName());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 79c41f8..3782596 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -44,6 +44,7 @@ import javax.cache.expiry.TouchedExpiryPolicy;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CachePeekMode;
@@ -65,6 +66,7 @@ import org.apache.ignite.events.CacheQueryExecutedEvent;
import org.apache.ignite.events.CacheQueryReadEvent;
import org.apache.ignite.events.Event;
import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQuerySelfTest;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
import org.apache.ignite.internal.processors.cache.query.QueryCursorEx;
@@ -110,9 +112,6 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
/** */
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
- /** */
- protected Ignite ignite;
-
/**
* @return Grid count.
*/
@@ -207,18 +206,34 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
return false;
}
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- ignite = startGridsMultiThreaded(gridCount());
+ /**
+ * @return Ignite instance.
+ */
+ protected Ignite ignite() {
+ return grid(0);
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ ignite().cache(null).removeAll();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGridsMultiThreaded(gridCount());
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
stopAllGrids();
store.reset();
-
- ignite = null;
}
/**
@@ -227,7 +242,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testDifferentKeyTypes() throws Exception {
- final IgniteCache<Object, Object> cache = ignite.cache(null);
+ final IgniteCache<Object, Object> cache = ignite().cache(null);
cache.put(1, "value");
@@ -247,7 +262,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testDifferentValueTypes() throws Exception {
- IgniteCache<Integer, Object> cache = ignite.cache(null);
+ IgniteCache<Integer, Object> cache = ignite().cache(null);
cache.put(7, "value");
@@ -262,7 +277,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testStringType() throws Exception {
- IgniteCache<Integer, String> cache = ignite.cache(null);
+ IgniteCache<Integer, String> cache = ignite().cache(null);
cache.put(666, "test");
@@ -281,7 +296,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testIntegerType() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
int key = 898;
@@ -307,7 +322,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
*/
public void testUserDefinedFunction() throws IgniteCheckedException {
// Without alias.
- final IgniteCache<Object, Object> cache = ignite.cache(null);
+ final IgniteCache<Object, Object> cache = ignite().cache(null);
QueryCursor<List<?>> qry = cache.query(new SqlFieldsQuery("select square(1), square(2)"));
@@ -359,10 +374,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testExpiration() throws Exception {
- ignite.cache(null).
+ ignite().cache(null).
withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000))).put(7, 1);
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
List<Cache.Entry<Integer, Integer>> qry =
cache.query(new SqlQuery<Integer, Integer>(Integer.class, "1=1")).getAll();
@@ -384,7 +399,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testIllegalBounds() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
cache.put(1, 1);
cache.put(2, 2);
@@ -401,7 +416,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testComplexType() throws Exception {
- IgniteCache<Key, GridCacheQueryTestValue> cache = ignite.cache(null);
+ IgniteCache<Key, GridCacheQueryTestValue> cache = ignite().cache(null);
GridCacheQueryTestValue val1 = new GridCacheQueryTestValue();
@@ -431,6 +446,41 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
}
/**
+ * @throws Exception In case of error.
+ */
+ public void testComplexTypeKeepBinary() throws Exception {
+ if (ignite().configuration().getMarshaller() == null || ignite().configuration().getMarshaller() instanceof BinaryMarshaller) {
+ IgniteCache<Key, GridCacheQueryTestValue> cache = ignite().cache(null);
+
+ GridCacheQueryTestValue val1 = new GridCacheQueryTestValue();
+
+ val1.setField1("field1");
+ val1.setField2(1);
+ val1.setField3(1L);
+
+ GridCacheQueryTestValue val2 = new GridCacheQueryTestValue();
+
+ val2.setField1("field2");
+ val2.setField2(2);
+ val2.setField3(2L);
+ val2.setField6(null);
+
+ cache.put(new Key(100500), val1);
+ cache.put(new Key(100501), val2);
+
+ QueryCursor<Cache.Entry<BinaryObject, BinaryObject>> qry = cache.withKeepBinary()
+ .query(new SqlQuery<BinaryObject, BinaryObject>(GridCacheQueryTestValue.class,
+ "fieldName='field1' and field2=1 and field3=1 and id=100500 and embeddedField2=11 and x=3"));
+
+ Cache.Entry<BinaryObject, BinaryObject> entry = F.first(qry.getAll());
+
+ assertNotNull(entry);
+ assertEquals(100500L, entry.getKey().field("id"));
+ assertEquals(val1, entry.getValue().deserialize());
+ }
+ }
+
+ /**
* Complex key type.
*/
private static class Key {
@@ -471,7 +521,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testSelectQuery() throws Exception {
- IgniteCache<Integer, String> cache = ignite.cache(null);
+ IgniteCache<Integer, String> cache = ignite().cache(null);
cache.put(10, "value");
@@ -490,7 +540,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testObjectQuery() throws Exception {
- IgniteCache<Integer, ObjectValue> cache = ignite.cache(null);
+ IgniteCache<Integer, ObjectValue> cache = ignite().cache(null);
ObjectValue val = new ObjectValue("test", 0);
@@ -528,7 +578,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testObjectQueryWithSwap() throws Exception {
- IgniteCache<Integer, ObjectValue> cache = ignite.cache(null);
+ IgniteCache<Integer, ObjectValue> cache = ignite().cache(null);
boolean partitioned = cache.getConfiguration(CacheConfiguration.class).getCacheMode() == PARTITIONED;
@@ -621,7 +671,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testFullTextSearch() throws Exception {
- IgniteCache<Integer, ObjectValue> cache = ignite.cache(null);
+ IgniteCache<Integer, ObjectValue> cache = ignite().cache(null);
// Try to execute on empty cache first.
QueryCursor<Cache.Entry<Integer, ObjectValue>> qry =
@@ -668,7 +718,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testScanQuery() throws Exception {
- IgniteCache<Integer, String> c1 = ignite.cache(null);
+ IgniteCache<Integer, String> c1 = ignite().cache(null);
c1.put(777, "value");
@@ -695,7 +745,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testScanPartitionQuery() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
GridCacheContext cctx = ((IgniteCacheProxy)cache).context();
@@ -739,7 +789,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception In case of error.
*/
public void testTwoObjectsTextSearch() throws Exception {
- IgniteCache<Object, Object> c = ignite.cache(null);
+ IgniteCache<Object, Object> c = ignite().cache(null);
c.put(1, new ObjectValue("ObjectValue str", 1));
c.put("key", new ObjectValueOther("ObjectValueOther str"));
@@ -762,7 +812,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testEmptyObject() throws Exception {
- IgniteCache<EmptyObject, EmptyObject> cache = ignite.cache(null);
+ IgniteCache<EmptyObject, EmptyObject> cache = ignite().cache(null);
cache.put(new EmptyObject(1), new EmptyObject(2));
@@ -778,7 +828,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testPrimitiveType() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
cache.put(1, 1);
cache.put(2, 2);
@@ -815,7 +865,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
private void testPaginationIterator(@Nullable String cacheName) throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(cacheName);
+ IgniteCache<Integer, Integer> cache = ignite().cache(cacheName);
for (int i = 0; i < 50; i++)
cache.put(i, i);
@@ -857,7 +907,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
private void testPaginationGet(@Nullable String cacheName) throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(cacheName);
+ IgniteCache<Integer, Integer> cache = ignite().cache(cacheName);
for (int i = 0; i < 50; i++)
cache.put(i, i);
@@ -885,7 +935,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testScanFilters() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
for (int i = 0; i < 50; i++)
cache.put(i, i);
@@ -921,7 +971,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws IgniteCheckedException if failed.
*/
public void testBadHashObjectKey() throws IgniteCheckedException {
- IgniteCache<BadHashKeyObject, Byte> cache = ignite.cache(null);
+ IgniteCache<BadHashKeyObject, Byte> cache = ignite().cache(null);
cache.put(new BadHashKeyObject("test_key1"), (byte)1);
cache.put(new BadHashKeyObject("test_key0"), (byte)10);
@@ -935,7 +985,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws IgniteCheckedException if failed.
*/
public void testTextIndexedKey() throws IgniteCheckedException {
- IgniteCache<ObjectValue, Long> cache = ignite.cache(null);
+ IgniteCache<ObjectValue, Long> cache = ignite().cache(null);
cache.put(new ObjectValue("test_key1", 10), 19L);
cache.put(new ObjectValue("test_key0", 11), 11005L);
@@ -950,7 +1000,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testOrderByOnly() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
for (int i = 0; i < 10; i++)
cache.put(i, i);
@@ -980,7 +1030,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testLimitOnly() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
for (int i = 0; i < 10; i++)
cache.put(i, i);
@@ -1008,7 +1058,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testArray() throws Exception {
- IgniteCache<Integer, ArrayObject> cache = ignite.cache(null);
+ IgniteCache<Integer, ArrayObject> cache = ignite().cache(null);
cache.put(1, new ArrayObject(new Long[]{1L, null, 3L}));
cache.put(2, new ArrayObject(new Long[] {4L, 5L, 6L}));
@@ -1038,7 +1088,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testFieldsQueryMetadata() throws Exception {
- IgniteCache<UUID, Person> cache = ignite.cache(null);
+ IgniteCache<UUID, Person> cache = ignite().cache(null);
for (int i = 0; i < 100; i++)
cache.put(UUID.randomUUID(), new Person("name-" + i, (i + 1) * 100));
@@ -1062,8 +1112,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
private void checkSqlQueryEvents() throws Exception {
final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
+ IgnitePredicate[] lsnrs = new IgnitePredicate[gridCount()];
+
for (int i = 0; i < gridCount(); i++) {
- grid(i).events().localListen(new IgnitePredicate<Event>() {
+ IgnitePredicate<Event> pred = new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryExecutedEvent;
@@ -1073,26 +1125,36 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
assertNotNull(qe.clause());
assertNull(qe.scanQueryFilter());
assertNull(qe.continuousQueryFilter());
- assertArrayEquals(new Integer[] { 10 }, qe.arguments());
+ assertArrayEquals(new Integer[] {10}, qe.arguments());
execLatch.countDown();
return true;
}
- }, EVT_CACHE_QUERY_EXECUTED);
+ };
+
+ grid(i).events().localListen(pred, EVT_CACHE_QUERY_EXECUTED);
+
+ lsnrs[i] = pred;
}
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ try {
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
- for (int i = 0; i < 20; i++)
- cache.put(i, i);
+ for (int i = 0; i < 20; i++)
+ cache.put(i, i);
- QueryCursor<Cache.Entry<Integer, Integer>> q =
- cache.query(new SqlQuery<Integer, Integer>(Integer.class, "_key >= ?").setArgs(10));
+ QueryCursor<Cache.Entry<Integer, Integer>> q =
+ cache.query(new SqlQuery<Integer, Integer>(Integer.class, "_key >= ?").setArgs(10));
- q.getAll();
+ q.getAll();
- assert execLatch.await(1000, MILLISECONDS);
+ assert execLatch.await(1000, MILLISECONDS);
+ }
+ finally {
+ for (int i = 0; i < gridCount(); i++)
+ grid(i).events().stopLocalListen(lsnrs[i], EVT_CACHE_QUERY_EXECUTED);
+ }
}
/**
@@ -1110,8 +1172,11 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
final CountDownLatch latch = new CountDownLatch(10);
final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
+ IgnitePredicate[] objReadLsnrs = new IgnitePredicate[gridCount()];
+ IgnitePredicate[] qryExecLsnrs = new IgnitePredicate[gridCount()];
+
for (int i = 0; i < gridCount(); i++) {
- grid(i).events().localListen(new IgnitePredicate<Event>() {
+ IgnitePredicate<Event> pred = new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryReadEvent;
@@ -1132,9 +1197,12 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
return true;
}
- }, EVT_CACHE_QUERY_OBJECT_READ);
+ };
+
+ grid(i).events().localListen(pred, EVT_CACHE_QUERY_OBJECT_READ);
+ objReadLsnrs[i] = pred;
- grid(i).events().localListen(new IgnitePredicate<Event>() {
+ IgnitePredicate<Event> execPred = new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryExecutedEvent;
@@ -1153,31 +1221,42 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
return true;
}
- }, EVT_CACHE_QUERY_EXECUTED);
+ };
+
+ grid(i).events().localListen(execPred, EVT_CACHE_QUERY_EXECUTED);
+ qryExecLsnrs[i] = execPred;
}
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ try {
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
- for (int i = 0; i < 20; i++)
- cache.put(i, i);
+ for (int i = 0; i < 20; i++)
+ cache.put(i, i);
- IgniteBiPredicate<Integer, Integer> filter = new IgniteBiPredicate<Integer, Integer>() {
- @Override public boolean apply(Integer k, Integer v) {
- return k >= 10;
- }
- };
+ IgniteBiPredicate<Integer, Integer> filter = new IgniteBiPredicate<Integer, Integer>() {
+ @Override public boolean apply(Integer k, Integer v) {
+ return k >= 10;
+ }
+ };
- QueryCursor<Cache.Entry<Integer, Integer>> q = cache.query(new ScanQuery<>(filter));
+ QueryCursor<Cache.Entry<Integer, Integer>> q = cache.query(new ScanQuery<>(filter));
- q.getAll();
+ q.getAll();
- assert latch.await(1000, MILLISECONDS);
- assert execLatch.await(1000, MILLISECONDS);
+ assert latch.await(1000, MILLISECONDS);
+ assert execLatch.await(1000, MILLISECONDS);
- assertEquals(10, map.size());
+ assertEquals(10, map.size());
- for (int i = 10; i < 20; i++)
- assertEquals(i, map.get(i).intValue());
+ for (int i = 10; i < 20; i++)
+ assertEquals(i, map.get(i).intValue());
+ }
+ finally {
+ for (int i = 0; i < gridCount(); i++) {
+ grid(i).events().stopLocalListen(objReadLsnrs[i]);
+ grid(i).events().stopLocalListen(qryExecLsnrs[i]);
+ }
+ }
}
/**
@@ -1188,8 +1267,11 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
final CountDownLatch latch = new CountDownLatch(2);
final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
+ IgnitePredicate[] objReadLsnrs = new IgnitePredicate[gridCount()];
+ IgnitePredicate[] qryExecLsnrs = new IgnitePredicate[gridCount()];
+
for (int i = 0; i < gridCount(); i++) {
- grid(i).events().localListen(new IgnitePredicate<Event>() {
+ IgnitePredicate<Event> objReadPred = new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryReadEvent;
@@ -1210,9 +1292,12 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
return true;
}
- }, EVT_CACHE_QUERY_OBJECT_READ);
+ };
- grid(i).events().localListen(new IgnitePredicate<Event>() {
+ grid(i).events().localListen(objReadPred, EVT_CACHE_QUERY_OBJECT_READ);
+ objReadLsnrs[i] = objReadPred;
+
+ IgnitePredicate<Event> qryExecPred = new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryExecutedEvent;
@@ -1231,30 +1316,41 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
return true;
}
- }, EVT_CACHE_QUERY_EXECUTED);
+ };
+
+ grid(i).events().localListen(qryExecPred, EVT_CACHE_QUERY_EXECUTED);
+ qryExecLsnrs[i] = qryExecPred;
}
- IgniteCache<UUID, Person> cache = ignite.cache(null);
+ try {
+ IgniteCache<UUID, Person> cache = ignite().cache(null);
- UUID k1 = UUID.randomUUID();
- UUID k2 = UUID.randomUUID();
- UUID k3 = UUID.randomUUID();
+ UUID k1 = UUID.randomUUID();
+ UUID k2 = UUID.randomUUID();
+ UUID k3 = UUID.randomUUID();
- cache.put(k1, new Person("Bob White", 1000));
- cache.put(k2, new Person("Tom White", 1000));
- cache.put(k3, new Person("Mike Green", 1000));
+ cache.put(k1, new Person("Bob White", 1000));
+ cache.put(k2, new Person("Tom White", 1000));
+ cache.put(k3, new Person("Mike Green", 1000));
- QueryCursor<Cache.Entry<UUID, Person>> q = cache.query(new TextQuery<UUID, Person>(Person.class, "White"));
+ QueryCursor<Cache.Entry<UUID, Person>> q = cache.query(new TextQuery<UUID, Person>(Person.class, "White"));
- q.getAll();
+ q.getAll();
- assert latch.await(1000, MILLISECONDS);
- assert execLatch.await(1000, MILLISECONDS);
+ assert latch.await(1000, MILLISECONDS);
+ assert execLatch.await(1000, MILLISECONDS);
- assertEquals(2, map.size());
+ assertEquals(2, map.size());
- assertEquals("Bob White", map.get(k1).name());
- assertEquals("Tom White", map.get(k2).name());
+ assertEquals("Bob White", map.get(k1).name());
+ assertEquals("Tom White", map.get(k2).name());
+ }
+ finally {
+ for (int i = 0; i < gridCount(); i++) {
+ grid(i).events().stopLocalListen(objReadLsnrs[i]);
+ grid(i).events().stopLocalListen(qryExecLsnrs[i]);
+ }
+ }
}
/**
@@ -1263,8 +1359,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
public void testFieldsQueryEvents() throws Exception {
final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
+ IgnitePredicate[] qryExecLsnrs = new IgnitePredicate[gridCount()];
+
for (int i = 0; i < gridCount(); i++) {
- grid(i).events().localListen(new IgnitePredicate<Event>() {
+ IgnitePredicate<Event> pred = new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
assert evt instanceof CacheQueryExecutedEvent;
@@ -1274,26 +1372,35 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
assertNotNull(qe.clause());
assertNull(qe.scanQueryFilter());
assertNull(qe.continuousQueryFilter());
- assertArrayEquals(new Integer[]{10}, qe.arguments());
+ assertArrayEquals(new Integer[] {10}, qe.arguments());
execLatch.countDown();
return true;
}
- }, EVT_CACHE_QUERY_EXECUTED);
+ };
+
+ grid(i).events().localListen(pred, EVT_CACHE_QUERY_EXECUTED);
+ qryExecLsnrs[i] = pred;
}
- IgniteCache<UUID, Person> cache = ignite.cache(null);
+ try {
+ IgniteCache<UUID, Person> cache = ignite().cache(null);
- for (int i = 1; i <= 20; i++)
- cache.put(UUID.randomUUID(), new Person("Person " + i, i));
+ for (int i = 1; i <= 20; i++)
+ cache.put(UUID.randomUUID(), new Person("Person " + i, i));
- QueryCursor<List<?>> q = cache.query(new SqlFieldsQuery("select _key, name from Person where salary > ?").
- setArgs(10));
+ QueryCursor<List<?>> q = cache.query(new SqlFieldsQuery("select _key, name from Person where salary > ?").
+ setArgs(10));
- q.getAll();
+ q.getAll();
- assert execLatch.await(1000, MILLISECONDS);
+ assert execLatch.await(1000, MILLISECONDS);
+ }
+ finally {
+ for (int i = 0; i < gridCount(); i++)
+ grid(i).events().stopLocalListen(qryExecLsnrs[i]);
+ }
}
/**
@@ -1574,7 +1681,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
/**
*
*/
- private static class BadHashKeyObject implements Serializable {
+ private static class BadHashKeyObject implements Serializable, Comparable<BadHashKeyObject> {
/** */
@QuerySqlField(index = false)
private final String str;
@@ -1583,7 +1690,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
* @param str String.
*/
private BadHashKeyObject(String str) {
- this.str = str;
+ this.str = str == null ? "" : str;
}
/** {@inheritDoc} */
@@ -1602,6 +1709,11 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
}
/** {@inheritDoc} */
+ @Override public int compareTo(BadHashKeyObject o) {
+ return str.compareTo(o.str);
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(BadHashKeyObject.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
index 9c52f92..e462cce 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.lang.reflect.Field;
-import java.sql.ResultSet;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
@@ -41,7 +40,6 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.events.DiscoveryEvent;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractQuerySelfTest;
@@ -49,8 +47,6 @@ import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.lang.GridCloseableIterator;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.PA;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -112,8 +108,8 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery
}
/** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- super.beforeTest();
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
ignite1 = grid(0);
ignite2 = grid(1);
@@ -322,7 +318,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery
* @throws Exception If failed.
*/
public void testLostIterator() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite().cache(null);
for (int i = 0; i < 1000; i++)
cache.put(i, i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java
index 9a4d168..64d48e3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java
@@ -47,7 +47,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT
* @throws Exception If test failed.
*/
public void testQueryLocal() throws Exception {
- IgniteCache<Integer, String> cache = ignite.cache(null);
+ IgniteCache<Integer, String> cache = ignite().cache(null);
cache.put(1, "value1");
cache.put(2, "value2");
http://git-wip-us.apache.org/repos/asf/ignite/blob/81458f51/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 6abc2d4..1f5d6d1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheQueryInternalKeysSel
import org.apache.ignite.internal.processors.cache.GridCacheQuerySerializationSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheReduceQueryMultithreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteBinaryObjectFieldsQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheBinaryObjectsScanSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheCollocatedQuerySelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheDuplicateEntityConfigurationSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheFieldsQueryNoDataSelfTest;
@@ -159,6 +160,7 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
suite.addTestSuite(GridCacheQuerySerializationSelfTest.class);
+ suite.addTestSuite(IgniteCacheBinaryObjectsScanSelfTest.class);
// Scan queries.
suite.addTestSuite(CacheScanPartitionQueryFallbackSelfTest.class);
[23/50] [abbrv] ignite git commit: IGNITE-2201 - Fixed affinity
collocation with AffinityKey and examples model
Posted by nt...@apache.org.
IGNITE-2201 - Fixed affinity collocation with AffinityKey and examples model
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bda0b19c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bda0b19c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bda0b19c
Branch: refs/heads/ignite-gg-10837
Commit: bda0b19c7f4af8f51823ddeb2e23583a3217dd5a
Parents: d391daa
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Dec 18 15:29:09 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Dec 18 15:30:23 2015 +0300
----------------------------------------------------------------------
...ComputeClientBinaryTaskExecutionExample.java | 4 +-
.../CacheClientBinaryPutGetExample.java | 6 +-
.../datagrid/CacheClientBinaryQueryExample.java | 10 +--
.../examples/datagrid/CacheQueryExample.java | 4 +-
.../apache/ignite/examples/model/Address.java | 72 +++++++++++++++
.../apache/ignite/examples/model/Employee.java | 93 ++++++++++++++++++++
.../ignite/examples/model/EmployeeKey.java | 93 ++++++++++++++++++++
.../ignite/examples/model/Organization.java | 85 ++++++++++++++++--
.../ignite/examples/model/OrganizationType.java | 32 +++++++
.../apache/ignite/examples/model/Person.java | 2 +-
.../ignite/examples/model/binary/Address.java | 72 ---------------
.../ignite/examples/model/binary/Employee.java | 93 --------------------
.../examples/model/binary/EmployeeKey.java | 93 --------------------
.../examples/model/binary/Organization.java | 93 --------------------
.../examples/model/binary/OrganizationType.java | 32 -------
.../ignite/examples/model/package-info.java | 23 +++++
.../ignite/internal/binary/BinaryContext.java | 16 +++-
17 files changed, 417 insertions(+), 406 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java b/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
index d839c96..aced78c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
import java.util.Collection;
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
-import org.apache.ignite.examples.model.binary.Address;
-import org.apache.ignite.examples.model.binary.Employee;
+import org.apache.ignite.examples.model.Address;
+import org.apache.ignite.examples.model.Employee;
import org.apache.ignite.binary.BinaryObject;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
index b6fc455..f0f57af 100644
--- a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java
@@ -28,9 +28,9 @@ import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.examples.model.binary.Address;
-import org.apache.ignite.examples.model.binary.Organization;
-import org.apache.ignite.examples.model.binary.OrganizationType;
+import org.apache.ignite.examples.model.Address;
+import org.apache.ignite.examples.model.Organization;
+import org.apache.ignite.examples.model.OrganizationType;
import org.apache.ignite.binary.BinaryObject;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java
index b05cbb5..11c00e9 100644
--- a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java
@@ -34,11 +34,11 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.cache.query.TextQuery;
import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.examples.model.binary.Address;
-import org.apache.ignite.examples.model.binary.Employee;
-import org.apache.ignite.examples.model.binary.EmployeeKey;
-import org.apache.ignite.examples.model.binary.Organization;
-import org.apache.ignite.examples.model.binary.OrganizationType;
+import org.apache.ignite.examples.model.Address;
+import org.apache.ignite.examples.model.Employee;
+import org.apache.ignite.examples.model.EmployeeKey;
+import org.apache.ignite.examples.model.Organization;
+import org.apache.ignite.examples.model.OrganizationType;
import org.apache.ignite.binary.BinaryObject;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index ace7395..98af93c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -273,8 +273,8 @@ public class CacheQueryExample {
Organization org1 = new Organization("ApacheIgnite");
Organization org2 = new Organization("Other");
- orgCache.put(org1.id, org1);
- orgCache.put(org2.id, org2);
+ orgCache.put(org1.id(), org1);
+ orgCache.put(org2.id(), org2);
IgniteCache<AffinityKey<Long>, Person> personCache = Ignition.ignite().cache(PERSON_CACHE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/Address.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/Address.java b/examples/src/main/java/org/apache/ignite/examples/model/Address.java
new file mode 100644
index 0000000..184de4a
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/model/Address.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.model;
+
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.binary.BinaryReader;
+import org.apache.ignite.binary.BinaryWriter;
+
+/**
+ * Employee address.
+ * <p>
+ * This class implements {@link org.apache.ignite.binary.Binarylizable} only for example purposes,
+ * in order to show how to customize serialization and deserialization of
+ * binary objects.
+ */
+public class Address implements Binarylizable {
+ /** Street. */
+ private String street;
+
+ /** ZIP code. */
+ private int zip;
+
+ /**
+ * Required for binary deserialization.
+ */
+ public Address() {
+ // No-op.
+ }
+
+ /**
+ * @param street Street.
+ * @param zip ZIP code.
+ */
+ public Address(String street, int zip) {
+ this.street = street;
+ this.zip = zip;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
+ writer.writeString("street", street);
+ writer.writeInt("zip", zip);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
+ street = reader.readString("street");
+ zip = reader.readInt("zip");
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Address [street=" + street +
+ ", zip=" + zip + ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/Employee.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/Employee.java b/examples/src/main/java/org/apache/ignite/examples/model/Employee.java
new file mode 100644
index 0000000..a59ffce
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/model/Employee.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.model;
+
+import java.util.Collection;
+
+/**
+ * This class represents employee object.
+ */
+public class Employee {
+ /** Name. */
+ private String name;
+
+ /** Salary. */
+ private long salary;
+
+ /** Address. */
+ private Address addr;
+
+ /** Departments. */
+ private Collection<String> departments;
+
+ /**
+ * Required for binary deserialization.
+ */
+ public Employee() {
+ // No-op.
+ }
+
+ /**
+ * @param name Name.
+ * @param salary Salary.
+ * @param addr Address.
+ * @param departments Departments.
+ */
+ public Employee(String name, long salary, Address addr, Collection<String> departments) {
+ this.name = name;
+ this.salary = salary;
+ this.addr = addr;
+ this.departments = departments;
+ }
+
+ /**
+ * @return Name.
+ */
+ public String name() {
+ return name;
+ }
+
+ /**
+ * @return Salary.
+ */
+ public long salary() {
+ return salary;
+ }
+
+ /**
+ * @return Address.
+ */
+ public Address address() {
+ return addr;
+ }
+
+ /**
+ * @return Departments.
+ */
+ public Collection<String> departments() {
+ return departments;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Employee [name=" + name +
+ ", salary=" + salary +
+ ", address=" + addr +
+ ", departments=" + departments + ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/EmployeeKey.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/EmployeeKey.java b/examples/src/main/java/org/apache/ignite/examples/model/EmployeeKey.java
new file mode 100644
index 0000000..55e7967
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/model/EmployeeKey.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.model;
+
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+
+/**
+ * This class represents key for employee object.
+ * <p>
+ * Used in query example to collocate employees
+ * with their organizations.
+ */
+public class EmployeeKey {
+ /** ID. */
+ private int id;
+
+ /** Organization ID. */
+ @AffinityKeyMapped
+ private int organizationId;
+
+ /**
+ * Required for binary deserialization.
+ */
+ public EmployeeKey() {
+ // No-op.
+ }
+
+ /**
+ * @param id ID.
+ * @param organizationId Organization ID.
+ */
+ public EmployeeKey(int id, int organizationId) {
+ this.id = id;
+ this.organizationId = organizationId;
+ }
+
+ /**
+ * @return ID.
+ */
+ public int id() {
+ return id;
+ }
+
+ /**
+ * @return Organization ID.
+ */
+ public int organizationId() {
+ return organizationId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ EmployeeKey key = (EmployeeKey)o;
+
+ return id == key.id && organizationId == key.organizationId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int res = id;
+
+ res = 31 * res + organizationId;
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "EmployeeKey [id=" + id +
+ ", organizationId=" + organizationId + ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/Organization.java b/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
index 2500584..70d4eee 100644
--- a/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
+++ b/examples/src/main/java/org/apache/ignite/examples/model/Organization.java
@@ -17,28 +17,42 @@
package org.apache.ignite.examples.model;
-import java.io.Serializable;
+import java.sql.Timestamp;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
/**
- * Organization class.
+ * This class represents organization object.
*/
-public class Organization implements Serializable {
+public class Organization {
/** */
private static final AtomicLong ID_GEN = new AtomicLong();
/** Organization ID (indexed). */
@QuerySqlField(index = true)
- public Long id;
+ private Long id;
/** Organization name (indexed). */
@QuerySqlField(index = true)
- public String name;
+ private String name;
+
+ /** Address. */
+ private Address addr;
+
+ /** Type. */
+ private OrganizationType type;
+
+ /** Last update time. */
+ private Timestamp lastUpdated;
+
+ /**
+ * Required for binary deserialization.
+ */
+ public Organization() {
+ // No-op.
+ }
/**
- * Create organization.
- *
* @param name Organization name.
*/
public Organization(String name) {
@@ -47,8 +61,63 @@ public class Organization implements Serializable {
this.name = name;
}
+ /**
+ * @param name Name.
+ * @param addr Address.
+ * @param type Type.
+ * @param lastUpdated Last update time.
+ */
+ public Organization(String name, Address addr, OrganizationType type, Timestamp lastUpdated) {
+ id = ID_GEN.incrementAndGet();
+
+ this.name = name;
+ this.addr = addr;
+ this.type = type;
+
+ this.lastUpdated = lastUpdated;
+ }
+
+ /**
+ * @return Organization ID.
+ */
+ public Long id() {
+ return id;
+ }
+
+ /**
+ * @return Name.
+ */
+ public String name() {
+ return name;
+ }
+
+ /**
+ * @return Address.
+ */
+ public Address address() {
+ return addr;
+ }
+
+ /**
+ * @return Type.
+ */
+ public OrganizationType type() {
+ return type;
+ }
+
+ /**
+ * @return Last update time.
+ */
+ public Timestamp lastUpdated() {
+ return lastUpdated;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
- return "Organization [id=" + id + ", name=" + name + ']';
+ return "Organization [id=" + id +
+ ", name=" + name +
+ ", address=" + addr +
+ ", type=" + type +
+ ", lastUpdated=" + lastUpdated + ']';
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/OrganizationType.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/OrganizationType.java b/examples/src/main/java/org/apache/ignite/examples/model/OrganizationType.java
new file mode 100644
index 0000000..8b22600
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/model/OrganizationType.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.model;
+
+/**
+ * Organization type enum.
+ */
+public enum OrganizationType {
+ /** Non-profit organization. */
+ NON_PROFIT,
+
+ /** Private organization. */
+ PRIVATE,
+
+ /** Government organization. */
+ GOVERNMENT
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/Person.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/Person.java b/examples/src/main/java/org/apache/ignite/examples/model/Person.java
index 618fa5c..6d3a6df 100644
--- a/examples/src/main/java/org/apache/ignite/examples/model/Person.java
+++ b/examples/src/main/java/org/apache/ignite/examples/model/Person.java
@@ -77,7 +77,7 @@ public class Person implements Serializable {
// Generate unique ID for this person.
id = ID_GEN.incrementAndGet();
- orgId = org.id;
+ orgId = org.id();
this.firstName = firstName;
this.lastName = lastName;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/binary/Address.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/binary/Address.java b/examples/src/main/java/org/apache/ignite/examples/model/binary/Address.java
deleted file mode 100644
index 2d17cb8..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/model/binary/Address.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.model.binary;
-
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.binary.Binarylizable;
-import org.apache.ignite.binary.BinaryReader;
-import org.apache.ignite.binary.BinaryWriter;
-
-/**
- * Employee address.
- * <p>
- * This class implements {@link org.apache.ignite.binary.Binarylizable} only for example purposes,
- * in order to show how to customize serialization and deserialization of
- * binary objects.
- */
-public class Address implements Binarylizable {
- /** Street. */
- private String street;
-
- /** ZIP code. */
- private int zip;
-
- /**
- * Required for binary deserialization.
- */
- public Address() {
- // No-op.
- }
-
- /**
- * @param street Street.
- * @param zip ZIP code.
- */
- public Address(String street, int zip) {
- this.street = street;
- this.zip = zip;
- }
-
- /** {@inheritDoc} */
- @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
- writer.writeString("street", street);
- writer.writeInt("zip", zip);
- }
-
- /** {@inheritDoc} */
- @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
- street = reader.readString("street");
- zip = reader.readInt("zip");
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Address [street=" + street +
- ", zip=" + zip + ']';
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/binary/Employee.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/binary/Employee.java b/examples/src/main/java/org/apache/ignite/examples/model/binary/Employee.java
deleted file mode 100644
index ad82065..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/model/binary/Employee.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.model.binary;
-
-import java.util.Collection;
-
-/**
- * This class represents employee object.
- */
-public class Employee {
- /** Name. */
- private String name;
-
- /** Salary. */
- private long salary;
-
- /** Address. */
- private Address addr;
-
- /** Departments. */
- private Collection<String> departments;
-
- /**
- * Required for binary deserialization.
- */
- public Employee() {
- // No-op.
- }
-
- /**
- * @param name Name.
- * @param salary Salary.
- * @param addr Address.
- * @param departments Departments.
- */
- public Employee(String name, long salary, Address addr, Collection<String> departments) {
- this.name = name;
- this.salary = salary;
- this.addr = addr;
- this.departments = departments;
- }
-
- /**
- * @return Name.
- */
- public String name() {
- return name;
- }
-
- /**
- * @return Salary.
- */
- public long salary() {
- return salary;
- }
-
- /**
- * @return Address.
- */
- public Address address() {
- return addr;
- }
-
- /**
- * @return Departments.
- */
- public Collection<String> departments() {
- return departments;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Employee [name=" + name +
- ", salary=" + salary +
- ", address=" + addr +
- ", departments=" + departments + ']';
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/binary/EmployeeKey.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/binary/EmployeeKey.java b/examples/src/main/java/org/apache/ignite/examples/model/binary/EmployeeKey.java
deleted file mode 100644
index 20367ac..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/model/binary/EmployeeKey.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.model.binary;
-
-import org.apache.ignite.cache.affinity.AffinityKeyMapped;
-
-/**
- * This class represents key for employee object.
- * <p>
- * Used in query example to collocate employees
- * with their organizations.
- */
-public class EmployeeKey {
- /** ID. */
- private int id;
-
- /** Organization ID. */
- @AffinityKeyMapped
- private int organizationId;
-
- /**
- * Required for binary deserialization.
- */
- public EmployeeKey() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param organizationId Organization ID.
- */
- public EmployeeKey(int id, int organizationId) {
- this.id = id;
- this.organizationId = organizationId;
- }
-
- /**
- * @return ID.
- */
- public int id() {
- return id;
- }
-
- /**
- * @return Organization ID.
- */
- public int organizationId() {
- return organizationId;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (o == null || getClass() != o.getClass())
- return false;
-
- EmployeeKey key = (EmployeeKey)o;
-
- return id == key.id && organizationId == key.organizationId;
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- int res = id;
-
- res = 31 * res + organizationId;
-
- return res;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "EmployeeKey [id=" + id +
- ", organizationId=" + organizationId + ']';
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/binary/Organization.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/binary/Organization.java b/examples/src/main/java/org/apache/ignite/examples/model/binary/Organization.java
deleted file mode 100644
index 6b7aca4..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/model/binary/Organization.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.model.binary;
-
-import java.sql.Timestamp;
-
-/**
- * This class represents organization object.
- */
-public class Organization {
- /** Name. */
- private String name;
-
- /** Address. */
- private Address addr;
-
- /** Type. */
- private OrganizationType type;
-
- /** Last update time. */
- private Timestamp lastUpdated;
-
- /**
- * Required for binary deserialization.
- */
- public Organization() {
- // No-op.
- }
-
- /**
- * @param name Name.
- * @param addr Address.
- * @param type Type.
- * @param lastUpdated Last update time.
- */
- public Organization(String name, Address addr, OrganizationType type, Timestamp lastUpdated) {
- this.name = name;
- this.addr = addr;
- this.type = type;
- this.lastUpdated = lastUpdated;
- }
-
- /**
- * @return Name.
- */
- public String name() {
- return name;
- }
-
- /**
- * @return Address.
- */
- public Address address() {
- return addr;
- }
-
- /**
- * @return Type.
- */
- public OrganizationType type() {
- return type;
- }
-
- /**
- * @return Last update time.
- */
- public Timestamp lastUpdated() {
- return lastUpdated;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Organization [name=" + name +
- ", address=" + addr +
- ", type=" + type +
- ", lastUpdated=" + lastUpdated + ']';
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/binary/OrganizationType.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/binary/OrganizationType.java b/examples/src/main/java/org/apache/ignite/examples/model/binary/OrganizationType.java
deleted file mode 100644
index 69804c0..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/model/binary/OrganizationType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.model.binary;
-
-/**
- * Organization type enum.
- */
-public enum OrganizationType {
- /** Non-profit organization. */
- NON_PROFIT,
-
- /** Private organization. */
- PRIVATE,
-
- /** Government organization. */
- GOVERNMENT
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/examples/src/main/java/org/apache/ignite/examples/model/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/model/package-info.java b/examples/src/main/java/org/apache/ignite/examples/model/package-info.java
new file mode 100644
index 0000000..9ddba67
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/model/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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 description. -->
+ * Model classes for Apache Ignite examples.
+ */
+
+package org.apache.ignite.examples.model;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/bda0b19c/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index abe283e..5c63fbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -212,7 +212,7 @@ public class BinaryContext implements Externalizable {
registerPredefinedType(LinkedHashMap.class, 0);
// Classes with overriden default serialization flag.
- registerPredefinedType(AffinityKey.class, 0);
+ registerPredefinedType(AffinityKey.class, 0, affinityFieldName(AffinityKey.class));
registerPredefinedType(GridMapEntry.class, 60);
registerPredefinedType(IgniteBiTuple.class, 61);
@@ -761,6 +761,15 @@ public class BinaryContext implements Externalizable {
* @return GridBinaryClassDescriptor.
*/
public BinaryClassDescriptor registerPredefinedType(Class<?> cls, int id) {
+ return registerPredefinedType(cls, id, null);
+ }
+
+ /**
+ * @param cls Class.
+ * @param id Type ID.
+ * @return GridBinaryClassDescriptor.
+ */
+ public BinaryClassDescriptor registerPredefinedType(Class<?> cls, int id, String affFieldName) {
String typeName = typeName(cls.getName());
if (id == 0)
@@ -772,7 +781,7 @@ public class BinaryContext implements Externalizable {
false,
id,
typeName,
- null,
+ affFieldName,
BinaryInternalIdMapper.defaultInstance(),
new BinaryReflectiveSerializer(),
false,
@@ -784,6 +793,9 @@ public class BinaryContext implements Externalizable {
descByCls.put(cls, desc);
+ if (affFieldName != null)
+ affKeyFieldNames.putIfAbsent(id, affFieldName);
+
return desc;
}
[16/50] [abbrv] ignite git commit: IGNITE-2203: Fixed a bug in
BinaryClassDescriptor causing Externalizable object to be mistakenly analyzed
for duplicate fields.
Posted by nt...@apache.org.
IGNITE-2203: Fixed a bug in BinaryClassDescriptor causing Externalizable object to be mistakenly analyzed for duplicate fields.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/301e7a1a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/301e7a1a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/301e7a1a
Branch: refs/heads/ignite-gg-10837
Commit: 301e7a1af38a3d9ef8640e74070e8c6b558eb332
Parents: d5a56da
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 11:46:50 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 11:46:50 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/binary/BinaryClassDescriptor.java | 5 ++++-
.../java/org/apache/ignite/internal/binary/BinaryWriteMode.java | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/301e7a1a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index eac1874..1eb3882 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -166,7 +166,7 @@ public class BinaryClassDescriptor {
if (excluded)
mode = BinaryWriteMode.EXCLUSION;
else if (useOptMarshaller)
- mode = BinaryWriteMode.OBJECT; // Will not be used anywhere.
+ mode = BinaryWriteMode.OPTIMIZED; // Will not be used anywhere.
else {
if (cls == BinaryEnumObjectImpl.class)
mode = BinaryWriteMode.BINARY_ENUM;
@@ -225,6 +225,7 @@ public class BinaryClassDescriptor {
case BINARY_ENUM:
case ENUM_ARR:
case CLASS:
+ case OPTIMIZED:
case EXCLUSION:
ctor = null;
fields = null;
@@ -395,6 +396,7 @@ public class BinaryClassDescriptor {
void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
assert obj != null;
assert writer != null;
+ assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should not be used here: " + cls.getName();
writer.typeId(typeId);
@@ -648,6 +650,7 @@ public class BinaryClassDescriptor {
*/
Object read(BinaryReaderExImpl reader) throws BinaryObjectException {
assert reader != null;
+ assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should not be used here: " + cls.getName();
Object res;
http://git-wip-us.apache.org/repos/asf/ignite/blob/301e7a1a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
index 30e0458..b037945 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
@@ -154,6 +154,9 @@ public enum BinaryWriteMode {
OBJECT(GridBinaryMarshaller.OBJ),
/** */
+ OPTIMIZED(GridBinaryMarshaller.OBJ),
+
+ /** */
EXCLUSION(GridBinaryMarshaller.OBJ);
/** Type ID. */
[50/50] [abbrv] ignite git commit: IGNITE-GG-10837 WIP
Posted by nt...@apache.org.
IGNITE-GG-10837 WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f00030d1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f00030d1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f00030d1
Branch: refs/heads/ignite-gg-10837
Commit: f00030d1640bc9c30fb16f0bf69acce110808ef5
Parents: 2204542
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Dec 22 13:38:59 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Dec 22 13:38:59 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/dr/GridCacheDrExpirationInfo.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f00030d1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
index 976dea2..7293950 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache.dr;
-import javax.cache.processor.EntryProcessor;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.typedef.internal.S;
[12/50] [abbrv] ignite git commit: IGNITE-2193: .NET: Fixed
SerivceTest.cs.
Posted by nt...@apache.org.
IGNITE-2193: .NET: Fixed SerivceTest.cs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/889b2689
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/889b2689
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/889b2689
Branch: refs/heads/ignite-gg-10837
Commit: 889b2689816a7185029eb7c992bf73f14600844c
Parents: 057ad5b
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Thu Dec 17 17:31:31 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Dec 17 17:31:31 2015 +0300
----------------------------------------------------------------------
.../Services/ServicesTest.cs | 23 +++++++++++++++-----
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/889b2689/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
index 33f255e..ffcdea8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
@@ -218,10 +218,10 @@ namespace Apache.Ignite.Core.Tests.Services
}
Services.Cancel(SvcName + 0);
- Services.Cancel(SvcName + 1);
+ AssertNoService(SvcName + 0);
- Assert.IsNull(Services.GetService<ITestIgniteService>(SvcName + 0));
- Assert.IsNull(Services.GetService<ITestIgniteService>(SvcName + 1));
+ Services.Cancel(SvcName + 1);
+ AssertNoService(SvcName + 1);
for (var i = 2; i < 10; i++)
Assert.IsNotNull(Services.GetService<ITestIgniteService>(SvcName + i));
@@ -229,7 +229,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
for (var i = 0; i < 10; i++)
- Assert.IsNull(Services.GetService<ITestIgniteService>(SvcName + i));
+ AssertNoService(SvcName + i);
}
/// <summary>
@@ -477,8 +477,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
// Cancellation failed, but service is removed.
- foreach (var grid in Grids)
- Assert.IsNull(grid.GetServices().GetService<ITestIgniteService>(SvcName));
+ AssertNoService();
}
[Test]
@@ -579,6 +578,18 @@ namespace Apache.Ignite.Core.Tests.Services
}
/// <summary>
+ /// Asserts that there is no service on any grid with given name.
+ /// </summary>
+ /// <param name="name">The name.</param>
+ private void AssertNoService(string name = SvcName)
+ {
+ foreach (var grid in Grids)
+ Assert.IsTrue(
+ TestUtils.WaitForCondition(() => grid.GetServices()
+ .GetService<ITestIgniteService>(name) == null, 5000));
+ }
+
+ /// <summary>
/// Gets the services.
/// </summary>
protected virtual IServices Services