http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java index fd19e3d..3312d91 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java @@ -24,9 +24,7 @@ import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.FunctionHolderExpression; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.fn.FuncHolder; -import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.MajorType; - import org.apache.drill.exec.expr.fn.HiveFuncHolder; public class HiveFuncHolderExpr extends FunctionHolderExpression implements Iterable<LogicalExpression>{ @@ -48,6 +46,7 @@ public class HiveFuncHolderExpr extends FunctionHolderExpression implements Iter return args.iterator(); } + @Override public FuncHolder getHolder() { return holder; } @@ -67,10 +66,10 @@ public class HiveFuncHolderExpr extends FunctionHolderExpression implements Iter public boolean isRandom() { return holder.isRandom(); } - + @Override public HiveFuncHolderExpr copy(List<LogicalExpression> args) { return new HiveFuncHolderExpr(this.nameUsed, this.holder, args, this.getPosition()); } - + }
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFuncHolder.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFuncHolder.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFuncHolder.java index 2bc3576..2861b97 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFuncHolder.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFuncHolder.java @@ -17,15 +17,8 @@ */ package org.apache.drill.exec.expr.fn; -import com.sun.codemodel.JBlock; -import com.sun.codemodel.JCatchBlock; -import com.sun.codemodel.JClass; -import com.sun.codemodel.JCodeModel; -import com.sun.codemodel.JConditional; -import com.sun.codemodel.JExpr; -import com.sun.codemodel.JInvocation; -import com.sun.codemodel.JTryBlock; -import com.sun.codemodel.JVar; +import java.util.List; + import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.FunctionHolderExpression; import org.apache.drill.common.expression.LogicalExpression; @@ -38,12 +31,20 @@ import org.apache.drill.exec.expr.HiveFuncHolderExpr; import org.apache.drill.exec.expr.TypeHelper; import org.apache.drill.exec.expr.fn.impl.hive.DrillDeferredObject; import org.apache.drill.exec.expr.fn.impl.hive.ObjectInspectorHelper; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.ql.exec.UDF; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge; import org.apache.hadoop.hive.ql.udf.generic.GenericUDF; +import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import java.util.List; +import com.sun.codemodel.JBlock; +import com.sun.codemodel.JCatchBlock; +import com.sun.codemodel.JClass; +import com.sun.codemodel.JCodeModel; +import com.sun.codemodel.JConditional; +import com.sun.codemodel.JExpr; +import com.sun.codemodel.JInvocation; +import com.sun.codemodel.JTryBlock; +import com.sun.codemodel.JVar; public class HiveFuncHolder extends AbstractFuncHolder { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FunctionImplementationRegistry.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java index c4813a7..2643220 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java @@ -20,7 +20,6 @@ package org.apache.drill.exec.expr.fn; import java.util.HashSet; import java.util.Set; -import com.google.common.collect.Sets; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.FunctionCall; import org.apache.drill.common.types.TypeProtos.MajorType; @@ -38,6 +37,7 @@ import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Sets; public class HiveFunctionRegistry implements PluggableFunctionRegistry{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HiveFunctionRegistry.class); @@ -78,7 +78,7 @@ public class HiveFunctionRegistry implements PluggableFunctionRegistry{ }else{ names = new String[]{clazz.getName().replace('.', '_')}; } - + UDFType type = clazz.getAnnotation(UDFType.class); if (type != null && type.deterministic()) nonDeterministicUDFs.add(clazz); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java index 5095d90..2c265d0 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java @@ -101,6 +101,7 @@ public abstract class HiveFieldConverter { } public static class Binary extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final byte[] value = ((BinaryObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableVarBinaryVector) outputVV).getMutator().setSafe(outputIndex, value, 0, value.length); @@ -108,6 +109,7 @@ public abstract class HiveFieldConverter { } public static class Boolean extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final boolean value = (boolean) ((BooleanObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableBitVector) outputVV).getMutator().setSafe(outputIndex, value ? 1 : 0); @@ -115,6 +117,7 @@ public abstract class HiveFieldConverter { } public static class Byte extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final byte value = (byte) ((ByteObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableTinyIntVector) outputVV).getMutator().setSafe(outputIndex, value); @@ -122,6 +125,7 @@ public abstract class HiveFieldConverter { } public static class Decimal extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final HiveDecimal value = ((HiveDecimalObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); final byte[] strBytes = value.toString().getBytes(); @@ -130,6 +134,7 @@ public abstract class HiveFieldConverter { } public static class Double extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final double value = (double) ((DoubleObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableFloat8Vector) outputVV).getMutator().setSafe(outputIndex, value); @@ -137,6 +142,7 @@ public abstract class HiveFieldConverter { } public static class Float extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final float value = (float) ((FloatObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableFloat4Vector) outputVV).getMutator().setSafe(outputIndex, value); @@ -144,6 +150,7 @@ public abstract class HiveFieldConverter { } public static class Int extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final int value = (int) ((IntObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableIntVector) outputVV).getMutator().setSafe(outputIndex, value); @@ -151,6 +158,7 @@ public abstract class HiveFieldConverter { } public static class Long extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final long value = (long) ((LongObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableBigIntVector) outputVV).getMutator().setSafe(outputIndex, value); @@ -158,6 +166,7 @@ public abstract class HiveFieldConverter { } public static class Short extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final short value = (short) ((ShortObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); return ((NullableSmallIntVector) outputVV).getMutator().setSafe(outputIndex, value); @@ -165,6 +174,7 @@ public abstract class HiveFieldConverter { } public static class String extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final Text value = ((StringObjectInspector)oi).getPrimitiveWritableObject(hiveFieldValue); final byte[] valueBytes = value.getBytes(); @@ -174,6 +184,7 @@ public abstract class HiveFieldConverter { } public static class VarChar extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final Text value = ((HiveVarcharObjectInspector)oi).getPrimitiveWritableObject(hiveFieldValue).getTextValue(); final byte[] valueBytes = value.getBytes(); @@ -183,6 +194,7 @@ public abstract class HiveFieldConverter { } public static class Timestamp extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final java.sql.Timestamp value = ((TimestampObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); final DateTime ts = new DateTime(value.getTime()).withZoneRetainFields(DateTimeZone.UTC); @@ -191,6 +203,7 @@ public abstract class HiveFieldConverter { } public static class Date extends HiveFieldConverter { + @Override public boolean setSafeValue(ObjectInspector oi, Object hiveFieldValue, ValueVector outputVV, int outputIndex) { final java.sql.Date value = ((DateObjectInspector)oi).getPrimitiveJavaObject(hiveFieldValue); final DateTime date = new DateTime(value.getTime()).withZoneRetainFields(DateTimeZone.UTC); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java index 1f3b3cd..c5831a0 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.store.hive; import java.io.IOException; -import java.sql.Timestamp; import java.sql.Date; +import java.sql.Timestamp; import java.util.List; import java.util.Map; import java.util.Properties; @@ -38,15 +38,14 @@ import org.apache.drill.exec.ops.OperatorContext; import org.apache.drill.exec.physical.impl.OutputMutator; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.store.AbstractRecordReader; -import org.apache.drill.exec.store.RecordReader; import org.apache.drill.exec.vector.BigIntVector; import org.apache.drill.exec.vector.BitVector; +import org.apache.drill.exec.vector.DateVector; import org.apache.drill.exec.vector.Float4Vector; import org.apache.drill.exec.vector.Float8Vector; import org.apache.drill.exec.vector.IntVector; -import org.apache.drill.exec.vector.TimeStampVector; -import org.apache.drill.exec.vector.DateVector; import org.apache.drill.exec.vector.SmallIntVector; +import org.apache.drill.exec.vector.TimeStampVector; import org.apache.drill.exec.vector.TinyIntVector; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.VarBinaryVector; @@ -73,7 +72,6 @@ import org.apache.hadoop.mapred.InputFormat; import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.Reporter; - import org.joda.time.DateTime; import org.joda.time.DateTimeZone; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScan.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScan.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScan.java index ef861d0..d050467 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScan.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScan.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.physical.base.AbstractGroupScan; import org.apache.drill.exec.physical.base.GroupScan; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.ScanStats; -import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.physical.base.ScanStats.GroupScanProperty; +import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.store.StoragePluginRegistry; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java index 616fae3..a1273c0 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveScanBatchCreator.java @@ -17,7 +17,8 @@ */ package org.apache.drill.exec.store.hive; -import com.google.common.collect.Lists; +import java.util.List; + import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.impl.BatchCreator; @@ -26,11 +27,9 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.store.RecordReader; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.Table; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; import org.apache.hadoop.mapred.InputSplit; -import org.apache.hadoop.mapred.TextInputFormat; -import java.util.List; +import com.google.common.collect.Lists; public class HiveScanBatchCreator implements BatchCreator<HiveSubScan> { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java index c0ac4ba..e221707 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java @@ -20,7 +20,6 @@ package org.apache.drill.exec.store.hive; import java.io.IOException; import java.util.List; -import net.hydromatic.optiq.Schema; import net.hydromatic.optiq.Schema.TableType; import net.hydromatic.optiq.SchemaPlus; @@ -31,7 +30,6 @@ import org.apache.drill.exec.rpc.user.UserSession; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.store.AbstractStoragePlugin; import org.apache.drill.exec.store.hive.schema.HiveSchemaFactory; -import org.apache.hadoop.hive.conf.HiveConf; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java index 55fa304..c01389f 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java @@ -17,16 +17,15 @@ */ package org.apache.drill.exec.store.hive; +import java.util.Map; + +import org.apache.drill.common.logical.StoragePluginConfigBase; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.common.logical.StoragePluginConfigBase; -import org.apache.hadoop.hive.conf.HiveConf; - -import java.util.Map; - @JsonTypeName(HiveStoragePluginConfig.NAME) public class HiveStoragePluginConfig extends StoragePluginConfigBase { @JsonProperty http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveTable.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveTable.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveTable.java index 949fa06..41f6e53 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveTable.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveTable.java @@ -21,7 +21,6 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import com.google.common.collect.Lists; import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.store.hive.HiveReadEntry; import org.apache.drill.exec.store.hive.HiveStoragePlugin; @@ -38,11 +37,13 @@ import org.eigenbase.reltype.RelDataTypeFactory; import org.eigenbase.sql.SqlCollation; import org.eigenbase.sql.type.SqlTypeName; +import com.google.common.collect.Lists; + public class DrillHiveTable extends DrillTable{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillHiveTable.class); - + protected final Table hiveTable; - + public DrillHiveTable(String storageEngineName, HiveStoragePlugin plugin, HiveReadEntry readEntry) { super(storageEngineName, plugin, readEntry); this.hiveTable = new Table(readEntry.getTable()); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java index b575972..52ceccc 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java @@ -18,6 +18,7 @@ package org.apache.drill.exec.store.hive.schema; import net.hydromatic.optiq.Schema.TableType; + import org.apache.drill.exec.planner.logical.DrillViewInfoProvider; import org.apache.drill.exec.store.hive.HiveReadEntry; import org.apache.drill.exec.store.hive.HiveStoragePlugin; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java index 0df2374..1d2902b 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java @@ -22,9 +22,7 @@ import java.util.Set; import net.hydromatic.optiq.Table; -import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.store.AbstractSchema; -import org.apache.drill.exec.store.dfs.FileSystemConfig; import org.apache.drill.exec.store.hive.HiveStoragePluginConfig; import org.apache.drill.exec.store.hive.schema.HiveSchemaFactory.HiveSchema; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java index ef2ac83..6c0d44b 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java @@ -24,14 +24,11 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import com.google.common.collect.ImmutableList; - import net.hydromatic.optiq.Schema; import net.hydromatic.optiq.SchemaPlus; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.planner.logical.DrillTable; -import org.apache.drill.exec.rpc.user.DrillUser; import org.apache.drill.exec.rpc.user.UserSession; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.SchemaFactory; @@ -50,6 +47,7 @@ import org.apache.thrift.TException; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java index a985cae..07ca82f 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java @@ -17,13 +17,13 @@ */ package org.apache.drill.exec; +import static org.junit.Assert.assertEquals; + import org.apache.drill.PlanTestBase; import org.apache.drill.exec.store.hive.HiveTestDataGenerator; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class TestHiveProjectPushDown extends PlanTestBase { @BeforeClass http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java index e8c58d1..24899d4 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java @@ -20,6 +20,8 @@ package org.apache.drill.exec.fn.hive; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.util.List; + import org.apache.drill.BaseTestQuery; import org.apache.drill.exec.record.RecordBatchLoader; import org.apache.drill.exec.rpc.user.QueryResultBatch; @@ -29,14 +31,11 @@ import org.apache.drill.exec.vector.NullableFloat8Vector; import org.apache.drill.exec.vector.NullableIntVector; import org.apache.drill.exec.vector.NullableVar16CharVector; import org.apache.drill.exec.vector.Var16CharVector; -import org.apache.drill.exec.vector.VarCharVector; import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Resources; -import java.util.List; - public class TestHiveUDFs extends BaseTestQuery { @Test http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java index 8517d20..c6efcad 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java @@ -17,6 +17,10 @@ */ package org.apache.drill.exec.fn.hive; +import static org.junit.Assert.assertTrue; + +import java.util.List; + import org.apache.drill.BaseTestQuery; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.store.hive.HiveTestDataGenerator; @@ -24,10 +28,6 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import java.util.List; - -import static org.junit.Assert.assertTrue; - public class TestSampleHiveUDFs extends BaseTestQuery { @BeforeClass http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java index 2f500b8..b618a93 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java @@ -25,7 +25,6 @@ import java.sql.Date; import java.sql.Timestamp; import java.util.Map; -import com.google.common.collect.Maps; import org.apache.commons.io.FileUtils; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.hadoop.fs.FileSystem; @@ -35,6 +34,8 @@ import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse; import org.apache.hadoop.hive.ql.session.SessionState; +import com.google.common.collect.Maps; + public class HiveTestDataGenerator { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HiveTestDataGenerator.class); @@ -42,7 +43,7 @@ public class HiveTestDataGenerator { private Driver hiveDriver = null; private static final String DB_DIR = "/tmp/drill_hive_db"; private static final String WH_DIR = "/tmp/drill_hive_wh"; - + public static void main(String[] args) throws Exception { HiveTestDataGenerator htd = new HiveTestDataGenerator(); htd.generateTestData(); @@ -73,11 +74,11 @@ public class HiveTestDataGenerator { } public void generateTestData() throws Exception { - + // remove data from previous runs. cleanDir(DB_DIR); cleanDir(WH_DIR); - + HiveConf conf = new HiveConf(); conf.set("javax.jdo.option.ConnectionURL", String.format("jdbc:derby:;databaseName=%s;create=true", DB_DIR)); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java b/exec/java-exec/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java index 86d3b59..2cca5d7 100644 --- a/exec/java-exec/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java +++ b/exec/java-exec/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java @@ -22,8 +22,6 @@ import io.netty.util.internal.PlatformDependent; import java.nio.ByteOrder; -import org.apache.drill.exec.memory.BufferAllocator; - public final class UnsafeDirectLittleEndian extends WrappedByteBuf { private static final boolean NATIVE_ORDER = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN; private final PooledUnsafeDirectByteBuf wrapped; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java index 1c5de85..1e0c985 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java @@ -17,8 +17,6 @@ */ package org.apache.drill.exec.cache; -import java.util.Map; - import org.apache.drill.exec.exception.DrillbitStartupException; import com.google.protobuf.Message; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java index 214a871..301f038 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java @@ -18,7 +18,6 @@ package org.apache.drill.exec.cache; import java.util.Collection; -import java.util.List; import java.util.concurrent.Future; public interface DistributedMultiMap<K, V> { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java index 83b3d5a..fc9775c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java @@ -17,7 +17,6 @@ */ package org.apache.drill.exec.cache; -import io.netty.buffer.ByteBuf; import io.netty.buffer.DrillBuf; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/JacksonAdvancedExternalizer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/JacksonAdvancedExternalizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/JacksonAdvancedExternalizer.java index 63a6d62..55633ab 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/JacksonAdvancedExternalizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/JacksonAdvancedExternalizer.java @@ -23,13 +23,10 @@ import java.io.ObjectOutput; import java.util.Collections; import java.util.Set; -import org.apache.drill.common.util.DataInputInputStream; import org.apache.drill.exec.cache.SerializationDefinition; import org.infinispan.commons.marshall.AdvancedExternalizer; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hazelcast.nio.ObjectDataInput; -import com.hazelcast.nio.ObjectDataOutput; public class JacksonAdvancedExternalizer<T> implements AdvancedExternalizer<T> { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(JacksonAdvancedExternalizer.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/ProtobufAdvancedExternalizer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/ProtobufAdvancedExternalizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/ProtobufAdvancedExternalizer.java index df97a01..7b638ee 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/ProtobufAdvancedExternalizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/ProtobufAdvancedExternalizer.java @@ -25,7 +25,6 @@ import java.util.Set; import org.apache.drill.common.util.DataInputInputStream; import org.apache.drill.exec.cache.SerializationDefinition; -import org.apache.drill.exec.proto.UserBitShared.QueryProfile; import org.infinispan.commons.marshall.AdvancedExternalizer; import com.google.protobuf.Message; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/VAAdvancedExternalizer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/VAAdvancedExternalizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/VAAdvancedExternalizer.java index 5f54f74..f072628 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/VAAdvancedExternalizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/infinispan/VAAdvancedExternalizer.java @@ -23,7 +23,6 @@ import java.io.ObjectOutput; import java.util.Set; import org.apache.drill.exec.cache.CachedVectorContainer; -import org.apache.drill.exec.cache.VectorAccessibleSerializable; import org.apache.drill.exec.memory.BufferAllocator; import org.infinispan.commons.marshall.AdvancedExternalizer; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java index 2d39b5e..510d637 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java @@ -20,7 +20,6 @@ package org.apache.drill.exec.client; import static com.google.common.base.Preconditions.checkState; import static org.apache.drill.exec.proto.UserProtos.QueryResultsMode.STREAM_FULL; import static org.apache.drill.exec.proto.UserProtos.RunQuery.newBuilder; -import io.netty.buffer.ByteBuf; import io.netty.buffer.DrillBuf; import java.io.Closeable; @@ -48,9 +47,9 @@ import org.apache.drill.exec.proto.helper.QueryIdHelper; import org.apache.drill.exec.rpc.BasicClientWithConnection.ServerConnection; import org.apache.drill.exec.rpc.ChannelClosedException; import org.apache.drill.exec.rpc.DrillRpcFuture; -import org.apache.drill.exec.rpc.TransportCheck; import org.apache.drill.exec.rpc.RpcConnectionHandler; import org.apache.drill.exec.rpc.RpcException; +import org.apache.drill.exec.rpc.TransportCheck; import org.apache.drill.exec.rpc.user.ConnectionThrottle; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.rpc.user.UserClient; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 2d65e91..54a5a3a 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 @@ -137,6 +137,7 @@ public class DumpCat { this.dataSize += info2.dataSize; } + @Override public String toString() { String avgRecSizeStr = null; if (this.rows>0) http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java index 6488699..704a199 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java @@ -37,6 +37,7 @@ class ByteCodeLoader { .expireAfterWrite(10, TimeUnit.MINUTES).build(new ClassBytesCacheLoader()); private class ClassBytesCacheLoader extends CacheLoader<String, byte[]> { + @Override public byte[] load(String path) throws ClassTransformationException, IOException { URL u = this.getClass().getResource(path); if (u == null) http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java index 544020f..34f622e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java @@ -58,14 +58,14 @@ public class ClassBodyBuilder { private String[] imports = {}; private String body; private boolean used = false; - + public static ClassBodyBuilder newBuilder(){ return new ClassBodyBuilder(); } - + private ClassBodyBuilder(){ } - + public ClassBodyBuilder setClassName(String className) { assertNotCooked(); this.className = className; @@ -93,7 +93,7 @@ public class ClassBodyBuilder { private void assertNotCooked() { assert !used; } - + public ClassBodyBuilder setImports(String[] imports) { assertNotCooked(); this.imports = imports; @@ -190,7 +190,7 @@ public class ClassBodyBuilder { // * <p> // * This method does not handle comments and string literals correctly, i.e. if a pattern that looks like an IMPORT // * declaration appears within a comment or a string literal, it will be taken as an IMPORT declaration. -// * +// * // * @param r // * A {@link Reader} that supports MARK, e.g. a {@link BufferedReader} // * @return The parsed imports, e.g. {@code "java.util.*", "static java.util.Map.Entry" } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java index e1f52ca..f056489 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java @@ -81,6 +81,7 @@ class JDKClassCompiler extends AbstractClassCompiler { } } + @Override protected org.slf4j.Logger getLogger() { return logger; } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java index aa16b83..84bf4b0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java @@ -41,6 +41,7 @@ public class JaninoClassCompiler extends AbstractClassCompiler { this.compilationClassLoader = new ClassLoaderIClassLoader(parentClassLoader); } + @Override protected byte[][] getByteCode(final ClassNames className, final String sourcecode) throws CompileException, IOException, ClassNotFoundException, ClassTransformationException { StringReader reader = new StringReader(sourcecode); @@ -56,6 +57,7 @@ public class JaninoClassCompiler extends AbstractClassCompiler { return byteCodes; } + @Override protected org.slf4j.Logger getLogger() { return logger; } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java index bd68b43..945c94a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java @@ -26,7 +26,6 @@ import java.util.Iterator; import java.util.Set; import org.apache.drill.exec.compile.ClassTransformer.ClassSet; -import org.apache.drill.exec.compile.bytecode.ValueHolderReplacementVisitor; import org.apache.drill.exec.compile.sig.SignatureHolder; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassReader; @@ -89,12 +88,14 @@ class MergeAdapter extends ClassVisitor { } } + @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { System.out.println("Annotation"); return super.visitAnnotation(desc, visible); } // visit the class + @Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { // use the access and names of the impl class. this.name = name; @@ -136,6 +137,7 @@ class MergeAdapter extends ClassVisitor { return mv; } + @Override @SuppressWarnings("unchecked") public void visitEnd() { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java index 2dcb52b..398d109 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java @@ -17,7 +17,13 @@ */ package org.apache.drill.exec.compile; -import com.google.common.collect.MapMaker; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Arrays; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; + import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.ExpressionParsingException; import org.apache.drill.exec.compile.ClassTransformer.ClassNames; @@ -30,12 +36,7 @@ import org.apache.drill.exec.server.options.TypeValidators.LongValidator; import org.apache.drill.exec.server.options.TypeValidators.StringValidator; import org.codehaus.commons.compiler.CompileException; -import java.io.IOException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Arrays; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; +import com.google.common.collect.MapMaker; public class QueryClassLoader extends URLClassLoader { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryClassLoader.class); @@ -59,7 +60,7 @@ public class QueryClassLoader extends URLClassLoader { public static final String JAVA_COMPILER_JANINO_MAXSIZE_OPTION = "exec.java_compiler_janino_maxsize"; public static final OptionValidator JAVA_COMPILER_JANINO_MAXSIZE = new LongValidator(JAVA_COMPILER_JANINO_MAXSIZE_OPTION, 256*1024); - + public static final String JAVA_COMPILER_CONFIG = "drill.exec.compile.compiler"; public static final String JAVA_COMPILER_DEBUG_CONFIG = "drill.exec.compile.debug"; public static final String JAVA_COMPILER_JANINO_MAXSIZE_CONFIG = "drill.exec.compile.janino_maxsize"; @@ -67,7 +68,7 @@ public class QueryClassLoader extends URLClassLoader { private ClassCompilerSelector compilerSelector; private AtomicLong index = new AtomicLong(0); - + private ConcurrentMap<String, byte[]> customClasses = new MapMaker().concurrencyLevel(4).makeMap(); public QueryClassLoader(DrillConfig config, OptionManager sessionOptions) { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java index 8e05602..7b24174 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java @@ -50,6 +50,7 @@ public class ReplacingBasicValue extends BasicValue{ return index; } + @Override public Type getType(){ return type; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java index 5099fbd..1e10eeb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java @@ -21,10 +21,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; -import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import org.objectweb.asm.commons.LocalVariablesSorter; import com.carrotsearch.hppc.ObjectIntOpenHashMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java index eacecfb..ce9f6c9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java @@ -19,10 +19,10 @@ package org.apache.drill.exec.compile.sig; public class CodeGeneratorArgument { - + private final String name; private final Class<?> type; - + public CodeGeneratorArgument(String name, Class<?> type) { super(); this.name = name; @@ -36,5 +36,5 @@ public class CodeGeneratorArgument { public Class<?> getType() { return type; } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 c65951d..d98c06b 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 @@ -34,18 +34,18 @@ import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; -import org.apache.drill.common.expression.ValueExpressions.DoubleExpression; -import org.apache.drill.common.expression.ValueExpressions.LongExpression; import org.apache.drill.common.expression.ValueExpressions.DateExpression; -import org.apache.drill.common.expression.ValueExpressions.IntervalYearExpression; -import org.apache.drill.common.expression.ValueExpressions.IntervalDayExpression; -import org.apache.drill.common.expression.ValueExpressions.TimeStampExpression; -import org.apache.drill.common.expression.ValueExpressions.TimeExpression; -import org.apache.drill.common.expression.ValueExpressions.Decimal9Expression; import org.apache.drill.common.expression.ValueExpressions.Decimal18Expression; import org.apache.drill.common.expression.ValueExpressions.Decimal28Expression; import org.apache.drill.common.expression.ValueExpressions.Decimal38Expression; +import org.apache.drill.common.expression.ValueExpressions.Decimal9Expression; +import org.apache.drill.common.expression.ValueExpressions.DoubleExpression; +import org.apache.drill.common.expression.ValueExpressions.IntervalDayExpression; +import org.apache.drill.common.expression.ValueExpressions.IntervalYearExpression; +import org.apache.drill.common.expression.ValueExpressions.LongExpression; import org.apache.drill.common.expression.ValueExpressions.QuotedString; +import org.apache.drill.common.expression.ValueExpressions.TimeExpression; +import org.apache.drill.common.expression.ValueExpressions.TimeStampExpression; import org.apache.drill.common.expression.visitors.ExprVisitor; import com.google.common.collect.Lists; @@ -54,7 +54,7 @@ public class ConstantExpressionIdentifier implements ExprVisitor<Boolean, Identi static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ConstantExpressionIdentifier.class); private ConstantExpressionIdentifier(){} - + /** * Get a list of expressions that mark boundaries into a constant space. * @param e @@ -63,7 +63,7 @@ public class ConstantExpressionIdentifier implements ExprVisitor<Boolean, Identi public static Set<LogicalExpression> getConstantExpressionSet(LogicalExpression e){ IdentityHashMap<LogicalExpression, Object> map = new IdentityHashMap<>(); ConstantExpressionIdentifier visitor = new ConstantExpressionIdentifier(); - + if(e.accept(visitor, map) && map.isEmpty()){ // if we receive a constant value here but the map is empty, this means the entire tree is a constant. @@ -74,7 +74,7 @@ public class ConstantExpressionIdentifier implements ExprVisitor<Boolean, Identi // so we don't continue to carry around a map, we let it go here and simply return an empty set. return Collections.emptySet(); }else{ - return map.keySet(); + return map.keySet(); } } @@ -89,7 +89,7 @@ public class ConstantExpressionIdentifier implements ExprVisitor<Boolean, Identi constant = false; } } - + // if one or more clauses isn't constant, this isn't constant. this also isn't a constant if it operates on a set. if(!constant || !transmitsConstant){ for(LogicalExpression c: constants){ @@ -98,7 +98,7 @@ public class ConstantExpressionIdentifier implements ExprVisitor<Boolean, Identi } return constant && transmitsConstant; } - + @Override public Boolean visitFunctionCall(FunctionCall call, IdentityHashMap<LogicalExpression, Object> value){ throw new UnsupportedOperationException("FunctionCall is not expected here. "+ http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java index 9eb5d53..93616c2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java @@ -22,9 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.drill.common.types.TypeProtos.DataMode; -import org.apache.drill.common.types.TypeProtos.MinorType; - /** * Marker annotation to determine which fields should be included as parameters for the function. */ http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java index bd362a3..dff92d0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java @@ -22,9 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.drill.common.types.TypeProtos.DataMode; -import org.apache.drill.common.types.TypeProtos.MinorType; - /** * Marker annotation to determine which fields should be included as parameters for the function. */ http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java index f855107..508a5b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java @@ -20,7 +20,6 @@ package org.apache.drill.exec.coord; import java.io.Closeable; import java.util.Collection; -import org.apache.curator.framework.recipes.locks.InterProcessSemaphoreV2; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; /** http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java index 3f5c930..3961b4b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java @@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; public class DrillbitEndpointSerDe { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillbitEndpointSerDe.class); - + public static class De extends StdDeserializer<DrillbitEndpoint> { public De() { @@ -44,11 +44,11 @@ public class DrillbitEndpointSerDe { JsonProcessingException { return DrillbitEndpoint.parseFrom(jp.getBinaryValue()); } - - + + } - - + + public static class Se extends StdSerializer<DrillbitEndpoint> { public Se() { @@ -60,6 +60,6 @@ public class DrillbitEndpointSerDe { JsonGenerationException { jgen.writeBinary(value.toByteArray()); } - + } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java index 3773833..76ad90b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java @@ -105,6 +105,7 @@ public class ZKClusterCoordinator extends ClusterCoordinator { return curator; } + @Override public void start(long millisToWait) throws Exception { logger.debug("Starting ZKClusterCoordination."); discovery.start(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java index 9cbc03b..f0c465f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java @@ -17,17 +17,16 @@ */ package org.apache.drill.exec.coord.zk; -import org.apache.drill.exec.coord.ClusterCoordinator; import org.apache.drill.exec.coord.ClusterCoordinator.RegistrationHandle; public class ZKRegistrationHandle implements RegistrationHandle { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKRegistrationHandle.class); - + public final String id; public ZKRegistrationHandle(String id) { super(); this.id = id; } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java index 5f951d0..5e63801 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java @@ -23,7 +23,6 @@ import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.locks.InterProcessSemaphoreV2; import org.apache.curator.framework.recipes.locks.Lease; import org.apache.drill.exec.coord.DistributedSemaphore; -import org.apache.drill.exec.coord.DistributedSemaphore.DistributedLease; public class ZkDistributedSemaphore implements DistributedSemaphore{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZkDistributedSemaphore.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java b/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java index b8d4d44..7588664 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.record.RecordBatch; public interface Spool { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Spool.class); - + public void write(RecordBatch batch) throws IOException; public void read(RecordBatch batch) throws IOException; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/View.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/View.java b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/View.java index 8119c29..a1132d7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/View.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/View.java @@ -19,7 +19,6 @@ package org.apache.drill.exec.dotdrill; import java.util.List; -import com.google.common.collect.ImmutableList; import org.apache.drill.exec.planner.StarColumnHelper; import org.apache.drill.exec.planner.types.RelDataTypeDrillImpl; import org.apache.drill.exec.planner.types.RelDataTypeHolder; @@ -34,6 +33,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @JsonTypeName("view") http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java index 24fb311..6b36bc3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java @@ -41,5 +41,5 @@ public class BitComException extends DrillException{ public BitComException(Throwable cause) { super(cause); } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java index bb5654a..8bf91c4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java @@ -42,6 +42,6 @@ public class ClassTransformationException extends DrillException{ public ClassTransformationException(Throwable cause) { super(cause); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java index a9ea942..03257ce 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java @@ -41,6 +41,6 @@ public class DrillbitStartupException extends DrillException{ public DrillbitStartupException(Throwable cause) { super(cause); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java index e7403a0..64c469e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java @@ -41,7 +41,7 @@ public class SchemaChangeException extends DrillException{ public SchemaChangeException(Throwable cause) { super(cause); } - + public SchemaChangeException(String message, Object...objects){ super(String.format(message, objects)); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java index e22aac0..e877e75 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java @@ -41,6 +41,6 @@ public class SetupException extends DrillException{ public SetupException(Throwable cause) { super(cause); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java index a131763..bbf00c7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java @@ -22,18 +22,18 @@ import com.sun.codemodel.JFormatter; public class DirectExpression extends JExpressionImpl{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DirectExpression.class); - + final String source; - + private DirectExpression(final String source) { super(); this.source = source; } - + public void generate( JFormatter f ) { f.p('(').p(source).p(')'); } - + public static DirectExpression direct( final String source ) { return new DirectExpression(source); } @@ -62,6 +62,6 @@ public class DirectExpression extends JExpressionImpl{ return false; return true; } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFuncHolderExpr.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFuncHolderExpr.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFuncHolderExpr.java index 785a8a6..d1734d4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFuncHolderExpr.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFuncHolderExpr.java @@ -66,24 +66,24 @@ public class DrillFuncHolderExpr extends FunctionHolderExpression implements Ite public boolean argConstantOnly(int i) { return holder.isConstant(i); } - + public boolean isComplexWriterFuncHolder() { return holder instanceof DrillComplexWriterFuncHolder; } - + @Override - public int getSelfCost() { + public int getSelfCost() { return holder.getCostCategory(); } - + @Override - public int getCumulativeCost() { + public int getCumulativeCost() { int cost = this.getSelfCost(); - + for (LogicalExpression arg : this.args) { cost += arg.getCumulativeCost(); } - + return cost; } @@ -91,6 +91,6 @@ public class DrillFuncHolderExpr extends FunctionHolderExpression implements Ite public DrillFuncHolderExpr copy(List<LogicalExpression> args) { return new DrillFuncHolderExpr(this.nameUsed, this.holder, args, this.getPosition()); } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java index de71eec..1e67158 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java @@ -29,9 +29,9 @@ import org.apache.drill.common.expression.FunctionHolderExpression; import org.apache.drill.common.expression.IfExpression; import org.apache.drill.common.expression.IfExpression.IfCondition; import org.apache.drill.common.expression.LogicalExpression; +import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.PathSegment; import org.apache.drill.common.expression.SchemaPath; -import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; import org.apache.drill.common.expression.ValueExpressions.DateExpression; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java index d3c2f8e..7b4c3d6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java @@ -17,17 +17,9 @@ */ package org.apache.drill.exec.expr; -import java.lang.reflect.Array; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; - import org.apache.drill.common.expression.BooleanOperator; import org.apache.drill.common.expression.CastExpression; import org.apache.drill.common.expression.ConvertExpression; @@ -36,27 +28,26 @@ import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.FunctionCall; import org.apache.drill.common.expression.FunctionHolderExpression; import org.apache.drill.common.expression.IfExpression; -import org.apache.drill.common.expression.IfExpression.IfCondition; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; -import org.apache.drill.common.expression.ValueExpressions.DoubleExpression; -import org.apache.drill.common.expression.ValueExpressions.FloatExpression; -import org.apache.drill.common.expression.ValueExpressions.LongExpression; import org.apache.drill.common.expression.ValueExpressions.DateExpression; -import org.apache.drill.common.expression.ValueExpressions.IntervalYearExpression; -import org.apache.drill.common.expression.ValueExpressions.IntervalDayExpression; -import org.apache.drill.common.expression.ValueExpressions.TimeStampExpression; -import org.apache.drill.common.expression.ValueExpressions.TimeExpression; -import org.apache.drill.common.expression.ValueExpressions.Decimal9Expression; import org.apache.drill.common.expression.ValueExpressions.Decimal18Expression; import org.apache.drill.common.expression.ValueExpressions.Decimal28Expression; import org.apache.drill.common.expression.ValueExpressions.Decimal38Expression; +import org.apache.drill.common.expression.ValueExpressions.Decimal9Expression; +import org.apache.drill.common.expression.ValueExpressions.DoubleExpression; +import org.apache.drill.common.expression.ValueExpressions.FloatExpression; import org.apache.drill.common.expression.ValueExpressions.IntExpression; +import org.apache.drill.common.expression.ValueExpressions.IntervalDayExpression; +import org.apache.drill.common.expression.ValueExpressions.IntervalYearExpression; +import org.apache.drill.common.expression.ValueExpressions.LongExpression; import org.apache.drill.common.expression.ValueExpressions.QuotedString; +import org.apache.drill.common.expression.ValueExpressions.TimeExpression; +import org.apache.drill.common.expression.ValueExpressions.TimeStampExpression; import org.apache.drill.common.expression.fn.CastFunctions; import org.apache.drill.common.expression.visitors.AbstractExprVisitor; import org.apache.drill.common.expression.visitors.ConditionalExprOptimizer; @@ -73,12 +64,15 @@ import org.apache.drill.exec.expr.fn.DrillFuncHolder; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; import org.apache.drill.exec.record.TypedFieldId; import org.apache.drill.exec.record.VectorAccessible; -import org.apache.drill.exec.resolver.DefaultFunctionResolver; import org.apache.drill.exec.resolver.FunctionResolver; import org.apache.drill.exec.resolver.FunctionResolverFactory; +import org.apache.drill.exec.resolver.TypeCastRules; +import com.google.common.base.Optional; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import org.apache.drill.exec.resolver.TypeCastRules; public class ExpressionTreeMaterializer { @@ -91,14 +85,14 @@ public class ExpressionTreeMaterializer { return ExpressionTreeMaterializer.materialize(expr, batch, errorCollector, registry, false); } - public static LogicalExpression materialize(LogicalExpression expr, VectorAccessible batch, ErrorCollector errorCollector, FunctionImplementationRegistry registry, + public static LogicalExpression materialize(LogicalExpression expr, VectorAccessible batch, ErrorCollector errorCollector, FunctionImplementationRegistry registry, boolean allowComplexWriterExpr) { LogicalExpression out = expr.accept(new MaterializeVisitor(batch, errorCollector, allowComplexWriterExpr), registry); - + if (!errorCollector.hasErrors()) { out = out.accept(ConditionalExprOptimizer.INSTANCE, null); } - + if(out instanceof NullExpression){ return new TypedNullConstant(Types.optional(MinorType.INT)); }else{ @@ -110,7 +104,7 @@ public class ExpressionTreeMaterializer { private ExpressionValidator validator = new ExpressionValidator(); private final ErrorCollector errorCollector; private final VectorAccessible batch; - private final boolean allowComplexWriter; + private final boolean allowComplexWriter; public MaterializeVisitor(VectorAccessible batch, ErrorCollector errorCollector, boolean allowComplexWriter) { this.batch = batch; @@ -145,7 +139,7 @@ public class ExpressionTreeMaterializer { } //replace with a new function call, since its argument could be changed. - return new BooleanOperator(op.getName(), args, op.getPosition()); + return new BooleanOperator(op.getName(), args, op.getPosition()); } private LogicalExpression addCastExpression(LogicalExpression fromExpr, MajorType toType, FunctionImplementationRegistry registry) { @@ -197,7 +191,7 @@ public class ExpressionTreeMaterializer { if (matchedFuncHolder instanceof DrillComplexWriterFuncHolder && ! allowComplexWriter) { errorCollector.addGeneralError(call.getPosition(), "Only ProjectRecordBatch could have complex writer function. You are using complex writer function " + call.getName() + " in a non-project operation!"); } - + //new arg lists, possible with implicit cast inserted. List<LogicalExpression> argsWithCast = Lists.newArrayList(); @@ -502,7 +496,7 @@ public class ExpressionTreeMaterializer { // if the type still isn't fully bound, leave as cast expression. return new CastExpression(input, e.getMajorType(), e.getPosition()); } else if (newMinor == MinorType.NULL) { - // if input is a NULL expression, remove cast expression and return a TypedNullConstant directly. + // if input is a NULL expression, remove cast expression and return a TypedNullConstant directly. return new TypedNullConstant(Types.optional(e.getMajorType().getMinorType())); } else { // if the type is fully bound, convert to functioncall and materialze the function. http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java index 45051b9..3e6ad4a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java @@ -25,14 +25,13 @@ import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.exec.expr.ClassGenerator.HoldingContainer; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.Iterators; public class HoldingContainerExpression implements LogicalExpression{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HoldingContainerExpression.class); final HoldingContainer container; - + public HoldingContainerExpression(HoldingContainer container) { this.container = container; } @@ -52,7 +51,7 @@ public class HoldingContainerExpression implements LogicalExpression{ return visitor.visitUnknown(this, value); } - + public HoldingContainer getContainer() { return container; } @@ -61,15 +60,15 @@ public class HoldingContainerExpression implements LogicalExpression{ public ExpressionPosition getPosition() { return ExpressionPosition.UNKNOWN; } - + @Override - public int getSelfCost() { - return 0; // TODO + public int getSelfCost() { + return 0; // TODO } - + @Override - public int getCumulativeCost() { + public int getCumulativeCost() { return 0; // TODO } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java index f292b5e..a284db1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java @@ -31,13 +31,13 @@ public class SingleClassStringWriter extends CodeWriter{ private boolean used; private StringWriter writer = new StringWriter(); - + @Override public OutputStream openBinary(JPackage pkg, String fileName) throws IOException { throw new UnsupportedOperationException(); } - + @Override public Writer openSource(JPackage pkg, String fileName) throws IOException { Preconditions.checkArgument(!used, "The SingleClassStringWriter can only output once src file."); @@ -52,6 +52,6 @@ public class SingleClassStringWriter extends CodeWriter{ public StringBuffer getCode(){ return writer.getBuffer(); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java index f8236d9..a5abf3e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java @@ -23,9 +23,7 @@ import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.PathSegment; import org.apache.drill.common.expression.visitors.ExprVisitor; -import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.common.types.Types; import org.apache.drill.exec.record.TypedFieldId; import com.google.common.collect.Iterators; @@ -78,15 +76,15 @@ public class ValueVectorReadExpression implements LogicalExpression{ public Iterator<LogicalExpression> iterator() { return Iterators.emptyIterator(); } - + @Override - public int getSelfCost() { - return 0; // TODO + public int getSelfCost() { + return 0; // TODO } - + @Override - public int getCumulativeCost() { + public int getCumulativeCost() { return 0; // TODO } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java index d277057..1fb46e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java @@ -34,17 +34,17 @@ public class ValueVectorWriteExpression implements LogicalExpression { private final TypedFieldId fieldId; private final LogicalExpression child; private final boolean safe; - + public ValueVectorWriteExpression(TypedFieldId fieldId, LogicalExpression child){ this(fieldId, child, false); } - + public ValueVectorWriteExpression(TypedFieldId fieldId, LogicalExpression child, boolean safe){ this.fieldId = fieldId; this.child = child; this.safe = safe; } - + public TypedFieldId getFieldId() { return fieldId; } @@ -54,7 +54,7 @@ public class ValueVectorWriteExpression implements LogicalExpression { return Types.NULL; } - + public boolean isSafe() { return safe; } @@ -72,21 +72,21 @@ public class ValueVectorWriteExpression implements LogicalExpression { public LogicalExpression getChild() { return child; } - + @Override public Iterator<LogicalExpression> iterator() { return Iterators.singletonIterator(child); } @Override - public int getSelfCost() { - return 0; // TODO + public int getSelfCost() { + return 0; // TODO } - + @Override - public int getCumulativeCost() { + public int getCumulativeCost() { return 0; // TODO } - + }
