This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/cache_dumps by this push: new 0957e6aee21 IGNITE-20595 Snapshot suite split in three (#10987) 0957e6aee21 is described below commit 0957e6aee215246cb01dc50eef841f4a74225aa7 Author: Nikolay <nizhi...@apache.org> AuthorDate: Tue Oct 10 11:28:43 2023 +0300 IGNITE-20595 Snapshot suite split in three (#10987) --- modules/calcite/pom.xml | 7 ++++ modules/cassandra/store/pom.xml | 7 ++-- .../ignite/testsuites/IgniteSnapshotTestSuite.java | 19 --------- ...estSuite.java => IgniteSnapshotTestSuite2.java} | 26 +----------- .../testsuites/IgniteSnapshotTestSuite3.java | 48 ++++++++++++++++++++++ modules/opencensus/pom.xml | 1 + parent/pom.xml | 2 +- 7 files changed, 62 insertions(+), 48 deletions(-) diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml index db1f38b42e6..3a39de70a8f 100644 --- a/modules/calcite/pom.xml +++ b/modules/calcite/pom.xml @@ -38,6 +38,7 @@ <avatica.version>1.23.0</avatica.version> <calcite.version>1.34.0</calcite.version> <checker.version>3.10.0</checker.version> + <failureaccess.version>1.0.1</failureaccess.version> <immutables.version>2.8.2</immutables.version> <janino.version>3.1.8</janino.version> <javacc-maven-plugin>2.4</javacc-maven-plugin> @@ -81,6 +82,12 @@ <version>${guava.version}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>failureaccess</artifactId> + <version>${failureaccess.version}</version> + </dependency> + <dependency> <groupId>org.checkerframework</groupId> <artifactId>checker-qual</artifactId> diff --git a/modules/cassandra/store/pom.xml b/modules/cassandra/store/pom.xml index f447ff7daf4..d3a7f1254d0 100644 --- a/modules/cassandra/store/pom.xml +++ b/modules/cassandra/store/pom.xml @@ -39,6 +39,7 @@ <cassandra-driver.version>3.2.0</cassandra-driver.version> <cassandra-all.version>3.11.3</cassandra-all.version> <metrics-core.version>3.0.2</metrics-core.version> + <dataostaxguava.version>25.1-jre</dataostaxguava.version> </properties> <dependencies> @@ -116,9 +117,9 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> + <groupId>com.datastax.oss</groupId> + <artifactId>java-driver-shaded-guava</artifactId> + <version>${dataostaxguava.version}</version> </dependency> <dependency> diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java index ced347b5c00..4b4398fc1dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java @@ -20,24 +20,15 @@ package org.apache.ignite.testsuites; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotCheckTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotDeltaTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotHandlerTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotRestoreSelfTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotSelfTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotStreamerTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotWalRecordTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotConsistencyTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotMXBeanTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManagerSelfTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRemoteRequestTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRestoreFromRemoteTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotWithMetastorageTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.DynamicSuite; import org.junit.runner.RunWith; @@ -65,15 +56,5 @@ public class IgniteSnapshotTestSuite { GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotRestoreSelfTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotHandlerTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotRestoreFromRemoteTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, PlainSnapshotTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, EncryptedSnapshotTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotWalRecordTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotStreamerTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotConsistencyTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotDeltaTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IncrementalSnapshotsTestSuite.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelf2Test.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteConcurrentCacheDumpTest.class, ignoredTests); } } diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java similarity index 51% copy from modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java copy to modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java index ced347b5c00..d4a5716619d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java @@ -21,30 +21,18 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotCheckTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotDeltaTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotHandlerTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotRestoreSelfTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotSelfTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotStreamerTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotWalRecordTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotConsistencyTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotMXBeanTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManagerSelfTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRemoteRequestTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRestoreFromRemoteTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotWithMetastorageTest; import org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest; -import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.DynamicSuite; import org.junit.runner.RunWith; /** */ @RunWith(DynamicSuite.class) -public class IgniteSnapshotTestSuite { +public class IgniteSnapshotTestSuite2 { /** */ public static List<Class<?>> suite() { List<Class<?>> suite = new ArrayList<>(); @@ -56,15 +44,6 @@ public class IgniteSnapshotTestSuite { /** */ public static void addSnapshotTests(List<Class<?>> suite, Collection<Class> ignoredTests) { - GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotManagerSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotRemoteRequestTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotCheckTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotWithMetastorageTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotMXBeanTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotRestoreSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotHandlerTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotRestoreFromRemoteTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, PlainSnapshotTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, EncryptedSnapshotTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotWalRecordTest.class, ignoredTests); @@ -72,8 +51,5 @@ public class IgniteSnapshotTestSuite { GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotConsistencyTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, IgniteClusterSnapshotDeltaTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, IncrementalSnapshotsTestSuite.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelf2Test.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteConcurrentCacheDumpTest.class, ignoredTests); } } diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java new file mode 100644 index 00000000000..c514882c8be --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java @@ -0,0 +1,48 @@ +/* + * 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.testsuites; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test; +import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest; +import org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.DynamicSuite; +import org.junit.runner.RunWith; + +/** */ +@RunWith(DynamicSuite.class) +public class IgniteSnapshotTestSuite3 { + /** */ + public static List<Class<?>> suite() { + List<Class<?>> suite = new ArrayList<>(); + + addSnapshotTests(suite, null); + + return suite; + } + + /** */ + public static void addSnapshotTests(List<Class<?>> suite, Collection<Class> ignoredTests) { + GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelf2Test.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteConcurrentCacheDumpTest.class, ignoredTests); + } +} diff --git a/modules/opencensus/pom.xml b/modules/opencensus/pom.xml index 87f38880e75..cb9de48e137 100644 --- a/modules/opencensus/pom.xml +++ b/modules/opencensus/pom.xml @@ -81,6 +81,7 @@ <groupId>io.opencensus</groupId> <artifactId>opencensus-exporter-trace-zipkin</artifactId> <version>${opencensus.version}</version> + <scope>test</scope> </dependency> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index ebf298a9208..8385c2bd96c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -86,7 +86,7 @@ <ezmorph.bundle.version>1.0.6_1</ezmorph.bundle.version> <ezmorph.version>1.0.6</ezmorph.version> <guava.retrying.version>2.0.0</guava.retrying.version> - <guava.version>25.1-jre</guava.version> + <guava.version>32.1.2-jre</guava.version> <guava14.version>14.0.1</guava14.version> <guava16.version>16.0.1</guava16.version> <h2.version>1.4.197</h2.version>