MVCC: commented out more tests, which fail due to known issues.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39379a3a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39379a3a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39379a3a Branch: refs/heads/ignite-7251 Commit: 39379a3ab5e42257bec3091eac6b2c8dd111bca4 Parents: 3c52f36 Author: devozerov <voze...@gridgain.com> Authored: Thu Sep 13 14:31:39 2018 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Thu Sep 13 14:31:39 2018 +0300 ---------------------------------------------------------------------- .../dht/GridDhtPartitionsStateValidator.java | 2 +- .../DataStreamProcessorMvccSeflTest.java | 68 -------------------- .../DataStreamProcessorMvccSelfTest.java | 9 ++- .../mvcc/CacheMvccSqlQueriesAbstractTest.java | 2 +- .../mvcc/CacheMvccSqlTxQueriesAbstractTest.java | 2 + 5 files changed, 10 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/39379a3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsStateValidator.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 7faf0ff..3b99758 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 class GridDhtPartitionsStateValidator { 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); http://git-wip-us.apache.org/repos/asf/ignite/blob/39379a3a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSeflTest.java ---------------------------------------------------------------------- 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 abe6dee..0000000 --- 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(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/39379a3a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccSelfTest.java ---------------------------------------------------------------------- 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 c1af42b..eaea6da 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, Cache.removeAll + 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, Cache.removeAll + 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, Cache.removeAll + fail("https://issues.apache.org/jira/browse/IGNITE-9451";); super.testReplicated(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/39379a3a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlQueriesAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlQueriesAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlQueriesAbstractTest.java index 9e0b02f..796c0bb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlQueriesAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlQueriesAbstractTest.java @@ -629,7 +629,7 @@ public abstract class CacheMvccSqlQueriesAbstractTest extends CacheMvccAbstractT * @throws Exception If failed. */ public void testDistributedJoinSimple() throws Exception { - disableScheduledVacuum = true; //TODO: IGNITE-9446: remove this after races in vacuum will be fixed. + fail("https://issues.apache.org/jira/browse/IGNITE-9446";); startGridsMultiThreaded(4); http://git-wip-us.apache.org/repos/asf/ignite/blob/39379a3a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java index cb4ade7..e683def 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java @@ -227,6 +227,8 @@ public abstract class CacheMvccSqlTxQueriesAbstractTest extends CacheMvccAbstrac * @throws Exception If failed. */ public void testAccountsTxDmlSql_ClientServer_Backups2_Persistence() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-9292";); + persistence = true; testAccountsTxDmlSql_ClientServer_Backups2();
