You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2013/05/23 00:40:48 UTC
svn commit: r1485472 -
/hive/trunk/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf
Author: gates
Date: Wed May 22 22:40:47 2013
New Revision: 1485472
URL: http://svn.apache.org/r1485472
Log:
HIVE-4581 HCat e2e tests broken by changes to Hive's describe table formatting (gates)
Modified:
hive/trunk/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf
Modified: hive/trunk/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf?rev=1485472&r1=1485471&r2=1485472&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf (original)
+++ hive/trunk/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf Wed May 22 22:40:47 2013
@@ -48,7 +48,8 @@ gpa double)
stored as textfile;
describe hcat_createtable_1;\
,'rc' => 0
- ,'expected_out_regex' => 'name string(\s)*age int(\s)*gpa double'
+ ,'expected_out_regex' =>
+ 'name(\s)+string(\s)+None(\s)+\nage(\s)+int(\s)+None(\s)+\ngpa(\s)+double(\s)+None'
,'expected_err_regex' => 'OK(.*)OK(.*)OK'
},
{
@@ -61,7 +62,8 @@ gpa double) partitioned by (b string) st
describe extended hcat_createtable_2;
\,
,'rc' => 0
- ,'expected_out_regex' => 'name string(\s)*age int(\s)*gpa double'
+ ,'expected_out_regex' =>
+ 'name(\s)+string(\s)+None(\s)+\nage(\s)+int(\s)+None(\s)+\ngpa(\s)+double(\s)+None(\s)+\nb(\s)+string(\s)+None'
},
{
'num' => 3
@@ -72,7 +74,8 @@ create table if not exists hcat_createta
describe hcat_createtable_3;
\,
,'rc' => 0
- ,'expected_out_regex' => 'name string(\s)*age int(\s)*gpa double'
+ ,'expected_out_regex' =>
+ 'name(\s)+string(\s)+None(\s)+\nage(\s)+int(\s)+None(\s)+\ngpa(\s)+double(\s)+None'
,'expected_err_regex' => 'OK(.*)OK(.*)OK(.*)OK'
},
@@ -99,7 +102,8 @@ outputformat 'org.apache.hadoop.hive.ql.
describe extended hcat_createtable_5;
\,
,'rc' => 0
- ,'expected_out_regex' => 'name string(\s)*age int(\s)*gpa double(.*(\s))*inputFormat:org.apache.hadoop.hive.ql.io.RCFileInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat'
+ ,'expected_out_regex' =>
+ 'name(\s)+string(\s)+None(\s)+\nage(\s)+int(\s)+None(\s)+\ngpa(\s)+double(\s)+None'
,'expected_err_regex' => 'OK(.*)OK(.*)OK'
},
@@ -117,7 +121,8 @@ stored as textfile;
describe extended hcat_createtable_6;
#,
,'rc' => 0
- ,'expected_out_regex' => 'a int(\s)*b array<int>(\s)*c map<string,string>(.*(\s))*.*parameters:.*colelction.delim=,, mapkey.delim=:, serialization.format=|, line.delim=\n, field.delim=^'
+ ,'expected_out_regex' =>
+ 'a(\s)+int(\s)+None(\s)+\nb(\s)+array<int>(\s)+None(\s)+\nc(\s)+map<string,string>(\s)+None(\s)+\n(.*(\s))*.*parameters:.*colelction.delim=,, mapkey.delim=:, serialization.format=|, line.delim=\n, field.delim=^'
,'expected_err_regex' => 'OK(.*)OK(.*)OK'
},
@@ -315,7 +320,8 @@ alter table hcat_altertable_13 add parti
alter table hcat_altertable_13 add columns (x string comment 'extra');
describe hcat_altertable_13;\,
,'rc' => 0
- ,'expected_out_regex' => 'a int(\s)*b string(\s)*x string extra(\s)*c string(\s)*d string'
+ ,'expected_out_regex' =>
+ 'a(\s)+int(\s)+None(\s)+\nb(\s)+string(\s)+None(\s)+\nx(\s)+string(\s)+extra(\s)+\nc(\s)+string(\s)+None(\s)+\nd(\s)+string(\s)+None'
},
{
'num' => 14
@@ -324,7 +330,8 @@ describe hcat_altertable_13;\,
alter table hcat_altertable_13 replace columns (k int, l string, m string);
describe hcat_altertable_13;\,
,'rc' => 0
- ,'expected_out_regex' => 'k int(\s)*l string(\s)*m string(\s)*c string(\s)*d string'
+ ,'expected_out_regex' =>
+ 'k(\s)+int(\s)+None(\s)+\nl(\s)+string(\s)+None(\s)+\nm(\s)+string(\s)+None(\s)+\nc(\s)+string(\s)+None(\s)+\nd(\s)+string'
},
{
'num' => 15
@@ -410,7 +417,8 @@ drop view if exists hcat_view_2_1;
create view hcat_view_2_1(name,age) as select name, age from studenttab10k;
describe extended hcat_view_2_1;
"
- ,'expected_out_regex' => 'name string.*(\s)age int(.*(\s))*viewOriginalText:select name, age from studenttab10k.*tableType:VIRTUAL_VIEW'
+ ,'expected_out_regex' =>
+ 'name(\s)+string(\s)+None(\s)+\nage(\s)+int(\s)+None(\s)+(.*(\s))*viewOriginalText:select name, age from studenttab10k.*tableType:VIRTUAL_VIEW'
,'rc' => 0
},
],
@@ -589,7 +597,8 @@ show table extended like hcat_showdestab
,'hcat' => q\
describe extended hcat_showdestable_2 partition(c='42');\
,'rc' => 0
- ,'expected_out_regex' => 'a int first(\s)*b struct<foo:int,bar:struct<bar1:int,bar2:int>> second(\s)*c string(.*(\s))*Detailed Partition Information(\s)*Partition(.*)values:\[42\]'
+ ,'expected_out_regex' =>
+ 'a(\s)+int(\s)+first(\s)+\nb(\s)+struct<foo:int,bar:struct<bar1:int,bar2:int>>(\s)+second(\s)+\nc(\s)+string(\s)+None(\s)+(.*(\s))*Detailed Partition Information(\s)*Partition(.*)values:\[42\]'
},
{
'num' => 10
@@ -597,7 +606,7 @@ describe extended hcat_showdestable_2 pa
,'hcat' => q\
describe extended hcat_showdestable_2.b;\
,'rc' => 0
- ,'expected_out_regex' => 'foo int from deserializer(\s)*bar struct<bar1:int,bar2:int> from deserializer'
+ ,'expected_out_regex' => 'foo(\s)+int(\s)+from deserializer(\s)+\nbar(\s)+struct<bar1:int,bar2:int>(\s)+from deserializer'
},
{
'num' => 11
@@ -605,7 +614,7 @@ describe extended hcat_showdestable_2.b;
,'hcat' => q\
describe extended hcat_showdestable_2.b.foo;\
,'rc' => 0
- ,'expected_out_regex' => 'foo int from deserializer'
+ ,'expected_out_regex' => 'foo(\s)+int(\s)+from deserializer'
,'not_expected_out_regex' => 'bar'
},
{
@@ -614,7 +623,7 @@ describe extended hcat_showdestable_2.b.
,'hcat' => q\
describe extended hcat_showdestable_2.b.bar;\
,'rc' => 0
- ,'expected_out_regex' => 'bar1 int from deserializer(\s)*bar2 int from deserializer'
+ ,'expected_out_regex' => 'bar1(\s)+int(\s)+from deserializer(\s)+\nbar2(\s)+int(\s)+from deserializer'
},
{
'num' => 13
@@ -622,7 +631,7 @@ describe extended hcat_showdestable_2.b.
,'hcat' => q\
describe extended hcat_showdestable_2.b.bar.bar1;\
,'rc' => 0
- ,'expected_out_regex' => 'bar1 int from deserializer'
+ ,'expected_out_regex' => 'bar1(\s)+int(\s)+from deserializer'
,'not_expected_out_regex' => 'bar2'
},
{