Repository: hive Updated Branches: refs/heads/master 5db30cd5a -> 733aecf28
http://git-wip-us.apache.org/repos/asf/hive/blob/733aecf2/ql/src/java/org/apache/hadoop/hive/ql/processors/LlapClusterResourceProcessor.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/LlapClusterResourceProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/LlapClusterResourceProcessor.java deleted file mode 100644 index 0238727..0000000 --- a/ql/src/java/org/apache/hadoop/hive/ql/processors/LlapClusterResourceProcessor.java +++ /dev/null @@ -1,134 +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.hadoop.hive.ql.processors; - -import static org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_NULL_FORMAT; -import static org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.defaultNullString; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Arrays; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.hadoop.hive.conf.VariableSubstitution; -import org.apache.hadoop.hive.llap.registry.LlapServiceInstance; -import org.apache.hadoop.hive.llap.registry.impl.LlapRegistryService; -import org.apache.hadoop.hive.metastore.api.FieldSchema; -import org.apache.hadoop.hive.metastore.api.Schema; -import org.apache.hadoop.hive.ql.session.SessionState; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Joiner; - -public class LlapClusterResourceProcessor implements CommandProcessor { - public static final Logger LOG = LoggerFactory.getLogger(LlapClusterResourceProcessor.class); - private Options CLUSTER_OPTIONS = new Options(); - private HelpFormatter helpFormatter = new HelpFormatter(); - - LlapClusterResourceProcessor() { - CLUSTER_OPTIONS.addOption("info", "info", false, "Information about LLAP cluster"); - } - - private CommandProcessorResponse returnErrorResponse(final String errmsg) { - return new CommandProcessorResponse(1, "LLAP Cluster Processor Helper Failed:" + errmsg, null); - } - - @Override - public CommandProcessorResponse run(String command) { - SessionState ss = SessionState.get(); - command = new VariableSubstitution(() -> SessionState.get().getHiveVariables()).substitute(ss.getConf(), command); - String[] tokens = command.split("\\s+"); - if (tokens.length < 1) { - return returnErrorResponse("Command arguments are empty."); - } - - String params[] = Arrays.copyOfRange(tokens, 1, tokens.length); - try { - return llapClusterCommandHandler(ss, params); - } catch (Exception e) { - return returnErrorResponse(e.getMessage()); - } - } - - private CommandProcessorResponse llapClusterCommandHandler(final SessionState ss, - final String[] params) throws ParseException { - CommandLine args = parseCommandArgs(CLUSTER_OPTIONS, params); - - // no auth check for "LLAP CLUSTER INFO" - boolean hasInfo = args.hasOption("info"); - if (hasInfo) { - try { - LlapRegistryService llapRegistryService = LlapRegistryService.getClient(ss.getConf()); - String appId = llapRegistryService.getApplicationId() == null ? "null" : - llapRegistryService.getApplicationId().toString(); - for (LlapServiceInstance instance : llapRegistryService.getInstances().getAll()) { - ss.out.println(Joiner.on("\t").join(appId, instance.getWorkerIdentity(), instance.getHost(), - instance.getRpcPort(), instance.getResource().getMemory() * 1024L * 1024L, - instance.getResource().getVirtualCores())); - } - return createProcessorSuccessResponse(); - } catch (Exception e) { - LOG.error("Unable to list LLAP instances. err: ", e); - return returnErrorResponse("Unable to list LLAP instances. err: " + e.getMessage()); - } - } else { - String usage = getUsageAsString(); - return returnErrorResponse("Unsupported sub-command option. " + usage); - } - } - - private CommandProcessorResponse createProcessorSuccessResponse() { - return new CommandProcessorResponse(0, null, null, getSchema()); - } - - private Schema getSchema() { - Schema sch = new Schema(); - sch.addToFieldSchemas(new FieldSchema("applicationId", "string", "")); - sch.addToFieldSchemas(new FieldSchema("workerIdentity", "string", "")); - sch.addToFieldSchemas(new FieldSchema("hostname", "string", "")); - sch.addToFieldSchemas(new FieldSchema("rpcPort", "string", "")); - sch.addToFieldSchemas(new FieldSchema("memory", "string", "")); - sch.addToFieldSchemas(new FieldSchema("vcores", "string", "")); - sch.putToProperties(SERIALIZATION_NULL_FORMAT, defaultNullString); - return sch; - } - - private String getUsageAsString() { - StringWriter out = new StringWriter(); - PrintWriter pw = new PrintWriter(out); - helpFormatter.printUsage(pw, helpFormatter.getWidth(), "llap cluster", CLUSTER_OPTIONS); - pw.flush(); - return out.toString(); - } - - private CommandLine parseCommandArgs(final Options opts, String[] args) throws ParseException { - CommandLineParser parser = new GnuParser(); - return parser.parse(opts, args); - } - - @Override - public void close() { - } -} http://git-wip-us.apache.org/repos/asf/hive/blob/733aecf2/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java index 0374d37..5d6905a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java @@ -147,8 +147,6 @@ public enum HiveOperationType { CREATE_MAPPING, ALTER_MAPPING, DROP_MAPPING, - LLAP_CLUSTER, - LLAP_CACHE, // ==== Hive command operation types starts here ==== // SET, http://git-wip-us.apache.org/repos/asf/hive/blob/733aecf2/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java index 8014520..a55e66b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java @@ -484,8 +484,6 @@ public class Operation2Privilege { // Handled via adminPrivOps (see above). op2Priv.put(HiveOperationType.KILL_QUERY, PrivRequirement.newIOPrivRequirement(null, null)); - op2Priv.put(HiveOperationType.LLAP_CLUSTER, PrivRequirement.newIOPrivRequirement(null, null)); - op2Priv.put(HiveOperationType.LLAP_CACHE, PrivRequirement.newIOPrivRequirement(ADMIN_PRIV_AR, ADMIN_PRIV_AR)); op2Priv.put(HiveOperationType.CREATE_RESOURCEPLAN, PrivRequirement.newIOPrivRequirement(null, null)); op2Priv.put(HiveOperationType.ALTER_RESOURCEPLAN, PrivRequirement.newIOPrivRequirement(null, null)); op2Priv.put(HiveOperationType.DROP_RESOURCEPLAN, PrivRequirement.newIOPrivRequirement(null, null)); http://git-wip-us.apache.org/repos/asf/hive/blob/733aecf2/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java index 5164775..4e456e7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java @@ -129,7 +129,6 @@ public class SQLStdHiveAuthorizationValidator implements HiveAuthorizationValida // ignore partitions continue; case COMMAND_PARAMS: - case SERVICE_NAME: case FUNCTION: // operations that have objects of type COMMAND_PARAMS, FUNCTION are authorized // solely on the type http://git-wip-us.apache.org/repos/asf/hive/blob/733aecf2/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java ---------------------------------------------------------------------- diff --git a/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java b/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java index 8fbfe76..e3a5922 100644 --- a/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java +++ b/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java @@ -172,7 +172,7 @@ public class HiveCommandOperation extends ExecuteStatementOperation { RowSet rowSet = RowSetFactory.create(resultSchema, getProtocolVersion(), false); for (String row : rows) { - rowSet.addRow(row.split("\\t")); + rowSet.addRow(new String[] { row }); } return rowSet; }
