commit f6aab2983660e82d7e6179a0f1c3f3d739a9a43e Author: Vihang Karajgaonkar Date: Thu Mar 2 10:48:10 2017 -0800 HIVE-16090 : Addendum to HIVE-16014 diff --git a/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java b/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java index f95c130b0e76ef27ffa2ddf02a5bc22fb52934b9..f9bcc520579e6ec93aac834d70947bfcf2346671 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java @@ -31,6 +31,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -65,7 +66,7 @@ protected void setUp() throws Exception { super.setUp(); hive = Hive.get(); - hive.getConf().setIntVar(HiveConf.ConfVars.HIVE_MOVE_FILES_THREAD_COUNT, 15); + hive.getConf().setIntVar(HiveConf.ConfVars.METASTORE_FS_HANDLER_THREADS_COUNT, 15); hive.getConf().set(HiveConf.ConfVars.HIVE_MSCK_PATH_VALIDATION.varname, "throw"); checker = new HiveMetaStoreChecker(hive); @@ -335,7 +336,7 @@ public void testPartitionsNotInMs() throws HiveException, AlreadyExistsException public void testSingleThreadedCheckMetastore() throws HiveException, AlreadyExistsException, IOException { // set num of threads to 0 so that single-threaded checkMetastore is called - hive.getConf().setIntVar(HiveConf.ConfVars.HIVE_MOVE_FILES_THREAD_COUNT, 0); + hive.getConf().setIntVar(HiveConf.ConfVars.METASTORE_FS_HANDLER_THREADS_COUNT, 0); Table testTable = createPartitionedTestTable(dbName, tableName, 2, 0); // add 10 partitions on the filesystem createPartitionsDirectoriesOnFS(testTable, 10); @@ -357,7 +358,7 @@ public void testSingleThreadedCheckMetastore() public void testSingleThreadedDeeplyNestedTables() throws HiveException, AlreadyExistsException, IOException { // set num of threads to 0 so that single-threaded checkMetastore is called - hive.getConf().setIntVar(HiveConf.ConfVars.HIVE_MOVE_FILES_THREAD_COUNT, 0); + hive.getConf().setIntVar(HiveConf.ConfVars.METASTORE_FS_HANDLER_THREADS_COUNT, 0); // currently HiveMetastoreChecker uses a minimum pool size of 2*numOfProcs // no other easy way to set it deterministically for this test case checker = Mockito.spy(checker); @@ -440,7 +441,7 @@ public void testErrorForMissingPartitionColumn() throws AlreadyExistsException, public void testErrorForMissingPartitionsSingleThreaded() throws AlreadyExistsException, HiveException, IOException { // set num of threads to 0 so that single-threaded checkMetastore is called - hive.getConf().setIntVar(HiveConf.ConfVars.HIVE_MOVE_FILES_THREAD_COUNT, 0); + hive.getConf().setIntVar(HiveConf.ConfVars.METASTORE_FS_HANDLER_THREADS_COUNT, 0); Table testTable = createPartitionedTestTable(dbName, tableName, 2, 0); // add 10 partitions on the filesystem createPartitionsDirectoriesOnFS(testTable, 10);