You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/08/04 23:33:27 UTC
[1/2] incubator-ignite git commit: master - minor refactoring
Repository: incubator-ignite
Updated Branches:
refs/heads/master 01c3e0928 -> c087be217
master - minor refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b683b8f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b683b8f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b683b8f8
Branch: refs/heads/master
Commit: b683b8f80b59696933d52ad2c79321b374e4e6b4
Parents: 246b94a
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Aug 5 00:27:18 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Aug 5 00:27:18 2015 +0300
----------------------------------------------------------------------
.../query/h2/twostep/GridMergeIndexUnsorted.java | 8 +-------
.../processors/query/h2/twostep/GridMergeTable.java | 13 +++++++------
2 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b683b8f8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
index 276d25b..61aaa80 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
@@ -75,13 +75,7 @@ public class GridMergeIndexUnsorted extends GridMergeIndex {
if (page != null)
break;
- UUID nodeId = ((GridMergeTable)table).checkSourceNodesAlive();
-
- if (nodeId != null) {
- fail(nodeId);
-
- assert !queue.isEmpty();
- }
+ ((GridMergeTable)table).checkSourceNodesAlive();
}
if (page.isLast())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b683b8f8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
index fd9eec3..0b335d3 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
@@ -54,15 +54,16 @@ public class GridMergeTable extends TableBase {
}
/**
- * @return Failed node or {@code null} if all alive.
+ * Fails merge table if any source node is left.
*/
- public UUID checkSourceNodesAlive() {
+ public void checkSourceNodesAlive() {
for (UUID nodeId : idx.sources()) {
- if (!ctx.discovery().alive(nodeId))
- return nodeId;
- }
+ if (!ctx.discovery().alive(nodeId)) {
+ idx.fail(nodeId);
- return null;
+ return;
+ }
+ }
}
/** {@inheritDoc} */
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by se...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c087be21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c087be21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c087be21
Branch: refs/heads/master
Commit: c087be21760dd8ab34a0b2a43f7f10f7a5203e41
Parents: b683b8f 01c3e09
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Aug 5 00:27:37 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Aug 5 00:27:37 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheSwapPreloadSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------