ignite-341 - tests 3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d88992f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d88992f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d88992f5 Branch: refs/heads/ignite-494b Commit: d88992f518576dc9ff3742ad55aca8000c7cc9ce Parents: 0a7a684 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Mar 25 19:45:25 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Mar 25 19:45:25 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/opt/GridH2KeyValueRowOffheap.java | 3 ++- .../cache/IgniteCacheQueryMultiThreadedSelfTest.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d88992f5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java index 34eaba9..9c1d90a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java @@ -198,7 +198,8 @@ public class GridH2KeyValueRowOffheap extends GridH2AbstractKeyValueRow { final long valPtr = mem.readLongVolatile(p); - assert valPtr > 0: valPtr; + if (valPtr == 0) + return; // Nothing to swap. desc.guard().finalizeLater(new Runnable() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d88992f5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index 1b1d094..6060a23 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java @@ -238,7 +238,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes */ @SuppressWarnings({"TooBroadScope"}) public void testMultiThreadedSwapUnswapString() throws Exception { - int threadCnt = 150; + int threadCnt = 50; final int keyCnt = 2000; final int valCnt = 10000; @@ -310,7 +310,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes */ @SuppressWarnings({"TooBroadScope"}) public void testMultiThreadedSwapUnswapLong() throws Exception { - int threadCnt = 150; + int threadCnt = 50; final int keyCnt = 2000; final int valCnt = 10000; @@ -383,7 +383,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes */ @SuppressWarnings({"TooBroadScope"}) public void testMultiThreadedSwapUnswapLongString() throws Exception { - int threadCnt = 150; + int threadCnt = 50; final int keyCnt = 2000; final int valCnt = 10000;