[impala] branch master updated: IMPALA-8585: Fix StmtMetadataLoaderTest when compiled against Hive 3

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new 3bbb855  IMPALA-8585: Fix StmtMetadataLoaderTest when compiled against Hive 3
3bbb855 is described below

commit 3bbb85598a271e18e512b066ff22c263f85ab241
Author: Zoltan Borok-Nagy <bo...@cloudera.com>
AuthorDate: Mon May 27 18:22:46 2019 +0200

    IMPALA-8585: Fix StmtMetadataLoaderTest when compiled against Hive 3
    
    IMPALA-8438 added a new event to the metadata loading timeline when
    Impala is integrated with Hive 3.
    
    This updates an assertion in a test about the number of events during
    metadata loading.
    
    Change-Id: I0028c22a122a31ab08d863e90658271f1274e9a4
    Reviewed-on: http://gerrit.cloudera.org:8080/13444
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 .../test/java/org/apache/impala/analysis/StmtMetadataLoaderTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fe/src/test/java/org/apache/impala/analysis/StmtMetadataLoaderTest.java b/fe/src/test/java/org/apache/impala/analysis/StmtMetadataLoaderTest.java
index 1c8a853..9f65022 100644
--- a/fe/src/test/java/org/apache/impala/analysis/StmtMetadataLoaderTest.java
+++ b/fe/src/test/java/org/apache/impala/analysis/StmtMetadataLoaderTest.java
@@ -116,7 +116,8 @@ public class StmtMetadataLoaderTest {
     Assert.assertEquals(expectedNumCatalogUpdates,
         mdLoader.getNumCatalogUpdatesReceived());
     // Validate timeline.
-    Assert.assertEquals(2, mdLoader.getTimeline().getNumEvents());
+    long expectedNumEvents = MetastoreShim.getMajorVersion() >= 3 ? 3 : 2;
+    Assert.assertEquals(expectedNumEvents, mdLoader.getTimeline().getNumEvents());
     // Validate dbs and tables.
     validateDbs(stmtTableCache, expectedDbs);
     validateTables(stmtTableCache, expectedTables);