From ea0c6c8c42aad9677aa563b805da3b225c61991f Mon Sep 17 00:00:00 2001 From: Pravin Sinha Date: Tue, 16 Jun 2020 00:27:00 +0530 Subject: [PATCH] HIVE-23539 : Optimize data copy during repl load operation for HDFS based staging location - fixed tests --- .../ql/parse/TestReplicationScenariosAcidTables.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java index 529b38783217..6d2b88f0e5d7 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java @@ -1539,15 +1539,14 @@ public void testCheckPointingWithSourceTableDataInserted() throws Throwable { .run("insert into t2 values (24)") .run("insert into t1 values (4)") .dump(primaryDbName, dumpClause); - + assertEquals(modifiedTimeTable1CopyFile, fs.listStatus(tablet1Path)[0].getModificationTime()); + assertTrue(modifiedTimeTable2 < fs.getFileStatus(tablet2Path).getModificationTime()); replica.load(replicatedDbName, primaryDbName) .run("use " + replicatedDbName) .run("select * from t1") .verifyResults(new String[]{"1", "2", "3", "4"}) .run("select * from t2") .verifyResults(new String[]{"11", "21", "13", "24"}); - assertEquals(modifiedTimeTable1CopyFile, fs.listStatus(tablet1Path)[0].getModificationTime()); - assertTrue(modifiedTimeTable2 < fs.getFileStatus(tablet2Path).getModificationTime()); } @Test @@ -1596,6 +1595,10 @@ public void testCheckPointingWithNewTablesAdded() throws Throwable { .run("insert into t3 values (3)") .dump(primaryDbName, dumpClause); + assertEquals(modifiedTimeTable1, fs.getFileStatus(tablet1Path).getModificationTime()); + assertEquals(modifiedTimeTable1CopyFile, fs.listStatus(tablet1Path)[0].getModificationTime()); + assertTrue(modifiedTimeTable2 < fs.getFileStatus(tablet2Path).getModificationTime()); + replica.load(replicatedDbName, primaryDbName) .run("use " + replicatedDbName) .run("select * from t1") @@ -1606,9 +1609,6 @@ public void testCheckPointingWithNewTablesAdded() throws Throwable { .verifyResults(new String[]{"t1", "t2", "t3"}) .run("select * from t3") .verifyResults(new String[]{"1", "2", "3"}); - assertEquals(modifiedTimeTable1, fs.getFileStatus(tablet1Path).getModificationTime()); - assertEquals(modifiedTimeTable1CopyFile, fs.listStatus(tablet1Path)[0].getModificationTime()); - assertTrue(modifiedTimeTable2 < fs.getFileStatus(tablet2Path).getModificationTime()); } @Test