You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/03/10 00:53:47 UTC
svn commit: r1454774 [1/3] - in /hive/branches/ptf-windowing: ./
common/src/java/org/apache/hadoop/hive/conf/ data/conf/ eclipse-templates/
ivy/ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/
ql/src/gen/protobuf/ ql/src/gen/protobuf/gen-java/...
Author: hashutosh
Date: Sat Mar 9 23:53:44 2013
New Revision: 1454774
URL: http://svn.apache.org/r1454774
Log:
Merged with trunk. Resolved conflicts in TypeCheckProcFactory. All ptf and windowing tests passed.
Added:
hive/branches/ptf-windowing/ql/src/gen/protobuf/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/apache/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/apache/hadoop/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/hadoop/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/
- copied from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/
hive/branches/ptf-windowing/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java
- copied unchanged from r1454765, hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/
- copied from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/BitFieldReader.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/BitFieldReader.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/BitFieldWriter.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/BitFieldWriter.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/BooleanColumnStatistics.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/BooleanColumnStatistics.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ColumnStatistics.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ColumnStatistics.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ColumnStatisticsImpl.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ColumnStatisticsImpl.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionKind.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionKind.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/DoubleColumnStatistics.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/DoubleColumnStatistics.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/DynamicByteArray.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/DynamicByteArray.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/DynamicIntArray.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/DynamicIntArray.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/InStream.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/InStream.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/IntegerColumnStatistics.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/IntegerColumnStatistics.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcOutputFormat.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcOutputFormat.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OutStream.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OutStream.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/PositionProvider.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/PositionProvider.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/PositionRecorder.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/PositionRecorder.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/PositionedOutputStream.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/PositionedOutputStream.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/Reader.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/Reader.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ReaderImpl.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ReaderImpl.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReader.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReader.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RedBlackTree.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RedBlackTree.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthByteReader.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthByteReader.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthByteWriter.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthByteWriter.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReader.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReader.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerWriter.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerWriter.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SerializationUtils.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SerializationUtils.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SnappyCodec.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SnappyCodec.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StreamName.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StreamName.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StringColumnStatistics.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StringColumnStatistics.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StringRedBlackTree.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StringRedBlackTree.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StripeInformation.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StripeInformation.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/Writer.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/Writer.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/io/orc/package-info.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/package-info.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeColumnListDesc.java
- copied unchanged from r1454765, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeColumnListDesc.java
hive/branches/ptf-windowing/ql/src/protobuf/
- copied from r1454765, hive/trunk/ql/src/protobuf/
hive/branches/ptf-windowing/ql/src/protobuf/org/
- copied from r1454765, hive/trunk/ql/src/protobuf/org/
hive/branches/ptf-windowing/ql/src/protobuf/org/apache/
- copied from r1454765, hive/trunk/ql/src/protobuf/org/apache/
hive/branches/ptf-windowing/ql/src/protobuf/org/apache/hadoop/
- copied from r1454765, hive/trunk/ql/src/protobuf/org/apache/hadoop/
hive/branches/ptf-windowing/ql/src/protobuf/org/apache/hadoop/hive/
- copied from r1454765, hive/trunk/ql/src/protobuf/org/apache/hadoop/hive/
hive/branches/ptf-windowing/ql/src/protobuf/org/apache/hadoop/hive/ql/
- copied from r1454765, hive/trunk/ql/src/protobuf/org/apache/hadoop/hive/ql/
hive/branches/ptf-windowing/ql/src/protobuf/org/apache/hadoop/hive/ql/io/
- copied from r1454765, hive/trunk/ql/src/protobuf/org/apache/hadoop/hive/ql/io/
hive/branches/ptf-windowing/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/
- copied from r1454765, hive/trunk/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/
hive/branches/ptf-windowing/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto
- copied unchanged from r1454765, hive/trunk/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/
- copied from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestBitFieldReader.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestBitFieldReader.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestDynamicArray.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestDynamicArray.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestFileDump.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestFileDump.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInStream.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInStream.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestRunLengthByteReader.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestRunLengthByteReader.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestRunLengthIntegerReader.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestRunLengthIntegerReader.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestSerializationUtils.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestSerializationUtils.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestStreamName.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestStreamName.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestStringRedBlackTree.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestStringRedBlackTree.java
hive/branches/ptf-windowing/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestZlib.java
- copied unchanged from r1454765, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestZlib.java
hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/allcolref_in_udf.q
- copied unchanged from r1454765, hive/trunk/ql/src/test/queries/clientpositive/allcolref_in_udf.q
hive/branches/ptf-windowing/ql/src/test/resources/orc-file-dump.out
- copied unchanged from r1454765, hive/trunk/ql/src/test/resources/orc-file-dump.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
- copied unchanged from r1454765, hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
Modified:
hive/branches/ptf-windowing/ (props changed)
hive/branches/ptf-windowing/build.properties
hive/branches/ptf-windowing/build.xml
hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/branches/ptf-windowing/data/conf/hive-site.xml
hive/branches/ptf-windowing/eclipse-templates/.classpath
hive/branches/ptf-windowing/ivy/libraries.properties
hive/branches/ptf-windowing/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
hive/branches/ptf-windowing/ql/build.xml
hive/branches/ptf-windowing/ql/ivy.xml
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/HashMapWrapper.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join19.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join9.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/input39_hadoop20.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join38.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join9.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join_map_ppr.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/louter_join_ppr.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/router_join_ppr.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/stats11.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/union26.q.out
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/cast1.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input1.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input6.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input9.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_part1.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join4.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join5.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join6.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join7.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join8.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml
hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml
Propchange: hive/branches/ptf-windowing/
------------------------------------------------------------------------------
Merged /hive/trunk:r1451444-1454765
Modified: hive/branches/ptf-windowing/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/build.properties?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/build.properties (original)
+++ hive/branches/ptf-windowing/build.properties Sat Mar 9 23:53:44 2013
@@ -76,6 +76,7 @@ iterate.hive.all=ant,shims,common,serde,
iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,hwi,hbase-handler,pdk,builtins
iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service
iterate.hive.thrift=ql,service,metastore,serde
+iterate.hive.protobuf=ql
iterate.hive.cpp=odbc
#
Modified: hive/branches/ptf-windowing/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/build.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/build.xml (original)
+++ hive/branches/ptf-windowing/build.xml Sat Mar 9 23:53:44 2013
@@ -256,6 +256,11 @@
<iterate target="thriftif" iterate="${iterate.hive.thrift}"/>
</target>
+ <target name="protobuf">
+ <echo message="Project: ${ant.project.name}"/>
+ <iterate target="protobuf" iterate="${iterate.hive.protobuf}"/>
+ </target>
+
<target name="jar"
depends="init"
description="Build JAR artifacts">
Modified: hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Sat Mar 9 23:53:44 2013
@@ -470,7 +470,7 @@ public class HiveConf extends Configurat
HIVEUSEEXPLICITRCFILEHEADER("hive.exec.rcfile.use.explicit.header", true),
HIVESKEWJOIN("hive.optimize.skewjoin", false),
- HIVECONVERTJOIN("hive.auto.convert.join", false),
+ HIVECONVERTJOIN("hive.auto.convert.join", true),
HIVECONVERTJOINNOCONDITIONALTASK("hive.auto.convert.join.noconditionaltask", false),
HIVECONVERTJOINNOCONDITIONALTASKTHRESHOLD("hive.auto.convert.join.noconditionaltask.size",
10000000L),
Modified: hive/branches/ptf-windowing/data/conf/hive-site.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/data/conf/hive-site.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/data/conf/hive-site.xml (original)
+++ hive/branches/ptf-windowing/data/conf/hive-site.xml Sat Mar 9 23:53:44 2013
@@ -171,6 +171,12 @@
</property>
<property>
+ <name>hive.auto.convert.join</name>
+ <value>false</value>
+ <description>Whether Hive enable the optimization about converting common join into mapjoin based on the input file size</description>
+</property>
+
+<property>
<name>hive.input.format</name>
<value>org.apache.hadoop.hive.ql.io.CombineHiveInputFormat</value>
<description>The default input format, if it is not specified, the system assigns it. It is set to HiveInputFormat for hadoop versions 17, 18 and 19, whereas it is set to CombineHiveInputFormat for hadoop 20. The user can always overwrite it - if there is a bug in CombineHiveInputFormat, it can always be manually set to HiveInputFormat. </description>
Modified: hive/branches/ptf-windowing/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/eclipse-templates/.classpath?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/eclipse-templates/.classpath (original)
+++ hive/branches/ptf-windowing/eclipse-templates/.classpath Sat Mar 9 23:53:44 2013
@@ -62,6 +62,7 @@
<classpathentry kind="lib" path="build/ivy/lib/default/hbase-@hbase.version@-tests.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/libfb303-@libfb303.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/libthrift-@libthrift.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/protobuf-java-@protobuf.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/zookeeper-@zookeeper.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/log4j-@log4j.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/antlr-@antlr.version@.jar"/>
@@ -86,6 +87,7 @@
<classpathentry kind="lib" path="build/ivy/lib/default/jackson-xc-1.8.8.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/mockito-all-@mockito-all.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/stringtemplate-@stringtemplate.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
<classpathentry kind="lib" path="build/builtins/hive-builtins-@HIVE_VERSION@.jar"/>
<classpathentry kind="src" path="build/contrib/test/src"/>
<classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
@@ -101,6 +103,7 @@
<classpathentry kind="src" path="metastore/src/model"/>
<classpathentry kind="src" path="metastore/src/test"/>
<classpathentry kind="src" path="ql/src/gen/thrift/gen-javabean"/>
+ <classpathentry kind="src" path="ql/src/gen/protobuf/gen-java"/>
<classpathentry kind="src" path="ql/src/java"/>
<classpathentry kind="src" path="ql/src/test"/>
<classpathentry kind="src" path="serde/src/gen/thrift/gen-javabean"/>
Modified: hive/branches/ptf-windowing/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ivy/libraries.properties?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ivy/libraries.properties (original)
+++ hive/branches/ptf-windowing/ivy/libraries.properties Sat Mar 9 23:53:44 2013
@@ -60,9 +60,11 @@ libthrift.version=0.9.0
log4j.version=1.2.16
maven-ant-tasks.version=2.1.0
mockito-all.version=1.8.2
+protobuf.version=2.4.1
rat.version=0.8
slf4j-api.version=1.6.1
slf4j-log4j12.version=1.6.1
+snappy.version=0.2
velocity.version=1.5
zookeeper.version=3.4.3
javolution.version=5.5.1
Modified: hive/branches/ptf-windowing/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (original)
+++ hive/branches/ptf-windowing/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java Sat Mar 9 23:53:44 2013
@@ -2043,16 +2043,23 @@ public class ObjectStore implements RawS
public void alterPartition(String dbname, String name, List<String> part_vals, Partition newPart)
throws InvalidObjectException, MetaException {
boolean success = false;
+ Exception e = null;
try {
openTransaction();
alterPartitionNoTxn(dbname, name, part_vals, newPart);
// commit the changes
success = commitTransaction();
+ } catch (Exception exception) {
+ e = exception;
} finally {
if (!success) {
rollbackTransaction();
- throw new MetaException(
+ MetaException metaException = new MetaException(
"The transaction for alter partition did not commit successfully.");
+ if (e != null) {
+ metaException.initCause(e);
+ }
+ throw metaException;
}
}
}
@@ -2060,6 +2067,7 @@ public class ObjectStore implements RawS
public void alterPartitions(String dbname, String name, List<List<String>> part_vals,
List<Partition> newParts) throws InvalidObjectException, MetaException {
boolean success = false;
+ Exception e = null;
try {
openTransaction();
Iterator<List<String>> part_val_itr = part_vals.iterator();
@@ -2069,11 +2077,17 @@ public class ObjectStore implements RawS
}
// commit the changes
success = commitTransaction();
+ } catch (Exception exception) {
+ e = exception;
} finally {
if (!success) {
rollbackTransaction();
- throw new MetaException(
+ MetaException metaException = new MetaException(
"The transaction for alter partition did not commit successfully.");
+ if (e != null) {
+ metaException.initCause(e);
+ }
+ throw metaException;
}
}
}
Modified: hive/branches/ptf-windowing/ql/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/build.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/build.xml (original)
+++ hive/branches/ptf-windowing/ql/build.xml Sat Mar 9 23:53:44 2013
@@ -22,6 +22,9 @@
<property name="ql.lib.dir" value="${basedir}/lib"/>
<property name="src.dir" location="${basedir}/src/java"/>
+ <property name="protobuf.src.dir" location="${basedir}/src/protobuf"/>
+ <property name="protobuf.build.dir"
+ location="${basedir}/src/gen/protobuf/gen-java"/>
<property name="ql.test.query.dir" location="${basedir}/src/test/queries"/>
<property name="ql.test.template.dir" location="${basedir}/src/test/templates"/>
<property name="ql.test.results.dir" location="${basedir}/src/test/results"/>
@@ -147,16 +150,28 @@
</java>
</target>
+ <target name="protobuf">
+ <echo message="Project: ${ant.project.name}"/>
+ <echo>Building ORC Protobuf</echo>
+ <mkdir dir="${protobuf.build.dir}"/>
+ <exec executable="protoc" failonerror="true">
+ <arg value="--java_out=${protobuf.build.dir}"/>
+ <arg value="-I=${protobuf.src.dir}/org/apache/hadoop/hive/ql/io/orc"/>
+ <arg value="${protobuf.src.dir}/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto"/>
+ </exec>
+ </target>
+
<target name="ql-init">
<echo message="Project: ${ant.project.name}"/>
<mkdir dir="${build.dir}/gen/antlr/gen-java/org/apache/hadoop/hive/ql/parse"/>
</target>
- <target name="compile" depends="init, ql-init, ivy-retrieve, build-grammar">
+ <target name="compile"
+ depends="init, ql-init, ivy-retrieve, build-grammar">
<echo message="Project: ${ant.project.name}"/>
<javac
encoding="${build.encoding}"
- srcdir="${src.dir}:${basedir}/src/gen/thrift/gen-javabean:${build.dir}/gen/antlr/gen-java"
+ srcdir="${src.dir}:${basedir}/src/gen/thrift/gen-javabean:${build.dir}/gen/antlr/gen-java:${protobuf.build.dir}"
includes="**/*.java"
destdir="${build.classes}"
debug="${javac.debug}"
Modified: hive/branches/ptf-windowing/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/ivy.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/ivy.xml (original)
+++ hive/branches/ptf-windowing/ql/ivy.xml Sat Mar 9 23:53:44 2013
@@ -38,6 +38,10 @@
conf="test->default" transitive="false"/>
<dependency org="org.antlr" name="antlr" rev="${antlr.version}"
transitive="false"/>
+ <dependency org="com.google.protobuf" name="protobuf-java"
+ rev="${protobuf.version}" transitive="false"/>
+ <dependency org="org.iq80.snappy" name="snappy"
+ rev="${snappy.version}" transitive="false"/>
<!-- hadoop specific guava -->
<dependency org="com.google.guava" name="guava" rev="${guava-hadoop20.version}"
Modified: hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/HashMapWrapper.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/HashMapWrapper.java?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/HashMapWrapper.java (original)
+++ hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/HashMapWrapper.java Sat Mar 9 23:53:44 2013
@@ -21,6 +21,8 @@ package org.apache.hadoop.hive.ql.exec.p
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -112,7 +114,7 @@ public class HashMapWrapper<K, V> implem
*/
public long flushMemoryCacheToPersistent(File file) throws IOException {
ObjectOutputStream outputStream = null;
- outputStream = new ObjectOutputStream(new FileOutputStream(file));
+ outputStream = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file), 4096));
outputStream.writeObject(mHash);
outputStream.flush();
outputStream.close();
@@ -122,7 +124,7 @@ public class HashMapWrapper<K, V> implem
public void initilizePersistentHash(String fileName) throws IOException, ClassNotFoundException {
ObjectInputStream inputStream = null;
- inputStream = new ObjectInputStream(new FileInputStream(fileName));
+ inputStream = new ObjectInputStream(new BufferedInputStream(new FileInputStream(fileName), 4096));
HashMap<K, V> hashtable = (HashMap<K, V>) inputStream.readObject();
this.setMHash(hashtable);
Modified: hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java (original)
+++ hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java Sat Mar 9 23:53:44 2013
@@ -49,9 +49,6 @@ public class Optimizer {
transformations = new ArrayList<Transform>();
// Add the transformation that computes the lineage information.
transformations.add(new Generator());
- if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCP)) {
- transformations.add(new ColumnPruner());
- }
if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTPPD)) {
transformations.add(new PredicateTransitivePropagate());
transformations.add(new PredicatePushDown());
@@ -62,6 +59,9 @@ public class Optimizer {
transformations.add(new ListBucketingPruner());
}
}
+ if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCP)) {
+ transformations.add(new ColumnPruner());
+ }
if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_OPTIMIZE_SKEWJOIN_COMPILETIME)) {
transformations.add(new SkewJoinOptimizer());
}
Modified: hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g (original)
+++ hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g Sat Mar 9 23:53:44 2013
@@ -171,11 +171,11 @@ function
LPAREN
(
(star=STAR)
- | (dist=KW_DISTINCT)? (expression (COMMA expression)*)?
+ | (dist=KW_DISTINCT)? (selectExpression (COMMA selectExpression)*)?
)
RPAREN -> {$star != null}? ^(TOK_FUNCTIONSTAR functionName)
- -> {$dist == null}? ^(TOK_FUNCTION functionName (expression+)?)
- -> ^(TOK_FUNCTIONDI functionName (expression+)?)
+ -> {$dist == null}? ^(TOK_FUNCTION functionName (selectExpression+)?)
+ -> ^(TOK_FUNCTIONDI functionName (selectExpression+)?)
;
functionName
Modified: hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Sat Mar 9 23:53:44 2013
@@ -149,6 +149,7 @@ import org.apache.hadoop.hive.ql.plan.Cr
import org.apache.hadoop.hive.ql.plan.DDLWork;
import org.apache.hadoop.hive.ql.plan.DynamicPartitionCtx;
import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeColumnListDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeDescUtils;
@@ -8937,6 +8938,9 @@ public class SemanticAnalyzer extends Ba
}
throw new SemanticException(errMsg);
}
+ if (desc instanceof ExprNodeColumnListDesc) {
+ throw new SemanticException("TOK_ALLCOLREF is not supported in current context");
+ }
if (!unparseTranslator.isEnabled()) {
// Not creating a view, so no need to track view expansions.
Modified: hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java (original)
+++ hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java Sat Mar 9 23:53:44 2013
@@ -48,6 +48,7 @@ import org.apache.hadoop.hive.ql.lib.Nod
import org.apache.hadoop.hive.ql.lib.Rule;
import org.apache.hadoop.hive.ql.lib.RuleRegExp;
import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeColumnListDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeFieldDesc;
@@ -535,14 +536,11 @@ public final class TypeCheckProcFactory
windowingTokens.add(HiveParser.TOK_TABSORTCOLNAMEDESC);
}
- public static boolean isRedundantConversionFunction(ASTNode expr,
+ private static boolean isRedundantConversionFunction(ASTNode expr,
boolean isFunction, ArrayList<ExprNodeDesc> children) {
if (!isFunction) {
return false;
}
- // children is always one less than the expr.getChildCount(), since the
- // latter contains function name.
- assert (children.size() == expr.getChildCount() - 1);
// conversion functions take a single parameter
if (children.size() != 1) {
return false;
@@ -893,6 +891,43 @@ public final class TypeCheckProcFactory
return null;
}
+ if (expr.getType() == HiveParser.TOK_TABNAME) {
+ return null;
+ }
+
+ if (expr.getType() == HiveParser.TOK_ALLCOLREF) {
+ RowResolver input = ctx.getInputRR();
+ ExprNodeColumnListDesc columnList = new ExprNodeColumnListDesc();
+ assert expr.getChildCount() <= 1;
+ if (expr.getChildCount() == 1) {
+ // table aliased (select a.*, for example)
+ ASTNode child = (ASTNode) expr.getChild(0);
+ assert child.getType() == HiveParser.TOK_TABNAME;
+ assert child.getChildCount() == 1;
+ String tableAlias = BaseSemanticAnalyzer.unescapeIdentifier(child.getChild(0).getText());
+ HashMap<String, ColumnInfo> columns = input.getFieldMap(tableAlias);
+ if (columns == null) {
+ throw new SemanticException(ErrorMsg.INVALID_TABLE_ALIAS.getMsg(child));
+ }
+ for (Map.Entry<String, ColumnInfo> colMap : columns.entrySet()) {
+ ColumnInfo colInfo = colMap.getValue();
+ if (!colInfo.getIsVirtualCol()) {
+ columnList.addColumn(new ExprNodeColumnDesc(colInfo.getType(),
+ colInfo.getInternalName(), colInfo.getTabAlias(), false));
+ }
+ }
+ } else {
+ // all columns (select *, for example)
+ for (ColumnInfo colInfo : input.getColumnInfos()) {
+ if (!colInfo.getIsVirtualCol()) {
+ columnList.addColumn(new ExprNodeColumnDesc(colInfo.getType(),
+ colInfo.getInternalName(), colInfo.getTabAlias(), false));
+ }
+ }
+ }
+ return columnList;
+ }
+
// If the first child is a TOK_TABLE_OR_COL, and nodeOutput[0] is NULL,
// and the operator is a DOT, then it's a table column reference.
if (expr.getType() == HiveParser.DOT
@@ -924,7 +959,9 @@ public final class TypeCheckProcFactory
return null;
}
- boolean isFunction = (expr.getType() == HiveParser.TOK_FUNCTION);
+ boolean isFunction = (expr.getType() == HiveParser.TOK_FUNCTION ||
+ expr.getType() == HiveParser.TOK_FUNCTIONSTAR ||
+ expr.getType() == HiveParser.TOK_FUNCTIONDI);
// Create all children
int childrenBegin = (isFunction ? 1 : 0);
@@ -932,7 +969,21 @@ public final class TypeCheckProcFactory
.getChildCount()
- childrenBegin);
for (int ci = childrenBegin; ci < expr.getChildCount(); ci++) {
- children.add((ExprNodeDesc) nodeOutputs[ci]);
+ if (nodeOutputs[ci] instanceof ExprNodeColumnListDesc) {
+ children.addAll(((ExprNodeColumnListDesc)nodeOutputs[ci]).getChildren());
+ } else {
+ children.add((ExprNodeDesc) nodeOutputs[ci]);
+ }
+ }
+
+ if (expr.getType() == HiveParser.TOK_FUNCTIONSTAR) {
+ RowResolver input = ctx.getInputRR();
+ for (ColumnInfo colInfo : input.getColumnInfos()) {
+ if (!colInfo.getIsVirtualCol()) {
+ children.add(new ExprNodeColumnDesc(colInfo.getType(),
+ colInfo.getInternalName(), colInfo.getTabAlias(), false));
+ }
+ }
}
// If any of the children contains null, then return a null
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join19.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join19.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join19.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join19.q.out Sat Mar 9 23:53:44 2013
@@ -42,7 +42,7 @@ STAGE PLANS:
alias: src2
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -60,13 +60,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 0
Select Operator
expressions:
@@ -111,7 +111,7 @@ STAGE PLANS:
alias: src1
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -129,13 +129,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 1
Select Operator
expressions:
@@ -173,10 +173,6 @@ STAGE PLANS:
value expressions:
expr: key
type: string
- expr: ds
- type: string
- expr: hr
- type: string
src2
TableScan
alias: src2
@@ -197,10 +193,10 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col2} {VALUE._col3}
+ 0 {VALUE._col0}
1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Select Operator
expressions:
expr: UDFToInteger(_col0)
@@ -217,7 +213,6 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: default.dest1
-
PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value
where (src1.ds = '2008-04-08' or src1.ds = '2008-04-09' )and (src1.hr = '12' or src1.hr = '11')
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join9.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join9.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/auto_join9.q.out Sat Mar 9 23:53:44 2013
@@ -40,7 +40,7 @@ STAGE PLANS:
alias: src2
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -58,13 +58,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 0
Select Operator
expressions:
@@ -109,7 +109,7 @@ STAGE PLANS:
alias: src1
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -127,13 +127,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 1
Select Operator
expressions:
@@ -171,10 +171,6 @@ STAGE PLANS:
value expressions:
expr: key
type: string
- expr: ds
- type: string
- expr: hr
- type: string
src2
TableScan
alias: src2
@@ -195,10 +191,10 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col2} {VALUE._col3}
+ 0 {VALUE._col0}
1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Select Operator
expressions:
expr: UDFToInteger(_col0)
@@ -215,7 +211,6 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: default.dest1
-
PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value where src1.ds = '2008-04-08' and src1.hr = '12'
PREHOOK: type: QUERY
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin1.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin1.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin1.q.out Sat Mar 9 23:53:44 2013
@@ -53,7 +53,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -77,12 +77,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col6, _col7
+ outputColumnNames: _col0, _col1, _col6
Position of Big Table: 0
BucketMapJoin: true
Select Operator
@@ -167,7 +167,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -196,12 +196,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col6, _col7
+ outputColumnNames: _col0, _col1, _col6
Position of Big Table: 1
BucketMapJoin: true
Select Operator
@@ -359,7 +359,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -385,12 +385,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 0
BucketMapJoin: true
Select Operator
@@ -849,7 +849,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -875,12 +875,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 1
BucketMapJoin: true
Select Operator
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out Sat Mar 9 23:53:44 2013
@@ -85,7 +85,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -104,12 +104,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 0
Select Operator
expressions:
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/filter_join_breaktask.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/filter_join_breaktask.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/filter_join_breaktask.q.out Sat Mar 9 23:53:44 2013
@@ -81,8 +81,6 @@ STAGE PLANS:
value expressions:
expr: value
type: string
- expr: ds
- type: string
Needs Tagging: true
Path -> Alias:
#### A masked pattern was here ####
@@ -138,9 +136,9 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0}
- 1 {VALUE._col1} {VALUE._col2}
+ 1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col6, _col7
+ outputColumnNames: _col0, _col6
File Output Operator
compressed: false
GlobalTableId: 0
@@ -150,8 +148,8 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
properties:
- columns _col0,_col6,_col7
- columns.types int,string,string
+ columns _col0,_col6
+ columns.types int,string
escape.delim \
TotalFiles: 1
GatherStats: false
@@ -206,15 +204,15 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
properties:
- columns _col0,_col6,_col7
- columns.types int,string,string
+ columns _col0,_col6
+ columns.types int,string
escape.delim \
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
properties:
- columns _col0,_col6,_col7
- columns.types int,string,string
+ columns _col0,_col6
+ columns.types int,string
escape.delim \
#### A masked pattern was here ####
Partition
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out Sat Mar 9 23:53:44 2013
@@ -57,18 +57,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
@@ -111,7 +108,6 @@ STAGE PLANS:
Fetch Operator
limit: -1
-
PREHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
PREHOOK: type: QUERY
PREHOOK: Input: default@src
@@ -376,18 +372,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out Sat Mar 9 23:53:44 2013
@@ -57,18 +57,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
@@ -111,7 +108,6 @@ STAGE PLANS:
Fetch Operator
limit: -1
-
PREHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
PREHOOK: type: QUERY
PREHOOK: Input: default@src
@@ -353,18 +349,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/input39_hadoop20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/input39_hadoop20.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/input39_hadoop20.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/input39_hadoop20.q.out Sat Mar 9 23:53:44 2013
@@ -96,9 +96,6 @@ STAGE PLANS:
expr: key
type: string
tag: 0
- value expressions:
- expr: ds
- type: string
t2
TableScan
alias: t2
@@ -115,18 +112,14 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: ds
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col2}
- 1 {VALUE._col2}
+ 0
+ 1
handleSkewJoin: false
- outputColumnNames: _col2, _col7
Select Operator
Group By Operator
aggregations:
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join38.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join38.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join38.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join38.q.out Sat Mar 9 23:53:44 2013
@@ -95,7 +95,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {value}
- 1 {col5} {col11}
+ 1 {col5}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -117,12 +117,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {value}
- 1 {col5} {col11}
+ 1 {col5}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[col11]]
- outputColumnNames: _col1, _col9, _col15
+ outputColumnNames: _col1, _col9
Position of Big Table: 1
Select Operator
expressions:
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join9.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join9.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join9.q.out Sat Mar 9 23:53:44 2013
@@ -39,10 +39,6 @@ STAGE PLANS:
value expressions:
expr: key
type: string
- expr: ds
- type: string
- expr: hr
- type: string
src2
TableScan
alias: src2
@@ -156,10 +152,10 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col2} {VALUE._col3}
+ 0 {VALUE._col0}
1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Select Operator
expressions:
expr: UDFToInteger(_col0)
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join_map_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join_map_ppr.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join_map_ppr.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/join_map_ppr.q.out Sat Mar 9 23:53:44 2013
@@ -50,7 +50,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -65,7 +65,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -87,13 +87,13 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
2 [Column[key]]
- outputColumnNames: _col0, _col5, _col9, _col10, _col11
+ outputColumnNames: _col0, _col5, _col9
Position of Big Table: 2
Select Operator
expressions:
@@ -598,7 +598,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
@@ -613,7 +613,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
@@ -635,13 +635,13 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
1 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
2 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
- outputColumnNames: _col0, _col5, _col9, _col10, _col11
+ outputColumnNames: _col0, _col5, _col9
Position of Big Table: 2
Select Operator
expressions:
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/lateral_view_ppd.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/lateral_view_ppd.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/lateral_view_ppd.q.out Sat Mar 9 23:53:44 2013
@@ -22,9 +22,12 @@ STAGE PLANS:
type: boolean
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: value
+ type: string
+ outputColumnNames: value
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Select Operator
expressions:
expr: _col1
@@ -46,7 +49,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Select Operator
expressions:
expr: _col1
@@ -193,13 +196,9 @@ STAGE PLANS:
expressions:
expr: value
type: string
- expr: ds
- type: string
- expr: hr
- type: string
- outputColumnNames: value, ds, hr
+ outputColumnNames: value
Lateral View Join Operator
- outputColumnNames: _col1, _col2, _col3, _col4
+ outputColumnNames: _col1, _col4
Select Operator
expressions:
expr: _col1
@@ -222,7 +221,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col1, _col2, _col3, _col4
+ outputColumnNames: _col1, _col4
Select Operator
expressions:
expr: _col1
@@ -289,14 +288,22 @@ STAGE PLANS:
type: boolean
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: value
+ type: string
+ outputColumnNames: value
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: _col1
+ type: string
+ expr: _col2
+ type: int
+ outputColumnNames: _col1, _col2
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
@@ -318,7 +325,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
@@ -340,12 +347,17 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: _col1
+ type: string
+ expr: _col2
+ type: int
+ outputColumnNames: _col1, _col2
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
@@ -367,7 +379,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/louter_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/louter_join_ppr.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/louter_join_ppr.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/louter_join_ppr.q.out Sat Mar 9 23:53:44 2013
@@ -1164,8 +1164,6 @@ STAGE PLANS:
type: string
expr: value
type: string
- expr: ds
- type: string
b
TableScan
alias: b
@@ -1332,10 +1330,10 @@ STAGE PLANS:
condition map:
Left Outer Join0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col1} {VALUE._col2}
+ 0 {VALUE._col0} {VALUE._col1}
1 {VALUE._col0} {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col2, _col6, _col7
+ outputColumnNames: _col0, _col1, _col6, _col7
Filter Operator
isSamplingPred: false
predicate:
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out Sat Mar 9 23:53:44 2013
@@ -358,9 +358,7 @@ STAGE PLANS:
expressions:
expr: _col0
type: int
- expr: _col6
- type: int
- outputColumnNames: _col0, _col1
+ outputColumnNames: _col0
File Output Operator
compressed: false
GlobalTableId: 0
@@ -378,8 +376,6 @@ STAGE PLANS:
value expressions:
expr: _col0
type: int
- expr: _col1
- type: int
d
TableScan
alias: d
@@ -396,10 +392,10 @@ STAGE PLANS:
condition map:
Left Outer Join0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col1}
+ 0 {VALUE._col0}
1 {VALUE._col0} {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col3, _col4
+ outputColumnNames: _col0, _col3, _col4
Filter Operator
predicate:
expr: (_col3 = 1)
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/router_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/router_join_ppr.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/router_join_ppr.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/router_join_ppr.q.out Sat Mar 9 23:53:44 2013
@@ -784,8 +784,6 @@ STAGE PLANS:
type: string
expr: value
type: string
- expr: ds
- type: string
Needs Tagging: true
Path -> Alias:
#### A masked pattern was here ####
@@ -930,9 +928,9 @@ STAGE PLANS:
Right Outer Join0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0} {VALUE._col1} {VALUE._col2}
+ 1 {VALUE._col0} {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4, _col5, _col6
+ outputColumnNames: _col0, _col1, _col4, _col5
Filter Operator
isSamplingPred: false
predicate:
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out Sat Mar 9 23:53:44 2013
@@ -46,13 +46,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds}
+ 0 {key}
1 {key} {value} {ds}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col5, _col6, _col7
+ outputColumnNames: _col0, _col5, _col6, _col7
Position of Big Table: 0
Select Operator
expressions:
@@ -141,13 +141,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds}
+ 0 {key}
1 {key} {value} {ds}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col5, _col6, _col7
+ outputColumnNames: _col0, _col5, _col6, _col7
Position of Big Table: 1
Select Operator
expressions:
@@ -269,13 +269,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds}
+ 0 {key}
1 {key} {value} {ds}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col5, _col6, _col7
+ outputColumnNames: _col0, _col5, _col6, _col7
Position of Big Table: 0
Select Operator
expressions:
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out Sat Mar 9 23:53:44 2013
@@ -76,13 +76,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out Sat Mar 9 23:53:44 2013
@@ -84,13 +84,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key], Column[value]]
1 [Column[key], Column[value]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out Sat Mar 9 23:53:44 2013
@@ -84,13 +84,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key], Column[value]]
1 [Column[key], Column[value]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out Sat Mar 9 23:53:44 2013
@@ -85,7 +85,7 @@ STAGE PLANS:
type: boolean
HashTable Sink Operator
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
@@ -107,13 +107,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key], Column[value]]
1 [Column[key], Column[value]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/stats11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/stats11.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/stats11.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/stats11.q.out Sat Mar 9 23:53:44 2013
@@ -306,7 +306,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -332,12 +332,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 0
BucketMapJoin: true
Select Operator
@@ -796,7 +796,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -822,12 +822,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 1
BucketMapJoin: true
Select Operator