Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 cbfb98296 -> 8ef3fbe85
#ignite-180: Add tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ec77118 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ec77118 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ec77118 Branch: refs/heads/ignite-80 Commit: 9ec77118f9073ab6a17a545a9012ceef379bae0d Parents: 90f91d7 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Apr 8 12:54:13 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Apr 8 12:54:13 2015 +0300 ---------------------------------------------------------------------- .../GridCacheQueueApiSelfAbstractTest.java | 28 +++++++++++++++ .../GridCacheQueueCleanupSelfTest.java | 5 +++ ...dCacheQueueMultiNodeConsistencySelfTest.java | 5 +++ .../IgniteCollectionAbstractTest.java | 14 ++++++++ .../IgniteDataStructureUniqueNameTest.java | 5 +++ .../GridCacheLocalAtomicOffheapSetSelfTest.java | 30 ++++++++++++++++ .../GridCacheLocalAtomicQueueApiSelfTest.java | 5 +++ .../local/GridCacheLocalAtomicSetSelfTest.java | 5 +++ .../GridCacheLocalOffheapQueueApiSelfTest.java | 29 ++++++++++++++++ .../local/GridCacheLocalQueueApiSelfTest.java | 5 +++ .../local/GridCacheLocalSetSelfTest.java | 5 +++ ...artitionedAtomicOffheapQueueApiSelfTest.java | 30 ++++++++++++++++ ...omicOffheapQueueCreateMultiNodeSelfTest.java | 30 ++++++++++++++++ ...onedAtomicOffheapQueueMultiNodeSelfTest.java | 30 ++++++++++++++++ ...dCachePartitionedAtomicQueueApiSelfTest.java | 5 +++ ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 +++ ...micQueueFailoverDataConsistencySelfTest.java | 5 +++ ...PartitionedAtomicQueueMultiNodeSelfTest.java | 5 +++ ...itionedAtomicQueueRotativeMultiNodeTest.java | 5 +++ ...chePartitionedAtomicSetFailoverSelfTest.java | 5 +++ ...rtitionedDataStructuresFailoverSelfTest.java | 5 +++ ...edOffheapDataStructuresFailoverSelfTest.java | 36 ++++++++++++++++++++ ...hePartitionedOffheapSetFailoverSelfTest.java | 30 ++++++++++++++++ .../GridCachePartitionedQueueApiSelfTest.java | 5 +++ ...PartitionedQueueCreateMultiNodeSelfTest.java | 5 +++ ...dCachePartitionedQueueEntryMoveSelfTest.java | 5 +++ ...nedQueueFailoverDataConsistencySelfTest.java | 5 +++ ...CachePartitionedQueueJoinedNodeSelfTest.java | 5 +++ ...dCachePartitionedQueueMultiNodeSelfTest.java | 5 +++ ...hePartitionedQueueRotativeMultiNodeTest.java | 5 +++ ...GridCachePartitionedSetFailoverSelfTest.java | 5 +++ .../GridCachePartitionedSetSelfTest.java | 5 +++ ...eplicatedDataStructuresFailoverSelfTest.java | 5 +++ .../GridCacheReplicatedQueueApiSelfTest.java | 10 ++++++ ...idCacheReplicatedQueueMultiNodeSelfTest.java | 5 +++ ...cheReplicatedQueueRotativeMultiNodeTest.java | 5 +++ .../GridCacheReplicatedSetSelfTest.java | 5 +++ .../IgniteCacheDataStructuresSelfTestSuite.java | 13 +++++-- 38 files changed, 412 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java index 7a43ff4..012401d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java @@ -19,7 +19,10 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.datastructures.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.testframework.*; import java.io.*; import java.util.*; @@ -505,6 +508,31 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection } /** + * @throws Exception If failed. + */ + public void testReuseHash() throws Exception { + CollectionConfiguration colCfg = collectionConfiguration(); + + IgniteQueue queue1 = grid(0).queue("Queue1", 0, colCfg); + + IgniteQueue queue2 = grid(0).queue("Queue2", 0, colCfg); + + assertEquals(getQueueCache(queue1), getQueueCache(queue2)); + } + + /** + * @param queue Ignite queue. + * @return Cache configuration. + */ + private CacheConfiguration getQueueCache(IgniteQueue queue) { + GridCacheQueueAdapter delegate = GridTestUtils.getFieldValue(queue, "delegate"); + + GridCacheAdapter cache = GridTestUtils.getFieldValue(delegate, GridCacheQueueAdapter.class, "cache"); + + return cache.configuration(); + } + + /** * Test class with the same hash code. */ private static class SameHashItem implements Serializable { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java index e0b6094..8bf30fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java @@ -55,6 +55,11 @@ public class GridCacheQueueCleanupSelfTest extends IgniteCollectionAbstractTest } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java index 36d7758..495bcef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java @@ -68,6 +68,11 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java index 92a94dd..3ef9ebd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java @@ -71,6 +71,8 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes colCfg.setCacheMode(collectionCacheMode()); colCfg.setAtomicityMode(collectionCacheAtomicityMode()); + colCfg.setMemoryMode(collectionMemoryMode()); + colCfg.setOffHeapMaxMemory(collectionOffHeapMaxMemory()); if (colCfg.getCacheMode() == PARTITIONED) colCfg.setBackups(1); @@ -89,10 +91,22 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes protected abstract CacheMode collectionCacheMode(); /** + * @return Collection cache memory mode. + */ + protected abstract CacheMemoryMode collectionMemoryMode(); + + /** * @return Collection cache atomicity mode. */ protected abstract CacheAtomicityMode collectionCacheAtomicityMode(); + /** + * @return Collection cache off-heap max memory. + */ + protected long collectionOffHeapMaxMemory() { + return -1; + } + /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(gridCount()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java index 92b88ff..1255153 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java @@ -46,6 +46,11 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java new file mode 100644 index 0000000..394eaab --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.datastructures.local; + +import org.apache.ignite.cache.*; + +/** + * Set tests. + */ +public class GridCacheLocalAtomicOffheapSetSelfTest extends GridCacheLocalAtomicSetSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java index 7c818cf..51c08a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java @@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public class GridCacheLocalAtomicQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java index 17ef6a8..d149a06 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java @@ -38,6 +38,11 @@ public class GridCacheLocalAtomicSetSelfTest extends GridCacheSetAbstractSelfTes } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java new file mode 100644 index 0000000..c8e5bf7 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ignite.internal.processors.cache.datastructures.local; + +import org.apache.ignite.cache.*; + +/** + * Queue tests with local cache. + */ +public class GridCacheLocalOffheapQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java index 3c90d0e..837c94b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java @@ -33,6 +33,11 @@ public class GridCacheLocalQueueApiSelfTest extends GridCacheQueueApiSelfAbstrac } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java index a2e24a3..b312a65 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java @@ -38,6 +38,11 @@ public class GridCacheLocalSetSelfTest extends GridCacheSetAbstractSelfTest { } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java new file mode 100644 index 0000000..f571f60 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.datastructures.partitioned; + +import org.apache.ignite.cache.*; + +/** + * Queue tests with partitioned atomic cache. + */ +public class GridCachePartitionedAtomicOffheapQueueApiSelfTest extends GridCachePartitionedAtomicQueueApiSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java new file mode 100644 index 0000000..9c31319 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ignite.internal.processors.cache.datastructures.partitioned; + +import org.apache.ignite.cache.*; + +/** + * + */ +public class GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest + extends GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java new file mode 100644 index 0000000..5efc2ed --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.datastructures.partitioned; + +import org.apache.ignite.cache.*; + +/** + * Queue multi node test. + */ +public class GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest extends GridCachePartitionedAtomicQueueMultiNodeSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java index 94c04a0..02fc8ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java @@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public class GridCachePartitionedAtomicQueueApiSelfTest extends GridCachePartitionedQueueApiSelfTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java index 0e9fdea..1b36a74 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java @@ -27,6 +27,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; public class GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest extends GridCachePartitionedQueueCreateMultiNodeSelfTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java index 19854be..1772d5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java @@ -28,6 +28,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; public class GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest extends GridCacheAbstractQueueFailoverDataConsistencySelfTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java index 68c0090..914f7d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java @@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public class GridCachePartitionedAtomicQueueMultiNodeSelfTest extends GridCachePartitionedQueueMultiNodeSelfTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java index ff24222..7451e38 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java @@ -27,6 +27,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; public class GridCachePartitionedAtomicQueueRotativeMultiNodeTest extends GridCachePartitionedQueueRotativeMultiNodeTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java index 9e2ffd2..771d685 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java @@ -27,6 +27,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public class GridCachePartitionedAtomicSetFailoverSelfTest extends GridCacheSetFailoverAbstractSelfTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java index 03c7b99..fdb344d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java @@ -34,6 +34,11 @@ public class GridCachePartitionedDataStructuresFailoverSelfTest } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java new file mode 100644 index 0000000..74bbd53 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.datastructures.partitioned; + +import org.apache.ignite.cache.*; +import org.apache.ignite.internal.processors.cache.datastructures.*; + +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; + +/** + * Failover tests for cache data structures. + */ +public class GridCachePartitionedOffheapDataStructuresFailoverSelfTest extends GridCachePartitionedDataStructuresFailoverSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } + + +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java new file mode 100644 index 0000000..0b28dd8 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.datastructures.partitioned; + +import org.apache.ignite.cache.*; + +/** + * Set failover tests. + */ +public class GridCachePartitionedOffheapSetFailoverSelfTest extends GridCachePartitionedSetFailoverSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java index c46e86b..41d8417 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java @@ -33,6 +33,11 @@ public class GridCachePartitionedQueueApiSelfTest extends GridCacheQueueApiSelfA } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 67491fa..4bbbf8c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -51,6 +51,11 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index 66e5e89..92b61f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -62,6 +62,11 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends IgniteCollection } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java index 8579c7a..495036e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java @@ -28,6 +28,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; public class GridCachePartitionedQueueFailoverDataConsistencySelfTest extends GridCacheAbstractQueueFailoverDataConsistencySelfTest { /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java index 8bda877..b3a575f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java @@ -33,6 +33,11 @@ public class GridCachePartitionedQueueJoinedNodeSelfTest extends GridCacheQueueJ } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java index 717517d..bdf7f95 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java @@ -33,6 +33,11 @@ public class GridCachePartitionedQueueMultiNodeSelfTest extends GridCacheQueueMu } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java index a9a5c87..0807d46 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java @@ -33,6 +33,11 @@ public class GridCachePartitionedQueueRotativeMultiNodeTest extends GridCacheQue } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java index 6cbf65e..68659c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java @@ -30,4 +30,9 @@ public class GridCachePartitionedSetFailoverSelfTest extends GridCacheSetFailove @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } + + /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java index c18553e..a76fec1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java @@ -33,6 +33,11 @@ public class GridCachePartitionedSetSelfTest extends GridCacheSetAbstractSelfTes } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java index 73826c7..f2dbdcf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java @@ -34,6 +34,11 @@ public class GridCacheReplicatedDataStructuresFailoverSelfTest } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java index 9c02b14..0a854cc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java @@ -33,6 +33,16 @@ public class GridCacheReplicatedQueueApiSelfTest extends GridCacheQueueApiSelfAb } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.OFFHEAP_TIERED; + } + + /** {@inheritDoc} */ + @Override protected long collectionOffHeapMaxMemory() { + return 0; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java index 6ac82b8..5969bcd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java @@ -33,6 +33,11 @@ public class GridCacheReplicatedQueueMultiNodeSelfTest extends GridCacheQueueMul } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java index 665562d..d013c2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java @@ -33,6 +33,11 @@ public class GridCacheReplicatedQueueRotativeMultiNodeTest extends GridCacheQueu } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java index adab5f6..897660c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java @@ -33,6 +33,11 @@ public class GridCacheReplicatedSetSelfTest extends GridCacheSetAbstractSelfTest } /** {@inheritDoc} */ + @Override protected CacheMemoryMode collectionMemoryMode() { + return CacheMemoryMode.ONHEAP_TIERED; + } + + /** {@inheritDoc} */ @Override protected CacheAtomicityMode collectionCacheAtomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index 99beb0f..729be28 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -42,7 +42,9 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheLocalSequenceApiSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalSetSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalAtomicSetSelfTest.class)); + suite.addTest(new TestSuite(GridCacheLocalAtomicOffheapSetSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalQueueApiSelfTest.class)); + suite.addTest(new TestSuite(GridCacheLocalOffheapQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class)); suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class)); @@ -60,17 +62,21 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class)); - // TODO: IGNITE-80. - //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class)); + + suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class)); suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class)); suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSetFailoverSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedOffheapSetFailoverSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicSetFailoverSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueRotativeMultiNodeTest.class)); @@ -82,6 +88,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { // TODO: GG-2699 //suite.addTest(new TestSuite(GridCachePartitionedDataStructuresFailoverSelfTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedOffheapDataStructuresFailoverSelfTest.class)); // TODO: GG-4807 Uncomment when fix // suite.addTest(new TestSuite(GridCacheQueueMultiNodeConsistencySelfTest.class));
