ignite-959-m - clean
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca924559 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca924559 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca924559 Branch: refs/heads/ignite-959-m Commit: ca924559f4ef59f7510e525a53a08c943e0ce6db Parents: 5f6e86d Author: S.Vladykin <[email protected]> Authored: Wed Jul 22 13:40:25 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Wed Jul 22 13:40:25 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/opt/GridH2AbstractKeyValueRow.java | 2 -- .../ignite/internal/processors/query/h2/opt/GridH2Table.java | 2 -- .../processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca924559/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index 5e1aade..d788431 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -198,8 +198,6 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { final Object k = getValue(KEY_COL).getObject(); - final Integer kx = getValue(KEY_COL).getInt(); - try { Object valObj = desc.readFromSwap(k); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca924559/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index 1d2cf0f..ef6c2ef 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -154,8 +154,6 @@ public class GridH2Table extends TableBase { try { GridH2AbstractKeyValueRow row = (GridH2AbstractKeyValueRow)pk.findOne(searchRow); -// D.debug("onSwapUnswap", key, getName(), row == null, val); - if (row == null) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca924559/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 8841ae7..33dbd08 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 @@ -211,7 +211,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes c.remove(e.getKey()); } - U.sleep(3000); + U.sleep(5000); assertEquals("Swap keys: " + c.size(CachePeekMode.SWAP), 0, c.size(CachePeekMode.SWAP)); assertEquals(0, c.size(CachePeekMode.OFFHEAP)); @@ -406,7 +406,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes */ @SuppressWarnings({"TooBroadScope"}) public void testMultiThreadedSwapUnswapLongString() throws Exception { - int threadCnt = 100; + int threadCnt = 50; final int keyCnt = 2000; final int valCnt = 10000;
