Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 17DA3200C61 for ; Mon, 10 Apr 2017 16:17:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 16425160B99; Mon, 10 Apr 2017 14:17:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9E4DF160BAB for ; Mon, 10 Apr 2017 16:17:53 +0200 (CEST) Received: (qmail 28212 invoked by uid 500); 10 Apr 2017 14:17:52 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 27962 invoked by uid 99); 10 Apr 2017 14:17:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Apr 2017 14:17:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 050D4E9432; Mon, 10 Apr 2017 14:17:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Mon, 10 Apr 2017 14:17:57 -0000 Message-Id: <9f24ea0b783443eca36667a4b1e0d36f@git.apache.org> In-Reply-To: <0c07b39632ab44c5b2d2df29072d73be@git.apache.org> References: <0c07b39632ab44c5b2d2df29072d73be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/17] ignite git commit: IGNITE-4535 - Add option to store deserialized values on-heap archived-at: Mon, 10 Apr 2017 14:17:56 -0000 http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxOffheapExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxOffheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxOffheapExpiryPolicyTest.java deleted file mode 100644 index c118457..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxOffheapExpiryPolicyTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.expiry; - -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * - */ -public class IgniteCacheTxOffheapExpiryPolicyTest extends IgniteCacheTxExpiryPolicyTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return CacheMemoryMode.OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedOffheapExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedOffheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedOffheapExpiryPolicyTest.java deleted file mode 100644 index 1ee7c3c..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedOffheapExpiryPolicyTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.expiry; - -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * - */ -public class IgniteCacheTxReplicatedOffheapExpiryPolicyTest extends IgniteCacheTxReplicatedExpiryPolicyTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return CacheMemoryMode.OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxWithStoreOffheapExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxWithStoreOffheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxWithStoreOffheapExpiryPolicyTest.java deleted file mode 100644 index 5ffd052..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxWithStoreOffheapExpiryPolicyTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.expiry; - -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * - */ -public class IgniteCacheTxWithStoreOffheapExpiryPolicyTest extends IgniteCacheTxWithStoreExpiryPolicyTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return CacheMemoryMode.OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java deleted file mode 100644 index cfb0f85..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.local; - -import org.apache.ignite.cache.CacheAtomicityMode; - -import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; - -/** - * Tests local cache in atomic mode with values being stored offheap. - */ -public class GridCacheLocalAtomicOffHeapFullApiSelfTest extends GridCacheLocalOffHeapFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected boolean txEnabled() { - return false; - } - - /** {@inheritDoc} */ - @Override protected boolean lockingEnabled() { - return false; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapTieredFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapTieredFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapTieredFullApiSelfTest.java deleted file mode 100644 index e7096b1..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapTieredFullApiSelfTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.local; - -import org.apache.ignite.cache.CacheMemoryMode; - -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; - -/** - * Tests local cache in atomic mode with off-heap tiered mode. - */ -public class GridCacheLocalAtomicOffHeapTieredFullApiSelfTest extends GridCacheLocalAtomicOffHeapFullApiSelfTest{ - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index 11e717d..1ad8d75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES; import static org.apache.ignite.cache.CacheMode.LOCAL; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; @@ -48,33 +47,20 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte /** Regular cache. */ private static IgniteCache cache; - /** Offheap cache. */ - private static IgniteCache cacheOffheap; - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); c.getTransactionConfiguration().setTxSerializableEnabled(true); - CacheConfiguration cc1 = new CacheConfiguration(); - - cc1.setName(CACHE_REGULAR); - cc1.setAtomicityMode(TRANSACTIONAL); - cc1.setCacheMode(LOCAL); - cc1.setWriteSynchronizationMode(FULL_SYNC); - cc1.setEvictSynchronized(false); + CacheConfiguration ccfg = new CacheConfiguration(); - CacheConfiguration cc2 = new CacheConfiguration(); + ccfg.setName(CACHE_REGULAR); + ccfg.setAtomicityMode(TRANSACTIONAL); + ccfg.setCacheMode(LOCAL); + ccfg.setWriteSynchronizationMode(FULL_SYNC); - cc2.setName(CACHE_OFFHEAP); - cc2.setAtomicityMode(TRANSACTIONAL); - cc2.setCacheMode(LOCAL); - cc2.setWriteSynchronizationMode(FULL_SYNC); - cc2.setMemoryMode(OFFHEAP_VALUES); - cc2.setOffHeapMaxMemory(100 * 1024 * 1024); - - c.setCacheConfiguration(cc1, cc2); + c.setCacheConfiguration(ccfg); return c; } @@ -84,7 +70,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte ignite = startGrid(1); cache = ignite.cache(CACHE_REGULAR); - cacheOffheap = ignite.cache(CACHE_OFFHEAP); } /** {@inheritDoc} */ @@ -92,7 +77,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte super.afterTestsStopped(); cache = null; - cacheOffheap = null; ignite = null; } @@ -116,24 +100,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte } /** - * Check whether offheap cache with byte array entry works correctly in PESSIMISTIC transaction. - * - * @throws Exception If failed. - */ - public void testPessimisticOffheap() throws Exception { - testTransaction(cacheOffheap, PESSIMISTIC, KEY_1, wrap(1)); - } - - /** - * Check whether offheap cache with byte array entry works correctly in PESSIMISTIC transaction. - * - * @throws Exception If failed. - */ - public void testPessimisticOffheapMixed() throws Exception { - testTransactionMixed(cacheOffheap, PESSIMISTIC, KEY_1, wrap(1), KEY_2, 1); - } - - /** * Check whether cache with byte array entry works correctly in OPTIMISTIC transaction. * * @throws Exception If failed. @@ -152,24 +118,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte } /** - * Check whether offheap cache with byte array entry works correctly in OPTIMISTIC transaction. - * - * @throws Exception If failed. - */ - public void testOptimisticOffheap() throws Exception { - testTransaction(cacheOffheap, OPTIMISTIC, KEY_1, wrap(1)); - } - - /** - * Check whether offheap cache with byte array entry works correctly in OPTIMISTIC transaction. - * - * @throws Exception If failed. - */ - public void testOptimisticOffheapMixed() throws Exception { - testTransactionMixed(cacheOffheap, OPTIMISTIC, KEY_1, wrap(1), KEY_2, 1); - } - - /** * Test byte array entry swapping. * * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapFullApiSelfTest.java deleted file mode 100644 index 22b3a03..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapFullApiSelfTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.local; - -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Tests local cache with values being stored offheap. - */ -public class GridCacheLocalOffHeapFullApiSelfTest extends GridCacheLocalFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return CacheMemoryMode.OFFHEAP_VALUES; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapTieredFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapTieredFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapTieredFullApiSelfTest.java deleted file mode 100644 index c6ce9da..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalOffHeapTieredFullApiSelfTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.local; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Tests local cache with off-heap tired memory mode. - */ -public class GridCacheLocalOffHeapTieredFullApiSelfTest extends GridCacheLocalOffHeapFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java deleted file mode 100644 index a9fd6cb..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java +++ /dev/null @@ -1,463 +0,0 @@ -/* - * 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.local; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; - -/** - * - */ -public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractTest { - /** Grid count. */ - private static final int GRID_CNT = 1; - - /** Keys count. */ - private static final int KEYS_CNT = 1000; - - /** Max size. */ - private static final int MAX_SIZE = 100; - - /** Entry size. */ - private static final int ENTRY_SIZE = 86; // Calculated as allocated size divided on entries count. - - /** Offheap max count. */ - private static final int OFFHEAP_MAX_CNT = KEYS_CNT / 2; - - /** Offheap max size. */ - private static final int OFFHEAP_MAX_SIZE = ENTRY_SIZE * OFFHEAP_MAX_CNT; - - /** Cache. */ - private IgniteCache cache; - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - - return cfg; - } - - /** - * @param memoryMode Cache memory mode. - * @param offHeapSize Max off-heap size. - * @param swapEnabled Swap enabled. - */ - private void createCache(CacheMemoryMode memoryMode, int offHeapSize, boolean swapEnabled) { - CacheConfiguration ccfg = defaultCacheConfiguration(); - - ccfg.setStatisticsEnabled(true); - - ccfg.setCacheMode(CacheMode.LOCAL); - ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC); - ccfg.setMemoryMode(memoryMode); - - ccfg.setOffHeapMaxMemory(offHeapSize); - - ccfg.setEvictionPolicy(new FifoEvictionPolicy(MAX_SIZE)); - - cache = grid(0).getOrCreateCache(ccfg); - } - - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - super.beforeTestsStarted(); - - startGrids(GRID_CNT); - } - - /** {@inheritDoc} */ - @Override protected void afterTestsStopped() throws Exception { - super.afterTestsStopped(); - - stopAllGrids(); - } - - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { - if (cache != null) - cache.destroy(); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapMetrics() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536"); - - createCache(CacheMemoryMode.ONHEAP_TIERED, 0, false); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0f, cache.localMetrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses()); - assertEquals(100f, cache.localMetrics().getOffHeapMissPercentage()); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapHits()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapHits()); - assertEquals(100 / 3.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 - (100 / 3.0), cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getOffHeapHits()); - assertEquals(100 * (KEYS_CNT * 2.0 - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(0, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapAndSwapMetrics() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536"); - - createCache(CacheMemoryMode.ONHEAP_TIERED, OFFHEAP_MAX_SIZE, true); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0f, cache.localMetrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses()); - assertEquals(100f, cache.localMetrics().getOffHeapMissPercentage()); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(KEYS_CNT - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses()); - assertEquals(100.0, cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapMisses()); - assertEquals(100.0, cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getOffHeapGets()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapHits()); - assertEquals(100 * OFFHEAP_MAX_CNT / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT - MAX_SIZE, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 * (KEYS_CNT * 4 - OFFHEAP_MAX_CNT - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(0, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapMetricsInOffHeapTiered() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536"); - - createCache(CacheMemoryMode.OFFHEAP_TIERED, 0, false); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPuts()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0f, cache.metrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100f, cache.metrics().getOffHeapMissPercentage()); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapEntriesCount()); - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapHits()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapHits()); - assertEquals(100 / 3.0, cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses()); - assertEquals(100 - (100 / 3.0), cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 4, cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapHits()); - assertEquals(100 * (KEYS_CNT * 2.0) / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(0, cache.metrics().getOffHeapEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapAndSwapMetricsInOffHeapTiered() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536"); - - createCache(CacheMemoryMode.OFFHEAP_TIERED, OFFHEAP_MAX_SIZE, true); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0f, cache.metrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100f, cache.metrics().getOffHeapMissPercentage()); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(KEYS_CNT - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0.0, cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses()); - assertEquals(100.0, cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0.0, cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapMisses()); - assertEquals(100.0, cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT - KEYS_CNT, - cache.metrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 4, cache.metrics().getOffHeapGets()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapHits()); - assertEquals(100 * OFFHEAP_MAX_CNT / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100 * (KEYS_CNT * 4 - OFFHEAP_MAX_CNT) / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapRemovals()); - - assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT - 2 * KEYS_CNT, cache.metrics().getOffHeapEvictions()); - assertEquals(0, cache.metrics().getOffHeapEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - } - - /** - * Prints stats. - */ - protected void printStat() { - System.out.println("!!! -------------------------------------------------------"); - System.out.println("!!! Puts: cache = " + cache.localMetrics().getCachePuts() + - ", offheap = " + cache.localMetrics().getOffHeapPuts()); - System.out.println("!!! Gets: cache = " + cache.localMetrics().getCacheGets() + - ", offheap = " + cache.localMetrics().getOffHeapGets()); - System.out.println("!!! Removes: cache = " + cache.localMetrics().getCacheRemovals() + - ", offheap = " + cache.localMetrics().getOffHeapRemovals()); - System.out.println("!!! Evictions: cache = " + cache.localMetrics().getCacheEvictions() + - ", offheap = " + cache.localMetrics().getOffHeapEvictions() + - ", swap = none" ); - System.out.println("!!! Hits: cache = " + cache.localMetrics().getCacheHits() + - ", offheap = " + cache.localMetrics().getOffHeapHits()); - System.out.println("!!! Hit(%): cache = " + cache.localMetrics().getCacheHitPercentage() + - ", offheap = " + cache.localMetrics().getOffHeapHitPercentage()); - System.out.println("!!! Misses: cache = " + cache.localMetrics().getCacheMisses() + - ", offheap = " + cache.localMetrics().getOffHeapMisses()); - System.out.println("!!! Miss(%): cache = " + cache.localMetrics().getCacheMissPercentage() + - ", offheap = " + cache.localMetrics().getOffHeapMissPercentage()); - System.out.println("!!! Entries: cache = " + cache.localMetrics().getSize() + - ", offheap = " + cache.localMetrics().getOffHeapEntriesCount()); - System.out.println("!!! Size: cache = none" + - ", offheap = " + cache.localMetrics().getOffHeapAllocatedSize()); - System.out.println(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java deleted file mode 100644 index 6b23991..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCacheAtomicOffHeapMultiJvmFullApiSelfTest extends - GridCacheAtomicOffHeapMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java deleted file mode 100644 index bae0fa0..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest - extends GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } - - /** {@inheritDoc} */ - @Override public void testLocalClearKeys() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1107"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java new file mode 100644 index 0000000..2a5c2da --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.multijvm; + +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOnheapMultiNodeFullApiSelfTest; + +public class GridCacheAtomicOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicOnheapMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected boolean isMultiJvm() { + return true; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.java new file mode 100644 index 0000000..af69e66 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.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.multijvm; + +import org.apache.ignite.cache.CacheAtomicWriteOrderMode; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest; + +public class GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return CacheAtomicWriteOrderMode.PRIMARY; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java deleted file mode 100644 index 2222ada..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest extends - GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java deleted file mode 100644 index 0bfdfea..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest - extends GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected boolean isMultiJvm() { - return true; - } - - /** {@inheritDoc} */ - @Override public void testLocalClearKeys() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1107"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java deleted file mode 100644 index f5603a2..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest - extends GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } - - /** {@inheritDoc} */ - @Override public void testLocalClearKeys() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1107"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java new file mode 100644 index 0000000..0ce6ada --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.multijvm; + +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest; + +public class GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected boolean isMultiJvm() { + return true; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java deleted file mode 100644 index 121d453..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest extends - GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java deleted file mode 100644 index fbe6098..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest - extends GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } - - /** {@inheritDoc} */ - @Override public void testLocalClearKeys() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1107"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java new file mode 100644 index 0000000..e2d716f --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.multijvm; + +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest; + +public class GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected boolean isMultiJvm() { + return true; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java deleted file mode 100644 index 73abe6d..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCachePartitionedOffHeapMultiJvmFullApiSelfTest extends - GridCachePartitionedOffHeapMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java deleted file mode 100644 index 7b7d64f..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapTieredMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest - extends GridCachePartitionedOffHeapTieredMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } - - /** {@inheritDoc} */ - @Override public void testLocalClearKeys() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1107"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java new file mode 100644 index 0000000..bdde212 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.multijvm; + +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOnheapMultiNodeFullApiSelfTest; + +public class GridCachePartitionedOnheapMultiJvmFullApiSelfTest extends GridCachePartitionedOnheapMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected boolean isMultiJvm() { + return true; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java deleted file mode 100644 index 81d7e9b..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest extends - GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java deleted file mode 100644 index 6ecf12b..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.multijvm; - -import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest; - -/** - * Multi-JVM tests. - */ -public class GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest - extends GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - protected boolean isMultiJvm() { - return true; - } - - /** {@inheritDoc} */ - @Override public void testLocalClearKeys() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1107"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java new file mode 100644 index 0000000..c609ce7 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.multijvm; + +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOnheapMultiNodeFullApiSelfTest; + +public class GridCacheReplicatedOnheapMultiJvmFullApiSelfTest extends GridCacheReplicatedOnheapMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected boolean isMultiJvm() { + return true; + } +}