You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ek...@apache.org on 2015/12/19 01:03:58 UTC
hive git commit: HIVE-12697 Remove deprecated post option from
webhcat test files (Aswathy Chellammal Sreekumar via Eugene Koifman)
Repository: hive
Updated Branches:
refs/heads/master e84da8c9b -> 7eb14afc9
HIVE-12697 Remove deprecated post option from webhcat test files (Aswathy Chellammal Sreekumar via Eugene Koifman)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7eb14afc
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7eb14afc
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7eb14afc
Branch: refs/heads/master
Commit: 7eb14afc93a697c91c900410b5ca5c5a5c598b45
Parents: e84da8c
Author: Eugene Koifman <ek...@hortonworks.com>
Authored: Fri Dec 18 16:03:50 2015 -0800
Committer: Eugene Koifman <ek...@hortonworks.com>
Committed: Fri Dec 18 16:03:50 2015 -0800
----------------------------------------------------------------------
hcatalog/src/test/e2e/templeton/tests/ddl.conf | 85 +++++++-------
.../src/test/e2e/templeton/tests/jobstatus.conf | 12 +-
.../test/e2e/templeton/tests/jobsubmission.conf | 112 +++++++++----------
.../e2e/templeton/tests/jobsubmission2.conf | 4 +-
.../tests/jobsubmission_streaming.conf | 21 ++--
.../templeton/tests/modifyConfiguration.conf | 8 +-
6 files changed, 119 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/7eb14afc/hcatalog/src/test/e2e/templeton/tests/ddl.conf
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/tests/ddl.conf b/hcatalog/src/test/e2e/templeton/tests/ddl.conf
index 23d3074..3f3d00e 100644
--- a/hcatalog/src/test/e2e/templeton/tests/ddl.conf
+++ b/hcatalog/src/test/e2e/templeton/tests/ddl.conf
@@ -42,9 +42,9 @@ $cfg =
#drop table if exists
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templetontest_tab2'],
+ 'post_options' => ['exec=drop table if exists templetontest_tab2'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
@@ -52,63 +52,63 @@ $cfg =
#create table
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=create table templetontest_tab2(i int, j bigint) STORED AS rcfile;'],
+ 'post_options' => ['exec=create table templetontest_tab2(i int, j bigint) STORED AS rcfile;'],
'json_field_substr_match' => {'stderr' => 'OK', 'exitcode' => '^0$'}
},
{
#show tables
'num' => 3,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=show tables;'],
+ 'post_options' => ['exec=show tables;'],
'json_field_substr_match' => {'stderr' => 'OK', 'stdout' => 'templetontest_tab2', 'exitcode' => '^0$'}
},
{
#create table again, should fail
'num' => 4,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=create table templetontest_tab2(i int, j bigint) STORED AS rcfile;'],
+ 'post_options' => ['exec=create table templetontest_tab2(i int, j bigint) STORED AS rcfile;'],
'json_field_substr_match' => { 'exitcode' => '^1$'}
},
{
#describe table
'num' => 5,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=describe templetontest_tab2;'],
+ 'post_options' => ['exec=describe templetontest_tab2;'],
'json_field_substr_match' => { 'stdout' => '.*i\s+int.*\n.*j.*bigint.*', 'exitcode' => '^0$', 'stderr' => 'OK'}
},
{
#alter table - file format
'num' => 6,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=alter table templetontest_tab2 SET FILEFORMAT rcfile;'],
+ 'post_options' => ['exec=alter table templetontest_tab2 SET FILEFORMAT rcfile;'],
'json_field_substr_match' => { 'exitcode' => '^0$', 'stderr' => 'OK'}
},
{
#alter table - add column
'num' => 7,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=alter table templetontest_tab2 add columns(newcolx int);'],
+ 'post_options' => ['exec=alter table templetontest_tab2 add columns(newcolx int);'],
'json_field_substr_match' => { 'exitcode' => '^0$', 'stderr' => 'OK'}
},
{
#describe table
'num' => 8,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=describe templetontest_tab2;'],
+ 'post_options' => ['exec=describe templetontest_tab2;'],
'json_field_substr_match' => { 'stdout' => '.*newcolx\s+int.*', 'exitcode' => '^0$', 'stderr' => 'OK'}
},
]
@@ -123,9 +123,9 @@ $cfg =
#drop database if exists
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop database if exists templeton_testempty_db'],
+ 'post_options' => ['exec=drop database if exists templeton_testempty_db'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
{
@@ -197,9 +197,9 @@ $cfg =
#create db if not exists
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=create database if not exists templeton_testdb1;'],
+ 'post_options' => ['exec=create database if not exists templeton_testdb1;'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
@@ -218,9 +218,9 @@ $cfg =
'ignore' => 'rest api now available',
'num' => 3,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=use templeton_testdb1; create table if not exists templeton_testtab1 (i int, j bigint) STORED AS rcfile;'],
+ 'post_options' => ['exec=use templeton_testdb1; create table if not exists templeton_testtab1 (i int, j bigint) STORED AS rcfile;'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
@@ -444,9 +444,9 @@ $cfg =
#drop table if exists
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templeton_testtab_rename1'],
+ 'post_options' => ['exec=drop table if exists templeton_testtab_rename1'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
{
@@ -454,9 +454,9 @@ $cfg =
#drop table if exists
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templeton_testtab_rename2'],
+ 'post_options' => ['exec=drop table if exists templeton_testtab_rename2'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
{
@@ -464,18 +464,18 @@ $cfg =
#create table if not exists
'num' => 3,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=create table if not exists templeton_testtab_rename1 (i int, j bigint) STORED AS rcfile;'],
+ 'post_options' => ['exec=create table if not exists templeton_testtab_rename1 (i int, j bigint) STORED AS rcfile;'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
{
#rename table
'num' => 4,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl/database/default/table/templeton_testtab_rename1',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl/database/default/table/templeton_testtab_rename1?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','rename=templeton_testtab_rename2'],
+ 'post_options' => ['rename=templeton_testtab_rename2'],
'json_field_substr_match' => {'table' => 'templeton_testtab_rename2'},
},
@@ -509,9 +509,9 @@ $cfg =
#drop table if exists
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templetontest_parts'],
+ 'post_options' => ['exec=drop table if exists templetontest_parts'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
@@ -521,10 +521,9 @@ $cfg =
#create table if not exists
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:',
- 'exec=create table if not exists templetontest_parts (i int, j bigint, ip STRING COMMENT \'IP Address of the User\') COMMENT \'This is the page view table\' PARTITIONED BY(dt STRING, country STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY \'\001\' COLLECTION ITEMS TERMINATED BY \'\002\' MAP KEYS TERMINATED BY \'\003\' STORED AS rcfile --LOCATION \'table1_location\' '],
+ 'post_options' => ['exec=create table if not exists templetontest_parts (i int, j bigint, ip STRING COMMENT \'IP Address of the User\') COMMENT \'This is the page view table\' PARTITIONED BY(dt STRING, country STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY \'\001\' COLLECTION ITEMS TERMINATED BY \'\002\' MAP KEYS TERMINATED BY \'\003\' STORED AS rcfile --LOCATION \'table1_location\' '],
'json_field_substr_match' => {'stderr' => 'OK'},
},
{
@@ -763,7 +762,7 @@ $cfg =
'method' => 'POST',
'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=create table if not exists templeton_testcol_tab (i int comment \'column with comment\', j bigint) STORED AS rcfile;'],
+ 'post_options' => ['exec=create table if not exists templeton_testcol_tab (i int comment \'column with comment\', j bigint) STORED AS rcfile;'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
{
@@ -1065,9 +1064,9 @@ $cfg =
#drop table if exists
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templetontest_hcatgp'],
+ 'post_options' => ['exec=drop table if exists templetontest_hcatgp'],
'json_field_substr_match' => {'stderr' => 'OK'},
},
@@ -1075,10 +1074,9 @@ $cfg =
#create table . -ve test
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:',
- 'group=no_such_group_AA',
+ 'post_options' => ['group=no_such_group_AA',
'exec=create table templetontest_hcatgp(i int, j bigint) STORED AS rcfile;'],
'json_field_substr_match' => {'stderr' => 'User does not belong to no_such_group_AA', 'exitcode' => '^1$'}
},
@@ -1086,10 +1084,9 @@ $cfg =
#create table with no permissions
'num' => 3,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:',
- 'permissions=---------',
+ 'post_options' => ['permissions=---------',
'exec=create table templetontest_hcatgp(i int, j bigint) PARTITIONED BY(dt STRING, 3Bcountry STRING) STORED AS rcfile;'
],
'json_field_substr_match' => {'stderr' => 'OK', 'exitcode' => '^0$'}
http://git-wip-us.apache.org/repos/asf/hive/blob/7eb14afc/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf b/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf
index 514f129..5fd7c1d 100644
--- a/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf
+++ b/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf
@@ -43,9 +43,9 @@ $cfg =
#a simple load store script as UNAME_OTHER
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME_OTHER:',
'user_name' => ':UNAME_OTHER:',
- 'post_options' => ['user.name=:UNAME_OTHER:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -57,9 +57,9 @@ $cfg =
#a simple load store script as UNAME
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
'user_name' => ':UNAME:',
- 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -71,9 +71,9 @@ $cfg =
#a simple load store script as UNAME_OTHER
'num' => 3,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME_OTHER:',
'user_name' => ':UNAME_OTHER:',
- 'post_options' => ['user.name=:UNAME_OTHER:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
http://git-wip-us.apache.org/repos/asf/hive/blob/7eb14afc/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf b/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
index e836111..a1b0284 100644
--- a/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
+++ b/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
@@ -41,8 +41,8 @@ $cfg =
{
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming',
- 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/nums.txt',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:',
+ 'post_options' => ['input=:INPDIR_HDFS:/nums.txt',
'input=:INPDIR_HDFS:/nums.txt',
'output=:OUTDIR:/mycounts',
'mapper=sleep 100', 'reducer=wc'],
@@ -89,8 +89,8 @@ $cfg =
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
- 'post_options' => ['user.name=:UNAME:','arg=:INPDIR_HDFS:/nums.txt', 'arg= :OUTDIR:/wc.txt',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar?user.name=:UNAME:',
+ 'post_options' => ['arg=:INPDIR_HDFS:/nums.txt', 'arg= :OUTDIR:/wc.txt',
'jar=:INPDIR_HDFS:/hexamples.jar', 'class=wordcount', 'define=MYPROP1=VALUE1', 'define=MYPROP2=VALUE2',],
'json_field_substr_match' => { 'id' => '\d+'},
#results
@@ -106,8 +106,8 @@ $cfg =
'num' => 2,
'ignore23' => 'Log collector does not work with Hadoop 2',
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
- 'post_options' => ['user.name=:UNAME:','arg=:INPDIR_HDFS:/nums.txt', 'arg= :OUTDIR:/wc.txt',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar?user.name=:UNAME:',
+ 'post_options' => ['arg=:INPDIR_HDFS:/nums.txt', 'arg= :OUTDIR:/wc.txt',
'jar=:INPDIR_HDFS:/hexamples.jar', 'class=wordcount', 'statusdir=:OUTDIR:/status', 'enablelog=true' ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
@@ -129,8 +129,8 @@ $cfg =
#test syntax error
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:','execute=asdf', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['execute=asdf', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -142,8 +142,8 @@ $cfg =
#valid syntax, hdfs operation through pig
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:','execute=fs -ls :INPDIR_HDFS:;', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['execute=fs -ls :INPDIR_HDFS:;', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -156,8 +156,8 @@ $cfg =
#syntax check - valid syntax
'num' => 3,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:','arg=-check', 'file=:INPDIR_HDFS:/loadstore.pig', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-check', 'file=:INPDIR_HDFS:/loadstore.pig', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -170,8 +170,8 @@ $cfg =
#syntax check cmd - valid syntax
'num' => 4,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:', 'arg=-d', 'arg=INFO' , 'execute=fs -ls :INPDIR_HDFS: ', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-d', 'arg=INFO' , 'execute=fs -ls :INPDIR_HDFS: ', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -185,8 +185,8 @@ $cfg =
#a simple load store script
'num' => 5,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -202,8 +202,8 @@ $cfg =
#pig query registering jar
'num' => 6,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/jarregistered.pig',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/jarregistered.pig',
'files=:INPDIR_HDFS:/piggybank.jar' ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
@@ -218,8 +218,8 @@ $cfg =
#macro
'num' => 7,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/rowcount_withmacro.pig',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/rowcount_withmacro.pig',
'files=:INPDIR_HDFS:/rowcountmacro.pig' ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
@@ -234,8 +234,8 @@ $cfg =
#no file to be copied, should result in launcher job error
'num' => 8,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/no_such_file.pig',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/no_such_file.pig',
'files=:INPDIR_HDFS:/rowcountmacro.pig' ],
'json_field_substr_match' => { 'error' => 'does not exist'},
#results
@@ -248,8 +248,8 @@ $cfg =
'ignore' => 'MS9 feature, will reenable later',
'num' => 9,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:','arg=-check', 'file=:INPDIR_HDFS:/loadstore.pig', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-check', 'file=:INPDIR_HDFS:/loadstore.pig', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -264,8 +264,8 @@ $cfg =
'num' => 10,
'ignore23' => 'Log collector does not work with Hadoop 2',
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig',
'statusdir=:OUTDIR:/status', 'enablelog=true'],
'json_field_substr_match' => { 'id' => '\d+'},
#results
@@ -284,15 +284,15 @@ $cfg =
'setup' => [
{
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop table if exists hcattest_pig; create table hcattest_pig(i int, j int) STORED AS textfile;'],
+ 'post_options' => ['exec=drop table if exists hcattest_pig; create table hcattest_pig(i int, j int) STORED AS textfile;'],
'json_field_substr_match' => {'stderr' => 'OK'}
}
],
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/pig',
- 'post_options' => ['user.name=:UNAME:', 'arg=-useHCatalog', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:', 'arg=-p', 'arg= OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/hcatloadstore.pig'],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:',
+ 'post_options' => ['arg=-useHCatalog', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:', 'arg=-p', 'arg= OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/hcatloadstore.pig'],
'json_field_substr_match' => { 'id' => '\d+'},
'status_code' => 200,
@@ -318,8 +318,8 @@ $cfg =
#test syntax error
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=asdf', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=asdf', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -332,8 +332,8 @@ $cfg =
#test show tables
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=show tables', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=show tables', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -348,8 +348,8 @@ $cfg =
'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;', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=drop table if exists mynums;', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -362,8 +362,8 @@ $cfg =
#test show tables
'num' => 4,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=create external table mynums(a int, b int) location \':INPDIR_HDFS:/numstable/\';', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=create external table mynums(a int, b int) location \':INPDIR_HDFS:/numstable/\';', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -377,8 +377,8 @@ $cfg =
#test describe
'num' => 5,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=describe formatted mynums', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=describe formatted mynums', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -392,8 +392,8 @@ $cfg =
#test select *
'num' => 6,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=select * from mynums', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=select * from mynums', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -407,8 +407,8 @@ $cfg =
#test select a,b
'num' => 7,#seems to be the same as test 6 except for percent_complete check
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=select count(*) from mynums', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=select count(*) from mynums', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -425,8 +425,8 @@ $cfg =
#test udfs : select a,rand(b)
'num' => 8,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=select a,rand(b) from mynums', ],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=select a,rand(b) from mynums', ],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -442,8 +442,8 @@ $cfg =
# for this case when jar is shipped, #10 is a negative test case
'num' => 9,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=add jar piggybank.jar', 'files=:INPDIR_HDFS:/piggybank.jar',],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=add jar piggybank.jar', 'files=:INPDIR_HDFS:/piggybank.jar',],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -457,8 +457,8 @@ $cfg =
# controller job using "files"
'num' => 10,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=add jar piggybank.jar',],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=add jar piggybank.jar',],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -472,8 +472,8 @@ $cfg =
'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=add jar piggybank.jar', 'files=:INPDIR_HDFS:/piggybank.jar',],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=add jar piggybank.jar', 'files=:INPDIR_HDFS:/piggybank.jar',],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -486,8 +486,8 @@ $cfg =
#test add jar when the jar is not shipped
'num' => 12,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=add jar piggybank.jar',],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=add jar piggybank.jar',],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
@@ -501,8 +501,8 @@ $cfg =
'num' => 13,
'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'],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=select a,b from mynums', 'statusdir=:OUTDIR:/status', 'enablelog=true'],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,
http://git-wip-us.apache.org/repos/asf/hive/blob/7eb14afc/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf b/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf
index de2743e..188e416 100644
--- a/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf
+++ b/hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf
@@ -44,8 +44,8 @@ $cfg =
# -mt must be greater than mapred.task.timeout (600000ms)
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
- 'post_options' => ['user.name=:UNAME:','arg=-mt', 'arg=642000',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar?user.name=:UNAME:',
+ 'post_options' => ['arg=-mt', 'arg=642000',
'jar=:INPDIR_HDFS:/hclient.jar', 'class=sleep',
'statusdir=/tmp/TestHeartbeat_1' ],
'json_field_substr_match' => { 'id' => '\d+'},
http://git-wip-us.apache.org/repos/asf/hive/blob/7eb14afc/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf b/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf
index eb37dd7..88812af 100644
--- a/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf
+++ b/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf
@@ -41,8 +41,8 @@ $cfg =
{
'num' => 1,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming',
- 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt','output=:OUTDIR:/mycounts',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:',
+ 'post_options' => ['input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt','output=:OUTDIR:/mycounts',
'mapper=cat', 'reducer=wc'],
'json_field_substr_match' => { 'id' => '\d+'},
#results
@@ -61,8 +61,8 @@ $cfg =
# job and thus is always SUCCCESS(2)/KILLED(5) once the job completes.
'num' => 2,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming',
- 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt','output=:OUTDIR:/mycounts',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:',
+ 'post_options' => ['input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt','output=:OUTDIR:/mycounts',
'mapper=ls no_such-file-12e3', 'reducer=wc'],
'json_field_substr_match' => { 'id' => '\d+'},
#results
@@ -77,9 +77,8 @@ $cfg =
'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:',
- 'input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:',
+ 'post_options' => ['input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt',
'output=:OUTDIR:/mycounts',
'mapper=cat', 'reducer=wc', 'statusdir=:OUTDIR:/status', 'enablelog=true'],
'json_field_substr_match' => { 'id' => '\d+'},
@@ -96,8 +95,8 @@ $cfg =
'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',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:',
+ 'post_options' => ['input=:INPDIR_HDFS:/nums.txt',
'input=:INPDIR_HDFS:/nums.txt',
'output=:OUTDIR:/mycounts',
'mapper=ls no_such-file-12e3', 'reducer=wc', 'statusdir=:OUTDIR:/status', 'enablelog=true'],
@@ -114,8 +113,8 @@ $cfg =
#streaming xml
'num' => 5,
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming',
- 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/xml/file1.xml','input=:INPDIR_HDFS:/xml/file2.xml','output=:OUTDIR:/xmlout',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:',
+ 'post_options' => ['input=:INPDIR_HDFS:/xml/file1.xml','input=:INPDIR_HDFS:/xml/file2.xml','output=:OUTDIR:/xmlout',
'mapper=python :INPDIR_HDFS:/xmlmapper.py','reducer=python :INPDIR_HDFS:/xmlreducer.py', 'inputreader=StreamXmlRecordReader,begin=xml,end=/xml'],
'json_field_substr_match' => { 'id' => '\d+'},
#results
http://git-wip-us.apache.org/repos/asf/hive/blob/7eb14afc/hcatalog/src/test/e2e/templeton/tests/modifyConfiguration.conf
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/tests/modifyConfiguration.conf b/hcatalog/src/test/e2e/templeton/tests/modifyConfiguration.conf
index 586b3da..11de38c 100644
--- a/hcatalog/src/test/e2e/templeton/tests/modifyConfiguration.conf
+++ b/hcatalog/src/test/e2e/templeton/tests/modifyConfiguration.conf
@@ -43,17 +43,17 @@ $cfg =
'setup' => [
{
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/ddl',
+ 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:',
'status_code' => 200,
- 'post_options' => ['user.name=:UNAME:','exec=drop table if exists ratings;CREATE EXTERNAL TABLE ratings(userid INT, movieid INT, ratings FLOAT, unixtime STRING)
+ 'post_options' => ['exec=drop table if exists ratings;CREATE EXTERNAL TABLE ratings(userid INT, movieid INT, ratings FLOAT, unixtime STRING)
ROW FORMAT DELIMITED FIELDS TERMINATED BY \':\' location \':INPDIR_HDFS:/ratings/\';drop table if exists testtable;create table testtable
(userid INT, movieid INT, ratings FLOAT, unixtime STRING) location \':INPDIR_HDFS:/testtable/\';'],
'json_field_substr_match' => {'stderr' => 'OK'}
}
],
'method' => 'POST',
- 'url' => ':TEMPLETON_URL:/templeton/v1/hive',
- 'post_options' => ['user.name=:UNAME:','execute=INSERT OVERWRITE TABLE testtable SELECT * from ratings','statusdir=:OUTDIR:/status'],
+ 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:',
+ 'post_options' => ['execute=INSERT OVERWRITE TABLE testtable SELECT * from ratings','statusdir=:OUTDIR:/status'],
'json_field_substr_match' => { 'id' => '\d+'},
#results
'status_code' => 200,