Remove deadcode from frontend - Part 1 Change-Id: I3fa810cf4eaf9f9ff545fe80a11bc62619039224 Reviewed-on: http://gerrit.cloudera.org:8080/6172 Reviewed-by: Alex Behm <[email protected]> Reviewed-by: Ravi Shetye <[email protected]> Tested-by: Impala Public 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/71eb569f Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/71eb569f Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/71eb569f Branch: refs/heads/master Commit: 71eb569f395dc01fe7b17ec851f69f4c2625306f Parents: 8b417c6 Author: Bharath Vissapragada <[email protected]> Authored: Mon Feb 27 15:04:32 2017 -0800 Committer: Impala Public Jenkins <[email protected]> Committed: Thu Mar 2 02:02:17 2017 +0000 ---------------------------------------------------------------------- .../apache/impala/analysis/AggregateInfo.java | 31 ------- .../apache/impala/analysis/AnalyticExpr.java | 2 - .../apache/impala/analysis/AnalyticInfo.java | 13 --- .../org/apache/impala/analysis/Analyzer.java | 89 -------------------- .../apache/impala/analysis/BinaryPredicate.java | 2 - .../impala/analysis/CollectionStructType.java | 1 - .../impala/analysis/CompoundPredicate.java | 17 ---- .../apache/impala/analysis/CreateDbStmt.java | 1 - .../impala/analysis/CreateFunctionStmtBase.java | 1 - .../analysis/CreateOrAlterViewStmtBase.java | 3 - .../impala/analysis/CreateTableLikeStmt.java | 1 - .../apache/impala/analysis/DescribeDbStmt.java | 1 - .../apache/impala/analysis/DescriptorTable.java | 14 --- .../impala/analysis/DropFunctionStmt.java | 1 - .../apache/impala/analysis/ExistsPredicate.java | 2 - .../java/org/apache/impala/analysis/Expr.java | 17 ---- .../apache/impala/analysis/InlineViewRef.java | 4 - .../org/apache/impala/analysis/InsertStmt.java | 3 - .../apache/impala/analysis/LimitElement.java | 5 -- .../org/apache/impala/analysis/ModifyStmt.java | 2 - .../apache/impala/analysis/PartitionDef.java | 1 + .../impala/analysis/PartitionListItem.java | 37 -------- .../apache/impala/analysis/PartitionSpec.java | 5 -- .../impala/analysis/PartitionSpecBase.java | 6 -- .../java/org/apache/impala/analysis/Path.java | 5 -- .../org/apache/impala/analysis/Predicate.java | 1 - .../apache/impala/analysis/RangePartition.java | 3 - .../impala/analysis/ResetMetadataStmt.java | 1 - .../apache/impala/analysis/SelectListItem.java | 1 - .../org/apache/impala/analysis/SlotRef.java | 2 - .../org/apache/impala/analysis/Subquery.java | 2 - .../org/apache/impala/analysis/TableRef.java | 25 ------ .../authorization/PrivilegeRequestBuilder.java | 8 -- .../impala/catalog/AggregateFunction.java | 6 -- .../java/org/apache/impala/catalog/Catalog.java | 2 - .../impala/catalog/CatalogObjectCache.java | 1 - .../impala/catalog/CatalogServiceCatalog.java | 19 ----- .../impala/catalog/ColumnNotFoundException.java | 2 - .../org/apache/impala/catalog/ColumnStats.java | 6 -- .../main/java/org/apache/impala/catalog/Db.java | 1 - .../org/apache/impala/catalog/Function.java | 19 ----- .../org/apache/impala/catalog/HBaseTable.java | 8 -- .../apache/impala/catalog/HdfsPartition.java | 13 +-- .../impala/catalog/HdfsStorageDescriptor.java | 5 -- .../org/apache/impala/catalog/HdfsTable.java | 7 -- .../org/apache/impala/catalog/KuduTable.java | 2 - .../catalog/PartitionNotFoundException.java | 2 - .../apache/impala/catalog/PrimitiveType.java | 1 - .../apache/impala/catalog/RolePrivilege.java | 1 - .../apache/impala/catalog/ScalarFunction.java | 16 ---- .../org/apache/impala/catalog/ScalarType.java | 8 -- .../java/org/apache/impala/catalog/Table.java | 6 -- .../impala/catalog/TableNotFoundException.java | 2 - .../java/org/apache/impala/catalog/Type.java | 20 ----- .../java/org/apache/impala/catalog/View.java | 2 - .../org/apache/impala/common/RuntimeEnv.java | 2 - .../hive/executor/ImpalaTextWritable.java | 2 - .../apache/impala/planner/DataPartition.java | 2 - .../impala/planner/DataSourceScanNode.java | 9 -- .../org/apache/impala/planner/ExchangeNode.java | 2 - .../apache/impala/planner/HBaseScanNode.java | 3 - .../org/apache/impala/planner/HashJoinNode.java | 2 - .../apache/impala/planner/JoinBuildSink.java | 2 - .../impala/planner/NestedLoopJoinNode.java | 2 - .../org/apache/impala/planner/PlanFragment.java | 2 - .../org/apache/impala/planner/PlanNode.java | 3 - .../apache/impala/planner/PlannerContext.java | 3 - .../org/apache/impala/planner/ValueRange.java | 1 - .../org/apache/impala/service/JniFrontend.java | 5 -- .../apache/impala/util/AvroSchemaConverter.java | 4 - .../org/apache/impala/util/HdfsCachingUtil.java | 9 -- .../java/org/apache/impala/util/KuduUtil.java | 12 --- .../org/apache/impala/util/NativeLogger.java | 1 - .../apache/impala/util/RequestPoolService.java | 3 - .../apache/impala/util/SentryPolicyService.java | 28 ------ .../impala/analysis/AuthorizationTest.java | 4 - .../apache/impala/planner/S3PlannerTest.java | 3 - 77 files changed, 3 insertions(+), 557 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 5dbde32..3e12ee1 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java +++ b/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java @@ -266,7 +266,6 @@ public class AggregateInfo extends AggregateInfoBase { public AggregateInfo getSecondPhaseDistinctAggInfo() { return secondPhaseDistinctAggInfo_; } - public AggPhase getAggPhase() { return aggPhase_; } public boolean isMerge() { return aggPhase_.isMerge(); } public boolean isDistinctAgg() { return secondPhaseDistinctAggInfo_ != null; } public ExprSubstitutionMap getIntermediateSmap() { return intermediateTupleSmap_; } @@ -298,22 +297,6 @@ public class AggregateInfo extends AggregateInfoBase { } /** - * Append ids of all slots that are being referenced in the process - * of performing the aggregate computation described by this AggregateInfo. - */ - public void getRefdSlots(List<SlotId> ids) { - Preconditions.checkState(outputTupleDesc_ != null); - if (groupingExprs_ != null) { - Expr.getIds(groupingExprs_, null, ids); - } - Expr.getIds(aggregateExprs_, null, ids); - // The backend assumes that the entire aggTupleDesc is materialized - for (int i = 0; i < outputTupleDesc_.getSlots().size(); ++i) { - ids.add(outputTupleDesc_.getSlots().get(i).getId()); - } - } - - /** * Substitute all the expressions (grouping expr, aggregate expr) and update our * substitution map according to the given substitution map: * - smap typically maps from tuple t1 to tuple t2 (example: the smap of an @@ -717,20 +700,6 @@ public class AggregateInfo extends AggregateInfoBase { } } - /** - * Returns DataPartition derived from grouping exprs. - * Returns unpartitioned spec if no grouping. - * TODO: this won't work when we start supporting range partitions, - * because we could derive both hash and order-based partitions - */ - public DataPartition getPartition() { - if (groupingExprs_.isEmpty()) { - return DataPartition.UNPARTITIONED; - } else { - return DataPartition.hashPartitioned(groupingExprs_); - } - } - @Override public String debugString() { StringBuilder out = new StringBuilder(super.debugString()); http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/AnalyticExpr.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/AnalyticExpr.java b/fe/src/main/java/org/apache/impala/analysis/AnalyticExpr.java index 864c10b..bf0fb1b 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AnalyticExpr.java +++ b/fe/src/main/java/org/apache/impala/analysis/AnalyticExpr.java @@ -62,8 +62,6 @@ import com.google.common.collect.Lists; * and need to be substituted as such; example: COUNT(COUNT(..)) OVER (..) */ public class AnalyticExpr extends Expr { - private final static Logger LOG = LoggerFactory.getLogger(AnalyticExpr.class); - private FunctionCallExpr fnCall_; private final List<Expr> partitionExprs_; // These elements are modified to point to the corresponding child exprs to keep them http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 5e59e0f..26ce3f8 100644 --- a/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java +++ b/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java @@ -125,19 +125,6 @@ public class AnalyticInfo extends AggregateInfoBase { return result; } - /** - * Append ids of all slots that are being referenced in the process - * of performing the analytic computation described by this AnalyticInfo. - */ - public void getRefdSlots(List<SlotId> ids) { - Preconditions.checkState(intermediateTupleDesc_ != null); - Expr.getIds(analyticExprs_, null, ids); - // The backend assumes that the entire intermediateTupleDesc is materialized - for (SlotDescriptor slotDesc: intermediateTupleDesc_.getSlots()) { - ids.add(slotDesc.getId()); - } - } - @Override public void materializeRequiredSlots(Analyzer analyzer, ExprSubstitutionMap smap) { materializedSlots_.clear(); http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 2809851..ef008b7 100644 --- a/fe/src/main/java/org/apache/impala/analysis/Analyzer.java +++ b/fe/src/main/java/org/apache/impala/analysis/Analyzer.java @@ -165,7 +165,6 @@ public class Analyzer { isSubquery_ = true; globalState_.containsSubquery = true; } - public boolean isSubquery() { return isSubquery_; } public boolean setHasPlanHints() { return globalState_.hasPlanHints = true; } public boolean hasPlanHints() { return globalState_.hasPlanHints; } public void setIsWithClause() { isWithClause_ = true; } @@ -316,12 +315,6 @@ public class Analyzer { public boolean containsSubquery() { return globalState_.containsSubquery; } - /** - * Helper function to reset the global state information about the existence of - * subqueries. - */ - public void resetSubquery() { globalState_.containsSubquery = false; } - // An analyzer stores analysis state for a single select block. A select block can be // a top level select statement, or an inline view select block. // ancestors contains the Analyzers of the enclosing select blocks of 'this' @@ -1588,35 +1581,6 @@ public class Analyzer { } /** - * Modifies the analysis state associated with the rhs table ref of an outer join - * to accomodate a join inversion that changes the rhs table ref of the join from - * oldRhsTbl to newRhsTbl. - * TODO: Revisit this function and how outer joins are inverted. This function - * should not be necessary because the semantics of an inverted outer join do - * not change. This function will naturally become obsolete when we can transform - * outer joins with otherPredicates into inner joins. - */ - public void invertOuterJoinState(TableRef oldRhsTbl, TableRef newRhsTbl) { - Preconditions.checkState(oldRhsTbl.getJoinOp().isOuterJoin()); - // Invert analysis state for an outer join. - List<ExprId> conjunctIds = - globalState_.conjunctsByOjClause.remove(oldRhsTbl.getId()); - if (conjunctIds != null) { - globalState_.conjunctsByOjClause.put(newRhsTbl.getId(), conjunctIds); - for (ExprId eid: conjunctIds) { - globalState_.ojClauseByConjunct.put(eid, newRhsTbl); - } - } else { - // An outer join is allowed not to have an On-clause if the rhs table ref is - // correlated or relative. - Preconditions.checkState(oldRhsTbl.isCorrelated() || oldRhsTbl.isRelative()); - } - for (Map.Entry<TupleId, TableRef> e: globalState_.outerJoinedTupleIds.entrySet()) { - if (e.getValue() == oldRhsTbl) e.setValue(newRhsTbl); - } - } - - /** * For each equivalence class, adds/removes predicates from conjuncts such that it * contains a minimum set of <lhsSlot> = <rhsSlot> predicates that establish the known * equivalences between slots in lhsTids and rhsTids which must be disjoint. @@ -2086,11 +2050,6 @@ public class Analyzer { return globalState_.equivClassBySlotId.get(slotId); } - public Collection<SlotId> getEquivSlots(SlotId slotId) { - EquivalenceClassId classId = globalState_.equivClassBySlotId.get(slotId); - return globalState_.equivClassMembers.get(classId); - } - public ExprSubstitutionMap getEquivClassSmap() { return globalState_.equivClassSmap; } /** @@ -2118,27 +2077,6 @@ public class Analyzer { } /** - * Removes redundant expressions from exprs based on equivalence classes, as follows: - * First, normalizes the exprs using the canonical SlotRef representative of each - * equivalence class. Then retains the first original element of exprs that is - * non-redundant in the normalized exprs. Returns a new list with the unique exprs. - */ - public List<Expr> removeRedundantExprs(List<Expr> exprs) { - List<Expr> result = Lists.newArrayList(); - List<Expr> normalizedExprs = - Expr.substituteList(exprs, globalState_.equivClassSmap, this, false); - Preconditions.checkState(exprs.size() == normalizedExprs.size()); - List<Expr> uniqueExprs = Lists.newArrayList(); - for (int i = 0; i < normalizedExprs.size(); ++i) { - if (!uniqueExprs.contains(normalizedExprs.get(i))) { - uniqueExprs.add(normalizedExprs.get(i)); - result.add(exprs.get(i).clone()); - } - } - return result; - } - - /** * Mark predicates as assigned. */ public void markConjunctsAssigned(List<Expr> conjuncts) { @@ -2155,10 +2093,6 @@ public class Analyzer { globalState_.assignedConjuncts.add(conjunct.getId()); } - public boolean isConjunctAssigned(Expr conjunct) { - return globalState_.assignedConjuncts.contains(conjunct.getId()); - } - public Set<ExprId> getAssignedConjuncts() { return Sets.newHashSet(globalState_.assignedConjuncts); } @@ -2168,19 +2102,6 @@ public class Analyzer { } /** - * Return true if there's at least one unassigned non-auxiliary conjunct. - */ - public boolean hasUnassignedConjuncts() { - for (ExprId id: globalState_.conjuncts.keySet()) { - if (globalState_.assignedConjuncts.contains(id)) continue; - Expr e = globalState_.conjuncts.get(id); - if (e.isAuxExpr()) continue; - return true; - } - return false; - } - - /** * Mark all slots that are referenced in exprs as materialized. */ public void materializeSlots(List<Expr> exprs) { @@ -2486,10 +2407,6 @@ public class Analyzer { return tableName.isFullyQualified() ? tableName.getDb() : getDefaultDb(); } - public String getTargetDbName(FunctionName fnName) { - return fnName.isFullyQualified() ? fnName.getDb() : getDefaultDb(); - } - /** * Returns the fully-qualified table name of tableName. If tableName * is already fully qualified, returns tableName. @@ -2519,12 +2436,6 @@ public class Analyzer { public List<Expr> getConjuncts() { return new ArrayList<Expr>(globalState_.conjuncts.values()); } - public Expr getConjunct(ExprId exprId) { - return globalState_.conjuncts.get(exprId); - } - public Map<TupleId, List<ExprId>> getEqJoinConjuncts() { - return globalState_.eqJoinConjuncts; - } public int incrementCallDepth() { return ++callDepth_; } public int decrementCallDepth() { return --callDepth_; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/BinaryPredicate.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/BinaryPredicate.java b/fe/src/main/java/org/apache/impala/analysis/BinaryPredicate.java index 145dbce..cc4b030 100644 --- a/fe/src/main/java/org/apache/impala/analysis/BinaryPredicate.java +++ b/fe/src/main/java/org/apache/impala/analysis/BinaryPredicate.java @@ -44,8 +44,6 @@ import com.google.common.collect.Lists; * */ public class BinaryPredicate extends Predicate { - private final static Logger LOG = LoggerFactory.getLogger(BinaryPredicate.class); - // true if this BinaryPredicate is inferred from slot equivalences, false otherwise. private boolean isInferred_ = false; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/CollectionStructType.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CollectionStructType.java b/fe/src/main/java/org/apache/impala/analysis/CollectionStructType.java index d05a6b2..a982774 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CollectionStructType.java +++ b/fe/src/main/java/org/apache/impala/analysis/CollectionStructType.java @@ -75,5 +75,4 @@ public class CollectionStructType extends StructType { public StructField getOptionalField() { return optionalField_; } public boolean isMapStruct() { return isMapStruct_; } - public boolean isArrayStruct() { return !isMapStruct_; } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/CompoundPredicate.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CompoundPredicate.java b/fe/src/main/java/org/apache/impala/analysis/CompoundPredicate.java index 2655eaa..6354004 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CompoundPredicate.java +++ b/fe/src/main/java/org/apache/impala/analysis/CompoundPredicate.java @@ -159,23 +159,6 @@ public class CompoundPredicate extends Predicate { } /** - * Retrieve the slots bound by BinaryPredicate, InPredicate and - * CompoundPredicates in the subtree rooted at 'this'. - */ - public ArrayList<SlotRef> getBoundSlots() { - ArrayList<SlotRef> slots = Lists.newArrayList(); - for (int i = 0; i < getChildren().size(); ++i) { - if (getChild(i) instanceof BinaryPredicate || - getChild(i) instanceof InPredicate) { - slots.add(((Predicate)getChild(i)).getBoundSlot()); - } else if (getChild(i) instanceof CompoundPredicate) { - slots.addAll(((CompoundPredicate)getChild(i)).getBoundSlots()); - } - } - return slots; - } - - /** * Negates a CompoundPredicate. */ @Override http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/CreateDbStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CreateDbStmt.java b/fe/src/main/java/org/apache/impala/analysis/CreateDbStmt.java index a9fbf20..9b2fd10 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CreateDbStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/CreateDbStmt.java @@ -58,7 +58,6 @@ public class CreateDbStmt extends StatementBase { public String getComment() { return comment_; } public String getDb() { return dbName_; } public boolean getIfNotExists() { return ifNotExists_; } - public HdfsUri getLocation() { return location_; } @Override public String toSql() { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/CreateFunctionStmtBase.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CreateFunctionStmtBase.java b/fe/src/main/java/org/apache/impala/analysis/CreateFunctionStmtBase.java index b9c49e5..211b3de 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CreateFunctionStmtBase.java +++ b/fe/src/main/java/org/apache/impala/analysis/CreateFunctionStmtBase.java @@ -83,7 +83,6 @@ public abstract class CreateFunctionStmtBase extends StatementBase { optArgs_ = optArgs; } - public String getComment() { return optArgs_.get(OptArg.COMMENT); } public boolean getIfNotExists() { return ifNotExists_; } public boolean hasSignature() { return args_ != null; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 1fba940..701964a 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java +++ b/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java @@ -200,10 +200,7 @@ public abstract class CreateOrAlterViewStmtBase extends StatementBase { return owner_; } - public List<ColumnDef> getColumnDescs() {return columnDefs_; } - public String getComment() { return comment_; } public boolean getIfNotExists() { return ifNotExists_; } - public String getOriginalViewDef() { return originalViewDef_; } public String getInlineViewDef() { return inlineViewDef_; } public String getTbl() { return tableName_.getTbl(); } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeStmt.java b/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeStmt.java index 6fde627..b0aad63 100644 --- a/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeStmt.java @@ -76,7 +76,6 @@ public class CreateTableLikeStmt extends StatementBase { public String getSrcTbl() { return srcTableName_.getTbl(); } public boolean isExternal() { return isExternal_; } public boolean getIfNotExists() { return ifNotExists_; } - public String getComment() { return comment_; } public THdfsFileFormat getFileFormat() { return fileFormat_; } public HdfsUri getLocation() { return location_; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/DescribeDbStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/DescribeDbStmt.java b/fe/src/main/java/org/apache/impala/analysis/DescribeDbStmt.java index 879e4e1..c6ffc9e 100644 --- a/fe/src/main/java/org/apache/impala/analysis/DescribeDbStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/DescribeDbStmt.java @@ -55,7 +55,6 @@ public class DescribeDbStmt extends StatementBase { } public String getDb() { return dbName_; } - public TDescribeOutputStyle getOutputStyle() { return outputStyle_; } @Override public void analyze(Analyzer analyzer) throws AnalysisException { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/DescriptorTable.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/DescriptorTable.java b/fe/src/main/java/org/apache/impala/analysis/DescriptorTable.java index 7040be6..f24a429 100644 --- a/fe/src/main/java/org/apache/impala/analysis/DescriptorTable.java +++ b/fe/src/main/java/org/apache/impala/analysis/DescriptorTable.java @@ -101,12 +101,9 @@ public class DescriptorTable { public TupleDescriptor getTupleDesc(TupleId id) { return tupleDescs_.get(id); } public SlotDescriptor getSlotDesc(SlotId id) { return slotDescs_.get(id); } - public Collection<TupleDescriptor> getTupleDescs() { return tupleDescs_.values(); } public Collection<SlotDescriptor> getSlotDescs() { return slotDescs_.values(); } - public TupleId getMaxTupleId() { return tupleIdGenerator_.getMaxId(); } public SlotId getMaxSlotId() { return slotIdGenerator_.getMaxId(); } - public Table getTargetTable() { return targetTable_; } public void setTargetTable(Table table) { targetTable_ = table; } /** @@ -140,17 +137,6 @@ public class DescriptorTable { } /** - * Return all ids in slotIds that belong to tupleId. - */ - public List<SlotId> getTupleSlotIds(List<SlotId> slotIds, TupleId tupleId) { - List<SlotId> result = Lists.newArrayList(); - for (SlotId id: slotIds) { - if (getSlotDesc(id).getParent().getId().equals(tupleId)) result.add(id); - } - return result; - } - - /** * Computes physical layout parameters of all descriptors. * Call this only after the last descriptor was added. * Test-only. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 9d9dd80..7a4fa53 100644 --- a/fe/src/main/java/org/apache/impala/analysis/DropFunctionStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/DropFunctionStmt.java @@ -51,7 +51,6 @@ public class DropFunctionStmt extends StatementBase { ifExists_ = ifExists; } - public FunctionName getFunction() { return desc_.getFunctionName(); } public boolean getIfExists() { return ifExists_; } private boolean hasSignature() { return fnArgs_ != null; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/ExistsPredicate.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/ExistsPredicate.java b/fe/src/main/java/org/apache/impala/analysis/ExistsPredicate.java index c8ecfc9..355f562 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ExistsPredicate.java +++ b/fe/src/main/java/org/apache/impala/analysis/ExistsPredicate.java @@ -28,8 +28,6 @@ import com.google.common.base.Preconditions; * Class representing a [NOT] EXISTS predicate. */ public class ExistsPredicate extends Predicate { - private final static Logger LOG = LoggerFactory.getLogger( - ExistsPredicate.class); private boolean notExists_ = false; public boolean isNotExists() { return notExists_; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/Expr.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/Expr.java b/fe/src/main/java/org/apache/impala/analysis/Expr.java index d9c46bf..8f01005 100644 --- a/fe/src/main/java/org/apache/impala/analysis/Expr.java +++ b/fe/src/main/java/org/apache/impala/analysis/Expr.java @@ -49,8 +49,6 @@ import com.google.common.collect.Sets; * */ abstract public class Expr extends TreeNode<Expr> implements ParseNode, Cloneable { - private final static Logger LOG = LoggerFactory.getLogger(Expr.class); - // Limits on the number of expr children and the depth of an expr tree. These maximum // values guard against crashes due to stack overflows (IMPALA-432) and were // experimentally determined to be safe. @@ -252,7 +250,6 @@ abstract public class Expr extends TreeNode<Expr> implements ParseNode, Cloneabl public boolean isOnClauseConjunct() { return isOnClauseConjunct_; } public void setIsOnClauseConjunct(boolean b) { isOnClauseConjunct_ = b; } public boolean isAuxExpr() { return isAuxExpr_; } - public boolean isRegisteredPredicate() { return id_ != null; } public void setIsAuxExpr() { isAuxExpr_ = true; } public Function getFn() { return fn_; } @@ -917,13 +914,6 @@ abstract public class Expr extends TreeNode<Expr> implements ParseNode, Cloneabl } /** - * Returns true if expr is fully bound by slotId, otherwise false. - */ - public boolean isBound(SlotId slotId) { - return isBoundBySlotIds(Lists.newArrayList(slotId)); - } - - /** * Returns true if expr is fully bound by slotIds, otherwise false. */ public boolean isBoundBySlotIds(List<SlotId> slotIds) { @@ -933,13 +923,6 @@ abstract public class Expr extends TreeNode<Expr> implements ParseNode, Cloneabl return true; } - public static boolean isBound(List<? extends Expr> exprs, List<TupleId> tids) { - for (Expr expr: exprs) { - if (!expr.isBoundByTupleIds(tids)) return false; - } - return true; - } - public static Expr getFirstBoundChild(Expr expr, List<TupleId> tids) { for (Expr child: expr.getChildren()) { if (child.isBoundByTupleIds(tids)) return child; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 377ee1f..811d284 100644 --- a/fe/src/main/java/org/apache/impala/analysis/InlineViewRef.java +++ b/fe/src/main/java/org/apache/impala/analysis/InlineViewRef.java @@ -295,10 +295,6 @@ public class InlineViewRef extends TableRef { } public QueryStmt getViewStmt() { return queryStmt_; } - public void setRewrittenViewStmt(QueryStmt stmt) { - Preconditions.checkState(getAnalyzer().containsSubquery()); - queryStmt_ = stmt; - } public List<String> getExplicitColLabels() { return explicitColLabels_; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/InsertStmt.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/InsertStmt.java b/fe/src/main/java/org/apache/impala/analysis/InsertStmt.java index 902d100..916f97f 100644 --- a/fe/src/main/java/org/apache/impala/analysis/InsertStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/InsertStmt.java @@ -51,8 +51,6 @@ import com.google.common.collect.Sets; * whose results are to be inserted. */ public class InsertStmt extends StatementBase { - private final static Logger LOG = LoggerFactory.getLogger(InsertStmt.class); - // Target table name as seen by the parser private final TableName originalTableName_; @@ -838,7 +836,6 @@ public class InsertStmt extends StatementBase { * Only valid after analysis */ public QueryStmt getQueryStmt() { return queryStmt_; } - public void setQueryStmt(QueryStmt stmt) { queryStmt_ = stmt; } public List<Expr> getPartitionKeyExprs() { return partitionKeyExprs_; } public boolean hasShuffleHint() { return hasShuffleHint_; } public boolean hasNoShuffleHint() { return hasNoShuffleHint_; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/LimitElement.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/LimitElement.java b/fe/src/main/java/org/apache/impala/analysis/LimitElement.java index a8ef9e2..d357b07 100644 --- a/fe/src/main/java/org/apache/impala/analysis/LimitElement.java +++ b/fe/src/main/java/org/apache/impala/analysis/LimitElement.java @@ -75,11 +75,6 @@ class LimitElement { return limit_; } - public boolean hasLimit() { - Preconditions.checkState(isAnalyzed_); - return limit_ != -1; - } - /** * Returns the integer offset, evaluated from the offset expression. Must call * analyze() first. If no offsetExpr exists, then 0 (the default offset) is returned. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 8463b31..c538968 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ModifyStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/ModifyStmt.java @@ -60,8 +60,6 @@ import com.google.common.collect.Sets; */ public abstract class ModifyStmt extends StatementBase { - private final static org.slf4j.Logger LOG = LoggerFactory.getLogger(ModifyStmt.class); - // List of explicitly mentioned assignment expressions in the UPDATE's SET clause protected final List<Pair<SlotRef, Expr>> assignments_; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/PartitionDef.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/PartitionDef.java b/fe/src/main/java/org/apache/impala/analysis/PartitionDef.java index 6a1175d..b5443cb 100644 --- a/fe/src/main/java/org/apache/impala/analysis/PartitionDef.java +++ b/fe/src/main/java/org/apache/impala/analysis/PartitionDef.java @@ -53,6 +53,7 @@ public class PartitionDef implements ParseNode { } public HdfsUri getLocation() { return location_; } + public PartitionSpec getPartitionSpec() { return partitionSpec_; } @Override http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/PartitionListItem.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/PartitionListItem.java b/fe/src/main/java/org/apache/impala/analysis/PartitionListItem.java deleted file mode 100644 index 4870d28..0000000 --- a/fe/src/main/java/org/apache/impala/analysis/PartitionListItem.java +++ /dev/null @@ -1,37 +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.impala.analysis; - -/** - * Representation of a single column:value element in the PARTITION (...) clause of an insert - * statement. - */ -public class PartitionListItem { - // Name of partitioning column. - private final String colName_; - // Value of partitioning column. Set to null for dynamic inserts. - private final LiteralExpr value_; - - public PartitionListItem(String colName, LiteralExpr value) { - this.colName_ = colName; - this.value_ = value; - } - - public String getColName() { return colName_; } - public LiteralExpr getValue() { return value_; } -} http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 2ea53c4..c9b289f 100644 --- a/fe/src/main/java/org/apache/impala/analysis/PartitionSpec.java +++ b/fe/src/main/java/org/apache/impala/analysis/PartitionSpec.java @@ -49,11 +49,6 @@ public class PartitionSpec extends PartitionSpecBase { public List<PartitionKeyValue> getPartitionSpecKeyValues() { return partitionSpec_; } - public boolean partitionExists() { - Preconditions.checkNotNull(partitionExists_); - return partitionExists_; - } - @Override public void analyze(Analyzer analyzer) throws AnalysisException { super.analyze(analyzer); http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/PartitionSpecBase.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/PartitionSpecBase.java b/fe/src/main/java/org/apache/impala/analysis/PartitionSpecBase.java index 5ead2d8..1a7c1a1 100644 --- a/fe/src/main/java/org/apache/impala/analysis/PartitionSpecBase.java +++ b/fe/src/main/java/org/apache/impala/analysis/PartitionSpecBase.java @@ -37,8 +37,6 @@ public abstract class PartitionSpecBase implements ParseNode { // Set during analysis. protected String nullPartitionKeyValue_; - public String getTbl() { return tableName_.getTbl(); } - public void setTableName(TableName tableName) {this.tableName_ = tableName; } public TableName getTableName() { return tableName_; } @@ -61,10 +59,6 @@ public abstract class PartitionSpecBase implements ParseNode { return partitionShouldExist_ != null && partitionShouldExist_; } - public boolean getPartitionShouldNotExist() { - return partitionShouldExist_ != null && !partitionShouldExist_; - } - // Set the privilege requirement for this partition spec. Must be set prior to // analysis. public void setPrivilegeRequirement(Privilege privilege) { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/Path.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/Path.java b/fe/src/main/java/org/apache/impala/analysis/Path.java index 89f3409..32ba3d5 100644 --- a/fe/src/main/java/org/apache/impala/analysis/Path.java +++ b/fe/src/main/java/org/apache/impala/analysis/Path.java @@ -282,11 +282,6 @@ public class Path { return matchedTypes_; } - public List<Integer> getMatchedPositions() { - Preconditions.checkState(isResolved_); - return matchedPositions_; - } - public boolean hasNonDestCollection() { Preconditions.checkState(isResolved_); return firstCollectionPathIdx_ != -1 && http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/Predicate.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/Predicate.java b/fe/src/main/java/org/apache/impala/analysis/Predicate.java index d1311b7..34e6722 100644 --- a/fe/src/main/java/org/apache/impala/analysis/Predicate.java +++ b/fe/src/main/java/org/apache/impala/analysis/Predicate.java @@ -38,7 +38,6 @@ public abstract class Predicate extends Expr { isEqJoinConjunct_ = other.isEqJoinConjunct_; } - public boolean isEqJoinConjunct() { return isEqJoinConjunct_; } public void setIsEqJoinConjunct(boolean v) { isEqJoinConjunct_ = v; } @Override http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/RangePartition.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/RangePartition.java b/fe/src/main/java/org/apache/impala/analysis/RangePartition.java index e2640a8..b441a78 100644 --- a/fe/src/main/java/org/apache/impala/analysis/RangePartition.java +++ b/fe/src/main/java/org/apache/impala/analysis/RangePartition.java @@ -221,7 +221,4 @@ public class RangePartition implements ParseNode { || tRangePartition.isSetUpper_bound_values()); return tRangePartition; } - - public List<Expr> getLowerBound() { return ImmutableList.copyOf(lowerBound_); } - public List<Expr> getUpperBound() { return ImmutableList.copyOf(upperBound_); } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/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 f1c95ab..6f6a3f1 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ResetMetadataStmt.java +++ b/fe/src/main/java/org/apache/impala/analysis/ResetMetadataStmt.java @@ -50,7 +50,6 @@ public class ResetMetadataStmt extends StatementBase { } public TableName getTableName() { return tableName_; } - public boolean isRefresh() { return isRefresh_; } @Override public void analyze(Analyzer analyzer) throws AnalysisException { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/SelectListItem.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/SelectListItem.java b/fe/src/main/java/org/apache/impala/analysis/SelectListItem.java index b47e59f..74398a8 100644 --- a/fe/src/main/java/org/apache/impala/analysis/SelectListItem.java +++ b/fe/src/main/java/org/apache/impala/analysis/SelectListItem.java @@ -55,7 +55,6 @@ class SelectListItem { public void setExpr(Expr expr) { expr_ = expr; } public boolean isStar() { return isStar_; } public String getAlias() { return alias_; } - public void setAlias(String alias) { alias_ = alias; } public List<String> getRawPath() { return rawPath_; } @Override http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/SlotRef.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/SlotRef.java b/fe/src/main/java/org/apache/impala/analysis/SlotRef.java index 5f77f3b..21bfd22 100644 --- a/fe/src/main/java/org/apache/impala/analysis/SlotRef.java +++ b/fe/src/main/java/org/apache/impala/analysis/SlotRef.java @@ -37,8 +37,6 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; public class SlotRef extends Expr { - private final static Logger LOG = LoggerFactory.getLogger(SlotRef.class); - private final List<String> rawPath_; private final String label_; // printed in toSql() http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/Subquery.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/Subquery.java b/fe/src/main/java/org/apache/impala/analysis/Subquery.java index ab3132c..cc2c075 100644 --- a/fe/src/main/java/org/apache/impala/analysis/Subquery.java +++ b/fe/src/main/java/org/apache/impala/analysis/Subquery.java @@ -38,8 +38,6 @@ import com.google.common.collect.Sets; * its own Analyzer context. */ public class Subquery extends Expr { - private final static Logger LOG = LoggerFactory.getLogger(Subquery.class); - // The QueryStmt of the subquery. protected QueryStmt stmt_; // A subquery has its own analysis context http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/analysis/TableRef.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/TableRef.java b/fe/src/main/java/org/apache/impala/analysis/TableRef.java index 975b70b..a56b8cd 100644 --- a/fe/src/main/java/org/apache/impala/analysis/TableRef.java +++ b/fe/src/main/java/org/apache/impala/analysis/TableRef.java @@ -263,7 +263,6 @@ public class TableRef implements ParseNode { public List<PlanHint> getJoinHints() { return joinHints_; } public List<PlanHint> getTableHints() { return tableHints_; } public Expr getOnClause() { return onClause_; } - public List<String> getUsingClause() { return usingColNames_; } public void setJoinOp(JoinOperator op) { this.joinOp_ = op; } public void setOnClause(Expr e) { this.onClause_ = e; } public void setUsingClause(List<String> colNames) { this.usingColNames_ = colNames; } @@ -571,30 +570,6 @@ public class TableRef implements ParseNode { @Override protected TableRef clone() { return new TableRef(this); } - /** - * Deep copies the given list of table refs and returns the clones in a new list. - * The linking structure in the original table refs is preserved in the clones, - * i.e., if the table refs were originally linked, then the corresponding clones - * are linked in the same way. Similarly, if the original table refs were not linked - * then the clones are also not linked. - * Assumes that the given table refs are self-contained with respect to linking, i.e., - * that no table ref links to another table ref not in the list. - */ - public static List<TableRef> cloneTableRefList(List<TableRef> tblRefs) { - List<TableRef> clonedTblRefs = Lists.newArrayListWithCapacity(tblRefs.size()); - TableRef leftTblRef = null; - for (TableRef tblRef: tblRefs) { - TableRef tblRefClone = tblRef.clone(); - clonedTblRefs.add(tblRefClone); - if (tblRef.leftTblRef_ != null) { - Preconditions.checkState(tblRefs.contains(tblRef.leftTblRef_)); - tblRefClone.leftTblRef_ = leftTblRef; - } - leftTblRef = tblRefClone; - } - return clonedTblRefs; - } - public void reset() { isAnalyzed_ = false; resolvedPath_ = null; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequestBuilder.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequestBuilder.java b/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequestBuilder.java index f47c52f..efe043d 100644 --- a/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequestBuilder.java +++ b/fe/src/main/java/org/apache/impala/authorization/PrivilegeRequestBuilder.java @@ -70,14 +70,6 @@ public class PrivilegeRequestBuilder { } /** - * Sets the authorizeable object to be a URI. - */ - public PrivilegeRequestBuilder onURI(String uriName) { - authorizeable_ = new AuthorizeableUri(uriName); - return this; - } - - /** * Specifies that permissions on any table in the given database. */ public PrivilegeRequestBuilder onAnyTable(String dbName) { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/AggregateFunction.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/AggregateFunction.java b/fe/src/main/java/org/apache/impala/catalog/AggregateFunction.java index ba8f972..bd87f80 100644 --- a/fe/src/main/java/org/apache/impala/catalog/AggregateFunction.java +++ b/fe/src/main/java/org/apache/impala/catalog/AggregateFunction.java @@ -44,8 +44,6 @@ public class AggregateFunction extends Function { private String removeFnSymbol_; private String finalizeFnSymbol_; - private static String BE_BUILTINS_CLASS = "AggregateFunctions"; - // If true, this aggregate function should ignore distinct. // e.g. min(distinct col) == min(col). // TODO: currently it is not possible for user functions to specify this. We should @@ -174,8 +172,6 @@ public class AggregateFunction extends Function { public String getInitFnSymbol() { return initFnSymbol_; } public String getSerializeFnSymbol() { return serializeFnSymbol_; } public String getMergeFnSymbol() { return mergeFnSymbol_; } - public String getGetValueFnSymbol() { return getValueFnSymbol_; } - public String getRemoveFnSymbol() { return removeFnSymbol_; } public String getFinalizeFnSymbol() { return finalizeFnSymbol_; } public boolean ignoresDistinct() { return ignoresDistinct_; } public boolean isAnalyticFn() { return isAnalyticFn_; } @@ -191,8 +187,6 @@ public class AggregateFunction extends Function { public void setInitFnSymbol(String fn) { initFnSymbol_ = fn; } public void setSerializeFnSymbol(String fn) { serializeFnSymbol_ = fn; } public void setMergeFnSymbol(String fn) { mergeFnSymbol_ = fn; } - public void setGetValueFnSymbol(String fn) { getValueFnSymbol_ = fn; } - public void setRemoveFnSymbol(String fn) { removeFnSymbol_ = fn; } public void setFinalizeFnSymbol(String fn) { finalizeFnSymbol_ = fn; } public void setIntermediateType(Type t) { intermediateType_ = t; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/Catalog.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/Catalog.java b/fe/src/main/java/org/apache/impala/catalog/Catalog.java index 403b9c1..5a3fc61 100644 --- a/fe/src/main/java/org/apache/impala/catalog/Catalog.java +++ b/fe/src/main/java/org/apache/impala/catalog/Catalog.java @@ -55,8 +55,6 @@ import org.apache.log4j.Logger; * Builtins are populated on startup in initBuiltins(). */ public abstract class Catalog { - private static final Logger LOG = Logger.getLogger(Catalog.class); - // Initial catalog version. public final static long INITIAL_CATALOG_VERSION = 0L; public static final String DEFAULT_DB = "default"; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/CatalogObjectCache.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/CatalogObjectCache.java b/fe/src/main/java/org/apache/impala/catalog/CatalogObjectCache.java index 9132905..c578e41 100644 --- a/fe/src/main/java/org/apache/impala/catalog/CatalogObjectCache.java +++ b/fe/src/main/java/org/apache/impala/catalog/CatalogObjectCache.java @@ -32,7 +32,6 @@ import com.google.common.collect.Lists; * entries only get applied if the new/updated object has a larger catalog version. */ public class CatalogObjectCache<T extends CatalogObject> implements Iterable<T> { - private static final Logger LOG = Logger.getLogger(CatalogObjectCache.class); private final boolean caseInsensitiveKeys_; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java b/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java index 00caf51..2adba9e 100644 --- a/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java +++ b/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java @@ -1017,25 +1017,6 @@ public class CatalogServiceCatalog extends Catalog { } /** - * Drops the partition specified in 'partitionSpec' from 'tbl'. Throws a - * CatalogException if 'tbl' is not an HdfsTable. If the partition having the given - * partition spec does not exist, null is returned. Otherwise, the modified table is - * returned. - */ - public Table dropPartition(Table tbl, List<TPartitionKeyValue> partitionSpec) - throws CatalogException { - Preconditions.checkNotNull(tbl); - Preconditions.checkNotNull(partitionSpec); - Preconditions.checkArgument(tbl.getLock().isHeldByCurrentThread()); - if (!(tbl instanceof HdfsTable)) { - throw new CatalogException("Table " + tbl.getFullName() + " is not an Hdfs table"); - } - HdfsTable hdfsTable = (HdfsTable) tbl; - if (hdfsTable.dropPartition(partitionSpec) == null) return null; - return hdfsTable; - } - - /** * Adds a partition to its HdfsTable and returns the modified table. */ public Table addPartition(HdfsPartition partition) throws CatalogException { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/ColumnNotFoundException.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/ColumnNotFoundException.java b/fe/src/main/java/org/apache/impala/catalog/ColumnNotFoundException.java index 80582b6..a865c4e 100644 --- a/fe/src/main/java/org/apache/impala/catalog/ColumnNotFoundException.java +++ b/fe/src/main/java/org/apache/impala/catalog/ColumnNotFoundException.java @@ -26,6 +26,4 @@ public class ColumnNotFoundException extends CatalogException { private static final long serialVersionUID = -2203080667446640542L; public ColumnNotFoundException(String s) { super(s); } - - public ColumnNotFoundException(String s, Exception cause) { super(s, cause); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/ColumnStats.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/ColumnStats.java b/fe/src/main/java/org/apache/impala/catalog/ColumnStats.java index 0b161df..ec4c0f5 100644 --- a/fe/src/main/java/org/apache/impala/catalog/ColumnStats.java +++ b/fe/src/main/java/org/apache/impala/catalog/ColumnStats.java @@ -40,8 +40,6 @@ import com.google.common.collect.Sets; * Statistics for a single column. */ public class ColumnStats { - private final static Logger LOG = LoggerFactory.getLogger(ColumnStats.class); - // Set of the currently supported column stats column types. private final static Set<PrimitiveType> SUPPORTED_COL_TYPES = Sets.newHashSet( PrimitiveType.BIGINT, PrimitiveType.BINARY, PrimitiveType.BOOLEAN, @@ -157,9 +155,6 @@ public class ColumnStats { return this; } - public void setAvgSize(float avgSize) { avgSize_ = avgSize; } - public void setAvgSerializedSize(float avgSize) { avgSerializedSize_ = avgSize; } - public void setMaxSize(long maxSize) { maxSize_ = maxSize; } public long getNumDistinctValues() { return numDistinctValues_; } public void setNumDistinctValues(long numDistinctValues) { this.numDistinctValues_ = numDistinctValues; @@ -171,7 +166,6 @@ public class ColumnStats { public boolean hasNulls() { return numNulls_ > 0; } public long getNumNulls() { return numNulls_; } public boolean hasAvgSerializedSize() { return avgSerializedSize_ >= 0; } - public boolean hasMaxSize() { return maxSize_ >= 0; } public boolean hasNumDistinctValues() { return numDistinctValues_ >= 0; } public boolean hasStats() { return numNulls_ != -1 || numDistinctValues_ != -1; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/Db.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/Db.java b/fe/src/main/java/org/apache/impala/catalog/Db.java index 0ed67c6..d8f5719 100644 --- a/fe/src/main/java/org/apache/impala/catalog/Db.java +++ b/fe/src/main/java/org/apache/impala/catalog/Db.java @@ -493,7 +493,6 @@ public class Db implements CatalogObject { public long getCatalogVersion() { return catalogVersion_; } @Override public void setCatalogVersion(long newVersion) { catalogVersion_ = newVersion; } - public Catalog getParentCatalog() { return parentCatalog_; } @Override public boolean isLoaded() { return true; } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/Function.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/Function.java b/fe/src/main/java/org/apache/impala/catalog/Function.java index 74df8c9..f7f2632 100644 --- a/fe/src/main/java/org/apache/impala/catalog/Function.java +++ b/fe/src/main/java/org/apache/impala/catalog/Function.java @@ -163,7 +163,6 @@ public class Function implements CatalogObject { return argTypes_[argTypes_.length - 1]; } - public void setName(FunctionName name) { name_ = name; } public void setLocation(HdfsUri loc) { location_ = loc; } public void setBinaryType(TFunctionBinaryType type) { binaryType_ = type; } public void setHasVarArgs(boolean v) { hasVarArgs_ = v; } @@ -240,24 +239,6 @@ public class Function implements CatalogObject { return new Function(name_, promoted, retType_, hasVarArgs_); } - /** - * Given a list of functions which are a super type of this function, select the best - * match. This is the one which requires the fewest type promotions. - */ - public Function selectClosestSuperType(List<Function> candidates) { - Preconditions.checkArgument(candidates.size() > 0); - if (candidates.size() == 1) return candidates.get(0); - - // Always promote CHAR to STRING before attempting any other promotions. - Function withStrs = promoteCharsToStrings(); - for (Function f: candidates) { - if (withStrs.isIndistinguishable(f)) return f; - } - // Otherwise, we use the previous rules of resolution which are to take the first - // one in the list. - return candidates.get(0); - } - private boolean isIdentical(Function o) { if (!o.name_.equals(name_)) return false; if (o.argTypes_.length != this.argTypes_.length) return false; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/HBaseTable.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/HBaseTable.java b/fe/src/main/java/org/apache/impala/catalog/HBaseTable.java index 3af1160..c901f1d 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HBaseTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/HBaseTable.java @@ -99,10 +99,6 @@ public class HBaseTable extends Table { // Minimum number of regions that are checked to estimate the row count private static final int MIN_NUM_REGIONS_TO_CHECK = 5; - // Column referring to HBase row key. - // Hive (including metastore) currently doesn't support composite HBase keys. - protected HBaseColumn rowKey_; - // Name of table in HBase. // 'this.name' is the alias of the HBase table in Hive. protected String hbaseTableName_; @@ -674,10 +670,6 @@ public class HBaseTable extends Table { return hbaseTableName_; } - public static Configuration getHBaseConf() { - return hbaseConf_; - } - public int getNumNodes() { // TODO: implement return 100; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java b/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java index 5db2247..5cde346 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java +++ b/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java @@ -209,8 +209,6 @@ public class HdfsPartition implements Comparable<HdfsPartition> { public long getOffset() { return fileBlock_.getOffset(); } public long getLength() { return fileBlock_.getLength(); } - // Returns true if at there at least one cached replica. - public boolean isCached() { return isCached_; } public List<Integer> getReplicaHostIdxs() { return fileBlock_.getReplica_host_idxs(); } @@ -441,16 +439,9 @@ public class HdfsPartition implements Comparable<HdfsPartition> { */ public TAccessLevel getAccessLevel() { return accessLevel_; } - /** - * Returns the HMS parameter with key 'key' if it exists, otherwise returns null. - */ - public String getParameter(String key) { - return hmsParameters_.get(key); - } - - public Map<String, String> getParameters() { return hmsParameters_; } + public Map<String, String> getParameters() { return hmsParameters_; } - public void putToParameters(String k, String v) { hmsParameters_.put(k, v); } + public void putToParameters(String k, String v) { hmsParameters_.put(k, v); } /** * Marks this partition's metadata as "dirty" indicating that changes have been http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/HdfsStorageDescriptor.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/HdfsStorageDescriptor.java b/fe/src/main/java/org/apache/impala/catalog/HdfsStorageDescriptor.java index ace00c2..4554a31 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HdfsStorageDescriptor.java +++ b/fe/src/main/java/org/apache/impala/catalog/HdfsStorageDescriptor.java @@ -42,7 +42,6 @@ public class HdfsStorageDescriptor { // Serde parameters that are recognized by table writers. private static final String BLOCK_SIZE = "blocksize"; - private static final String COMPRESSION = "compression"; // Important: don't change the ordering of these keys - if e.g. FIELD_DELIM is not // found, the value of LINE_DELIM is used, so LINE_DELIM must be found first. @@ -183,9 +182,6 @@ public class HdfsStorageDescriptor { public InvalidStorageDescriptorException(Exception ex) { super(ex.getMessage(), ex); } - public InvalidStorageDescriptorException(String msg, Throwable cause) { - super(msg, cause); - } } /** @@ -234,7 +230,6 @@ public class HdfsStorageDescriptor { public byte getCollectionDelim() { return collectionDelim_; } public byte getMapKeyDelim() { return mapKeyDelim_; } public byte getEscapeChar() { return escapeChar_; } - public byte getQuoteChar() { return quoteChar_; } public HdfsFileFormat getFileFormat() { return fileFormat_; } public int getBlockSize() { return blockSize_; } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java b/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java index fa6a1b7..3e51cba 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java @@ -212,8 +212,6 @@ public class HdfsTable extends Table { new HdfsPartitionLocationCompressor(numClusteringCols_); } - public boolean spansMultipleFileSystems() { return multipleFileSystems_; } - /** * Returns true if the table resides at a location which supports caching (e.g. HDFS). */ @@ -487,9 +485,6 @@ public class HdfsTable extends Table { public Collection<HdfsPartition> getPartitions() { return partitionMap_.values(); } public Map<Long, HdfsPartition> getPartitionMap() { return partitionMap_; } - public Map<String, HdfsPartition> getNameToPartitionMap() { - return nameToPartitionMap_; - } public Set<Long> getNullPartitionIds(int i) { return nullPartitionIds_.get(i); } public HdfsPartitionLocationCompressor getPartitionLocationCompressor() { return partitionLocationCompressor_; @@ -504,7 +499,6 @@ public class HdfsTable extends Table { * Set during load. */ public String getNullPartitionKeyValue() { return nullPartitionKeyValue_; } - public String getNullColumnValue() { return nullColumnValue_; } /* * Returns the storage location (HDFS path) of this table. @@ -1672,7 +1666,6 @@ public class HdfsTable extends Table { return hdfsTable; } - public long getNumHdfsFiles() { return numHdfsFiles_; } public long getTotalHdfsBytes() { return totalHdfsBytes_; } public String getHdfsBaseDir() { return hdfsBaseDir_; } public Path getHdfsBaseDirPath() { return new Path(hdfsBaseDir_); } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/KuduTable.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/KuduTable.java b/fe/src/main/java/org/apache/impala/catalog/KuduTable.java index 8409b45..c58c665 100644 --- a/fe/src/main/java/org/apache/impala/catalog/KuduTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/KuduTable.java @@ -67,8 +67,6 @@ import com.google.common.collect.Lists; */ public class KuduTable extends Table { - private static final Logger LOG = Logger.getLogger(KuduTable.class); - // Alias to the string key that identifies the storage handler for Kudu tables. public static final String KEY_STORAGE_HANDLER = hive_metastoreConstants.META_TABLE_STORAGE; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/PartitionNotFoundException.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/PartitionNotFoundException.java b/fe/src/main/java/org/apache/impala/catalog/PartitionNotFoundException.java index 60707ef..3cd4afa 100644 --- a/fe/src/main/java/org/apache/impala/catalog/PartitionNotFoundException.java +++ b/fe/src/main/java/org/apache/impala/catalog/PartitionNotFoundException.java @@ -26,6 +26,4 @@ public class PartitionNotFoundException extends CatalogException { private static final long serialVersionUID = -2203080667446640542L; public PartitionNotFoundException(String s) { super(s); } - - public PartitionNotFoundException(String s, Exception cause) { super(s, cause); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/PrimitiveType.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/PrimitiveType.java b/fe/src/main/java/org/apache/impala/catalog/PrimitiveType.java index 986c4fe..7397734 100644 --- a/fe/src/main/java/org/apache/impala/catalog/PrimitiveType.java +++ b/fe/src/main/java/org/apache/impala/catalog/PrimitiveType.java @@ -101,5 +101,4 @@ public enum PrimitiveType { } public int getSlotSize() { return slotSize_; } - public static int getMaxSlotSize() { return DECIMAL.slotSize_; } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/RolePrivilege.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/RolePrivilege.java b/fe/src/main/java/org/apache/impala/catalog/RolePrivilege.java index 58bb906..6ce035f 100644 --- a/fe/src/main/java/org/apache/impala/catalog/RolePrivilege.java +++ b/fe/src/main/java/org/apache/impala/catalog/RolePrivilege.java @@ -134,5 +134,4 @@ public class RolePrivilege implements CatalogObject { public long getCreateTimeMs() { return privilege_.isSetCreate_time_ms() ? privilege_.getCreate_time_ms() : -1L; } - public TPrivilegeScope getScope() { return privilege_.getScope(); } } http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/ScalarFunction.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/ScalarFunction.java b/fe/src/main/java/org/apache/impala/catalog/ScalarFunction.java index 766111e..dd88a71 100644 --- a/fe/src/main/java/org/apache/impala/catalog/ScalarFunction.java +++ b/fe/src/main/java/org/apache/impala/catalog/ScalarFunction.java @@ -236,20 +236,6 @@ public class ScalarFunction extends Function { } /** - * Create a function that is used to search the catalog for a matching builtin. Only - * the fields necessary for matching function prototypes are specified. - */ - public static ScalarFunction createBuiltinSearchDesc(String name, Type[] argTypes, - boolean hasVarArgs) { - ArrayList<Type> fnArgs = - (argTypes == null) ? new ArrayList<Type>() : Lists.newArrayList(argTypes); - ScalarFunction fn = new ScalarFunction( - new FunctionName(Catalog.BUILTINS_DB, name), fnArgs, Type.INVALID, hasVarArgs); - fn.setBinaryType(TFunctionBinaryType.BUILTIN); - return fn; - } - - /** * Static helper method to create a scalar function of given * TFunctionBinaryType. */ @@ -269,8 +255,6 @@ public class ScalarFunction extends Function { public void setCloseFnSymbol(String s) { closeFnSymbol_ = s; } public String getSymbolName() { return symbolName_; } - public String getPrepareFnSymbol() { return prepareFnSymbol_; } - public String getCloseFnSymbol() { return closeFnSymbol_; } @Override public String toSql(boolean ifNotExists) { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/ScalarType.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/ScalarType.java b/fe/src/main/java/org/apache/impala/catalog/ScalarType.java index 297f90e..f43cf6c 100644 --- a/fe/src/main/java/org/apache/impala/catalog/ScalarType.java +++ b/fe/src/main/java/org/apache/impala/catalog/ScalarType.java @@ -242,14 +242,6 @@ public class ScalarType extends Type { } } - public static Type[] toColumnType(PrimitiveType[] types) { - Type result[] = new Type[types.length]; - for (int i = 0; i < types.length; ++i) { - result[i] = createType(types[i]); - } - return result; - } - public int decimalPrecision() { Preconditions.checkState(type_ == PrimitiveType.DECIMAL); return precision_; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/Table.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/Table.java b/fe/src/main/java/org/apache/impala/catalog/Table.java index 61289a5..f70186e 100644 --- a/fe/src/main/java/org/apache/impala/catalog/Table.java +++ b/fe/src/main/java/org/apache/impala/catalog/Table.java @@ -65,7 +65,6 @@ public abstract class Table implements CatalogObject { protected final Db db_; protected final String name_; protected final String owner_; - protected TTableDescriptor tableDesc_; protected TAccessLevel accessLevel_ = TAccessLevel.READ_WRITE; // Lock protecting this table private final ReentrantLock tableLock_ = new ReentrantLock(); @@ -89,10 +88,6 @@ public abstract class Table implements CatalogObject { // The lastDdlTime for this table; -1 if not set protected long lastDdlTime_; - // Set of supported table types. - protected static EnumSet<TableType> SUPPORTED_TABLE_TYPES = EnumSet.of( - TableType.EXTERNAL_TABLE, TableType.MANAGED_TABLE, TableType.VIRTUAL_VIEW); - protected Table(org.apache.hadoop.hive.metastore.api.Table msTable, Db db, String name, String owner) { msTable_ = msTable; @@ -376,7 +371,6 @@ public abstract class Table implements CatalogObject { return new TableName(db_ != null ? db_.getName() : null, name_); } - public String getOwner() { return owner_; } public ArrayList<Column> getColumns() { return colsByPos_; } /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/TableNotFoundException.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/TableNotFoundException.java b/fe/src/main/java/org/apache/impala/catalog/TableNotFoundException.java index 7b93a20..3095939 100644 --- a/fe/src/main/java/org/apache/impala/catalog/TableNotFoundException.java +++ b/fe/src/main/java/org/apache/impala/catalog/TableNotFoundException.java @@ -26,6 +26,4 @@ public class TableNotFoundException extends CatalogException { private static final long serialVersionUID = -2203080667446640542L; public TableNotFoundException(String s) { super(s); } - - public TableNotFoundException(String s, Exception cause) { super(s, cause); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/Type.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/Type.java b/fe/src/main/java/org/apache/impala/catalog/Type.java index 45848c5..3061194 100644 --- a/fe/src/main/java/org/apache/impala/catalog/Type.java +++ b/fe/src/main/java/org/apache/impala/catalog/Type.java @@ -154,7 +154,6 @@ public abstract class Type { public boolean isBoolean() { return isScalarType(PrimitiveType.BOOLEAN); } public boolean isTimestamp() { return isScalarType(PrimitiveType.TIMESTAMP); } public boolean isDecimal() { return isScalarType(PrimitiveType.DECIMAL); } - public boolean isDecimalOrNull() { return isDecimal() || isNull(); } public boolean isFullySpecifiedDecimal() { return false; } public boolean isWildcardDecimal() { return false; } public boolean isWildcardVarchar() { return false; } @@ -316,15 +315,6 @@ public abstract class Type { } /** - * Checks if types t1 and t2 are assignment compatible, i.e. if both t1 and t2 can be - * assigned to a type t without an explicit cast and without any conversions that would - * result in loss of precision. - */ - public static boolean areAssignmentCompatibleTypes(Type t1, Type t2) { - return getAssignmentCompatibleType(t1, t2, true) != ScalarType.INVALID; - } - - /** * Returns true if this type exceeds the MAX_NESTING_DEPTH, false otherwise. */ public boolean exceedsMaxNestingDepth() { return exceedsMaxNestingDepth(0); } @@ -447,16 +437,6 @@ public abstract class Type { } /** - * Utility function to get the primitive type of a thrift type that is known - * to be scalar. - */ - public TPrimitiveType getTPrimitiveType(TColumnType ttype) { - Preconditions.checkState(ttype.getTypesSize() == 1); - Preconditions.checkState(ttype.types.get(0).getType() == TTypeNodeType.SCALAR); - return ttype.types.get(0).scalar_type.getType(); - } - - /** * JDBC data type description * Returns the column size for this type. * For numeric data this is the maximum precision. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/catalog/View.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/View.java b/fe/src/main/java/org/apache/impala/catalog/View.java index f437c58..b82c489 100644 --- a/fe/src/main/java/org/apache/impala/catalog/View.java +++ b/fe/src/main/java/org/apache/impala/catalog/View.java @@ -164,8 +164,6 @@ public class View extends Table { @Override public TCatalogObjectType getCatalogObjectType() { return TCatalogObjectType.VIEW; } public QueryStmt getQueryStmt() { return queryStmt_; } - public String getOriginalViewDef() { return originalViewDef_; } - public String getInlineViewDef() { return inlineViewDef_; } public boolean isLocalView() { return isLocalView_; } /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/common/RuntimeEnv.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/common/RuntimeEnv.java b/fe/src/main/java/org/apache/impala/common/RuntimeEnv.java index d33455a..bfb079e 100644 --- a/fe/src/main/java/org/apache/impala/common/RuntimeEnv.java +++ b/fe/src/main/java/org/apache/impala/common/RuntimeEnv.java @@ -28,8 +28,6 @@ import org.apache.impala.service.FeSupport; * can rely on a machine-independent RuntimeEnv. */ public class RuntimeEnv { - private final static Logger LOG = LoggerFactory.getLogger(RuntimeEnv.class); - public static RuntimeEnv INSTANCE = new RuntimeEnv(); private int numCores_; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/hive/executor/ImpalaTextWritable.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/hive/executor/ImpalaTextWritable.java b/fe/src/main/java/org/apache/impala/hive/executor/ImpalaTextWritable.java index bae4537..2a87454 100644 --- a/fe/src/main/java/org/apache/impala/hive/executor/ImpalaTextWritable.java +++ b/fe/src/main/java/org/apache/impala/hive/executor/ImpalaTextWritable.java @@ -37,8 +37,6 @@ public class ImpalaTextWritable extends Text { @Override public int getLength() { return string_.getLength(); } - public ImpalaStringWritable getStringWritable() { return string_; } - @Override public void set(byte[] v, int offset, int len) { string_.set(v, offset, len); http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/DataPartition.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/DataPartition.java b/fe/src/main/java/org/apache/impala/planner/DataPartition.java index f0f16fa..9e942e4 100644 --- a/fe/src/main/java/org/apache/impala/planner/DataPartition.java +++ b/fe/src/main/java/org/apache/impala/planner/DataPartition.java @@ -40,8 +40,6 @@ import com.google.common.collect.Lists; * DataStreamSender/DataStreamMgr/DataStreamRecvr). */ public class DataPartition { - private final static Logger LOG = LoggerFactory.getLogger(DataPartition.class); - private final TPartitionType type_; // for hash partition: exprs used to compute hash value http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/DataSourceScanNode.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/DataSourceScanNode.java b/fe/src/main/java/org/apache/impala/planner/DataSourceScanNode.java index 520f0f3..89f8377 100644 --- a/fe/src/main/java/org/apache/impala/planner/DataSourceScanNode.java +++ b/fe/src/main/java/org/apache/impala/planner/DataSourceScanNode.java @@ -336,15 +336,6 @@ public class DataSourceScanNode extends ScanNode { perHostMemCost_ = 1024L * 1024L * 1024L; } - /** - * Returns the per-host upper bound of memory that any number of concurrent scan nodes - * will use. Used for estimating the per-host memory requirement of queries. - */ - public static long getPerHostMemUpperBound() { - // TODO: What's a good estimate of memory consumption? - return 1024L * 1024L * 1024L; - } - @Override protected String getNodeExplainString(String prefix, String detailPrefix, TExplainLevel detailLevel) { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/ExchangeNode.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/ExchangeNode.java b/fe/src/main/java/org/apache/impala/planner/ExchangeNode.java index 658aa76..32673ae 100644 --- a/fe/src/main/java/org/apache/impala/planner/ExchangeNode.java +++ b/fe/src/main/java/org/apache/impala/planner/ExchangeNode.java @@ -45,8 +45,6 @@ import com.google.common.base.Preconditions; * inputs are also sorted individually on the same SortInfo parameter. */ public class ExchangeNode extends PlanNode { - private final static Logger LOG = LoggerFactory.getLogger(ExchangeNode.class); - // The serialization overhead per tuple in bytes when sent over an exchange. // Currently it accounts only for the tuple_offset entry per tuple (4B) in a // BE TRowBatch. If we modify the RowBatch serialization, then we need to http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/HBaseScanNode.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/HBaseScanNode.java b/fe/src/main/java/org/apache/impala/planner/HBaseScanNode.java index 9e25655..aea3750 100644 --- a/fe/src/main/java/org/apache/impala/planner/HBaseScanNode.java +++ b/fe/src/main/java/org/apache/impala/planner/HBaseScanNode.java @@ -100,9 +100,6 @@ public class HBaseScanNode extends ScanNode { private final static int DEFAULT_SUGGESTED_CACHING = 1024; private int suggestedCaching_ = DEFAULT_SUGGESTED_CACHING; - // HBase config; Common across all object instance. - private static Configuration hbaseConf_ = HBaseConfiguration.create(); - public HBaseScanNode(PlanNodeId id, TupleDescriptor desc) { super(id, desc, "SCAN HBASE"); desc_ = desc; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/HashJoinNode.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/HashJoinNode.java b/fe/src/main/java/org/apache/impala/planner/HashJoinNode.java index 07cfe9f..008cd5c 100644 --- a/fe/src/main/java/org/apache/impala/planner/HashJoinNode.java +++ b/fe/src/main/java/org/apache/impala/planner/HashJoinNode.java @@ -47,8 +47,6 @@ import com.google.common.collect.Lists; * inversion (for outer/semi/cross joins) it could also be the left child. */ public class HashJoinNode extends JoinNode { - private final static Logger LOG = LoggerFactory.getLogger(HashJoinNode.class); - public HashJoinNode(PlanNode outer, PlanNode inner, boolean isStraightJoin, DistributionMode distrMode, JoinOperator joinOp, List<BinaryPredicate> eqJoinConjuncts, List<Expr> otherJoinConjuncts) { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/JoinBuildSink.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/JoinBuildSink.java b/fe/src/main/java/org/apache/impala/planner/JoinBuildSink.java index e214fa6..7afced6 100644 --- a/fe/src/main/java/org/apache/impala/planner/JoinBuildSink.java +++ b/fe/src/main/java/org/apache/impala/planner/JoinBuildSink.java @@ -41,8 +41,6 @@ import com.google.common.collect.Lists; * Sink to materialize the build side of a join. */ public class JoinBuildSink extends DataSink { - private final static Logger LOG = LoggerFactory.getLogger(JoinBuildSink.class); - // id of join's build-side table assigned during planning private final JoinTableId joinTableId_; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/NestedLoopJoinNode.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/NestedLoopJoinNode.java b/fe/src/main/java/org/apache/impala/planner/NestedLoopJoinNode.java index cbaf370..0213c8b 100644 --- a/fe/src/main/java/org/apache/impala/planner/NestedLoopJoinNode.java +++ b/fe/src/main/java/org/apache/impala/planner/NestedLoopJoinNode.java @@ -50,8 +50,6 @@ import com.google.common.base.Preconditions; * right input. */ public class NestedLoopJoinNode extends JoinNode { - private final static Logger LOG = LoggerFactory.getLogger(NestedLoopJoinNode.class); - public NestedLoopJoinNode(PlanNode outer, PlanNode inner, boolean isStraightJoin, DistributionMode distrMode, JoinOperator joinOp, List<Expr> otherJoinConjuncts) { super(outer, inner, isStraightJoin, distrMode, joinOp, http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/PlanFragment.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/PlanFragment.java b/fe/src/main/java/org/apache/impala/planner/PlanFragment.java index 168e485..e4888f9 100644 --- a/fe/src/main/java/org/apache/impala/planner/PlanFragment.java +++ b/fe/src/main/java/org/apache/impala/planner/PlanFragment.java @@ -74,8 +74,6 @@ import com.google.common.collect.Sets; * fix that */ public class PlanFragment extends TreeNode<PlanFragment> { - private final static Logger LOG = LoggerFactory.getLogger(PlanFragment.class); - private final PlanFragmentId fragmentId_; private PlanId planId_; private CohortId cohortId_; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/PlanNode.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/PlanNode.java b/fe/src/main/java/org/apache/impala/planner/PlanNode.java index 312ea5b..978e0ac 100644 --- a/fe/src/main/java/org/apache/impala/planner/PlanNode.java +++ b/fe/src/main/java/org/apache/impala/planner/PlanNode.java @@ -65,9 +65,6 @@ import com.google.common.math.LongMath; abstract public class PlanNode extends TreeNode<PlanNode> { private final static Logger LOG = LoggerFactory.getLogger(PlanNode.class); - // TODO: Retrieve from the query options instead of using a default. - protected final static int DEFAULT_BATCH_SIZE = 1024; - // String used for this node in getExplainString(). protected String displayName_; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/PlannerContext.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/PlannerContext.java b/fe/src/main/java/org/apache/impala/planner/PlannerContext.java index 06208aa..b2881b7 100644 --- a/fe/src/main/java/org/apache/impala/planner/PlannerContext.java +++ b/fe/src/main/java/org/apache/impala/planner/PlannerContext.java @@ -37,9 +37,6 @@ public class PlannerContext { // used for determining whether a broadcast join is feasible. public final static double HASH_TBL_SPACE_OVERHEAD = 1.1; - // The maximum fraction of remaining memory that a sort node can use during execution. - public final static double SORT_MEM_MAX_FRACTION = 0.80; - // Assumed average number of items in a nested collection, since we currently have no // statistics on nested fields. The motivation for this constant is to avoid // pathological plan choices that could result from a SubplanNode having an unknown http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/planner/ValueRange.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/planner/ValueRange.java b/fe/src/main/java/org/apache/impala/planner/ValueRange.java index 492dd3d..4b8f252 100644 --- a/fe/src/main/java/org/apache/impala/planner/ValueRange.java +++ b/fe/src/main/java/org/apache/impala/planner/ValueRange.java @@ -36,7 +36,6 @@ import com.google.common.base.Preconditions; * value, both bounds are set. */ public class ValueRange { - private final static Logger LOG = LoggerFactory.getLogger(ValueRange.class); private Expr lowerBound_; private boolean lowerBoundInclusive_; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/71eb569f/fe/src/main/java/org/apache/impala/service/JniFrontend.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/service/JniFrontend.java b/fe/src/main/java/org/apache/impala/service/JniFrontend.java index 5fcd54c..2b6748d 100644 --- a/fe/src/main/java/org/apache/impala/service/JniFrontend.java +++ b/fe/src/main/java/org/apache/impala/service/JniFrontend.java @@ -112,11 +112,6 @@ public class JniFrontend { new TBinaryProtocol.Factory(); private final Frontend frontend_; - // Required minimum value (in milliseconds) for the HDFS config - // 'dfs.client.file-block-storage-locations.timeout.millis' - private static final long MIN_DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS = - 10 * 1000; - /** * Create a new instance of the Jni Frontend. */
