You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/09/05 01:45:25 UTC
[01/30] ignite git commit: ignite-1369: fixed failing portable
example tests
Repository: ignite
Updated Branches:
refs/heads/ignite-264 1124dee42 -> 114387bea
ignite-1369: fixed failing portable example tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca1523ec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca1523ec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca1523ec
Branch: refs/heads/ignite-264
Commit: ca1523ec5c28286ac75f9fedd51cd53eb7870ff1
Parents: 77fc969
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Sep 4 09:05:55 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Sep 4 09:05:55 2015 +0300
----------------------------------------------------------------------
.../portable/datagrid/CacheClientPortablePutGetExample.java | 4 ++++
.../portable/datagrid/CacheClientPortableQueryExample.java | 5 +++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca1523ec/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortablePutGetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortablePutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortablePutGetExample.java
index 19c5685..77c5d95 100644
--- a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortablePutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortablePutGetExample.java
@@ -86,6 +86,10 @@ public class CacheClientPortablePutGetExample {
System.out.println();
}
+ finally {
+ // Delete cache with its content completely.
+ ignite.destroyCache(CACHE_NAME);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca1523ec/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
index 1eb43b3..b0048fa 100644
--- a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
@@ -117,6 +117,11 @@ public class CacheClientPortableQueryExample {
System.out.println();
}
+ finally {
+ // Delete caches with their content completely.
+ ignite.destroyCache(ORGANIZATION_CACHE_NAME);
+ ignite.destroyCache(EMPLOYEE_CACHE_NAME);
+ }
}
}
[06/30] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d223a707
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d223a707
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d223a707
Branch: refs/heads/ignite-264
Commit: d223a707de65daf3d0e8d49ef10f9f674840fe97
Parents: 15f3edb 28213a3
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 10:33:19 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 10:33:19 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/IgniteKernal.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d223a707/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
[28/30] ignite git commit: 1.4.0-SNAPSHOT
Posted by ag...@apache.org.
1.4.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38baf596
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38baf596
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38baf596
Branch: refs/heads/ignite-264
Commit: 38baf596e5194a27c0f77ca017e54755210ca904
Parents: 78a4b7c
Author: Ignite Teamcity <ig...@apache.org>
Authored: Fri Sep 4 17:42:31 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Fri Sep 4 17:42:31 2015 +0300
----------------------------------------------------------------------
modules/platform/src/main/cpp/common/configure.ac | 2 +-
.../main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
.../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38baf596/modules/platform/src/main/cpp/common/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/configure.ac b/modules/platform/src/main/cpp/common/configure.ac
index 7706737..920a1b5 100644
--- a/modules/platform/src/main/cpp/common/configure.ac
+++ b/modules/platform/src/main/cpp/common/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Ignite JNI bridge for C++], [7.4.1], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Ignite JNI bridge for C++], [1.4.0], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
AC_CONFIG_SRCDIR(src)
AC_CANONICAL_SYSTEM
http://git-wip-us.apache.org/repos/asf/ignite/blob/38baf596/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 326df2a..7d2d4cc 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
[assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
[assembly: CLSCompliant(true)]
http://git-wip-us.apache.org/repos/asf/ignite/blob/38baf596/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 4600569..b8eb3b8 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("de8dd5cc-7c7f-4a09-80d5-7086d9416a7b")]
-[assembly: AssemblyVersion("1.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
\ No newline at end of file
[18/30] ignite git commit: ignite-1369: deleted info from the doc
that is possible to run a server node from the console
Posted by ag...@apache.org.
ignite-1369: deleted info from the doc that is possible to run a server node from the console
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55cbf277
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55cbf277
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55cbf277
Branch: refs/heads/ignite-264
Commit: 55cbf2773dadf6b66bd3192b73fd9f4241a97b5d
Parents: 83b6e5f
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Sep 4 14:13:00 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Sep 4 14:13:00 2015 +0300
----------------------------------------------------------------------
.../portable/datagrid/CacheClientPortableQueryExample.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/55cbf277/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
index b0048fa..c77a6b2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
@@ -47,9 +47,6 @@ import org.apache.ignite.portable.PortableObject;
* <p>
* Remote nodes should always be started with special configuration file which
* enables the portable marshaller: {@code 'ignite.{sh|bat} examples/config/portable/example-ignite-portable.xml'}.
- * <p>
- * Alternatively you can run {@link ExamplePortableNodeStartup} in another JVM which will
- * start node with {@code examples/config/portable/example-ignite-portable.xml} configuration.
*/
public class CacheClientPortableQueryExample {
/** Organization cache name. */
[20/30] ignite git commit: Release notes - ignite-1.4
Posted by ag...@apache.org.
Release notes - ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83454cc6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83454cc6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83454cc6
Branch: refs/heads/ignite-264
Commit: 83454cc6fbe9faff1ed3b0b37d6dbc29d250bd08
Parents: cb78a14
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Sep 4 14:34:48 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Sep 4 14:34:48 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/83454cc6/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index ce180c7..3f3ac7b 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -3,8 +3,18 @@ Apache Ignite Release Notes
Apache Ignite In-Memory Data Fabric 1.4
---------------------------------------
+* Added SSL support to communication and discovery.
* Added support for log4j2.
-
+* Added versioned entry to cache API.
+* Fixed IGNITE_HOME resolution with JBoss.
+* Fixed configuration file resolution on classpath.
+* Fixed MBean registration for caches.
+* Fixed near cache evictions with offheap.
+* Fixed SQL queries group index logic.
+* Fixed memory leak in partitioned transactional cache.
+* Fixed auto-retries for cache operations in recoverable cases.
+* Fixed affinity routing in compute grid.
+* Many stability and fault-tolerance fixes.
Apache Ignite In-Memory Data Fabric 1.3
---------------------------------------
[21/30] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b18a8448
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b18a8448
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b18a8448
Branch: refs/heads/ignite-264
Commit: b18a844829ad7aed98d00c1b9f4e39ec2f8ed594
Parents: 83454cc 5859711
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Sep 4 14:35:02 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Sep 4 14:35:02 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/messaging/MessagingPingPongExample.java | 6 +++++-
.../portable/datagrid/CacheClientPortableQueryExample.java | 3 ---
.../examples/java8/messaging/MessagingPingPongExample.java | 2 +-
.../org/apache/ignite/examples/MessagingExamplesSelfTest.java | 3 +--
.../ignite/java8/examples/MessagingExamplesSelfTest.java | 3 ++-
5 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[30/30] ignite git commit: IGNITE-264 - Corrected write version
Posted by ag...@apache.org.
IGNITE-264 - Corrected write version
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/114387be
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/114387be
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/114387be
Branch: refs/heads/ignite-264
Commit: 114387beab4c52ab7ba82ae78c47eb6b0ddd3721
Parents: acfa611
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Sep 4 16:43:32 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Sep 4 16:43:32 2015 -0700
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/114387be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index d79b7c1..27b881a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -927,6 +927,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
// We are holding transaction-level locks for entries here, so we can get next write version.
onEntriesLocked();
+ // We are holding transaction-level locks for entries here, so we can get next write version.
tx.writeVersion(cctx.versions().next(tx.topologyVersion()));
{
@@ -949,12 +950,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
tx.needsCompletedVersions(hasRemoteNodes);
}
- // We are holding transaction-level locks for entries here, so we can get next write version.
- if (tx.onePhaseCommit())
- tx.writeVersion(tx.nearXidVersion());
- else
- tx.writeVersion(cctx.versions().next(tx.topologyVersion()));
-
if (isDone())
return;
[09/30] ignite git commit: Merge branch 'ignite-1.4' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4
Posted by ag...@apache.org.
Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/826cb2f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/826cb2f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/826cb2f3
Branch: refs/heads/ignite-264
Commit: 826cb2f3b4bf1637fa607dcd148c53335bfb7c3f
Parents: bf64c6e 1f6d2ff
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Sep 4 10:51:51 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Sep 4 10:51:51 2015 +0300
----------------------------------------------------------------------
.../CacheClientPortablePutGetExample.java | 4 +
.../CacheClientPortableQueryExample.java | 5 +
.../configuration/CacheConfiguration.java | 31 ++--
.../apache/ignite/internal/IgniteKernal.java | 10 +-
.../dht/GridPartitionedGetFuture.java | 14 +-
.../distributed/near/GridNearGetFuture.java | 13 ++
.../query/GridCacheDistributedQueryFuture.java | 5 +-
.../query/GridCacheDistributedQueryManager.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 177 ++++++-------------
.../cache/query/GridCacheQueryRequest.java | 59 ++++++-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 5 -
.../IgniteCacheNodeJoinAbstractTest.java | 42 +++++
.../testsuites/IgniteCacheTestSuite3.java | 3 +-
13 files changed, 212 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
[29/30] ignite git commit: Merge remote-tracking branch
'upstream/ignite-1.4' into ignite-264
Posted by ag...@apache.org.
Merge remote-tracking branch 'upstream/ignite-1.4' into ignite-264
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acfa6110
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acfa6110
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acfa6110
Branch: refs/heads/ignite-264
Commit: acfa6110262655f1420e34194262e50d372f3398
Parents: 1124dee 38baf59
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Sep 4 10:55:54 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Sep 4 10:55:54 2015 -0700
----------------------------------------------------------------------
RELEASE_NOTES.txt | 13 +-
examples/pom.xml | 2 +-
.../messaging/MessagingPingPongExample.java | 6 +-
.../CacheClientPortablePutGetExample.java | 4 +
.../CacheClientPortableQueryExample.java | 8 +-
.../messaging/MessagingPingPongExample.java | 2 +-
.../examples/MessagingExamplesSelfTest.java | 3 +-
.../examples/MessagingExamplesSelfTest.java | 3 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 5 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 10 +-
.../distributed/dht/GridDhtLocalPartition.java | 51 +++++-
.../dht/GridPartitionedGetFuture.java | 14 +-
.../distributed/near/GridNearGetFuture.java | 13 ++
.../query/GridCacheDistributedQueryFuture.java | 5 +-
.../query/GridCacheDistributedQueryManager.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 177 ++++++-------------
.../cache/query/GridCacheQueryRequest.java | 59 ++++++-
.../messages/TcpDiscoveryClientAckResponse.java | 2 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../cache/GridCacheIncrementTransformTest.java | 2 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 5 -
.../IgniteCacheNodeJoinAbstractTest.java | 42 +++++
.../testsuites/IgniteCacheTestSuite3.java | 3 +-
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/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 +-
.../query/h2/opt/GridH2IndexBase.java | 42 +++++
.../query/IgniteSqlSplitterSelfTest.java | 35 +++-
modules/jcl/pom.xml | 2 +-
modules/jms11/pom.xml | 5 +-
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/platform/pom.xml | 2 +-
.../platform/src/main/cpp/common/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/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 | 119 ++++++++++++-
70 files changed, 512 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/acfa6110/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
[27/30] ignite git commit: 1.4.0-SNAPSHOT
Posted by ag...@apache.org.
1.4.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/78a4b7c2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/78a4b7c2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/78a4b7c2
Branch: refs/heads/ignite-264
Commit: 78a4b7c2daa5b71d3c9d65e41036fbe86d623648
Parents: fc05689
Author: Ignite Teamcity <ig...@apache.org>
Authored: Fri Sep 4 17:39:01 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Fri Sep 4 17:39:01 2015 +0300
----------------------------------------------------------------------
pom.xml | 45 ++++++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/78a4b7c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a143cd..d026b30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -780,41 +780,40 @@
setClientVersion('new.ignite.version.fixed', 'new.client.version');
</script>
- <echo message="Update ignite.version in dotnet client"/>
- <echo message="${new.client.version}"/>
+ <echo message="Update ignite.version in dotnet client" />
+ <echo message="${new.client.version}" />
<replaceregexp byline="true" encoding="UTF-8">
- <regexp
- pattern="(\[assembly:\s*Assembly\w*Version\w*\(")\d.\d.\d(.\d)?("\)\])"/>
- <substitution expression="\1${new.client.version}\3"/>
+ <regexp pattern="(\[assembly:\s*Assembly\w*Version\w*\(")\d.\d.\d(.\d)?("\)\])" />
+ <substitution expression="\1${new.client.version}\3" />
<fileset dir="${basedir}/">
- <include name="**/AssemblyInfo.cs"/>
- <include name="**/AssemblyInfo.cpp"/>
+ <include name="**/AssemblyInfo.cs" />
+ <include name="**/AssemblyInfo.cpp" />
</fileset>
</replaceregexp>
- <echo message="Update ignite.version in cpp client"/>
+ <echo message="Update ignite.version in cpp client" />
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(AC_INIT.+\[)\d.\d.\d(.\d)?(\].+)"/>
- <substitution expression="\1${new.client.version}\3"/>
+ <regexp pattern="(AC_INIT.+\[)\d.\d.\d(.\d)?(\].+)" />
+ <substitution expression="\1${new.client.version}\3" />
<fileset dir="${basedir}/">
- <include name="**/configure.ac"/>
+ <include name="**/configure.ac" />
</fileset>
</replaceregexp>
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(define GG_VERSION_STR_WIN ")\d.\d.\d(.\d)?(")"/>
- <substitution expression="\1${new.client.version}\3"/>
+ <regexp pattern="(define GG_VERSION_STR_WIN ")\d.\d.\d(.\d)?(")" />
+ <substitution expression="\1${new.client.version}\3" />
<fileset dir="${basedir}/">
- <include name="**/resource.h"/>
+ <include name="**/resource.h" />
</fileset>
</replaceregexp>
<replaceregexp byline="true" encoding="UTF-16">
- <regexp pattern="(Version", ")\d.\d.\d.\d(")"/>
- <substitution expression="\1${new.client.version}\2"/>
+ <regexp pattern="(Version", ")\d.\d.\d.\d(")" />
+ <substitution expression="\1${new.client.version}\2" />
<fileset dir="${basedir}/">
- <include name="**/Resource.rc"/>
+ <include name="**/Resource.rc" />
</fileset>
</replaceregexp>
@@ -833,18 +832,18 @@
</script>
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(define GG_VERSION_BIN_WIN )\d,\d,\d,\d"/>
- <substitution expression="\1${new.bin.version}"/>
+ <regexp pattern="(define GG_VERSION_BIN_WIN )\d,\d,\d,\d" />
+ <substitution expression="\1${new.bin.version}" />
<fileset dir="${basedir}/">
- <include name="**/resource.h"/>
+ <include name="**/resource.h" />
</fileset>
</replaceregexp>
<replaceregexp byline="true" encoding="UTF-16">
- <regexp pattern="(VERSION )\d,\d,\d,\d"/>
- <substitution expression="\1${new.bin.version}"/>
+ <regexp pattern="(VERSION )\d,\d,\d,\d" />
+ <substitution expression="\1${new.bin.version}" />
<fileset dir="${basedir}/">
- <include name="**/Resource.rc"/>
+ <include name="**/Resource.rc" />
</fileset>
</replaceregexp>
</target>
[24/30] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d1c2db86
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1c2db86
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1c2db86
Branch: refs/heads/ignite-264
Commit: d1c2db860d408c617a4ec98247433610bfb062df
Parents: b41309c ecc492d
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 17:23:01 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 17:23:01 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 13 ++++++++++++-
.../datagrid/CacheClientPortableQueryExample.java | 3 ---
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[26/30] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc056899
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc056899
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc056899
Branch: refs/heads/ignite-264
Commit: fc0568991876cef5e36771cefa5e765af6a3f6c7
Parents: c631a37 d1c2db8
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Sep 4 17:28:34 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 4 17:28:34 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[07/30] ignite git commit: Enabled test.
Posted by ag...@apache.org.
Enabled test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f6d2ff3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f6d2ff3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f6d2ff3
Branch: refs/heads/ignite-264
Commit: 1f6d2ff3e769a694721cd5349ad446dc5ae1d9dd
Parents: d223a70
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 10:36:32 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 10:36:32 2015 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f6d2ff3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
index ecb2698..b62cc48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
@@ -42,11 +42,6 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes
protected static int key = 0;
/** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-1366");
- }
-
- /** {@inheritDoc} */
@Override protected int gridCount() {
return 3;
}
[10/30] ignite git commit: Fixed GridCacheQueryRequest.
Posted by ag...@apache.org.
Fixed GridCacheQueryRequest.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/039c48d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/039c48d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/039c48d3
Branch: refs/heads/ignite-264
Commit: 039c48d3fb1594deb9e1121afd06a7e107559f62
Parents: 1f6d2ff
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 11:33:34 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 11:33:34 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/query/GridCacheQueryRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/039c48d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index f7ef76f..c9ce933 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -262,7 +262,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
/** {@inheritDoc} */
@Override public AffinityTopologyVersion topologyVersion() {
- return topVer;
+ return topVer != null ? topVer : AffinityTopologyVersion.NONE;
}
/** {@inheritDoc} */
[04/30] ignite git commit: Fixed update notifier executor service
issue.
Posted by ag...@apache.org.
Fixed update notifier executor service issue.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28213a31
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28213a31
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28213a31
Branch: refs/heads/ignite-264
Commit: 28213a311213cd46e2ade744590f339f4fc385a3
Parents: f1f6be8
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Sep 4 10:27:17 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Sep 4 10:27:17 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/IgniteKernal.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/28213a31/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index ad4940a..70cd56f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -821,7 +821,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
updateNtfTimer = new Timer("ignite-update-notifier-timer", true);
// Setup periodic version check.
- updateNtfTimer.scheduleAtFixedRate(new UpdateNotifierTimerTask(this, verChecker),
+ updateNtfTimer.scheduleAtFixedRate(new UpdateNotifierTimerTask(this, execSvc, verChecker),
0, PERIODIC_VER_CHECK_DELAY);
}
catch (IgniteCheckedException e) {
@@ -3199,15 +3199,15 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
* Constructor.
*
* @param kernal Kernal.
+ * @param execSvc Executor service.
* @param verChecker Version checker.
*/
- private UpdateNotifierTimerTask(IgniteKernal kernal, GridUpdateNotifier verChecker) {
+ private UpdateNotifierTimerTask(IgniteKernal kernal, ExecutorService execSvc, GridUpdateNotifier verChecker) {
kernalRef = new WeakReference<>(kernal);
log = kernal.log.getLogger(UpdateNotifierTimerTask.class);
- execSvc = kernal.executorService();
-
+ this.execSvc = execSvc;
this.verChecker = verChecker;
}
[11/30] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd8c6074
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd8c6074
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd8c6074
Branch: refs/heads/ignite-264
Commit: bd8c60740d8535a3a4434533bdc4b9876ccbddb9
Parents: 039c48d 826cb2f
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 11:34:05 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 11:34:05 2015 +0300
----------------------------------------------------------------------
.../query/h2/opt/GridH2IndexBase.java | 42 ++++++++++++++++++++
.../query/IgniteSqlSplitterSelfTest.java | 35 ++++++++++++++--
2 files changed, 74 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[02/30] ignite git commit: Uncommented test.
Posted by ag...@apache.org.
Uncommented test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a69e74e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a69e74e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a69e74e
Branch: refs/heads/ignite-264
Commit: 7a69e74ee86c85aef38b60607d91a7469436f542
Parents: 77fc969
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 10:20:54 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 10:20:54 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7a69e74e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index 837fb9a..5a2815d 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -73,6 +73,7 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.preloa
import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadStartStopEventsSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheDaemonNodeLocalSelfTest;
+import org.apache.ignite.internal.processors.cache.local.GridCacheLocalByteArrayValuesSelfTest;
/**
* Test suite.
@@ -132,7 +133,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
suite.addTestSuite(GridCacheOrderedPreloadingSelfTest.class);
// Test for byte array value special case.
-// suite.addTestSuite(GridCacheLocalByteArrayValuesSelfTest.class);
+ suite.addTestSuite(GridCacheLocalByteArrayValuesSelfTest.class);
suite.addTestSuite(GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.class);
suite.addTestSuite(GridCacheNearPartitionedP2PDisabledByteArrayValuesSelfTest.class);
suite.addTestSuite(GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.class);
[05/30] ignite git commit: ignite-1366 Start cache processor before
query processor. Initialize topology version for GridCacheQueryRequest to do
not miss messages before message handler is registered.
Posted by ag...@apache.org.
ignite-1366 Start cache processor before query processor. Initialize topology version for GridCacheQueryRequest to do not miss messages before message handler is registered.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/15f3edb5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/15f3edb5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/15f3edb5
Branch: refs/heads/ignite-264
Commit: 15f3edb546c9f08ed46e3baa51f41250d57b1d98
Parents: f1f6be8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 10:30:18 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 10:30:18 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 14 +-
.../distributed/near/GridNearGetFuture.java | 13 ++
.../query/GridCacheDistributedQueryFuture.java | 5 +-
.../query/GridCacheDistributedQueryManager.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 177 ++++++-------------
.../cache/query/GridCacheQueryRequest.java | 59 ++++++-
.../IgniteCacheNodeJoinAbstractTest.java | 42 +++++
8 files changed, 185 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index ad4940a..7deede7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -876,8 +876,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
startProcessor(new GridAffinityProcessor(ctx));
startProcessor(createComponent(GridSegmentationProcessor.class, ctx));
startProcessor(createComponent(IgniteCacheObjectProcessor.class, ctx));
- startProcessor(new GridQueryProcessor(ctx));
startProcessor(new GridCacheProcessor(ctx));
+ startProcessor(new GridQueryProcessor(ctx));
startProcessor(new GridTaskSessionProcessor(ctx));
startProcessor(new GridJobProcessor(ctx));
startProcessor(new GridTaskProcessor(ctx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 2f0de86..3ddf6d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -770,6 +770,18 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
if (log.isDebugEnabled())
log.debug("Remapping mini get future [invalidParts=" + invalidParts + ", fut=" + this + ']');
+ if (!canRemap) {
+ map(F.view(keys.keySet(), new P1<KeyCacheObject>() {
+ @Override public boolean apply(KeyCacheObject key) {
+ return invalidParts.contains(cctx.affinity().partition(key));
+ }
+ }), F.t(node, keys), topVer);
+
+ onDone(createResultMap(res.entries()));
+
+ return;
+ }
+
// Need to wait for next topology version to remap.
IgniteInternalFuture<Long> topFut = cctx.discovery().topologyFuture(rmtTopVer.topologyVersion());
@@ -779,7 +791,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
AffinityTopologyVersion topVer = new AffinityTopologyVersion(fut.get());
// This will append new futures to compound list.
- map(F.view(keys.keySet(), new P1<KeyCacheObject>() {
+ map(F.view(keys.keySet(), new P1<KeyCacheObject>() {
@Override public boolean apply(KeyCacheObject key) {
return invalidParts.contains(cctx.affinity().partition(key));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 9d2113e..a7875f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -904,6 +904,19 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
if (log.isDebugEnabled())
log.debug("Remapping mini get future [invalidParts=" + invalidParts + ", fut=" + this + ']');
+ if (!canRemap) {
+ map(F.view(keys.keySet(), new P1<KeyCacheObject>() {
+ @Override public boolean apply(KeyCacheObject key) {
+ return invalidParts.contains(cctx.affinity().partition(key));
+ }
+ }), F.t(node, keys), topVer);
+
+ // It is critical to call onDone after adding futures to compound list.
+ onDone(loadEntries(node.id(), keys.keySet(), res.entries(), savedVers, topVer));
+
+ return;
+ }
+
// Need to wait for next topology version to remap.
IgniteInternalFuture<Long> topFut = cctx.discovery().topologyFuture(rmtTopVer.topologyVersion());
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
index 32a4599..1d547c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
@@ -98,7 +98,10 @@ public class GridCacheDistributedQueryFuture<K, V, R> extends GridCacheQueryFutu
subgrid.clear();
}
- final GridCacheQueryRequest req = new GridCacheQueryRequest(cctx.cacheId(), reqId, fields());
+ final GridCacheQueryRequest req = new GridCacheQueryRequest(cctx.cacheId(),
+ reqId,
+ fields(),
+ qryMgr.queryTopologyVersion());
// Process cancel query directly (without sending) for local node,
cctx.closures().callLocalSafe(new Callable<Object>() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index d1fdfcf..4422952 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -566,7 +566,8 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
false,
qry.query().keepPortable(),
qry.query().subjectId(),
- qry.query().taskHash());
+ qry.query().taskHash(),
+ queryTopologyVersion());
addQueryFuture(req.id(), fut);
@@ -610,7 +611,8 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
all,
qry.keepPortable(),
qry.subjectId(),
- qry.taskHash());
+ qry.taskHash(),
+ queryTopologyVersion());
sendRequest(fut, req, nodes);
}
@@ -675,7 +677,8 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
qry.query().includeMetadata(),
qry.query().keepPortable(),
qry.query().subjectId(),
- qry.query().taskHash());
+ qry.query().taskHash(),
+ queryTopologyVersion());
addQueryFuture(req.id(), fut);
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index b3f8720..2041464 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -168,6 +168,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/** */
private boolean enabled;
+ /** */
+ private AffinityTopologyVersion qryTopVer;
+
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
qryProc = cctx.kernalContext().query();
@@ -182,12 +185,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
if (futs != null) {
for (Map.Entry<Long, GridFutureAdapter<QueryResult<K, V>>> entry : futs.entrySet()) {
- final Object recipient = recipient(nodeId, entry.getKey());
+ final Object rcpt = recipient(nodeId, entry.getKey());
entry.getValue().listen(new CIX1<IgniteInternalFuture<QueryResult<K, V>>>() {
@Override public void applyx(IgniteInternalFuture<QueryResult<K, V>> f)
throws IgniteCheckedException {
- f.get().closeIfNotShared(recipient);
+ f.get().closeIfNotShared(rcpt);
}
});
}
@@ -197,12 +200,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
if (fieldsFuts != null) {
for (Map.Entry<Long, GridFutureAdapter<FieldsResult>> entry : fieldsFuts.entrySet()) {
- final Object recipient = recipient(nodeId, entry.getKey());
+ final Object rcpt = recipient(nodeId, entry.getKey());
entry.getValue().listen(new CIX1<IgniteInternalFuture<FieldsResult>>() {
@Override public void applyx(IgniteInternalFuture<FieldsResult> f)
throws IgniteCheckedException {
- f.get().closeIfNotShared(recipient);
+ f.get().closeIfNotShared(rcpt);
}
});
}
@@ -213,6 +216,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.events().addListener(lsnr, EVT_NODE_LEFT, EVT_NODE_FAILED);
enabled = GridQueryProcessor.isEnabled(cctx.config());
+
+ qryTopVer = cctx.startTopologyVersion();
+
+ if (qryTopVer == null)
+ qryTopVer = new AffinityTopologyVersion(cctx.localNode().order(), 0);
}
/**
@@ -281,16 +289,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/**
* Rebuilds all search indexes of given value type.
*
- * @param valType Value type.
- * @return Future that will be completed when rebuilding of all indexes is finished.
- */
- public IgniteInternalFuture<?> rebuildIndexes(Class<?> valType) {
- return rebuildIndexes(valType.getName());
- }
-
- /**
- * Rebuilds all search indexes of given value type.
- *
* @param typeName Value type name.
* @return Future that will be completed when rebuilding of all indexes is finished.
*/
@@ -307,23 +305,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/**
- * Rebuilds all search indexes of all types.
- *
- * @return Future that will be completed when rebuilding of all indexes is finished.
- */
- public IgniteInternalFuture<?> rebuildAllIndexes() {
- if (!enterBusy())
- throw new IllegalStateException("Failed to rebuild indexes (grid is stopping).");
-
- try {
- return qryProc.rebuildAllIndexes();
- }
- finally {
- leaveBusy();
- }
- }
-
- /**
* Marks this request as canceled.
*
* @param reqId Request id.
@@ -531,12 +512,13 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @param loc Local query or not.
* @param subjId Security subject ID.
* @param taskName Task name.
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
* @return Collection of found keys.
* @throws IgniteCheckedException In case of error.
*/
+ @SuppressWarnings("unchecked")
private QueryResult<K, V> executeQuery(GridCacheQueryAdapter<?> qry,
- @Nullable Object[] args, boolean loc, @Nullable UUID subjId, @Nullable String taskName, Object recipient)
+ @Nullable Object[] args, boolean loc, @Nullable UUID subjId, @Nullable String taskName, Object rcpt)
throws IgniteCheckedException {
if (qry.type() == null) {
assert !loc;
@@ -555,16 +537,16 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
res = (QueryResult<K, V>)qryResCache.get(resKey);
- if (res != null && res.addRecipient(recipient))
+ if (res != null && res.addRecipient(rcpt))
return res;
- res = new QueryResult<>(qry.type(), recipient);
+ res = new QueryResult<>(qry.type(), rcpt);
if (qryResCache.putIfAbsent(resKey, res) != null)
resKey = null;
}
else
- res = new QueryResult<>(qry.type(), recipient);
+ res = new QueryResult<>(qry.type(), rcpt);
GridCloseableIterator<IgniteBiTuple<K, V>> iter;
@@ -667,12 +649,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @param loc Local query or not.
* @param subjId Security subject ID.
* @param taskName Task name.
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
* @return Collection of found keys.
* @throws IgniteCheckedException In case of error.
*/
private FieldsResult executeFieldsQuery(GridCacheQueryAdapter<?> qry, @Nullable Object[] args,
- boolean loc, @Nullable UUID subjId, @Nullable String taskName, Object recipient) throws IgniteCheckedException {
+ boolean loc, @Nullable UUID subjId, @Nullable String taskName, Object rcpt) throws IgniteCheckedException {
assert qry != null;
FieldsResult res;
@@ -709,10 +691,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
res = (FieldsResult)qryResCache.get(resKey);
- if (res != null && res.addRecipient(recipient))
+ if (res != null && res.addRecipient(rcpt))
return res; // Cached result found.
- res = new FieldsResult(recipient);
+ res = new FieldsResult(rcpt);
if (qryResCache.putIfAbsent(resKey, res) != null)
resKey = null; // Failed to cache result.
@@ -736,7 +718,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
taskName));
}
- res = new FieldsResult(recipient);
+ res = new FieldsResult(rcpt);
}
try {
@@ -1191,7 +1173,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
// If metadata needs to be returned to user and cleaned from internal fields - copy it.
List<GridQueryFieldMetadata> meta = qryInfo.includeMetaData() ?
- (res.metaData() != null ? new ArrayList<GridQueryFieldMetadata>(res.metaData()) : null) :
+ (res.metaData() != null ? new ArrayList<>(res.metaData()) : null) :
res.metaData();
if (!qryInfo.includeMetaData())
@@ -1996,6 +1978,13 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/**
+ * @return Topology version for query requests.
+ */
+ public AffinityTopologyVersion queryTopologyVersion() {
+ return qryTopVer;
+ }
+
+ /**
* @param qry Query.
* @return Filter.
*/
@@ -2347,10 +2336,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/**
* @param type Query type.
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
*/
- private QueryResult(GridCacheQueryType type, Object recipient) {
- super(recipient);
+ private QueryResult(GridCacheQueryType type, Object rcpt) {
+ super(rcpt);
this.type = type;
}
@@ -2374,10 +2363,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private List<GridQueryFieldMetadata> meta;
/**
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
*/
- FieldsResult(Object recipient) {
- super(recipient);
+ FieldsResult(Object rcpt) {
+ super(rcpt);
}
/**
@@ -2674,39 +2663,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/**
- *
- */
- private class GridCacheScanSwapEntry implements Cache.Entry<K, V> {
- /** */
- private final AbstractLazySwapEntry e;
-
- /**
- * @param e Entry.
- */
- private GridCacheScanSwapEntry(AbstractLazySwapEntry e) {
- this.e = e;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public V getValue() {
- return e.value();
- }
-
- /** {@inheritDoc} */
- @Override public K getKey() {
- return e.key();
- }
-
- /** {@inheritDoc} */
- @Override public <T> T unwrap(Class<T> clazz) {
- if (clazz.isAssignableFrom(getClass()))
- return clazz.cast(this);
-
- throw new IllegalArgumentException();
- }
- }
-
- /**
* Cached result.
*/
private abstract static class CachedResult<R> extends GridFutureAdapter<IgniteSpiCloseableIterator<R>> {
@@ -2720,10 +2676,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private final Map<Object, QueueIterator> recipients = new GridLeanMap<>(1);
/**
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
*/
- protected CachedResult(Object recipient) {
- boolean res = addRecipient(recipient);
+ protected CachedResult(Object rcpt) {
+ boolean res = addRecipient(rcpt);
assert res;
}
@@ -2731,17 +2687,17 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/**
* Close if this result does not have any other recipients.
*
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
* @throws IgniteCheckedException If failed.
*/
- public void closeIfNotShared(Object recipient) throws IgniteCheckedException {
+ public void closeIfNotShared(Object rcpt) throws IgniteCheckedException {
assert isDone();
synchronized (recipients) {
if (recipients.isEmpty())
return;
- recipients.remove(recipient);
+ recipients.remove(rcpt);
if (recipients.isEmpty())
get().close();
@@ -2749,17 +2705,17 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/**
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
* @return {@code true} If the recipient successfully added.
*/
- public boolean addRecipient(Object recipient) {
+ public boolean addRecipient(Object rcpt) {
synchronized (recipients) {
if (isDone())
return false;
- assert !recipients.containsKey(recipient) : recipient + " -> " + recipients;
+ assert !recipients.containsKey(rcpt) : rcpt + " -> " + recipients;
- recipients.put(recipient, new QueueIterator(recipient));
+ recipients.put(rcpt, new QueueIterator(rcpt));
}
return true;
@@ -2798,18 +2754,18 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/**
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
* @throws IgniteCheckedException If failed.
*/
- public IgniteSpiCloseableIterator<R> iterator(Object recipient) throws IgniteCheckedException {
- assert recipient != null;
+ public IgniteSpiCloseableIterator<R> iterator(Object rcpt) throws IgniteCheckedException {
+ assert rcpt != null;
IgniteSpiCloseableIterator<R> it = get();
assert it != null;
synchronized (recipients) {
- return queue == null ? it : recipients.get(recipient);
+ return queue == null ? it : recipients.get(rcpt);
}
}
@@ -2825,7 +2781,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private static final int NEXT_SIZE = 64;
/** */
- private final Object recipient;
+ private final Object rcpt;
/** */
private int pos;
@@ -2834,10 +2790,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private Queue<R> next;
/**
- * @param recipient ID of the recipient.
+ * @param rcpt ID of the recipient.
*/
- private QueueIterator(Object recipient) {
- this.recipient = recipient;
+ private QueueIterator(Object rcpt) {
+ this.rcpt = rcpt;
}
/**
@@ -2850,7 +2806,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/** {@inheritDoc} */
@Override public void close() throws IgniteCheckedException {
- closeIfNotShared(recipient);
+ closeIfNotShared(rcpt);
}
/** {@inheritDoc} */
@@ -3101,25 +3057,4 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
false,
keepPortable);
}
-
- /**
- * Creates SQL fields query which will include results metadata if needed.
- *
- * @param qry SQL query.
- * @param incMeta Whether to include results metadata.
- * @param keepPortable Keep portable flag.
- * @return Created query.
- */
- public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta, boolean keepPortable) {
- assert qry != null;
-
- return new GridCacheQueryAdapter<>(cctx,
- SQL_FIELDS,
- null,
- qry,
- null,
- null,
- incMeta,
- keepPortable);
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index c21ac66..f7ef76f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
@@ -121,6 +122,9 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
/** Partition. */
private int part;
+ /** */
+ private AffinityTopologyVersion topVer;
+
/**
* Required by {@link Externalizable}
*/
@@ -129,13 +133,21 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
}
/**
+ * Creates cancel query request.
+ *
+ * @param cacheId Cache ID.
* @param id Request to cancel.
* @param fields Fields query flag.
+ * @param topVer Topology version.
*/
- public GridCacheQueryRequest(int cacheId, long id, boolean fields) {
+ public GridCacheQueryRequest(int cacheId,
+ long id,
+ boolean fields,
+ AffinityTopologyVersion topVer) {
this.cacheId = cacheId;
this.id = id;
this.fields = fields;
+ this.topVer = topVer;
cancel = true;
}
@@ -151,6 +163,9 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
* @param fields Fields query flag.
* @param all Whether to load all pages.
* @param keepPortable Whether to keep portables.
+ * @param subjId Subject ID.
+ * @param taskHash Task name hash code.
+ * @param topVer Topology version.
*/
public GridCacheQueryRequest(
int cacheId,
@@ -162,7 +177,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
boolean all,
boolean keepPortable,
UUID subjId,
- int taskHash
+ int taskHash,
+ AffinityTopologyVersion topVer
) {
this.cacheId = cacheId;
this.id = id;
@@ -174,6 +190,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
this.keepPortable = keepPortable;
this.subjId = subjId;
this.taskHash = taskHash;
+ this.topVer = topVer;
}
/**
@@ -192,6 +209,10 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
* @param incBackups {@code true} if need to include backups.
* @param args Query arguments.
* @param incMeta Include meta data or not.
+ * @param keepPortable Keep portable flag.
+ * @param subjId Subject ID.
+ * @param taskHash Task name hash code.
+ * @param topVer Topology version.
*/
public GridCacheQueryRequest(
int cacheId,
@@ -211,7 +232,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
boolean incMeta,
boolean keepPortable,
UUID subjId,
- int taskHash
+ int taskHash,
+ AffinityTopologyVersion topVer
) {
assert type != null || fields;
assert clause != null || (type == SCAN || type == SET || type == SPI);
@@ -235,10 +257,15 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
this.keepPortable = keepPortable;
this.subjId = subjId;
this.taskHash = taskHash;
+ this.topVer = topVer;
}
- /** {@inheritDoc}
- * @param ctx*/
+ /** {@inheritDoc} */
+ @Override public AffinityTopologyVersion topologyVersion() {
+ return topVer;
+ }
+
+ /** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
@@ -554,12 +581,18 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
writer.incrementState();
case 20:
- if (!writer.writeByteArray("transBytes", transBytes))
+ if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
case 21:
+ if (!writer.writeByteArray("transBytes", transBytes))
+ return false;
+
+ writer.incrementState();
+
+ case 22:
if (!writer.writeByte("type", type != null ? (byte)type.ordinal() : -1))
return false;
@@ -718,7 +751,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
reader.incrementState();
case 20:
- transBytes = reader.readByteArray("transBytes");
+ topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
return false;
@@ -726,6 +759,14 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
reader.incrementState();
case 21:
+ transBytes = reader.readByteArray("transBytes");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 22:
byte typeOrd;
typeOrd = reader.readByte("type");
@@ -749,11 +790,11 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 22;
+ return 23;
}
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridCacheQueryRequest.class, this, super.toString());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/15f3edb5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
index 58aa571..2e7f2ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
@@ -23,6 +23,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
@@ -106,4 +107,45 @@ public abstract class IgniteCacheNodeJoinAbstractTest extends IgniteCacheAbstrac
stopGrid(1);
}
}
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testScanQuery() throws Exception {
+ final IgniteCache<Integer, Integer> cache = jcache(0);
+
+ for (int i = 0; i < 5; i++) {
+ log.info("Iteration: " + i);
+
+ final IgniteInternalFuture fut = GridTestUtils.runAsync(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ startGrid(1);
+
+ return null;
+ }
+ });
+
+ final AtomicBoolean stop = new AtomicBoolean();
+
+ GridTestUtils.runMultiThreaded(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ScanQuery qry = new ScanQuery();
+
+ while (!stop.get() && !fut.isDone())
+ cache.query(qry).getAll();
+
+ return null;
+ }
+ }, 10, "test-qry");
+
+ try {
+ fut.get(60_000);
+ }
+ finally {
+ stop.set(true);
+ }
+
+ stopGrid(1);
+ }
+ }
}
\ No newline at end of file
[13/30] ignite git commit: Fixed test.
Posted by ag...@apache.org.
Fixed test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acfd99bc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acfd99bc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acfd99bc
Branch: refs/heads/ignite-264
Commit: acfd99bc3949dde1439e34cfe26caf9f85f58ab5
Parents: 8a4b754
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 13:20:54 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 13:20:54 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheIncrementTransformTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/acfd99bc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
index 812baa5..a3d2dde 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
@@ -172,7 +172,7 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest {
ignite = restarts ? grids.getAndSet(idx, null) : grid(idx);
}
- IgniteCache<String, TestObject> cache = ignite.cache(null);
+ IgniteCache<String, TestObject> cache = ignite.<String, TestObject>cache(null).withNoRetries();
assertNotNull(cache);
[15/30] ignite git commit: Platform .Net: update version
Posted by ag...@apache.org.
Platform .Net: update version
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb78a14b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb78a14b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb78a14b
Branch: refs/heads/ignite-264
Commit: cb78a14b89384edecfdef31a8b20fb25878dd39e
Parents: 83b6e5f
Author: ptupitsyn <pt...@gridgain.com>
Authored: Fri Sep 4 13:58:19 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Fri Sep 4 13:58:19 2015 +0300
----------------------------------------------------------------------
.../main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb78a14b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 8deafec..326df2a 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
[assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")]
-[assembly: AssemblyVersion("1.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
[assembly: CLSCompliant(true)]
[17/30] ignite git commit: Merge branch
'ignite-1361-pingpong-example' of
https://github.com/ashutakGG/incubator-ignite into ignite-1.4
Posted by ag...@apache.org.
Merge branch 'ignite-1361-pingpong-example' of https://github.com/ashutakGG/incubator-ignite into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a37cefb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a37cefb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a37cefb
Branch: refs/heads/ignite-264
Commit: 5a37cefba9aea47e1f530425eafeac239a0c1d2e
Parents: cb78a14 cd81fff
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 14:08:31 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 14:08:31 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/messaging/MessagingPingPongExample.java | 6 +++++-
.../examples/java8/messaging/MessagingPingPongExample.java | 2 +-
.../org/apache/ignite/examples/MessagingExamplesSelfTest.java | 3 +--
.../ignite/java8/examples/MessagingExamplesSelfTest.java | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[12/30] ignite git commit: Handle GridDhtInvalidPartitionException in
GridDhtLocalPartition.clearAll.
Posted by ag...@apache.org.
Handle GridDhtInvalidPartitionException in GridDhtLocalPartition.clearAll.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a4b7541
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a4b7541
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a4b7541
Branch: refs/heads/ignite-264
Commit: 8a4b7541a050a29f3a3032554ffece1496c76145
Parents: bd8c607
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 12:15:09 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 12:15:09 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtLocalPartition.java | 51 ++++++++++++++++++--
1 file changed, 46 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a4b7541/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index d0e2b5b..6d22dc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -628,22 +628,41 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
try {
while (it.hasNext()) {
- GridDhtCacheEntry cached = it.next();
+ GridDhtCacheEntry cached = null;
try {
+ cached = it.next();
+
if (cached.clearInternal(clearVer, swap)) {
map.remove(cached.key(), cached);
if (!cached.isInternal()) {
mapPubSize.decrement();
- if (rec)
- cctx.events().addEvent(cached.partition(), cached.key(), cctx.localNodeId(),
- (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_UNLOADED, null, false,
- cached.rawGet(), cached.hasValue(), null, null, null);
+ if (rec) {
+ cctx.events().addEvent(cached.partition(),
+ cached.key(),
+ cctx.localNodeId(),
+ (IgniteUuid)null,
+ null,
+ EVT_CACHE_REBALANCE_OBJECT_UNLOADED,
+ null,
+ false,
+ cached.rawGet(),
+ cached.hasValue(),
+ null,
+ null,
+ null);
+ }
}
}
}
+ catch (GridDhtInvalidPartitionException e) {
+ assert map.isEmpty() && state() == EVICTED: "Invalid error [e=" + e + ", part=" + this + ']';
+ assert swapEmpty() : "Invalid error when swap is not cleared [e=" + e + ", part=" + this + ']';
+
+ break; // Partition is already concurrently cleared and evicted.
+ }
catch (IgniteCheckedException e) {
U.error(log, "Failed to clear cache entry for evicted partition: " + cached, e);
}
@@ -655,6 +674,28 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
}
/**
+ * @return {@code True} if there are no swap entries for this partition.
+ */
+ private boolean swapEmpty() {
+ GridCloseableIterator<?> it0 = null;
+
+ try {
+ it0 = cctx.swap().iterator(id);
+
+ return it0 == null || !it0.hasNext();
+ }
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to get partition swap iterator: " + this, e);
+
+ return true;
+ }
+ finally {
+ if (it0 != null)
+ U.closeQuiet(it0);
+ }
+ }
+
+ /**
* @param it Swap iterator.
* @return Unswapping iterator over swapped entries.
*/
[19/30] ignite git commit: Merge branch 'ignite-1.4' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4-main
Posted by ag...@apache.org.
Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58597111
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58597111
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58597111
Branch: refs/heads/ignite-264
Commit: 58597111c2eb79bd9b1581525ee1974c4afae6a6
Parents: 55cbf27 5a37cef
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Sep 4 14:13:19 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Sep 4 14:13:19 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/messaging/MessagingPingPongExample.java | 6 +++++-
.../examples/java8/messaging/MessagingPingPongExample.java | 2 +-
.../org/apache/ignite/examples/MessagingExamplesSelfTest.java | 3 +--
.../ignite/java8/examples/MessagingExamplesSelfTest.java | 3 ++-
.../main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
5 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[22/30] ignite git commit: Release notes - ignite-1.4
Posted by ag...@apache.org.
Release notes - ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecc492d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecc492d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecc492d7
Branch: refs/heads/ignite-264
Commit: ecc492d7f6a8e37783920fd02b95aa08e38b82ac
Parents: b18a844
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Sep 4 14:44:02 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Sep 4 14:44:02 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecc492d7/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 3f3ac7b..661ebe4 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,6 +4,7 @@ Apache Ignite Release Notes
Apache Ignite In-Memory Data Fabric 1.4
---------------------------------------
* Added SSL support to communication and discovery.
+* Added portable objects API.
* Added support for log4j2.
* Added versioned entry to cache API.
* Fixed IGNITE_HOME resolution with JBoss.
[16/30] ignite git commit: ignite-1361: Fixed.
Posted by ag...@apache.org.
ignite-1361: Fixed.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd81fff6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd81fff6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd81fff6
Branch: refs/heads/ignite-264
Commit: cd81fff65d6788e33a0065976ce4c3d3d1c68247
Parents: 83b6e5f
Author: ashutak <as...@gridgain.com>
Authored: Fri Sep 4 14:02:13 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Sep 4 14:02:13 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/messaging/MessagingPingPongExample.java | 6 +++++-
.../examples/java8/messaging/MessagingPingPongExample.java | 2 +-
.../org/apache/ignite/examples/MessagingExamplesSelfTest.java | 3 +--
.../ignite/java8/examples/MessagingExamplesSelfTest.java | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd81fff6/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
index eca4a2c..a2ba227 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
@@ -26,6 +26,7 @@ import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
/**
* Demonstrates simple message exchange between local and remote nodes.
@@ -64,6 +65,9 @@ public class MessagingPingPongExample {
// Set up remote player.
ignite.message(nodeB).remoteListen(null, new IgniteBiPredicate<UUID, String>() {
+ @IgniteInstanceResource
+ private Ignite ignite;
+
@Override public boolean apply(UUID nodeId, String rcvMsg) {
System.out.println("Received message [msg=" + rcvMsg + ", sender=" + nodeId + ']');
@@ -116,4 +120,4 @@ public class MessagingPingPongExample {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd81fff6/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
index 9962748..133e735 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
@@ -110,4 +110,4 @@ public class MessagingPingPongExample {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd81fff6/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
index a5b4329..66cddb4 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
@@ -39,7 +39,6 @@ public class MessagingExamplesSelfTest extends GridAbstractExamplesTest {
}
/**
- * TODO IGNITE-533
* @throws Exception If failed.
*/
public void testMessagingPingPongExample() throws Exception {
@@ -52,4 +51,4 @@ public class MessagingExamplesSelfTest extends GridAbstractExamplesTest {
public void testMessagingPingPongListenActorExample() throws Exception {
MessagingPingPongListenActorExample.main(EMPTY_ARGS);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd81fff6/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
index 0948a2a..c77e4b6 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
@@ -38,10 +38,11 @@ public class MessagingExamplesSelfTest extends GridAbstractExamplesTest {
}
/**
- * TODO IGNITE-533
* @throws Exception If failed.
*/
public void testMessagingPingPongExample() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-10");
+
MessagingPingPongExample.main(EMPTY_ARGS);
}
[23/30] ignite git commit: Fixed version.
Posted by ag...@apache.org.
Fixed version.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b41309c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b41309c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b41309c4
Branch: refs/heads/ignite-264
Commit: b41309c48abd9d9daad55c53d75dba7ea33893d7
Parents: 5a37cef
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 17:22:41 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 17:22:41 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b41309c4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
index 0376d04..6505765 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
@@ -30,7 +30,7 @@ public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/** */
- public static final IgniteProductVersion CLIENT_ACK_SINCE_VERSION = IgniteProductVersion.fromString("1.4.1");
+ public static final IgniteProductVersion CLIENT_ACK_SINCE_VERSION = IgniteProductVersion.fromString("1.4.0");
/** */
private final IgniteUuid msgId;
[03/30] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f1f6be8c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f1f6be8c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f1f6be8c
Branch: refs/heads/ignite-264
Commit: f1f6be8c750877e636681b07af849418e2919dec
Parents: 7a69e74 ca1523e
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 4 10:21:09 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 4 10:21:09 2015 +0300
----------------------------------------------------------------------
.../portable/datagrid/CacheClientPortablePutGetExample.java | 4 ++++
.../portable/datagrid/CacheClientPortableQueryExample.java | 5 +++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
[14/30] ignite git commit: 1.4.0-SNAPSHOT
Posted by ag...@apache.org.
1.4.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83b6e5f0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83b6e5f0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83b6e5f0
Branch: refs/heads/ignite-264
Commit: 83b6e5f07125cabf119194a97c170330aef5fc1a
Parents: acfd99b
Author: Ignite Teamcity <ig...@apache.org>
Authored: Fri Sep 4 13:28:23 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Fri Sep 4 13:28:23 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 5 ++---
modules/aws/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/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 | 5 ++---
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/platform/pom.xml | 2 +-
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/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 +-
45 files changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index a2ac452..64e8be9 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index a080b57..391f5b8 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/apache-license-gen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml
index 2d15ad4..c17f98f 100644
--- a/modules/apache-license-gen/pom.xml
+++ b/modules/apache-license-gen/pom.xml
@@ -20,8 +20,7 @@
<!--
POM file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -32,7 +31,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-apache-license-gen</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 63d454d..a0ca6b0 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 303a274..61f6694 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index e735804..b7aa43b 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ignite-cloud</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index a39da2f..89cadf5 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 57abba0..2f0dde7 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<repositories>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index c1c2d0f..50725fa 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-ignite.version=1.4.1-SNAPSHOT
+ignite.version=1.4.0-SNAPSHOT
ignite.build=0
ignite.revision=DEV
ignite.rel.date=01011970
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index b48859b..aca3132 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/extdata/uri/modules/uri-dependency/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/modules/uri-dependency/pom.xml b/modules/extdata/uri/modules/uri-dependency/pom.xml
index f863bed..98d3fcf 100644
--- a/modules/extdata/uri/modules/uri-dependency/pom.xml
+++ b/modules/extdata/uri/modules/uri-dependency/pom.xml
@@ -27,7 +27,7 @@
<artifactId>ignite-extdata-uri-dep</artifactId>
<packaging>jar</packaging>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 0b4f92f..7613f0c 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -32,7 +32,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index b3fbb32..05f043f 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-gce</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 1330cf5..766114b 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 9fdfd99..839ffb8 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 2d6d893..a3ae729 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 4bcadc8..e4713b4 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 0b2c48b..335b6c8 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/jms11/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
index ff80007..dbb385d 100644
--- a/modules/jms11/pom.xml
+++ b/modules/jms11/pom.xml
@@ -20,8 +20,7 @@
<!--
POM file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -32,7 +31,7 @@
</parent>
<artifactId>ignite-jms11</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 7965dd9..c0ce618 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/modules/kafka/pom.xml b/modules/kafka/pom.xml
index ed192ab..5103a32 100644
--- a/modules/kafka/pom.xml
+++ b/modules/kafka/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-kafka</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index c3c4a84..aaf1dca 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/log4j2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j2/pom.xml b/modules/log4j2/pom.xml
index 0628b47..2c0fd94 100644
--- a/modules/log4j2/pom.xml
+++ b/modules/log4j2/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j2</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/mesos/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index 07bd13d..a652b60 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mesos</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/platform/pom.xml
----------------------------------------------------------------------
diff --git a/modules/platform/pom.xml b/modules/platform/pom.xml
index 4bff370..87f0368 100644
--- a/modules/platform/pom.xml
+++ b/modules/platform/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-platform</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 8156887..c506df6 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/scalar-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index 42fb9b9..627f2b4 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar_2.10</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 982fcaf..ab03a5d 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index e64059a..207a97c 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 0ba8597..ef36af9 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 5cdf791..807ed0d 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/spark-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml
index 6c44006..283855e 100644
--- a/modules/spark-2.10/pom.xml
+++ b/modules/spark-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark_2.10</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/spark/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index 1fb2753..f7b2110 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 4ed1fd7..bf093ef 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 7922f53..5b407ad 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 5e3465e..ca0d0f4 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 7dd0431..df2b0fa 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/visor-console-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml
index a0edeaf..fa541dc 100644
--- a/modules/visor-console-2.10/pom.xml
+++ b/modules/visor-console-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console_2.10</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index d6f373a..dc841bf 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 04142fa..c0e5b5e 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 4432d81..d814f47 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 3f3774a..eda9429 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml
index 079a173..c93efa4 100644
--- a/modules/yarn/pom.xml
+++ b/modules/yarn/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yarn</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/modules/zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index ba10101..3993bd5 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-zookeeper</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6e5f0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 96305a3..22ebad7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
[08/30] ignite git commit: IGNITE-1333 - SQL Group index can return
wrong restult in half-bounded conditions - Fixes #50.
Posted by ag...@apache.org.
IGNITE-1333 - SQL Group index can return wrong restult in half-bounded conditions - Fixes #50.
Signed-off-by: S.Vladykin <sv...@gridgain.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf64c6ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf64c6ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf64c6ed
Branch: refs/heads/ignite-264
Commit: bf64c6edc8f44a0f2d4ef2707d8bdd2a98589297
Parents: 8901575
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Sep 4 10:48:03 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Sep 4 10:50:47 2015 +0300
----------------------------------------------------------------------
.../query/h2/opt/GridH2IndexBase.java | 42 ++++++++++++++++++++
.../query/IgniteSqlSplitterSelfTest.java | 35 ++++++++++++++--
2 files changed, 74 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bf64c6ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
index ff9aa23..39664ff 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
@@ -27,6 +27,8 @@ import org.h2.index.BaseIndex;
import org.h2.message.DbException;
import org.h2.result.Row;
import org.h2.result.SearchRow;
+import org.h2.result.SortOrder;
+import org.h2.value.Value;
import org.jetbrains.annotations.Nullable;
/**
@@ -106,6 +108,46 @@ public abstract class GridH2IndexBase extends BaseIndex {
// No-op.
}
+ /** {@inheritDoc} */
+ @Override public int compareRows(SearchRow rowData, SearchRow compare) {
+ if (rowData == compare)
+ return 0;
+
+ for (int i = 0, len = indexColumns.length; i < len; i++) {
+ int index = columnIds[i];
+
+ Value v1 = rowData.getValue(index);
+ Value v2 = compare.getValue(index);
+
+ if (v1 == null || v2 == null)
+ return 0;
+
+ int c = compareValues(v1, v2, indexColumns[i].sortType);
+
+ if (c != 0)
+ return c;
+ }
+ return 0;
+ }
+
+ /**
+ * @param a First value.
+ * @param b Second value.
+ * @param sortType Sort type.
+ * @return Comparison result.
+ */
+ private int compareValues(Value a, Value b, int sortType) {
+ if (a == b)
+ return 0;
+
+ int comp = table.compareTypeSave(a, b);
+
+ if ((sortType & SortOrder.DESCENDING) != 0)
+ comp = -comp;
+
+ return comp;
+ }
+
/**
* Filters rows from expired ones and using predicate.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/bf64c6ed/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index f70c218..75112fd 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -158,15 +158,44 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
// Check results.
assertEquals(1, columnQuery(c, qry + "where a = 1 and b = 1").size());
+ assertEquals(0, columnQuery(c, qry + "where a = 1 and b = 2").size());
+ assertEquals(1, columnQuery(c, qry + "where a = 1 and b = 3").size());
assertEquals(2, columnQuery(c, qry + "where a = 1 and b < 4").size());
assertEquals(2, columnQuery(c, qry + "where a = 1 and b <= 3").size());
assertEquals(1, columnQuery(c, qry + "where a = 1 and b < 3").size());
assertEquals(2, columnQuery(c, qry + "where a = 1 and b > 0").size());
assertEquals(1, columnQuery(c, qry + "where a = 1 and b > 1").size());
assertEquals(2, columnQuery(c, qry + "where a = 1 and b >= 1").size());
- assertEquals(4, columnQuery(c, qry + "where a > 0 and b > 0").size());
- assertEquals(4, columnQuery(c, qry + "where a > 0 and b >= 1").size());
- assertEquals(3, columnQuery(c, qry + "where a > 0 and b > 1").size());
+
+ assertEquals(4, columnQuery(c, qry + "where a > 0").size());
+ assertEquals(4, columnQuery(c, qry + "where a >= 1").size());
+ assertEquals(4, columnQuery(c, qry + "where b > 0").size());
+ assertEquals(4, columnQuery(c, qry + "where b >= 1").size());
+
+ assertEquals(4, columnQuery(c, qry + "where a < 2").size());
+ assertEquals(4, columnQuery(c, qry + "where a <= 1").size());
+ assertEquals(4, columnQuery(c, qry + "where b < 3").size());
+ assertEquals(5, columnQuery(c, qry + "where b <= 3").size());
+
+ assertEquals(3, columnQuery(c, qry + "where a > 0 and b > 0").size());
+ assertEquals(2, columnQuery(c, qry + "where a > 0 and b >= 2").size());
+ assertEquals(3, columnQuery(c, qry + "where a >= 1 and b > 0").size());
+ assertEquals(2, columnQuery(c, qry + "where a >= 1 and b >= 2").size());
+
+ assertEquals(3, columnQuery(c, qry + "where a > 0 and b < 3").size());
+ assertEquals(2, columnQuery(c, qry + "where a > 0 and b <= 1").size());
+ assertEquals(3, columnQuery(c, qry + "where a >= 1 and b < 3").size());
+ assertEquals(2, columnQuery(c, qry + "where a >= 1 and b <= 1").size());
+
+ assertEquals(2, columnQuery(c, qry + "where a < 2 and b < 3").size());
+ assertEquals(2, columnQuery(c, qry + "where a < 2 and b <= 1").size());
+ assertEquals(2, columnQuery(c, qry + "where a <= 1 and b < 3").size());
+ assertEquals(2, columnQuery(c, qry + "where a <= 1 and b <= 1").size());
+
+ assertEquals(3, columnQuery(c, qry + "where a < 2 and b > 0").size());
+ assertEquals(2, columnQuery(c, qry + "where a < 2 and b >= 3").size());
+ assertEquals(3, columnQuery(c, qry + "where a <= 1 and b > 0").size());
+ assertEquals(2, columnQuery(c, qry + "where a <= 1 and b >= 3").size());
}
finally {
c.destroy();
[25/30] ignite git commit: Platforms version update
Posted by ag...@apache.org.
Platforms version update
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c631a376
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c631a376
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c631a376
Branch: refs/heads/ignite-264
Commit: c631a37669b85cc3d9fd209af820264155a0a32d
Parents: ecc492d
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Sep 4 17:28:13 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 4 17:28:13 2015 +0300
----------------------------------------------------------------------
pom.xml | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 118 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c631a376/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 22ebad7..8a143cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -737,6 +737,124 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>update-versions</id>
+ <!-- updates dotnet & cpp versions -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>update-versions</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <target>
+ <script language="javascript">
+ function setClientVersion(ggVer, clientVer) {
+ var p = project.getProperty(ggVer);
+
+ if (java.util.regex.Pattern.matches(".*-p\\d+", p))
+ project.setProperty(clientVer, p.replace("-p", "."));
+ else
+ if (java.util.regex.Pattern.matches(".*-[a-zA-Z]+\\d+.*", p))
+ project.setProperty(clientVer, p.replaceAll("-[a-zA-Z]+(\\d+)?.*", ".$1"));
+ else
+ project.setProperty(clientVer, p);
+ }
+
+ function fix(dest, source) {
+ project.setProperty(dest, project.getProperty(source).replace("-SNAPSHOT",
+ ""));
+ }
+
+ fix('ignite.version.fixed', 'project.version');
+ fix('new.ignite.version.fixed', 'new.ignite.version');
+ setClientVersion('ignite.version.fixed', 'old.client.version');
+ setClientVersion('new.ignite.version.fixed', 'new.client.version');
+ </script>
+
+ <echo message="Update ignite.version in dotnet client"/>
+ <echo message="${new.client.version}"/>
+
+ <replaceregexp byline="true" encoding="UTF-8">
+ <regexp
+ pattern="(\[assembly:\s*Assembly\w*Version\w*\(")\d.\d.\d(.\d)?("\)\])"/>
+ <substitution expression="\1${new.client.version}\3"/>
+ <fileset dir="${basedir}/">
+ <include name="**/AssemblyInfo.cs"/>
+ <include name="**/AssemblyInfo.cpp"/>
+ </fileset>
+ </replaceregexp>
+
+ <echo message="Update ignite.version in cpp client"/>
+ <replaceregexp byline="true" encoding="UTF-8">
+ <regexp pattern="(AC_INIT.+\[)\d.\d.\d(.\d)?(\].+)"/>
+ <substitution expression="\1${new.client.version}\3"/>
+ <fileset dir="${basedir}/">
+ <include name="**/configure.ac"/>
+ </fileset>
+ </replaceregexp>
+
+ <replaceregexp byline="true" encoding="UTF-8">
+ <regexp pattern="(define GG_VERSION_STR_WIN ")\d.\d.\d(.\d)?(")"/>
+ <substitution expression="\1${new.client.version}\3"/>
+ <fileset dir="${basedir}/">
+ <include name="**/resource.h"/>
+ </fileset>
+ </replaceregexp>
+
+ <replaceregexp byline="true" encoding="UTF-16">
+ <regexp pattern="(Version", ")\d.\d.\d.\d(")"/>
+ <substitution expression="\1${new.client.version}\2"/>
+ <fileset dir="${basedir}/">
+ <include name="**/Resource.rc"/>
+ </fileset>
+ </replaceregexp>
+
+ <script language="javascript">
+ function setBinVersion(clientVer, binVer) {
+ var p = project.getProperty(clientVer).replace(".", ",");
+
+ if (p.split(',').length == 3)
+ project.setProperty(binVer, p + ',0');
+ else
+ project.setProperty(binVer, p);
+ }
+
+ setBinVersion('old.client.version', 'old.bin.version');
+ setBinVersion('new.client.version', 'new.bin.version');
+ </script>
+
+ <replaceregexp byline="true" encoding="UTF-8">
+ <regexp pattern="(define GG_VERSION_BIN_WIN )\d,\d,\d,\d"/>
+ <substitution expression="\1${new.bin.version}"/>
+ <fileset dir="${basedir}/">
+ <include name="**/resource.h"/>
+ </fileset>
+ </replaceregexp>
+
+ <replaceregexp byline="true" encoding="UTF-16">
+ <regexp pattern="(VERSION )\d,\d,\d,\d"/>
+ <substitution expression="\1${new.bin.version}"/>
+ <fileset dir="${basedir}/">
+ <include name="**/Resource.rc"/>
+ </fileset>
+ </replaceregexp>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>