From 1fecf7bf7360f231778bb91a4d49b90693167119 Mon Sep 17 00:00:00 2001 From: ipavlukhin Date: Thu, 13 Sep 2018 12:46:33 +0300 Subject: [PATCH 1/2] fail DataStreamProcessorMvccSeflTest referring to IGNITE-9451 and mention same ticket in GridDhtPartitionsStateValidator --- .../dht/GridDhtPartitionsStateValidator.java | 2 +- .../DataStreamProcessorMvccSeflTest.java | 68 ------------------- .../DataStreamProcessorMvccSelfTest.java | 9 ++- 3 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSeflTest.java diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsStateValidator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsStateValidator.java index 7faf0ff02d2eb..3b99758cc8840 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsStateValidator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsStateValidator.java @@ -94,7 +94,7 @@ public void validatePartitionCountersAndSizes(GridDhtPartitionsExchangeFuture fu ignoringNodes.add(id); } - if (!MvccUtils.mvccEnabled(cctx.kernalContext())) { // TODO: Remove "if" clause in IGNITE-8149. + if (!MvccUtils.mvccEnabled(cctx.kernalContext())) { // TODO: Remove "if" clause in IGNITE-9451. // Validate cache sizes. result = validatePartitionsSizes(top, messages, ignoringNodes); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSeflTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSeflTest.java deleted file mode 100644 index abe6dee696641..0000000000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSeflTest.java +++ /dev/null @@ -1,68 +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.datastreamer; - -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; - -import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; - -/** */ -public class DataStreamProcessorMvccSeflTest extends DataStreamProcessorSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration igniteConfiguration = super.getConfiguration(igniteInstanceName); - - CacheConfiguration[] cacheConfigurations = igniteConfiguration.getCacheConfiguration(); - - assert cacheConfigurations == null || cacheConfigurations.length == 0 - || (cacheConfigurations.length == 1 && cacheConfigurations[0].getAtomicityMode() == TRANSACTIONAL); - - igniteConfiguration.setMvccEnabled(true); - - return igniteConfiguration; - } - - /** {@inheritDoc} */ - @Override public void testPartitioned() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8149"); - - super.testPartitioned(); - } - - /** {@inheritDoc} */ - @Override public void testColocated() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8149"); - - super.testColocated(); - } - - /** {@inheritDoc} */ - @Override public void testReplicated() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8149"); - - super.testReplicated(); - } - - /** {@inheritDoc} */ - @Override public void testUpdateStore() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8582"); - - super.testUpdateStore(); - } -} diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java index c1af42b6605ef..b7a291ebbca87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java @@ -42,21 +42,24 @@ public class DataStreamProcessorMvccSelfTest extends DataStreamProcessorSelfTest /** {@inheritDoc} */ @Override public void testPartitioned() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8149"); + // test uses batchedSorted StreamReceiver which depends on Cache.putAll + fail("https://issues.apache.org/jira/browse/IGNITE-9451"); super.testPartitioned(); } /** {@inheritDoc} */ @Override public void testColocated() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8149"); + // test uses batchedSorted StreamReceiver which depends on Cache.putAll + fail("https://issues.apache.org/jira/browse/IGNITE-9451"); super.testColocated(); } /** {@inheritDoc} */ @Override public void testReplicated() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8149"); + // test uses batchedSorted StreamReceiver which depends on Cache.putAll + fail("https://issues.apache.org/jira/browse/IGNITE-9451"); super.testReplicated(); } From 2118d420164342fc0aa5f9247d5139eaf250959b Mon Sep 17 00:00:00 2001 From: ipavlukhin Date: Thu, 13 Sep 2018 12:52:21 +0300 Subject: [PATCH 2/2] update comment --- .../datastreamer/DataStreamProcessorMvccSelfTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java index b7a291ebbca87..eaea6da0c4428 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java @@ -42,7 +42,7 @@ public class DataStreamProcessorMvccSelfTest extends DataStreamProcessorSelfTest /** {@inheritDoc} */ @Override public void testPartitioned() throws Exception { - // test uses batchedSorted StreamReceiver which depends on Cache.putAll + // test uses batchedSorted StreamReceiver which depends on Cache.putAll, Cache.removeAll fail("https://issues.apache.org/jira/browse/IGNITE-9451"); super.testPartitioned(); @@ -50,7 +50,7 @@ public class DataStreamProcessorMvccSelfTest extends DataStreamProcessorSelfTest /** {@inheritDoc} */ @Override public void testColocated() throws Exception { - // test uses batchedSorted StreamReceiver which depends on Cache.putAll + // test uses batchedSorted StreamReceiver which depends on Cache.putAll, Cache.removeAll fail("https://issues.apache.org/jira/browse/IGNITE-9451"); super.testColocated(); @@ -58,7 +58,7 @@ public class DataStreamProcessorMvccSelfTest extends DataStreamProcessorSelfTest /** {@inheritDoc} */ @Override public void testReplicated() throws Exception { - // test uses batchedSorted StreamReceiver which depends on Cache.putAll + // test uses batchedSorted StreamReceiver which depends on Cache.putAll, Cache.removeAll fail("https://issues.apache.org/jira/browse/IGNITE-9451"); super.testReplicated();