Repository: incubator-ignite Updated Branches: refs/heads/ignite-63 b458bd090 -> b89b472d3
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java deleted file mode 100644 index 43e97a1..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java +++ /dev/null @@ -1,173 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.transactions.*; -import org.apache.ignite.internal.util.typedef.*; - -import java.util.*; - -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; - -/** - * Multi-node test for group locking. - */ -public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest extends - GridCacheGroupLockPartitionedAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 3; - } - - /** - * @throws Exception If failed. - */ - public void testNonLocalKeyOptimistic() throws Exception { - checkNonLocalKey(OPTIMISTIC); - } - - /** - * @throws Exception If failed. - */ - public void testNonLocalKeyPessimistic() throws Exception { - checkNonLocalKey(PESSIMISTIC); - } - - /** - * @throws Exception If failed. - */ - private void checkNonLocalKey(IgniteTxConcurrency concurrency) throws Exception { - final UUID key = primaryKeyForCache(grid(1)); - - GridCache<Object, Object> cache = grid(0).cache(null); - - IgniteTx tx = null; - try { - tx = cache.txStartAffinity(key, concurrency, READ_COMMITTED, 0, 2); - - cache.put(new GridCacheAffinityKey<>("1", key), "2"); - - tx.commit(); - - fail("Exception should be thrown."); - } - catch (IgniteCheckedException ignored) { - // Expected exception. - } - finally { - if (tx != null) - tx.close(); - - assertNull(cache.tx()); - } - } - - /** - * @throws Exception If failed. - */ - public void testNearReadersUpdateWithAffinityReaderOptimistic() throws Exception { - checkNearReadersUpdate(true, OPTIMISTIC); - } - - /** - * @throws Exception If failed. - */ - public void testNearReadersUpdateWithAffinityReaderPessimistic() throws Exception { - checkNearReadersUpdate(true, PESSIMISTIC); - } - - /** - * @throws Exception If failed. - */ - public void testNearReaderUpdateWithoutAffinityReaderOptimistic() throws Exception { - checkNearReadersUpdate(false, OPTIMISTIC); - } - - /** - * @throws Exception If failed. - */ - public void testNearReaderUpdateWithoutAffinityReaderPessimistic() throws Exception { - checkNearReadersUpdate(false, PESSIMISTIC); - } - - /** - * @throws Exception If failed. - */ - private void checkNearReadersUpdate(boolean touchAffKey, IgniteTxConcurrency concurrency) throws Exception { - UUID affinityKey = primaryKeyForCache(grid(0)); - - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); - GridCacheAffinityKey<String> key3 = new GridCacheAffinityKey<>("key3", affinityKey); - - grid(0).cache(null).put(affinityKey, "aff"); - - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); - - cache.putAll(F.asMap( - key1, "val1", - key2, "val2", - key3, "val3") - ); - - Ignite reader = null; - - for (int i = 0; i < gridCount(); i++) { - if (!grid(i).cache(null).affinity().isPrimaryOrBackup(grid(i).localNode(), affinityKey)) - reader = grid(i); - } - - assert reader != null; - - info(">>> Reader is " + reader.cluster().localNode().id()); - - // Add reader. - if (touchAffKey) - assertEquals("aff", reader.cache(null).get(affinityKey)); - - assertEquals("val1", reader.cache(null).get(key1)); - assertEquals("val2", reader.cache(null).get(key2)); - assertEquals("val3", reader.cache(null).get(key3)); - - if (nearEnabled()) { - assertEquals("val1", reader.cache(null).peek(key1)); - assertEquals("val2", reader.cache(null).peek(key2)); - assertEquals("val3", reader.cache(null).peek(key3)); - } - - try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 3)) { - cache.putAll(F.asMap( - key1, "val01", - key2, "val02", - key3, "val03") - ); - - tx.commit(); - } - - if (nearEnabled()) { - assertEquals("val01", reader.cache(null).peek(key1)); - assertEquals("val02", reader.cache(null).peek(key2)); - assertEquals("val03", reader.cache(null).peek(key3)); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java deleted file mode 100644 index 8e962f2..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java +++ /dev/null @@ -1,33 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; - -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Multi node test for disabled near cache. - */ -public class GridCachePartitionedNearDisabledFullApiSelfTest extends GridCachePartitionedFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java deleted file mode 100644 index 2f34631..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java +++ /dev/null @@ -1,120 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.configuration.*; -import org.gridgain.grid.kernal.processors.cache.*; - -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; - -/** - * Metrics test for partitioned cache with disabled near cache. - */ -public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAbstractSelfTest { - /** */ - private static final int GRID_CNT = 2; - - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); - - return cfg; - } - - /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setCacheMode(PARTITIONED); - cfg.setBackups(gridCount() - 1); - cfg.setPreloadMode(SYNC); - cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setDistributionMode(PARTITIONED_ONLY); - - return cfg; - } - - /** {@inheritDoc} */ - @Override protected int gridCount() { - return GRID_CNT; - } - - // TODO: extend from GridCacheTransactionalAbstractMetricsSelfTest and uncomment: - -// /** {@inheritDoc} */ -// @Override protected int expectedReadsPerPut(boolean isPrimary) { -// return 1; -// } -// -// /** {@inheritDoc} */ -// @Override protected int expectedMissesPerPut(boolean isPrimary) { -// return 1; -// } - - /** - * @throws Exception If failed. - */ - public void _testGettingRemovedKey() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); - - cache.put(0, 0); - - for (int i = 0; i < gridCount(); i++) { - Ignite g = grid(i); - - // TODO: getting of removed key will produce 3 inner read operations. - g.cache(null).removeAll(); - - // TODO: getting of removed key will produce inner write and 4 inner read operations. - //g.cache(null).remove(0); - - assert g.cache(null).isEmpty(); - - g.cache(null).resetMetrics(); - } - - assertNull("Value is not null for key: " + 0, cache.get(0)); - - // Check metrics for the whole cache. - long writes = 0; - long reads = 0; - long hits = 0; - long misses = 0; - - for (int i = 0; i < gridCount(); i++) { - GridCacheMetrics m = grid(i).cache(null).metrics(); - - writes += m.writes(); - reads += m.reads(); - hits += m.hits(); - misses += m.misses(); - } - - assertEquals(0, writes); - assertEquals(1, reads); - assertEquals(0, hits); - assertEquals(1, misses); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java deleted file mode 100644 index 62e5c14..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java +++ /dev/null @@ -1,34 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; - -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Multi node test for disabled near cache. - */ -public class GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest - extends GridCachePartitionedMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java deleted file mode 100644 index fa5ce3f..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java +++ /dev/null @@ -1,34 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; - -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Multi node test for disabled near cache. - */ -public class GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest - extends GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapFullApiSelfTest.java deleted file mode 100644 index ae5dc2b..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapFullApiSelfTest.java +++ /dev/null @@ -1,29 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -/** - * Tests colocated cache with values being stored off-heap. - */ -public class GridCachePartitionedNearDisabledOffHeapFullApiSelfTest extends - GridCachePartitionedNearDisabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected boolean offHeapValues() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.java deleted file mode 100644 index db21ae9..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.java +++ /dev/null @@ -1,29 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -/** - * Tests colocated cache with values being stored off-heap. - */ -public class GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest - extends GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected boolean offHeapValues() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java deleted file mode 100644 index 9b88818..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; - -/** - * Tests transaction consistency when originating node fails. - */ -public class GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest - extends GridCachePartitionedTxOriginatingNodeFailureSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.PARTITIONED_ONLY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest.java deleted file mode 100644 index aaf396e..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest.java +++ /dev/null @@ -1,29 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -/** - * Tests for byte array values in PARTITIONED-ONLY caches with P2P disabled. - */ -public class GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest extends - GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest { - /** {@inheritDoc} */ - @Override protected boolean peerClassLoading() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java deleted file mode 100644 index 3d8f738..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java +++ /dev/null @@ -1,29 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -/** - * Tests for byte array values in PARTITIONED-ONLY caches with P2P enabled. - */ -public class GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest extends - GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest{ - /** {@inheritDoc} */ - @Override protected boolean peerClassLoading() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java deleted file mode 100644 index 3f104a4..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; - -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Tests cache with near cache disabled. - */ -public class GridCachePartitionedOnlyProjectionSelfTest extends GridCachePartitionedProjectionSelfTest { - @Override protected GridCacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java deleted file mode 100644 index 3478477..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java +++ /dev/null @@ -1,124 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.gridgain.grid.kernal.processors.cache.distributed.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; -import org.apache.ignite.internal.util.typedef.*; - -import java.util.*; - -import static org.apache.ignite.cache.GridCacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; - -/** - * - */ -public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadEventsAbstractSelfTest { - /** */ - private boolean replicatedAffinity = true; - - /** */ - private GridCachePreloadMode preloadMode = SYNC; - - /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration() { - CacheConfiguration cacheCfg = super.cacheConfiguration(); - - if (replicatedAffinity) - // replicate entries to all nodes - cacheCfg.setAffinity(new GridCacheAffinityFunction() { - /** {@inheritDoc} */ - @Override public void reset() { - } - - /** {@inheritDoc} */ - @Override public int partitions() { - return 1; - } - - /** {@inheritDoc} */ - @Override public int partition(Object key) { - return 0; - } - - /** {@inheritDoc} */ - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext affCtx) { - List<ClusterNode> nodes = new ArrayList<>(affCtx.currentTopologySnapshot()); - - return Collections.singletonList(nodes); - } - - /** {@inheritDoc} */ - @Override public void removeNode(UUID nodeId) { - } - }); - - cacheCfg.setPreloadMode(preloadMode); - - return cacheCfg; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode getCacheMode() { - return PARTITIONED; - } - - /** - * Test events fired from - * {@link GridDhtForceKeysFuture} - * - * @throws Exception if failed. - */ - public void testForcePreload() throws Exception { - replicatedAffinity = false; - preloadMode = NONE; - - Ignite g1 = startGrid("g1"); - - Collection<Integer> keys = new HashSet<>(); - - GridCache<Integer, String> cache = g1.cache(null); - - for (int i = 0; i < 100; i++) { - keys.add(i); - cache.put(i, "val"); - } - - Ignite g2 = startGrid("g2"); - - Map<ClusterNode, Collection<Object>> keysMap = g1.cache(null).affinity().mapKeysToNodes(keys); - Collection<Object> g2Keys = keysMap.get(g2.cluster().localNode()); - - assertNotNull(g2Keys); - assertFalse("There are no keys assigned to g2", g2Keys.isEmpty()); - - for (Object key : g2Keys) - g2.cache(null).put(key, "changed val"); - - Collection<IgniteEvent> evts = g2.events().localQuery(F.<IgniteEvent>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); - - checkPreloadEvents(evts, g2, g2Keys); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java deleted file mode 100644 index c2ef3a6..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ /dev/null @@ -1,596 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.transactions.*; -import org.gridgain.grid.kernal.processors.cache.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; - -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.cache.GridCacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.events.IgniteEventType.*; - -/** - * Tests that new transactions do not start until partition exchange is completed. - */ -public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstractTest { - /** Partition does not belong to node. */ - private static final int PARTITION_READER = 0; - - /** Node is primary for partition. */ - private static final int PARTITION_PRIMARY = 1; - - /** Node is backup for partition. */ - private static final int PARTITION_BACKUP = 2; - - /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration c = super.getConfiguration(gridName); - - // Discovery. - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(ipFinder); - - c.setDiscoverySpi(disco); - - CacheConfiguration cc = defaultCacheConfiguration(); - - cc.setCacheMode(PARTITIONED); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 18)); - cc.setBackups(1); - cc.setPreloadMode(SYNC); - cc.setDistributionMode(PARTITIONED_ONLY); - - c.setCacheConfiguration(cc); - - return c; - } - - /** - * @throws Exception If failed. - */ - public void testNearTxNodeJoined() throws Exception { - checkTxNodeJoined(PARTITION_READER); - } - - /** - * @throws Exception If failed. - */ - public void testPrimaryTxNodeJoined() throws Exception { - checkTxNodeJoined(PARTITION_PRIMARY); - } - - /** - * @throws Exception If failed. - */ - public void testBackupTxNodeJoined() throws Exception { - checkTxNodeJoined(PARTITION_BACKUP); - } - - /** - * @throws Exception If failed. - */ - public void testNearTxNodeLeft() throws Exception { - checkTxNodeLeft(PARTITION_READER); - } - - /** - * @throws Exception If failed. - */ - public void testPrimaryTxNodeLeft() throws Exception { - // This test does not make sense because if node is primary for some partition, - // it will reside on node until node leaves grid. - } - - /** - * @throws Exception If failed. - */ - public void testBackupTxNodeLeft() throws Exception { - checkTxNodeLeft(PARTITION_BACKUP); - } - - /** - * @throws Exception If failed. - */ - public void testExplicitLocks() throws Exception { - try { - startGridsMultiThreaded(2); - - GridKernal[] nodes = new GridKernal[] {(GridKernal)grid(0), (GridKernal)grid(1)}; - - Collection<IgniteFuture> futs = new ArrayList<>(); - - final CountDownLatch startLatch = new CountDownLatch(1); - - for (final GridKernal node : nodes) { - List<Integer> parts = partitions(node, PARTITION_PRIMARY); - - Map<Integer, Integer> keyMap = keysFor(node, parts); - - for (final Integer key : keyMap.values()) { - futs.add(multithreadedAsync(new Runnable() { - @Override public void run() { - try { - try { - node.jcache(null).lock(key).lock(); - - info(">>> Acquired explicit lock for key: " + key); - - startLatch.await(); - - info(">>> Acquiring explicit lock for key: " + key * 10); - - node.jcache(null).lock(key * 10).lock(); - - info(">>> Releasing locks [key1=" + key + ", key2=" + key * 10 + ']'); - } - finally { - node.cache(null).unlock(key * 10); - node.cache(null).unlock(key); - } - } - catch (IgniteCheckedException e) { - info(">>> Failed to perform lock [key=" + key + ", e=" + e + ']'); - } - catch (InterruptedException ignored) { - info(">>> Interrupted while waiting for start latch."); - - Thread.currentThread().interrupt(); - } - } - }, 1)); - } - } - - IgniteFuture<?> startFut = multithreadedAsync(new Runnable() { - @Override public void run() { - try { - startGrid(2); - - info(">>> Started grid2."); - } - catch (Exception e) { - info(">>> Failed to start grid: " + e); - } - } - }, 1); - - U.sleep(5000); - - assertFalse(startFut.isDone()); - - info(">>> Waiting for all locks to be released."); - - startLatch.countDown(); - - for (IgniteFuture fut : futs) - fut.get(1000); - - startFut.get(); - } - finally { - stopAllGrids(); - } - } - - /** - * @throws Exception If failed. - */ - private void checkTxNodeJoined(int nodeType) throws Exception { - startGrids(3); - - final GridKernal g0 = (GridKernal)grid(0); - final GridKernal g1 = (GridKernal)grid(1); - final GridKernal g2 = (GridKernal)grid(2); - - GridKernal[] nodes = new GridKernal[] {g0, g1, g2}; - - try { - info(">>> Started nodes [g0=" + g0.localNode().id() + ", g1=" + g1.localNode().id() + ", g2=" + - g2.localNode().id() + ']'); - - final CountDownLatch commitLatch = new CountDownLatch(1); - - Collection<IgniteFuture> futs = new ArrayList<>(); - - for (final GridKernal node : nodes) { - printDistribution(node); - - // Get partitions that does not reside on g0. - List<Integer> parts = partitions(node, nodeType); - - info(">>> Partitions for node [nodeId=" + node.localNode().id() + ", parts=" + parts + - ", type=" + nodeType + ']'); - - final Map<Integer, Integer> keysMap = keysFor(node, parts); - - info(">>> Generated keys for node [nodeId=" + node.localNode().id() + ", keysMap=" + keysMap + ']'); - - // Start tx for every key in map. - for (final Integer key : keysMap.values()) { - futs.add(multithreadedAsync(new Runnable() { - @Override public void run() { - GridCache<Integer, Integer> cache = node.cache(null); - - try { - try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { - cache.put(key, key); - - info(">>> Locked key, waiting for latch: " + key); - - commitLatch.await(); - - tx.commit(); - } - } - catch (IgniteCheckedException e) { - info("Failed to run tx for key [key=" + key + ", e=" + e + ']'); - } - catch (InterruptedException ignored) { - Thread.currentThread().interrupt(); - - info("Got interrupted while waiting for commit latch: " + key); - } - } - }, 1)); - } - } - - final CountDownLatch joinLatch = new CountDownLatch(1); - - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt.type() == EVT_NODE_JOINED; - - info(">>> Node has joined: " + evt.node().id()); - - joinLatch.countDown(); - - g0.events().stopLocalListen(this, EVT_NODE_JOINED); - - return true; - } - }, EVT_NODE_JOINED); - - // Now start new node. We do it in a separate thread since startGrid - // should block until partition exchange completes. - IgniteFuture startFut = multithreadedAsync(new Runnable() { - @Override public void run() { - try { - Ignite g3 = startGrid(3); - - info(">>> Started grid g3: " + g3.cluster().localNode().id()); - } - catch (Exception e) { - info(">>> Failed to start 4th node: " + e); - } - } - }, 1); - - joinLatch.await(); - - Thread.sleep(100); - - assertFalse("Node was able to join the grid while there exist pending transactions.", startFut.isDone()); - - // Now check that new transactions will wait for new topology version to become available. - Collection<IgniteFuture> txFuts = new ArrayList<>(nodes.length); - - for (final Ignite g : nodes) { - txFuts.add(multithreadedAsync(new Runnable() { - @Override public void run() { - GridCache<Integer, Integer> cache = g.cache(null); - - int key = (int)Thread.currentThread().getId(); - - try { - try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { - // This method should block until all previous transactions are completed. - cache.put(key, key); - - info(">>> Acquired second lock for key: " + key); - - tx.commit(); - } - } - catch (IgniteCheckedException e) { - info(">>> Failed to execute tx on new topology [key=" + key + ", e=" + e + ']'); - } - } - }, 1)); - } - - Thread.sleep(500); - - for (IgniteFuture txFut : txFuts) - assertFalse("New transaction was completed before new node joined topology", txFut.isDone()); - - info(">>> Committing pending transactions."); - - commitLatch.countDown(); - - for (IgniteFuture fut : futs) - fut.get(1000); - - startFut.get(1000); - - for (IgniteFuture txFut : txFuts) - txFut.get(1000); - } - finally { - stopAllGrids(); - } - } - - /** - * @throws Exception If failed. - */ - private void checkTxNodeLeft(int nodeType) throws Exception { - startGridsMultiThreaded(4); - - final GridKernal g0 = (GridKernal)grid(0); - final GridKernal g1 = (GridKernal)grid(1); - final GridKernal g2 = (GridKernal)grid(2); - final GridKernal g3 = (GridKernal)grid(3); - - GridKernal[] nodes = new GridKernal[] {g0, g1, g2}; - - final CountDownLatch commitLatch = new CountDownLatch(1); - - UUID leftNodeId = g3.localNode().id(); - - try { - info(">>> Started nodes [g0=" + g0.localNode().id() + ", g1=" + g1.localNode().id() + ", g2=" + - g2.localNode().id() + ", g3=" + g3.localNode().id() + ']'); - - Collection<IgniteFuture> futs = new ArrayList<>(); - - printDistribution(g3); - - for (final GridKernal node : nodes) { - printDistribution(node); - - // Get partitions that does not reside on g0. - List<Integer> parts = partitions(node, nodeType); - - info(">>> Partitions for node [nodeId=" + node.localNode().id() + ", parts=" + parts + - ", type=" + nodeType + ']'); - - final Map<Integer, Integer> keysMap = keysFor(node, parts); - - info(">>> Generated keys for node [nodeId=" + node.localNode().id() + ", keysMap=" + keysMap + ']'); - - // Start tx for every key in map. - for (final Integer key : keysMap.values()) { - futs.add(multithreadedAsync(new Runnable() { - @Override public void run() { - GridCache<Integer, Integer> cache = node.cache(null); - - try { - try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { - cache.put(key, key); - - commitLatch.await(); - - tx.commit(); - } - } - catch (IgniteCheckedException e) { - info("Failed to run tx for key [key=" + key + ", e=" + e + ']'); - } - catch (InterruptedException ignored) { - Thread.currentThread().interrupt(); - - info("Got interrupted while waiting for commit latch: " + key); - } - } - }, 1)); - } - } - - final CountDownLatch leaveLatch = new CountDownLatch(1); - - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED; - - info(">>> Node has left: " + evt.node().id()); - - leaveLatch.countDown(); - - g0.events().stopLocalListen(this, EVT_NODE_LEFT, EVT_NODE_FAILED); - - return true; - } - }, EVT_NODE_LEFT, EVT_NODE_FAILED); - - // Now stop the node. - stopGrid(getTestGridName(3), true); - - leaveLatch.await(); - - // Now check that new transactions will wait for new topology version to become available. - Collection<IgniteFuture> txFuts = new ArrayList<>(nodes.length); - - for (final Ignite g : nodes) { - txFuts.add(multithreadedAsync(new Runnable() { - @Override public void run() { - GridCache<Integer, Integer> cache = g.cache(null); - - int key = (int)Thread.currentThread().getId(); - - try { - try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { - // This method should block until all previous transactions are completed. - cache.put(key, key); - - tx.commit(); - } - } - catch (IgniteCheckedException e) { - info(">>> Failed to execute tx on new topology [key=" + key + ", e=" + e + ']'); - } - } - }, 1)); - } - - Thread.sleep(500); - - for (IgniteFuture txFut : txFuts) - assertFalse("New transaction was completed before old transactions were committed", txFut.isDone()); - - info(">>> Committing pending transactions."); - - commitLatch.countDown(); - - for (IgniteFuture fut : futs) - fut.get(1000); - - for (IgniteFuture txFut : txFuts) - txFut.get(1000); - - for (int i = 0; i < 3; i++) { - GridCacheConsistentHashAffinityFunction affinity = (GridCacheConsistentHashAffinityFunction)((GridKernal)grid(i)) - .internalCache().context().config().getAffinity(); - - ConcurrentMap addedNodes = U.field(affinity, "addedNodes"); - - assertFalse(addedNodes.containsKey(leftNodeId)); - } - } - finally { - info(">>> Shutting down the test."); - - commitLatch.countDown(); - - U.sleep(1000); - - stopAllGrids(); - } - } - - /** - * Prints partition distribution for node. - * - * @param node Node to detect partitions for. - */ - private void printDistribution(GridKernal node) { - List<Integer> primary = partitions(node, PARTITION_PRIMARY); - List<Integer> backup = partitions(node, PARTITION_BACKUP); - List<Integer> reader = partitions(node, PARTITION_READER); - - info(">>> Partitions distribution calculated [nodeId=" + node.localNode().id() + ", primary=" + primary + - ", backup=" + backup + ", reader=" + reader + ']'); - } - - /** - * For each partition given calculates a key that belongs to this partition. Generated keys are - * in ascending order. - * - * @param node Node to use. - * @param parts Partitions to get keys for. - * @return Map from partition to key. - */ - private Map<Integer, Integer> keysFor(GridKernal node, Iterable<Integer> parts) { - GridCacheContext<Object, Object> ctx = node.internalCache().context(); - - Map<Integer, Integer> res = new HashMap<>(); - - int key = 0; - - for (Integer part : parts) { - while (ctx.affinity().partition(key) != part) - key++; - - res.put(part, key); - } - - return res; - } - - /** - * Gets partitions that are not resided on given node (neither as primary nor as backup). - * - * @param node Node to calculate partitions for. - * @return List of partitions. - */ - private List<Integer> partitions(Ignite node, int partType) { - List<Integer> res = new LinkedList<>(); - - GridCacheAffinity<Object> aff = node.cache(null).affinity(); - - for (int partCnt = aff.partitions(), i = 0; i < partCnt; i++) { - ClusterNode locNode = node.cluster().localNode(); - - switch (partType) { - // Near, partition should not belong to node. - case PARTITION_READER: { - if (!aff.isPrimaryOrBackup(locNode, i)) - res.add(i); - - break; - } - - // Node should be primary for partition. - case PARTITION_PRIMARY: { - if (aff.isPrimary(locNode, i)) - res.add(i); - - break; - } - - // Node should be backup for partition. - case PARTITION_BACKUP: { - if (aff.isPrimaryOrBackup(locNode, i) && !aff.isPrimary(locNode, i)) - res.add(i); - - break; - } - - default: { - assert false; - } - } - } - - return res; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.java deleted file mode 100644 index 761d8eb..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.java +++ /dev/null @@ -1,29 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -/** - * Test for transform put with batch update enabled. - */ -public class GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest - extends GridCacheAbstractTransformWriteThroughSelfTest { - /** {@inheritDoc} */ - @Override protected boolean batchUpdate() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java deleted file mode 100644 index 2e1b644..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java +++ /dev/null @@ -1,161 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.*; -import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.kernal.processors.cache.distributed.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; - -import java.util.*; - -/** - * Tests transaction consistency when originating node fails. - */ -public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends - IgniteTxOriginatingNodeFailureAbstractSelfTest { - /** */ - private static final int BACKUP_CNT = 2; - - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.NEAR_PARTITIONED; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return GridCacheMode.PARTITIONED; - } - - /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); - - ccfg.setBackups(BACKUP_CNT); - - return ccfg; - } - - /** {@inheritDoc} */ - @Override protected Class<?> ignoreMessageClass() { - return GridNearTxPrepareRequest.class; - } - - /** - * @throws Exception If failed. - */ - public void testTxFromPrimary() throws Exception { - GridCacheAdapter<Integer, String> cache = ((GridKernal)grid(originatingNode())).internalCache(); - - ClusterNode txNode = grid(originatingNode()).localNode(); - - Integer key = null; - - for (int i = 0; i < Integer.MAX_VALUE; i++) { - if (cache.affinity().isPrimary(txNode, i)) { - key = i; - - break; - } - } - - assertNotNull(key); - - testTxOriginatingNodeFails(Collections.singleton(key), false); - } - - /** - * @throws Exception If failed. - */ - public void testTxFromBackup() throws Exception { - GridCacheAdapter<Integer, String> cache = ((GridKernal)grid(originatingNode())).internalCache(); - - ClusterNode txNode = grid(originatingNode()).localNode(); - - Integer key = null; - - for (int i = 0; i < Integer.MAX_VALUE; i++) { - if (cache.affinity().isBackup(txNode, i)) { - key = i; - - break; - } - } - - assertNotNull(key); - - testTxOriginatingNodeFails(Collections.singleton(key), false); - } - - /** - * @throws Exception If failed. - */ - public void testTxFromNotColocated() throws Exception { - GridCacheAdapter<Integer, String> cache = ((GridKernal)grid(originatingNode())).internalCache(); - - ClusterNode txNode = grid(originatingNode()).localNode(); - - Integer key = null; - - for (int i = 0; i < Integer.MAX_VALUE; i++) { - if (!cache.affinity().isPrimary(txNode, i) && !cache.affinity().isBackup(txNode, i)) { - key = i; - - break; - } - } - - assertNotNull(key); - - testTxOriginatingNodeFails(Collections.singleton(key), false); - } - - /** - * @throws Exception If failed. - */ - public void testTxAllNodes() throws Exception { - GridCacheAdapter<Integer, String> cache = ((GridKernal)grid(originatingNode())).internalCache(); - - List<ClusterNode> allNodes = new ArrayList<>(GRID_CNT); - - for (int i = 0; i < GRID_CNT; i++) - allNodes.add(grid(i).localNode()); - - Collection<Integer> keys = new ArrayList<>(); - - for (int i = 0; i < Integer.MAX_VALUE && !allNodes.isEmpty(); i++) { - for (Iterator<ClusterNode> iter = allNodes.iterator(); iter.hasNext();) { - ClusterNode node = iter.next(); - - if (cache.affinity().isPrimary(node, i)) { - keys.add(i); - - iter.remove(); - - break; - } - } - } - - assertEquals(GRID_CNT, keys.size()); - - testTxOriginatingNodeFails(keys, false); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java deleted file mode 100644 index b5cc103..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java +++ /dev/null @@ -1,151 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.consistenthash.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.junits.common.*; - -import java.util.*; - -import static org.apache.ignite.cache.GridCacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; - -/** - */ -public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstractTest { - /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); - - cfg.setCacheConfiguration(cacheConfiguration()); - - return cfg; - } - - /** - * @return Cache configuration. - */ - protected CacheConfiguration cacheConfiguration() { - CacheConfiguration cacheCfg = defaultCacheConfiguration(); - cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setPreloadMode(SYNC); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10)); - cacheCfg.setBackups(0); - return cacheCfg; - } - - /** - * @throws Exception if failed. - */ - public void testUnloadEvents() throws Exception { - final Ignite g1 = startGrid("g1"); - - Collection<Integer> allKeys = new ArrayList<>(100); - - GridCache<Integer, String> cache = g1.cache(null); - - for (int i = 0; i < 100; i++) { - cache.put(i, "val"); - allKeys.add(i); - } - - Ignite g2 = startGrid("g2"); - - Map<ClusterNode, Collection<Object>> keysMap = g1.cache(null).affinity().mapKeysToNodes(allKeys); - Collection<Object> g2Keys = keysMap.get(g2.cluster().localNode()); - - assertNotNull(g2Keys); - assertFalse("There are no keys assigned to g2", g2Keys.isEmpty()); - - Thread.sleep(5000); - - Collection<IgniteEvent> objEvts = - g1.events().localQuery(F.<IgniteEvent>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_UNLOADED); - - checkObjectUnloadEvents(objEvts, g1, g2Keys); - - Collection <IgniteEvent> partEvts = - g1.events().localQuery(F.<IgniteEvent>alwaysTrue(), EVT_CACHE_PRELOAD_PART_UNLOADED); - - checkPartitionUnloadEvents(partEvts, g1, dht(g2.cache(null)).topology().localPartitions()); - } - - /** - * @param evts Events. - * @param g Grid. - * @param keys Keys. - */ - private void checkObjectUnloadEvents(Collection<IgniteEvent> evts, Ignite g, Collection<?> keys) { - assertEquals(keys.size(), evts.size()); - - for (IgniteEvent evt : evts) { - IgniteCacheEvent cacheEvt = ((IgniteCacheEvent)evt); - - assertEquals(EVT_CACHE_PRELOAD_OBJECT_UNLOADED, cacheEvt.type()); - assertEquals(g.cache(null).name(), cacheEvt.cacheName()); - assertEquals(g.cluster().localNode().id(), cacheEvt.node().id()); - assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id()); - assertTrue("Unexpected key: " + cacheEvt.key(), keys.contains(cacheEvt.key())); - } - } - - /** - * @param evts Events. - * @param g Grid. - * @param parts Parts. - */ - private void checkPartitionUnloadEvents(Collection<IgniteEvent> evts, Ignite g, - Collection<GridDhtLocalPartition<Object, Object>> parts) { - assertEquals(parts.size(), evts.size()); - - for (IgniteEvent evt : evts) { - IgniteCachePreloadingEvent unloadEvt = (IgniteCachePreloadingEvent)evt; - - final int part = unloadEvt.partition(); - - assertNotNull("Unexpected partition: " + part, F.find(parts, null, - new IgnitePredicate<GridDhtLocalPartition<Object, Object>>() { - @Override - public boolean apply(GridDhtLocalPartition<Object, Object> e) { - return e.id() == part; - } - })); - - assertEquals(g.cache(null).name(), unloadEvt.cacheName()); - assertEquals(g.cluster().localNode().id(), unloadEvt.node().id()); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.java deleted file mode 100644 index b2a2c18..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; -import org.gridgain.grid.kernal.processors.cache.distributed.*; - -/** - * - */ -public class IgniteTxConsistencyColocatedRestartSelfTest extends IgniteTxConsistencyRestartAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return GridCacheMode.PARTITIONED; - } - - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode partitionDistributionMode() { - return GridCacheDistributionMode.PARTITIONED_ONLY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java deleted file mode 100644 index 16c4293..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java +++ /dev/null @@ -1,79 +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.gridgain.grid.kernal.processors.cache.distributed.dht; - -import org.apache.ignite.cache.*; -import org.apache.ignite.cluster.*; -import org.gridgain.grid.kernal.processors.cache.*; - -import java.util.*; - -import static org.apache.ignite.cache.GridCacheMode.*; - -/** - * - */ -public class IgniteTxReentryColocatedSelfTest extends IgniteTxReentryAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return PARTITIONED; - } - - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 3; - } - - /** {@inheritDoc} */ - @Override protected int testKey() { - int key = 0; - - GridCache<Object, Object> cache = grid(0).cache(null); - - while (true) { - Collection<ClusterNode> nodes = cache.affinity().mapKeyToPrimaryAndBackups(key); - - if (nodes.contains(grid(0).localNode())) - key++; - else - break; - } - - return key; - } - - /** {@inheritDoc} */ - @Override protected int expectedNearLockRequests() { - return 1; - } - - /** {@inheritDoc} */ - @Override protected int expectedDhtLockRequests() { - return 0; - } - - /** {@inheritDoc} */ - @Override protected int expectedDistributedLockRequests() { - return 1; - } - - /** {@inheritDoc} */ - @Override protected boolean nearEnabled() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java index 8b2911f..d755462 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java @@ -18,8 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.replicated; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import static org.apache.ignite.cache.GridCacheMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java index cd7d5d2..d2c0cb2 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.util.typedef.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java index 8d07aea..8881c4b 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.apache.ignite.client.ssl.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java index 1c1b2ad..82020fb 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.processors.cache.local.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java index 7f3c77d..9a14ba9 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java @@ -18,7 +18,7 @@ package org.gridgain.testsuites; import junit.framework.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.gridgain.grid.kernal.processors.cache.distributed.replicated.*; import org.apache.ignite.internal.processors.cache.local.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testsuites/GridCacheGroupLockSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheGroupLockSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheGroupLockSelfTestSuite.java index f91390f..bfb5d9e 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheGroupLockSelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheGroupLockSelfTestSuite.java @@ -18,7 +18,7 @@ package org.gridgain.testsuites; import junit.framework.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.gridgain.grid.kernal.processors.cache.distributed.replicated.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testsuites/GridCacheNearOnlySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheNearOnlySelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheNearOnlySelfTestSuite.java index 952398a..40251a3 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheNearOnlySelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheNearOnlySelfTestSuite.java @@ -18,7 +18,7 @@ package org.gridgain.testsuites; import junit.framework.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.gridgain.grid.kernal.processors.cache.distributed.replicated.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testsuites/GridCacheTxRecoverySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheTxRecoverySelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheTxRecoverySelfTestSuite.java index d64a1d6..e943ce9 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheTxRecoverySelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheTxRecoverySelfTestSuite.java @@ -18,7 +18,7 @@ package org.gridgain.testsuites; import junit.framework.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.gridgain.grid.kernal.processors.cache.distributed.replicated.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java index 3a8beb3..cf46fc1 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java @@ -18,7 +18,7 @@ package org.gridgain.testsuites.bamboo; import junit.framework.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b77f2a59/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java index 0b84cac..120a7f9 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java @@ -27,7 +27,7 @@ import org.gridgain.grid.cache.affinity.fair.*; import org.gridgain.grid.cache.store.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; -import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.gridgain.grid.kernal.processors.cache.distributed.replicated.*;
