diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationAcrossInstances.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationAcrossInstances.java index d321ccaec2..1b696e1075 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationAcrossInstances.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationAcrossInstances.java @@ -54,6 +54,7 @@ static void internalBeforeClassSetup(Map overrides, Class clazz) Map localOverrides = new HashMap() {{ put("fs.defaultFS", miniDFSCluster.getFileSystem().getUri().toString()); put(HiveConf.ConfVars.HIVE_IN_TEST_REPL.varname, "true"); + put(HiveConf.ConfVars.HIVE_STRICT_MANAGED_TABLES.varname, "false"); }}; localOverrides.putAll(overrides); primary = new WarehouseInstance(LOG, miniDFSCluster, localOverrides); diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationScenariosAcidTables.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationScenariosAcidTables.java index e5436953f1..c91d808e54 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationScenariosAcidTables.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/BaseReplicationScenariosAcidTables.java @@ -84,6 +84,7 @@ static void internalBeforeClassSetup(Map overrides, Class clazz) put("mapred.input.dir.recursive", "true"); put("hive.metastore.disallow.incompatible.col.type.changes", "false"); put("hive.in.repl.test", "true"); + put("hive.strict.managed.tables", "false"); }}; acidEnableConf.putAll(overrides); diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/ReplicationTestUtils.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/ReplicationTestUtils.java index 4caa884b11..43ac92a205 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/ReplicationTestUtils.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/ReplicationTestUtils.java @@ -409,7 +409,8 @@ public static void insertRecordsIntoDB(WarehouseInstance primary, String DbName, nextVal = true; } - primary.run("CREATE TABLE " + tableNameOp + "_temp (key int, value int) " + tableStorage + "") + primary.run("CREATE TABLE " + tableNameOp + "_temp (key int, value int) " + tableStorage + + " tblproperties (" + tableProperty + ")") .run("INSERT INTO TABLE " + tableNameOp + "_temp VALUES " + buf.toString()) .run("SELECT key FROM " + tableNameOp + "_temp") .verifyResults(resultArray) @@ -462,7 +463,8 @@ public static void insertForMerge(WarehouseInstance primary, String primaryDbNam " ( "+ tableProperty + " )") .run("SHOW TABLES LIKE '" + tableName + "'") .verifyResult(tableName) - .run("CREATE TABLE " + tableNameMerge + " ( ID int, TranValue string, tran_date string) STORED AS ORC ") + .run("CREATE TABLE " + tableNameMerge + " ( ID int, TranValue string, tran_date string) STORED AS ORC " + + " TBLPROPERTIES ( "+ tableProperty + " )") .run("SHOW TABLES LIKE '" + tableNameMerge + "'") .verifyResult(tableNameMerge) .run("INSERT INTO " + tableName + " PARTITION (tran_date) VALUES (1, 'value_01', 'creation', '20170410')," + diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestCopyUtils.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestCopyUtils.java index 0e0a5cc43f..5e18db6054 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestCopyUtils.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestCopyUtils.java @@ -93,6 +93,7 @@ public static void classLevelSetup() throws Exception { put(ConfVars.HIVE_EXEC_COPYFILE_MAXSIZE.varname, "1"); put(ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "false"); put(ConfVars.HIVE_DISTCP_DOAS_USER.varname, currentUser); + put(ConfVars.HIVE_STRICT_MANAGED_TABLES.varname, "false"); }}; primary = new WarehouseInstanceWithMR(LOG, miniDFSCluster, overridesForHiveConf); replica = new WarehouseInstanceWithMR(LOG, miniDFSCluster, overridesForHiveConf); diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestExportImport.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestExportImport.java index e44252891c..f04fef9658 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestExportImport.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestExportImport.java @@ -62,6 +62,7 @@ public static void classLevelSetup() throws Exception { HashMap overridesForHiveConfDump = new HashMap() {{ put(HiveConf.ConfVars.HIVE_IN_TEST.varname, "false"); put(HiveConf.ConfVars.REPL_INCLUDE_EXTERNAL_TABLES.varname, "true"); + put(HiveConf.ConfVars.HIVE_STRICT_MANAGED_TABLES.varname, "false"); }}; srcHiveWarehouse = new WarehouseInstance(LOG, miniDFSCluster, overridesForHiveConf); diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java index 7557280d2d..a09fabdd1c 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.util.HashMap; +import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.HIVE_STRICT_MANAGED_TABLES; import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.METASTORE_AGGREGATE_STATS_CACHE_ENABLED; import static org.apache.hadoop.hive.metastore.ReplChangeManager.SOURCE_OF_REPLICATION; @@ -63,6 +64,7 @@ public static void beforeClassSetup() throws Exception { conf.setLong(HiveConf.ConfVars.HIVE_EXEC_COPYFILE_MAXSIZE.varname, 1); conf.setLong(HiveConf.ConfVars.HIVE_EXEC_COPYFILE_MAXNUMFILES.varname, 0); conf.setBoolean(METASTORE_AGGREGATE_STATS_CACHE_ENABLED.varname, false); + conf.setBoolean(HIVE_STRICT_MANAGED_TABLES.varname, false); miniDFSCluster = new MiniDFSCluster.Builder(conf).numDataNodes(1).format(true).build(); diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTablesBootstrap.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTablesBootstrap.java index f475b1e55d..096cc53e38 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTablesBootstrap.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTablesBootstrap.java @@ -58,7 +58,7 @@ public static void classLevelSetup() throws Exception { Map overrides = new HashMap<>(); overrides.put(MetastoreConf.ConfVars.EVENT_MESSAGE_FACTORY.getHiveName(), GzipJSONMessageEncoder.class.getCanonicalName()); - + overrides.put(MetastoreConf.ConfVars.STRICT_MANAGED_TABLES.getHiveName(),"false"); internalBeforeClassSetup(overrides, TestReplicationScenariosAcidTablesBootstrap.class); } diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosExternalTables.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosExternalTables.java index 74854db2ab..88a7c4cf90 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosExternalTables.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosExternalTables.java @@ -72,6 +72,7 @@ public static void classLevelSetup() throws Exception { overrides.put(HiveConf.ConfVars.REPL_INCLUDE_EXTERNAL_TABLES.varname, "true"); overrides.put(HiveConf.ConfVars.HIVE_DISTCP_DOAS_USER.varname, UserGroupInformation.getCurrentUser().getUserName()); + overrides.put(HiveConf.ConfVars.HIVE_STRICT_MANAGED_TABLES.varname,"false"); internalBeforeClassSetup(overrides, TestReplicationScenarios.class); } diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestStatsReplicationScenarios.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestStatsReplicationScenarios.java index 94eb1ffa87..b7db31b2e6 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestStatsReplicationScenarios.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestStatsReplicationScenarios.java @@ -96,6 +96,7 @@ static void internalBeforeClassSetup(Map primaryOverrides, Map additionalOverrides = new HashMap() {{ put("fs.defaultFS", miniDFSCluster.getFileSystem().getUri().toString()); put(HiveConf.ConfVars.HIVE_IN_TEST_REPL.varname, "true"); + put(HiveConf.ConfVars.HIVE_STRICT_MANAGED_TABLES.varname, "false"); }}; Map overrides = new HashMap<>(); @@ -543,8 +544,8 @@ private void applyDMLOperations(List tableNames) throws Throwable { .run("truncate table " + ndTableName) .run("truncate table " + ndPartTableName + " partition (pk=1)") // CTAS - .run("create table " + ctasTableName + " as select * from " + incTableName) - .run("create table " + ctasPartTableName + " as select * from " + partTableName) + .run("create table " + ctasTableName + tblCreateExtra + " as select * from " + incTableName) + .run("create table " + ctasPartTableName + tblCreateExtra + " as select * from " + partTableName) // Import .run("export table " + partTableName + " to " + exportPartPath) .run("import table " + eximPartTableName + " from " + exportPartPath) diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java index 01f8cda2ff..7d4cb37054 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java @@ -148,6 +148,7 @@ private void initialize(String cmRoot, String externalTableWarehouseRoot, String } hiveConf.set(HiveConf.ConfVars.METASTORE_RAW_STORE_IMPL.varname, "org.apache.hadoop.hive.metastore.InjectableBehaviourObjectStore"); + hiveConf.set(HiveConf.ConfVars.HIVE_STRICT_MANAGED_TABLES.varname, "true"); System.setProperty(HiveConf.ConfVars.PREEXECHOOKS.varname, " "); System.setProperty(HiveConf.ConfVars.POSTEXECHOOKS.varname, " ");