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 2017/01/16 14:12:04 UTC
[05/12] ignite git commit: ignite-gg-8.0.2.ea2 fix
IgniteCacheP2pUnmarshallingErrorTest.testResponseMessageOnUnmarshallingFailed
and IgniteCacheClientQueryReplicatedNodeRestartSelfTest.testRestarts
ignite-gg-8.0.2.ea2 fix IgniteCacheP2pUnmarshallingErrorTest.testResponseMessageOnUnmarshallingFailed and IgniteCacheClientQueryReplicatedNodeRestartSelfTest.testRestarts
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b84b41
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b84b41
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b84b41
Branch: refs/heads/ignite-gg-11810-1
Commit: e1b84b41bd4ae52631f17f79396d6921385c0dcc
Parents: 2254d37
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Fri Jan 13 19:27:47 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Fri Jan 13 19:27:47 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheAdapter.java | 2 +-
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 +--
.../internal/processors/query/h2/database/H2TreeIndex.java | 5 ++---
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 93270ea..2d688da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2180,7 +2180,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
ctx.evicts().touch(peekEx(key0), topVer);
}
- throw e;
+ return new GridFinishedFuture<>(e);
}
catch (IgniteCheckedException e) {
return new GridFinishedFuture<>(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 3363124..c1acb84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -573,9 +573,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
val = this.val;
if (val == null) {
- if (isStartVersion()) {
+ if (isStartVersion())
val = unswap(true, false);
- }
}
if (val != null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index 31df27c..3268d9d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -79,7 +79,7 @@ public class H2TreeIndex extends GridH2IndexBase {
name = BPlusTree.treeName(name, "H2Tree");
- if (!cctx.kernalContext().clientNode()) {
+ if (!cctx.kernalContext().clientNode() && cctx.affinityNode()) {
IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database();
RootPage page = cctx.offheap().rootPageForIndex(name);
@@ -87,8 +87,7 @@ public class H2TreeIndex extends GridH2IndexBase {
tree = new H2Tree(name, cctx.offheap().reuseListForIndex(name), cctx.cacheId(),
dbMgr.pageMemory(), cctx.shared().wal(), cctx.offheap().globalRemoveId(),
tbl.rowFactory(), page.pageId().pageId(), page.isAllocated()) {
- @Override
- protected int compare(BPlusIO<SearchRow> io, ByteBuffer buf, int idx, SearchRow row)
+ @Override protected int compare(BPlusIO<SearchRow> io, ByteBuffer buf, int idx, SearchRow row)
throws IgniteCheckedException {
return compareRows(getRow(io, buf, idx), row);
}