Repository: tajo Updated Branches: refs/heads/master f9825e71b -> 410a53c98
http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java index 5169136..3318d35 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java @@ -33,7 +33,6 @@ import org.apache.tajo.exception.TajoInternalError; import org.apache.tajo.plan.LogicalPlan; import org.apache.tajo.plan.Target; import org.apache.tajo.plan.util.ExprFinder; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -523,7 +522,7 @@ public class EvalTreeUtil { public static class EvalFinder extends BasicEvalNodeVisitor<Object, Object> { private EvalType targetType; - List<EvalNode> evalNodes = TUtil.newList(); + List<EvalNode> evalNodes = new ArrayList<>(); public EvalFinder(EvalType targetType) { this.targetType = targetType; @@ -546,7 +545,7 @@ public class EvalTreeUtil { } public static class OuterJoinSensitiveEvalFinder extends BasicEvalNodeVisitor<Object, Object> { - private List<EvalNode> evalNodes = TUtil.newList(); + private List<EvalNode> evalNodes = new ArrayList<>(); @Override public Object visit(Object context, EvalNode evalNode, Stack<EvalNode> stack) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java index 19a4ac2..0a900cc 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java @@ -40,11 +40,11 @@ import org.apache.tajo.storage.Tuple; import org.apache.tajo.storage.VTuple; import org.apache.tajo.unit.StorageUnit; import org.apache.tajo.util.FileUtil; -import org.apache.tajo.util.TUtil; import java.io.*; import java.net.URI; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -173,7 +173,7 @@ public class PythonScriptEngine extends TajoScriptEngine { // TODO: python parser must be improved. private static List<FunctionInfo> getFunctions(InputStream is) throws IOException { - List<FunctionInfo> functions = TUtil.newList(); + List<FunctionInfo> functions = new ArrayList<>(); InputStreamReader in = new InputStreamReader(is, Charset.defaultCharset()); BufferedReader br = new BufferedReader(in); String line = br.readLine(); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/function/stream/StreamingUtil.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/function/stream/StreamingUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/function/stream/StreamingUtil.java index 46558c1..1f6e2af 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/function/stream/StreamingUtil.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/function/stream/StreamingUtil.java @@ -20,9 +20,9 @@ package org.apache.tajo.plan.function.stream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.tajo.util.TUtil; import java.io.File; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -41,7 +41,7 @@ public class StreamingUtil { */ public static ProcessBuilder createProcess(String[] argv) { // Set the actual command to run with 'bash -c exec ...' - List<String> cmdArgs = TUtil.newList(); + List<String> cmdArgs = new ArrayList<>(); StringBuffer argBuffer = new StringBuffer(); for (String arg : argv) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/NameResolver.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/NameResolver.java b/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/NameResolver.java index c5dd577..cbe93d2 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/NameResolver.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/NameResolver.java @@ -33,7 +33,6 @@ import org.apache.tajo.plan.logical.RelationNode; import org.apache.tajo.plan.logical.ScanNode; import org.apache.tajo.util.Pair; import org.apache.tajo.util.StringUtils; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -92,7 +91,7 @@ public abstract class NameResolver { public static RelationNode lookupTable(LogicalPlan.QueryBlock block, String tableName) throws AmbiguousTableException { - List<RelationNode> found = TUtil.newList(); + List<RelationNode> found = new ArrayList<>(); for (RelationNode relation : block.getRelations()) { @@ -245,7 +244,7 @@ public abstract class NameResolver { String columnName, boolean includeSelfDescTable) throws AmbiguousColumnException { Preconditions.checkArgument(CatalogUtil.isSimpleIdentifier(columnName)); - List<Column> candidates = TUtil.newList(); + List<Column> candidates = new ArrayList<>(); for (RelationNode rel : block.getRelations()) { if (rel.isNameResolveBase()) { @@ -260,7 +259,7 @@ public abstract class NameResolver { return ensureUniqueColumn(candidates); } else { if (includeSelfDescTable) { - List<RelationNode> candidateRels = TUtil.newList(); + List<RelationNode> candidateRels = new ArrayList<>(); for (RelationNode rel : block.getRelations()) { if (describeSchemaByItself(rel)) { candidateRels.add(rel); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/ResolverByLegacy.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/ResolverByLegacy.java b/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/ResolverByLegacy.java index 94e38be..343b9ab 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/ResolverByLegacy.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/nameresolver/ResolverByLegacy.java @@ -30,8 +30,8 @@ import org.apache.tajo.plan.logical.LogicalNode; import org.apache.tajo.plan.logical.NodeType; import org.apache.tajo.plan.logical.RelationNode; import org.apache.tajo.util.Pair; -import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.List; public class ResolverByLegacy extends NameResolver { @@ -85,7 +85,7 @@ public class ResolverByLegacy extends NameResolver { if (currentNode != null && !currentNodeSchema.contains(found) && currentNode.getType() != NodeType.TABLE_SUBQUERY) { - List<Column> candidates = TUtil.newList(); + List<Column> candidates = new ArrayList<>(); if (block.getNamedExprsManager().isAliased(qualifiedName)) { String alias = block.getNamedExprsManager().getAlias(qualifiedName); found = resolve(plan, block, new ColumnReferenceExpr(alias), NameResolvingMode.LEGACY, includeSeflDescTable); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanPreprocessPhaseProvider.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanPreprocessPhaseProvider.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanPreprocessPhaseProvider.java index 3f64ae6..80805d8 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanPreprocessPhaseProvider.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanPreprocessPhaseProvider.java @@ -18,18 +18,16 @@ package org.apache.tajo.plan.rewrite; -import org.apache.tajo.util.TUtil; - +import java.util.ArrayList; import java.util.Collection; import java.util.List; public class BaseLogicalPlanPreprocessPhaseProvider extends LogicalPlanPreprocessPhaseProvider { @Override public Collection<Class<? extends LogicalPlanPreprocessPhase>> getPhases() { - List phases = TUtil.newList( - BaseSchemaBuildPhase.class, - SelfDescSchemaBuildPhase.class - ); + List phases = new ArrayList<>(); + phases.add(BaseSchemaBuildPhase.class); + phases.add(SelfDescSchemaBuildPhase.class); return phases; } } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanRewriteRuleProvider.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanRewriteRuleProvider.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanRewriteRuleProvider.java index 3776f62..68df282 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanRewriteRuleProvider.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseLogicalPlanRewriteRuleProvider.java @@ -20,8 +20,8 @@ package org.apache.tajo.plan.rewrite; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.plan.rewrite.rules.*; -import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -37,7 +37,7 @@ public class BaseLogicalPlanRewriteRuleProvider extends LogicalPlanRewriteRulePr @Override public Collection<Class<? extends LogicalPlanRewriteRule>> getPreRules() { - List<Class<? extends LogicalPlanRewriteRule>> rules = TUtil.newList(); + List<Class<? extends LogicalPlanRewriteRule>> rules = new ArrayList<>(); rules.add(CommonConditionReduceRule.class); // In-subquery rewrite phase must be executed before the filter push down phase. @@ -55,11 +55,10 @@ public class BaseLogicalPlanRewriteRuleProvider extends LogicalPlanRewriteRulePr @Override public Collection<Class<? extends LogicalPlanRewriteRule>> getPostRules() { - List<Class<? extends LogicalPlanRewriteRule>> rules = TUtil.newList( - ProjectionPushDownRule.class, - PartitionedTableRewriter.class, - AccessPathRewriter.class - ); + List<Class<? extends LogicalPlanRewriteRule>> rules = new ArrayList<>(); + rules.add(ProjectionPushDownRule.class); + rules.add(PartitionedTableRewriter.class); + rules.add(AccessPathRewriter.class); return rules; } } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseSchemaBuildPhase.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseSchemaBuildPhase.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseSchemaBuildPhase.java index a1306ad..99921c3 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseSchemaBuildPhase.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/BaseSchemaBuildPhase.java @@ -36,7 +36,6 @@ import org.apache.tajo.plan.nameresolver.NameResolver; import org.apache.tajo.plan.nameresolver.NameResolvingMode; import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.plan.visitor.SimpleAlgebraVisitor; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -149,7 +148,7 @@ public class BaseSchemaBuildPhase extends LogicalPlanPreprocessPhase { // columns of every relation should be resolved. Iterator<RelationNode> iterator = block.getRelations().iterator(); Schema schema; - List<Column> resolvedColumns = TUtil.newList(); + List<Column> resolvedColumns = new ArrayList<>(); while (iterator.hasNext()) { relationOp = iterator.next(); @@ -187,7 +186,7 @@ public class BaseSchemaBuildPhase extends LogicalPlanPreprocessPhase { private static List<NamedExpr> voidResolveAsteriskNamedExpr(LogicalPlanner.PlanContext context, List<NamedExpr> namedExprs) throws TajoException { - List<NamedExpr> rewrittenTargets = TUtil.newList(); + List<NamedExpr> rewrittenTargets = new ArrayList<>(); for (NamedExpr originTarget : namedExprs) { if (originTarget.getExpr().getType() == OpType.Asterisk) { // rewrite targets http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java index 29780d4..36d91bd 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/FilterPushDownRule.java @@ -42,7 +42,6 @@ import org.apache.tajo.plan.rewrite.rules.FilterPushDownRule.FilterPushDownConte import org.apache.tajo.plan.rewrite.rules.IndexScanInfo.SimplePredicate; import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.plan.visitor.BasicLogicalPlanVisitor; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -74,7 +73,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo public void setToOrigin(Map<EvalNode, EvalNode> evalMap) { //evalMap: copy -> origin - List<EvalNode> origins = TUtil.newList(); + List<EvalNode> origins = new ArrayList<>(); for (EvalNode eval : pushingDownFilters) { EvalNode origin = evalMap.get(eval); if (origin != null) { @@ -188,7 +187,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo LogicalNode left = joinNode.getLeftChild(); LogicalNode right = joinNode.getRightChild(); - List<EvalNode> notMatched = TUtil.newList(); + List<EvalNode> notMatched = new ArrayList<>(); // Join's input schema = right child output columns + left child output columns Map<EvalNode, EvalNode> transformedMap = findCanPushdownAndTransform(context, block, joinNode, left, notMatched, null, 0); @@ -210,7 +209,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo notMatched.clear(); context.pushingDownFilters.addAll(nonPushableQuals); - List<EvalNode> matched = TUtil.newList(); + List<EvalNode> matched = new ArrayList<>(); // If the query involves a subquery, the stack can be empty. // In this case, this join is the top most one within a query block. @@ -414,7 +413,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo private static List<EvalNode> extractNonEquiThetaJoinQuals(final Set<EvalNode> predicates, final LogicalPlan.QueryBlock block, final JoinNode joinNode) { - List<EvalNode> nonEquiThetaJoinQuals = TUtil.newList(); + List<EvalNode> nonEquiThetaJoinQuals = new ArrayList<>(); for (EvalNode eachEval: predicates) { if (isNonEquiThetaJoinQual(block, joinNode, eachEval)) { nonEquiThetaJoinQuals.add(eachEval); @@ -534,8 +533,8 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo @Override public LogicalNode visitTableSubQuery(FilterPushDownContext context, LogicalPlan plan, LogicalPlan.QueryBlock block, TableSubQueryNode node, Stack<LogicalNode> stack) throws TajoException { - List<EvalNode> matched = TUtil.newList(); - List<EvalNode> unmatched = TUtil.newList(); + List<EvalNode> matched = new ArrayList<>(); + List<EvalNode> unmatched = new ArrayList<>(); for (EvalNode eval : context.pushingDownFilters) { if (LogicalPlanner.checkIfBeEvaluatedAtRelation(block, eval, node)) { matched.add(eval); @@ -561,7 +560,8 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo Stack<LogicalNode> stack) throws TajoException { LogicalNode leftNode = unionNode.getLeftChild(); - List<EvalNode> origins = TUtil.newList(context.pushingDownFilters); + List<EvalNode> origins = new ArrayList<>(); + origins.addAll(context.pushingDownFilters); // transformed -> pushingDownFilters Map<EvalNode, EvalNode> transformedMap = transformEvalsWidthByPassNode(origins, plan, block, unionNode, leftNode); @@ -594,7 +594,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo Stack<LogicalNode> stack) throws TajoException { LogicalNode childNode = projectionNode.getChild(); - List<EvalNode> notMatched = TUtil.newList(); + List<EvalNode> notMatched = new ArrayList<>(); //copy -> origin BiMap<EvalNode, EvalNode> transformedMap = findCanPushdownAndTransform( @@ -791,8 +791,8 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo } } - List<EvalNode> aggrEvalOrigins = TUtil.newList(); - List<EvalNode> aggrEvals = TUtil.newList(); + List<EvalNode> aggrEvalOrigins = new ArrayList<>(); + List<EvalNode> aggrEvals = new ArrayList<>(); for (EvalNode eval : context.pushingDownFilters) { EvalNode copy = null; @@ -878,7 +878,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo context.pushingDownFilters.removeAll(aggrEvals); } - List<EvalNode> notMatched = TUtil.newList(); + List<EvalNode> notMatched = new ArrayList<>(); // transform Map<EvalNode, EvalNode> transformed = findCanPushdownAndTransform(context, block, groupbyNode,groupbyNode.getChild(), notMatched, null, 0); @@ -896,7 +896,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo public LogicalNode visitScan(FilterPushDownContext context, LogicalPlan plan, LogicalPlan.QueryBlock block, final ScanNode scanNode, Stack<LogicalNode> stack) throws TajoException { - List<EvalNode> matched = TUtil.newList(); + List<EvalNode> matched = new ArrayList<>(); // find partition column and check matching Set<String> partitionColumns = new HashSet<>(); @@ -942,7 +942,7 @@ public class FilterPushDownRule extends BasicLogicalPlanVisitor<FilterPushDownCo context.pushingDownFilters.removeAll(partitionEvals); - List<EvalNode> notMatched = TUtil.newList(); + List<EvalNode> notMatched = new ArrayList<>(); // transform Map<EvalNode, EvalNode> transformed = http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/InSubqueryRewriteRule.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/InSubqueryRewriteRule.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/InSubqueryRewriteRule.java index 6265e38..979c9d7 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/InSubqueryRewriteRule.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/InSubqueryRewriteRule.java @@ -32,7 +32,6 @@ import org.apache.tajo.plan.rewrite.LogicalPlanRewriteRule; import org.apache.tajo.plan.rewrite.LogicalPlanRewriteRuleContext; import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.plan.visitor.BasicLogicalPlanVisitor; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -65,7 +64,7 @@ public class InSubqueryRewriteRule implements LogicalPlanRewriteRule { } static List<InEval> extractInSubquery(EvalNode qual) { - List<InEval> inSubqueries = TUtil.newList(); + List<InEval> inSubqueries = new ArrayList<>(); for (EvalNode eachQual : EvalTreeUtil.findEvalsByType(qual, EvalType.IN)) { InEval inEval = (InEval) eachQual; if (inEval.getRightExpr().getType() == EvalType.SUBQUERY) { @@ -127,7 +126,8 @@ public class InSubqueryRewriteRule implements LogicalPlanRewriteRule { joinNode.setInSchema(inSchema); joinNode.setOutSchema(node.getOutSchema()); - List<Target> targets = TUtil.newList(PlannerUtil.schemaToTargets(inSchema)); + List<Target> targets = new ArrayList<>(); + targets.addAll(PlannerUtil.schemaToTargets(inSchema)); joinNode.setTargets(targets); block.addJoinType(joinType); @@ -140,7 +140,7 @@ public class InSubqueryRewriteRule implements LogicalPlanRewriteRule { // 4. remove in quals EvalNode[] originDnfs = AlgebraicUtil.toDisjunctiveNormalFormArray(node.getQual()); - List<EvalNode> rewrittenDnfs = TUtil.newList(); + List<EvalNode> rewrittenDnfs = new ArrayList<>(); for (EvalNode eachDnf : originDnfs) { Set<EvalNode> cnfs = new HashSet<>(Arrays.asList(AlgebraicUtil.toConjunctiveNormalFormArray(eachDnf))); cnfs.removeAll(inSubqueries); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/ProjectionPushDownRule.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/ProjectionPushDownRule.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/ProjectionPushDownRule.java index c9ef61f..ce083f1 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/ProjectionPushDownRule.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/ProjectionPushDownRule.java @@ -363,7 +363,7 @@ public class ProjectionPushDownRule extends } class FilteredTargetIterator implements Iterator<Target> { - List<Target> filtered = TUtil.newList(); + List<Target> filtered = new ArrayList<>(); Iterator<Target> iterator; public FilteredTargetIterator(Set<String> required) { @@ -469,7 +469,7 @@ public class ProjectionPushDownRule extends node.setInSchema(child.getOutSchema()); int evaluationCount = 0; - List<Target> finalTargets = TUtil.newList(); + List<Target> finalTargets = new ArrayList<>(); for (String referenceName : referenceNames) { Target target = context.targetListMgr.getTarget(referenceName); @@ -689,7 +689,7 @@ public class ProjectionPushDownRule extends if (node.hasAggFunctions() && aggEvalNames != null) { WindowFunctionEval [] aggEvals = new WindowFunctionEval[aggEvalNames.length]; int i = 0; - for (Iterator<String> it = getFilteredReferences(aggEvalNames, TUtil.newList(aggEvalNames)); it.hasNext();) { + for (Iterator<String> it = getFilteredReferences(aggEvalNames, Arrays.asList(aggEvalNames)); it.hasNext();) { String referenceName = it.next(); Target target = context.targetListMgr.getTarget(referenceName); @@ -795,7 +795,7 @@ public class ProjectionPushDownRule extends // Getting projected targets if (node.hasAggFunctions() && aggEvalNames != null) { List<AggregationFunctionCallEval> aggEvals = new ArrayList<>(); - for (Iterator<String> it = getFilteredReferences(aggEvalNames, TUtil.newList(aggEvalNames)); it.hasNext();) { + for (Iterator<String> it = getFilteredReferences(aggEvalNames, Arrays.asList(aggEvalNames)); it.hasNext();) { String referenceName = it.next(); Target target = context.targetListMgr.getTarget(referenceName); @@ -962,14 +962,14 @@ public class ProjectionPushDownRule extends } static Iterator<String> getFilteredReferences(String [] targetNames, Collection<String> required) { - return new FilteredStringsIterator(targetNames, required); + return new FilteredStringsIterator(Arrays.asList(targetNames), required); } static class FilteredStringsIterator implements Iterator<String> { Iterator<String> iterator; FilteredStringsIterator(Collection<String> targetNames, Collection<String> required) { - List<String> filtered = TUtil.newList(); + List<String> filtered = new ArrayList<>(); for (String name : targetNames) { if (required.contains(name)) { filtered.add(name); @@ -979,10 +979,6 @@ public class ProjectionPushDownRule extends iterator = filtered.iterator(); } - FilteredStringsIterator(String [] targetNames, Collection<String> required) { - this(TUtil.newList(targetNames), required); - } - @Override public boolean hasNext() { return iterator.hasNext(); @@ -1006,7 +1002,7 @@ public class ProjectionPushDownRule extends Iterator<Target> iterator; FilteredIterator(List<Target> targets, Set<String> requiredReferences) { - List<Target> filtered = TUtil.newList(); + List<Target> filtered = new ArrayList<>(); Map<String, Target> targetSet = new HashMap<>(); for (Target t : targets) { // Only should keep an raw target instead of field reference. http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java index e9f58d9..e8c0d4f 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java @@ -331,7 +331,7 @@ public class LogicalNodeDeserializer { } if (distinctGroupbyProto.getSubPlansCount() > 0) { - List<GroupbyNode> subPlans = TUtil.newList(); + List<GroupbyNode> subPlans = new ArrayList<>(); for (int i = 0; i < distinctGroupbyProto.getSubPlansCount(); i++) { subPlans.add(convertGroupby(context, evalContext, nodeMap, distinctGroupbyProto.getSubPlans(i))); } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeSerializer.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeSerializer.java b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeSerializer.java index d7a9598..e724768 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeSerializer.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeSerializer.java @@ -40,8 +40,8 @@ import org.apache.tajo.plan.serder.PlanProto.AlterTablespaceNode.SetLocation; import org.apache.tajo.plan.serder.PlanProto.LogicalNodeTree; import org.apache.tajo.plan.visitor.BasicLogicalPlanVisitor; import org.apache.tajo.util.ProtoUtil; -import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Stack; @@ -478,7 +478,7 @@ public class LogicalNodeSerializer extends BasicLogicalPlanVisitor<LogicalNodeSe PlanProto.ScanNode.Builder scanBuilder = buildScanNode(node); PlanProto.PartitionScanSpec.Builder partitionScan = PlanProto.PartitionScanSpec.newBuilder(); - List<String> pathStrs = TUtil.newList(); + List<String> pathStrs = new ArrayList<>(); if (node.getInputPaths() != null) { for (Path p : node.getInputPaths()) { pathStrs.add(p.toString()); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/util/ExprFinder.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/util/ExprFinder.java b/tajo-plan/src/main/java/org/apache/tajo/plan/util/ExprFinder.java index 8475e92..4e23c92 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/util/ExprFinder.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/util/ExprFinder.java @@ -25,8 +25,8 @@ import org.apache.tajo.algebra.UnaryOperator; import org.apache.tajo.exception.TajoException; import org.apache.tajo.exception.TajoInternalError; import org.apache.tajo.plan.visitor.SimpleAlgebraVisitor; -import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -35,7 +35,7 @@ import java.util.Stack; public class ExprFinder extends SimpleAlgebraVisitor<ExprFinder.Context, Object> { static class Context<T> { - List<T> set = TUtil.newList(); + List<T> set = new ArrayList<>(); OpType targetType; Context(OpType type) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/util/PartitionFilterAlgebraVisitor.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PartitionFilterAlgebraVisitor.java b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PartitionFilterAlgebraVisitor.java index 72fd939..7759280 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PartitionFilterAlgebraVisitor.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PartitionFilterAlgebraVisitor.java @@ -29,13 +29,13 @@ import org.apache.tajo.exception.UnsupportedException; import org.apache.tajo.plan.ExprAnnotator; import org.apache.tajo.plan.visitor.SimpleAlgebraVisitor; import org.apache.tajo.util.Pair; -import org.apache.tajo.util.TUtil; import org.apache.tajo.util.datetime.DateTimeUtil; import org.apache.tajo.util.datetime.TimeMeta; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.List; import java.util.Stack; import java.util.TimeZone; @@ -51,7 +51,7 @@ public class PartitionFilterAlgebraVisitor extends SimpleAlgebraVisitor<Object, private boolean isHiveCatalog = false; private Stack<String> queries = new Stack(); - private List<Pair<Type, Object>> parameters = TUtil.newList(); + private List<Pair<Type, Object>> parameters = new ArrayList<>(); public String getTableAlias() { return tableAlias; http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java index 1d286b3..239becc 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java @@ -38,7 +38,6 @@ import org.apache.tajo.plan.visitor.ExplainLogicalPlanVisitor; import org.apache.tajo.plan.visitor.SimpleAlgebraVisitor; import org.apache.tajo.util.KeyValueSet; import org.apache.tajo.util.StringUtils; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -765,7 +764,7 @@ public class PlannerUtil { } public static Collection<String> toQualifiedFieldNames(Collection<String> fieldNames, String qualifier) { - List<String> names = TUtil.newList(); + List<String> names = new ArrayList<>(); for (String n : fieldNames) { String[] parts = n.split("\\."); if (parts.length == 1) { @@ -934,7 +933,7 @@ public class PlannerUtil { * @return */ public static List<Expr> extractInSubquery(Expr qual) { - List<Expr> inSubqueries = TUtil.newList(); + List<Expr> inSubqueries = new ArrayList<>(); for (Expr eachIn : ExprFinder.findsInOrder(qual, OpType.InPredicate)) { InPredicate inPredicate = (InPredicate) eachIn; if (inPredicate.getInValue().getType() == OpType.SimpleTableSubquery) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PostLogicalPlanVerifier.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PostLogicalPlanVerifier.java b/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PostLogicalPlanVerifier.java index 7442561..9ded584 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PostLogicalPlanVerifier.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PostLogicalPlanVerifier.java @@ -27,8 +27,8 @@ import org.apache.tajo.plan.logical.*; import org.apache.tajo.plan.verifier.PostLogicalPlanVerifier.Context; import org.apache.tajo.plan.visitor.BasicLogicalPlanVisitor; import org.apache.tajo.unit.StorageUnit; -import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.List; import java.util.Stack; @@ -87,7 +87,7 @@ public class PostLogicalPlanVerifier extends BasicLogicalPlanVisitor<Context, Ob } else { boolean crossJoinAllowed = false; - List<String> largeRelationNames = TUtil.newList(); + List<String> largeRelationNames = new ArrayList<>(); if (isSimpleRelationNode(node.getLeftChild())) { if (getTableVolume((ScanNode) node.getLeftChild()) <= context.bcastLimitForCrossJoin * StorageUnit.KB) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseTablespace.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseTablespace.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseTablespace.java index 66138e3..c79de33 100644 --- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseTablespace.java +++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseTablespace.java @@ -73,8 +73,8 @@ public class HBaseTablespace extends Tablespace { new StorageProperty("hbase", false, true, false, false); public static final FormatProperty HFILE_FORMAT_PROPERTIES = new FormatProperty(true, false, true); public static final FormatProperty PUT_MODE_PROPERTIES = new FormatProperty(true, true, false); - public static final List<byte []> EMPTY_START_ROW_KEY = TUtil.newList(new byte [0]); - public static final List<byte []> EMPTY_END_ROW_KEY = TUtil.newList(new byte [0]); + public static final List<byte []> EMPTY_START_ROW_KEY = Arrays.asList(new byte [0]); + public static final List<byte []> EMPTY_END_ROW_KEY = Arrays.asList(new byte [0]); private Configuration hbaseConf; http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java index 4128998..8f18c7a 100644 --- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java +++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java @@ -226,7 +226,7 @@ public class FileFragment implements Fragment, Comparable<FileFragment>, Cloneab } if(hosts != null) { - builder.addAllHosts(TUtil.newList(hosts)); + builder.addAllHosts(Arrays.asList(hosts)); } FragmentProto.Builder fragmentBuilder = FragmentProto.newBuilder(); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java index 1598b50..d8d3359 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java @@ -33,7 +33,6 @@ import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.util.CommonTestingUtil; import org.apache.tajo.util.KeyValueSet; -import org.apache.tajo.util.TUtil; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -165,7 +164,7 @@ public class TestMergeScanner { targetSchema.addColumn(schema.getColumn(0)); targetSchema.addColumn(schema.getColumn(2)); - Scanner scanner = new MergeScanner(conf, schema, meta, TUtil.newList(fragment), targetSchema); + Scanner scanner = new MergeScanner(conf, schema, meta, Arrays.asList(fragment), targetSchema); assertEquals(isProjectableStorage(meta.getDataFormat()), scanner.isProjectable()); scanner.init(); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java index 1c963fd..0088504 100644 --- a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java +++ b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java @@ -23,7 +23,8 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.storage.jdbc.JdbcFragmentProtos.JdbcFragmentProto; -import org.apache.tajo.util.TUtil; + +import java.util.Arrays; public class JdbcFragment implements Fragment, Comparable<JdbcFragment>, Cloneable { String uri; @@ -89,7 +90,7 @@ public class JdbcFragment implements Fragment, Comparable<JdbcFragment>, Cloneab builder.setInputSourceId(this.inputSourceId); builder.setUri(this.uri); if(hostNames != null) { - builder.addAllHosts(TUtil.newList(hostNames)); + builder.addAllHosts(Arrays.asList(hostNames)); } CatalogProtos.FragmentProto.Builder fragmentBuilder = CatalogProtos.FragmentProto.newBuilder();
