You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/10/27 13:58:02 UTC
[1/3] ignite git commit: ignite-1792: ContinuousProcessor should use
ALWAYS_TRUE predicate instead of null
Repository: ignite
Updated Branches:
refs/heads/ignite-1607 0f915e152 -> b1eb21c0c
ignite-1792: ContinuousProcessor should use ALWAYS_TRUE predicate instead of null
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5a30693
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5a30693
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5a30693
Branch: refs/heads/ignite-1607
Commit: b5a30693498c17e5ecea04dd19c8608f54321076
Parents: e9aa4d1
Author: Andrey Gura <ag...@gridgain.com>
Authored: Tue Oct 27 14:03:27 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Oct 27 14:03:27 2015 +0300
----------------------------------------------------------------------
.../cache/query/continuous/CacheContinuousQueryManager.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5a30693/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index 6a151a5..c7bf091 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -419,10 +419,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter {
taskNameHash,
skipPrimaryCheck);
- IgnitePredicate<ClusterNode> pred = null;
-
- if (loc || cctx.config().getCacheMode() == CacheMode.LOCAL)
- pred = F.nodeForNodeId(cctx.localNodeId());
+ IgnitePredicate<ClusterNode> pred = (loc || cctx.config().getCacheMode() == CacheMode.LOCAL) ?
+ F.nodeForNodeId(cctx.localNodeId()) : F.<ClusterNode>alwaysTrue();
UUID id = cctx.kernalContext().continuous().startRoutine(
hnd,
[2/3] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1607
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1607
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50b3b008
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50b3b008
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50b3b008
Branch: refs/heads/ignite-1607
Commit: 50b3b0087b4b750de5ee18e3c422608598c8722e
Parents: 0f915e1 b5a3069
Author: sboikov <sb...@gridgain.com>
Authored: Tue Oct 27 15:48:40 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Oct 27 15:48:40 2015 +0300
----------------------------------------------------------------------
.../cache/query/continuous/CacheContinuousQueryManager.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/3] ignite git commit: ignite-1607 WIP
Posted by sb...@apache.org.
ignite-1607 WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1eb21c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1eb21c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1eb21c0
Branch: refs/heads/ignite-1607
Commit: b1eb21c0cddd38b6c9a36f9f496e9bbfdae1962d
Parents: 50b3b00
Author: sboikov <sb...@gridgain.com>
Authored: Tue Oct 27 15:57:28 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Oct 27 15:57:28 2015 +0300
----------------------------------------------------------------------
.../near/GridNearOptimisticSerializableTxPrepareFuture.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1eb21c0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index eb88149..7f42526 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -444,7 +444,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
m.explicitLock(),
tx.subjectId(),
tx.taskNameHash(),
- m.clientFirst());
+ m.clientFirst(),
+ tx.activeCachesDeploymentEnabled());
for (IgniteTxEntry txEntry : m.writes()) {
if (txEntry.op() == TRANSFORM)