You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jo...@apache.org on 2022/06/02 01:53:38 UTC
[impala] 01/02: Resolve merge conflict from IMPALA-10645
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
commit b3dec99ea1942069a67b971719d095567758dc9b
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Wed May 25 10:36:56 2022 -0700
Resolve merge conflict from IMPALA-10645
Change-Id: Ic8d693af43e28c5834ca56654afbc8e711def117
Reviewed-on: http://gerrit.cloudera.org:8080/18564
Reviewed-by: Joe McDonnell <jo...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
.../org/apache/impala/catalog/metastore/CatalogMetastoreServer.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java b/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java
index 5f33e2bde..14a0f6076 100644
--- a/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java
+++ b/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java
@@ -350,12 +350,7 @@ public class CatalogMetastoreServer extends ThriftHiveMetastore implements
}
/**
-<<<<<<< HEAD
- * Returns the RPC and connection metrics for this metastore server. //TODO hook this
- * method to the Catalog's debug UI
-=======
* Returns the RPC and connection metrics for this metastore server.
->>>>>>> c4a8633759... IMPALA-10645: Log catalogd HMS API metrics
*/
@Override
public TCatalogdHmsCacheMetrics getCatalogdHmsCacheMetrics() {