You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by sd...@apache.org on 2015/08/14 09:29:01 UTC
[27/50] [abbrv] incubator-sentry git commit: SENTRY-790: Remove
MetaStoreClient interface ( Sravya Tirukkovalur, Reviewed by: Lenni Kuff)
SENTRY-790: Remove MetaStoreClient interface ( Sravya Tirukkovalur, Reviewed by: Lenni Kuff)
Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/100e2397
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/100e2397
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/100e2397
Branch: refs/heads/hive_plugin_v2
Commit: 100e2397e5e30d8291a6c79329ff8778f8ddf21e
Parents: 18ba71b
Author: Sravya Tirukkovalur <sr...@clouera.com>
Authored: Tue Jul 21 14:58:03 2015 -0700
Committer: Sravya Tirukkovalur <sr...@clouera.com>
Committed: Fri Jul 24 13:38:41 2015 -0700
----------------------------------------------------------------------
.../org/apache/sentry/hdfs/MetastoreClient.java | 38 -------
.../sentry/hdfs/ExtendedMetastoreClient.java | 108 -------------------
2 files changed, 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/100e2397/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/MetastoreClient.java
----------------------------------------------------------------------
diff --git a/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/MetastoreClient.java b/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/MetastoreClient.java
deleted file mode 100644
index 3ecff94..0000000
--- a/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/MetastoreClient.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sentry.hdfs;
-
-import java.util.List;
-
-import org.apache.hadoop.hive.metastore.api.Database;
-import org.apache.hadoop.hive.metastore.api.Partition;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-/**
- * Interface to abstract all interactions between Sentry and Hive Metastore
- *
- */
-public interface MetastoreClient {
-
- public List<Database> getAllDatabases();
-
- public List<Table> getAllTablesOfDatabase(Database db);
-
- public List<Partition> listAllPartitions(Database db, Table tbl);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/100e2397/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/ExtendedMetastoreClient.java
----------------------------------------------------------------------
diff --git a/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/ExtendedMetastoreClient.java b/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/ExtendedMetastoreClient.java
deleted file mode 100644
index e7677f2..0000000
--- a/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/ExtendedMetastoreClient.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sentry.hdfs;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
-import org.apache.hadoop.hive.metastore.api.Database;
-import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.apache.hadoop.hive.metastore.api.Partition;
-import org.apache.hadoop.hive.metastore.api.Table;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Implementation of {@link MetastoreClient}
- *
- */
-public class ExtendedMetastoreClient implements MetastoreClient {
-
- private static Logger LOG = LoggerFactory.getLogger(ExtendedMetastoreClient.class);
-
- private volatile HiveMetaStoreClient client;
- private final HiveConf hiveConf;
- public ExtendedMetastoreClient(HiveConf hiveConf) {
- this.hiveConf = hiveConf;
- }
-
- @Override
- public List<Database> getAllDatabases() {
- List<Database> retList = new ArrayList<Database>();
- HiveMetaStoreClient client = getClient();
- if (client != null) {
- try {
- for (String dbName : client.getAllDatabases()) {
- retList.add(client.getDatabase(dbName));
- }
- } catch (Exception e) {
- LOG.error("Could not get All Databases !!", e);
- }
- }
- return retList;
- }
-
- @Override
- public List<Table> getAllTablesOfDatabase(Database db) {
- List<Table> retList = new ArrayList<Table>();
- HiveMetaStoreClient client = getClient();
- if (client != null) {
- try {
- for (String tblName : client.getAllTables(db.getName())) {
- retList.add(client.getTable(db.getName(), tblName));
- }
- } catch (Exception e) {
- LOG.error(String.format(
- "Could not get Tables for '%s' !!", db.getName()), e);
- }
- }
- return retList;
- }
-
- @Override
- public List<Partition> listAllPartitions(Database db, Table tbl) {
- HiveMetaStoreClient client = getClient();
- if (client != null) {
- try {
- return client.listPartitions(db.getName(), tbl.getTableName(), Short.MAX_VALUE);
- } catch (Exception e) {
- LOG.error(String.format(
- "Could not get partitions for '%s'.'%s' !!", db.getName(),
- tbl.getTableName()), e);
- }
- }
- return new LinkedList<Partition>();
- }
-
- private HiveMetaStoreClient getClient() {
- if (client == null) {
- try {
- client = new HiveMetaStoreClient(hiveConf);
- return client;
- } catch (MetaException e) {
- client = null;
- LOG.error("Could not create metastore client !!", e);
- return null;
- }
- } else {
- return client;
- }
- }
-}