You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2009/04/15 21:18:44 UTC
svn commit: r765314 - in /hadoop/hive/trunk: ./
ql/src/java/org/apache/hadoop/hive/ql/parse/
ql/src/test/queries/clientpositive/ ql/src/test/queries/negative/
ql/src/test/results/clientnegative/ ql/src/test/results/clientpositive/
ql/src/test/results/c...
Author: namit
Date: Wed Apr 15 19:18:43 2009
New Revision: 765314
URL: http://svn.apache.org/viewvc?rev=765314&view=rev
Log:
HIVE-372. Fix UDF memory consumptions and bad error messages.
(Zheng Shao via namit)
Added:
hadoop/hive/trunk/ql/src/test/queries/clientpositive/udf_10_trims.q
hadoop/hive/trunk/ql/src/test/queries/negative/invalid_create_table.q
hadoop/hive/trunk/ql/src/test/queries/negative/invalid_select.q
hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out
hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_create_table.q.out
hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_select.q.out
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g
hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_create_tbl2.q.out
hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_select_expression.q.out
hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_tbl_name.q.out
hadoop/hive/trunk/ql/src/test/results/compiler/errors/wrong_distinct2.q.out
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=765314&r1=765313&r2=765314&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Wed Apr 15 19:18:43 2009
@@ -46,6 +46,9 @@
HIVE-414. Add Hive Web Interface code to Eclipse config
(Prasad Chakka)
+ HIVE-372. Fix UDF memory consumptions and bad error messages.
+ (Zheng Shao via namit)
+
Release 0.3.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g?rev=765314&r1=765313&r2=765314&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g Wed Apr 15 19:18:43 2009
@@ -5,7 +5,7 @@
output=AST;
ASTLabelType=CommonTree;
backtrack=true;
-k=1;
+k=3;
}
tokens {
Added: hadoop/hive/trunk/ql/src/test/queries/clientpositive/udf_10_trims.q
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/queries/clientpositive/udf_10_trims.q?rev=765314&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/queries/clientpositive/udf_10_trims.q (added)
+++ hadoop/hive/trunk/ql/src/test/queries/clientpositive/udf_10_trims.q Wed Apr 15 19:18:43 2009
@@ -0,0 +1,12 @@
+CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
+
+EXPLAIN
+INSERT OVERWRITE TABLE dest1
+SELECT trim(trim(trim(trim(trim(trim(trim(trim(trim(trim( ' abc '))))))))))
+FROM src
+WHERE src.key = 86;
+
+INSERT OVERWRITE TABLE dest1
+SELECT trim(trim(trim(trim(trim(trim(trim(trim(trim(trim( ' abc '))))))))))
+FROM src
+WHERE src.key = 86;
Added: hadoop/hive/trunk/ql/src/test/queries/negative/invalid_create_table.q
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/queries/negative/invalid_create_table.q?rev=765314&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/queries/negative/invalid_create_table.q (added)
+++ hadoop/hive/trunk/ql/src/test/queries/negative/invalid_create_table.q Wed Apr 15 19:18:43 2009
@@ -0,0 +1,4 @@
+CREATE TABLE mytable (
+ a INT
+ b STRING
+);
Added: hadoop/hive/trunk/ql/src/test/queries/negative/invalid_select.q
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/queries/negative/invalid_select.q?rev=765314&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/queries/negative/invalid_select.q (added)
+++ hadoop/hive/trunk/ql/src/test/queries/negative/invalid_select.q Wed Apr 15 19:18:43 2009
@@ -0,0 +1,4 @@
+SELECT
+ trim(trim(a))
+ trim(b)
+FROM src;
Modified: hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_create_tbl2.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_create_tbl2.q.out?rev=765314&r1=765313&r2=765314&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_create_tbl2.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_create_tbl2.q.out Wed Apr 15 19:18:43 2009
@@ -1,2 +1,2 @@
-FAILED: Parse Error: line 1:7 mismatched input 'tabl' expecting TEMPORARY in create function statement
+FAILED: Parse Error: line 1:0 cannot recognize input 'create' in ddl statement
Modified: hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_select_expression.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_select_expression.q.out?rev=765314&r1=765313&r2=765314&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_select_expression.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_select_expression.q.out Wed Apr 15 19:18:43 2009
@@ -1,2 +1,2 @@
-FAILED: Parse Error: line 1:32 cannot recognize input '.' in table column identifier
+FAILED: Parse Error: line 1:32 cannot recognize input '.' in expression specification
Modified: hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_tbl_name.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_tbl_name.q.out?rev=765314&r1=765313&r2=765314&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_tbl_name.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientnegative/invalid_tbl_name.q.out Wed Apr 15 19:18:43 2009
@@ -1,2 +1,2 @@
-FAILED: Parse Error: line 1:20 mismatched input '-' expecting EOF in statement
+FAILED: Parse Error: line 1:20 mismatched input '-' expecting EOF
Added: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out?rev=765314&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out (added)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out Wed Apr 15 19:18:43 2009
@@ -0,0 +1,44 @@
+ABSTRACT SYNTAX TREE:
+ (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim (TOK_FUNCTION trim ' abc ')))))))))))) (TOK_WHERE (= (TOK_COLREF src key) 86))))
+
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Alias -> Map Operator Tree:
+ src
+ Select Operator
+ expressions:
+ expr: key
+ type: string
+ Filter Operator
+ predicate:
+ expr: (UDFToDouble(0) = UDFToDouble(86))
+ type: boolean
+ Select Operator
+ expressions:
+ expr: trim(trim(trim(trim(trim(trim(trim(trim(trim(trim(' abc '))))))))))
+ type: string
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: dest1
+
+ Stage: Stage-0
+ Move Operator
+ tables:
+ replace: true
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: dest1
+
+
Added: hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_create_table.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_create_table.q.out?rev=765314&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_create_table.q.out (added)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_create_table.q.out Wed Apr 15 19:18:43 2009
@@ -0,0 +1 @@
+Parse Error: line 3:2 mismatched input 'b' expecting ) in create statement
Added: hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_select.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_select.q.out?rev=765314&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_select.q.out (added)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/errors/invalid_select.q.out Wed Apr 15 19:18:43 2009
@@ -0,0 +1 @@
+Parse Error: line 3:2 cannot recognize input 'trim' in from clause
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/errors/wrong_distinct2.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/errors/wrong_distinct2.q.out?rev=765314&r1=765313&r2=765314&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/errors/wrong_distinct2.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/errors/wrong_distinct2.q.out Wed Apr 15 19:18:43 2009
@@ -1 +1 @@
-Parse Error: line 2:29 cannot recognize input 'SELECT' in select expression
+Parse Error: line 2:45 cannot recognize input 'DISTINCT' in select expression