date:20151222

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 7cf8ed26b -> 3938d2986


ignite-1.5 Fixed hang on metadata update inside put in atomic cache when 
topology read lock is held.


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

Branch: refs/heads/ignite-1537
Commit: 3938d2986ddcad641d24f08d311500866aa419d2
Parents: 7cf8ed2
Author: sboikov 
Authored: Tue Dec 22 18:02:10 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 18:02:10 2015 +0300

--
 .../ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3938d298/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 dcab5b2..0df7da6 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
@@ -897,8 +897,8 @@ public class TcpDiscoverySelfTest extends 
GridCommonAbstractTest {
  */
 public void testIpFinderCleaning() throws Exception {
 try {
-ipFinder.registerAddresses(Arrays.asList(new 
InetSocketAddress("host1", 1024),
-new InetSocketAddress("host2", 1024)));
+ipFinder.registerAddresses(Arrays.asList(new 
InetSocketAddress("1.1.1.1", 1024),
+new InetSocketAddress("1.1.1.2", 1024)));
 
 Ignite g1 = startGrid(1);
 
@@ -923,8 +923,8 @@ public class TcpDiscoverySelfTest extends 
GridCommonAbstractTest {
 // Check that missing addresses are returned back.
 ipFinder.unregisterAddresses(ipFinder.getRegisteredAddresses()); 
// Unregister valid address.
 
-ipFinder.registerAddresses(Arrays.asList(new 
InetSocketAddress("host1", 1024),
-new InetSocketAddress("host2", 1024)));
+ipFinder.registerAddresses(Arrays.asList(new 
InetSocketAddress("1.1.1.1", 1024),
+new InetSocketAddress("1.1.1.2", 1024)));
 
 GridTestUtils.waitForCondition(new GridAbsPredicate() {
 @Override public boolean apply() {

ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 8be0ced4c -> b6dab0915


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/b6dab091
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6dab091
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6dab091

Branch: refs/heads/ignite-1.5
Commit: b6dab0915d691c9a4b9e949d90d93ced8458e018
Parents: 8be0ced
Author: Ignite Teamcity 
Authored: Tue Dec 22 18:21:45 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 18:21:45 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/b6dab091/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 63bc44c..c81873d 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.7791], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7794], 
[d...@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/b6dab091/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 736c721..5918135 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.7791], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7794], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index a87bd58..7f36009 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.7791], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7794], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index b3d72ab..c9aa6b7 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.7791],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0.7794],[d...@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/b6dab091/modules/platforms/cpp/ignite/configure.ac

ignite git commit: IGNITE-2226

2015-12-22 Thread av

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 d95ca2ef3 -> 8be0ced4c


IGNITE-2226


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

Branch: refs/heads/ignite-1.5
Commit: 8be0ced4c4eaba4002a0f963d0d74519aef7c8c6
Parents: d95ca2e
Author: Anton Vinogradov 
Authored: Tue Dec 22 18:14:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 18:14:25 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 +-
 .../ignite/internal/IgniteVersionUtils.java |  5 -
 .../ignite/lang/IgniteProductVersion.java   |  2 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../product/GridProductVersionSelfTest.java | 22 ++--
 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 +-
 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  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../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 +-
 67 files changed, 99 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8be0ced4/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 @@

[02/14] ignite git commit: IGNITE-2226

2015-12-22 Thread sboikov

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-1537
Commit: 1039bf69e94c07e5e8d26860f0df2037caab79a7
Parents: fa48b89
Author: Anton Vinogradov 
Authored: Tue Dec 22 13:18:33 2015 +0300
Committer: Anton Vinogradov 
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 @@
 
 
 
-
+

[06/14] ignite git commit: 1.5.0-final-SNAPSHOT

2015-12-22 Thread sboikov

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/73d8b904
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73d8b904
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73d8b904

Branch: refs/heads/ignite-1537
Commit: 73d8b90488e5b7033cc59aca341dd3e5dda8bcff
Parents: 276207a
Author: Ignite Teamcity 
Authored: Tue Dec 22 14:25:05 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 14:25:05 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 +-

[13/14] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

2015-12-22 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537


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

Branch: refs/heads/ignite-1537
Commit: bad9e6364916d1af791f72f73abdfa5fe4486416
Parents: 3938d29 b6dab09
Author: sboikov 
Authored: Tue Dec 22 22:19:17 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 22:19:17 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml   |  7 +++
 assembly/dependencies-fabric.xml|  7 +++
 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 +-
 .../ignite/internal/IgniteVersionUtils.java |  5 +-
 .../internal/binary/GridBinaryMarshaller.java   | 10 
 .../binary/CacheObjectBinaryProcessorImpl.java  |  3 ++
 .../ignite/lang/IgniteProductVersion.java   |  2 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../product/GridProductVersionSelfTest.java | 22 ++---
 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 +-
 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  |  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../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 +-
 .../config/benchmark-multicast.properties   |  6 +--
 modules/yardstick/pom.xml   |  2 +-
 .../cache/IgnitePutTxImplicitBenchmark.java | 52 
 .../cache/IgnitePutTxOffHeapBenchmark.java  |  2 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java  |  2 +-
 modules/yarn/pom.xml|  2 +-
 modules/zookeeper/pom.xml   |  2 +-
 pom.xml |  4 +-
 75

[05/14] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread sboikov

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/276207a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/276207a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/276207a5

Branch: refs/heads/ignite-1537
Commit: 276207a5c7a7ee0a4c76f7aebb569cf2215da10b
Parents: 60d157b d134730
Author: sboikov 
Authored: Tue Dec 22 13:30:03 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:30: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 +-
 .../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 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 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  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../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 |   4 +-
 65 files changed, 224 insertions(+), 79 deletions(-)
--

[11/14] ignite git commit: IGNITE-2226

2015-12-22 Thread sboikov

IGNITE-2226


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

Branch: refs/heads/ignite-1537
Commit: 8be0ced4c4eaba4002a0f963d0d74519aef7c8c6
Parents: d95ca2e
Author: Anton Vinogradov 
Authored: Tue Dec 22 18:14:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 18:14:25 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 +-
 .../ignite/internal/IgniteVersionUtils.java |  5 -
 .../ignite/lang/IgniteProductVersion.java   |  2 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../product/GridProductVersionSelfTest.java | 22 ++--
 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 +-
 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  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../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 +-
 67 files changed, 99 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8be0ced4/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 @@
 
 
 ignite-examples
-1.5.0-final-SNAPSHOT
+1.5.0.final-SNAPSHOT

[08/14] ignite git commit: ignite-1.5 Fixed benchmarks names.

2015-12-22 Thread sboikov

ignite-1.5 Fixed benchmarks names.


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

Branch: refs/heads/ignite-1537
Commit: 6ad758ce9deb5154ba7b907cf077d2ea8ec0d4d7
Parents: 2c8b259
Author: sboikov 
Authored: Tue Dec 22 16:00:57 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 16:00:57 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6ad758ce/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 43fb7d7..03d74ad 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} -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 IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-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,\
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark 
-sn IgniteNode -ds

[03/14] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread sboikov

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/d1347308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1347308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1347308

Branch: refs/heads/ignite-1537
Commit: d134730895e7e1f764ccf10bdb3144c6aac861a9
Parents: 1039bf6
Author: Ignite Teamcity 
Authored: Tue Dec 22 13:26:23 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 13:26:23 2015 +0300

--
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 2 +-
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs| 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 2 +-
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 2 +-
 .../examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 869b090..54da0d1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 edf867d..3bacd8f 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,4 +47,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 41b2aac..2fe3dd9 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 8eac438..e4c823b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]
 
 [assembly: CLSCompliant(true)]
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
--
diff --git

[04/14] ignite git commit: ignite-1.5 Fixed benchmark configuration.

2015-12-22 Thread sboikov

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/60d157bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d157bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d157bd

Branch: refs/heads/ignite-1537
Commit: 60d157bde27f406bd52b3fe166f7375cf881a19c
Parents: bbdb202
Author: sboikov 
Authored: Tue Dec 22 13:29:20 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:29:20 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60d157bd/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index def652a..43fb7d7 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup,\

[12/14] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread sboikov

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/b6dab091
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6dab091
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6dab091

Branch: refs/heads/ignite-1537
Commit: b6dab0915d691c9a4b9e949d90d93ced8458e018
Parents: 8be0ced
Author: Ignite Teamcity 
Authored: Tue Dec 22 18:21:45 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 18:21:45 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/b6dab091/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 63bc44c..c81873d 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.7791], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7794], 
[d...@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/b6dab091/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 736c721..5918135 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.7791], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7794], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index a87bd58..7f36009 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.7791], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7794], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index b3d72ab..c9aa6b7 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.7791],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0.7794],[d...@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/b6dab091/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac

[01/14] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 3938d2986 -> 0b5306fb9


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-1537
Commit: fa48b89ec77a0095364d37371d52f544593572d5
Parents: 3ee0966
Author: Ignite Teamcity 
Authored: Tue Dec 22 12:43:03 2015 +0300
Committer: Ignite Teamcity 
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|

[09/14] ignite git commit: ignite-1.5 Restored benchmarks with implicit transactions.

2015-12-22 Thread sboikov

ignite-1.5 Restored benchmarks with implicit transactions.


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

Branch: refs/heads/ignite-1537
Commit: c8ccd4f2399f4764631b504feb27efc68eb23256
Parents: 6ad758c
Author: sboikov 
Authored: Tue Dec 22 17:09:39 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 17:10:53 2015 +0300

--
 .../config/benchmark-multicast.properties   |  6 +--
 .../cache/IgnitePutTxImplicitBenchmark.java | 52 
 .../cache/IgnitePutTxOffHeapBenchmark.java  |  2 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java  |  2 +-
 4 files changed, 57 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c8ccd4f2/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 03d74ad..c638d94 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} -txc OPTIMISTIC -dn IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-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,\
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-val-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-put-offheap-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds

[14/14] ignite git commit: ignite-1.5

2015-12-22 Thread sboikov

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/0b5306fb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b5306fb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b5306fb

Branch: refs/heads/ignite-1537
Commit: 0b5306fb99dd367bf291bf2de69245ff8cd2902b
Parents: bad9e63
Author: sboikov 
Authored: Tue Dec 22 22:21:20 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 22:21:20 2015 +0300

--
 .../continuous/GridCacheContinuousQueryAbstractSelfTest.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0b5306fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 5f5dfd4..db59a7f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -62,6 +62,7 @@ import org.apache.ignite.internal.util.typedef.PA;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiInClosure;
 import org.apache.ignite.lang.IgnitePredicate;
+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;
@@ -128,6 +129,8 @@ public abstract class 
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
 
 cfg.setDiscoverySpi(disco);
 
+
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
 return cfg;
 }

[10/14] ignite git commit: IGNITE-2116

2015-12-22 Thread sboikov

IGNITE-2116


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

Branch: refs/heads/ignite-1537
Commit: d95ca2ef309db9a2be78338ad53b71ae3380856d
Parents: c8ccd4f
Author: Anton Vinogradov 
Authored: Tue Dec 22 17:15:21 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 17:15:21 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml | 7 +++
 assembly/dependencies-fabric.xml  | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric-lgpl.xml
--
diff --git a/assembly/dependencies-fabric-lgpl.xml 
b/assembly/dependencies-fabric-lgpl.xml
index f50847e..8fa3c4e 100644
--- a/assembly/dependencies-fabric-lgpl.xml
+++ b/assembly/dependencies-fabric-lgpl.xml
@@ -151,6 +151,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 5fb7cb1..2330a3a 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -154,6 +154,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /

ignite git commit: ignite-1.5

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 0b5306fb9 -> dc8ab8afe


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/dc8ab8af
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc8ab8af
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc8ab8af

Branch: refs/heads/ignite-1537
Commit: dc8ab8afec41945c201e5a677920ec74670a443c
Parents: 0b5306f
Author: sboikov 
Authored: Tue Dec 22 22:42:32 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 22:42:32 2015 +0300

--
 ...ContinuousQueryFailoverAbstractSelfTest.java | 128 ++-
 1 file changed, 66 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dc8ab8af/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index 5a4ba14..283da80 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -1009,107 +1009,111 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
  */
 private void checkEvents(final List> expEvts, 
final CacheEventListener2 lsnr,
 boolean lostAllow, boolean wait) throws Exception {
-if (wait)
+if (wait) {
 GridTestUtils.waitForCondition(new PA() {
-@Override public boolean apply() {
+@Override
+public boolean apply() {
 return expEvts.size() == lsnr.size();
 }
 }, 2000L);
+}
 
-Map> prevMap = new 
HashMap<>(lsnr.evts.size());
+synchronized (lsnr) {
+Map> prevMap = new 
HashMap<>(lsnr.evts.size());
 
-for (Map.Entry> e : 
lsnr.evts.entrySet())
-prevMap.put(e.getKey(), new ArrayList<>(e.getValue()));
+for (Map.Entry> e : 
lsnr.evts.entrySet())
+prevMap.put(e.getKey(), new ArrayList<>(e.getValue()));
 
-List> lostEvts = new ArrayList<>();
+List> lostEvts = new ArrayList<>();
 
-for (T3 exp : expEvts) {
-List rcvdEvts = lsnr.evts.get(exp.get1());
+for (T3 exp : expEvts) {
+List rcvdEvts = 
lsnr.evts.get(exp.get1());
 
-if (F.eq(exp.get2(), exp.get3()))
-continue;
+if (F.eq(exp.get2(), exp.get3()))
+continue;
 
-if (rcvdEvts == null || rcvdEvts.isEmpty()) {
-lostEvts.add(exp);
+if (rcvdEvts == null || rcvdEvts.isEmpty()) {
+lostEvts.add(exp);
 
-continue;
-}
+continue;
+}
 
-Iterator iter = rcvdEvts.iterator();
+Iterator iter = rcvdEvts.iterator();
 
-boolean found = false;
+boolean found = false;
 
-while (iter.hasNext()) {
-CacheEntryEvent e = iter.next();
+while (iter.hasNext()) {
+CacheEntryEvent e = iter.next();
 
-if ((exp.get2() != null && e.getValue() != null && 
exp.get2().equals(e.getValue()))
-&& equalOldValue(e, exp)) {
-found = true;
+if ((exp.get2() != null && e.getValue() != null && 
exp.get2().equals(e.getValue()))
+&& equalOldValue(e, exp)) {
+found = true;
 
-iter.remove();
+iter.remove();
 
-break;
+break;
+}
 }
-}
 
-// Lost event is acceptable.
-if (!found)
-lostEvts.add(exp);
-}
+// Lost event is acceptable.
+if (!found)
+

[ignite] Git Push Summary

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-igfs-kerberos [created] 7b094a5c3

ignite git commit: removed HadoopNativeCodeLoader

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-igfs-kerberos 7b094a5c3 -> 2caec5dde


removed HadoopNativeCodeLoader


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

Branch: refs/heads/ignite-igfs-kerberos
Commit: 2caec5dde00bd7461d4e7186f593744d93f65216
Parents: 7b094a5
Author: dmagda 
Authored: Tue Dec 22 21:31:24 2015 +0300
Committer: dmagda 
Committed: Tue Dec 22 21:31:24 2015 +0300

--
 .../hadoop/v2/HadoopNativeCodeLoader.java   | 74 
 1 file changed, 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2caec5dd/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopNativeCodeLoader.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopNativeCodeLoader.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopNativeCodeLoader.java
deleted file mode 100644
index 4c4840d..000
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopNativeCodeLoader.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.hadoop.v2;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.conf.Configuration;
-
-/**
- * A fake helper to load the native hadoop code i.e. libhadoop.so.
- */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
-public class HadoopNativeCodeLoader {
-/**
- * Check if native-hadoop code is loaded for this platform.
- *
- * @return true if native-hadoop is loaded,
- * else false
- */
-public static boolean isNativeCodeLoaded() {
-return false;
-}
-
-/**
- * Returns true only if this build was compiled with support for snappy.
- */
-public static boolean buildSupportsSnappy() {
-return false;
-}
-
-/**
- * @return Library name.
- */
-public static String getLibraryName() {
-throw new IllegalStateException();
-}
-
-/**
- * Return if native hadoop libraries, if present, can be used for this job.
- * @param conf configuration
- *
- * @return true if native hadoop libraries, if present, can be
- * used for this job; false otherwise.
- */
-public boolean getLoadNativeLibraries(Configuration conf) {
-return false;
-}
-
-/**
- * Set if native hadoop libraries, if present, can be used for this job.
- *
- * @param conf configuration
- * @param loadNativeLibraries can native hadoop libraries be loaded
- */
-public void setLoadNativeLibraries(Configuration conf, boolean 
loadNativeLibraries) {
-// No-op.
-}
-}

ignite git commit: fixed compilation of HadoopClassLoader

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-igfs-kerberos 2caec5dde -> d9dffb333


fixed compilation of HadoopClassLoader


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

Branch: refs/heads/ignite-igfs-kerberos
Commit: d9dffb333510a57ffc597fdc7d217845407b6192
Parents: 2caec5d
Author: dmagda 
Authored: Tue Dec 22 21:39:25 2015 +0300
Committer: dmagda 
Committed: Tue Dec 22 21:39:25 2015 +0300

--
 .../ignite/internal/processors/hadoop/HadoopClassLoader.java  | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d9dffb33/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
index f12af46..eb53e20 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
@@ -33,7 +33,6 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.processors.hadoop.v2.HadoopDaemon;
-import org.apache.ignite.internal.processors.hadoop.v2.HadoopNativeCodeLoader;
 import 
org.apache.ignite.internal.processors.hadoop.v2.HadoopShutdownHookManager;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -145,8 +144,6 @@ public class HadoopClassLoader extends URLClassLoader {
 if (isHadoop(name)) { // Always load Hadoop classes explicitly, 
since Hadoop can be available in App classpath.
 if (name.endsWith(".util.ShutdownHookManager"))  // Dirty hack 
to get rid of Hadoop shutdown hooks.
 return loadFromBytes(name, 
HadoopShutdownHookManager.class.getName());
-else if (name.endsWith(".util.NativeCodeLoader"))
-return loadFromBytes(name, 
HadoopNativeCodeLoader.class.getName());
 else if (name.equals(HADOOP_DAEMON_CLASS_NAME))
 // We replace this in order to be able to forcibly stop 
some daemon threads
 // that otherwise never stop (e.g. PeerCache runnables):

svn commit: r1721481 - in /ignite/site/trunk: index.html news.html

2015-12-22 Thread dsetrakyan

Author: dsetrakyan
Date: Wed Dec 23 01:39:43 2015
New Revision: 1721481

URL: http://svn.apache.org/viewvc?rev=1721481=rev
Log:
updated news.

Modified:
ignite/site/trunk/index.html
ignite/site/trunk/news.html

Modified: ignite/site/trunk/index.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/index.html?rev=1721481=1721480=1721481=diff
==
--- ignite/site/trunk/index.html (original)
+++ ignite/site/trunk/index.html Wed Dec 23 01:39:43 2015
@@ -115,6 +115,15 @@ under the License.
 
 Latest News
 
+
+https://dzone.com/articles/getting-started-with-apache-ignite;>
+Getting Started With Apache Ignite
+Blog, Prachi Garg, December 19, 2015
+
+
+Apache Ignite 1.5.0-b1 released
+December 12, 
2015
+
 
 Apache Ignite 1.4.0 released
 September 28, 
2015
@@ -129,15 +138,14 @@ under the License.
 How Apache Ignite Processes Geographically 
Distributed Transactions
 Blog, Yakov Zhdanov, 
July 22, 2015
 
-
-Apache Ignite 1.3.0 released
-July 21, 2015
-
-
-
-Apache Ignite 1.2.0 released
-June 29, 2015
-
+
+
+
+
+
+
+
+
 
 Read 
More
 

Modified: ignite/site/trunk/news.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/news.html?rev=1721481=1721480=1721481=diff
==
Binary files - no diff available.

[21/28] ignite git commit: 1.5.0-final-SNAPSHOT

2015-12-22 Thread akuznetsov

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/73d8b904
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73d8b904
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73d8b904

Branch: refs/heads/ignite-gg-10889
Commit: 73d8b90488e5b7033cc59aca341dd3e5dda8bcff
Parents: 276207a
Author: Ignite Teamcity 
Authored: Tue Dec 22 14:25:05 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 14:25:05 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 +-

[20/28] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread akuznetsov

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/276207a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/276207a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/276207a5

Branch: refs/heads/ignite-gg-10889
Commit: 276207a5c7a7ee0a4c76f7aebb569cf2215da10b
Parents: 60d157b d134730
Author: sboikov 
Authored: Tue Dec 22 13:30:03 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:30: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 +-
 .../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 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 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  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../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 |   4 +-
 65 files changed, 224 insertions(+), 79 deletions(-)
--

[15/28] ignite git commit: IGNITE-2229 - Added test for the ticket.

2015-12-22 Thread akuznetsov

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-10889
Commit: 3ee096613bbbe9538de949cfe20fafd7d2471de1
Parents: bbdb202
Author: Alexey Goncharuk 
Authored: Tue Dec 22 12:20:39 2015 +0300
Committer: Alexey Goncharuk 
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 000..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 fields = new LinkedHashMap<>();
+
+fields.put("val", String.class.getName());
+
+qryEntity.setFields(fields);
+
+qryEntity.setIndexes(Arrays.asList(new QueryIndex("val", 
QueryIndexType.FULLTEXT)));
+
+

[10/28] ignite git commit: ignite-1.5 Fixed benchmark configuration.

2015-12-22 Thread akuznetsov

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-10889
Commit: 8c2b6740c43b3e32c424d2862155ce384fbafe51
Parents: d8576b8
Author: sboikov 
Authored: Tue Dec 22 10:16:37 2015 +0300
Committer: sboikov 
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,\

[08/28] ignite git commit: ignite-1.5 Minor javadocs.

2015-12-22 Thread akuznetsov

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-10889
Commit: d8576b8f9850b53c240bd21fab7fe19abd717225
Parents: da24df9
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 11:14:17 2015 +0700
Committer: Alexey Kuznetsov 
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

[09/28] ignite git commit: ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.

2015-12-22 Thread akuznetsov

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-10889
Commit: c5ed0d0e23329b8badb594e6f625eb58a24e2392
Parents: d8576b8
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 14:14:43 2015 +0700
Committer: Alexey Kuznetsov 
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()))

[03/28] ignite git commit: .NET: Removed unnecessary "Contains" word from namespace descriptions.

2015-12-22 Thread akuznetsov

.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-10889
Commit: 12d1528fb705c4d3812a5a5ccaeb6dee6a924422
Parents: 359bf21
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:55:56 2015 +0300
Committer: vozerov-gridgain 
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
 
 /// 
-/// Contains Ignite Binary Objects API classes.
+/// Ignite Binary Objects API classes.
 /// 
 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
 
 /// 
-/// Contains main Data Grid APIs.
+/// Main Data Grid APIs.
 /// 
 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
 
 /// 
-/// Contains APIs for creating and executing cache continuous queries.
+/// APIs for creating and executing cache continuous queries.
 /// 
 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
 
 /// 
-/// Contains APIs for creating and executing cache queries.
+/// APIs for creating and

[05/28] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

2015-12-22 Thread akuznetsov

IGNITE-2190 - Fixing deserialization during scan query. - Fixes #355.

Signed-off-by: Alexey Goncharuk 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/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-10889
Commit: 81458f51c40f58b169da178bd7a572d3c9fe01ff
Parents: 2848680
Author: Alexey Goncharuk 
Authored: Mon Dec 21 18:54:38 2015 +0300
Committer: Alexey Goncharuk 
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 extends 
AsyncSupportAdapter)qry, qry.isLocal(),
@@ -630,7 +630,8 @@ public class IgniteCacheProxy extends 
AsyncSupportAdapter(new 
Iterable>() {
 @Override public Iterator> 
iterator() {
-return ctx.kernalContext().query().queryLocal(ctx, 
p);
+return

[18/28] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread akuznetsov

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/d1347308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1347308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1347308

Branch: refs/heads/ignite-gg-10889
Commit: d134730895e7e1f764ccf10bdb3144c6aac861a9
Parents: 1039bf6
Author: Ignite Teamcity 
Authored: Tue Dec 22 13:26:23 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 13:26:23 2015 +0300

--
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 2 +-
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs| 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 2 +-
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 2 +-
 .../examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 869b090..54da0d1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 edf867d..3bacd8f 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,4 +47,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 41b2aac..2fe3dd9 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 8eac438..e4c823b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]
 
 [assembly: CLSCompliant(true)]
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
--
diff --git

[07/28] ignite git commit: ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

2015-12-22 Thread akuznetsov

ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

Signed-off-by: S.Vladykin 


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-10889
Commit: da24df99525b796a79fdb55997efe1c9bd515a5d
Parents: a0cdb59
Author: vershov 
Authored: Tue Dec 22 00:08:37 2015 +0300
Committer: S.Vladykin 
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 extends 
MutableConfiguration {
 private IgnitePredicate 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 extends 
MutableConfiguration {
 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 extends 
MutableConfiguration {
 }
 
 /**
- * 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 extends 
MutableConfiguration {
 }
 
 /**
+ * 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.
+ * 
+ * Be aware of using the same string in case sensitive and case 
insensitive manner simultaneously, since
+ * behaviour for such case is not specified.
+ * 
+ * When sqlSchema is not specified, quoted {@code cacheName} is used 
instead.
+ * 
+ * {@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 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

[25/28] ignite git commit: IGNITE-2116

2015-12-22 Thread akuznetsov

IGNITE-2116


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

Branch: refs/heads/ignite-gg-10889
Commit: d95ca2ef309db9a2be78338ad53b71ae3380856d
Parents: c8ccd4f
Author: Anton Vinogradov 
Authored: Tue Dec 22 17:15:21 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 17:15:21 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml | 7 +++
 assembly/dependencies-fabric.xml  | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric-lgpl.xml
--
diff --git a/assembly/dependencies-fabric-lgpl.xml 
b/assembly/dependencies-fabric-lgpl.xml
index f50847e..8fa3c4e 100644
--- a/assembly/dependencies-fabric-lgpl.xml
+++ b/assembly/dependencies-fabric-lgpl.xml
@@ -151,6 +151,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 5fb7cb1..2330a3a 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -154,6 +154,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /

svn commit: r1721482 - in /ignite/site/trunk: index.html news.html

2015-12-22 Thread dsetrakyan

Author: dsetrakyan
Date: Wed Dec 23 01:42:53 2015
New Revision: 1721482

URL: http://svn.apache.org/viewvc?rev=1721482=rev
Log:
updated news.

Modified:
ignite/site/trunk/index.html
ignite/site/trunk/news.html

Modified: ignite/site/trunk/index.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/index.html?rev=1721482=1721481=1721482=diff
==
--- ignite/site/trunk/index.html (original)
+++ ignite/site/trunk/index.html Wed Dec 23 01:42:53 2015
@@ -117,11 +117,11 @@ under the License.
 
 
 https://dzone.com/articles/getting-started-with-apache-ignite;>
-Getting Started With Apache Ignite
-Blog, Prachi Garg, December 19, 2015
+Getting Started With Ignite
+Blog, Prachi Garg, Dec 
19, 2015
 
 
-Apache Ignite 1.5.0-b1 released
+Apache Ignite 1.5.0-b1 early access 
released
 December 12, 
2015
 
 

Modified: ignite/site/trunk/news.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/news.html?rev=1721482=1721481=1721482=diff
==
Binary files - no diff available.

[27/28] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread akuznetsov

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/b6dab091
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6dab091
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6dab091

Branch: refs/heads/ignite-gg-10889
Commit: b6dab0915d691c9a4b9e949d90d93ced8458e018
Parents: 8be0ced
Author: Ignite Teamcity 
Authored: Tue Dec 22 18:21:45 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 18:21:45 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/b6dab091/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 63bc44c..c81873d 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.7791], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7794], 
[d...@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/b6dab091/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 736c721..5918135 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.7791], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7794], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index a87bd58..7f36009 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.7791], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7794], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index b3d72ab..c9aa6b7 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.7791],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0.7794],[d...@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/b6dab091/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac

[11/28] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread akuznetsov

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-10889
Commit: 6a91996e328ad29dde03b68622517360cb7a7ffb
Parents: 8c2b674 c5ed0d0
Author: sboikov 
Authored: Tue Dec 22 10:17:06 2015 +0300
Committer: sboikov 
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(-)
--

[19/28] ignite git commit: ignite-1.5 Fixed benchmark configuration.

2015-12-22 Thread akuznetsov

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/60d157bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d157bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d157bd

Branch: refs/heads/ignite-gg-10889
Commit: 60d157bde27f406bd52b3fe166f7375cf881a19c
Parents: bbdb202
Author: sboikov 
Authored: Tue Dec 22 13:29:20 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:29:20 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60d157bd/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index def652a..43fb7d7 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup,\

[16/28] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread akuznetsov

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-10889
Commit: fa48b89ec77a0095364d37371d52f544593572d5
Parents: 3ee0966
Author: Ignite Teamcity 
Authored: Tue Dec 22 12:43:03 2015 +0300
Committer: Ignite Teamcity 
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 +-

[24/28] ignite git commit: ignite-1.5 Restored benchmarks with implicit transactions.

2015-12-22 Thread akuznetsov

ignite-1.5 Restored benchmarks with implicit transactions.


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

Branch: refs/heads/ignite-gg-10889
Commit: c8ccd4f2399f4764631b504feb27efc68eb23256
Parents: 6ad758c
Author: sboikov 
Authored: Tue Dec 22 17:09:39 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 17:10:53 2015 +0300

--
 .../config/benchmark-multicast.properties   |  6 +--
 .../cache/IgnitePutTxImplicitBenchmark.java | 52 
 .../cache/IgnitePutTxOffHeapBenchmark.java  |  2 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java  |  2 +-
 4 files changed, 57 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c8ccd4f2/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 03d74ad..c638d94 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} -txc OPTIMISTIC -dn IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-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,\
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-val-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-put-offheap-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds

[02/28] ignite git commit: 1.5.0-final-SNAPSHOT

2015-12-22 Thread akuznetsov

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-10889
Commit: e5869237561eda9e57cb3e7c86deb7f83a8275fd
Parents: 359bf21
Author: Ignite Teamcity 
Authored: Mon Dec 21 15:53:50 2015 +0300
Committer: Ignite Teamcity 
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.1], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7768], 
[d...@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.1], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7768], [d...@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.1], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7768], [d...@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.1],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0.7768],[d...@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

[14/28] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread akuznetsov

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-10889
Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3
Parents: 627134b 3aa6f82
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:29:06 2015 +0300
Committer: vozerov-gridgain 
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(-)
--

[06/28] ignite git commit: ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

2015-12-22 Thread akuznetsov

ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

Signed-off-by: S.Vladykin 


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-10889
Commit: a0cdb59645ce0a84344c6c92b9695c1a26e2a824
Parents: 81458f5
Author: S.Vladykin 
Authored: Mon Dec 21 19:58:29 2015 +0300
Committer: S.Vladykin 
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 mapExps = F.addAll(new 
ArrayList(mapQry.allColumns()),
 mapQry.columns(false));
 
-GridSqlElement[] rdcExps = new GridSqlElement[mapQry.visibleColumns()];
+final int visibleCols = mapQry.visibleColumns();
+final int havingCol = mapQry.havingColumn();
+
+List rdcExps = new ArrayList<>(visibleCols);
 
 Set 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++)  //

[01/28] ignite git commit: IGNITE-2184: Updated .NET/CPP version update procedure.

2015-12-22 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-10889 192762b25 -> 767bb82bf


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-10889
Commit: 359bf2142627b1dbe26e00da1fb1ac071d71b4ce
Parents: 6edeccd
Author: Pavel Tupitsyn 
Authored: Mon Dec 21 15:33:43 2015 +0300
Committer: vozerov-gridgain 
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.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[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.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[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.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[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.1")]
 [assembly: AssemblyFileVersion("1.5.0.1")]
+[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
---

[04/28] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread akuznetsov

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-10889
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain 
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(-)
--

[26/28] ignite git commit: IGNITE-2226

2015-12-22 Thread akuznetsov

IGNITE-2226


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

Branch: refs/heads/ignite-gg-10889
Commit: 8be0ced4c4eaba4002a0f963d0d74519aef7c8c6
Parents: d95ca2e
Author: Anton Vinogradov 
Authored: Tue Dec 22 18:14:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 18:14:25 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 +-
 .../ignite/internal/IgniteVersionUtils.java |  5 -
 .../ignite/lang/IgniteProductVersion.java   |  2 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../product/GridProductVersionSelfTest.java | 22 ++--
 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 +-
 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  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../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 +-
 67 files changed, 99 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8be0ced4/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 @@
 
 
 ignite-examples
-1.5.0-final-SNAPSHOT
+1.5.0.final-SNAPSHOT

[22/28] ignite git commit: IGNITE-2225: Fixed unnecessary deserializations.

2015-12-22 Thread akuznetsov

IGNITE-2225: Fixed unnecessary deserializations.


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

Branch: refs/heads/ignite-gg-10889
Commit: 2c8b259b4e0149887ce03e29cd9b2b5f103d1b86
Parents: 73d8b90
Author: vozerov-gridgain 
Authored: Tue Dec 22 15:05:24 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 15:05:24 2015 +0300

--
 .../ignite/internal/binary/GridBinaryMarshaller.java  | 10 ++
 .../cache/binary/CacheObjectBinaryProcessorImpl.java  |  3 +++
 2 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2c8b259b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index b21c679..71ca018 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -268,6 +268,16 @@ public class GridBinaryMarshaller {
 }
 
 /**
+ * Whether object must be deserialized anyway. I.e. it cannot be converted 
to BinaryObject.
+ *
+ * @param obj Object.
+ * @return {@code True} if object will be deserialized on unmarshal.
+ */
+public boolean mustDeserialize(Object obj) {
+return obj != null && ctx.mustDeserialize(obj.getClass());
+}
+
+/**
  * Gets writer for the given output stream.
  *
  * @param out Output stream.

http://git-wip-us.apache.org/repos/asf/ignite/blob/2c8b259b/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 6aee7a9..b335179 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
@@ -435,6 +435,9 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 return new GridMapEntry<>(marshalToBinary(e.getKey()), 
marshalToBinary(e.getValue()));
 }
 
+if (binaryMarsh.mustDeserialize(obj))
+return obj; // No need to go through marshal-unmarshal because 
result will be the same as initial object.
+
 byte[] arr = binaryMarsh.marshal(obj);
 
 assert arr.length > 0;

svn commit: r1721475 - /ignite/site/trunk/index.html

2015-12-22 Thread dsetrakyan

Author: dsetrakyan
Date: Tue Dec 22 23:57:52 2015
New Revision: 1721475

URL: http://svn.apache.org/viewvc?rev=1721475=rev
Log:
added sh.html include.

Modified:
ignite/site/trunk/index.html

Modified: ignite/site/trunk/index.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/index.html?rev=1721475=1721474=1721475=diff
==
--- ignite/site/trunk/index.html (original)
+++ ignite/site/trunk/index.html Tue Dec 22 23:57:52 2015
@@ -41,6 +41,8 @@ under the License.
 
 https://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css; 
rel="stylesheet">
 
+
+

svn commit: r1721483 - /ignite/site/trunk/index.html

2015-12-22 Thread dsetrakyan

Author: dsetrakyan
Date: Wed Dec 23 01:43:50 2015
New Revision: 1721483

URL: http://svn.apache.org/viewvc?rev=1721483=rev
Log:
updated news.

Modified:
ignite/site/trunk/index.html

Modified: ignite/site/trunk/index.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/index.html?rev=1721483=1721482=1721483=diff
==
--- ignite/site/trunk/index.html (original)
+++ ignite/site/trunk/index.html Wed Dec 23 01:43:50 2015
@@ -121,7 +121,7 @@ under the License.
 Blog, Prachi Garg, Dec 
19, 2015
 
 
-Apache Ignite 1.5.0-b1 early access 
released
+Apache Ignite 1.5.0-b1 Early Access 
Released
 December 12, 
2015

[1/2] ignite git commit: IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.

2015-12-22 Thread akuznetsov

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-10889 767bb82bf -> 7daa2b5d8


IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.


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

Branch: refs/heads/ignite-gg-10889
Commit: fbb4982081d08ea9d8d2971a1db49e9fed547304
Parents: b6dab09
Author: thatcoach 
Authored: Wed Dec 23 09:01:13 2015 +0300
Committer: thatcoach 
Committed: Wed Dec 23 09:01:13 2015 +0300

--
 .../binary/BinaryMarshallerSelfTest.java| 82 ++--
 1 file changed, 41 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fbb49820/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 ac9771f..9f7beb8 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
@@ -17,40 +17,6 @@
 
 package org.apache.ignite.internal.binary;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetSocketAddress;
-import java.sql.Timestamp;
-import java.util.AbstractQueue;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
 import junit.framework.Assert;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.binary.BinaryCollectionFactory;
@@ -87,9 +53,43 @@ import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 import sun.misc.Unsafe;
 
-import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.INSTANCE;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotEquals;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetSocketAddress;
+import java.sql.Timestamp;
+import java.util.AbstractQueue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.*;
+import static org.junit.Assert.*;
 
 /**
  * Binary marshaller tests.
@@ -2339,8 +2339,8 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 
 // Check direct field access.
 assertNull(objBin.field(fieldName));
-assertEquals(1, objBin.field(fieldNameA));
-assertEquals(2, objBin.field(fieldNameB));
+assertEquals(Integer.valueOf(1), objBin.field(fieldNameA));
+assertEquals(Integer.valueOf(2), objBin.field(fieldNameB));
 
 // Check metadata.
 BinaryType type = objBin.type();
@@ -2363,8 +2363,8 @@ public class BinaryMarshallerSelfTest extends

ignite git commit: ignite-1.5

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 dc8ab8afe -> 118f29ae0


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/118f29ae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/118f29ae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/118f29ae

Branch: refs/heads/ignite-1537
Commit: 118f29ae0e926f774dcde836440814f638d99501
Parents: dc8ab8a
Author: sboikov 
Authored: Wed Dec 23 08:10:18 2015 +0300
Committer: sboikov 
Committed: Wed Dec 23 08:10:18 2015 +0300

--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/118f29ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index e617f43..3c86083 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -845,14 +845,6 @@ public class GridNearAtomicUpdateFuture extends 
GridFutureAdapter
 
 GridCacheVersion futVer = cctx.versions().next(topVer);
 
-if (storeFuture()) {
-if (!cctx.mvcc().addAtomicFuture(futVer, 
GridNearAtomicUpdateFuture.this)) {
-assert isDone() : GridNearAtomicUpdateFuture.this;
-
-return;
-}
-}
-
 GridCacheVersion updVer;
 
 // Assign version on near node in CLOCK ordering mode even if 
fastMap is false.
@@ -926,6 +918,14 @@ public class GridNearAtomicUpdateFuture extends 
GridFutureAdapter
 return;
 }
 
+if (storeFuture()) {
+if (!cctx.mvcc().addAtomicFuture(futVer, 
GridNearAtomicUpdateFuture.this)) {
+assert isDone() : GridNearAtomicUpdateFuture.this;
+
+return;
+}
+}
+
 // Optimize mapping for single key.
 if (singleReq0 != null)
 mapSingle(singleReq0.nodeId(), singleReq0);

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 118f29ae0 -> 70c182f8b


ignite-1.5 Fixed hang on metadata update inside put in atomic cache when 
topology read lock is held.


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

Branch: refs/heads/ignite-1537
Commit: 70c182f8be9c5a8aa6af3b3c6b501bb9ea19b78d
Parents: 118f29a
Author: sboikov 
Authored: Wed Dec 23 09:18:13 2015 +0300
Committer: sboikov 
Committed: Wed Dec 23 09:51:53 2015 +0300

--
 .../managers/communication/GridIoManager.java   | 39 +++-
 .../dht/atomic/GridDhtAtomicCache.java  |  1 +
 .../ignite/internal/util/lang/GridFunc.java |  1 +
 ...niteClientReconnectFailoverAbstractTest.java |  3 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 20 +++---
 .../cache/GridCacheAbstractSelfTest.java|  3 +-
 .../GridServiceProcessorStopSelfTest.java   | 21 ++-
 7 files changed, 54 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/70c182f8/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index bf7c7e4..42f8dae 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -666,6 +666,7 @@ public class GridIoManager extends 
GridManagerAdapter 0 || skipOnTimeout;
 
-send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, 
ackClosure);
+send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, 
ackC);
 }
 
  /**
@@ -1385,6 +1388,7 @@ public class GridIoManager extends 
GridManagerAdapter 0 || skipOnTimeout;
 
@@ -1442,7 +1447,7 @@ public class GridIoManager extends 
GridManagerAdapter extends 
GridDhtCacheAdapter {

[1/2] ignite git commit: IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 70c182f8b -> 656b113ed


IGNITE-2213: Fixed test. Thanks to Roman Shtykh for noticing it.


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

Branch: refs/heads/ignite-1537
Commit: fbb4982081d08ea9d8d2971a1db49e9fed547304
Parents: b6dab09
Author: thatcoach 
Authored: Wed Dec 23 09:01:13 2015 +0300
Committer: thatcoach 
Committed: Wed Dec 23 09:01:13 2015 +0300

--
 .../binary/BinaryMarshallerSelfTest.java| 82 ++--
 1 file changed, 41 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fbb49820/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 ac9771f..9f7beb8 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
@@ -17,40 +17,6 @@
 
 package org.apache.ignite.internal.binary;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetSocketAddress;
-import java.sql.Timestamp;
-import java.util.AbstractQueue;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
 import junit.framework.Assert;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.binary.BinaryCollectionFactory;
@@ -87,9 +53,43 @@ import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 import sun.misc.Unsafe;
 
-import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.INSTANCE;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotEquals;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetSocketAddress;
+import java.sql.Timestamp;
+import java.util.AbstractQueue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import static 
org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.*;
+import static org.junit.Assert.*;
 
 /**
  * Binary marshaller tests.
@@ -2339,8 +2339,8 @@ public class BinaryMarshallerSelfTest extends 
GridCommonAbstractTest {
 
 // Check direct field access.
 assertNull(objBin.field(fieldName));
-assertEquals(1, objBin.field(fieldNameA));
-assertEquals(2, objBin.field(fieldNameB));
+assertEquals(Integer.valueOf(1), objBin.field(fieldNameA));
+assertEquals(Integer.valueOf(2), objBin.field(fieldNameB));
 
 // Check metadata.
 BinaryType type = objBin.type();
@@ -2363,8 +2363,8 @@ public class BinaryMarshallerSelfTest extends

[2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

2015-12-22 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537


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

Branch: refs/heads/ignite-1537
Commit: 656b113ed9052c03b6b68096a69e08fe107d358c
Parents: 70c182f fbb4982
Author: sboikov 
Authored: Wed Dec 23 10:11:59 2015 +0300
Committer: sboikov 
Committed: Wed Dec 23 10:11:59 2015 +0300

--
 .../binary/BinaryMarshallerSelfTest.java| 82 ++--
 1 file changed, 41 insertions(+), 41 deletions(-)
--

[10/10] ignite git commit: Merge branch 'ignite-1.5' into ignite-gg-10837

2015-12-22 Thread ntikhonov

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/972a703b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/972a703b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/972a703b

Branch: refs/heads/ignite-gg-10837
Commit: 972a703b6987e81e9f75dc18fc5b5484f7931f03
Parents: d01589c d95ca2e
Author: nikolay_tikhonov 
Authored: Tue Dec 22 17:39:06 2015 +0300
Committer: nikolay_tikhonov 
Committed: Tue Dec 22 17:39:06 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml   |  7 +++
 assembly/dependencies-fabric.xml|  7 +++
 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 +-
 .../internal/binary/GridBinaryMarshaller.java   | 10 
 .../binary/CacheObjectBinaryProcessorImpl.java  |  3 ++
 .../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 +-
 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  |  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  6 +--
 .../Properties/AssemblyInfo.cs  |  6 +--
 .../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 +-
 .../config/benchmark-multicast.properties   |  6 +--
 modules/yardstick/pom.xml   |  2 +-
 .../cache/IgnitePutTxImplicitBenchmark.java | 52 
 .../cache/IgnitePutTxOffHeapBenchmark.java  |  2 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java  |  2 +-
 modules/yarn/pom.xml|  2 +-
 modules/zookeeper/pom.xml   |  2 +-
 pom.xml |  2 +-
 72 files changed, 162 insertions(+), 83 deletions(-)
--

[02/10] ignite git commit: ignite-1.5 Fixed benchmark configuration.

2015-12-22 Thread ntikhonov

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/60d157bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d157bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d157bd

Branch: refs/heads/ignite-gg-10837
Commit: 60d157bde27f406bd52b3fe166f7375cf881a19c
Parents: bbdb202
Author: sboikov 
Authored: Tue Dec 22 13:29:20 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:29:20 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60d157bd/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index def652a..43fb7d7 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup,\

[01/10] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread ntikhonov

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-10837 f00030d16 -> 972a703b6


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/d1347308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1347308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1347308

Branch: refs/heads/ignite-gg-10837
Commit: d134730895e7e1f764ccf10bdb3144c6aac861a9
Parents: 1039bf6
Author: Ignite Teamcity 
Authored: Tue Dec 22 13:26:23 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 13:26:23 2015 +0300

--
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 2 +-
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs| 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 2 +-
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 2 +-
 .../examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 869b090..54da0d1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 edf867d..3bacd8f 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,4 +47,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 41b2aac..2fe3dd9 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 8eac438..e4c823b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]
 
 [assembly: CLSCompliant(true)]
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs

[03/10] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread ntikhonov

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/276207a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/276207a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/276207a5

Branch: refs/heads/ignite-gg-10837
Commit: 276207a5c7a7ee0a4c76f7aebb569cf2215da10b
Parents: 60d157b d134730
Author: sboikov 
Authored: Tue Dec 22 13:30:03 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:30: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 +-
 .../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 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 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  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../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 |   4 +-
 65 files changed, 224 insertions(+), 79 deletions(-)
--

[08/10] ignite git commit: IGNITE-2116

2015-12-22 Thread ntikhonov

IGNITE-2116


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

Branch: refs/heads/ignite-gg-10837
Commit: d95ca2ef309db9a2be78338ad53b71ae3380856d
Parents: c8ccd4f
Author: Anton Vinogradov 
Authored: Tue Dec 22 17:15:21 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 17:15:21 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml | 7 +++
 assembly/dependencies-fabric.xml  | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric-lgpl.xml
--
diff --git a/assembly/dependencies-fabric-lgpl.xml 
b/assembly/dependencies-fabric-lgpl.xml
index f50847e..8fa3c4e 100644
--- a/assembly/dependencies-fabric-lgpl.xml
+++ b/assembly/dependencies-fabric-lgpl.xml
@@ -151,6 +151,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 5fb7cb1..2330a3a 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -154,6 +154,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /

[08/15] ignite git commit: IGNITE-2225: Fixed unnecessary deserializations.

2015-12-22 Thread av

IGNITE-2225: Fixed unnecessary deserializations.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 2c8b259b4e0149887ce03e29cd9b2b5f103d1b86
Parents: 73d8b90
Author: vozerov-gridgain 
Authored: Tue Dec 22 15:05:24 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 15:05:24 2015 +0300

--
 .../ignite/internal/binary/GridBinaryMarshaller.java  | 10 ++
 .../cache/binary/CacheObjectBinaryProcessorImpl.java  |  3 +++
 2 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2c8b259b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index b21c679..71ca018 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -268,6 +268,16 @@ public class GridBinaryMarshaller {
 }
 
 /**
+ * Whether object must be deserialized anyway. I.e. it cannot be converted 
to BinaryObject.
+ *
+ * @param obj Object.
+ * @return {@code True} if object will be deserialized on unmarshal.
+ */
+public boolean mustDeserialize(Object obj) {
+return obj != null && ctx.mustDeserialize(obj.getClass());
+}
+
+/**
  * Gets writer for the given output stream.
  *
  * @param out Output stream.

http://git-wip-us.apache.org/repos/asf/ignite/blob/2c8b259b/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 6aee7a9..b335179 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
@@ -435,6 +435,9 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
 return new GridMapEntry<>(marshalToBinary(e.getKey()), 
marshalToBinary(e.getValue()));
 }
 
+if (binaryMarsh.mustDeserialize(obj))
+return obj; // No need to go through marshal-unmarshal because 
result will be the same as initial object.
+
 byte[] arr = binaryMarsh.marshal(obj);
 
 assert arr.length > 0;

[14/15] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

2015-12-22 Thread av

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

Conflicts:
examples/pom.xml
examples/schema-import/pom.xml
modules/aop/pom.xml
modules/apache-license-gen/pom.xml
modules/aws/pom.xml
modules/camel/pom.xml
modules/clients/pom.xml
modules/cloud/pom.xml
modules/codegen/pom.xml
modules/core/pom.xml
modules/core/src/main/resources/ignite.properties
modules/extdata/p2p/pom.xml
modules/extdata/uri/modules/uri-dependency/pom.xml
modules/extdata/uri/pom.xml
modules/flume/pom.xml
modules/gce/pom.xml
modules/geospatial/pom.xml
modules/hadoop/pom.xml
modules/hibernate/pom.xml
modules/indexing/pom.xml
modules/jcl/pom.xml
modules/jms11/pom.xml
modules/jta/pom.xml
modules/kafka/pom.xml
modules/log4j/pom.xml
modules/log4j2/pom.xml
modules/mesos/pom.xml
modules/mqtt/pom.xml
modules/osgi-karaf/pom.xml
modules/osgi-paxlogging/pom.xml
modules/osgi/pom.xml
modules/platforms/cpp/common/configure.ac
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac
modules/platforms/cpp/ignite/configure.ac

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
modules/rest-http/pom.xml
modules/scalar-2.10/pom.xml
modules/scalar/pom.xml
modules/schedule/pom.xml
modules/schema-import/pom.xml
modules/slf4j/pom.xml
modules/spark-2.10/pom.xml
modules/spark/pom.xml
modules/spring/pom.xml
modules/ssh/pom.xml
modules/tools/pom.xml
modules/twitter/pom.xml
modules/urideploy/pom.xml
modules/visor-console-2.10/pom.xml
modules/visor-console/pom.xml
modules/visor-plugins/pom.xml
modules/web/pom.xml
modules/yardstick/pom.xml
modules/yarn/pom.xml
modules/zookeeper/pom.xml
pom.xml

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

Conflicts:
benchmarks/cache-comparison/pom.xml
benchmarks/filesystem/hadoop1/pom.xml
benchmarks/filesystem/hadoop2/pom.xml
benchmarks/mongo/pom.xml
benchmarks/risk-analytics/pom.xml
benchmarks/serialization/pom.xml

benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs
examples/pom.xml
modules/clients/pom.xml
modules/codegen/pom.xml
modules/compatibility/pom.xml
modules/core/pom.xml
modules/core/src/main/resources/gridgain.properties
modules/diagnostic/pom.xml
modules/dr-demo/pom.xml
modules/license-gen/pom.xml
modules/mongo-sniffer/pom.xml
modules/mongo-visor/pom.xml
modules/mongo/pom.xml
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac

modules/platforms/dotnet/examples/GridGainExamples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/GridGainExamplesDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-examples-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-exe/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-test-compatibility/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-dll/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-runner/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain/Properties/AssemblyInfo.cs
modules/tools/pom.xml
modules/visor-console/pom.xml
modules/visor-demo/pom.xml
modules/visor-tester-plugin/pom.xml
modules/visor-tester/pom.xml
modules/visor/pom.xml
modules/yardstick/dotnet/Properties/AssemblyInfo.cs
modules/yardstick/pom.xml
parent/pom.xml
pilots/chronotrack/pom.xml
pilots/ctb/pom.xml
pilots/dsi/pom.xml
pilots/ionic/pom.xml
pilots/sb/pom.xml
pilots/sony/pom.xml
pilots/wellsfargo/pom.xml
pilots/worldpay/pom.xml
pom.xml

[06/15] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread av

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/276207a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/276207a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/276207a5

Branch: refs/heads/ignite-1.5.1-2
Commit: 276207a5c7a7ee0a4c76f7aebb569cf2215da10b
Parents: 60d157b d134730
Author: sboikov 
Authored: Tue Dec 22 13:30:03 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:30: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 +-
 .../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 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 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  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../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 |   4 +-
 65 files changed, 224 insertions(+), 79 deletions(-)
--

[07/15] ignite git commit: 1.5.0-final-SNAPSHOT

2015-12-22 Thread av

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/73d8b904
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73d8b904
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73d8b904

Branch: refs/heads/ignite-1.5.1-2
Commit: 73d8b90488e5b7033cc59aca341dd3e5dda8bcff
Parents: 276207a
Author: Ignite Teamcity 
Authored: Tue Dec 22 14:25:05 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 14:25:05 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 +-

[11/15] ignite git commit: IGNITE-2116

2015-12-22 Thread av

IGNITE-2116


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

Branch: refs/heads/ignite-1.5.1-2
Commit: d95ca2ef309db9a2be78338ad53b71ae3380856d
Parents: c8ccd4f
Author: Anton Vinogradov 
Authored: Tue Dec 22 17:15:21 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 17:15:21 2015 +0300

--
 assembly/dependencies-fabric-lgpl.xml | 7 +++
 assembly/dependencies-fabric.xml  | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric-lgpl.xml
--
diff --git a/assembly/dependencies-fabric-lgpl.xml 
b/assembly/dependencies-fabric-lgpl.xml
index f50847e..8fa3c4e 100644
--- a/assembly/dependencies-fabric-lgpl.xml
+++ b/assembly/dependencies-fabric-lgpl.xml
@@ -151,6 +151,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d95ca2ef/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 5fb7cb1..2330a3a 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -154,6 +154,13 @@
 /
 
 
+target/classes
+/
+
+features.xml
+
+
+
 target
 /

[04/15] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread av

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/d1347308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1347308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1347308

Branch: refs/heads/ignite-1.5.1-2
Commit: d134730895e7e1f764ccf10bdb3144c6aac861a9
Parents: 1039bf6
Author: Ignite Teamcity 
Authored: Tue Dec 22 13:26:23 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 13:26:23 2015 +0300

--
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 2 +-
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs| 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 2 +-
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 2 +-
 .../examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 869b090..54da0d1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 edf867d..3bacd8f 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,4 +47,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 41b2aac..2fe3dd9 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 8eac438..e4c823b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]
 
 [assembly: CLSCompliant(true)]
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
--
diff --git

[12/15] ignite git commit: IGNITE-2226

2015-12-22 Thread av

IGNITE-2226


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 8be0ced4c4eaba4002a0f963d0d74519aef7c8c6
Parents: d95ca2e
Author: Anton Vinogradov 
Authored: Tue Dec 22 18:14:25 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 18:14:25 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 +-
 .../ignite/internal/IgniteVersionUtils.java |  5 -
 .../ignite/lang/IgniteProductVersion.java   |  2 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../product/GridProductVersionSelfTest.java | 22 ++--
 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 +-
 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  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  6 +++---
 .../Properties/AssemblyInfo.cs  |  6 +++---
 .../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 +-
 67 files changed, 99 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8be0ced4/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 @@
 
 
 ignite-examples
-1.5.0-final-SNAPSHOT
+1.5.0.final-SNAPSHOT

[15/15] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

2015-12-22 Thread av

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

Conflicts:
examples/pom.xml
examples/schema-import/pom.xml
modules/aop/pom.xml
modules/apache-license-gen/pom.xml
modules/aws/pom.xml
modules/camel/pom.xml
modules/clients/pom.xml
modules/cloud/pom.xml
modules/codegen/pom.xml
modules/core/pom.xml
modules/core/src/main/resources/ignite.properties
modules/extdata/p2p/pom.xml
modules/extdata/uri/modules/uri-dependency/pom.xml
modules/extdata/uri/pom.xml
modules/flume/pom.xml
modules/gce/pom.xml
modules/geospatial/pom.xml
modules/hadoop/pom.xml
modules/hibernate/pom.xml
modules/indexing/pom.xml
modules/jcl/pom.xml
modules/jms11/pom.xml
modules/jta/pom.xml
modules/kafka/pom.xml
modules/log4j/pom.xml
modules/log4j2/pom.xml
modules/mesos/pom.xml
modules/mqtt/pom.xml
modules/osgi-karaf/pom.xml
modules/osgi-paxlogging/pom.xml
modules/osgi/pom.xml
modules/platforms/cpp/common/configure.ac
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac
modules/platforms/cpp/ignite/configure.ac

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
modules/rest-http/pom.xml
modules/scalar-2.10/pom.xml
modules/scalar/pom.xml
modules/schedule/pom.xml
modules/schema-import/pom.xml
modules/slf4j/pom.xml
modules/spark-2.10/pom.xml
modules/spark/pom.xml
modules/spring/pom.xml
modules/ssh/pom.xml
modules/tools/pom.xml
modules/twitter/pom.xml
modules/urideploy/pom.xml
modules/visor-console-2.10/pom.xml
modules/visor-console/pom.xml
modules/visor-plugins/pom.xml
modules/web/pom.xml
modules/yardstick/pom.xml
modules/yarn/pom.xml
modules/zookeeper/pom.xml
pom.xml

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

Conflicts:
benchmarks/cache-comparison/pom.xml
benchmarks/filesystem/hadoop1/pom.xml
benchmarks/filesystem/hadoop2/pom.xml
benchmarks/mongo/pom.xml
benchmarks/risk-analytics/pom.xml
benchmarks/serialization/pom.xml

benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs
examples/pom.xml
modules/clients/pom.xml
modules/codegen/pom.xml
modules/compatibility/pom.xml
modules/core/pom.xml
modules/core/src/main/resources/gridgain.properties
modules/diagnostic/pom.xml
modules/dr-demo/pom.xml
modules/license-gen/pom.xml
modules/mongo-sniffer/pom.xml
modules/mongo-visor/pom.xml
modules/mongo/pom.xml
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac

modules/platforms/dotnet/examples/GridGainExamples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/GridGainExamplesDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-examples-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-exe/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-test-compatibility/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-dll/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-runner/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain/Properties/AssemblyInfo.cs
modules/tools/pom.xml
modules/visor-console/pom.xml
modules/visor-demo/pom.xml
modules/visor-tester-plugin/pom.xml
modules/visor-tester/pom.xml
modules/visor/pom.xml
modules/yardstick/dotnet/Properties/AssemblyInfo.cs
modules/yardstick/pom.xml
parent/pom.xml
pilots/chronotrack/pom.xml
pilots/ctb/pom.xml
pilots/dsi/pom.xml
pilots/ionic/pom.xml
pilots/sb/pom.xml
pilots/sony/pom.xml
pilots/wellsfargo/pom.xml
pilots/worldpay/pom.xml
pom.xml

[10/15] ignite git commit: ignite-1.5 Restored benchmarks with implicit transactions.

2015-12-22 Thread av

ignite-1.5 Restored benchmarks with implicit transactions.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: c8ccd4f2399f4764631b504feb27efc68eb23256
Parents: 6ad758c
Author: sboikov 
Authored: Tue Dec 22 17:09:39 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 17:10:53 2015 +0300

--
 .../config/benchmark-multicast.properties   |  6 +--
 .../cache/IgnitePutTxImplicitBenchmark.java | 52 
 .../cache/IgnitePutTxOffHeapBenchmark.java  |  2 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java  |  2 +-
 4 files changed, 57 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c8ccd4f2/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 03d74ad..c638d94 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} -txc OPTIMISTIC -dn IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-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,\
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-val-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-optimistic-put-offheap-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds

[05/15] ignite git commit: ignite-1.5 Fixed benchmark configuration.

2015-12-22 Thread av

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/60d157bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d157bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d157bd

Branch: refs/heads/ignite-1.5.1-2
Commit: 60d157bde27f406bd52b3fe166f7375cf881a19c
Parents: bbdb202
Author: sboikov 
Authored: Tue Dec 22 13:29:20 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:29:20 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/60d157bd/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index def652a..43fb7d7 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn 
IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}tx-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup,\

[09/15] ignite git commit: ignite-1.5 Fixed benchmarks names.

2015-12-22 Thread av

ignite-1.5 Fixed benchmarks names.


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

Branch: refs/heads/ignite-1.5.1-2
Commit: 6ad758ce9deb5154ba7b907cf077d2ea8ec0d4d7
Parents: 2c8b259
Author: sboikov 
Authored: Tue Dec 22 16:00:57 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 16:00:57 2015 +0300

--
 modules/yardstick/config/benchmark-multicast.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6ad758ce/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties 
b/modules/yardstick/config/benchmark-multicast.properties
index 43fb7d7..03d74ad 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} -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 IgnitePutTxBenchmark 
-sn IgniteNode -ds ${ver}tx-optimistic-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,\
@@ -105,8 +105,8 @@ CONFIGS="\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark 
-sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn 
IgniteNode -ds ${ver}atomic-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-put-offheap-val-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 
IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-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 
IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds 
${ver}tx-optimistic-put-offheap-val-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn 
IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark 
-sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
 -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 
${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark 
-sn IgniteNode -ds

[01/15] ignite git commit: IGNITE-2229 - Added test for the ticket.

2015-12-22 Thread av

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 c0cfc6a78 -> 487071fc5


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-1.5.1-2
Commit: 3ee096613bbbe9538de949cfe20fafd7d2471de1
Parents: bbdb202
Author: Alexey Goncharuk 
Authored: Tue Dec 22 12:20:39 2015 +0300
Committer: Alexey Goncharuk 
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 000..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 fields = new LinkedHashMap<>();
+
+fields.put("val", String.class.getName());
+
+qryEntity.setFields(fields);
+
+qryEntity.setIndexes(Arrays.asList(new

[02/15] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread av

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-1.5.1-2
Commit: fa48b89ec77a0095364d37371d52f544593572d5
Parents: 3ee0966
Author: Ignite Teamcity 
Authored: Tue Dec 22 12:43:03 2015 +0300
Committer: Ignite Teamcity 
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 +-

[13/15] ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread av

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/b6dab091
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6dab091
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6dab091

Branch: refs/heads/ignite-1.5.1-2
Commit: b6dab0915d691c9a4b9e949d90d93ced8458e018
Parents: 8be0ced
Author: Ignite Teamcity 
Authored: Tue Dec 22 18:21:45 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 18:21:45 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/b6dab091/modules/platforms/cpp/common/configure.ac
--
diff --git a/modules/platforms/cpp/common/configure.ac 
b/modules/platforms/cpp/common/configure.ac
index 63bc44c..c81873d 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.7791], 
[d...@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0.7794], 
[d...@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/b6dab091/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 736c721..5918135 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.7791], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.5.0.7794], [d...@ignite.apache.org], 
[ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/core/configure.ac
--
diff --git a/modules/platforms/cpp/core/configure.ac 
b/modules/platforms/cpp/core/configure.ac
index a87bd58..7f36009 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.7791], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.5.0.7794], [d...@ignite.apache.org], [ignite], 
[ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6dab091/modules/platforms/cpp/examples/configure.ac
--
diff --git a/modules/platforms/cpp/examples/configure.ac 
b/modules/platforms/cpp/examples/configure.ac
index b3d72ab..c9aa6b7 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.7791],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ 
examples],[1.5.0.7794],[d...@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/b6dab091/modules/platforms/cpp/ignite/configure.ac
--
diff --git a/modules/platforms/cpp/ignite/configure.ac

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 0fd1e158e -> 7ebc2ffd9


ignite-1.5 Fixed hang on metadata update inside put in atomic cache when 
topology read lock is held.


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

Branch: refs/heads/ignite-1537
Commit: 7ebc2ffd97dc5343403fb0a1fccf57f8bb53cf33
Parents: 0fd1e15
Author: sboikov 
Authored: Tue Dec 22 12:45:49 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 12:45:49 2015 +0300

--
 .../internal/processors/datastreamer/DataStreamProcessor.java   | 2 +-
 .../org/apache/ignite/cache/websession/WebSessionFilter.java| 5 ++---
 .../org/apache/ignite/cache/websession/WebSessionListener.java  | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7ebc2ffd/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index 32f2ff5..da39209 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -90,7 +90,7 @@ public class DataStreamProcessor extends 
GridProcessorAdapter {
 return;
 
 marshErrBytes = marsh.marshal(new IgniteCheckedException("Failed to 
marshal response error, " +
-"see log for details."));
+"see node log for details."));
 
 flusher = new IgniteThread(new GridWorker(ctx.gridName(), 
"grid-data-loader-flusher", log) {
 @Override protected void body() throws InterruptedException {

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ebc2ffd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
--
diff --git 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index c3a3b32..4a84931 100644
--- 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -38,7 +38,6 @@ import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.util.typedef.C1;
@@ -434,7 +433,7 @@ public class WebSessionFilter implements Filter {
 
 break;
 }
-catch (CacheException | BinaryObjectException e) {
+catch (CacheException | IgniteException e) {
 if (log.isDebugEnabled())
 log.debug(e.getMessage());
 
@@ -442,7 +441,7 @@ public class WebSessionFilter implements Filter {
 throw new IgniteException("Failed to save session: " + 
sesId, e);
 else {
 if (log.isDebugEnabled())
-log.debug("Failed to save session (will retry): " + sesId);
+log.debug("Failed to save session (will retry): " + 
sesId);
 
 IgniteFuture retryFut = null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ebc2ffd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
--
diff --git 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
index a1c1106..63f58f5 100644
--- 
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
+++ 
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
@@ -32,7 +32,6 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.binary.BinaryObjectException;
 import

[40/50] [abbrv] ignite git commit: ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.

2015-12-22 Thread ntikhonov

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 
Authored: Tue Dec 22 14:14:43 2015 +0700
Committer: Alexey Kuznetsov 
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()))

[48/50] [abbrv] ignite git commit: IGNITE-2226

2015-12-22 Thread ntikhonov

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 
Authored: Tue Dec 22 13:18:33 2015 +0300
Committer: Anton Vinogradov 
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 @@
 
 
 
-
+

[25/50] [abbrv] ignite git commit: IGNITE-2210: Fixed testMethodAnnotationWithoutGet - it cannot work with BinaryMarshaller at the moment.

2015-12-22 Thread ntikhonov

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 
Authored: Fri Dec 18 16:08:24 2015 +0300
Committer: vozerov-gridgain 
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 qry = grid(0).cache(null)
-.query(new SqlFieldsQuery("select methodField from Organization 
where methodField='name-A'")
-.setPageSize(10));
+if (!binaryMarshaller) {
+QueryCursor qry = grid(0).cache(null)
+.query(new SqlFieldsQuery("select methodField from 
Organization where methodField='name-A'")
+.setPageSize(10));
 
-List flds = qry.getAll();
+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));
+}
 }
 
 /**

[11/50] [abbrv] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.

2015-12-22 Thread ntikhonov

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 
Authored: Thu Dec 17 17:00:29 2015 +0300
Committer: vozerov-gridgain 
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 000..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

[14/50] [abbrv] ignite git commit: Fixed CacheEntry toString()

2015-12-22 Thread ntikhonov

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 
Authored: Thu Dec 17 17:07:26 2015 -0800
Committer: Valentin Kulichenko 
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 implements Cache.Entry, Externalizable {
 /** {@inheritDoc} */
 @SuppressWarnings("unchecked")
 @Override public  T unwrap(Class 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 implements Cache.Entry, 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 extends 
CacheEntryImpl 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
+}

[12/50] [abbrv] ignite git commit: IGNITE-2193: .NET: Fixed SerivceTest.cs.

2015-12-22 Thread ntikhonov

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 
Authored: Thu Dec 17 17:31:31 2015 +0300
Committer: vozerov-gridgain 
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(SvcName + 
0));
-Assert.IsNull(Services.GetService(SvcName + 
1));
+Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 1);
 
 for (var i = 2; i < 10; i++)
 
Assert.IsNotNull(Services.GetService(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(SvcName 
+ i));
+AssertNoService(SvcName + i);
 }
 
 /// 
@@ -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(SvcName));
+AssertNoService();
 }
 
 [Test]
@@ -579,6 +578,18 @@ namespace Apache.Ignite.Core.Tests.Services
 }
 
 /// 
+/// Asserts that there is no service on any grid with given name.
+/// 
+/// The name.
+private void AssertNoService(string name = SvcName)
+{
+foreach (var grid in Grids)
+Assert.IsTrue(
+TestUtils.WaitForCondition(() => grid.GetServices()
+.GetService(name) == null, 5000));
+}
+
+/// 
 /// Gets the services.
 /// 
 protected virtual IServices Services

[10/50] [abbrv] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.

2015-12-22 Thread ntikhonov

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 000..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(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

[21/50] [abbrv] ignite git commit: IGNITE-2123: Need to add EntryProcessorExample to cache examples

2015-12-22 Thread ntikhonov

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 
Authored: Fri Dec 18 15:09:00 2015 +0300
Committer: Denis Magda 
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 000..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.
+ * 
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: {@code 'ignite.{sh|bat} 
examples/config/example-ignite.xml'}.
+ * 
+ * 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 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

[37/50] [abbrv] ignite git commit: ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

2015-12-22 Thread ntikhonov

ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

Signed-off-by: S.Vladykin 


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 
Authored: Mon Dec 21 19:58:29 2015 +0300
Committer: S.Vladykin 
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 mapExps = F.addAll(new 
ArrayList(mapQry.allColumns()),
 mapQry.columns(false));
 
-GridSqlElement[] rdcExps = new GridSqlElement[mapQry.visibleColumns()];
+final int visibleCols = mapQry.visibleColumns();
+final int havingCol = mapQry.havingColumn();
+
+List rdcExps = new ArrayList<>(visibleCols);
 
 Set 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++)  //

[22/50] [abbrv] ignite git commit: fixed compilation error for Java 8

2015-12-22 Thread ntikhonov

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 
Authored: Fri Dec 18 15:09:55 2015 +0300
Committer: Denis Magda 
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();

[16/50] [abbrv] ignite git commit: IGNITE-2203: Fixed a bug in BinaryClassDescriptor causing Externalizable object to be mistakenly analyzed for duplicate fields.

2015-12-22 Thread ntikhonov

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 
Authored: Fri Dec 18 11:46:50 2015 +0300
Committer: vozerov-gridgain 
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. */

[07/50] [abbrv] ignite git commit: minor

2015-12-22 Thread ntikhonov

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 
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov 
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 {
 
 ctx.security().authorize(cacheName, perm, null);
 }
-}
\ No newline at end of file
+}

[1/2] ignite git commit: IGNITE-2213: Fixed serialization of duplicate fields.

2015-12-22 Thread vozerov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 3aa6f8283 -> bbdb20248


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-1.5
Commit: 627134b25ca730d7a7dbcec9facde158c5d15dc3
Parents: d8576b8
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:28:44 2015 +0300
Committer: vozerov-gridgain 
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 duplicates = duplicateFields(cls);
+
 Collection names = new HashSet<>();
 Collection 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 duplicateFields(Class cls) {
+Set all = new HashSet<>();
+Set 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() {

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread vozerov

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-1.5
Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3
Parents: 627134b 3aa6f82
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:29:06 2015 +0300
Committer: vozerov-gridgain 
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(-)
--

[07/10] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query.

2015-12-22 Thread av

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-1.5.1-2
Commit: 3aa6f828318ac90b73ced040ae031efad763073e
Parents: 6a91996
Author: Alexey Goncharuk 
Authored: Tue Dec 22 11:08:21 2015 +0300
Committer: Alexey Goncharuk 
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 extends 
AsyncSupportAdapter 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);

[06/10] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread av

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-1.5.1-2
Commit: 6a91996e328ad29dde03b68622517360cb7a7ffb
Parents: 8c2b674 c5ed0d0
Author: sboikov 
Authored: Tue Dec 22 10:17:06 2015 +0300
Committer: sboikov 
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(-)
--

[04/10] ignite git commit: ignite-1.5 Added CacheConfiguration.storeKeepBinary flag support in Visor.

2015-12-22 Thread av

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-1.5.1-2
Commit: c5ed0d0e23329b8badb594e6f625eb58a24e2392
Parents: d8576b8
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 14:14:43 2015 +0700
Committer: Alexey Kuznetsov 
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()))

[05/10] ignite git commit: ignite-1.5 Fixed benchmark configuration.

2015-12-22 Thread av

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-1.5.1-2
Commit: 8c2b6740c43b3e32c424d2862155ce384fbafe51
Parents: d8576b8
Author: sboikov 
Authored: Tue Dec 22 10:16:37 2015 +0300
Committer: sboikov 
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,\

[01/10] ignite git commit: ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

2015-12-22 Thread av

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1-2 b534c4271 -> c0cfc6a78


ignite-2205 - clause HAVING doesn't work for count - Fixes #357.

Signed-off-by: S.Vladykin 


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-1.5.1-2
Commit: a0cdb59645ce0a84344c6c92b9695c1a26e2a824
Parents: 81458f5
Author: S.Vladykin 
Authored: Mon Dec 21 19:58:29 2015 +0300
Committer: S.Vladykin 
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 mapExps = F.addAll(new 
ArrayList(mapQry.allColumns()),
 mapQry.columns(false));
 
-GridSqlElement[] rdcExps = new GridSqlElement[mapQry.visibleColumns()];
+final int visibleCols = mapQry.visibleColumns();
+final int havingCol = mapQry.havingColumn();
+
+List rdcExps = new ArrayList<>(visibleCols);
 
 Set 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

[02/10] ignite git commit: ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

2015-12-22 Thread av

ignite-1979 Support case insensitive nonquoted cache names in SQL - Fixes #324.

Signed-off-by: S.Vladykin 


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-1.5.1-2
Commit: da24df99525b796a79fdb55997efe1c9bd515a5d
Parents: a0cdb59
Author: vershov 
Authored: Tue Dec 22 00:08:37 2015 +0300
Committer: S.Vladykin 
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 extends 
MutableConfiguration {
 private IgnitePredicate 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 extends 
MutableConfiguration {
 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 extends 
MutableConfiguration {
 }
 
 /**
- * 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 extends 
MutableConfiguration {
 }
 
 /**
+ * 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.
+ * 
+ * Be aware of using the same string in case sensitive and case 
insensitive manner simultaneously, since
+ * behaviour for such case is not specified.
+ * 
+ * When sqlSchema is not specified, quoted {@code cacheName} is used 
instead.
+ * 
+ * {@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 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

[10/10] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

2015-12-22 Thread av

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2


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

Branch: refs/heads/ignite-1.5.1-2
Commit: c0cfc6a784ab94430b730d200d37788b70dc930b
Parents: b534c42 bbdb202
Author: Anton Vinogradov 
Authored: Tue Dec 22 11:54:01 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 22 11:54:01 2015 +0300

--
 .../configuration/CacheConfiguration.java   |  44 +++-
 .../internal/binary/BinaryClassDescriptor.java  |  56 -
 .../ignite/internal/binary/BinaryUtils.java |  11 +
 .../processors/cache/IgniteCacheProxy.java  |   3 +-
 .../ignite/internal/util/IgniteUtils.java   |   6 +-
 .../cache/VisorCacheQueryConfiguration.java |  11 +
 .../cache/VisorCacheStoreConfiguration.java |  13 +-
 .../internal/visor/query/VisorQueryJob.java |   6 +
 .../binary/BinaryMarshallerSelfTest.java| 110 +
 .../processors/query/h2/IgniteH2Indexing.java   | 118 ++---
 .../processors/query/h2/sql/GridSqlQuery.java   |   3 +
 .../query/h2/sql/GridSqlQuerySplitter.java  | 113 +
 .../query/IgniteSqlSchemaIndexingTest.java  | 240 +++
 .../query/IgniteSqlSplitterSelfTest.java|  52 
 .../query/h2/sql/GridQueryParsingTest.java  |   9 +-
 .../IgniteBinaryCacheQueryTestSuite.java|   3 +-
 .../IgniteCacheQuerySelfTestSuite.java  |   2 +
 .../commands/cache/VisorCacheCommand.scala  |  14 +-
 .../config/benchmark-multicast.properties   |   2 +-
 19 files changed, 709 insertions(+), 107 deletions(-)
--

[08/10] ignite git commit: IGNITE-2213: Fixed serialization of duplicate fields.

2015-12-22 Thread av

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-1.5.1-2
Commit: 627134b25ca730d7a7dbcec9facde158c5d15dc3
Parents: d8576b8
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:28:44 2015 +0300
Committer: vozerov-gridgain 
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 duplicates = duplicateFields(cls);
+
 Collection names = new HashSet<>();
 Collection 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 duplicateFields(Class cls) {
+Set all = new HashSet<>();
+Set 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

[03/10] ignite git commit: ignite-1.5 Minor javadocs.

2015-12-22 Thread av

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-1.5.1-2
Commit: d8576b8f9850b53c240bd21fab7fe19abd717225
Parents: da24df9
Author: Alexey Kuznetsov 
Authored: Tue Dec 22 11:14:17 2015 +0700
Committer: Alexey Kuznetsov 
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

[09/10] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread av

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-1.5.1-2
Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3
Parents: 627134b 3aa6f82
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:29:06 2015 +0300
Committer: vozerov-gridgain 
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(-)
--

[4/9] ignite git commit: IGNITE-2190 - Fixing deserialization during scan query.

2015-12-22 Thread sboikov

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-1537
Commit: 3aa6f828318ac90b73ced040ae031efad763073e
Parents: 6a91996
Author: Alexey Goncharuk 
Authored: Tue Dec 22 11:08:21 2015 +0300
Committer: Alexey Goncharuk 
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 extends 
AsyncSupportAdapter 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);

ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 7ebc2ffd9 -> 5b2f375d5


ignite-1.5 Fixed hang on metadata update inside put in atomic cache when 
topology read lock is held.


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

Branch: refs/heads/ignite-1537
Commit: 5b2f375d56a175911922bdda61bacaaf2f423271
Parents: 7ebc2ff
Author: sboikov 
Authored: Tue Dec 22 12:54:57 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:23:10 2015 +0300

--
 .../distributed/IgniteCacheManyClientsTest.java |  2 ++
 .../service/ClosureServiceClientsNodesTest.java | 22 
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  6 ++
 3 files changed, 26 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5b2f375d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
index 242b12d..8d4af19 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
@@ -65,6 +65,8 @@ public class IgniteCacheManyClientsTest extends 
GridCommonAbstractTest {
 @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
 IgniteConfiguration cfg = super.getConfiguration(gridName);
 
+cfg.setFailureDetectionTimeout(20_000);
+
 cfg.setConnectorConfiguration(null);
 cfg.setPeerClassLoadingEnabled(false);
 cfg.setTimeServerPortRange(200);

http://git-wip-us.apache.org/repos/asf/ignite/blob/5b2f375d/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
index b529b6c..49c6968 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.cluster.ClusterGroup;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
@@ -38,6 +39,7 @@ import org.apache.ignite.services.ServiceDescriptor;
 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;
 
 /**
@@ -171,14 +173,20 @@ public class ClosureServiceClientsNodesTest extends 
GridCommonAbstractTest {
 for (int i = 0 ; i < NODES_CNT; i++) {
 log.info("Iteration: " + i);
 
-Ignite ignite = grid(i);
+final Ignite ignite = grid(i);
 
 ignite.services().deployNodeSingleton(SINGLETON_NAME, new 
TestService());
 
-ClusterGroup grp = ignite.cluster();
+final ClusterGroup grp = ignite.cluster();
 
 assertEquals(NODES_CNT, grp.nodes().size());
 
+GridTestUtils.waitForCondition(new GridAbsPredicate() {
+@Override public boolean apply() {
+return ignite.services(grp).serviceDescriptors().size() == 
1;
+}
+}, 5000);
+
 Collection srvDscs = 
ignite.services(grp).serviceDescriptors();
 
 assertEquals(1, srvDscs.size());
@@ -206,14 +214,20 @@ public class ClosureServiceClientsNodesTest extends 
GridCommonAbstractTest {
 for (int i = 0 ; i < NODES_CNT; i++) {

ignite git commit: 1.5.0.final-SNAPSHOT

2015-12-22 Thread sboikov

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 1039bf69e -> d13473089


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/d1347308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1347308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1347308

Branch: refs/heads/ignite-1.5
Commit: d134730895e7e1f764ccf10bdb3144c6aac861a9
Parents: 1039bf6
Author: Ignite Teamcity 
Authored: Tue Dec 22 13:26:23 2015 +0300
Committer: Ignite Teamcity 
Committed: Tue Dec 22 13:26:23 2015 +0300

--
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 2 +-
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs| 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +-
 .../platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 2 +-
 modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs  | 2 +-
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 2 +-
 .../examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 869b090..54da0d1 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 edf867d..3bacd8f 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,4 +47,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 41b2aac..2fe3dd9 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/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 8eac438..e4c823b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("1.5.0.7789")]
 [assembly: AssemblyFileVersion("1.5.0.7789")]
-[assembly: AssemblyInformationalVersion("1.5.0.final-SNAPSHOT")]
+[assembly: AssemblyInformationalVersion("1.5.0.final")]
 
 [assembly: CLSCompliant(true)]
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d1347308/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-12-22 Thread sboikov

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/276207a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/276207a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/276207a5

Branch: refs/heads/ignite-1.5
Commit: 276207a5c7a7ee0a4c76f7aebb569cf2215da10b
Parents: 60d157b d134730
Author: sboikov 
Authored: Tue Dec 22 13:30:03 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:30: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 +-
 .../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 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 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  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../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 |   4 +-
 65 files changed, 224 insertions(+), 79 deletions(-)
--

1 2 >

1 - 100 of 188 matches

Mail list logo