You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/10/16 22:28:20 UTC
svn commit: r1532891 [1/6] - in /hive/branches/tez: ./
ant/src/org/apache/hadoop/hive/ant/ bin/ bin/ext/ common/
common/src/java/org/apache/hadoop/hive/common/type/
common/src/java/org/apache/hadoop/hive/conf/
common/src/java/org/apache/hive/common/ co...
Author: gunther
Date: Wed Oct 16 20:28:16 2013
New Revision: 1532891
URL: http://svn.apache.org/r1532891
Log:
Merge latest trunk into branch. (Gunther Hagleitner)
Added:
hive/branches/tez/bin/ext/version.sh
- copied unchanged from r1532873, hive/trunk/bin/ext/version.sh
hive/branches/tez/data/files/posexplode_data.txt
- copied unchanged from r1532873, hive/trunk/data/files/posexplode_data.txt
hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareColumn.txt
- copied unchanged from r1532873, hive/trunk/ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareColumn.txt
hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt
- copied unchanged from r1532873, hive/trunk/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt
hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/StringColumnCompareColumn.txt
- copied unchanged from r1532873, hive/trunk/ql/src/gen/vectorization/ExpressionTemplates/StringColumnCompareColumn.txt
hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/StringColumnCompareScalar.txt
- copied unchanged from r1532873, hive/trunk/ql/src/gen/vectorization/ExpressionTemplates/StringColumnCompareScalar.txt
hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareColumn.txt
- copied unchanged from r1532873, hive/trunk/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareColumn.txt
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorLimitOperator.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorLimitOperator.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToStringViaLongToString.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToStringViaLongToString.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToString.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToString.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLogWithBaseLongToDouble.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLogWithBaseLongToDouble.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncPowerLongToDouble.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncPowerLongToDouble.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ISetDoubleArg.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ISetDoubleArg.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ISetLongArg.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ISetLongArg.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongToStringUnaryUDF.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongToStringUnaryUDF.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToDouble.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToDouble.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/RoundWithNumDigitsDoubleToDouble.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/RoundWithNumDigitsDoubleToDouble.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLag.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLag.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLead.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLead.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFPosExplode.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFPosExplode.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/LeadLagBuffer.java
- copied unchanged from r1532873, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/LeadLagBuffer.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/TestDriver.java
- copied unchanged from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/TestDriver.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java
- copied unchanged from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java
- copied unchanged from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/
- copied from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java
- copied unchanged from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/testutil/
- copied from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/testutil/
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFRound.java
- copied unchanged from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFRound.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFConcat.java
- copied unchanged from r1532873, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFConcat.java
hive/branches/tez/ql/src/test/queries/clientnegative/compile_processor.q
- copied unchanged from r1532873, hive/trunk/ql/src/test/queries/clientnegative/compile_processor.q
hive/branches/tez/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
- copied unchanged from r1532873, hive/trunk/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
hive/branches/tez/ql/src/test/queries/clientpositive/compile_processor.q
- copied unchanged from r1532873, hive/trunk/ql/src/test/queries/clientpositive/compile_processor.q
hive/branches/tez/ql/src/test/queries/clientpositive/drop_with_concurrency.q
- copied unchanged from r1532873, hive/trunk/ql/src/test/queries/clientpositive/drop_with_concurrency.q
hive/branches/tez/ql/src/test/queries/clientpositive/udtf_posexplode.q
- copied unchanged from r1532873, hive/trunk/ql/src/test/queries/clientpositive/udtf_posexplode.q
hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_limit.q
- copied unchanged from r1532873, hive/trunk/ql/src/test/queries/clientpositive/vectorization_limit.q
hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_nested_udf.q
- copied unchanged from r1532873, hive/trunk/ql/src/test/queries/clientpositive/vectorization_nested_udf.q
hive/branches/tez/ql/src/test/results/clientnegative/compile_processor.q.out
- copied unchanged from r1532873, hive/trunk/ql/src/test/results/clientnegative/compile_processor.q.out
hive/branches/tez/ql/src/test/results/clientnegative/windowing_ll_no_neg.q.out
- copied unchanged from r1532873, hive/trunk/ql/src/test/results/clientnegative/windowing_ll_no_neg.q.out
hive/branches/tez/ql/src/test/results/clientpositive/compile_processor.q.out
- copied unchanged from r1532873, hive/trunk/ql/src/test/results/clientpositive/compile_processor.q.out
hive/branches/tez/ql/src/test/results/clientpositive/drop_with_concurrency.q.out
- copied unchanged from r1532873, hive/trunk/ql/src/test/results/clientpositive/drop_with_concurrency.q.out
hive/branches/tez/ql/src/test/results/clientpositive/udtf_posexplode.q.out
- copied unchanged from r1532873, hive/trunk/ql/src/test/results/clientpositive/udtf_posexplode.q.out
hive/branches/tez/ql/src/test/results/clientpositive/vectorization_limit.q.out
- copied unchanged from r1532873, hive/trunk/ql/src/test/results/clientpositive/vectorization_limit.q.out
hive/branches/tez/ql/src/test/results/clientpositive/vectorization_nested_udf.q.out
- copied unchanged from r1532873, hive/trunk/ql/src/test/results/clientpositive/vectorization_nested_udf.q.out
Removed:
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/RoundDoubleToDoubleWithNumDigits.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConv.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnhex.java
Modified:
hive/branches/tez/ (props changed)
hive/branches/tez/NOTICE
hive/branches/tez/README.txt
hive/branches/tez/ant/src/org/apache/hadoop/hive/ant/GenVectorCode.java
hive/branches/tez/bin/hive
hive/branches/tez/build.properties
hive/branches/tez/common/build.xml
hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/branches/tez/common/src/java/org/apache/hive/common/HiveVersionAnnotation.java
hive/branches/tez/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java
hive/branches/tez/common/src/scripts/saveVersion.sh
hive/branches/tez/eclipse-templates/.classpath
hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm
hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
hive/branches/tez/hcatalog/src/test/e2e/templeton/README.txt
hive/branches/tez/hcatalog/src/test/e2e/templeton/build.xml
hive/branches/tez/hcatalog/src/test/e2e/templeton/conf/default.conf
hive/branches/tez/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/hcatperms.conf
hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf
hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf
hive/branches/tez/ivy/libraries.properties
hive/branches/tez/metastore/ivy.xml
hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/parser/Filter.g
hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDelegationToken.java
hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MMasterKey.java
hive/branches/tez/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
hive/branches/tez/ql/ivy.xml
hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryFunc.txt
hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/FilterStringColumnCompareColumn.txt
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncBin.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncHex.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLogWithBaseDoubleToDouble.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncPowerDoubleToDouble.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRand.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathExpr.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncDoubleToDouble.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ColumnStatisticsImpl.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingExprNodeEvaluatorFactory.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/BoundaryDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/CurrentRowDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/OrderDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/OrderExpressionDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFExpressionDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFInputDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFQueryInputDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PartitionDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PartitionedTableFunctionDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/RangeBoundaryDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/ShapeDetails.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/ValueBoundaryDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/WindowExpressionDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/WindowFrameDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/WindowFunctionDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/WindowTableFunctionDef.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorFactory.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/processors/HiveCommand.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/GenericUDFDecode.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/GenericUDFEncode.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFBase64.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMinus.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMod.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMultiply.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPPlus.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFPosMod.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFPower.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFRound.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFUnbase64.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLeadLag.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAbs.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUnixTimeStamp.java
hive/branches/tez/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/metastore/TestMetastoreExpr.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorLogicalExpressions.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcSerDeStats.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/udf/Rot13OutputFormat.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/security/TestClientSideAuthorizationProvider.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/security/TestMetastoreAuthorizationProvider.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProvider.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestGenericUDFAbs.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestGenericUDFDecode.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestGenericUDFEncode.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestToInteger.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFBase64.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFHex.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFUnbase64.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFUnhex.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/serde2/CustomNonSettableStructObjectInspector1.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/serde2/CustomNonSettableUnionObjectInspector1.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/serde2/CustomSerDe1.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/serde2/CustomSerDe2.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/serde2/CustomSerDe3.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/serde2/CustomSerDe4.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/serde2/CustomSerDe5.java
hive/branches/tez/ql/src/test/queries/clientpositive/filter_numeric.q
hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_short_regress.q
hive/branches/tez/ql/src/test/results/clientpositive/filter_numeric.q.out
hive/branches/tez/ql/src/test/results/clientpositive/show_create_table_alter.q.out
hive/branches/tez/ql/src/test/results/clientpositive/show_create_table_db_table.q.out
hive/branches/tez/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
hive/branches/tez/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
hive/branches/tez/ql/src/test/results/clientpositive/show_create_table_serde.q.out
hive/branches/tez/ql/src/test/results/clientpositive/show_create_table_view.q.out
hive/branches/tez/ql/src/test/results/clientpositive/show_functions.q.out
hive/branches/tez/ql/src/test/results/clientpositive/vectorization_short_regress.q.out
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveDecimalWritable.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/SettableUnionObjectInspector.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveDecimalObjectInspector.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java
hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableHiveDecimalObjectInspector.java
hive/branches/tez/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java
hive/branches/tez/serde/src/test/org/apache/hadoop/hive/serde2/io/TestTimestampWritable.java
hive/branches/tez/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorConverters.java
hive/branches/tez/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/primitive/TestPrimitiveObjectInspectorUtils.java
hive/branches/tez/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
hive/branches/tez/service/src/java/org/apache/hive/service/auth/TUGIContainingProcessor.java
hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/AddResourceOperation.java
hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/DeleteResourceOperation.java
hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/DfsOperation.java
hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/SetOperation.java
hive/branches/tez/service/src/java/org/apache/hive/service/server/HiveServer2.java
hive/branches/tez/service/src/java/org/apache/hive/service/server/ServerOptionsProcessor.java
hive/branches/tez/service/src/test/org/apache/hive/service/cli/thrift/ThriftCLIServiceTest.java
hive/branches/tez/shims/src/common-secure/java/org/apache/hadoop/hive/thrift/DBTokenStore.java
hive/branches/tez/shims/src/common-secure/test/org/apache/hadoop/hive/thrift/TestDBTokenStore.java
hive/branches/tez/shims/src/common/java/org/apache/hadoop/hive/shims/HiveEventCounter.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestBatch.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/UnitTestBatch.java
hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RSyncCommandExecutor.java
hive/branches/tez/testutils/ptest2/src/main/resources/batch-exec.vm
hive/branches/tez/testutils/ptest2/src/main/resources/source-prep.vm
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.java
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java
hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java
Propchange: hive/branches/tez/
------------------------------------------------------------------------------
Merged /hive/trunk:r1530173-1532873
Modified: hive/branches/tez/NOTICE
URL: http://svn.apache.org/viewvc/hive/branches/tez/NOTICE?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/NOTICE (original)
+++ hive/branches/tez/NOTICE Wed Oct 16 20:28:16 2013
@@ -1,5 +1,5 @@
Apache Hive
-Copyright 2008-2011 The Apache Software Foundation
+Copyright 2008-2013 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
@@ -8,13 +8,13 @@ This product includes software developed
(http://jdbm.sourceforge.net/).
This product includes/uses ANTLR (http://www.antlr.org/),
-Copyright (c) 2003-2008, Terrence Parr.
+Copyright (c) 2003-2011, Terrence Parr.
This product includes/uses StringTemplate (http://www.stringtemplate.org/),
-Copyright (c) 2008, Terrence Parr.
+Copyright (c) 2011, Terrence Parr.
This product includes/uses ASM (http://asm.ow2.org/),
-Copyright (c) 2000-2005 INRIA, France Telecom.
+Copyright (c) 2000-2007 INRIA, France Telecom.
This product includes/uses org.json (http://www.json.org/java/index.html),
Copyright (c) 2002 JSON.org
@@ -26,7 +26,7 @@ This product includes/uses SQLLine (http
Copyright (c) 2002, 2003, 2004, 2005 Marc Prud'hommeaux <mw...@cornell.edu>.
This product includes/uses SLF4J (http://www.slf4j.org/),
-Copyright (c) 2004-2008 QOS.ch
+Copyright (c) 2004-2010 QOS.ch
This product includes/uses Bootstrap (http://twitter.github.com/bootstrap/),
Copyright (c) 2012 Twitter, Inc.
Modified: hive/branches/tez/README.txt
URL: http://svn.apache.org/viewvc/hive/branches/tez/README.txt?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/README.txt (original)
+++ hive/branches/tez/README.txt Wed Oct 16 20:28:16 2013
@@ -82,16 +82,9 @@ Upgrading from older versions of Hive
schema upgrade scripts located in the scripts/metastore/upgrade
directory.
- We have provided upgrade scripts for Derby and MySQL databases. If
- you are using a different database for your MetaStore you will need
- to provide your own upgrade script.
-
-- Hive @VERSION@ includes new configuration properties. If you
- are upgrading from an earlier version of Hive it is imperative
- that you replace all of the old copies of the hive-default.xml
- configuration file with the new version located in the conf/
- directory.
-
+- We have provided upgrade scripts for MySQL, PostgreSQL, Oracle and Derby
+ databases. If you are using a different database for your MetaStore
+ you will need to provide your own upgrade script.
Useful mailing lists
====================
Modified: hive/branches/tez/ant/src/org/apache/hadoop/hive/ant/GenVectorCode.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ant/src/org/apache/hadoop/hive/ant/GenVectorCode.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/ant/src/org/apache/hadoop/hive/ant/GenVectorCode.java (original)
+++ hive/branches/tez/ant/src/org/apache/hadoop/hive/ant/GenVectorCode.java Wed Oct 16 20:28:16 2013
@@ -117,6 +117,45 @@ public class GenVectorCode extends Task
{"ColumnCompareScalar", "GreaterEqual", "long", "double", ">="},
{"ColumnCompareScalar", "GreaterEqual", "double", "double", ">="},
+ {"ColumnCompareScalar", "Equal", "long", "long", "=="},
+ {"ColumnCompareScalar", "Equal", "double", "long", "=="},
+ {"ColumnCompareScalar", "NotEqual", "long", "long", "!="},
+ {"ColumnCompareScalar", "NotEqual", "double", "long", "!="},
+ {"ColumnCompareScalar", "Less", "long", "long", "<"},
+ {"ColumnCompareScalar", "Less", "double", "long", "<"},
+ {"ColumnCompareScalar", "LessEqual", "long", "long", "<="},
+ {"ColumnCompareScalar", "LessEqual", "double", "long", "<="},
+ {"ColumnCompareScalar", "Greater", "long", "long", ">"},
+ {"ColumnCompareScalar", "Greater", "double", "long", ">"},
+ {"ColumnCompareScalar", "GreaterEqual", "long", "long", ">="},
+ {"ColumnCompareScalar", "GreaterEqual", "double", "long", ">="},
+
+ {"ScalarCompareColumn", "Equal", "long", "double", "=="},
+ {"ScalarCompareColumn", "Equal", "double", "double", "=="},
+ {"ScalarCompareColumn", "NotEqual", "long", "double", "!="},
+ {"ScalarCompareColumn", "NotEqual", "double", "double", "!="},
+ {"ScalarCompareColumn", "Less", "long", "double", "<"},
+ {"ScalarCompareColumn", "Less", "double", "double", "<"},
+ {"ScalarCompareColumn", "LessEqual", "long", "double", "<="},
+ {"ScalarCompareColumn", "LessEqual", "double", "double", "<="},
+ {"ScalarCompareColumn", "Greater", "long", "double", ">"},
+ {"ScalarCompareColumn", "Greater", "double", "double", ">"},
+ {"ScalarCompareColumn", "GreaterEqual", "long", "double", ">="},
+ {"ScalarCompareColumn", "GreaterEqual", "double", "double", ">="},
+
+ {"ScalarCompareColumn", "Equal", "long", "long", "=="},
+ {"ScalarCompareColumn", "Equal", "double", "long", "=="},
+ {"ScalarCompareColumn", "NotEqual", "long", "long", "!="},
+ {"ScalarCompareColumn", "NotEqual", "double", "long", "!="},
+ {"ScalarCompareColumn", "Less", "long", "long", "<"},
+ {"ScalarCompareColumn", "Less", "double", "long", "<"},
+ {"ScalarCompareColumn", "LessEqual", "long", "long", "<="},
+ {"ScalarCompareColumn", "LessEqual", "double", "long", "<="},
+ {"ScalarCompareColumn", "Greater", "long", "long", ">"},
+ {"ScalarCompareColumn", "Greater", "double", "long", ">"},
+ {"ScalarCompareColumn", "GreaterEqual", "long", "long", ">="},
+ {"ScalarCompareColumn", "GreaterEqual", "double", "long", ">="},
+
{"FilterColumnCompareScalar", "Equal", "long", "double", "=="},
{"FilterColumnCompareScalar", "Equal", "double", "double", "=="},
{"FilterColumnCompareScalar", "NotEqual", "long", "double", "!="},
@@ -176,6 +215,13 @@ public class GenVectorCode extends Task
{"FilterStringColumnCompareScalar", "Greater", ">"},
{"FilterStringColumnCompareScalar", "GreaterEqual", ">="},
+ {"StringColumnCompareScalar", "Equal", "=="},
+ {"StringColumnCompareScalar", "NotEqual", "!="},
+ {"StringColumnCompareScalar", "Less", "<"},
+ {"StringColumnCompareScalar", "LessEqual", "<="},
+ {"StringColumnCompareScalar", "Greater", ">"},
+ {"StringColumnCompareScalar", "GreaterEqual", ">="},
+
{"FilterStringScalarCompareColumn", "Equal", "=="},
{"FilterStringScalarCompareColumn", "NotEqual", "!="},
{"FilterStringScalarCompareColumn", "Less", "<"},
@@ -183,6 +229,13 @@ public class GenVectorCode extends Task
{"FilterStringScalarCompareColumn", "Greater", ">"},
{"FilterStringScalarCompareColumn", "GreaterEqual", ">="},
+ {"StringScalarCompareColumn", "Equal", "=="},
+ {"StringScalarCompareColumn", "NotEqual", "!="},
+ {"StringScalarCompareColumn", "Less", "<"},
+ {"StringScalarCompareColumn", "LessEqual", "<="},
+ {"StringScalarCompareColumn", "Greater", ">"},
+ {"StringScalarCompareColumn", "GreaterEqual", ">="},
+
{"FilterStringColumnCompareColumn", "Equal", "=="},
{"FilterStringColumnCompareColumn", "NotEqual", "!="},
{"FilterStringColumnCompareColumn", "Less", "<"},
@@ -190,6 +243,13 @@ public class GenVectorCode extends Task
{"FilterStringColumnCompareColumn", "Greater", ">"},
{"FilterStringColumnCompareColumn", "GreaterEqual", ">="},
+ {"StringColumnCompareColumn", "Equal", "=="},
+ {"StringColumnCompareColumn", "NotEqual", "!="},
+ {"StringColumnCompareColumn", "Less", "<"},
+ {"StringColumnCompareColumn", "LessEqual", "<="},
+ {"StringColumnCompareColumn", "Greater", ">"},
+ {"StringColumnCompareColumn", "GreaterEqual", ">="},
+
{"FilterColumnCompareColumn", "Equal", "long", "double", "=="},
{"FilterColumnCompareColumn", "Equal", "double", "double", "=="},
{"FilterColumnCompareColumn", "NotEqual", "long", "double", "!="},
@@ -216,46 +276,111 @@ public class GenVectorCode extends Task
{"FilterColumnCompareColumn", "GreaterEqual", "long", "long", ">="},
{"FilterColumnCompareColumn", "GreaterEqual", "double", "long", ">="},
+ {"ColumnCompareColumn", "Equal", "long", "double", "=="},
+ {"ColumnCompareColumn", "Equal", "double", "double", "=="},
+ {"ColumnCompareColumn", "NotEqual", "long", "double", "!="},
+ {"ColumnCompareColumn", "NotEqual", "double", "double", "!="},
+ {"ColumnCompareColumn", "Less", "long", "double", "<"},
+ {"ColumnCompareColumn", "Less", "double", "double", "<"},
+ {"ColumnCompareColumn", "LessEqual", "long", "double", "<="},
+ {"ColumnCompareColumn", "LessEqual", "double", "double", "<="},
+ {"ColumnCompareColumn", "Greater", "long", "double", ">"},
+ {"ColumnCompareColumn", "Greater", "double", "double", ">"},
+ {"ColumnCompareColumn", "GreaterEqual", "long", "double", ">="},
+ {"ColumnCompareColumn", "GreaterEqual", "double", "double", ">="},
+
+ {"ColumnCompareColumn", "Equal", "long", "long", "=="},
+ {"ColumnCompareColumn", "Equal", "double", "long", "=="},
+ {"ColumnCompareColumn", "NotEqual", "long", "long", "!="},
+ {"ColumnCompareColumn", "NotEqual", "double", "long", "!="},
+ {"ColumnCompareColumn", "Less", "long", "long", "<"},
+ {"ColumnCompareColumn", "Less", "double", "long", "<"},
+ {"ColumnCompareColumn", "LessEqual", "long", "long", "<="},
+ {"ColumnCompareColumn", "LessEqual", "double", "long", "<="},
+ {"ColumnCompareColumn", "Greater", "long", "long", ">"},
+ {"ColumnCompareColumn", "Greater", "double", "long", ">"},
+ {"ColumnCompareColumn", "GreaterEqual", "long", "long", ">="},
+ {"ColumnCompareColumn", "GreaterEqual", "double", "long", ">="},
+
// template, <ClassNamePrefix>, <ReturnType>, <OperandType>, <FuncName>, <OperandCast>,
- // <ResultCast>
- {"ColumnUnaryFunc", "FuncRound", "double", "double", "MathExpr.round", "", ""},
+ // <ResultCast>, <Cleanup>
+ {"ColumnUnaryFunc", "FuncRound", "double", "double", "MathExpr.round", "", "", ""},
// round(longCol) returns a long and is a no-op. So it will not be implemented here.
// round(Col, N) is a special case and will be implemented separately from this template
- {"ColumnUnaryFunc", "FuncFloor", "long", "double", "Math.floor", "", "(long)"},
- // Note: floor(long) is a no-op so code generation should remove it or use
- // an IdentityExpression
- {"ColumnUnaryFunc", "FuncCeil", "long", "double", "Math.ceil", "", "(long)"},
- // Similarly, ceil(long) is a no-op, so not generating code for it here
- {"ColumnUnaryFunc", "FuncExp", "double", "double", "Math.exp", "", ""},
- {"ColumnUnaryFunc", "FuncLn", "double", "double", "Math.log", "", ""},
- {"ColumnUnaryFunc", "FuncLn", "double", "long", "Math.log", "(double)", ""},
- {"ColumnUnaryFunc", "FuncLog10", "double", "double", "Math.log10", "", ""},
- {"ColumnUnaryFunc", "FuncLog10", "double", "long", "Math.log10", "(double)", ""},
+ {"ColumnUnaryFunc", "FuncFloor", "long", "double", "Math.floor", "", "(long)", ""},
+ // Floor on an integer argument is a noop, but it is less code to handle it this way.
+ {"ColumnUnaryFunc", "FuncFloor", "long", "long", "Math.floor", "", "(long)", ""},
+ {"ColumnUnaryFunc", "FuncCeil", "long", "double", "Math.ceil", "", "(long)", ""},
+ // Ceil on an integer argument is a noop, but it is less code to handle it this way.
+ {"ColumnUnaryFunc", "FuncCeil", "long", "long", "Math.ceil", "", "(long)", ""},
+ {"ColumnUnaryFunc", "FuncExp", "double", "double", "Math.exp", "", "", ""},
+ {"ColumnUnaryFunc", "FuncExp", "double", "long", "Math.exp", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncLn", "double", "double", "Math.log", "", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
+ {"ColumnUnaryFunc", "FuncLn", "double", "long", "Math.log", "(double)", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
+ {"ColumnUnaryFunc", "FuncLog10", "double", "double", "Math.log10", "", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
+ {"ColumnUnaryFunc", "FuncLog10", "double", "long", "Math.log10", "(double)", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
// The MathExpr class contains helper functions for cases when existing library
// routines can't be used directly.
- {"ColumnUnaryFunc", "FuncLog2", "double", "double", "MathExpr.log2", "", ""},
- {"ColumnUnaryFunc", "FuncLog2", "double", "long", "MathExpr.log2", "(double)", ""},
+ {"ColumnUnaryFunc", "FuncLog2", "double", "double", "MathExpr.log2", "", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
+ {"ColumnUnaryFunc", "FuncLog2", "double", "long", "MathExpr.log2", "(double)", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
// Log(base, Col) is a special case and will be implemented separately from this template
// Pow(col, P) and Power(col, P) are special cases implemented separately from this template
- {"ColumnUnaryFunc", "FuncSqrt", "double", "double", "Math.sqrt", "", ""},
- {"ColumnUnaryFunc", "FuncSqrt", "double", "long", "Math.sqrt", "(double)", ""},
- {"ColumnUnaryFunc", "FuncAbs", "double", "double", "Math.abs", "", ""},
- {"ColumnUnaryFunc", "FuncAbs", "long", "long", "MathExpr.abs", "", ""},
- {"ColumnUnaryFunc", "FuncSin", "double", "double", "Math.sin", "", ""},
- {"ColumnUnaryFunc", "FuncASin", "double", "double", "Math.asin", "", ""},
- {"ColumnUnaryFunc", "FuncCos", "double", "double", "Math.cos", "", ""},
- {"ColumnUnaryFunc", "FuncACos", "double", "double", "Math.acos", "", ""},
- {"ColumnUnaryFunc", "FuncTan", "double", "double", "Math.tan", "", ""},
- {"ColumnUnaryFunc", "FuncATan", "double", "double", "Math.atan", "", ""},
- {"ColumnUnaryFunc", "FuncDegrees", "double", "double", "Math.toDegrees", "", ""},
- {"ColumnUnaryFunc", "FuncRadians", "double", "double", "Math.toRadians", "", ""},
- {"ColumnUnaryFunc", "FuncSign", "double", "double", "MathExpr.sign", "", ""},
- {"ColumnUnaryFunc", "FuncSign", "double", "long", "MathExpr.sign", "", ""},
-
+ {"ColumnUnaryFunc", "FuncSqrt", "double", "double", "Math.sqrt", "", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
+ {"ColumnUnaryFunc", "FuncSqrt", "double", "long", "Math.sqrt", "(double)", "",
+ "MathExpr.NaNToNull(outputColVector, sel, batch.selectedInUse, n);"},
+ {"ColumnUnaryFunc", "FuncAbs", "double", "double", "Math.abs", "", "", ""},
+ {"ColumnUnaryFunc", "FuncAbs", "long", "long", "MathExpr.abs", "", "", ""},
+ {"ColumnUnaryFunc", "FuncSin", "double", "double", "Math.sin", "", "", ""},
+ {"ColumnUnaryFunc", "FuncSin", "double", "long", "Math.sin", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncASin", "double", "double", "Math.asin", "", "", ""},
+ {"ColumnUnaryFunc", "FuncASin", "double", "long", "Math.asin", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncCos", "double", "double", "Math.cos", "", "", ""},
+ {"ColumnUnaryFunc", "FuncCos", "double", "long", "Math.cos", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncACos", "double", "double", "Math.acos", "", "", ""},
+ {"ColumnUnaryFunc", "FuncACos", "double", "long", "Math.acos", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncTan", "double", "double", "Math.tan", "", "", ""},
+ {"ColumnUnaryFunc", "FuncTan", "double", "long", "Math.tan", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncATan", "double", "double", "Math.atan", "", "", ""},
+ {"ColumnUnaryFunc", "FuncATan", "double", "long", "Math.atan", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncDegrees", "double", "double", "Math.toDegrees", "", "", ""},
+ {"ColumnUnaryFunc", "FuncDegrees", "double", "long", "Math.toDegrees", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncRadians", "double", "double", "Math.toRadians", "", "", ""},
+ {"ColumnUnaryFunc", "FuncRadians", "double", "long", "Math.toRadians", "(double)", "", ""},
+ {"ColumnUnaryFunc", "FuncSign", "double", "double", "MathExpr.sign", "", "", ""},
+ {"ColumnUnaryFunc", "FuncSign", "double", "long", "MathExpr.sign", "(double)", "", ""},
+
+ // Casts
+ {"ColumnUnaryFunc", "Cast", "long", "double", "", "", "(long)", ""},
+ {"ColumnUnaryFunc", "Cast", "double", "long", "", "", "(double)", ""},
+ {"ColumnUnaryFunc", "CastTimestampToLongVia", "long", "long", "MathExpr.fromTimestamp", "",
+ "", ""},
+ {"ColumnUnaryFunc", "CastTimestampToDoubleVia", "double", "long",
+ "MathExpr.fromTimestampToDouble", "", "", ""},
+ {"ColumnUnaryFunc", "CastDoubleToBooleanVia", "long", "double", "MathExpr.toBool", "",
+ "", ""},
+ {"ColumnUnaryFunc", "CastLongToBooleanVia", "long", "long", "MathExpr.toBool", "",
+ "", ""},
+ {"ColumnUnaryFunc", "CastLongToTimestampVia", "long", "long", "MathExpr.longToTimestamp", "",
+ "", ""},
+ {"ColumnUnaryFunc", "CastDoubleToTimestampVia", "long", "double",
+ "MathExpr.doubleToTimestamp", "", "", ""},
+
+ // Boolean to long is done with an IdentityExpression
+ // Boolean to double is done with standard Long to Double cast
+ // See org.apache.hadoop.hive.ql.exec.vector.expressions for remaining cast VectorExpression
+ // classes
{"ColumnUnaryMinus", "long"},
{"ColumnUnaryMinus", "double"},
+
// template, <ClassName>, <ValueType>, <OperatorSymbol>, <DescriptionName>, <DescriptionValue>
{"VectorUDAFMinMax", "VectorUDAFMinLong", "long", "<", "min",
"_FUNC_(expr) - Returns the minimum value of expr (vectorized, type: long)"},
@@ -380,6 +505,8 @@ public class GenVectorCode extends Task
generateColumnArithmeticScalar(tdesc);
} else if (tdesc[0].equals("ColumnCompareScalar")) {
generateColumnCompareScalar(tdesc);
+ } else if (tdesc[0].equals("ScalarCompareColumn")) {
+ generateScalarCompareColumn(tdesc);
} else if (tdesc[0].equals("FilterColumnCompareScalar")) {
generateFilterColumnCompareScalar(tdesc);
} else if (tdesc[0].equals("FilterScalarCompareColumn")) {
@@ -388,6 +515,8 @@ public class GenVectorCode extends Task
generateScalarArithmeticColumn(tdesc);
} else if (tdesc[0].equals("FilterColumnCompareColumn")) {
generateFilterColumnCompareColumn(tdesc);
+ } else if (tdesc[0].equals("ColumnCompareColumn")) {
+ generateColumnCompareColumn(tdesc);
} else if (tdesc[0].equals("ColumnArithmeticColumn")) {
generateColumnArithmeticColumn(tdesc);
} else if (tdesc[0].equals("ColumnUnaryMinus")) {
@@ -406,10 +535,16 @@ public class GenVectorCode extends Task
generateVectorUDAFVar(tdesc);
} else if (tdesc[0].equals("FilterStringColumnCompareScalar")) {
generateFilterStringColumnCompareScalar(tdesc);
+ } else if (tdesc[0].equals("StringColumnCompareScalar")) {
+ generateStringColumnCompareScalar(tdesc);
} else if (tdesc[0].equals("FilterStringScalarCompareColumn")) {
generateFilterStringScalarCompareColumn(tdesc);
+ } else if (tdesc[0].equals("StringScalarCompareColumn")) {
+ generateStringScalarCompareColumn(tdesc);
} else if (tdesc[0].equals("FilterStringColumnCompareColumn")) {
generateFilterStringColumnCompareColumn(tdesc);
+ } else if (tdesc[0].equals("StringColumnCompareColumn")) {
+ generateStringColumnCompareColumn(tdesc);
} else {
continue;
}
@@ -418,6 +553,17 @@ public class GenVectorCode extends Task
testCodeGen.generateTestSuites();
}
+ private void generateColumnCompareColumn(String[] tdesc) throws IOException {
+ //The variables are all same as ColumnCompareScalar except that
+ //this template doesn't need a return type. Pass anything as return type.
+ String operatorName = tdesc[1];
+ String operandType1 = tdesc[2];
+ String operandType2 = tdesc[3];
+ String className = getCamelCaseType(operandType1)
+ + "Col" + operatorName + getCamelCaseType(operandType2) + "Column";
+ generateColumnBinaryOperatorColumn(tdesc, "long", className);
+ }
+
private void generateVectorUDAFMinMax(String[] tdesc) throws Exception {
String className = tdesc[1];
String valueType = tdesc[2];
@@ -523,22 +669,42 @@ public class GenVectorCode extends Task
String className = "FilterStringScalar" + operatorName + "StringColumn";
// Template expansion logic is the same for both column-scalar and scalar-column cases.
- generateFilterStringColumnCompareScalar(tdesc, className);
+ generateStringColumnCompareScalar(tdesc, className);
+ }
+
+ private void generateStringScalarCompareColumn(String[] tdesc) throws IOException {
+ String operatorName = tdesc[1];
+ String className = "StringScalar" + operatorName + "StringColumn";
+
+ // Template expansion logic is the same for both column-scalar and scalar-column cases.
+ generateStringColumnCompareScalar(tdesc, className);
}
private void generateFilterStringColumnCompareScalar(String[] tdesc) throws IOException {
String operatorName = tdesc[1];
String className = "FilterStringCol" + operatorName + "StringScalar";
- generateFilterStringColumnCompareScalar(tdesc, className);
+ generateStringColumnCompareScalar(tdesc, className);
+ }
+
+ private void generateStringColumnCompareScalar(String[] tdesc) throws IOException {
+ String operatorName = tdesc[1];
+ String className = "StringCol" + operatorName + "StringScalar";
+ generateStringColumnCompareScalar(tdesc, className);
}
private void generateFilterStringColumnCompareColumn(String[] tdesc) throws IOException {
String operatorName = tdesc[1];
String className = "FilterStringCol" + operatorName + "StringColumn";
- generateFilterStringColumnCompareScalar(tdesc, className);
+ generateStringColumnCompareScalar(tdesc, className);
+ }
+
+ private void generateStringColumnCompareColumn(String[] tdesc) throws IOException {
+ String operatorName = tdesc[1];
+ String className = "StringCol" + operatorName + "StringColumn";
+ generateStringColumnCompareScalar(tdesc, className);
}
- private void generateFilterStringColumnCompareScalar(String[] tdesc, String className)
+ private void generateStringColumnCompareScalar(String[] tdesc, String className)
throws IOException {
String operatorSymbol = tdesc[2];
String outputFile = joinPath(this.expressionOutputDirectory, className + ".java");
@@ -595,6 +761,7 @@ public class GenVectorCode extends Task
String funcName = tdesc[4];
String operandCast = tdesc[5];
String resultCast = tdesc[6];
+ String cleanup = tdesc[7];
// Expand, and write result
templateString = templateString.replaceAll("<ClassName>", className);
templateString = templateString.replaceAll("<InputColumnVectorType>", inputColumnVectorType);
@@ -604,6 +771,7 @@ public class GenVectorCode extends Task
templateString = templateString.replaceAll("<FuncName>", funcName);
templateString = templateString.replaceAll("<OperandCast>", operandCast);
templateString = templateString.replaceAll("<ResultCast>", resultCast);
+ templateString = templateString.replaceAll("<Cleanup>", cleanup);
writeFile(outputFile, templateString);
}
@@ -648,6 +816,16 @@ public class GenVectorCode extends Task
generateColumnBinaryOperatorScalar(tdesc, returnType, className);
}
+ private void generateScalarCompareColumn(String[] tdesc) throws IOException {
+ String operatorName = tdesc[1];
+ String operandType1 = tdesc[2];
+ String operandType2 = tdesc[3];
+ String returnType = "long";
+ String className = getCamelCaseType(operandType1)
+ + "Scalar" + operatorName + getCamelCaseType(operandType2) + "Column";
+ generateScalarBinaryOperatorColumn(tdesc, returnType, className);
+ }
+
private void generateColumnBinaryOperatorColumn(String[] tdesc, String returnType,
String className) throws IOException {
String operandType1 = tdesc[2];
Modified: hive/branches/tez/bin/hive
URL: http://svn.apache.org/viewvc/hive/branches/tez/bin/hive?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/bin/hive (original)
+++ hive/branches/tez/bin/hive Wed Oct 16 20:28:16 2013
@@ -29,6 +29,10 @@ SERVICE=""
HELP=""
while [ $# -gt 0 ]; do
case "$1" in
+ --version)
+ shift
+ SERVICE=version
+ ;;
--service)
shift
SERVICE=$1
Modified: hive/branches/tez/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/tez/build.properties?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/build.properties (original)
+++ hive/branches/tez/build.properties Wed Oct 16 20:28:16 2013
@@ -16,7 +16,8 @@
Name=Hive
name=hive
-version=0.13.0-SNAPSHOT
+shortversion=0.13.0
+version=${shortversion}-SNAPSHOT
hcatalog.version=${version}
year=2012
Modified: hive/branches/tez/common/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/build.xml?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/common/build.xml (original)
+++ hive/branches/tez/common/build.xml Wed Oct 16 20:28:16 2013
@@ -33,6 +33,7 @@ to call at top-level: ant deploy-contrib
<exec executable="bash" failonerror="true">
<arg value="${basedir}/src/scripts/saveVersion.sh"/>
<arg value="${version}"/>
+ <arg value="${shortversion}"/>
<arg value="${basedir}/src"/>
</exec>
<javac
Modified: hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java Wed Oct 16 20:28:16 2013
@@ -43,44 +43,47 @@ public class HiveDecimal implements Comp
private BigDecimal bd = BigDecimal.ZERO;
- public HiveDecimal(BigDecimal b) {
- this(b, false);
+ private HiveDecimal(BigDecimal bd) {
+ this.bd = bd;
}
- public HiveDecimal(BigDecimal b, boolean allowRounding) {
- bd = this.normalize(b, MAX_PRECISION, allowRounding);
- if (bd == null) {
- throw new NumberFormatException("Assignment would result in truncation");
- }
+ public static HiveDecimal create(BigDecimal b) {
+ return create(b, false);
}
- public HiveDecimal(BigInteger unscaled, int scale) {
- bd = this.normalize(new BigDecimal(unscaled, scale), MAX_PRECISION, false);
- if (bd == null) {
- throw new NumberFormatException("Assignment would result in truncation");
- }
+ public static HiveDecimal create(BigDecimal b, boolean allowRounding) {
+ BigDecimal bd = normalize(b, HiveDecimal.MAX_PRECISION, allowRounding);
+ return bd == null ? null : new HiveDecimal(bd);
}
- public HiveDecimal(String dec) {
- bd = this.normalize(new BigDecimal(dec), MAX_PRECISION, false);
- if (bd == null) {
- throw new NumberFormatException("Assignment would result in truncation");
- }
+ public static HiveDecimal create(BigInteger unscaled, int scale) {
+ BigDecimal bd = normalize(new BigDecimal(unscaled, scale), HiveDecimal.MAX_PRECISION, false);
+ return bd == null ? null : new HiveDecimal(bd);
}
- public HiveDecimal(BigInteger bi) {
- bd = this.normalize(new BigDecimal(bi), MAX_PRECISION, false);
- if (bd == null) {
- throw new NumberFormatException("Assignment would result in truncation");
+ public static HiveDecimal create(String dec) {
+ BigDecimal bd;
+ try {
+ bd = new BigDecimal(dec);
+ } catch (NumberFormatException ex) {
+ return null;
}
+
+ bd = normalize(bd, HiveDecimal.MAX_PRECISION, false);
+ return bd == null ? null : new HiveDecimal(bd);
+ }
+
+ public static HiveDecimal create(BigInteger bi) {
+ BigDecimal bd = normalize(new BigDecimal(bi), HiveDecimal.MAX_PRECISION, false);
+ return bd == null ? null : new HiveDecimal(bd);
}
- public HiveDecimal(int i) {
- bd = new BigDecimal(i);
+ public static HiveDecimal create(int i) {
+ return new HiveDecimal(new BigDecimal(i));
}
- public HiveDecimal(long l) {
- bd = new BigDecimal(l);
+ public static HiveDecimal create(long l) {
+ return new HiveDecimal(new BigDecimal(l));
}
@Override
@@ -147,15 +150,15 @@ public class HiveDecimal implements Comp
}
public HiveDecimal setScale(int adjustedScale, int rm) {
- return new HiveDecimal(bd.setScale(adjustedScale, rm));
+ return create(bd.setScale(adjustedScale, rm));
}
public HiveDecimal subtract(HiveDecimal dec) {
- return new HiveDecimal(bd.subtract(dec.bd));
+ return create(bd.subtract(dec.bd));
}
public HiveDecimal multiply(HiveDecimal dec) {
- return new HiveDecimal(bd.multiply(dec.bd));
+ return create(bd.multiply(dec.bd));
}
public BigInteger unscaledValue() {
@@ -163,34 +166,34 @@ public class HiveDecimal implements Comp
}
public HiveDecimal scaleByPowerOfTen(int n) {
- return new HiveDecimal(bd.scaleByPowerOfTen(n));
+ return create(bd.scaleByPowerOfTen(n));
}
public HiveDecimal abs() {
- return new HiveDecimal(bd.abs());
+ return create(bd.abs());
}
public HiveDecimal negate() {
- return new HiveDecimal(bd.negate());
+ return create(bd.negate());
}
public HiveDecimal add(HiveDecimal dec) {
- return new HiveDecimal(bd.add(dec.bd));
+ return create(bd.add(dec.bd));
}
public HiveDecimal pow(int n) {
- return new HiveDecimal(bd.pow(n));
+ return create(bd.pow(n));
}
public HiveDecimal remainder(HiveDecimal dec) {
- return new HiveDecimal(bd.remainder(dec.bd));
+ return create(bd.remainder(dec.bd));
}
public HiveDecimal divide(HiveDecimal dec) {
- return new HiveDecimal(bd.divide(dec.bd, MAX_PRECISION, RoundingMode.HALF_UP), true);
+ return create(bd.divide(dec.bd, MAX_PRECISION, RoundingMode.HALF_UP), true);
}
- private BigDecimal trim(BigDecimal d) {
+ private static BigDecimal trim(BigDecimal d) {
if (d.compareTo(BigDecimal.ZERO) == 0) {
// Special case for 0, because java doesn't strip zeros correctly on that number.
d = BigDecimal.ZERO;
@@ -204,7 +207,7 @@ public class HiveDecimal implements Comp
return d;
}
- private BigDecimal normalize(BigDecimal d, int precision, boolean allowRounding) {
+ private static BigDecimal normalize(BigDecimal d, int precision, boolean allowRounding) {
if (d == null) {
return null;
}
Modified: hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Wed Oct 16 20:28:16 2013
@@ -774,7 +774,7 @@ public class HiveConf extends Configurat
HIVE_SERVER2_TABLE_TYPE_MAPPING("hive.server2.table.type.mapping", "CLASSIC"),
HIVE_SERVER2_SESSION_HOOK("hive.server2.session.hook", ""),
- HIVE_SECURITY_COMMAND_WHITELIST("hive.security.command.whitelist", "set,reset,dfs,add,delete"),
+ HIVE_SECURITY_COMMAND_WHITELIST("hive.security.command.whitelist", "set,reset,dfs,add,delete,compile"),
HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list", ""),
Modified: hive/branches/tez/common/src/java/org/apache/hive/common/HiveVersionAnnotation.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hive/common/HiveVersionAnnotation.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hive/common/HiveVersionAnnotation.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hive/common/HiveVersionAnnotation.java Wed Oct 16 20:28:16 2013
@@ -41,6 +41,12 @@ public @interface HiveVersionAnnotation
String version();
/**
+ * Get the Hive short version containing major/minor/change version numbers
+ * @return the short version string "0.6.3"
+ */
+ String shortVersion();
+
+ /**
* Get the username that compiled Hive.
*/
String user();
Modified: hive/branches/tez/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java Wed Oct 16 20:28:16 2013
@@ -58,6 +58,14 @@ public class HiveVersionInfo {
}
/**
+ * Get the Hive short version, with major/minor/change version numbers.
+ * @return short version string, eg. "0.6.3"
+ */
+ public static String getShortVersion() {
+ return version != null ? version.shortVersion() : "Unknown";
+ }
+
+ /**
* Get the subversion revision number for the root directory
* @return the revision number, eg. "451451"
*/
Modified: hive/branches/tez/common/src/scripts/saveVersion.sh
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/scripts/saveVersion.sh?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/common/src/scripts/saveVersion.sh (original)
+++ hive/branches/tez/common/src/scripts/saveVersion.sh Wed Oct 16 20:28:16 2013
@@ -22,10 +22,11 @@ unset LANG
unset LC_CTYPE
unset LC_TIME
version=$1
-src_dir=$2
-revision=$3
-branch=$4
-url=$5
+shortversion=$2
+src_dir=$3
+revision=$4
+branch=$5
+url=$6
user=`whoami`
date=`date`
dir=`pwd`
@@ -68,14 +69,16 @@ url=`echo $url | tr -d '\r'`
srcChecksum=`echo $srcChecksum | tr -d '\r'`
cat << EOF | \
- sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
+ sed -e "s/VERSION/$version/" -e "s/SHORTVERSION/$shortversion/" \
+ -e "s/USER/$user/" -e "s/DATE/$date/" \
-e "s|URL|$url|" -e "s/REV/$revision/" \
-e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \
> $src_dir/gen/org/apache/hive/common/package-info.java
/*
* Generated by saveVersion.sh
*/
-@HiveVersionAnnotation(version="VERSION", revision="REV", branch="BRANCH",
+@HiveVersionAnnotation(version="VERSION", shortVersion="SHORTVERSION",
+ revision="REV", branch="BRANCH",
user="USER", date="DATE", url="URL",
srcChecksum="SRCCHECKSUM")
package org.apache.hive.common;
Modified: hive/branches/tez/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/branches/tez/eclipse-templates/.classpath?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/eclipse-templates/.classpath (original)
+++ hive/branches/tez/eclipse-templates/.classpath Wed Oct 16 20:28:16 2013
@@ -90,6 +90,7 @@
<classpathentry kind="lib" path="build/ivy/lib/default/mockito-all-@mockito-all.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/ST4-@ST4.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/groovy-all-@groovy.version@.jar"/>
<classpathentry kind="lib" path="build/beeline/hive-beeline-@HIVE_VERSION@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/tempus-fugit-@tempus-fugit.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/tez-common-@tez.version@.jar"/>
Modified: hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm (original)
+++ hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm Wed Oct 16 20:28:16 2013
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.hadoop.hive.cli;
import junit.framework.Test;
Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java Wed Oct 16 20:28:16 2013
@@ -271,7 +271,11 @@ public class HCatSemanticAnalyzer extend
DropDatabaseDesc dropDb = work.getDropDatabaseDesc();
if (dropDb != null) {
Database db = cntxt.getHive().getDatabase(dropDb.getDatabaseName());
- authorize(db, Privilege.DROP);
+ if (db != null){
+ // if above returned a null, then the db does not exist - probably a
+ // "drop database if exists" clause - don't try to authorize then.
+ authorize(db, Privilege.DROP);
+ }
}
DescDatabaseDesc descDb = work.getDescDatabaseDesc();
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/README.txt
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/README.txt?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/README.txt (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/README.txt Wed Oct 16 20:28:16 2013
@@ -104,6 +104,7 @@ Running the tests
Use the following command to run tests -
ant test -Dinpdir.hdfs=<location of inpdir on hdfs> -Dtest.user.name=<user the tests should run as> \
+ -Dtest.other.user.name=<another user who can launch job> \
-Dsecure.mode=<yes/no> -Dharness.webhdfs.url=<webhdfs url upto port num> -Dharness.templeton.url=<templeton url upto port num>
If you want to run specific test group you can specify the group, for example: -Dtests.to.run='-t TestHive'
@@ -111,6 +112,8 @@ If you want to run specific test group y
If you want to run specific test in a group group you can specify the test, for example: -Dtests.to.run='-t TestHive_1'
For example, tests/ddl.conf has several groups such as 'name' => 'REST_DDL_TABLE_BASIC'; use REST_DDL_TABLE_BASIC as the name
+If you are running with Hadoop 2, please use the flag: -Dhadoopversion=23
+
Running the hcat authorization tests
------------------------------------
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/build.xml?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/build.xml (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/build.xml Wed Oct 16 20:28:16 2013
@@ -106,8 +106,10 @@
<env key="WEBHDFS_URL" value="${harness.webhdfs.url}"/>
<env key="TEMPLETON_URL" value="${harness.templeton.url}"/>
<env key="USER_NAME" value="${test.user.name}"/>
+ <env key="OTHER_USER_NAME" value="${test.other.user.name}"/>
<env key="HARNESS_CONF" value="${basedir}/conf/default.conf"/>
<env key="SECURE_MODE" value="${secure.mode}"/>
+ <env key="HADOOP_VERSION" value="${hadoopversion}"/>
<arg line="${tests.to.run}"/>
<arg value="${basedir}/tests/serverstatus.conf"/>
<arg value="${basedir}/tests/jobsubmission_streaming.conf"/>
@@ -125,8 +127,8 @@
<property name="fork.factor.conf.file" value="1"/>
<property name="e2e.debug" value="false"/>
<property name="tests.to.run" value=""/>
- <exec executable="${harness.dir}/test_harness.pl" dir="${test.location}" failonerror="true">
- <env key="HARNESS_ROOT" value="${harness.dir}"/>
+ <exec executable="./test_harness.pl" dir="${test.location}" failonerror="true">
+ <env key="HARNESS_ROOT" value="."/>
<env key="DRIVER_ROOT" value="${basedir}/drivers"/>
<env key="TH_WORKING_DIR" value="${test.location}"/>
<env key="TH_INPDIR_LOCAL" value="${inpdir.local}"/>
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/conf/default.conf
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/conf/default.conf?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/conf/default.conf (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/conf/default.conf Wed Oct 16 20:28:16 2013
@@ -38,5 +38,5 @@ $cfg = {
,'logDir' => "$ENV{TH_OUT}/log"
# ,'propertiesFile' => "./conf/testpropertiesfile.conf"
,'harness.console.level' => 'ERROR'
-
+ ,'hadoopversion' => "$ENV{HADOOP_VERSION}"
};
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm Wed Oct 16 20:28:16 2013
@@ -207,6 +207,17 @@ sub globalSetup
die "Cannot create temporary directory " . $globalHash->{'tmpPath'} .
" " . "$ERRNO\n";
+ my $testCmdBasics = $self->copyTestBasicConfig($globalHash);
+ $testCmdBasics->{'method'} = 'PUT';
+ $testCmdBasics->{'url'} = ':WEBHDFS_URL:/webhdfs/v1' . $globalHash->{'outpath'} . '?op=MKDIRS&permission=777';
+ if (!defined $globalHash->{'is_secure_mode'} || $globalHash->{'is_secure_mode'} !~ /y.*/i) {
+ $testCmdBasics->{'url'} = $testCmdBasics->{'url'} . '&user.name=' . $globalHash->{'current_user'};
+ }
+ my $curl_result = $self->execCurlCmd($testCmdBasics, "", $log);
+ my $json = new JSON;
+ $json->utf8->decode($curl_result->{'body'})->{'boolean'} or
+ die "Cannot create hdfs directory " . $globalHash->{'outpath'} .
+ " " . "$ERRNO\n";
}
###############################################################################
@@ -249,6 +260,12 @@ sub runTest
my ($self, $testCmd, $log) = @_;
my $subName = (caller(0))[3];
+ # Check that we should run this test. If the current hadoop version
+ # is hadoop 2 and the test is marked as "ignore23", skip the test
+ if ($self->wrongExecutionMode($testCmd, $log)) {
+ my %result;
+ return \%result;
+ }
# Handle the various methods of running used in
# the original TestDrivers
@@ -607,6 +624,13 @@ sub compare
my ($self, $testResult, $benchmarkResult, $log, $testCmd) = @_;
my $subName = (caller(0))[3];
+ # Check that we should run this test. If the current hadoop version
+ # is hadoop 2 and the test is marked as "ignore23", skip the test
+ if ($self->wrongExecutionMode($testCmd, $log)) {
+ # Special magic value
+ return $self->{'wrong_execution_mode'};
+ }
+
my $result = 1; # until proven wrong...
if (defined $testCmd->{'status_code'}) {
my $res = $self->checkResStatusCode($testResult, $testCmd->{'status_code'}, $log);
@@ -631,7 +655,7 @@ sub compare
# in the tests, we run this case with jobName = "PigLatin:loadstore.pig"
# filter $body to leave only records with this jobName
my @filtered_body = grep {($_->{detail}{profile}{jobName} eq "PigLatin:loadstore.pig")} @$body;
- my @sorted_filtered_body = sort { $a->{id} <=> $b->{id} } @filtered_body;
+ my @sorted_filtered_body = sort { $a->{id} cmp $b->{id} } @filtered_body;
$value = $path->value(\@sorted_filtered_body);
} else {
$value = $path->value($testResult->{'body'});
@@ -952,6 +976,27 @@ sub compare
return $result;
}
+##############################################################################
+# Check whether we should be running this test or not.
+#
+sub wrongExecutionMode($$)
+{
+ my ($self, $testCmd, $log) = @_;
+
+ my $wrong = 0;
+
+ if (defined $testCmd->{'ignore23'} && $testCmd->{'hadoopversion'}=='23') {
+ $wrong = 1;
+ }
+
+ if ($wrong) {
+ print $log "Skipping test $testCmd->{'group'}" . "_" .
+ $testCmd->{'num'} . " since it is not suppsed to be run in hadoop 23\n";
+ }
+
+ return $wrong;
+}
+
###############################################################################
sub setLocationPermGroup{
my ($self, $job_info, $testCmd, $log) = @_;
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/hcatperms.conf
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/hcatperms.conf?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/hcatperms.conf (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/hcatperms.conf Wed Oct 16 20:28:16 2013
@@ -170,7 +170,7 @@ $cfg =
{
- #check default db permissions
+ #check db permissions
#the default group is currently the group of parent dir
'num' => 5,
@@ -188,7 +188,7 @@ $cfg =
'url' => ':TEMPLETON_URL:/templeton/v1/ddl/database/hcatperms_e',
'user_name' => ':UNAME:',
'format_header' => 'Content-Type: application/json',
- 'post_options' => ['{}']
+ 'post_options' => ['{ "permissions" : "rwx------" }']
}
],
@@ -677,7 +677,7 @@ $cfg =
'format_header' => 'Content-Type: application/json',
'user_name' => ':UNAME_OTHER:',
'status_code' => 500,
- 'json_field_substr_match' => {'error' => 'unable to show tables'},
+ 'json_field_substr_match' => {'error' => 'FAILED: AuthorizationException .*\.security\.AccessControlException: action READ not permitted on path .* for user :UNAME_OTHER:'},
},
@@ -868,7 +868,7 @@ $cfg =
},
{
- #check default permissions
+ #check permissions
#the default group is currently the group of parent dir
'num' => 2,
'setup' => [
@@ -883,7 +883,7 @@ $cfg =
'method' => 'PUT',
'url' => ':TEMPLETON_URL:/templeton/v1/ddl/database/default/table/permstable_:TNUM:',
'format_header' => 'Content-Type: application/json',
- 'post_options' => ['{ "columns": [ { "name" : "i", "type" : "int" } ],"format" : { "storedAs" : "rcfile"} }'],
+ 'post_options' => ['{ "columns": [ { "name" : "i", "type" : "int" } ],"format" : { "storedAs" : "rcfile"}, "permissions" : "rwx------" }'],
'user_name' => ':UNAME:',
'status_code' => 200,
}
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf Wed Oct 16 20:28:16 2013
@@ -77,24 +77,8 @@ $cfg =
'check_call_back' => 1,
},
{
-
- 'num' => 2,
- 'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
- 'post_options' => ['user.name=:UNAME:','arg=-mt', 'arg=660000',
- 'jar=:INPDIR_HDFS:/hexamples.jar', 'class=sleep', ],
- 'json_field_substr_match' => { 'id' => '\d+'},
- #results
- 'status_code' => 200,
- 'check_job_created' => 1,
- 'check_job_complete' => 'SUCCESS',
- 'check_job_exit_value' => 0,
- 'check_call_back' => 1,
- 'timeout' => 840, #increase timeout as this test takes long
- },
- {
# with log enabled
- 'num' => 3,
+ 'num' => 2,
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
'post_options' => ['user.name=:UNAME:','arg=:INPDIR_HDFS:/nums.txt', 'arg= :OUTDIR:/wc.txt',
@@ -310,6 +294,7 @@ $cfg =
{
#test show tables
'num' => 3,
+ 'ignore23' => 'Log collector does not work with Hadoop 2',
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/hive',
'post_options' => ['user.name=:UNAME:','execute=drop table if exists mynums;', ],
@@ -436,6 +421,7 @@ $cfg =
{
#test add jar
'num' => 9,
+ 'ignore23' => 'Log collector does not work with Hadoop 2',
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/hive',
'post_options' => ['user.name=:UNAME:','execute=add jar piggybank.jar', 'files=:INPDIR_HDFS:/piggybank.jar',],
@@ -464,6 +450,7 @@ $cfg =
{
#enable logs
'num' => 11,
+ 'ignore23' => 'Log collector does not work with Hadoop 2',
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/hive',
'post_options' => ['user.name=:UNAME:','execute=select a,b from mynums', 'statusdir=:OUTDIR:/status', 'enablelog=true'],
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf Wed Oct 16 20:28:16 2013
@@ -42,11 +42,12 @@ $cfg =
# see HIVE-4808
# this is a long running test, takes 11 minutes
# -mt must be greater than mapred.task.timeout (600000ms)
- 'num' => 2,
+ 'num' => 1,
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
'post_options' => ['user.name=:UNAME:','arg=-mt', 'arg=642000',
- 'jar=:INPDIR_HDFS:/hclient.jar', 'class=sleep', 'statusdir=/tmp' ],
+ 'jar=:INPDIR_HDFS:/hclient.jar', 'class=sleep',
+ 'statusdir=/tmp/TestHeartbeat_1' ],
'json_field_substr_match' => { 'id' => '\d+'},
'status_code' => 200,
'check_job_created' => 1,
@@ -55,7 +56,7 @@ $cfg =
# it contains the value.
# 'check_job_exit_value' => 0,
'check_call_back' => 1,
- 'timeout_seconds' => 800,
+ 'timeout' => 800,
},
]
},
Modified: hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf (original)
+++ hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf Wed Oct 16 20:28:16 2013
@@ -70,6 +70,7 @@ $cfg =
{
#enable log
'num' => 3,
+ 'ignore23' => 'Log collector does not work with Hadoop 2',
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming',
'post_options' => ['user.name=:UNAME:',
@@ -88,6 +89,7 @@ $cfg =
{
#enable log, failed job case
'num' => 4,
+ 'ignore23' => 'Log collector does not work with Hadoop 2',
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming',
'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/nums.txt',
Modified: hive/branches/tez/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/tez/ivy/libraries.properties?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/ivy/libraries.properties (original)
+++ hive/branches/tez/ivy/libraries.properties Wed Oct 16 20:28:16 2013
@@ -17,7 +17,7 @@
# project configuration files.
# These are the versions of our dependencies (in alphabetical order)
-apacheant.version=1.7.1
+apacheant.version=1.8.4
ant-contrib.version=1.0b3
ant-task.version=2.0.10
antlr.version=3.4
@@ -37,12 +37,13 @@ commons-configuration.version=1.6
commons-httpclient.version=3.0.1
commons-io.version=2.4
commons-lang.version=2.4
-commons-logging.version=1.0.4
+commons-logging.version=1.1.1
commons-logging-api.version=1.0.4
commons-pool.version=1.5.4
commons-lang3.version=3.1
derby.version=10.4.2.0
guava.version=11.0.2
+groovy.version=2.1.6
hbase.version=0.94.6.1
httpclient.version=4.2.5
httpcore.version=4.2.4
Modified: hive/branches/tez/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/metastore/ivy.xml?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/metastore/ivy.xml (original)
+++ hive/branches/tez/metastore/ivy.xml Wed Oct 16 20:28:16 2013
@@ -31,7 +31,10 @@
<dependency org="org.antlr" name="ST4" rev="${ST4.version}" transitive="false"/><!-- manually added (antlr dep), bad POM -->
<dependency org="org.apache.hive" name="hive-serde" rev="${version}"
conf="compile->default" />
- <dependency org="com.jolbox" name="bonecp" rev="${BoneCP.version}"/>
+ <dependency org="com.jolbox" name="bonecp" rev="${BoneCP.version}">
+ <exclude org="com.google.guava" module="guava"/>
+ </dependency>
+
<dependency org="commons-pool" name="commons-pool" rev="${commons-pool.version}"/>
<dependency org="org.datanucleus" name="datanucleus-api-jdo" rev="${datanucleus-api-jdo.version}">
<exclude org="javax.jdo" module="jdo2-api"/>
Modified: hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java (original)
+++ hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java Wed Oct 16 20:28:16 2013
@@ -130,9 +130,9 @@ public class MetaStoreSchemaInfo {
return UPGRADE_FILE_PREFIX + fileVersion + "." + dbType + SQL_FILE_EXTENSION;
}
- // Current hive version, remove the 'SNAPSHOT' part if needed
+ // Current hive version, in majorVersion.minorVersion.changeVersion format
public static String getHiveSchemaVersion() {
- return HiveVersionInfo.getVersion().replace("-SNAPSHOT", "");
+ return HiveVersionInfo.getShortVersion();
}
}
Modified: hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/parser/Filter.g
URL: http://svn.apache.org/viewvc/hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/parser/Filter.g?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/parser/Filter.g (original)
+++ hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/parser/Filter.g Wed Oct 16 20:28:16 2013
@@ -86,7 +86,14 @@ expression
operatorExpression
;
-operatorExpression
+operatorExpression
+ :
+ betweenExpression
+ |
+ binOpExpression
+ ;
+
+binOpExpression
@init {
boolean isReverseOrder = false;
Object val = null;
@@ -122,7 +129,39 @@ operator returns [Operator op]
$op = Operator.fromString(t.getText().toUpperCase());
};
+betweenExpression
+@init {
+ Object leftV = null;
+ Object rightV = null;
+ boolean isPositive = true;
+}
+ :
+ (
+ key = Identifier (KW_NOT { isPositive = false; } )? BETWEEN
+ (
+ (left = StringLiteral KW_AND right = StringLiteral) { leftV = TrimQuotes(left.getText());
+ rightV = TrimQuotes(right.getText());
+ }
+ |
+ (left = IntegralLiteral KW_AND right = IntegralLiteral) { leftV = Long.parseLong(left.getText());
+ rightV = Long.parseLong(right.getText());
+ }
+ )
+ )
+ {
+ LeafNode leftNode = new LeafNode(), rightNode = new LeafNode();
+ leftNode.keyName = rightNode.keyName = key.getText();
+ leftNode.value = leftV;
+ rightNode.value = rightV;
+ leftNode.operator = isPositive ? Operator.GREATERTHANOREQUALTO : Operator.LESSTHAN;
+ rightNode.operator = isPositive ? Operator.LESSTHANOREQUALTO : Operator.GREATERTHAN;
+ tree.addLeafNode(leftNode);
+ tree.addLeafNode(rightNode);
+ tree.addIntermediateNode(isPositive ? LogicalOperator.AND : LogicalOperator.OR);
+ };
+
// Keywords
+KW_NOT : 'NOT';
KW_AND : 'AND';
KW_OR : 'OR';
KW_LIKE : 'LIKE';
@@ -136,6 +175,7 @@ LESSTHANOREQUALTO : '<=';
LESSTHAN : '<';
GREATERTHANOREQUALTO : '>=';
GREATERTHAN : '>';
+BETWEEN : 'BETWEEN';
// LITERALS
fragment
Modified: hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDelegationToken.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDelegationToken.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDelegationToken.java (original)
+++ hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDelegationToken.java Wed Oct 16 20:28:16 2013
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.hadoop.hive.metastore.model;
public class MDelegationToken {
Modified: hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MMasterKey.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MMasterKey.java?rev=1532891&r1=1532890&r2=1532891&view=diff
==============================================================================
--- hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MMasterKey.java (original)
+++ hive/branches/tez/metastore/src/model/org/apache/hadoop/hive/metastore/model/MMasterKey.java Wed Oct 16 20:28:16 2013
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.hadoop.hive.metastore.model;
public class MMasterKey {