Cool :) Thanks for doing this.
Tim On Wed, May 21, 2014 at 7:48 PM, Jacques Nadeau <[email protected]> wrote: > Yeah, it is another one of the commits in my working branch. :) > > There is a way to add a maven plugin that makes sure we don't reference > these in the future. I need to track it down again and create a JIRA for > it. > > > On Wed, May 21, 2014 at 6:17 PM, Timothy Chen <[email protected]> wrote: > >> May we also remove all the Hive12.Lists reference as well? >> >> +import com.google.hive12.common.collect.Lists; >> >> I see these cropping up everywhere now. >> >> Tim >> >> On Wed, May 21, 2014 at 6:14 PM, <[email protected]> wrote: >> > Remove references to jcommander's copy of Guava's Lists class. >> > >> > >> > Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo >> > Commit: >> http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/864ebde0 >> > Tree: >> http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/864ebde0 >> > Diff: >> http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/864ebde0 >> > >> > Branch: refs/heads/diagnostics2 >> > Commit: 864ebde0384030d5d553251dc879ea3c2b98164c >> > Parents: fbdca8f >> > Author: Jacques Nadeau <[email protected]> >> > Authored: Wed May 21 13:34:40 2014 -0700 >> > Committer: Jacques Nadeau <[email protected]> >> > Committed: Wed May 21 13:43:33 2014 -0700 >> > >> > ---------------------------------------------------------------------- >> > .../src/main/java/org/apache/drill/exec/client/DumpCat.java | 2 +- >> > .../java/org/apache/drill/exec/compile/ClassTransformer.java | 2 +- >> > .../drill/exec/compile/sig/ConstantExpressionIdentifier.java | 2 +- >> > .../java/org/apache/drill/exec/compile/sig/SignatureHolder.java | 2 +- >> > .../src/main/java/org/apache/drill/exec/expr/ClassGenerator.java | 2 +- >> > .../src/main/java/org/apache/drill/exec/ops/FragmentContext.java | 2 +- >> > .../src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java | 2 +- >> > .../java/org/apache/drill/exec/physical/config/HashJoinPOP.java | 4 >> ++-- >> > .../java/org/apache/drill/exec/physical/config/MergeJoinPOP.java | 4 >> ++-- >> > .../drill/exec/physical/config/OrderedPartitionSender.java | 2 +- >> > .../apache/drill/exec/physical/impl/limit/LimitRecordBatch.java | 2 +- >> > .../exec/physical/impl/xsort/PriorityQueueCopierTemplate.java | 2 +- >> > .../org/apache/drill/exec/planner/logical/DrillJoinRule.java | 2 +- >> > .../java/org/apache/drill/exec/planner/physical/HashAggPrel.java | 2 +- >> > .../org/apache/drill/exec/planner/physical/HashJoinPrel.java | 2 +- >> > .../org/apache/drill/exec/planner/physical/MergeJoinPrel.java | 2 +- >> > .../java/org/apache/drill/exec/planner/physical/PrelUtil.java | 2 +- >> > .../org/apache/drill/exec/planner/physical/StreamAggPrel.java | 2 +- >> > .../apache/drill/exec/planner/sql/parser/DrillParserUtil.java | 2 +- >> > .../main/java/org/apache/drill/exec/record/VectorContainer.java | 2 +- >> > .../java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java | 2 +- >> > .../java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java | 2 +- >> > .../org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java | 2 +- >> > .../java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java | 2 +- >> > .../org/apache/drill/exec/store/hive/HiveScanBatchCreator.java | 2 +- >> > .../main/java/org/apache/drill/exec/store/hive/HiveTable.java | 2 +- >> > .../org/apache/drill/exec/store/schedule/AffinityCreator.java | 2 +- >> > .../org/apache/drill/exec/store/schedule/BlockMapBuilder.java | 2 +- >> > .../src/main/java/org/apache/drill/exec/util/BatchPrinter.java | 2 +- >> > .../src/main/java/org/apache/drill/exec/util/VectorUtil.java | 2 +- >> > .../test/java/org/apache/drill/exec/cache/TestVectorCache.java | 2 +- >> > .../test/java/org/apache/drill/exec/cache/TestWriteToDisk.java | 2 +- >> > .../java/org/apache/drill/exec/physical/impl/SimpleRootExec.java | 2 +- >> > .../org/apache/drill/exec/physical/impl/join/TestMergeJoin.java | 2 +- >> > .../exec/physical/impl/mergereceiver/TestMergingReceiver.java | 2 +- >> > 35 files changed, 37 insertions(+), 37 deletions(-) >> > ---------------------------------------------------------------------- >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java >> > index 7e8a4a2..2d65e91 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java >> > @@ -36,7 +36,7 @@ import com.beust.jcommander.IParameterValidator; >> > import com.beust.jcommander.JCommander; >> > import com.beust.jcommander.Parameter; >> > import com.beust.jcommander.ParameterException; >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class DumpCat { >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java >> > index 09fdfa9..3dfc4ea 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java >> > @@ -30,7 +30,7 @@ import org.codehaus.commons.compiler.CompileException; >> > import org.objectweb.asm.ClassReader; >> > import org.objectweb.asm.tree.ClassNode; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.beust.jcommander.internal.Maps; >> > import com.beust.jcommander.internal.Sets; >> > import com.google.common.base.Preconditions; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java >> > index c0c8484..8a1efdf 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java >> > @@ -45,7 +45,7 @@ import >> org.apache.drill.common.expression.ValueExpressions.Decimal38Expression; >> > import org.apache.drill.common.expression.ValueExpressions.QuotedString; >> > import org.apache.drill.common.expression.visitors.ExprVisitor; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class ConstantExpressionIdentifier implements >> ExprVisitor<Boolean, IdentityHashMap<LogicalExpression, Object>, >> RuntimeException>{ >> > static final org.slf4j.Logger logger = >> org.slf4j.LoggerFactory.getLogger(ConstantExpressionIdentifier.class); >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java >> > index 1eb6732..158570a 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java >> > @@ -24,7 +24,7 @@ import java.util.Iterator; >> > import java.util.List; >> > import java.util.Map; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.beust.jcommander.internal.Maps; >> > import com.google.common.collect.ImmutableMap; >> > import com.google.common.collect.Iterators; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java >> > index fc48552..51ef003 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java >> > @@ -37,7 +37,7 @@ import >> org.apache.drill.exec.exception.SchemaChangeException; >> > import org.apache.drill.exec.expr.fn.DrillFuncHolder.WorkspaceReference; >> > import org.apache.drill.exec.record.TypedFieldId; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.beust.jcommander.internal.Maps; >> > import com.google.common.base.Preconditions; >> > import com.sun.codemodel.JArray; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java >> > index 3f9f181..7812d11 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java >> > @@ -48,7 +48,7 @@ import org.apache.drill.exec.server.options.OptionList; >> > import org.apache.drill.exec.server.options.OptionManager; >> > import org.apache.drill.exec.work.batch.IncomingBuffers; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.beust.jcommander.internal.Maps; >> > >> > /** >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java >> > index 78c0e3c..24d9cfe 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java >> > @@ -60,7 +60,7 @@ import org.apache.drill.exec.store.StoragePlugin; >> > import org.eigenbase.rel.RelFieldCollation.Direction; >> > import org.eigenbase.rel.RelFieldCollation.NullDirection; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class BasicOptimizer extends Optimizer{ >> > static final org.slf4j.Logger logger = >> org.slf4j.LoggerFactory.getLogger(BasicOptimizer.class); >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java >> > index 1ef7e97..06c23f3 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java >> > @@ -32,7 +32,7 @@ import >> org.apache.drill.exec.physical.base.PhysicalOperator; >> > import org.apache.drill.exec.physical.base.PhysicalVisitor; >> > import org.apache.drill.exec.physical.base.Size; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.fasterxml.jackson.annotation.JsonCreator; >> > import com.fasterxml.jackson.annotation.JsonProperty; >> > import com.google.common.base.Preconditions; >> > @@ -111,7 +111,7 @@ public class HashJoinPOP extends AbstractBase { >> > >> > public HashJoinPOP flipIfRight(){ >> > if(joinType == JoinRelType.RIGHT){ >> > - List<JoinCondition> flippedConditions = >> Lists.newArrayList(conditions.size()); >> > + List<JoinCondition> flippedConditions = >> Lists.newArrayList(); >> > for(JoinCondition c : conditions){ >> > flippedConditions.add(c.flip()); >> > } >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java >> > index be9cf95..b79a07e 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java >> > @@ -30,7 +30,7 @@ import org.apache.drill.exec.physical.base.Size; >> > import org.apache.drill.exec.proto.UserBitShared.CoreOperatorType; >> > import org.eigenbase.rel.JoinRelType; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.fasterxml.jackson.annotation.JsonCreator; >> > import com.fasterxml.jackson.annotation.JsonProperty; >> > import com.fasterxml.jackson.annotation.JsonTypeName; >> > @@ -106,7 +106,7 @@ public class MergeJoinPOP extends AbstractBase{ >> > >> > public MergeJoinPOP flipIfRight(){ >> > if(joinType == JoinRelType.RIGHT){ >> > - List<JoinCondition> flippedConditions = >> Lists.newArrayList(conditions.size()); >> > + List<JoinCondition> flippedConditions = Lists.newArrayList(); >> > for(JoinCondition c : conditions){ >> > flippedConditions.add(c.flip()); >> > } >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java >> > index 83076a4..d73926e 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java >> > @@ -29,7 +29,7 @@ import org.apache.drill.exec.physical.base.Size; >> > import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; >> > import org.apache.drill.exec.proto.UserBitShared.CoreOperatorType; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.fasterxml.jackson.annotation.JsonCreator; >> > import com.fasterxml.jackson.annotation.JsonProperty; >> > import com.fasterxml.jackson.annotation.JsonTypeName; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java >> > index ed56e79..648fd89 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java >> > @@ -17,7 +17,7 @@ >> > */ >> > package org.apache.drill.exec.physical.impl.limit; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.google.common.base.Objects; >> > import org.apache.drill.exec.exception.SchemaChangeException; >> > import org.apache.drill.exec.memory.OutOfMemoryException; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java >> > index 4221ae2..686cc48 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java >> > @@ -17,7 +17,7 @@ >> > */ >> > package org.apache.drill.exec.physical.impl.xsort; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.google.common.base.Stopwatch; >> > import org.apache.drill.common.expression.ExpressionPosition; >> > import org.apache.drill.common.expression.SchemaPath; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java >> > index 96854a7..e940b2e 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java >> > @@ -28,7 +28,7 @@ import org.eigenbase.rex.RexUtil; >> > import org.eigenbase.sql.fun.SqlStdOperatorTable; >> > import org.eigenbase.trace.EigenbaseTrace; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > import java.util.ArrayList; >> > import java.util.List; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrel.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrel.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrel.java >> > index b33805c..b06c9e9 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrel.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrel.java >> > @@ -48,7 +48,7 @@ import org.eigenbase.relopt.RelOptCost; >> > import org.eigenbase.relopt.RelOptPlanner; >> > import org.eigenbase.relopt.RelTraitSet; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class HashAggPrel extends AggregateRelBase implements Prel{ >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java >> > index b03ef62..9ac0834 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java >> > @@ -40,7 +40,7 @@ import org.eigenbase.relopt.RelTraitSet; >> > import org.eigenbase.rex.RexNode; >> > import org.eigenbase.util.Pair; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class HashJoinPrel extends JoinPrel { >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java >> > index 1987e99..ee9480d 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java >> > @@ -40,7 +40,7 @@ import org.eigenbase.relopt.RelTraitSet; >> > import org.eigenbase.rex.RexNode; >> > import org.eigenbase.util.Pair; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class MergeJoinPrel extends JoinPrel { >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java >> > index 1cd480c..1de2db3 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelUtil.java >> > @@ -49,7 +49,7 @@ import org.eigenbase.rex.RexLiteral; >> > import org.eigenbase.rex.RexNode; >> > import org.eigenbase.rex.RexVisitorImpl; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.google.common.collect.ImmutableList; >> > import com.google.common.collect.Sets; >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrel.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrel.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrel.java >> > index b35d1bb..f7cda32 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrel.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrel.java >> > @@ -49,7 +49,7 @@ import org.eigenbase.relopt.RelOptCost; >> > import org.eigenbase.relopt.RelOptPlanner; >> > import org.eigenbase.relopt.RelTraitSet; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class StreamAggPrel extends AggregateRelBase implements Prel{ >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java >> > index 4b427be..ed36903 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java >> > @@ -18,7 +18,7 @@ >> > >> > package org.apache.drill.exec.planner.sql.parser; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import org.eigenbase.sql.SqlNode; >> > import org.eigenbase.sql.SqlOperator; >> > import org.eigenbase.sql.parser.SqlParserPos; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java >> > index 1c7714e..dd62c67 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java >> > @@ -27,7 +27,7 @@ import >> org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; >> > import org.apache.drill.exec.vector.ValueVector; >> > import org.apache.drill.exec.vector.complex.AbstractMapVector; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.google.common.base.Preconditions; >> > >> > public class VectorContainer extends AbstractMapVector implements >> Iterable<VectorWrapper<?>>, VectorAccessible { >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java >> > index 232ec07..4ac79fd 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java >> > @@ -29,7 +29,7 @@ import >> org.apache.drill.exec.store.dfs.shim.DrillFileSystem; >> > import org.apache.hadoop.fs.FSDataInputStream; >> > import org.apache.hadoop.fs.FileStatus; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.fasterxml.jackson.annotation.JsonIgnore; >> > import com.google.common.collect.ImmutableList; >> > import com.google.common.collect.Range; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java >> > index 39d71e9..a26ea1f 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java >> > @@ -39,7 +39,7 @@ import >> org.apache.drill.exec.store.dfs.shim.DrillFileSystem; >> > import org.apache.drill.exec.store.dfs.shim.FileSystemCreator; >> > import org.apache.hadoop.conf.Configuration; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.beust.jcommander.internal.Maps; >> > >> > import org.apache.hadoop.fs.FileSystem; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java >> > index 718da23..e702c9c 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java >> > @@ -49,7 +49,7 @@ import >> org.apache.drill.exec.store.dfs.shim.DrillFileSystem; >> > import org.apache.hadoop.conf.Configuration; >> > import org.apache.hadoop.io.compress.CompressionCodecFactory; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.google.common.collect.ImmutableSet; >> > >> > public abstract class EasyFormatPlugin<T extends FormatPluginConfig> >> implements FormatPlugin { >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java >> > index 03e2095..d0cd8cc 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java >> > @@ -40,7 +40,7 @@ import >> org.apache.drill.exec.store.schedule.BlockMapBuilder; >> > import org.apache.drill.exec.store.schedule.CompleteFileWork; >> > import >> org.apache.drill.exec.store.schedule.CompleteFileWork.FileWorkImpl; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.fasterxml.jackson.annotation.JacksonInject; >> > import com.fasterxml.jackson.annotation.JsonCreator; >> > import com.fasterxml.jackson.annotation.JsonIgnore; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java >> > index 3dc9ac4..a0837bc 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java >> > @@ -17,7 +17,7 @@ >> > */ >> > package org.apache.drill.exec.store.hive; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import org.apache.drill.common.exceptions.ExecutionSetupException; >> > import org.apache.drill.exec.ops.FragmentContext; >> > import org.apache.drill.exec.physical.impl.BatchCreator; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveTable.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveTable.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveTable.java >> > index 3858804..df2e428 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveTable.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveTable.java >> > @@ -17,7 +17,7 @@ >> > */ >> > package org.apache.drill.exec.store.hive; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.fasterxml.jackson.annotation.JsonCreator; >> > import com.fasterxml.jackson.annotation.JsonIgnore; >> > import com.fasterxml.jackson.annotation.JsonProperty; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java >> > index d25abad..56d0485 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java >> > @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; >> > import org.apache.drill.exec.physical.EndpointAffinity; >> > import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.carrotsearch.hppc.ObjectFloatOpenHashMap; >> > import com.carrotsearch.hppc.cursors.ObjectFloatCursor; >> > import com.carrotsearch.hppc.cursors.ObjectLongCursor; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java >> > index 1ad134e..f27e8e6 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java >> > @@ -34,7 +34,7 @@ import org.apache.hadoop.fs.FileStatus; >> > import org.apache.hadoop.fs.FileSystem; >> > import org.apache.hadoop.fs.Path; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.codahale.metrics.MetricRegistry; >> > import com.codahale.metrics.Timer; >> > import com.google.common.base.Stopwatch; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java >> > index e5b8ad4..6222514 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java >> > @@ -17,7 +17,7 @@ >> > */ >> > package org.apache.drill.exec.util; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > import org.apache.commons.lang.StringUtils; >> > import org.apache.drill.common.expression.ExpressionStringBuilder; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java >> b/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java >> > index a43225e..a19be27 100644 >> > --- >> a/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java >> > +++ >> b/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java >> > @@ -26,7 +26,7 @@ import org.apache.drill.exec.record.VectorAccessible; >> > import org.apache.drill.exec.record.VectorWrapper; >> > import org.apache.drill.exec.rpc.RpcException; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class VectorUtil { >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestVectorCache.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestVectorCache.java >> b/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestVectorCache.java >> > index 49f41e3..3e0be69 100644 >> > --- >> a/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestVectorCache.java >> > +++ >> b/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestVectorCache.java >> > @@ -43,7 +43,7 @@ import org.apache.drill.exec.vector.ValueVector; >> > import org.apache.drill.exec.vector.VarBinaryVector; >> > import org.junit.Test; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > public class TestVectorCache extends ExecTest{ >> > >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestWriteToDisk.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestWriteToDisk.java >> b/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestWriteToDisk.java >> > index d3f6da5..2666233 100644 >> > --- >> a/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestWriteToDisk.java >> > +++ >> b/exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestWriteToDisk.java >> > @@ -17,7 +17,7 @@ >> > */ >> > package org.apache.drill.exec.cache; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > import org.apache.drill.common.config.DrillConfig; >> > import org.apache.drill.common.expression.ExpressionPosition; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java >> b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java >> > index 62f9a21..7d04340 100644 >> > --- >> a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java >> > +++ >> b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java >> > @@ -31,7 +31,7 @@ import >> org.apache.drill.exec.record.selection.SelectionVector2; >> > import org.apache.drill.exec.record.selection.SelectionVector4; >> > import org.apache.drill.exec.vector.ValueVector; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > >> > @Deprecated >> > public class SimpleRootExec implements RootExec, Iterable<ValueVector>{ >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java >> b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java >> > index 5ca7e72..4c1ce93 100644 >> > --- >> a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java >> > +++ >> b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java >> > @@ -56,7 +56,7 @@ import org.junit.AfterClass; >> > import org.junit.Ignore; >> > import org.junit.Test; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import com.google.common.base.Charsets; >> > import com.google.common.io.Files; >> > import com.codahale.metrics.MetricRegistry; >> > >> > >> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/864ebde0/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java >> > ---------------------------------------------------------------------- >> > diff --git >> a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java >> b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java >> > index 14d6fe2..3fb04aa 100644 >> > --- >> a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java >> > +++ >> b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java >> > @@ -20,7 +20,7 @@ package >> org.apache.drill.exec.physical.impl.mergereceiver; >> > >> > import java.util.List; >> > >> > -import com.beust.jcommander.internal.Lists; >> > +import com.google.common.collect.Lists; >> > import org.apache.drill.common.util.FileUtils; >> > import org.apache.drill.exec.client.DrillClient; >> > import org.apache.drill.exec.pop.PopUnitTestBase; >> > >>
