Bracketing Java logging output with log level checks part 2. This reduces creation of intermediate objects and improves performance.
Change-Id: Ib94b3a20d439d854f579d9086755eb19699fcb68 Reviewed-on: http://gerrit.cloudera.org:8080/5297 Reviewed-by: Marcel Kornacker <mar...@cloudera.com> Tested-by: Internal Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/467642f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/467642f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/467642f2 Branch: refs/heads/master Commit: 467642f2cab9c341aba5955d8bfd88565649b3ff Parents: c97bffc Author: Alex Behm <alex.b...@cloudera.com> Authored: Wed Nov 30 17:39:54 2016 -0800 Committer: Internal Jenkins <cloudera-hud...@gerrit.cloudera.org> Committed: Thu Dec 1 11:10:02 2016 +0000 ---------------------------------------------------------------------- .../apache/impala/analysis/AggregateInfo.java | 23 +++++--- .../impala/analysis/AggregateInfoBase.java | 12 ++-- .../apache/impala/analysis/AlterTableStmt.java | 6 +- .../apache/impala/analysis/AnalysisContext.java | 6 +- .../apache/impala/analysis/AnalyticInfo.java | 10 ++-- .../org/apache/impala/analysis/Analyzer.java | 59 ++++++++++---------- .../impala/analysis/ComputeStatsStmt.java | 20 ++++--- .../impala/analysis/CreateDropRoleStmt.java | 4 +- .../analysis/CreateOrAlterViewStmtBase.java | 3 +- .../apache/impala/analysis/CreateUdfStmt.java | 5 +- .../impala/analysis/DropFunctionStmt.java | 5 +- .../impala/analysis/ExprSubstitutionMap.java | 4 +- .../apache/impala/analysis/InlineViewRef.java | 8 ++- .../org/apache/impala/analysis/LiteralExpr.java | 2 +- .../apache/impala/analysis/LoadDataStmt.java | 8 +-- .../org/apache/impala/analysis/ModifyStmt.java | 1 - .../apache/impala/analysis/PartitionSpec.java | 7 +-- .../impala/analysis/ResetMetadataStmt.java | 2 +- .../org/apache/impala/analysis/SelectStmt.java | 47 ++++++++++------ .../apache/impala/analysis/ShowFilesStmt.java | 8 +-- .../apache/impala/analysis/StmtRewriter.java | 2 +- .../apache/impala/analysis/TruncateStmt.java | 8 +-- .../org/apache/impala/analysis/UnionStmt.java | 4 +- .../authorization/AuthorizationChecker.java | 8 +-- .../impala/authorization/AuthorizeableDb.java | 2 +- .../impala/authorization/AuthorizeableUri.java | 2 +- .../authorization/ImpalaInternalAdminUser.java | 2 +- .../apache/impala/authorization/Privilege.java | 2 +- .../impala/authorization/PrivilegeRequest.java | 2 +- .../org/apache/impala/authorization/User.java | 11 ++-- 30 files changed, 148 insertions(+), 135 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java b/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java index 8590872..1ce5833 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java +++ b/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java @@ -20,14 +20,13 @@ package org.apache.impala.analysis; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.impala.catalog.Type; import org.apache.impala.common.AnalysisException; import org.apache.impala.common.InternalException; import org.apache.impala.planner.DataPartition; -import org.apache.impala.thrift.TPartitionType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -181,7 +180,7 @@ public class AggregateInfo extends AggregateInfoBase { Preconditions.checkState(tupleDesc == null); result.createDistinctAggInfo(groupingExprs, distinctAggExprs, analyzer); } - LOG.debug("agg info:\n" + result.debugString()); + if (LOG.isDebugEnabled()) LOG.debug("agg info:\n" + result.debugString()); return result; } @@ -338,7 +337,9 @@ public class AggregateInfo extends AggregateInfoBase { // Preserve the root type for NULL literals. groupingExprs_ = Expr.substituteList(groupingExprs_, smap, analyzer, true); - LOG.trace("AggInfo: grouping_exprs=" + Expr.debugString(groupingExprs_)); + if (LOG.isTraceEnabled()) { + LOG.trace("AggInfo: grouping_exprs=" + Expr.debugString(groupingExprs_)); + } // The smap in this case should not substitute the aggs themselves, only // their subexpressions. @@ -349,7 +350,9 @@ public class AggregateInfo extends AggregateInfoBase { aggregateExprs_.add((FunctionCallExpr) substitutedAgg); } - LOG.trace("AggInfo: agg_exprs=" + Expr.debugString(aggregateExprs_)); + if (LOG.isTraceEnabled()) { + LOG.trace("AggInfo: agg_exprs=" + Expr.debugString(aggregateExprs_)); + } outputTupleSmap_.substituteLhs(smap, analyzer); intermediateTupleSmap_.substituteLhs(smap, analyzer); if (secondPhaseDistinctAggInfo_ != null) { @@ -595,8 +598,10 @@ public class AggregateInfo extends AggregateInfoBase { } if (!requiresIntermediateTuple()) intermediateTupleSmap_ = outputTupleSmap_; - LOG.trace("output smap=" + outputTupleSmap_.debugString()); - LOG.trace("intermediate smap=" + intermediateTupleSmap_.debugString()); + if (LOG.isTraceEnabled()) { + LOG.trace("output smap=" + outputTupleSmap_.debugString()); + LOG.trace("intermediate smap=" + intermediateTupleSmap_.debugString()); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java b/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java index 51c56ae..d6ef084 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java +++ b/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java @@ -20,12 +20,11 @@ package org.apache.impala.analysis; import java.util.ArrayList; import java.util.List; +import org.apache.impala.catalog.AggregateFunction; +import org.apache.impala.catalog.Type; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.impala.catalog.AggregateFunction; -import org.apache.impala.catalog.ColumnStats; -import org.apache.impala.catalog.Type; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -169,8 +168,11 @@ public abstract class AggregateInfoBase { } } } - String prefix = (isOutputTuple ? "result " : "intermediate "); - LOG.trace(prefix + " tuple=" + result.debugString()); + + if (LOG.isTraceEnabled()) { + String prefix = (isOutputTuple ? "result " : "intermediate "); + LOG.trace(prefix + " tuple=" + result.debugString()); + } return result; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/AlterTableStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/AlterTableStmt.java b/fe/src/main/java/org/apache/impala/analysis/AlterTableStmt.java index 967838e..6c7530a 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AlterTableStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableStmt.java @@ -17,18 +17,14 @@ package org.apache.impala.analysis; -import java.util.List; - import org.apache.impala.authorization.Privilege; -import org.apache.impala.catalog.Column; import org.apache.impala.catalog.DataSourceTable; -import org.apache.impala.catalog.KuduTable; import org.apache.impala.catalog.Table; import org.apache.impala.common.AnalysisException; import org.apache.impala.thrift.TAlterTableParams; import org.apache.impala.thrift.TTableName; + import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; /** * Base class for all ALTER TABLE statements. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/AnalysisContext.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/AnalysisContext.java b/fe/src/main/java/org/apache/impala/analysis/AnalysisContext.java index a7f259d..e20fd34 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AnalysisContext.java +++ b/fe/src/main/java/org/apache/impala/analysis/AnalysisContext.java @@ -51,7 +51,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; /** - * Wrapper class for parser and analyzer. + * Wrapper class for parsing, analyzing and rewriting a SQL stmt. */ public class AnalysisContext { private final static Logger LOG = LoggerFactory.getLogger(AnalysisContext.class); @@ -411,7 +411,9 @@ public class AnalysisContext { // Restore the original result types and column labels. analysisResult_.stmt_.castResultExprs(origResultTypes); analysisResult_.stmt_.setColLabels(origColLabels); - LOG.trace("rewrittenStmt: " + analysisResult_.stmt_.toSql()); + if (LOG.isTraceEnabled()) { + LOG.trace("rewrittenStmt: " + analysisResult_.stmt_.toSql()); + } if (isExplain) analysisResult_.stmt_.setIsExplain(); Preconditions.checkState(!analysisResult_.requiresSubqueryRewrite()); } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java b/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java index cff6f35..d37152a 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java +++ b/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java @@ -20,10 +20,10 @@ package org.apache.impala.analysis; import java.util.ArrayList; import java.util.List; +import org.apache.impala.catalog.Type; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.impala.catalog.Type; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -97,9 +97,11 @@ public class AnalyticInfo extends AggregateInfoBase { result.outputTupleDesc_.getSlots().get(i).setSourceExpr( result.analyticExprs_.get(i)); } - LOG.trace("analytictuple=" + result.outputTupleDesc_.debugString()); - LOG.trace("analytictuplesmap=" + result.analyticTupleSmap_.debugString()); - LOG.trace("analytic info:\n" + result.debugString()); + if (LOG.isTraceEnabled()) { + LOG.trace("analytictuple=" + result.outputTupleDesc_.debugString()); + LOG.trace("analytictuplesmap=" + result.analyticTupleSmap_.debugString()); + LOG.trace("analytic info:\n" + result.debugString()); + } return result; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/Analyzer.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/Analyzer.java b/fe/src/main/java/org/apache/impala/analysis/Analyzer.java index 3ab367c..d4fe88d 100644 --- a/fe/src/main/java/org/apache/impala/analysis/Analyzer.java +++ b/fe/src/main/java/org/apache/impala/analysis/Analyzer.java @@ -51,7 +51,6 @@ import org.apache.impala.catalog.TableLoadingException; import org.apache.impala.catalog.Type; import org.apache.impala.catalog.View; import org.apache.impala.common.AnalysisException; -import org.apache.impala.common.Id; import org.apache.impala.common.IdGenerator; import org.apache.impala.common.ImpalaException; import org.apache.impala.common.InternalException; @@ -605,8 +604,10 @@ public class Analyzer { globalState_.fullOuterJoinedConjuncts.put(e.getId(), currentOuterJoin); break; } - LOG.trace("registerFullOuterJoinedConjunct: " + - globalState_.fullOuterJoinedConjuncts.toString()); + if (LOG.isTraceEnabled()) { + LOG.trace("registerFullOuterJoinedConjunct: " + + globalState_.fullOuterJoinedConjuncts.toString()); + } } /** @@ -617,8 +618,10 @@ public class Analyzer { for (TupleId tid: tids) { globalState_.fullOuterJoinedTupleIds.put(tid, rhsRef); } - LOG.trace("registerFullOuterJoinedTids: " + - globalState_.fullOuterJoinedTupleIds.toString()); + if (LOG.isTraceEnabled()) { + LOG.trace("registerFullOuterJoinedTids: " + + globalState_.fullOuterJoinedTupleIds.toString()); + } } /** @@ -628,7 +631,10 @@ public class Analyzer { for (TupleId tid: tids) { globalState_.outerJoinedTupleIds.put(tid, rhsRef); } - LOG.trace("registerOuterJoinedTids: " + globalState_.outerJoinedTupleIds.toString()); + if (LOG.isTraceEnabled()) { + LOG.trace("registerOuterJoinedTids: " + + globalState_.outerJoinedTupleIds.toString()); + } } /** @@ -1086,8 +1092,10 @@ public class Analyzer { // register single tid conjuncts if (tupleIds.size() == 1) globalState_.singleTidConjuncts.add(e.getId()); - LOG.trace("register tuple/slotConjunct: " + Integer.toString(e.getId().asInt()) - + " " + e.toSql() + " " + e.debugString()); + if (LOG.isTraceEnabled()) { + LOG.trace("register tuple/slotConjunct: " + Integer.toString(e.getId().asInt()) + + " " + e.toSql() + " " + e.debugString()); + } if (!(e instanceof BinaryPredicate)) return; BinaryPredicate binaryPred = (BinaryPredicate) e; @@ -1138,7 +1146,9 @@ public class Analyzer { // create an eq predicate between lhs and rhs BinaryPredicate p = new BinaryPredicate(BinaryPredicate.Operator.EQ, lhs, rhs); p.setIsAuxExpr(); - LOG.trace("register equiv predicate: " + p.toSql() + " " + p.debugString()); + if (LOG.isTraceEnabled()) { + LOG.trace("register equiv predicate: " + p.toSql() + " " + p.debugString()); + } registerConjunct(p); } @@ -1162,7 +1172,6 @@ public class Analyzer { */ public List<Expr> getUnassignedConjuncts( List<TupleId> tupleIds, boolean inclOjConjuncts) { - LOG.trace("getUnassignedConjuncts for " + Id.printIds(tupleIds)); List<Expr> result = Lists.newArrayList(); for (Expr e: globalState_.conjuncts.values()) { if (e.isBoundByTupleIds(tupleIds) @@ -1171,7 +1180,6 @@ public class Analyzer { && ((inclOjConjuncts && !e.isConstant()) || !globalState_.ojClauseByConjunct.containsKey(e.getId()))) { result.add(e); - LOG.trace("getUnassignedConjunct: " + e.toSql()); } } return result; @@ -1207,13 +1215,9 @@ public class Analyzer { * Outer Join clause. */ public List<Expr> getUnassignedConjuncts(List<TupleId> tupleIds) { - LOG.trace("getUnassignedConjuncts for node with " + Id.printIds(tupleIds)); List<Expr> result = Lists.newArrayList(); for (Expr e: getUnassignedConjuncts(tupleIds, true)) { - if (canEvalPredicate(tupleIds, e)) { - result.add(e); - LOG.trace("getUnassignedConjunct: " + e.toSql()); - } + if (canEvalPredicate(tupleIds, e)) result.add(e); } return result; } @@ -1249,7 +1253,6 @@ public class Analyzer { Expr e = globalState_.conjuncts.get(conjunctId); Preconditions.checkNotNull(e); result.add(e); - LOG.trace("getUnassignedOjConjunct: " + e.toSql()); } } return result; @@ -1343,8 +1346,6 @@ public class Analyzer { * referenced tids the last join to outer-join this tid has been materialized */ public boolean canEvalPredicate(List<TupleId> tupleIds, Expr e) { - LOG.trace("canEval: " + e.toSql() + " " + e.debugString() + " " - + Id.printIds(tupleIds)); if (!e.isBoundByTupleIds(tupleIds)) return false; ArrayList<TupleId> tids = Lists.newArrayList(); e.getIds(tids, null); @@ -1399,14 +1400,10 @@ public class Analyzer { if (isAntiJoinedConjunct(e)) return canEvalAntiJoinedConjunct(e, tupleIds); for (TupleId tid: tids) { - LOG.trace("canEval: checking tid " + tid.toString()); TableRef rhsRef = getLastOjClause(tid); // this is not outer-joined; ignore if (rhsRef == null) continue; // check whether the last join to outer-join 'tid' is materialized by tupleIds - boolean contains = tupleIds.containsAll(rhsRef.getAllTableRefIds()); - LOG.trace("canEval: contains=" + (contains ? "true " : "false ") - + Id.printIds(tupleIds) + " " + Id.printIds(rhsRef.getAllTableRefIds())); if (!tupleIds.containsAll(rhsRef.getAllTableRefIds())) return false; } return true; @@ -1525,7 +1522,9 @@ public class Analyzer { // to prevent callers from inadvertently marking the srcConjunct as assigned. p.setId(null); if (p instanceof BinaryPredicate) ((BinaryPredicate) p).setIsInferred(); - LOG.trace("new pred: " + p.toSql() + " " + p.debugString()); + if (LOG.isTraceEnabled()) { + LOG.trace("new pred: " + p.toSql() + " " + p.debugString()); + } } if (markAssigned) { @@ -2033,7 +2032,6 @@ public class Analyzer { */ public List<SlotId> getEquivSlots(SlotId slotId, List<TupleId> tupleIds) { List<SlotId> result = Lists.newArrayList(); - LOG.trace("getequivslots: slotid=" + Integer.toString(slotId.asInt())); EquivalenceClassId classId = globalState_.equivClassBySlotId.get(slotId); for (SlotId memberId: globalState_.equivClassMembers.get(classId)) { if (tupleIds.contains( @@ -2122,7 +2120,6 @@ public class Analyzer { if (conjuncts == null) return; for (Expr p: conjuncts) { globalState_.assignedConjuncts.add(p.getId()); - LOG.trace("markAssigned " + p.toSql() + " " + p.debugString()); } } @@ -2130,7 +2127,6 @@ public class Analyzer { * Mark predicate as assigned. */ public void markConjunctAssigned(Expr conjunct) { - LOG.trace("markAssigned " + conjunct.toSql() + " " + conjunct.debugString()); globalState_.assignedConjuncts.add(conjunct.getId()); } @@ -2154,7 +2150,6 @@ public class Analyzer { if (globalState_.assignedConjuncts.contains(id)) continue; Expr e = globalState_.conjuncts.get(id); if (e.isAuxExpr()) continue; - LOG.trace("unassigned: " + e.toSql() + " " + e.debugString()); return true; } return false; @@ -2736,7 +2731,9 @@ public class Analyzer { } long end = System.currentTimeMillis(); - LOG.trace("Time taken in computeValueTransfers(): " + (end - start) + "ms"); + if (LOG.isDebugEnabled()) { + LOG.trace("Time taken in computeValueTransfers(): " + (end - start) + "ms"); + } } /** @@ -2841,7 +2838,9 @@ public class Analyzer { // scope of the source slot and the receiving slot's block has a limit Analyzer firstBlock = globalState_.blockBySlot.get(slotIds.first); Analyzer secondBlock = globalState_.blockBySlot.get(slotIds.second); - LOG.trace("value transfer: from " + slotIds.first.toString()); + if (LOG.isTraceEnabled()) { + LOG.trace("value transfer: from " + slotIds.first.toString()); + } Pair<SlotId, SlotId> firstToSecond = null; Pair<SlotId, SlotId> secondToFirst = null; if (!(secondBlock.hasLimitOffsetClause_ && http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/ComputeStatsStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/ComputeStatsStmt.java b/fe/src/main/java/org/apache/impala/analysis/ComputeStatsStmt.java index 7aface4..298a17d 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ComputeStatsStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/ComputeStatsStmt.java @@ -336,7 +336,9 @@ public class ComputeStatsStmt extends StatementBase { if (p.isDefaultPartition()) continue; TPartitionStats partStats = p.getPartitionStats(); if (!p.hasIncrementalStats() || tableIsMissingColStats) { - if (partStats == null) LOG.trace(p.toString() + " does not have stats"); + if (partStats == null) { + if (LOG.isTraceEnabled()) LOG.trace(p.toString() + " does not have stats"); + } if (!tableIsMissingColStats) filterPreds.add(p.getConjunctSql()); List<String> partValues = Lists.newArrayList(); for (LiteralExpr partValue: p.getPartitionValues()) { @@ -345,7 +347,7 @@ public class ComputeStatsStmt extends StatementBase { } expectedPartitions_.add(partValues); } else { - LOG.trace(p.toString() + " does have statistics"); + if (LOG.isTraceEnabled()) LOG.trace(p.toString() + " does have statistics"); validPartStats_.add(partStats); } } @@ -377,7 +379,9 @@ public class ComputeStatsStmt extends StatementBase { } if (filterPreds.size() == 0 && validPartStats_.size() != 0) { - LOG.info("No partitions selected for incremental stats update"); + if (LOG.isDebugEnabled()) { + LOG.debug("No partitions selected for incremental stats update"); + } analyzer.addWarning("No partitions selected for incremental stats update"); return; } @@ -438,18 +442,20 @@ public class ComputeStatsStmt extends StatementBase { } tableStatsQueryStr_ = tableStatsQueryBuilder.toString(); - LOG.debug("Table stats query: " + tableStatsQueryStr_); + if (LOG.isDebugEnabled()) LOG.debug("Table stats query: " + tableStatsQueryStr_); if (columnStatsSelectList.isEmpty()) { // Table doesn't have any columns that we can compute stats for. - LOG.info("No supported column types in table " + table_.getTableName() + - ", no column statistics will be gathered."); + if (LOG.isDebugEnabled()) { + LOG.debug("No supported column types in table " + table_.getTableName() + + ", no column statistics will be gathered."); + } columnStatsQueryStr_ = null; return; } columnStatsQueryStr_ = columnStatsQueryBuilder.toString(); - LOG.debug("Column stats query: " + columnStatsQueryStr_); + if (LOG.isDebugEnabled()) LOG.debug("Column stats query: " + columnStatsQueryStr_); } /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/CreateDropRoleStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CreateDropRoleStmt.java b/fe/src/main/java/org/apache/impala/analysis/CreateDropRoleStmt.java index 3704e97..2007509 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CreateDropRoleStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/CreateDropRoleStmt.java @@ -20,6 +20,7 @@ package org.apache.impala.analysis; import org.apache.impala.catalog.Role; import org.apache.impala.common.AnalysisException; import org.apache.impala.thrift.TCreateDropRoleParams; + import com.google.common.base.Preconditions; /** @@ -29,9 +30,6 @@ public class CreateDropRoleStmt extends AuthorizationStmt { private final String roleName_; private final boolean isDropRole_; - // Set in analysis - private String user_; - public CreateDropRoleStmt(String roleName, boolean isDropRole) { Preconditions.checkNotNull(roleName); roleName_ = roleName; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java b/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java index 5f524f5..1fba940 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java +++ b/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java @@ -18,7 +18,6 @@ package org.apache.impala.analysis; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -167,7 +166,7 @@ public abstract class CreateOrAlterViewStmtBase extends StatementBase { } graph.addTargetColumnLabels(colDefs); graph.computeLineageGraph(viewDefStmt_.getResultExprs(), analyzer); - LOG.trace("lineage: " + graph.debugString()); + if (LOG.isTraceEnabled()) LOG.trace("lineage: " + graph.debugString()); } public TCreateOrAlterViewParams toThrift() { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/CreateUdfStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CreateUdfStmt.java b/fe/src/main/java/org/apache/impala/analysis/CreateUdfStmt.java index 4d5f3ed..644eb7c 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CreateUdfStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/CreateUdfStmt.java @@ -19,19 +19,16 @@ package org.apache.impala.analysis; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; -import org.apache.impala.catalog.Db; import org.apache.impala.catalog.Function; import org.apache.impala.catalog.PrimitiveType; import org.apache.impala.catalog.ScalarFunction; -import org.apache.impala.catalog.ScalarType; import org.apache.impala.catalog.Type; import org.apache.impala.common.AnalysisException; import org.apache.impala.hive.executor.UdfExecutor.JavaUdfDataType; import org.apache.impala.thrift.TFunctionBinaryType; -import org.apache.impala.thrift.TFunctionCategory; import org.apache.impala.thrift.TSymbolType; + import com.google.common.base.Preconditions; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/DropFunctionStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/DropFunctionStmt.java b/fe/src/main/java/org/apache/impala/analysis/DropFunctionStmt.java index e8f6666..9d9dd80 100644 --- a/fe/src/main/java/org/apache/impala/analysis/DropFunctionStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/DropFunctionStmt.java @@ -17,6 +17,8 @@ package org.apache.impala.analysis; +import java.util.ArrayList; + import org.apache.impala.authorization.AuthorizeableFn; import org.apache.impala.authorization.Privilege; import org.apache.impala.authorization.PrivilegeRequest; @@ -25,9 +27,6 @@ import org.apache.impala.catalog.Function; import org.apache.impala.catalog.Type; import org.apache.impala.common.AnalysisException; import org.apache.impala.thrift.TDropFunctionParams; -import org.apache.impala.thrift.TFunctionCategory; - -import java.util.ArrayList; /** * Represents a DROP [IF EXISTS] FUNCTION statement http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/ExprSubstitutionMap.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/ExprSubstitutionMap.java b/fe/src/main/java/org/apache/impala/analysis/ExprSubstitutionMap.java index a2de730..83e227e 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ExprSubstitutionMap.java +++ b/fe/src/main/java/org/apache/impala/analysis/ExprSubstitutionMap.java @@ -156,7 +156,9 @@ public final class ExprSubstitutionMap { for (int i = 0; i < lhs_.size(); ++i) { for (int j = i + 1; j < lhs_.size(); ++j) { if (lhs_.get(i).equals(lhs_.get(j))) { - LOG.info("verify: smap=" + this.debugString()); + if (LOG.isDebugEnabled()) { + LOG.debug("verify: smap=" + this.debugString()); + } Preconditions.checkState(false); } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/InlineViewRef.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/InlineViewRef.java b/fe/src/main/java/org/apache/impala/analysis/InlineViewRef.java index 42f9400..377ee1f 100644 --- a/fe/src/main/java/org/apache/impala/analysis/InlineViewRef.java +++ b/fe/src/main/java/org/apache/impala/analysis/InlineViewRef.java @@ -207,9 +207,11 @@ public class InlineViewRef extends TableRef { analyzer.createAuxEquivPredicate(new SlotRef(slotDesc), colExpr.clone()); } } - LOG.trace("inline view " + getUniqueAlias() + " smap: " + smap_.debugString()); - LOG.trace("inline view " + getUniqueAlias() + " baseTblSmap: " + - baseTblSmap_.debugString()); + if (LOG.isTraceEnabled()) { + LOG.trace("inline view " + getUniqueAlias() + " smap: " + smap_.debugString()); + LOG.trace("inline view " + getUniqueAlias() + " baseTblSmap: " + + baseTblSmap_.debugString()); + } analyzeHints(analyzer); // Now do the remaining join analysis http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/LiteralExpr.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/LiteralExpr.java b/fe/src/main/java/org/apache/impala/analysis/LiteralExpr.java index c1d41cb..a4052c6 100644 --- a/fe/src/main/java/org/apache/impala/analysis/LiteralExpr.java +++ b/fe/src/main/java/org/apache/impala/analysis/LiteralExpr.java @@ -172,7 +172,7 @@ public abstract class LiteralExpr extends Expr implements Comparable<LiteralExpr try { val = FeSupport.EvalConstExpr(constExpr, queryCtx); } catch (InternalException e) { - LOG.debug(String.format("Failed to evaluate expr '%s'", + LOG.error(String.format("Failed to evaluate expr '%s'", constExpr.toSql(), e.getMessage())); return null; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/LoadDataStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/LoadDataStmt.java b/fe/src/main/java/org/apache/impala/analysis/LoadDataStmt.java index b995cf0..3357df9 100644 --- a/fe/src/main/java/org/apache/impala/analysis/LoadDataStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/LoadDataStmt.java @@ -22,11 +22,10 @@ import java.io.IOException; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.s3a.S3AFileSystem; import org.apache.hadoop.hdfs.DistributedFileSystem; - import org.apache.impala.authorization.Privilege; import org.apache.impala.catalog.HdfsFileFormat; import org.apache.impala.catalog.HdfsPartition; @@ -37,11 +36,12 @@ import org.apache.impala.common.FileSystemUtil; import org.apache.impala.thrift.ImpalaInternalServiceConstants; import org.apache.impala.thrift.TLoadDataReq; import org.apache.impala.thrift.TTableName; -import org.apache.impala.util.TAccessLevelUtil; import org.apache.impala.util.FsPermissionChecker; +import org.apache.impala.util.TAccessLevelUtil; + import com.google.common.base.Preconditions; -/* +/** * Represents a LOAD DATA statement for moving data into an existing table: * LOAD DATA INPATH 'filepath' [OVERWRITE] INTO TABLE <table name> * [PARTITION (partcol1=val1, partcol2=val2 ...)] http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/ModifyStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/ModifyStmt.java b/fe/src/main/java/org/apache/impala/analysis/ModifyStmt.java index f4a48b2..8463b31 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ModifyStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/ModifyStmt.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.List; import org.apache.impala.authorization.Privilege; -import org.apache.impala.authorization.PrivilegeRequestBuilder; import org.apache.impala.catalog.Column; import org.apache.impala.catalog.KuduTable; import org.apache.impala.catalog.Table; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/PartitionSpec.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/PartitionSpec.java b/fe/src/main/java/org/apache/impala/analysis/PartitionSpec.java index b89e586..c131f84 100644 --- a/fe/src/main/java/org/apache/impala/analysis/PartitionSpec.java +++ b/fe/src/main/java/org/apache/impala/analysis/PartitionSpec.java @@ -21,21 +21,18 @@ import java.util.List; import java.util.Set; import org.apache.hadoop.hive.metastore.api.FieldSchema; - -import org.apache.impala.authorization.Privilege; import org.apache.impala.catalog.Column; -import org.apache.impala.catalog.HdfsTable; -import org.apache.impala.catalog.Table; import org.apache.impala.catalog.Type; import org.apache.impala.common.AnalysisException; import org.apache.impala.thrift.TPartitionKeyValue; + import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -/* +/** * Represents a partition spec - a collection of partition key/values. */ public class PartitionSpec extends PartitionSpecBase { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/ResetMetadataStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/ResetMetadataStmt.java b/fe/src/main/java/org/apache/impala/analysis/ResetMetadataStmt.java index 9d2249b..f1c95ab 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ResetMetadataStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/ResetMetadataStmt.java @@ -23,8 +23,8 @@ import org.apache.impala.authorization.PrivilegeRequestBuilder; import org.apache.impala.common.AnalysisException; import org.apache.impala.thrift.TResetMetadataRequest; import org.apache.impala.thrift.TTableName; + import com.google.common.base.Preconditions; -import com.google.common.base.Strings; /** * Representation of a REFRESH/INVALIDATE METADATA statement. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/SelectStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/SelectStmt.java b/fe/src/main/java/org/apache/impala/analysis/SelectStmt.java index d3dc8d2..264548c 100644 --- a/fe/src/main/java/org/apache/impala/analysis/SelectStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/SelectStmt.java @@ -272,7 +272,9 @@ public class SelectStmt extends QueryStmt { graph.addDependencyPredicates(sortInfo_.getOrderingExprs()); } - if (aggInfo_ != null) LOG.debug("post-analysis " + aggInfo_.debugString()); + if (aggInfo_ != null) { + if (LOG.isDebugEnabled()) LOG.debug("post-analysis " + aggInfo_.debugString()); + } } /** @@ -397,9 +399,11 @@ public class SelectStmt extends QueryStmt { } baseTblResultExprs_ = Expr.trySubstituteList(resultExprs_, baseTblSmap_, analyzer, false); - LOG.trace("baseTblSmap_: " + baseTblSmap_.debugString()); - LOG.trace("resultExprs: " + Expr.debugString(resultExprs_)); - LOG.trace("baseTblResultExprs: " + Expr.debugString(baseTblResultExprs_)); + if (LOG.isTraceEnabled()) { + LOG.trace("baseTblSmap_: " + baseTblSmap_.debugString()); + LOG.trace("resultExprs: " + Expr.debugString(resultExprs_)); + LOG.trace("baseTblResultExprs: " + Expr.debugString(baseTblResultExprs_)); + } } public List<TupleId> getTableRefIds() { @@ -686,14 +690,18 @@ public class SelectStmt extends QueryStmt { ExprSubstitutionMap combinedSmap = ExprSubstitutionMap.compose(countAllMap, finalAggInfo.getOutputSmap(), analyzer); - LOG.trace("combined smap: " + combinedSmap.debugString()); // change select list, having and ordering exprs to point to agg output. We need // to reanalyze the exprs at this point. - LOG.trace("desctbl: " + analyzer.getDescTbl().debugString()); - LOG.trace("resultexprs: " + Expr.debugString(resultExprs_)); + if (LOG.isTraceEnabled()) { + LOG.trace("combined smap: " + combinedSmap.debugString()); + LOG.trace("desctbl: " + analyzer.getDescTbl().debugString()); + LOG.trace("resultexprs: " + Expr.debugString(resultExprs_)); + } resultExprs_ = Expr.substituteList(resultExprs_, combinedSmap, analyzer, false); - LOG.trace("post-agg selectListExprs: " + Expr.debugString(resultExprs_)); + if (LOG.isTraceEnabled()) { + LOG.trace("post-agg selectListExprs: " + Expr.debugString(resultExprs_)); + } if (havingPred_ != null) { // Make sure the predicate in the HAVING clause does not contain a // subquery. @@ -701,12 +709,16 @@ public class SelectStmt extends QueryStmt { Predicates.instanceOf(Subquery.class))); havingPred_ = havingPred_.substitute(combinedSmap, analyzer, false); analyzer.registerConjuncts(havingPred_, true); - LOG.debug("post-agg havingPred: " + havingPred_.debugString()); + if (LOG.isTraceEnabled()) { + LOG.trace("post-agg havingPred: " + havingPred_.debugString()); + } } if (sortInfo_ != null) { sortInfo_.substituteOrderingExprs(combinedSmap, analyzer); - LOG.debug("post-agg orderingExprs: " + - Expr.debugString(sortInfo_.getOrderingExprs())); + if (LOG.isTraceEnabled()) { + LOG.trace("post-agg orderingExprs: " + + Expr.debugString(sortInfo_.getOrderingExprs())); + } } // check that all post-agg exprs point to agg output @@ -855,13 +867,16 @@ public class SelectStmt extends QueryStmt { } // change select list and ordering exprs to point to analytic output. We need // to reanalyze the exprs at this point. - resultExprs_ = Expr.substituteList(resultExprs_, smap, analyzer, - false); - LOG.trace("post-analytic selectListExprs: " + Expr.debugString(resultExprs_)); + resultExprs_ = Expr.substituteList(resultExprs_, smap, analyzer, false); + if (LOG.isTraceEnabled()) { + LOG.trace("post-analytic selectListExprs: " + Expr.debugString(resultExprs_)); + } if (sortInfo_ != null) { sortInfo_.substituteOrderingExprs(smap, analyzer); - LOG.trace("post-analytic orderingExprs: " + - Expr.debugString(sortInfo_.getOrderingExprs())); + if (LOG.isTraceEnabled()) { + LOG.trace("post-analytic orderingExprs: " + + Expr.debugString(sortInfo_.getOrderingExprs())); + } } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/ShowFilesStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/ShowFilesStmt.java b/fe/src/main/java/org/apache/impala/analysis/ShowFilesStmt.java index d102bb9..42839dd 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ShowFilesStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/ShowFilesStmt.java @@ -17,15 +17,13 @@ package org.apache.impala.analysis; -import java.util.List; - import org.apache.impala.authorization.Privilege; +import org.apache.impala.catalog.HdfsTable; +import org.apache.impala.catalog.Table; import org.apache.impala.common.AnalysisException; import org.apache.impala.thrift.TShowFilesParams; -import org.apache.impala.thrift.TPartitionKeyValue; -import org.apache.impala.catalog.Table; -import org.apache.impala.catalog.HdfsTable; import org.apache.impala.thrift.TTableName; + import com.google.common.base.Preconditions; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/StmtRewriter.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/StmtRewriter.java b/fe/src/main/java/org/apache/impala/analysis/StmtRewriter.java index eccb136..a53ffce 100644 --- a/fe/src/main/java/org/apache/impala/analysis/StmtRewriter.java +++ b/fe/src/main/java/org/apache/impala/analysis/StmtRewriter.java @@ -112,7 +112,7 @@ public class StmtRewriter { rewriteWhereClauseSubqueries(stmt, analyzer); } stmt.sqlString_ = null; - LOG.trace("rewritten stmt: " + stmt.toSql()); + if (LOG.isTraceEnabled()) LOG.trace("rewritten stmt: " + stmt.toSql()); } /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/TruncateStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/TruncateStmt.java b/fe/src/main/java/org/apache/impala/analysis/TruncateStmt.java index 0f1c9ce..714e9b1 100644 --- a/fe/src/main/java/org/apache/impala/analysis/TruncateStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/TruncateStmt.java @@ -17,19 +17,13 @@ package org.apache.impala.analysis; -import java.util.ArrayList; -import java.util.List; - import org.apache.impala.authorization.Privilege; import org.apache.impala.catalog.HdfsTable; import org.apache.impala.catalog.Table; -import org.apache.impala.catalog.Type; import org.apache.impala.common.AnalysisException; -import org.apache.impala.thrift.TTableName; import org.apache.impala.thrift.TTruncateParams; + import com.google.common.base.Preconditions; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; /** * Representation of a TRUNCATE statement. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/analysis/UnionStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/UnionStmt.java b/fe/src/main/java/org/apache/impala/analysis/UnionStmt.java index ad9150f..d5f1ef1 100644 --- a/fe/src/main/java/org/apache/impala/analysis/UnionStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/UnionStmt.java @@ -466,7 +466,9 @@ public class UnionStmt extends QueryStmt { TupleDescriptor tupleDesc = analyzer.getDescTbl().createTupleDescriptor("union"); tupleDesc.setIsMaterialized(true); tupleId_ = tupleDesc.getId(); - LOG.trace("UnionStmt.createMetadata: tupleId=" + tupleId_.toString()); + if (LOG.isTraceEnabled()) { + LOG.trace("UnionStmt.createMetadata: tupleId=" + tupleId_.toString()); + } // One slot per expr in the select blocks. Use first select block as representative. List<Expr> firstSelectExprs = operands_.get(0).getQueryStmt().getResultExprs(); http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/authorization/AuthorizationChecker.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/AuthorizationChecker.java b/fe/src/main/java/org/apache/impala/authorization/AuthorizationChecker.java index b9a6440..43e86cf 100644 --- a/fe/src/main/java/org/apache/impala/authorization/AuthorizationChecker.java +++ b/fe/src/main/java/org/apache/impala/authorization/AuthorizationChecker.java @@ -22,6 +22,9 @@ import java.util.List; import java.util.Set; import org.apache.commons.lang.reflect.ConstructorUtils; +import org.apache.impala.catalog.AuthorizationException; +import org.apache.impala.catalog.AuthorizationPolicy; +import org.apache.impala.common.InternalException; import org.apache.sentry.core.common.ActiveRoleSet; import org.apache.sentry.core.common.Subject; import org.apache.sentry.core.model.db.DBModelAction; @@ -33,13 +36,10 @@ import org.apache.sentry.provider.common.ProviderBackendContext; import org.apache.sentry.provider.common.ResourceAuthorizationProvider; import org.apache.sentry.provider.file.SimpleFileProviderBackend; -import org.apache.impala.catalog.AuthorizationException; -import org.apache.impala.catalog.AuthorizationPolicy; -import org.apache.impala.common.InternalException; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -/* +/** * Class used to check whether a user has access to a given resource. */ public class AuthorizationChecker { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/authorization/AuthorizeableDb.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/AuthorizeableDb.java b/fe/src/main/java/org/apache/impala/authorization/AuthorizeableDb.java index b358528..1f488f3 100644 --- a/fe/src/main/java/org/apache/impala/authorization/AuthorizeableDb.java +++ b/fe/src/main/java/org/apache/impala/authorization/AuthorizeableDb.java @@ -24,7 +24,7 @@ import org.apache.sentry.core.model.db.DBModelAuthorizable; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -/* +/** * Class used to authorize access to a database. */ public class AuthorizeableDb extends Authorizeable { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/authorization/AuthorizeableUri.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/AuthorizeableUri.java b/fe/src/main/java/org/apache/impala/authorization/AuthorizeableUri.java index ebef8f9..cbc6bf6 100644 --- a/fe/src/main/java/org/apache/impala/authorization/AuthorizeableUri.java +++ b/fe/src/main/java/org/apache/impala/authorization/AuthorizeableUri.java @@ -22,7 +22,7 @@ import java.util.List; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -/* +/** * Class used to authorize access to a URI. */ public class AuthorizeableUri extends Authorizeable { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/authorization/ImpalaInternalAdminUser.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/ImpalaInternalAdminUser.java b/fe/src/main/java/org/apache/impala/authorization/ImpalaInternalAdminUser.java index b68e8ea..edb77a2 100644 --- a/fe/src/main/java/org/apache/impala/authorization/ImpalaInternalAdminUser.java +++ b/fe/src/main/java/org/apache/impala/authorization/ImpalaInternalAdminUser.java @@ -17,7 +17,7 @@ package org.apache.impala.authorization; -/* +/** * A singleton class that represents a special user type used for internal Impala * sessions (for example, populating the debug webpage Catalog view). This user has * all privileges on all objects in the server. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/authorization/Privilege.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/Privilege.java b/fe/src/main/java/org/apache/impala/authorization/Privilege.java index c087b73..453558b 100644 --- a/fe/src/main/java/org/apache/impala/authorization/Privilege.java +++ b/fe/src/main/java/org/apache/impala/authorization/Privilege.java @@ -21,7 +21,7 @@ import java.util.EnumSet; import org.apache.sentry.core.model.db.DBModelAction; -/* +/** * Maps an Impala Privilege to one or more Hive Access "Actions". */ public enum Privilege { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequest.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequest.java b/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequest.java index 7dbc23a..d206908 100644 --- a/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequest.java +++ b/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequest.java @@ -19,7 +19,7 @@ package org.apache.impala.authorization; import com.google.common.base.Preconditions; -/* +/** * Represents a privilege request in the context of an Authorizeable object. If no * Authorizeable object is provided, it represents a privilege request on the server. * For example, SELECT on table Foo in database Bar. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/467642f2/fe/src/main/java/org/apache/impala/authorization/User.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/User.java b/fe/src/main/java/org/apache/impala/authorization/User.java index e29b19f..e699783 100644 --- a/fe/src/main/java/org/apache/impala/authorization/User.java +++ b/fe/src/main/java/org/apache/impala/authorization/User.java @@ -17,18 +17,17 @@ package org.apache.impala.authorization; -import com.google.common.base.Preconditions; -import com.google.common.annotations.VisibleForTesting; +import java.io.IOException; import org.apache.hadoop.security.authentication.util.KerberosName; import org.apache.impala.common.InternalException; import org.apache.impala.common.RuntimeEnv; -import org.apache.impala.service.BackendConfig; -import java.io.IOException; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; -/* +/** * Class that represents a User of an Impala session. */ public class User { @@ -37,7 +36,7 @@ public class User { // Refer to BackendConfig.initAuthToLocal() for initialization // of static auth_to_local configs in KerberosName class. - private KerberosName kerberosName_; + private final KerberosName kerberosName_; public User(String name) { Preconditions.checkNotNull(name);
