You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/03/19 04:45:00 UTC

[incubator-linkis] 05/07: Support configuring Hive administrator #1757

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

alexkun pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git

commit 36942f29458a848e21602cb9674a01b1bb51f5e2
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 21:26:10 2022 +0800

    Support configuring Hive administrator #1757
---
 .../impl/HiveMetaWithPermissionServiceImpl.java    | 22 ++++++++++++++++++++++
 .../org/apache/linkis/metadata/util/DWSConfig.java |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java
index 76af70a..85e107c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java
@@ -23,20 +23,33 @@ import org.apache.linkis.metadata.util.DWSConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.List;
 import java.util.Map;
 
 @Service
 public class HiveMetaWithPermissionServiceImpl implements HiveMetaWithPermissionService {
 
+    private static final Logger log =
+            LoggerFactory.getLogger(HiveMetaWithPermissionServiceImpl.class);
+
     @Autowired private HiveMetaDao hiveMetaDao;
 
+    private String adminUser = DWSConfig.HIVE_DB_ADMIN_USER.getValue();
+
     @Override
     public List<String> getDbsOptionalUserName(String userName) {
+        if (adminUser.equals(userName)) {
+            log.info("admin to get all dbs ");
+            return hiveMetaDao.getAllDbs();
+        }
         Boolean flag = DWSConfig.HIVE_PERMISSION_WITH_lOGIN_USER_ENABLED.getValue();
         if (flag) {
             return hiveMetaDao.getDbsByUser(userName);
         } else {
+            log.info("user {} to get all dbs no permission control", userName);
             return hiveMetaDao.getAllDbs();
         }
     }
@@ -44,9 +57,18 @@ public class HiveMetaWithPermissionServiceImpl implements HiveMetaWithPermission
     @Override
     public List<Map<String, Object>> getTablesByDbNameAndOptionalUserName(Map<String, String> map) {
         Boolean flag = DWSConfig.HIVE_PERMISSION_WITH_lOGIN_USER_ENABLED.getValue();
+        if (null == map) {
+            return null;
+        }
+        String userName = map.get("userName");
+        if (adminUser.equals(userName)) {
+            log.info("admin to get all dbs ");
+            hiveMetaDao.getTablesByDbName(map);
+        }
         if (flag) {
             return hiveMetaDao.getTablesByDbNameAndUser(map);
         } else {
+            log.info("user {} to getTablesByDbName no permission control", userName);
             return hiveMetaDao.getTablesByDbName(map);
         }
     }
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
index 2a8903e..4475924 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
@@ -45,6 +45,9 @@ public class DWSConfig {
     public static final CommonVars<String> DB_FILTER_KEYWORDS =
             CommonVars.apply("wds.linkis.db.filter.keywords", "bak");
 
+    public static final CommonVars<String> HIVE_DB_ADMIN_USER =
+            CommonVars.apply("wds.linkis.metadata.hive.db.admin", "hadoop");
+
     public static final String HDFS_FILE_SYSTEM_REST_ERRS =
             CommonVars.apply(
                             "wds.linkis.hdfs.rest.errs",

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org