Author: nzhang
Date: Thu Nov 17 00:12:24 2011
New Revision: 1202945
URL: http://svn.apache.org/viewvc?rev=1202945&view=rev
Log:
backporting HIVE-2568 (rev. 1201091)
Modified:
hive/branches/branch-0.8/ (props changed)
hive/branches/branch-0.8/README.txt (props changed)
hive/branches/branch-0.8/contrib/src/java/org/apache/hadoop/hive/contrib/udaf/example/UDAFExampleMax.java
(props changed)
hive/branches/branch-0.8/contrib/src/java/org/apache/hadoop/hive/contrib/udaf/example/UDAFExampleMin.java
(props changed)
hive/branches/branch-0.8/metastore/scripts/upgrade/mysql/008-HIVE-2246.mysql.sql
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/io/NonSyncDataInputBuffer.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/io/NonSyncDataOutputBuffer.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultGraphWalker.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultRuleDispatcher.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/Dispatcher.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/GraphWalker.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessor.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessorCtx.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/Rule.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/RuleRegExp.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/parse/JoinCond.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/parse/JoinType.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/AggregationDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CollectDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CopyWork.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateFunctionDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableLikeDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateViewDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DDLDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DescFunctionDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DropFunctionDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DropTableDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/Explain.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExplainWork.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExplosionDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeColumnDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeFieldDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeNullDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExtractDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/FetchWork.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/FileSinkDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ForwardDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinCondDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LateralViewJoinDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LimitDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadFileDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MoveWork.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/SchemaDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ScriptDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/SelectDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowFunctionsDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowPartitionsDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTableStatusDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTablesDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/UDTFDesc.java
(props changed)
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionDesc.java
(props changed)
hive/branches/branch-0.8/serde/README.txt (props changed)
hive/branches/branch-0.8/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java
(props changed)
hive/branches/branch-0.8/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/
(props changed)
Propchange: hive/branches/branch-0.8/
------------------------------------------------------------------------------
svn:mergeinfo = /hive/trunk:1201091
Propchange: hive/branches/branch-0.8/README.txt
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/contrib/src/java/org/apache/hadoop/hive/contrib/udaf/example/UDAFExampleMax.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/contrib/src/java/org/apache/hadoop/hive/contrib/udaf/example/UDAFExampleMin.java
('svn:mergeinfo' removed)
Modified:
hive/branches/branch-0.8/metastore/scripts/upgrade/mysql/008-HIVE-2246.mysql.sql
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.8/metastore/scripts/upgrade/mysql/008-HIVE-2246.mysql.sql?rev=1202945&r1=1202944&r2=1202945&view=diff
==============================================================================
---
hive/branches/branch-0.8/metastore/scripts/upgrade/mysql/008-HIVE-2246.mysql.sql
(original)
+++
hive/branches/branch-0.8/metastore/scripts/upgrade/mysql/008-HIVE-2246.mysql.sql
Thu Nov 17 00:12:24 2011
@@ -26,6 +26,9 @@ CREATE PROCEDURE REVERT()
DROP TABLE IF EXISTS COLUMNS_V2;
DROP TABLE IF EXISTS TABLE_SDS;
DROP TABLE IF EXISTS CDS;
+ ALTER TABLE COLUMNS_OLD
+ ADD CONSTRAINT `COLUMNS_FK1` FOREIGN KEY (`SD_ID`) REFERENCES
`SDS`(`SD_ID`)
+ ;
RENAME TABLE COLUMNS_OLD TO COLUMNS;
END $$
@@ -211,6 +214,8 @@ CREATE PROCEDURE CREATE_TABLE_SDS()
CREATE PROCEDURE RENAME_OLD_COLUMNS()
BEGIN
RENAME TABLE `COLUMNS` TO `COLUMNS_OLD`;
+ ALTER TABLE COLUMNS_OLD
+ DROP FOREIGN KEY `COLUMNS_FK1`;
END $$
/*
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/io/NonSyncDataInputBuffer.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/io/NonSyncDataOutputBuffer.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultGraphWalker.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultRuleDispatcher.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/Dispatcher.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/GraphWalker.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessor.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessorCtx.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/Rule.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/lib/RuleRegExp.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/parse/JoinCond.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/parse/JoinType.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/AggregationDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CollectDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CopyWork.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateFunctionDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableLikeDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateViewDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DDLDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DescFunctionDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DropFunctionDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/DropTableDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/Explain.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExplainWork.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExplosionDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeColumnDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeFieldDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeNullDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ExtractDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/FetchWork.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/FileSinkDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ForwardDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinCondDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LateralViewJoinDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LimitDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadFileDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/MoveWork.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/SchemaDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ScriptDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/SelectDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowFunctionsDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowPartitionsDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTableStatusDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTablesDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/UDTFDesc.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionDesc.java
('svn:mergeinfo' removed)
Propchange: hive/branches/branch-0.8/serde/README.txt
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java
('svn:mergeinfo' removed)
Propchange:
hive/branches/branch-0.8/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/
('svn:mergeinfo' removed)
