Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10052 9cbecbce1 -> 6ad37e14f
[GG-10249]: temp fixes in some tests related to size() and count() removals. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/455b0844 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/455b0844 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/455b0844 Branch: refs/heads/ignite-gg-10052 Commit: 455b0844ce95cb13869b270a4b518ee95be5efb7 Parents: 1b75ba2 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Tue May 19 12:15:57 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Tue May 19 12:15:57 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/swapspace/SwapSpaceSpi.java | 10 ++-- .../GridSwapSpaceSpiAbstractSelfTest.java | 50 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/455b0844/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java index 8c788c8..d8d0de9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java @@ -29,15 +29,15 @@ import java.util.*; * by calling {@link org.apache.ignite.Ignite} API swap-related methods. Logically storage is organized into * independent 'spaces' in which data is stored. * <p> - * All swap space implementations can be configured to prevent infinite growth and evict oldest entries. - * <p> - * The default swap space SPI is {@link org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi} which stores values on disk in files and keeps keys in + * The default swap space SPI is {@link org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi} which stores + * values on disk in files and keeps keys in * memory. * <p> * Ignite provides the following {@code GridSwapSpaceSpi} implementations: * <ul> * <li> - * {@link org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi} - pure Java implementation with in-memory keys. This SPI is used by default. + * {@link org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi} - pure Java implementation with in-memory keys. + * This SPI is used by default. * </li> * <li> * {@link org.apache.ignite.spi.swapspace.noop.NoopSwapSpaceSpi} - no-op SPI mainly for testing. @@ -195,7 +195,7 @@ public interface SwapSpaceSpi extends IgniteSpi { * @return Iterator over space entries or {@code null} if space is unknown. * @throws org.apache.ignite.spi.IgniteSpiException If failed. */ - @Nullable <K> IgniteSpiCloseableIterator<K> keyIterator(@Nullable String spaceName, SwapContext ctx) + @Nullable public <K> IgniteSpiCloseableIterator<K> keyIterator(@Nullable String spaceName, SwapContext ctx) throws IgniteSpiException; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/455b0844/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java index 5740915..94658d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java @@ -112,7 +112,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.store(DFLT_SPACE_NAME, new SwapKey(key1), val1, context()); - assertEquals(1, spi.count(DFLT_SPACE_NAME)); + //assertEquals(1, spi.count(DFLT_SPACE_NAME)); assertArrayEquals(spi.read(DFLT_SPACE_NAME, new SwapKey(key1), context()), val1); @@ -120,7 +120,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.store(DFLT_SPACE_NAME, new SwapKey(key1), val2, context()); - assertEquals(1, spi.count(DFLT_SPACE_NAME)); + //assertEquals(1, spi.count(DFLT_SPACE_NAME)); assertArrayEquals(spi.read(DFLT_SPACE_NAME, new SwapKey(key1), context()), val2); @@ -130,7 +130,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac } }, context()); - assertEquals(0, spi.count(DFLT_SPACE_NAME)); + //assertEquals(0, spi.count(DFLT_SPACE_NAME)); } /** @@ -158,15 +158,15 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.store(space1, new SwapKey(key1), val1, context()); - assertEquals(1, spi.count(space1)); - - assertEquals(0, spi.count(space2)); +// assertEquals(1, spi.count(space1)); +// +// assertEquals(0, spi.count(space2)); spi.store(space2, new SwapKey(key1), val1, context()); - assertEquals(1, spi.count(space1)); - - assertEquals(1, spi.count(space2)); +// assertEquals(1, spi.count(space1)); +// +// assertEquals(1, spi.count(space2)); assertArrayEquals(spi.read(space1, new SwapKey(key1), context()), val1); @@ -178,9 +178,9 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.store(space1, new SwapKey(key2), val2, context()); - assertEquals(2, spi.count(space1)); - - assertEquals(1, spi.count(space2)); +// assertEquals(2, spi.count(space1)); +// +// assertEquals(1, spi.count(space2)); assertArrayEquals(spi.read(space1, new SwapKey(key2), context()), val2); @@ -190,9 +190,9 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.store(space1, new SwapKey(key1), val12, context()); - assertEquals(2, spi.count(space1)); - - assertEquals(1, spi.count(space2)); +// assertEquals(2, spi.count(space1)); +// +// assertEquals(1, spi.count(space2)); assertArrayEquals(spi.read(space1, new SwapKey(key1), context()), val12); @@ -204,9 +204,9 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac } }, context()); - assertEquals(1, spi.count(space1)); - - assertEquals(1, spi.count(space2)); +// assertEquals(1, spi.count(space1)); +// +// assertEquals(1, spi.count(space2)); spi.remove(space2, new SwapKey(key1), new IgniteInClosure<byte[]>() { @Override public void apply(byte[] old) { @@ -214,9 +214,9 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac } }, context()); - assertEquals(1, spi.count(space1)); - - assertEquals(0, spi.count(space2)); +// assertEquals(1, spi.count(space1)); +// +// assertEquals(0, spi.count(space2)); } /** @@ -237,7 +237,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.storeAll(DFLT_SPACE_NAME, batch, context()); - assertEquals(batchSize, spi.count(DFLT_SPACE_NAME)); +// assertEquals(batchSize, spi.count(DFLT_SPACE_NAME)); Map<SwapKey, byte[]> read = spi.readAll(DFLT_SPACE_NAME, batch.keySet(), context()); @@ -254,7 +254,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.storeAll(DFLT_SPACE_NAME, batch, context()); - assertEquals(batchSize, spi.count(DFLT_SPACE_NAME)); + //assertEquals(batchSize, spi.count(DFLT_SPACE_NAME)); read = spi.readAll(DFLT_SPACE_NAME, batch.keySet(), context()); @@ -267,7 +267,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.removeAll(DFLT_SPACE_NAME, batch.keySet(), null, context()); - assertEquals(0, spi.count(DFLT_SPACE_NAME)); +// assertEquals(0, spi.count(DFLT_SPACE_NAME)); } /** @@ -516,7 +516,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac spi.clear(SPACE1); - int cnt = 10; + final int cnt = 10; for (int i = 0; i < cnt; i++) spi.store(SPACE1, new SwapKey("key" + i, i), str2ByteArray("value" + i), context());
