diff --git ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java index 0f129fc..4f1c7d8 100644 --- ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java +++ ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java @@ -18,7 +18,6 @@ package org.apache.hadoop.hive.ql; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.GetOpenTxnsInfoResponse; @@ -34,27 +33,19 @@ import org.apache.hadoop.hive.ql.io.AcidOutputFormat; import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.io.BucketCodec; -import org.apache.hadoop.hive.ql.io.HiveInputFormat; import org.apache.hadoop.hive.ql.lockmgr.TestDbTxnManager2; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse; -import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.txn.AcidHouseKeeperService; import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileOutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -69,7 +60,7 @@ * Tests here are for multi-statement transactions (WIP) and those that don't need to * run with Acid 2.0 (see subclasses of TestTxnCommands2) */ -public class TestTxnCommands extends TestTxnCommandsBase { +public class TestTxnCommands extends TxnCommandsBaseForTests { static final private Logger LOG = LoggerFactory.getLogger(TestTxnCommands.class); private static final String TEST_DATA_DIR = new File(System.getProperty("java.io.tmpdir") + File.separator + TestTxnCommands.class.getCanonicalName() diff --git ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java index 7aca6b2..1f0c269 100644 --- ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java +++ ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Set; -public class TestTxnNoBuckets extends TestTxnCommandsBase { +public class TestTxnNoBuckets extends TxnCommandsBaseForTests { static final private Logger LOG = LoggerFactory.getLogger(TestTxnNoBuckets.class); private static final String TEST_DATA_DIR = new File(System.getProperty("java.io.tmpdir") + File.separator + TestTxnNoBuckets.class.getCanonicalName() diff --git ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommandsBase.java ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java similarity index 97% rename from ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommandsBase.java rename to ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java index d6e709d..ad2aac5 100644 --- ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommandsBase.java +++ ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Set; -public abstract class TestTxnCommandsBase { +public abstract class TxnCommandsBaseForTests { //bucket count for test tables; set it to 1 for easier debugging final static int BUCKET_COUNT = 2; @Rule @@ -85,7 +85,7 @@ void setUpInternal() throws Exception { runStatementOnDriver("create table " + Table.NONACIDNONBUCKET + "(a int, b int) stored as orc"); } private void dropTables() throws Exception { - for(TestTxnCommandsBase.Table t : TestTxnCommandsBase.Table.values()) { + for(TxnCommandsBaseForTests.Table t : TxnCommandsBaseForTests.Table.values()) { runStatementOnDriver("drop table if exists " + t); } }