commit d058986c642f29418c7a7c5e2aa774136156e3c4 Author: Alan Gates Date: Thu Feb 1 09:07:14 2018 -0800 HIVE-18588 Add categories to unit tests to divide them into unit and checkin tests. diff --git standalone-metastore/pom.xml standalone-metastore/pom.xml index 9fe2a61da1..ba32a348a0 100644 --- standalone-metastore/pom.xml +++ standalone-metastore/pom.xml @@ -45,12 +45,14 @@ ${project.build.directory}/warehouse file:// 1 + org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest 1.0b3 1.7 ${basedir}/checkstyle/ 2.17 + 2.20.1 3.5.2 @@ -390,6 +392,48 @@ + @@ -504,7 +548,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 + ${maven.surefire.version} true false @@ -526,6 +570,7 @@ ${log4j.conf.dir} + ${test.groups} diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java index 883e2bdcdb..24689215c2 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java @@ -24,9 +24,13 @@ import java.util.HashMap; import java.util.Map; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.Test; import com.google.common.collect.Lists; +import org.junit.experimental.categories.Category; + +@Category(MetastoreUnitTest.class) public class TestStatsSetupConst { @Test diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java index e3a6f140b9..5eb04579f6 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java @@ -25,8 +25,11 @@ import javolution.util.FastBitSet; import org.apache.hadoop.hive.common.ndv.NumDistinctValueEstimatorFactory; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreUnitTest.class) public class TestFMSketchSerialization { private FastBitSet[] deserialize(String s, int numBitVectors) { diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java index f09cb8ce15..6251a59109 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java @@ -25,12 +25,15 @@ import java.util.Random; import java.util.Set; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(value = Parameterized.class) +@Category(MetastoreUnitTest.class) public class TestHLLNoBias { // 1.5% tolerance for long range bias (when no bias enabled) and 5% when (no diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java index 08955d73b6..4796d0efb1 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java @@ -32,15 +32,18 @@ import java.util.Set; import org.apache.hadoop.hive.common.ndv.hll.HyperLogLog.EncodingType; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.After; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TestName; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(value = Parameterized.class) +@Category(MetastoreUnitTest.class) public class TestHLLSerialization { private int size; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java index b0eaad8012..617d9c3627 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java @@ -20,8 +20,11 @@ import static org.junit.Assert.assertEquals; import org.apache.hadoop.hive.common.ndv.hll.HyperLogLog.EncodingType; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreUnitTest.class) public class TestHyperLogLog { // 5% tolerance for estimated count private float longRangeTolerance = 5.0f; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java index 106a9ed1e5..de363e4cea 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java @@ -25,12 +25,15 @@ import java.util.Random; import java.util.Set; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(value = Parameterized.class) +@Category(MetastoreUnitTest.class) public class TestHyperLogLogDense { // 5% tolerance for long range bias and 3% for short range bias diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java index 50c7ea1355..70563c4aea 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java @@ -25,12 +25,15 @@ import java.util.Random; import java.util.Set; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(value = Parameterized.class) +@Category(MetastoreUnitTest.class) public class TestHyperLogLogSparse { // 5% tolerance for long range bias and 1% for short range bias diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java index bcabe9511c..7cf6116ff3 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java @@ -22,12 +22,15 @@ import java.util.Arrays; import java.util.Collection; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(value = Parameterized.class) +@Category(MetastoreUnitTest.class) public class TestSparseEncodeHash { private long input; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java index 3b541d22b9..499e1f8875 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java @@ -19,6 +19,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.metastore.HiveMetaStore.HMSHandler; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.api.PrincipalType; @@ -27,7 +28,9 @@ import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreUnitTest.class) public class TestAdminUser { @Test diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java index 6e06026f77..b95f1f23a5 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.LongColumnStatsData; @@ -38,7 +39,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreUnitTest.class) public class TestAggregateStatsCache { static String DB_NAME = "db"; static String TAB_PREFIX = "tab"; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java index 3a8443a8c0..83aeedbe1e 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java @@ -18,15 +18,18 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.MetaException; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * Test the Deadline class used for long running requests. */ +@Category(MetastoreUnitTest.class) public class TestDeadline { private static final Logger LOG = LoggerFactory.getLogger(TestDeadline.class); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java index 72758df7e7..eafa92b5e1 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java @@ -18,10 +18,13 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.util.StringUtils; import org.junit.After; import org.junit.Before; +import org.junit.experimental.categories.Category; +@Category(MetastoreUnitTest.class) public class TestEmbeddedHiveMetaStore extends TestHiveMetaStore { @Before diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java index 21046363fb..45a65e0fd5 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Index; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -42,11 +43,13 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; +@Category(MetastoreUnitTest.class) public class TestFilterHooks { private static final Logger LOG = LoggerFactory.getLogger(TestFilterHooks.class); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java index bc049b1be3..ba8c1a0038 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java @@ -18,12 +18,15 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.*; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.mockito.Mockito; import java.util.Arrays; +@Category(MetastoreUnitTest.class) public class TestHiveAlterHandler { @Test diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java index ba86e052ed..7d9297ea0a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java @@ -21,6 +21,7 @@ import java.security.Permission; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; @@ -31,6 +32,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.Rule; +import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,6 +40,7 @@ import static org.junit.Assert.*; import org.junit.Before; +@Category(MetastoreUnitTest.class) public class TestHiveMetaStoreGetMetaConf { @Rule diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java index 57e5a4126e..78227d6f27 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Partition; @@ -34,6 +35,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,6 +49,7 @@ /** * Test to check PartitionSpec support in HiveMetaStore. */ +@Category(MetastoreCheckinTest.class) public class TestHiveMetaStorePartitionSpecs { private static final Logger LOG = LoggerFactory.getLogger(TestHiveMetaStorePartitionSpecs.class); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java index 1489975749..42df9c22d9 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; @@ -30,11 +31,13 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test long running request timeout functionality in MetaStore Server * HiveMetaStore.HMSHandler.create_database() is used to simulate a long running method. */ +@Category(MetastoreCheckinTest.class) public class TestHiveMetaStoreTimeout { protected static HiveMetaStoreClient client; protected static Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java index d4cedb030f..db4dd9ec42 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.common.ValidTxnList; import org.apache.hadoop.hive.common.ValidReadTxnList; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.DataOperationType; import org.apache.hadoop.hive.metastore.api.HeartbeatTxnRangeResponse; import org.apache.hadoop.hive.metastore.api.LockResponse; @@ -30,6 +31,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.List; @@ -45,6 +47,7 @@ * required the hive-exec jar, and hive-exec jar already depends on * hive-metastore jar, thus I can't make hive-metastore depend on hive-exec. */ +@Category(MetastoreUnitTest.class) public class TestHiveMetaStoreTxns { private final Configuration conf = MetastoreConf.newMetastoreConf(); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java index fd7524726b..42e77a6629 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.EnvironmentContext; import org.apache.hadoop.hive.metastore.api.Partition; @@ -43,6 +44,7 @@ import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; @@ -50,6 +52,7 @@ * TestHiveMetaStoreWithEnvironmentContext. Test case for _with_environment_context * calls in {@link org.apache.hadoop.hive.metastore.HiveMetaStore} */ +@Category(MetastoreUnitTest.class) public class TestHiveMetaStoreWithEnvironmentContext { private Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java index f1a08dd9e6..0d10be1e44 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java @@ -19,10 +19,13 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreUnitTest.class) public class TestHiveMetastoreCli { private static final String[] CLI_ARGUMENTS = { "9999" }; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java index a47c8a6d42..31284eeb66 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java @@ -17,12 +17,14 @@ */ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.LockComponent; import org.apache.hadoop.hive.metastore.api.LockLevel; import org.apache.hadoop.hive.metastore.api.LockRequest; import org.apache.hadoop.hive.metastore.api.LockType; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.net.InetAddress; import java.util.List; @@ -30,6 +32,7 @@ /** * Tests for LockRequestBuilder. */ +@Category(MetastoreUnitTest.class) public class TestLockRequestBuilder { // Test failure if user not set diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java index 6854a93f32..b477088709 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.InvalidPartitionException; import org.apache.hadoop.hive.metastore.api.Partition; @@ -36,7 +37,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestMarkPartition { protected Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java index ac1cc4c936..55f3324c0a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java @@ -18,11 +18,14 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.junit.Before; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestMarkPartitionRemote extends TestMarkPartition { @Before diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java index 19279a5537..e8d88dcf0b 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java @@ -19,15 +19,18 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * TestMetaStoreConnectionUrlHook * Verifies that when an instance of an implementation of RawStore is initialized, the connection * URL has already been updated by any metastore connect URL hooks. */ +@Category(MetastoreUnitTest.class) public class TestMetaStoreConnectionUrlHook { @Test diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java index 25e3a955d9..bfc819e8ca 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.api.Table; @@ -29,6 +30,7 @@ import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -38,6 +40,7 @@ * TestMetaStoreEventListener. Test case for * {@link org.apache.hadoop.hive.metastore.MetaStoreEndFunctionListener} */ +@Category(MetastoreUnitTest.class) public class TestMetaStoreEndFunctionListener { private Configuration conf; private HiveMetaStoreClient msc; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java index 1508ee5dcf..879e611ab4 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Index; @@ -79,12 +80,14 @@ import com.google.common.collect.Lists; import junit.framework.TestCase; +import org.junit.experimental.categories.Category; /** * TestMetaStoreEventListener. Test case for * {@link org.apache.hadoop.hive.metastore.MetaStoreEventListener} and * {@link org.apache.hadoop.hive.metastore.MetaStorePreEventListener} */ +@Category(MetastoreUnitTest.class) public class TestMetaStoreEventListener { private Configuration conf; private HiveMetaStoreClient msc; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java index de729c752d..062520b46f 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.Table; @@ -39,10 +40,12 @@ import static org.junit.Assert.assertTrue; import junit.framework.TestCase; +import org.junit.experimental.categories.Category; /** * Ensure that the status of MetaStore events depend on the RawStore's commit status. */ +@Category(MetastoreUnitTest.class) public class TestMetaStoreEventListenerOnlyOnCommit { private Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java index 82e39f1cf3..a9d9e78c20 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java @@ -29,6 +29,7 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Index; @@ -72,6 +73,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -83,6 +85,7 @@ * Mostly same tests as TestMetaStoreEventListener, but using old hive conf values instead of new * metastore conf values. */ +@Category(MetastoreUnitTest.class) public class TestMetaStoreEventListenerWithOldConf { private Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java index f692b0a87d..fd8fde4d43 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java @@ -19,17 +19,20 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * TestMetaStoreInitListener. Test case for * {@link org.apache.hadoop.hive.metastore.MetaStoreInitListener} */ +@Category(MetastoreCheckinTest.class) public class TestMetaStoreInitListener { private Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java index 3fdce48237..2bdf3cc4f8 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java @@ -19,17 +19,20 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test for unwrapping InvocationTargetException, which is thrown from * constructor of listener class */ +@Category(MetastoreUnitTest.class) public class TestMetaStoreListenersError { @Test diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java index f6147e5d70..5511a33e4b 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java @@ -18,12 +18,15 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreUnitTest.class) public class TestMetaStoreSchemaFactory { private Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java index 8485e997b5..a756e40b66 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java @@ -18,13 +18,16 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test MetaStoreSchemaInfo */ +@Category(MetastoreUnitTest.class) public class TestMetaStoreSchemaInfo { @Test diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java index 372dee6369..8be68d274f 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableList; import org.apache.hadoop.hive.metastore.ObjectStore.RetryingExecutor; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -56,6 +57,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,6 +75,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +@Category(MetastoreUnitTest.class) public class TestObjectStore { private ObjectStore objectStore = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java index b4e5a85a9c..467439235d 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java @@ -28,16 +28,19 @@ import javax.jdo.JDOCanRetryException; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Category(MetastoreCheckinTest.class) public class TestObjectStoreInitRetry { private static final Logger LOG = LoggerFactory.getLogger(TestObjectStoreInitRetry.class); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java index 6a44833a67..f286da824d 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java @@ -24,6 +24,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.common.ndv.hll.HyperLogLog; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.AggrStats; import org.apache.hadoop.hive.metastore.api.ColumnStatistics; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; @@ -47,9 +48,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Category(MetastoreUnitTest.class) public class TestOldSchema { private ObjectStore store = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java index 180a66694f..e60544b0af 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java @@ -24,14 +24,17 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; // Validate the metastore client call validatePartitionNameCharacters to ensure it throws // an exception if partition fields contain Unicode characters or commas +@Category(MetastoreUnitTest.class) public class TestPartitionNameWhitelistValidation { private static final String partitionValidationPattern = "[\\x20-\\x7E&&[^,]]*"; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java index 25a6ecf3a1..2bf5d3266a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java @@ -23,10 +23,13 @@ import java.util.concurrent.TimeUnit; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestRawStoreProxy { static class TestStore extends ObjectStore { diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java index 8976474b01..e1f81bb1c0 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java @@ -18,13 +18,16 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.junit.Assert; import org.junit.Before; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestRemoteHiveMetaStore extends TestHiveMetaStore { private static boolean isServerStarted = false; protected static int port; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java index 370cd28adf..e26a97d221 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java @@ -19,12 +19,14 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,6 +37,7 @@ * Test which checks that the remote Hive metastore stores the proper IP address using * IpAddressListener */ +@Category(MetastoreCheckinTest.class) public class TestRemoteHiveMetaStoreIpAddress { private static final Logger LOG = LoggerFactory.getLogger(TestRemoteHiveMetaStoreIpAddress.class); private static Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java index 92d2d0e24c..e0de07c92f 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java @@ -18,8 +18,11 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestRemoteUGIHiveMetaStoreIpAddress extends TestRemoteHiveMetaStoreIpAddress { public TestRemoteUGIHiveMetaStoreIpAddress() { System.setProperty(MetastoreConf.ConfVars.EXECUTE_SET_UGI.toString(), "true"); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java index 8d44bf8081..23ebc6d850 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java @@ -25,13 +25,16 @@ import javax.jdo.JDOException; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.mockito.Mockito; +@Category(MetastoreCheckinTest.class) public class TestRetriesInRetryingHMSHandler { private static Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java index badcd60ba1..b72cc09e78 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.client.builder.TableBuilder; @@ -30,11 +31,13 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * TestRetryingHMSHandler. Test case for * {@link org.apache.hadoop.hive.metastore.RetryingHMSHandler} */ +@Category(MetastoreCheckinTest.class) public class TestRetryingHMSHandler { private Configuration conf; private HiveMetaStoreClient msc; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java index e34d089e10..98113ae173 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java @@ -18,8 +18,11 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestSetUGIOnBothClientServer extends TestRemoteHiveMetaStore{ public TestSetUGIOnBothClientServer() { diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java index beff65656a..f2705bca70 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestSetUGIOnOnlyClient extends TestRemoteHiveMetaStore{ @Override diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java index bec5a5512d..da550f6038 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hive.metastore; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestSetUGIOnOnlyServer extends TestSetUGIOnBothClientServer { @Override diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java new file mode 100644 index 0000000000..f13ed74388 --- /dev/null +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java @@ -0,0 +1,25 @@ +/* + * 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.hadoop.hive.metastore.annotation; + +/** + * Marker interface for tests run before checkin and as part of nightly builds. These are + * generally slower unit tests that we don't want to run every time someone runs 'mvn test'. + */ +public interface MetastoreCheckinTest extends MetastoreTest { +} diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java new file mode 100644 index 0000000000..cc52de0976 --- /dev/null +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java @@ -0,0 +1,24 @@ +/* + * 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.hadoop.hive.metastore.annotation; + +/** + * Marker interface for all Metastore unit tests. + */ +public interface MetastoreTest { +} diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java new file mode 100644 index 0000000000..e712393585 --- /dev/null +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java @@ -0,0 +1,25 @@ +/* + * 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.hadoop.hive.metastore.annotation; + +/** + * Marker interface for all faster running metastore unit tests. Tests (and only tests) marked + * with this interface will be run as the default for 'mvn test'. + */ +public interface MetastoreUnitTest extends MetastoreTest { +} diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java index b9a8f61c69..db48e39422 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java @@ -29,6 +29,7 @@ import org.apache.hadoop.hive.metastore.ObjectStore; import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.TestObjectStore.MockPartitionExpressionProxy; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AggrStats; import org.apache.hadoop.hive.metastore.api.BasicTxnInfo; import org.apache.hadoop.hive.metastore.api.BooleanColumnStatsData; @@ -50,7 +51,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MetastoreCheckinTest.class) public class TestCachedStore { private ObjectStore objectStore; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddAlterDropIndexes.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddAlterDropIndexes.java index 88bacbf841..ca1c003068 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddAlterDropIndexes.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddAlterDropIndexes.java @@ -25,6 +25,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -47,6 +48,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -54,6 +56,7 @@ * Tests for creating, altering and dropping indexes. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestAddAlterDropIndexes { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) // https://github.com/junit-team/junit4/commit/1bf8438b65858565dbb64736bfe13aae9cfc1b5a diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java index 09be32155a..f483ca888a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java @@ -25,6 +25,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -46,6 +47,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -55,6 +57,7 @@ * Tests for creating partitions. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestAddPartitions { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java index dca8406455..31b315454a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.EnvironmentContext; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -45,6 +46,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -59,6 +61,7 @@ * API tests for HMS client's alterPartitions methods. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestAlterPartitions { public static final int NEW_CREATE_TIME = 123456789; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java index d8aa5bd010..cfec569d27 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java @@ -29,6 +29,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.TableType; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -47,6 +48,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -56,6 +58,7 @@ * Tests for appending partitions. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestAppendPartitions { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java index fe7e0e44df..0a20672df8 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java @@ -20,6 +20,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Function; @@ -42,6 +43,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.slf4j.Logger; @@ -53,6 +55,7 @@ import java.util.stream.Collectors; @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestDatabases { private static final Logger LOG = LoggerFactory.getLogger(TestDatabases.class); // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java index 2ed7ec0970..e550bca46c 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java @@ -27,6 +27,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.PartitionDropOptions; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -43,6 +44,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -52,6 +54,7 @@ * Tests for dropping partitions. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestDropPartitions { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java index f3b7ce501f..1974399df5 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hive.metastore.client; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Function; import org.apache.hadoop.hive.metastore.api.FunctionType; @@ -39,6 +40,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -50,6 +52,7 @@ * Test class for IMetaStoreClient API. Testing the Function related functions. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestFunctions { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) // https://github.com/junit-team/junit4/commit/1bf8438b65858565dbb64736bfe13aae9cfc1b5a diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetListIndexes.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetListIndexes.java index ab3c00d271..3b865b6005 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetListIndexes.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetListIndexes.java @@ -22,6 +22,7 @@ import java.util.stream.Collectors; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Index; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -37,6 +38,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -46,6 +48,7 @@ * Tests for getting and listing indexes. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestGetListIndexes { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) // https://github.com/junit-team/junit4/commit/1bf8438b65858565dbb64736bfe13aae9cfc1b5a diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java index 76a824a752..2c7f3fb68c 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; @@ -41,6 +42,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -53,6 +55,7 @@ * API tests for HMS client's getPartitions methods. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestGetPartitions { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java index f4fa73bedd..379e2e81d7 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java @@ -24,6 +24,7 @@ import java.util.stream.Collectors; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -49,6 +50,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -64,6 +66,7 @@ * API tests for HMS client's listPartitions methods. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestListPartitions { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java index abc400a928..ae6e6fae4a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java @@ -21,6 +21,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.StatsSetupConst; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.EnvironmentContext; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -45,6 +46,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -60,6 +62,7 @@ * manipulation, like creating, dropping and altering tables. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestTablesCreateDropAlterTruncate { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) // https://github.com/junit-team/junit4/commit/1bf8438b65858565dbb64736bfe13aae9cfc1b5a diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java index 7346e5c6fb..0af873b28a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hive.metastore.client; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.InvalidOperationException; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; @@ -35,6 +36,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -48,6 +50,7 @@ * querying like getting one, or multiple tables, and table name lists. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestTablesGetExists { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) // https://github.com/junit-team/junit4/commit/1bf8438b65858565dbb64736bfe13aae9cfc1b5a diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java index d345104484..15bd6c64ea 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hive.metastore.client; import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.InvalidOperationException; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; @@ -35,6 +36,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -48,6 +50,7 @@ * querying like getting one, or multiple tables, and table name lists. */ @RunWith(Parameterized.class) +@Category(MetastoreCheckinTest.class) public class TestTablesList { // Needed until there is no junit release with @BeforeParam, @AfterParam (junit 4.13) // https://github.com/junit-team/junit4/commit/1bf8438b65858565dbb64736bfe13aae9cfc1b5a diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java index b8f53a099a..1422701be2 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hive.metastore.conf; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.apache.hadoop.conf.Configuration; import org.hamcrest.CoreMatchers; @@ -26,6 +27,7 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,6 +40,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; +@Category(MetastoreUnitTest.class) public class TestMetastoreConf { private static final Logger LOG = LoggerFactory.getLogger(TestMetastoreConf.class); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java index f61b016aee..2d45c29f97 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java @@ -20,15 +20,18 @@ import com.jolbox.bonecp.BoneCPDataSource; import com.zaxxer.hikari.HikariDataSource; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import javax.sql.DataSource; import java.sql.SQLException; +@Category(MetastoreUnitTest.class) public class TestDataSourceProviderFactory { private Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java index 2f988551d3..21dd2f05ed 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java @@ -17,9 +17,11 @@ */ package org.apache.hadoop.hive.metastore.messaging.json; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.codehaus.jackson.annotate.JsonProperty; import org.json.JSONException; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.skyscreamer.jsonassert.JSONAssert; import java.io.IOException; @@ -28,6 +30,7 @@ import static org.junit.Assert.*; +@Category(MetastoreUnitTest.class) public class TestJSONMessageDeserializer { public static class MyClass { diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java index 173f5118c6..6f04288736 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java @@ -21,16 +21,19 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; +@Category(MetastoreUnitTest.class) public class TestMetrics { private static final long REPORT_INTERVAL = 1; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java index d8640b584b..9405dc6ea9 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java @@ -18,7 +18,9 @@ package org.apache.hadoop.hive.metastore.txn; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.junit.Test; @@ -26,6 +28,7 @@ import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; +@Category(MetastoreUnitTest.class) public class TestTxnHandlerNegative { static final private Logger LOG = LoggerFactory.getLogger(TestTxnHandlerNegative.class); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java index 0384f8b64d..60be0f9c22 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java @@ -19,6 +19,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.metastore.DatabaseProduct; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.tools.SQLGenerator; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; @@ -26,6 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.sql.Connection; import java.sql.ResultSet; @@ -36,6 +38,7 @@ /** * Tests for TxnUtils */ +@Category(MetastoreUnitTest.class) public class TestTxnUtils { private Configuration conf; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java index f91b062aab..de21fc5017 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java @@ -26,9 +26,11 @@ import org.apache.hadoop.fs.permission.AclStatus; import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.UserGroupInformation; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.mockito.Mockito; import javax.security.auth.login.LoginException; @@ -43,6 +45,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@Category(MetastoreUnitTest.class) public class TestHdfsUtils { private Random rand = new Random(); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java index 32ad63a728..d6c13d3f2a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java @@ -18,9 +18,11 @@ package org.apache.hadoop.hive.metastore.utils; +import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.Arrays; import java.util.HashMap; @@ -28,6 +30,7 @@ import static org.junit.Assert.assertEquals; +@Category(MetastoreUnitTest.class) public class TestMetaStoreUtils { @Test