DRILL-634: Cleanup/organize Java imports and trailing whitespaces from Drill code
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/39990292 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/39990292 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/39990292 Branch: refs/heads/master Commit: 39990292e833bbfb419565a3503312c552110378 Parents: 20d2aa4 Author: Aditya Kishore <[email protected]> Authored: Tue Sep 9 13:26:06 2014 -0700 Committer: Aditya Kishore <[email protected]> Committed: Thu Sep 11 19:24:11 2014 -0700 ---------------------------------------------------------------------- .../com/google/protobuf/WireFormatProxy.java | 2 +- .../org/apache/drill/common/JSONOptions.java | 24 +++--- .../drill/common/config/CommonConstants.java | 2 +- .../drill/common/exceptions/DrillError.java | 4 +- .../common/exceptions/DrillIOException.java | 4 +- .../exceptions/ExecutionSetupException.java | 4 +- .../exceptions/ExpressionParsingException.java | 4 +- .../exceptions/LogicalPlanParsingException.java | 12 +-- .../PhysicalOperatorSetupException.java | 4 +- .../common/expression/BooleanOperator.java | 21 +++-- .../drill/common/expression/CastExpression.java | 10 +-- .../common/expression/ConvertExpression.java | 2 +- .../drill/common/expression/ErrorCollector.java | 2 +- .../common/expression/ErrorCollectorImpl.java | 6 +- .../common/expression/ExpressionPosition.java | 12 +-- .../drill/common/expression/FunctionCall.java | 8 +- .../common/expression/FunctionCallFactory.java | 10 +-- .../expression/FunctionHolderExpression.java | 9 +- .../drill/common/expression/IfExpression.java | 39 ++++----- .../common/expression/LogicalExpression.java | 2 +- .../expression/LogicalExpressionBase.java | 16 ++-- .../drill/common/expression/NullExpression.java | 9 +- .../common/expression/OutputTypeDeterminer.java | 20 ++--- .../drill/common/expression/PathSegment.java | 6 ++ .../drill/common/expression/SchemaPath.java | 1 - .../common/expression/TypedNullConstant.java | 17 ++-- .../common/expression/fn/CastFunctions.java | 4 +- .../drill/common/expression/types/AtomType.java | 13 +-- .../drill/common/expression/types/DataType.java | 20 ++--- .../expression/types/DataTypeFactory.java | 2 +- .../common/expression/types/LateBindType.java | 2 +- .../visitors/AbstractExprVisitor.java | 22 ++--- .../expression/visitors/AggregateChecker.java | 18 ++-- .../visitors/ConditionalExprOptimizer.java | 49 +++++------ .../expression/visitors/ConstantChecker.java | 24 +++--- .../common/expression/visitors/ExprVisitor.java | 18 ++-- .../visitors/ExpressionValidator.java | 24 +++--- .../expression/visitors/SimpleExprVisitor.java | 22 ++--- .../drill/common/graph/AdjacencyList.java | 14 +-- .../common/graph/AdjacencyListBuilder.java | 2 +- .../org/apache/drill/common/graph/Edge.java | 4 +- .../org/apache/drill/common/graph/Graph.java | 4 +- .../apache/drill/common/graph/GraphAlgos.java | 2 +- .../apache/drill/common/graph/GraphValue.java | 2 +- .../common/logical/FormatPluginConfig.java | 4 +- .../common/logical/FormatPluginConfigBase.java | 9 +- .../drill/common/logical/LogicalPlan.java | 7 +- .../common/logical/LogicalPlanBuilder.java | 4 +- .../common/logical/StoragePluginConfig.java | 1 + .../common/logical/StoragePluginConfigBase.java | 1 + .../common/logical/UnexpectedOperatorType.java | 6 +- .../common/logical/data/AbstractBuilder.java | 4 +- .../logical/data/AbstractSingleBuilder.java | 7 +- .../drill/common/logical/data/Constant.java | 4 +- .../drill/common/logical/data/Filter.java | 12 +-- .../drill/common/logical/data/Flatten.java | 8 +- .../common/logical/data/GroupingAggregate.java | 27 +++--- .../apache/drill/common/logical/data/Join.java | 22 ++--- .../common/logical/data/JoinCondition.java | 2 +- .../apache/drill/common/logical/data/Limit.java | 7 +- .../logical/data/LogicalOperatorBase.java | 18 ++-- .../common/logical/data/NamedExpression.java | 4 +- .../apache/drill/common/logical/data/Order.java | 30 +++---- .../drill/common/logical/data/Project.java | 3 - .../common/logical/data/RunningAggregate.java | 10 +-- .../apache/drill/common/logical/data/Scan.java | 8 +- .../drill/common/logical/data/Sequence.java | 6 +- .../logical/data/SingleInputOperator.java | 6 +- .../drill/common/logical/data/SinkOperator.java | 2 +- .../common/logical/data/SourceOperator.java | 2 +- .../apache/drill/common/logical/data/Store.java | 7 +- .../drill/common/logical/data/Transform.java | 11 +-- .../apache/drill/common/logical/data/Union.java | 12 +-- .../drill/common/logical/data/WindowFrame.java | 22 ++--- .../data/visitors/AbstractLogicalVisitor.java | 2 +- .../org/apache/drill/common/types/Types.java | 4 +- .../drill/common/util/AbstractDynamicBean.java | 16 ++-- .../drill/common/util/ConstructorChecker.java | 12 +-- .../drill/common/util/DrillStringUtils.java | 4 +- .../org/apache/drill/common/util/FileUtils.java | 2 +- .../java/org/apache/drill/common/util/Hook.java | 4 +- .../exec/store/hbase/DrillHBaseConstants.java | 2 +- .../drill/exec/store/hbase/HBaseGroupScan.java | 2 +- .../exec/store/hbase/HBaseRecordReader.java | 3 +- .../exec/store/hbase/HBaseStoragePlugin.java | 1 + .../exec/store/hbase/TableStatsCalculator.java | 4 +- .../org/apache/drill/hbase/BaseHBaseTest.java | 2 - .../apache/drill/hbase/TestTableGenerator.java | 2 +- .../drill/exec/expr/HiveFuncHolderExpr.java | 7 +- .../drill/exec/expr/fn/HiveFuncHolder.java | 25 +++--- .../exec/expr/fn/HiveFunctionRegistry.java | 4 +- .../exec/store/hive/HiveFieldConverter.java | 13 +++ .../drill/exec/store/hive/HiveRecordReader.java | 8 +- .../apache/drill/exec/store/hive/HiveScan.java | 2 +- .../exec/store/hive/HiveScanBatchCreator.java | 7 +- .../exec/store/hive/HiveStoragePlugin.java | 2 - .../store/hive/HiveStoragePluginConfig.java | 9 +- .../exec/store/hive/schema/DrillHiveTable.java | 7 +- .../store/hive/schema/DrillHiveViewTable.java | 1 + .../store/hive/schema/HiveDatabaseSchema.java | 2 - .../store/hive/schema/HiveSchemaFactory.java | 4 +- .../drill/exec/TestHiveProjectPushDown.java | 4 +- .../apache/drill/exec/fn/hive/TestHiveUDFs.java | 5 +- .../drill/exec/fn/hive/TestSampleHiveUDFs.java | 8 +- .../exec/store/hive/HiveTestDataGenerator.java | 9 +- .../netty/buffer/UnsafeDirectLittleEndian.java | 2 - .../drill/exec/cache/DistributedCache.java | 2 - .../drill/exec/cache/DistributedMultiMap.java | 1 - .../cache/VectorAccessibleSerializable.java | 1 - .../infinispan/JacksonAdvancedExternalizer.java | 3 - .../ProtobufAdvancedExternalizer.java | 1 - .../infinispan/VAAdvancedExternalizer.java | 1 - .../apache/drill/exec/client/DrillClient.java | 3 +- .../org/apache/drill/exec/client/DumpCat.java | 1 + .../drill/exec/compile/ByteCodeLoader.java | 1 + .../drill/exec/compile/ClassBodyBuilder.java | 10 +-- .../drill/exec/compile/JDKClassCompiler.java | 1 + .../drill/exec/compile/JaninoClassCompiler.java | 2 + .../apache/drill/exec/compile/MergeAdapter.java | 4 +- .../drill/exec/compile/QueryClassLoader.java | 19 +++-- .../compile/bytecode/ReplacingBasicValue.java | 1 + .../exec/compile/bytecode/ValueHolderIden.java | 2 - .../exec/compile/sig/CodeGeneratorArgument.java | 6 +- .../sig/ConstantExpressionIdentifier.java | 24 +++--- .../drill/exec/compile/sig/VVReadBatch.java | 3 - .../drill/exec/compile/sig/VVWriteBatch.java | 3 - .../drill/exec/coord/ClusterCoordinator.java | 1 - .../drill/exec/coord/DrillbitEndpointSerDe.java | 12 +-- .../exec/coord/zk/ZKClusterCoordinator.java | 1 + .../exec/coord/zk/ZKRegistrationHandle.java | 5 +- .../exec/coord/zk/ZkDistributedSemaphore.java | 1 - .../java/org/apache/drill/exec/disk/Spool.java | 2 +- .../org/apache/drill/exec/dotdrill/View.java | 2 +- .../drill/exec/exception/BitComException.java | 2 +- .../exception/ClassTransformationException.java | 4 +- .../exception/DrillbitStartupException.java | 4 +- .../exec/exception/SchemaChangeException.java | 2 +- .../drill/exec/exception/SetupException.java | 4 +- .../drill/exec/expr/DirectExpression.java | 12 +-- .../drill/exec/expr/DrillFuncHolderExpr.java | 16 ++-- .../drill/exec/expr/EvaluationVisitor.java | 2 +- .../exec/expr/ExpressionTreeMaterializer.java | 46 +++++----- .../exec/expr/HoldingContainerExpression.java | 17 ++-- .../exec/expr/SingleClassStringWriter.java | 8 +- .../exec/expr/ValueVectorReadExpression.java | 14 ++- .../exec/expr/ValueVectorWriteExpression.java | 20 ++--- .../exec/expr/annotations/FunctionTemplate.java | 18 ++-- .../drill/exec/expr/annotations/MethodMap.java | 9 +- .../drill/exec/expr/annotations/Param.java | 3 - .../drill/exec/expr/fn/AbstractFuncHolder.java | 5 +- .../drill/exec/expr/fn/DrillAggFuncHolder.java | 4 +- .../expr/fn/DrillComplexWriterFuncHolder.java | 44 +++++----- .../exec/expr/fn/DrillDecimalAddFuncHolder.java | 1 - .../exec/expr/fn/DrillDecimalAggFuncHolder.java | 6 +- .../expr/fn/DrillDecimalCastFuncHolder.java | 1 - .../expr/fn/DrillDecimalDivScaleFuncHolder.java | 2 +- .../expr/fn/DrillDecimalMaxScaleFuncHolder.java | 1 - .../expr/fn/DrillDecimalModScaleFuncHolder.java | 1 - .../expr/fn/DrillDecimalSetScaleFuncHolder.java | 1 - .../expr/fn/DrillDecimalSumAggFuncHolder.java | 6 +- .../fn/DrillDecimalZeroScaleFuncHolder.java | 1 - .../exec/expr/fn/DrillFunctionRegistry.java | 6 +- .../exec/expr/fn/DrillSimpleFuncHolder.java | 5 +- .../apache/drill/exec/expr/fn/FunctionBody.java | 10 +-- .../exec/expr/fn/FunctionGenerationHelper.java | 11 +-- .../expr/fn/FunctionImplementationRegistry.java | 11 +-- .../drill/exec/expr/fn/ImportGrabber.java | 8 +- .../exec/expr/fn/MethodGrabbingVisitor.java | 17 ++-- .../exec/expr/fn/ModifiedUnparseVisitor.java | 2 + .../drill/exec/expr/fn/impl/Alternator.java | 10 +-- .../drill/exec/expr/fn/impl/BitFunctions.java | 14 +-- .../exec/expr/fn/impl/BooleanAggrFunctions.java | 18 ---- .../exec/expr/fn/impl/ByteFunctionHelpers.java | 5 +- .../drill/exec/expr/fn/impl/ByteSubstring.java | 2 +- .../expr/fn/impl/CastBigIntTimeStampTZ.java | 1 - .../drill/exec/expr/fn/impl/CharSubstring.java | 6 +- .../exec/expr/fn/impl/ComparisonFunctions.java | 44 ++++------ .../drill/exec/expr/fn/impl/DateUtility.java | 2 - .../drill/exec/expr/fn/impl/DrillByteArray.java | 2 +- .../drill/exec/expr/fn/impl/HashHelper.java | 4 +- .../drill/exec/expr/fn/impl/MathFunctions.java | 26 +++--- .../drill/exec/expr/fn/impl/RegexpUtil.java | 12 +-- .../exec/expr/fn/impl/StringFunctionUtil.java | 4 +- .../exec/expr/fn/impl/conv/BigIntConvertTo.java | 6 +- .../expr/fn/impl/conv/BigIntVLongConvertTo.java | 6 +- .../expr/fn/impl/conv/BooleanByteConvertTo.java | 6 +- .../expr/fn/impl/conv/DateEpochBEConvertTo.java | 6 +- .../expr/fn/impl/conv/DateEpochConvertTo.java | 6 +- .../exec/expr/fn/impl/conv/DoubleConvertTo.java | 6 +- .../expr/fn/impl/conv/DummyConvertFrom.java | 2 +- .../exec/expr/fn/impl/conv/DummyConvertTo.java | 2 +- .../exec/expr/fn/impl/conv/FloatConvertTo.java | 6 +- .../exec/expr/fn/impl/conv/IntBEConvertTo.java | 6 +- .../exec/expr/fn/impl/conv/IntConvertTo.java | 6 +- .../expr/fn/impl/conv/IntVIntConvertTo.java | 6 +- .../exec/expr/fn/impl/conv/JsonConvertFrom.java | 15 +--- .../expr/fn/impl/conv/SmallIntBEConvertTo.java | 6 +- .../expr/fn/impl/conv/SmallIntConvertTo.java | 6 +- .../expr/fn/impl/conv/TimeEpochBEConvertTo.java | 6 +- .../expr/fn/impl/conv/TimeEpochConvertTo.java | 6 +- .../expr/fn/impl/conv/TinyIntConvertTo.java | 6 +- .../exec/expr/fn/impl/conv/UInt8ConvertTo.java | 6 +- .../org/apache/drill/exec/memory/Accountor.java | 2 +- .../drill/exec/memory/AtomicRemainder.java | 3 - .../drill/exec/memory/BufferAllocator.java | 2 +- .../drill/exec/memory/OutOfMemoryException.java | 14 +-- .../drill/exec/memory/TopLevelAllocator.java | 4 +- .../apache/drill/exec/ops/FragmentContext.java | 5 +- .../apache/drill/exec/ops/OperatorStats.java | 2 +- .../org/apache/drill/exec/ops/QueryContext.java | 5 +- .../apache/drill/exec/opt/BasicOptimizer.java | 13 +-- .../drill/exec/physical/PhysicalPlan.java | 17 ++-- .../drill/exec/physical/base/AbstractBase.java | 1 - .../exec/physical/base/AbstractMultiple.java | 4 +- .../physical/base/AbstractPhysicalVisitor.java | 10 +-- .../exec/physical/base/AbstractSingle.java | 1 - .../drill/exec/physical/base/FragmentRoot.java | 2 +- .../drill/exec/physical/base/GroupScan.java | 2 +- .../drill/exec/physical/base/HasAffinity.java | 2 +- .../physical/base/PhysicalOperatorUtil.java | 4 +- .../exec/physical/base/PhysicalVisitor.java | 10 +-- .../drill/exec/physical/base/Receiver.java | 4 +- .../apache/drill/exec/physical/base/Sender.java | 4 +- .../apache/drill/exec/physical/base/Store.java | 6 +- .../exec/physical/config/ExternalSort.java | 3 + .../physical/config/HashToMergeExchange.java | 10 +-- .../physical/config/HashToRandomExchange.java | 9 +- .../physical/config/MergingReceiverPOP.java | 2 +- .../exec/physical/config/PartitionRange.java | 8 +- .../exec/physical/config/ProducerConsumer.java | 7 +- .../apache/drill/exec/physical/config/TopN.java | 2 + .../exec/physical/config/UnorderedReceiver.java | 2 +- .../drill/exec/physical/impl/BatchCreator.java | 3 +- .../drill/exec/physical/impl/ImplCreator.java | 4 +- .../physical/impl/MergingReceiverCreator.java | 8 +- .../drill/exec/physical/impl/RootCreator.java | 2 +- .../drill/exec/physical/impl/RootExec.java | 8 +- .../drill/exec/physical/impl/ScanBatch.java | 1 - .../drill/exec/physical/impl/ScreenCreator.java | 5 +- .../exec/physical/impl/SendingAccountor.java | 2 +- .../exec/physical/impl/SingleSenderCreator.java | 26 +++--- .../exec/physical/impl/TopN/TopNBatch.java | 1 - .../impl/TopN/TopNSortBatchCreator.java | 11 ++- .../drill/exec/physical/impl/TraceInjector.java | 4 +- .../exec/physical/impl/WriterRecordBatch.java | 1 - .../physical/impl/aggregate/BatchIterator.java | 2 +- .../physical/impl/aggregate/HashAggBatch.java | 19 ++--- .../impl/aggregate/HashAggBatchCreator.java | 5 +- .../impl/aggregate/HashAggTemplate.java | 3 +- .../physical/impl/aggregate/HashAggregator.java | 16 ++-- .../impl/aggregate/StreamingAggBatch.java | 8 -- .../aggregate/StreamingAggBatchCreator.java | 4 +- .../impl/aggregate/StreamingAggTemplate.java | 2 - .../impl/aggregate/StreamingAggregator.java | 1 - .../broadcastsender/BroadcastSenderCreator.java | 5 +- .../BroadcastSenderRootExec.java | 19 ++--- .../physical/impl/common/ChainedHashTable.java | 80 ++++++++--------- .../exec/physical/impl/common/HashTable.java | 3 - .../physical/impl/common/HashTableConfig.java | 10 +-- .../physical/impl/common/HashTableTemplate.java | 9 +- .../impl/filter/EvaluationPredicate.java | 6 +- .../impl/filter/FilterBatchCreator.java | 5 +- .../physical/impl/filter/FilterRecordBatch.java | 1 - .../physical/impl/filter/FilterSignature.java | 4 +- .../physical/impl/filter/FilterTemplate2.java | 10 +-- .../physical/impl/filter/FilterTemplate4.java | 6 +- .../exec/physical/impl/filter/Filterer.java | 4 +- .../impl/filter/ReturnValueExpression.java | 20 ++--- .../impl/join/HashJoinBatchCreator.java | 4 +- .../exec/physical/impl/join/HashJoinHelper.java | 8 +- .../exec/physical/impl/join/HashJoinProbe.java | 7 +- .../impl/join/HashJoinProbeTemplate.java | 10 +-- .../exec/physical/impl/join/JoinTemplate.java | 1 - .../exec/physical/impl/join/JoinWorker.java | 6 +- .../exec/physical/impl/join/MergeJoinBatch.java | 2 +- .../physical/impl/join/MergeJoinCreator.java | 4 +- .../physical/impl/limit/LimitBatchCreator.java | 5 +- .../physical/impl/limit/LimitRecordBatch.java | 10 +-- .../impl/materialize/QueryWritableBatch.java | 18 ++-- .../impl/materialize/RecordMaterializer.java | 4 +- .../materialize/VectorRecordMaterializer.java | 2 +- .../MergingReceiverGeneratorBase.java | 8 +- .../mergereceiver/MergingReceiverTemplate.java | 6 +- .../impl/mergereceiver/MergingRecordBatch.java | 4 +- .../OrderedPartitionProjector.java | 4 +- .../OrderedPartitionProjectorTemplate.java | 8 +- .../SampleCopierTemplate.java | 12 +-- .../orderedpartitioner/SampleSortTemplate.java | 8 +- .../impl/orderedpartitioner/SampleSorter.java | 2 +- .../partitionsender/PartitionSenderCreator.java | 3 +- .../PartitionSenderRootExec.java | 6 +- .../impl/partitionsender/Partitioner.java | 6 +- .../partitionsender/PartitionerTemplate.java | 3 +- .../impl/partitionsender/StatusHandler.java | 1 + .../impl/producer/ProducerConsumerBatch.java | 14 +-- .../producer/ProducerConsumerBatchCreator.java | 7 +- .../impl/project/ProjectRecordBatch.java | 90 ++++++++++---------- .../physical/impl/sort/RecordBatchData.java | 8 +- .../exec/physical/impl/sort/SortBatch.java | 1 - .../physical/impl/sort/SortBatchCreator.java | 4 +- .../exec/physical/impl/sort/SortTemplate.java | 15 ++-- .../drill/exec/physical/impl/sort/Sorter.java | 3 +- .../exec/physical/impl/svremover/Copier.java | 1 - .../impl/svremover/CopierTemplate4.java | 2 - .../impl/svremover/RemovingRecordBatch.java | 8 +- .../impl/svremover/SVRemoverCreator.java | 4 +- .../physical/impl/trace/TraceBatchCreator.java | 6 +- .../physical/impl/trace/TraceRecordBatch.java | 2 - .../impl/union/UnionAllBatchCreator.java | 4 +- .../impl/union/UnionAllRecordBatch.java | 2 +- .../UnorderedReceiverBatch.java | 4 +- .../UnorderedReceiverCreator.java | 6 +- .../IteratorValidatorBatchIterator.java | 3 +- .../impl/xsort/ExternalSortBatchCreator.java | 9 +- .../exec/physical/impl/xsort/MSortTemplate.java | 16 ++-- .../drill/exec/physical/impl/xsort/MSorter.java | 2 +- .../impl/xsort/PriorityQueueCopier.java | 9 +- .../impl/xsort/PriorityQueueCopierTemplate.java | 4 +- .../physical/impl/xsort/SingleBatchSorter.java | 5 +- .../impl/xsort/SingleBatchSorterTemplate.java | 17 ++-- .../drill/exec/planner/StarColumnHelper.java | 34 ++++---- .../planner/common/DrillAggregateRelBase.java | 8 +- .../exec/planner/common/DrillFilterRelBase.java | 20 ++--- .../exec/planner/common/DrillLimitRelBase.java | 26 ++---- .../planner/common/DrillProjectRelBase.java | 14 +-- .../exec/planner/common/DrillRelOptUtil.java | 10 +-- .../exec/planner/common/DrillScanRelBase.java | 6 +- .../exec/planner/common/DrillScreenRelBase.java | 3 +- .../exec/planner/common/DrillStoreRelBase.java | 2 +- .../exec/planner/common/DrillUnionRelBase.java | 8 +- .../drill/exec/planner/cost/DrillCostBase.java | 85 +++++++++--------- .../exec/planner/cost/DrillRelOptCost.java | 2 +- .../drill/exec/planner/fragment/Fragment.java | 23 +++-- .../planner/fragment/MakeFragmentsVisitor.java | 8 +- .../exec/planner/fragment/PlanningSet.java | 1 - .../exec/planner/logical/CreateTableEntry.java | 9 +- .../exec/planner/logical/DrillAggregateRel.java | 15 ++-- .../exec/planner/logical/DrillFilterRel.java | 2 +- .../exec/planner/logical/DrillFilterRule.java | 1 - .../exec/planner/logical/DrillImplementor.java | 14 +-- .../exec/planner/logical/DrillJoinRel.java | 4 - .../exec/planner/logical/DrillLimitRel.java | 6 +- .../planner/logical/DrillMergeProjectRule.java | 5 +- .../drill/exec/planner/logical/DrillOptiq.java | 2 +- .../exec/planner/logical/DrillProjectRel.java | 1 + .../logical/DrillReduceAggregatesRule.java | 2 +- .../exec/planner/logical/DrillRuleSets.java | 29 +++---- .../exec/planner/logical/DrillScanRel.java | 10 +-- .../exec/planner/logical/DrillScanRule.java | 2 - .../exec/planner/logical/DrillScreenRel.java | 2 +- .../exec/planner/logical/DrillSortRel.java | 14 +-- .../exec/planner/logical/DrillStoreRel.java | 4 +- .../drill/exec/planner/logical/DrillTable.java | 22 ++--- .../exec/planner/logical/DrillUnionRel.java | 5 +- .../exec/planner/logical/DrillUnionRule.java | 2 +- .../exec/planner/logical/DynamicDrillTable.java | 3 +- .../planner/logical/EnumerableDrillRule.java | 4 +- .../drill/exec/planner/logical/ExprHelper.java | 1 - .../logical/FileSystemCreateTableEntry.java | 11 +-- .../exec/planner/logical/RelOptHelper.java | 4 +- .../exec/planner/logical/RewriteProjectRel.java | 6 +- .../planner/logical/ScanFieldDeterminer.java | 11 +-- .../exec/planner/physical/AggPruleBase.java | 2 +- .../planner/physical/BroadcastExchangePrel.java | 3 - .../planner/physical/ComplexToJsonPrel.java | 4 +- .../physical/ConvertCountToDirectScan.java | 4 - .../physical/DrillDistributionTrait.java | 9 +- .../physical/DrillDistributionTraitDef.java | 29 ++++--- .../exec/planner/physical/DrillScanPrel.java | 4 +- .../drill/exec/planner/physical/FilterPrel.java | 7 +- .../exec/planner/physical/HashAggPrel.java | 9 +- .../exec/planner/physical/HashAggPrule.java | 5 +- .../exec/planner/physical/HashJoinPrel.java | 7 +- .../exec/planner/physical/HashJoinPrule.java | 16 ++-- .../physical/HashToMergeExchangePrel.java | 4 - .../physical/HashToRandomExchangePrel.java | 8 +- .../drill/exec/planner/physical/JoinPrel.java | 4 +- .../exec/planner/physical/JoinPruleBase.java | 3 +- .../drill/exec/planner/physical/LimitPrel.java | 11 +-- .../drill/exec/planner/physical/LimitPrule.java | 2 - .../exec/planner/physical/MergeJoinPrule.java | 16 ++-- .../physical/OrderedPartitionExchangePrel.java | 2 - .../planner/physical/PhysicalPlanCreator.java | 1 - .../planner/physical/ProducerConsumerPrel.java | 13 ++- .../planner/physical/ProjectAllowDupPrel.java | 2 +- .../exec/planner/physical/ProjectPrel.java | 6 +- .../exec/planner/physical/ProjectPrule.java | 1 - .../drill/exec/planner/physical/ScanPrule.java | 3 - .../drill/exec/planner/physical/ScreenPrel.java | 3 +- .../physical/SelectionVectorRemoverPrel.java | 3 +- .../physical/SingleMergeExchangePrel.java | 1 - .../drill/exec/planner/physical/SinglePrel.java | 1 - .../exec/planner/physical/SortConvertPrule.java | 14 ++- .../drill/exec/planner/physical/SortPrel.java | 11 +-- .../drill/exec/planner/physical/SortPrule.java | 5 -- .../exec/planner/physical/StreamAggPrel.java | 2 +- .../exec/planner/physical/StreamAggPrule.java | 4 +- .../drill/exec/planner/physical/TopNPrel.java | 4 - .../exec/planner/physical/UnionAllPrule.java | 12 +-- .../planner/physical/UnionDistinctPrule.java | 10 +-- .../planner/physical/UnionExchangePrel.java | 3 - .../drill/exec/planner/physical/UnionPrel.java | 3 +- .../drill/exec/planner/physical/WriterPrel.java | 9 +- .../exec/planner/physical/WriterPrule.java | 10 +-- .../planner/physical/explain/PrelSequencer.java | 1 - .../visitor/ExcessiveExchangeIdentifier.java | 1 - .../physical/visitor/FinalColumnReorderer.java | 4 +- .../visitor/ProducerConsumerPrelVisitor.java | 7 +- .../planner/physical/visitor/RelUniqifier.java | 2 +- .../exec/planner/sql/DrillConvertletTable.java | 4 +- .../planner/sql/DrillExtractConvertlet.java | 6 +- .../exec/planner/sql/DrillOperatorTable.java | 5 -- .../exec/planner/sql/DrillSqlAggOperator.java | 19 +---- .../exec/planner/sql/DrillSqlOperator.java | 1 - .../exec/planner/sql/DynamicReturnType.java | 4 +- .../drill/exec/planner/sql/DynamicType.java | 2 - .../drill/exec/planner/sql/FixedRange.java | 4 +- .../sql/handlers/AbstractSqlHandler.java | 3 +- .../sql/handlers/CreateTableHandler.java | 7 +- .../planner/sql/handlers/DefaultSqlHandler.java | 12 +-- .../planner/sql/handlers/SetOptionHandler.java | 5 +- .../planner/sql/handlers/ShowFileHandler.java | 14 ++- .../sql/handlers/ShowFilesCommandResult.java | 6 +- .../exec/planner/sql/handlers/ViewHandler.java | 7 +- .../sql/parser/DrillCompoundIdentifier.java | 2 +- .../planner/sql/parser/DrillParserUtil.java | 5 +- .../exec/planner/sql/parser/DrillSqlCall.java | 3 +- .../exec/planner/sql/parser/SqlCreateTable.java | 1 + .../exec/planner/sql/parser/SqlCreateView.java | 1 + .../planner/sql/parser/SqlDescribeTable.java | 1 + .../exec/planner/sql/parser/SqlDropView.java | 1 + .../exec/planner/sql/parser/SqlShowFiles.java | 1 + .../exec/planner/sql/parser/SqlShowSchemas.java | 1 + .../exec/planner/sql/parser/SqlShowTables.java | 1 + .../exec/planner/sql/parser/SqlUseSchema.java | 1 + .../DrillParserWithCompoundIdConverter.java | 4 +- .../exec/planner/torel/ConversionContext.java | 26 +++--- .../types/DrillFixedRelDataTypeImpl.java | 7 +- .../planner/types/RelDataTypeDrillImpl.java | 6 +- .../exec/record/AbstractSingleRecordBatch.java | 1 - .../apache/drill/exec/record/BatchSchema.java | 5 +- .../exec/record/ExpandableHyperContainer.java | 4 - .../exec/record/FragmentWritableBatch.java | 28 +++--- .../drill/exec/record/HyperVectorWrapper.java | 6 +- .../drill/exec/record/MajorTypeSerDe.java | 22 ++--- .../drill/exec/record/RawFragmentBatch.java | 1 - .../exec/record/RawFragmentBatchProvider.java | 6 +- .../apache/drill/exec/record/RecordBatch.java | 5 +- .../apache/drill/exec/record/SchemaBuilder.java | 8 +- .../apache/drill/exec/record/TypedFieldId.java | 1 - .../drill/exec/record/VectorAccessible.java | 1 - .../drill/exec/record/VectorContainer.java | 2 +- .../exec/record/selection/SelectionVector2.java | 1 + .../exec/record/selection/SelectionVector4.java | 24 +++--- .../selection/SelectionVector4Builder.java | 16 ++-- .../exec/resolver/DefaultFunctionResolver.java | 8 +- .../drill/exec/resolver/FunctionResolver.java | 2 +- .../exec/resolver/FunctionResolverFactory.java | 2 +- .../exec/resolver/ResolverTypePrecedence.java | 19 ++--- .../drill/exec/resolver/TypeCastRules.java | 1 - .../exec/rpc/AbstractHandshakeHandler.java | 6 +- .../java/org/apache/drill/exec/rpc/Acks.java | 2 +- .../drill/exec/rpc/BaseRpcOutcomeListener.java | 4 +- .../org/apache/drill/exec/rpc/BasicClient.java | 6 +- .../exec/rpc/BasicClientWithConnection.java | 16 ++-- .../org/apache/drill/exec/rpc/BasicServer.java | 4 - .../drill/exec/rpc/ChannelClosedException.java | 2 +- .../drill/exec/rpc/CoordinationQueue.java | 10 +-- .../apache/drill/exec/rpc/DrillRpcFuture.java | 2 +- .../drill/exec/rpc/DrillRpcFutureImpl.java | 11 +-- .../apache/drill/exec/rpc/FutureBitCommand.java | 2 +- .../drill/exec/rpc/InboundRpcMessage.java | 10 ++- .../apache/drill/exec/rpc/ListeningCommand.java | 2 +- .../drill/exec/rpc/OutboundRpcMessage.java | 10 ++- .../drill/exec/rpc/PositiveAtomicInteger.java | 6 +- .../drill/exec/rpc/ReconnectingConnection.java | 4 +- .../apache/drill/exec/rpc/RemoteConnection.java | 4 +- .../drill/exec/rpc/RemoteRpcException.java | 8 +- .../drill/exec/rpc/ResettableBarrier.java | 4 +- .../org/apache/drill/exec/rpc/Response.java | 12 +-- .../java/org/apache/drill/exec/rpc/RpcBus.java | 4 - .../apache/drill/exec/rpc/RpcCheckedFuture.java | 6 +- .../org/apache/drill/exec/rpc/RpcCommand.java | 2 - .../org/apache/drill/exec/rpc/RpcConfig.java | 30 +++---- .../drill/exec/rpc/RpcConnectionHandler.java | 6 +- .../org/apache/drill/exec/rpc/RpcConstants.java | 4 +- .../org/apache/drill/exec/rpc/RpcDecoder.java | 16 ++-- .../org/apache/drill/exec/rpc/RpcEncoder.java | 39 +++++---- .../drill/exec/rpc/RpcExceptionHandler.java | 6 +- .../org/apache/drill/exec/rpc/RpcMessage.java | 10 +-- .../org/apache/drill/exec/rpc/RpcOutcome.java | 2 +- .../drill/exec/rpc/RpcOutcomeListener.java | 6 +- .../rpc/control/ConnectionManagerRegistry.java | 12 +-- .../drill/exec/rpc/control/ControlClient.java | 6 +- .../exec/rpc/control/ControlConnection.java | 1 + .../rpc/control/ControlConnectionManager.java | 8 +- .../control/ControlProtobufLengthDecoder.java | 3 +- .../exec/rpc/control/ControlRpcConfig.java | 6 +- .../drill/exec/rpc/control/ControlServer.java | 28 +++--- .../drill/exec/rpc/control/Controller.java | 5 +- .../drill/exec/rpc/control/ControllerImpl.java | 4 - .../rpc/control/DefaultInstanceHandler.java | 2 +- .../drill/exec/rpc/control/WorkEventBus.java | 5 +- .../exec/rpc/data/BitServerConnection.java | 1 - .../apache/drill/exec/rpc/data/DataClient.java | 8 +- .../exec/rpc/data/DataClientConnection.java | 16 ++-- .../exec/rpc/data/DataConnectionManager.java | 4 +- .../rpc/data/DataDefaultInstanceHandler.java | 8 +- .../rpc/data/DataProtobufLengthDecoder.java | 5 +- .../drill/exec/rpc/data/DataRpcConfig.java | 1 - .../apache/drill/exec/rpc/data/DataServer.java | 2 +- .../apache/drill/exec/rpc/data/DataTunnel.java | 2 +- .../drill/exec/rpc/user/QueryResultHandler.java | 1 - .../apache/drill/exec/rpc/user/UserClient.java | 1 + .../rpc/user/UserProtobufLengthDecoder.java | 3 +- .../exec/rpc/user/UserResultsListener.java | 4 +- .../apache/drill/exec/rpc/user/UserServer.java | 1 - .../apache/drill/exec/rpc/user/UserSession.java | 6 +- .../apache/drill/exec/schema/DataRecord.java | 6 +- .../apache/drill/exec/schema/DiffSchema.java | 4 +- .../org/apache/drill/exec/schema/Field.java | 1 - .../apache/drill/exec/schema/ListSchema.java | 1 - .../apache/drill/exec/schema/NamedField.java | 1 + .../apache/drill/exec/schema/ObjectSchema.java | 6 +- .../org/apache/drill/exec/schema/Record.java | 4 - .../exec/schema/json/jackson/JacksonHelper.java | 7 +- .../drill/exec/server/BootStrapContext.java | 3 - .../org/apache/drill/exec/server/Drillbit.java | 2 - .../drill/exec/server/StartupOptions.java | 6 +- .../server/options/FragmentOptionManager.java | 9 +- .../exec/server/options/QueryOptionManager.java | 9 +- .../server/options/SessionOptionManager.java | 9 +- .../server/options/SystemOptionManager.java | 11 +-- .../exec/server/options/TypeValidators.java | 4 +- .../drill/exec/server/rest/DrillRoot.java | 16 ++-- .../exec/server/rest/MetricsResources.java | 4 +- .../exec/server/rest/PluginConfigWrapper.java | 7 +- .../drill/exec/server/rest/ProfileWrapper.java | 23 ++--- .../drill/exec/server/rest/QueryResources.java | 1 - .../drill/exec/server/rest/QueryWrapper.java | 22 ++--- .../drill/exec/server/rest/StatusResources.java | 20 ++--- .../exec/server/rest/StorageResources.java | 33 +++---- .../exec/server/rest/ThreadsResources.java | 4 +- .../exec/server/rest/WebResourceServer.java | 8 +- .../drill/exec/service/ServiceEngine.java | 3 - .../drill/exec/store/AbstractRecordReader.java | 7 +- .../apache/drill/exec/store/AbstractSchema.java | 9 +- .../drill/exec/store/AbstractStoragePlugin.java | 4 +- .../drill/exec/store/ClassPathFileSystem.java | 16 ++-- .../apache/drill/exec/store/RecordReader.java | 13 ++- .../apache/drill/exec/store/RecordRecorder.java | 8 +- .../drill/exec/store/ResourceInputStream.java | 8 +- .../apache/drill/exec/store/SchemaFactory.java | 1 - .../apache/drill/exec/store/StoragePlugin.java | 4 +- .../drill/exec/store/SubSchemaWrapper.java | 8 +- .../apache/drill/exec/store/VectorHolder.java | 4 +- .../exec/store/dfs/BasicFormatMatcher.java | 36 ++++---- .../drill/exec/store/dfs/FileSelection.java | 6 +- .../exec/store/dfs/FileSystemSchemaFactory.java | 7 +- .../drill/exec/store/dfs/FormatCreator.java | 30 +++---- .../drill/exec/store/dfs/FormatPlugin.java | 8 +- .../drill/exec/store/dfs/FormatSelection.java | 12 +-- .../drill/exec/store/dfs/MagicString.java | 10 +-- .../exec/store/dfs/NamedFormatPluginConfig.java | 1 - .../drill/exec/store/dfs/ReadEntryWithPath.java | 4 +- .../exec/store/dfs/WorkspaceSchemaFactory.java | 7 -- .../exec/store/dfs/easy/EasyFormatPlugin.java | 4 +- .../exec/store/dfs/easy/EasyGroupScan.java | 1 + .../drill/exec/store/dfs/easy/EasySubScan.java | 2 - .../drill/exec/store/dfs/easy/FileWork.java | 6 +- .../exec/store/dfs/shim/DrillFileSystem.java | 4 +- .../exec/store/dfs/shim/DrillInputStream.java | 4 +- .../exec/store/dfs/shim/DrillOutputStream.java | 2 +- .../exec/store/dfs/shim/FileSystemCreator.java | 5 +- .../dfs/shim/fallback/FallbackFileSystem.java | 6 +- .../exec/store/direct/DirectGroupScan.java | 1 - .../exec/store/easy/json/JSONFormatPlugin.java | 10 +-- .../exec/store/easy/json/JSONRecordReader2.java | 7 +- .../exec/store/easy/json/JsonRecordWriter.java | 11 +-- .../exec/store/easy/text/TextFormatPlugin.java | 14 +-- .../store/ischema/InfoSchemaDrillTable.java | 2 +- .../store/ischema/InfoSchemaStoragePlugin.java | 3 +- .../exec/store/ischema/RecordGenerator.java | 8 +- .../drill/exec/store/ischema/SelectedTable.java | 8 +- .../drill/exec/store/mock/MockGroupScanPOP.java | 2 - .../drill/exec/store/mock/MockRecordReader.java | 8 +- .../exec/store/mock/MockStorageEngine.java | 1 - .../exec/store/parquet/ColumnDataReader.java | 21 ++--- .../ParquetDirectByteBufferAllocator.java | 6 +- .../exec/store/parquet/ParquetFormatConfig.java | 3 +- .../exec/store/parquet/ParquetFormatPlugin.java | 29 +++---- .../exec/store/parquet/ParquetGroupScan.java | 1 + .../exec/store/parquet/ParquetRecordWriter.java | 19 +++-- .../store/parquet/ParquetScanBatchCreator.java | 7 +- .../parquet/ParquetWriterBatchCreator.java | 4 +- .../store/parquet/columnreaders/BitReader.java | 4 +- .../parquet/columnreaders/ColumnReader.java | 12 +-- .../columnreaders/ColumnReaderFactory.java | 2 +- .../columnreaders/FixedByteAlignedReader.java | 6 +- .../columnreaders/FixedWidthRepeatedReader.java | 19 ++++- .../columnreaders/NullableBitReader.java | 1 + .../columnreaders/NullableColumnReader.java | 7 +- .../NullableFixedByteAlignedReaders.java | 16 ++-- .../NullableVarLengthValuesColumn.java | 13 ++- .../store/parquet/columnreaders/PageReader.java | 7 +- .../ParquetFixedWidthDictionaryReaders.java | 4 +- .../columnreaders/ParquetRecordReader.java | 15 +--- .../ParquetToDrillTypeConverter.java | 7 +- .../parquet/columnreaders/VarLengthColumn.java | 7 +- .../columnreaders/VarLengthColumnReaders.java | 5 +- .../columnreaders/VarLengthValuesColumn.java | 10 ++- .../exec/store/parquet2/DrillParquetReader.java | 22 +++-- .../drill/exec/store/pojo/AbstractWriter.java | 1 - .../apache/drill/exec/store/pojo/Writers.java | 1 + .../exec/store/schedule/AffinityCreator.java | 10 +-- .../exec/store/schedule/AssignmentCreator.java | 10 +-- .../exec/store/schedule/BlockMapBuilder.java | 30 +++---- .../exec/store/schedule/CompleteFileWork.java | 10 +-- .../drill/exec/store/schedule/CompleteWork.java | 2 +- .../store/schedule/EndpointByteMapImpl.java | 16 ++-- .../drill/exec/store/schedule/PartialWork.java | 12 +-- .../drill/exec/store/sys/PStoreRegistry.java | 2 +- .../drill/exec/store/sys/SystemTablePlugin.java | 5 +- .../drill/exec/store/sys/SystemTableScan.java | 1 - .../exec/store/text/DrillTextRecordReader.java | 5 -- .../exec/store/text/DrillTextRecordWriter.java | 1 - .../apache/drill/exec/util/AssertionUtil.java | 8 +- .../org/apache/drill/exec/util/AtomicState.java | 12 +-- .../apache/drill/exec/util/BatchPrinter.java | 7 +- .../apache/drill/exec/util/DecimalUtility.java | 1 - .../drill/exec/util/JsonStringArrayList.java | 7 +- .../drill/exec/util/JsonStringHashMap.java | 9 +- .../apache/drill/exec/util/TextSerializer.java | 7 +- .../org/apache/drill/exec/util/VectorUtil.java | 2 +- .../drill/exec/vector/BaseDataValueVector.java | 4 +- .../org/apache/drill/exec/vector/BitVector.java | 1 + .../org/apache/drill/exec/vector/CopyUtil.java | 7 +- .../apache/drill/exec/vector/ObjectVector.java | 9 +- .../apache/drill/exec/vector/ValueVector.java | 1 - .../apache/drill/exec/vector/VectorTrimmer.java | 2 +- .../vector/accessor/AbstractSqlAccessor.java | 32 +++---- .../drill/exec/vector/accessor/SqlAccessor.java | 6 +- .../vector/accessor/sql/TimePrintMillis.java | 4 +- .../vector/allocator/FixedVectorAllocator.java | 1 + .../RepeatedVariableEstimatedAllocator.java | 4 +- .../allocator/RepeatedVectorAllocator.java | 2 +- .../allocator/VariableEstimatedVector.java | 1 + .../allocator/VariableVectorAllocator.java | 1 + .../vector/complex/AbstractContainerVector.java | 4 +- .../drill/exec/vector/complex/MapVector.java | 5 +- .../exec/vector/complex/RepeatedListVector.java | 3 +- .../exec/vector/complex/RepeatedMapVector.java | 1 + .../exec/vector/complex/fn/JsonReader.java | 7 +- .../complex/fn/UTF8JsonRecordSplitter.java | 1 - .../vector/complex/impl/AbstractBaseReader.java | 1 - .../vector/complex/impl/ComplexWriterImpl.java | 4 +- .../complex/impl/RepeatedListReaderImpl.java | 7 ++ .../complex/impl/RepeatedMapReaderImpl.java | 13 ++- .../complex/impl/SingleListReaderImpl.java | 5 ++ .../complex/impl/SingleMapReaderImpl.java | 6 ++ .../complex/impl/VectorContainerWriter.java | 2 +- .../drill/exec/work/EndpointListener.java | 4 +- .../org/apache/drill/exec/work/ErrorHelper.java | 3 +- .../apache/drill/exec/work/QueryWorkUnit.java | 20 ++--- .../apache/drill/exec/work/ResourceRequest.java | 4 +- .../apache/drill/exec/work/RootNodeDriver.java | 4 +- .../exec/work/batch/AbstractDataCollector.java | 1 - .../exec/work/batch/ControlHandlerImpl.java | 5 -- .../drill/exec/work/batch/DataCollector.java | 1 - .../drill/exec/work/batch/IncomingBuffers.java | 1 - .../drill/exec/work/batch/MergingCollector.java | 2 +- .../drill/exec/work/batch/RawBatchBuffer.java | 1 - .../work/batch/UnlimitedRawBatchBuffer.java | 3 - .../apache/drill/exec/work/foreman/Foreman.java | 4 +- .../work/foreman/FragmentStatusListener.java | 2 +- .../drill/exec/work/foreman/QueryManager.java | 2 - .../drill/exec/work/foreman/QueryStatus.java | 19 ++--- .../exec/work/foreman/RootStatusReporter.java | 4 +- .../exec/work/fragment/FragmentManager.java | 1 - .../work/fragment/NonRootFragmentManager.java | 6 -- .../work/fragment/NonRootStatusReporter.java | 8 +- .../exec/work/fragment/RootFragmentManager.java | 1 - .../parquet/hadoop/CodecFactoryExposer.java | 9 +- .../parquet/hadoop/ColumnChunkIncReadStore.java | 19 ++--- .../ColumnChunkPageWriteStoreExposer.java | 5 +- .../org/apache/drill/ParquetSchemaMerge.java | 1 - .../java/org/apache/drill/PlanningBase.java | 15 ++-- .../org/apache/drill/TestAltSortQueries.java | 5 -- .../org/apache/drill/TestExampleQueries.java | 9 +- .../org/apache/drill/TestProjectPushDown.java | 2 - .../org/apache/drill/TestTpchDistributed.java | 2 +- .../java/org/apache/drill/TestUnionAll.java | 27 +++--- .../apache/drill/exec/DrillSystemTestBase.java | 4 - .../java/org/apache/drill/exec/SortTest.java | 14 +-- .../drill/exec/TestQueriesOnLargeFile.java | 17 ++-- .../exec/cache/TestCacheSerialization.java | 3 - .../apache/drill/exec/client/DumpCatTest.java | 3 +- .../drill/exec/compile/ExampleTemplate.java | 4 +- .../exec/compile/ExampleTemplateWithInner.java | 16 ++-- .../apache/drill/exec/expr/ExpressionTest.java | 1 - .../fn/impl/TestByteComparisonFunctions.java | 2 +- .../drill/exec/fn/impl/TestMultiInputAdd.java | 19 ++--- .../exec/fn/impl/TestNewMathFunctions.java | 2 +- .../exec/fn/impl/TestRepeatedFunction.java | 1 - .../apache/drill/exec/memory/TestEndianess.java | 1 - .../exec/physical/impl/SimpleRootExec.java | 1 - .../exec/physical/impl/TestCastFunctions.java | 2 - .../physical/impl/TestCastVarCharToBigInt.java | 2 - .../physical/impl/TestComparisonFunctions.java | 17 ++-- .../drill/exec/physical/impl/TestDecimal.java | 2 - .../physical/impl/TestHashToRandomExchange.java | 2 - .../impl/TestImplicitCastFunctions.java | 1 - .../exec/physical/impl/TestOptiqPlans.java | 7 +- .../physical/impl/TestReverseImplicitCast.java | 17 ++-- .../exec/physical/impl/TestStringFunctions.java | 3 - .../exec/physical/impl/TestUnionExchange.java | 12 +-- .../exec/physical/impl/TopN/TestSimpleTopN.java | 32 ++----- .../exec/physical/impl/agg/TestHashAggr.java | 12 +-- .../exec/physical/impl/join/TestHashJoin.java | 4 - .../exec/physical/impl/join/TestMergeJoin.java | 12 +-- .../impl/join/TestMergeJoinMulCondition.java | 2 - .../physical/impl/limit/TestSimpleLimit.java | 20 ++--- .../impl/mergereceiver/TestMergingReceiver.java | 10 +-- .../TestOrderedPartitionExchange.java | 1 - .../impl/project/TestSimpleProjection.java | 11 +-- .../exec/physical/impl/sort/TestSimpleSort.java | 9 +- .../physical/impl/svremover/TestSVRemover.java | 10 +-- .../physical/impl/union/TestSimpleUnion.java | 18 ++-- .../physical/impl/writer/TestParquetWriter.java | 4 +- .../exec/physical/impl/writer/TestWriter.java | 1 - .../apache/drill/exec/pop/PopUnitTestBase.java | 5 -- .../apache/drill/exec/pop/TestFragmenter.java | 6 +- .../exec/store/CachedSingleFileSystem.java | 11 +-- .../exec/store/TestAffinityCalculator.java | 25 +----- .../drill/exec/store/TestOutputMutator.java | 1 - .../exec/store/json/JsonRecordReader2Test.java | 1 - .../store/parquet/ParquetRecordReaderTest.java | 4 - .../store/parquet/ParquetResultListener.java | 3 +- .../exec/store/parquet/TestFileGenerator.java | 1 + .../store/parquet/TestParquetPhysicalPlan.java | 2 - .../drill/exec/store/text/TestTextColumn.java | 12 +-- .../exec/store/text/TextRecordReaderTest.java | 35 ++------ .../exec/vector/TestAdaptiveAllocation.java | 12 +-- .../complex/writer/TestComplexToJson.java | 8 +- .../complex/writer/TestComplexTypeWriter.java | 38 ++++----- .../vector/complex/writer/TestJsonReader.java | 10 +-- .../vector/complex/writer/TestRepeated.java | 1 - .../exec/work/batch/TestSpoolingBuffer.java | 13 ++- .../drill/jdbc/AvaticaDrillSqlAccessor.java | 4 +- .../java/org/apache/drill/jdbc/BasicList.java | 4 +- .../drill/jdbc/DrillColumnMetaDataList.java | 12 ++- .../org/apache/drill/jdbc/DrillConnection.java | 2 +- .../drill/jdbc/DrillConnectionConfig.java | 11 ++- .../apache/drill/jdbc/DrillConnectionImpl.java | 1 + .../java/org/apache/drill/jdbc/DrillCursor.java | 1 - .../apache/drill/jdbc/DrillJdbc41Factory.java | 1 + .../apache/drill/jdbc/DrillPrepareResult.java | 2 +- .../drill/jdbc/DrillPreparedStatement.java | 2 +- .../drill/jdbc/DrillStatementRegistry.java | 6 +- .../main/java/org/apache/drill/jdbc/Driver.java | 3 +- .../drill/jdbc/GlobalServiceSetReference.java | 8 +- .../org/apache/drill/jdbc/test/JdbcAssert.java | 8 +- .../drill/jdbc/test/JdbcTestQueryBase.java | 19 ++--- .../jdbc/test/TestAggregateFunctionsQuery.java | 19 +---- .../drill/jdbc/test/TestFunctionsQuery.java | 2 +- .../drill/jdbc/test/TestHiveScalarUDFs.java | 4 +- .../drill/jdbc/test/TestJdbcDistQuery.java | 6 +- .../apache/drill/jdbc/test/TestJdbcQuery.java | 8 +- .../apache/drill/jdbc/test/TestMetadataDDL.java | 13 ++- .../org/apache/drill/jdbc/test/TestViews.java | 14 +-- 770 files changed, 2639 insertions(+), 3231 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/com/google/protobuf/WireFormatProxy.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/com/google/protobuf/WireFormatProxy.java b/common/src/main/java/com/google/protobuf/WireFormatProxy.java index ca09fdc..181b975 100644 --- a/common/src/main/java/com/google/protobuf/WireFormatProxy.java +++ b/common/src/main/java/com/google/protobuf/WireFormatProxy.java @@ -20,7 +20,7 @@ package com.google.protobuf; public class WireFormatProxy { WireFormatProxy(){}; - + public static int getFieldType(int tag){ return WireFormat.getTagWireType(tag); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/JSONOptions.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/JSONOptions.java b/common/src/main/java/org/apache/drill/common/JSONOptions.java index c77412d..b8157e8 100644 --- a/common/src/main/java/org/apache/drill/common/JSONOptions.java +++ b/common/src/main/java/org/apache/drill/common/JSONOptions.java @@ -47,22 +47,22 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; @JsonSerialize(using = Se.class) @JsonDeserialize(using = De.class) public class JSONOptions { - + final static Logger logger = LoggerFactory.getLogger(JSONOptions.class); - + private JsonNode root; private JsonLocation location; private Object opaque; - + public JSONOptions(Object opaque){ this.opaque = opaque; } - + public JSONOptions(JsonNode n, JsonLocation location){ this.root = n; this.location = location; } - + @SuppressWarnings("unchecked") public <T> T getWith(DrillConfig config, Class<T> c){ try { @@ -73,7 +73,7 @@ public class JSONOptions { throw new IllegalArgumentException(String.format("Attmpted to retrieve a option with type of %s. However, the JSON options carried an opaque value of type %s.", c.getName(), opaque.getClass().getName())); } } - + //logger.debug("Read tree {}", root); return config.getMapper().treeToValue(root, c); } catch (JsonProcessingException e) { @@ -99,7 +99,7 @@ public class JSONOptions { if(root == null) return null; return mapper.treeAsTokens(root).readValueAs(t); } - + public JsonNode path(String name){ return root.path(name); } @@ -107,9 +107,9 @@ public class JSONOptions { public JsonNode getRoot(){ return root; } - + public static class De extends StdDeserializer<JSONOptions> { - + public De() { super(JSONOptions.class); logger.debug("Creating Deserializer."); @@ -123,7 +123,7 @@ public class JSONOptions { TreeNode n = jp.readValueAsTree(); // logger.debug("Tree {}", n); if(n instanceof JsonNode){ - return new JSONOptions( (JsonNode) n, l); + return new JSONOptions( (JsonNode) n, l); }else{ throw new IllegalArgumentException(String.format("Received something other than a JsonNode %s", n)); } @@ -143,9 +143,9 @@ public class JSONOptions { if(value.opaque != null){ jgen.writeObject(value.opaque); }else{ - jgen.writeTree(value.root); + jgen.writeTree(value.root); } - + } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/config/CommonConstants.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/config/CommonConstants.java b/common/src/main/java/org/apache/drill/common/config/CommonConstants.java index 234c9b2..8a23cf3 100644 --- a/common/src/main/java/org/apache/drill/common/config/CommonConstants.java +++ b/common/src/main/java/org/apache/drill/common/config/CommonConstants.java @@ -20,7 +20,7 @@ package org.apache.drill.common.config; public interface CommonConstants { public static final String CONFIG_DEFAULT = "drill-default.conf"; public static final String CONFIG_OVERRIDE = "drill-override.conf"; - + public static final String LOGICAL_OPERATOR_SCAN_PACKAGES = "drill.logical.operator.packages"; public static final String PHYSICAL_OPERATOR_SCAN_PACKAGES = "drill.physical.operator.packages"; public static final String STORAGE_PLUGIN_CONFIG_SCAN_PACKAGES = "drill.logical.storage.packages"; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java b/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java index 6a50fb6..df7004c 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java @@ -39,6 +39,6 @@ public class DrillError extends Error { public DrillError(Throwable cause) { super(cause); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java b/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java index 7948978..d91fb13 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java @@ -37,6 +37,6 @@ public class DrillIOException extends IOException{ public DrillIOException(Throwable cause) { super(cause); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java b/common/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java index ae647f1..d50e52e 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java @@ -25,12 +25,12 @@ public class ExecutionSetupException extends DrillException{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ExecutionSetupException.class); public static ExecutionSetupException fromThrowable(String message, Throwable cause) { - Throwable t = cause instanceof InvocationTargetException + Throwable t = cause instanceof InvocationTargetException ? ((InvocationTargetException)cause).getTargetException() : cause; if(t instanceof ExecutionSetupException) return ((ExecutionSetupException) t); return new ExecutionSetupException(message, t); } - + public ExecutionSetupException() { super(); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java b/common/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java index 9b3ab11..835182d 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java @@ -40,6 +40,6 @@ public class ExpressionParsingException extends LogicalPlanParsingException { public ExpressionParsingException(Throwable cause) { super(cause); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java b/common/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java index cae21df..1f437b2 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java @@ -28,11 +28,11 @@ public class LogicalPlanParsingException extends DrillRuntimeException{ private Set<ConstraintViolation<LogicalOperatorBase>> violations; private LogicalOperator operator; - + public LogicalPlanParsingException() { super(); } - + public LogicalPlanParsingException(LogicalOperator operator, Set<ConstraintViolation<LogicalOperatorBase>> violations){ super(getErrorMessage(operator, violations)); this.operator = operator; @@ -55,13 +55,13 @@ public class LogicalPlanParsingException extends DrillRuntimeException{ public LogicalPlanParsingException(Throwable cause) { super(cause); } - - + + private static String getErrorMessage(LogicalOperator operator, Set<ConstraintViolation<LogicalOperatorBase>> violations){ StringBuffer sb = new StringBuffer(); sb.append("Failure while attempting to set up operator of type "); sb.append(operator.getClass().getCanonicalName()); - sb.append(". Constraints violated:\n"); + sb.append(". Constraints violated:\n"); for(ConstraintViolation<LogicalOperatorBase> v : violations){ sb.append("\t"); sb.append(v.getMessage()); @@ -71,5 +71,5 @@ public class LogicalPlanParsingException extends DrillRuntimeException{ } return sb.toString(); } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/exceptions/PhysicalOperatorSetupException.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/exceptions/PhysicalOperatorSetupException.java b/common/src/main/java/org/apache/drill/common/exceptions/PhysicalOperatorSetupException.java index 3219b18..cc6ba54 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/PhysicalOperatorSetupException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/PhysicalOperatorSetupException.java @@ -40,6 +40,6 @@ public class PhysicalOperatorSetupException extends ExecutionSetupException{ public PhysicalOperatorSetupException(Throwable cause) { super(cause); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/BooleanOperator.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/BooleanOperator.java b/common/src/main/java/org/apache/drill/common/expression/BooleanOperator.java index e69717b..e00ced5 100644 --- a/common/src/main/java/org/apache/drill/common/expression/BooleanOperator.java +++ b/common/src/main/java/org/apache/drill/common/expression/BooleanOperator.java @@ -20,18 +20,17 @@ package org.apache.drill.common.expression; import java.util.List; -import org.apache.drill.common.expression.IfExpression.IfCondition; import org.apache.drill.common.expression.visitors.ExprVisitor; -import org.apache.drill.common.types.Types; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; +import org.apache.drill.common.types.Types; public class BooleanOperator extends FunctionCall{ public BooleanOperator(String name, List<LogicalExpression> args, ExpressionPosition pos) { super(name, args, pos); } - + @Override public <T, V, E extends Exception> T accept(ExprVisitor<T, V, E> visitor, V value) throws E{ return visitor.visitBooleanOperator(this, value); @@ -39,8 +38,8 @@ public class BooleanOperator extends FunctionCall{ @Override public MajorType getMajorType() { - // If any of argumgnet of a boolean "and"/"or" is nullable, the result is nullable bit. - // Otherwise, it's non-nullable bit. + // If any of argumgnet of a boolean "and"/"or" is nullable, the result is nullable bit. + // Otherwise, it's non-nullable bit. for (LogicalExpression e : args) { if (e.getMajorType().getMode() == DataMode.OPTIONAL) { return Types.OPTIONAL_BIT; @@ -49,12 +48,12 @@ public class BooleanOperator extends FunctionCall{ return Types.REQUIRED_BIT; } - + @Override - public int getSelfCost() { - return 0; // TODO + public int getSelfCost() { + return 0; // TODO } - + @Override public int getCumulativeCost() { // return the average cost of operands for a boolean "and" | "or" @@ -65,8 +64,8 @@ public class BooleanOperator extends FunctionCall{ cost += e.getCumulativeCost(); i++; } - + return (int) (cost / i) ; } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/CastExpression.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/CastExpression.java b/common/src/main/java/org/apache/drill/common/expression/CastExpression.java index 7e5eea0..b73a447 100644 --- a/common/src/main/java/org/apache/drill/common/expression/CastExpression.java +++ b/common/src/main/java/org/apache/drill/common/expression/CastExpression.java @@ -24,12 +24,12 @@ import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.MajorType; public class CastExpression extends LogicalExpressionBase implements Iterable<LogicalExpression>{ - + static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CastExpression.class); - + private final LogicalExpression input; private final MajorType type; - + public CastExpression(LogicalExpression input, MajorType type, ExpressionPosition pos) { super(pos); this.input = input; @@ -60,6 +60,6 @@ public class CastExpression extends LogicalExpressionBase implements Iterable<Lo return "CastExpression [input=" + input + ", type=" + type + "]"; } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/ConvertExpression.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/ConvertExpression.java b/common/src/main/java/org/apache/drill/common/expression/ConvertExpression.java index 9debd15..dda97e6 100644 --- a/common/src/main/java/org/apache/drill/common/expression/ConvertExpression.java +++ b/common/src/main/java/org/apache/drill/common/expression/ConvertExpression.java @@ -30,7 +30,7 @@ public class ConvertExpression extends LogicalExpressionBase implements Iterable public static final String CONVERT_FROM = "convert_from"; public static final String CONVERT_TO = "convert_to"; - + private final LogicalExpression input; private final MajorType type; private final String convertFunction; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/ErrorCollector.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/ErrorCollector.java b/common/src/main/java/org/apache/drill/common/expression/ErrorCollector.java index db6b153..f229e53 100644 --- a/common/src/main/java/org/apache/drill/common/expression/ErrorCollector.java +++ b/common/src/main/java/org/apache/drill/common/expression/ErrorCollector.java @@ -38,7 +38,7 @@ public interface ErrorCollector { public void addExpectedConstantValue(ExpressionPosition expr, int actual, String s); boolean hasErrors(); - + public int getErrorCount(); String toErrorString(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java b/common/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java index bd67be3..4f958ec 100644 --- a/common/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java +++ b/common/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java @@ -95,7 +95,7 @@ public class ErrorCollectorImpl implements ErrorCollector { return !errors.isEmpty(); } - + @Override public int getErrorCount() { return errors.size(); @@ -110,6 +110,6 @@ public class ErrorCollectorImpl implements ErrorCollector { public String toString() { return toErrorString(); } - - + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java b/common/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java index 6509792..010e440 100644 --- a/common/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java +++ b/common/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java @@ -19,12 +19,12 @@ package org.apache.drill.common.expression; public class ExpressionPosition { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ExpressionPosition.class); - + public static final ExpressionPosition UNKNOWN = new ExpressionPosition("--UNKNOWN EXPRESSION--", -1); - + private final String expression; private final int charIndex; - + public ExpressionPosition(String expression, int charIndex) { super(); this.expression = expression; @@ -38,7 +38,7 @@ public class ExpressionPosition { public int getCharIndex() { return charIndex; } - - - + + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/FunctionCall.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/FunctionCall.java b/common/src/main/java/org/apache/drill/common/expression/FunctionCall.java index 53a5b48..f6c6588 100644 --- a/common/src/main/java/org/apache/drill/common/expression/FunctionCall.java +++ b/common/src/main/java/org/apache/drill/common/expression/FunctionCall.java @@ -17,11 +17,9 @@ */ package org.apache.drill.common.expression; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.drill.common.expression.ValueExpressions.QuotedString; import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.MajorType; @@ -36,9 +34,9 @@ public class FunctionCall extends LogicalExpressionBase implements Iterable<Logi public FunctionCall(String name, List<LogicalExpression> args, ExpressionPosition pos) { super(pos); this.name = name; - + if(args == null) args = Lists.newArrayList(); - + if (!(args instanceof ImmutableList)) { args = ImmutableList.copyOf(args); } @@ -76,5 +74,5 @@ public class FunctionCall extends LogicalExpressionBase implements Iterable<Logi final int maxLen = 10; return "FunctionCall [func=" + name + ", args=" + (args != null ? args.subList(0, Math.min(args.size(), maxLen)) : null) + ", pos=" + pos + "]"; - } + } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java b/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java index 63686b2..e19f546 100644 --- a/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java +++ b/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java @@ -21,15 +21,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; -import org.apache.drill.common.config.CommonConstants; -import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.DrillRuntimeException; -import org.apache.drill.common.exceptions.ExpressionParsingException; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.common.util.PathScanner; -import org.apache.drill.common.types.Types; import com.google.common.collect.Lists; @@ -64,7 +58,7 @@ public class FunctionCallFactory { opToFuncTable.put("is not true", "isnottrue"); opToFuncTable.put("is false", "isfalse"); opToFuncTable.put("is not false", "isnotfalse"); - + opToFuncTable.put("!", "not"); opToFuncTable.put("u-", "negative"); } @@ -77,7 +71,7 @@ public class FunctionCallFactory { String opName = replaceOpWithFuncName(funcName); return opName.equals("booleanAnd") || opName.equals("booleanOr"); } - + /* * create a cast function. * arguments : type -- targetType http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java b/common/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java index aa14e4d..8c50d6f 100644 --- a/common/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java +++ b/common/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java @@ -17,12 +17,13 @@ */ package org.apache.drill.common.expression; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; +import java.util.List; + import org.apache.drill.common.expression.fn.FuncHolder; import org.apache.drill.common.expression.visitors.ExprVisitor; -import java.util.List; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; public abstract class FunctionHolderExpression extends LogicalExpressionBase { public final ImmutableList<LogicalExpression> args; @@ -68,7 +69,7 @@ public abstract class FunctionHolderExpression extends LogicalExpressionBase { * is the function output non-deterministic? */ public abstract boolean isRandom(); - + /** * @ return a copy of FunctionHolderExpression, with passed in argument list. */ http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/IfExpression.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/IfExpression.java b/common/src/main/java/org/apache/drill/common/expression/IfExpression.java index f16d8fe..a65ea09 100644 --- a/common/src/main/java/org/apache/drill/common/expression/IfExpression.java +++ b/common/src/main/java/org/apache/drill/common/expression/IfExpression.java @@ -17,52 +17,43 @@ */ package org.apache.drill.common.expression; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.drill.common.expression.IfExpression.IfCondition; import org.apache.drill.common.expression.visitors.ExprVisitor; -import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.common.types.TypeProtos.MinorType; -import org.apache.drill.common.types.Types; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import com.google.common.collect.UnmodifiableIterator; public class IfExpression extends LogicalExpressionBase{ static final Logger logger = LoggerFactory.getLogger(IfExpression.class); - + public final IfCondition ifCondition; public final LogicalExpression elseExpression; - + private IfExpression(ExpressionPosition pos, IfCondition conditions, LogicalExpression elseExpression){ super(pos); this.ifCondition = conditions; this.elseExpression = elseExpression; } - + public static class IfCondition{ public final LogicalExpression condition; public final LogicalExpression expression; - + public IfCondition(LogicalExpression condition, LogicalExpression expression) { //logger.debug("Generating IfCondition {}, {}", condition, expression); - + this.condition = condition; this.expression = expression; } } - + @Override public <T, V, E extends Exception> T accept(ExprVisitor<T, V, E> visitor, V value) throws E{ return visitor.visitIfExpression(this, value); @@ -72,12 +63,12 @@ public class IfExpression extends LogicalExpressionBase{ IfCondition conditions; private LogicalExpression elseExpression; private ExpressionPosition pos = ExpressionPosition.UNKNOWN; - + public Builder setPosition(ExpressionPosition pos){ this.pos = pos; return this; } - + public Builder setElse(LogicalExpression elseExpression) { this.elseExpression = elseExpression; return this; @@ -87,13 +78,13 @@ public class IfExpression extends LogicalExpressionBase{ this.conditions = conditions; return this; } - + public IfExpression build(){ Preconditions.checkNotNull(pos); Preconditions.checkNotNull(conditions); return new IfExpression(pos, conditions, elseExpression); } - + } @Override @@ -121,7 +112,7 @@ public class IfExpression extends LogicalExpressionBase{ @Override public Iterator<LogicalExpression> iterator() { List<LogicalExpression> children = Lists.newLinkedList(); - + children.add(ifCondition.condition); children.add(ifCondition.expression); children.add(this.elseExpression); @@ -129,10 +120,10 @@ public class IfExpression extends LogicalExpressionBase{ } @Override - public int getSelfCost() { - return 0; // TODO + public int getSelfCost() { + return 0; // TODO } - + @Override public int getCumulativeCost() { // return the average cost of operands for a boolean "and" | "or" @@ -143,7 +134,7 @@ public class IfExpression extends LogicalExpressionBase{ cost += e.getCumulativeCost(); i++; } - + return (int) (cost / i) ; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/LogicalExpression.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/LogicalExpression.java b/common/src/main/java/org/apache/drill/common/expression/LogicalExpression.java index 64ae07e..c73db49 100644 --- a/common/src/main/java/org/apache/drill/common/expression/LogicalExpression.java +++ b/common/src/main/java/org/apache/drill/common/expression/LogicalExpression.java @@ -54,7 +54,7 @@ public interface LogicalExpression extends Iterable<LogicalExpression>{ public int getSelfCost(); public int getCumulativeCost(); - + public static class De extends StdDeserializer<LogicalExpression> { DrillConfig config; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/LogicalExpressionBase.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/LogicalExpressionBase.java b/common/src/main/java/org/apache/drill/common/expression/LogicalExpressionBase.java index 056e9dd..d113cde 100644 --- a/common/src/main/java/org/apache/drill/common/expression/LogicalExpressionBase.java +++ b/common/src/main/java/org/apache/drill/common/expression/LogicalExpressionBase.java @@ -44,7 +44,7 @@ public abstract class LogicalExpressionBase implements LogicalExpression{ sb.append(" "); } } - + @Override public MajorType getMajorType() { throw new UnsupportedOperationException(String.format("The type of %s doesn't currently support LogicalExpression.getDataType().", this.getClass().getCanonicalName())); @@ -54,15 +54,15 @@ public abstract class LogicalExpressionBase implements LogicalExpression{ public String getDescription(){ return this.getClass().getSimpleName(); } - + @JsonIgnore - public int getSelfCost() { - throw new UnsupportedOperationException(String.format("The type of %s doesn't currently support LogicalExpression.getSelfCost().", this.getClass().getCanonicalName())); + public int getSelfCost() { + throw new UnsupportedOperationException(String.format("The type of %s doesn't currently support LogicalExpression.getSelfCost().", this.getClass().getCanonicalName())); } - + @JsonIgnore - public int getCumulativeCost() { - throw new UnsupportedOperationException(String.format("The type of %s doesn't currently support LogicalExpression.getCumulativeCost().", this.getClass().getCanonicalName())); + public int getCumulativeCost() { + throw new UnsupportedOperationException(String.format("The type of %s doesn't currently support LogicalExpression.getCumulativeCost().", this.getClass().getCanonicalName())); } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/NullExpression.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/NullExpression.java b/common/src/main/java/org/apache/drill/common/expression/NullExpression.java index f515d14..e00399f 100644 --- a/common/src/main/java/org/apache/drill/common/expression/NullExpression.java +++ b/common/src/main/java/org/apache/drill/common/expression/NullExpression.java @@ -19,14 +19,11 @@ package org.apache.drill.common.expression; import java.util.Iterator; -import org.apache.drill.common.expression.ExpressionPosition; -import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.common.types.Types; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.Iterators; public class NullExpression implements LogicalExpression{ @@ -55,9 +52,9 @@ public class NullExpression implements LogicalExpression{ public Iterator<LogicalExpression> iterator() { return Iterators.emptyIterator(); } - + public int getSelfCost() { return 0 ; } - + public int getCumulativeCost() { return 0; } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java b/common/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java index dee1a0b..a03524c 100644 --- a/common/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java +++ b/common/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java @@ -36,12 +36,12 @@ public interface OutputTypeDeterminer { public static OutputTypeDeterminer FIXED_VAR16CHAR = new FixedType(Types.required(MinorType.VAR16CHAR)); public MajorType getOutputType(List<LogicalExpression> expressions); - - + + public static class FixedType implements OutputTypeDeterminer{ public MajorType outputType; - - + + public FixedType(MajorType outputType) { super(); this.outputType = outputType; @@ -52,16 +52,16 @@ public interface OutputTypeDeterminer { public MajorType getOutputType(List<LogicalExpression> expressions) { return outputType; } - + } - + public static class SameAsFirstInput implements OutputTypeDeterminer{ @Override public MajorType getOutputType(List<LogicalExpression> expressions) { return expressions.get(0).getMajorType(); } } - + public static class SameAsAnySoft implements OutputTypeDeterminer{ @Override public MajorType getOutputType(List<LogicalExpression> expressions) { @@ -73,11 +73,11 @@ public interface OutputTypeDeterminer { return expressions.get(0).getMajorType(); } } - + public static class NullIfNullType implements OutputTypeDeterminer{ public MinorType outputMinorType; - - + + public NullIfNullType(MinorType outputType) { super(); this.outputMinorType = outputType; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/PathSegment.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/PathSegment.java b/common/src/main/java/org/apache/drill/common/expression/PathSegment.java index c434dc7..ebce7db 100644 --- a/common/src/main/java/org/apache/drill/common/expression/PathSegment.java +++ b/common/src/main/java/org/apache/drill/common/expression/PathSegment.java @@ -24,6 +24,7 @@ public abstract class PathSegment{ int hash; public abstract PathSegment cloneWithNewChild(PathSegment segment); + @Override public abstract PathSegment clone(); public static final class ArraySegment extends PathSegment { @@ -57,10 +58,12 @@ public abstract class PathSegment{ return index; } + @Override public boolean isArray(){ return true; } + @Override public boolean isNamed(){ return false; } @@ -98,6 +101,7 @@ public abstract class PathSegment{ return seg; } + @Override public ArraySegment cloneWithNewChild(PathSegment newChild){ ArraySegment seg = new ArraySegment(index); if(child != null){ @@ -126,10 +130,12 @@ public abstract class PathSegment{ return path; } + @Override public boolean isArray(){ return false; } + @Override public boolean isNamed(){ return true; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/SchemaPath.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/SchemaPath.java b/common/src/main/java/org/apache/drill/common/expression/SchemaPath.java index 9f444e4..eb1ec90 100644 --- a/common/src/main/java/org/apache/drill/common/expression/SchemaPath.java +++ b/common/src/main/java/org/apache/drill/common/expression/SchemaPath.java @@ -44,7 +44,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; public class SchemaPath extends LogicalExpressionBase { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java b/common/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java index 9819e0e..d94fd07 100644 --- a/common/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java +++ b/common/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java @@ -24,13 +24,12 @@ import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; - import com.google.common.collect.Iterators; public class TypedNullConstant extends LogicalExpressionBase { private final MajorType type; - + public TypedNullConstant(MajorType type) { super(null); this.type = TypeProtos.MajorType.newBuilder().mergeFrom(type).setMode(DataMode.OPTIONAL).build(); @@ -40,25 +39,25 @@ public class TypedNullConstant extends LogicalExpressionBase { public MajorType getMajorType() { return this.type; } - + @Override public <T, V, E extends Exception> T accept(ExprVisitor<T, V, E> visitor, V value) throws E { return visitor.visitNullConstant(this, value); } - + @Override 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/common/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java b/common/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java index 4ff796d..7041760 100644 --- a/common/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java +++ b/common/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java @@ -17,11 +17,11 @@ */ package org.apache.drill.common.expression.fn; -import org.apache.drill.common.types.TypeProtos.MinorType; - import java.util.HashMap; import java.util.Map; +import org.apache.drill.common.types.TypeProtos.MinorType; + public class CastFunctions { private static Map<MinorType, String> TYPE2FUNC = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/types/AtomType.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/types/AtomType.java b/common/src/main/java/org/apache/drill/common/expression/types/AtomType.java index e2a78a1..2918216 100644 --- a/common/src/main/java/org/apache/drill/common/expression/types/AtomType.java +++ b/common/src/main/java/org/apache/drill/common/expression/types/AtomType.java @@ -22,7 +22,7 @@ public class AtomType extends DataType { private String name; private Comparability comparability; private boolean isNumericType; - + public AtomType(String name, Comparability comparability, boolean isNumericType) { super(); this.name = name; @@ -30,7 +30,8 @@ public class AtomType extends DataType { this.isNumericType = isNumericType; } - + + @Override public boolean isNumericType() { return isNumericType; } @@ -60,8 +61,8 @@ public class AtomType extends DataType { public Comparability getComparability() { return comparability; } - - - - + + + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/types/DataType.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/types/DataType.java b/common/src/main/java/org/apache/drill/common/expression/types/DataType.java index 12fe0e1..b68f9bc 100644 --- a/common/src/main/java/org/apache/drill/common/expression/types/DataType.java +++ b/common/src/main/java/org/apache/drill/common/expression/types/DataType.java @@ -39,20 +39,20 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; @JsonDeserialize(using = DataType.De.class) abstract class DataType { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DataType.class); - + public static enum Comparability{ UNKNOWN, NONE, EQUAL, ORDERED; } - + public abstract String getName(); public abstract boolean isLateBind(); public abstract boolean hasChildType(); public abstract DataType getChildType(); public abstract Comparability getComparability(); public abstract boolean isNumericType(); - - - + + + public static final DataType LATEBIND = new LateBindType(); public static final DataType BOOLEAN = new AtomType("BOOLEAN", Comparability.EQUAL, false); public static final DataType BYTES = new AtomType("BYTES", Comparability.ORDERED, false); @@ -73,7 +73,7 @@ abstract class DataType { public static final DataType MAP = new AtomType("MAP", Comparability.NONE, false); public static final DataType ARRAY = new AtomType("ARRAY", Comparability.NONE, false); public static final DataType NULL = new AtomType("NULL", Comparability.NONE, false); - + //TODO: Hack to get some size data, needs to be fixed so that each type reveals it's size. public int size(){ if(this == BOOLEAN){ @@ -85,7 +85,7 @@ abstract class DataType { } return 2; } - + static final Map<String, DataType> TYPES; static { Field[] fields = DataType.class.getFields(); @@ -96,7 +96,7 @@ abstract class DataType { try { Object o = f.get(null); //logger.debug("Object {}", o); - + if(o instanceof DataType) types.put(((DataType) o).getName(), (DataType) o); } catch (IllegalArgumentException | IllegalAccessException e) { logger.warn("Failure while reading DataType.", e); @@ -104,9 +104,9 @@ abstract class DataType { } } TYPES = Collections.unmodifiableMap(types); - + } - + public static DataType getDataType(String name){ if(TYPES.containsKey(name)){ return TYPES.get(name); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java b/common/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java index 9019a21..c95bf1f 100644 --- a/common/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java +++ b/common/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java @@ -21,5 +21,5 @@ public abstract class DataTypeFactory { public abstract DataType getArrayType(DataType containedType); public abstract DataType getMapType(DataType keyType, DataType valueType); - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/common/src/main/java/org/apache/drill/common/expression/types/LateBindType.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/types/LateBindType.java b/common/src/main/java/org/apache/drill/common/expression/types/LateBindType.java index 79f09cd..db0b09c 100644 --- a/common/src/main/java/org/apache/drill/common/expression/types/LateBindType.java +++ b/common/src/main/java/org/apache/drill/common/expression/types/LateBindType.java @@ -39,7 +39,7 @@ class LateBindType extends DataType { throw new UnsupportedOperationException(); } - + @Override public boolean isNumericType() { throw new UnsupportedOperationException();
