Modified: hive/trunk/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteTextPartitioned.java URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteTextPartitioned.java?rev=1577948&r1=1577947&r2=1577948&view=diff ============================================================================== --- hive/trunk/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteTextPartitioned.java (original) +++ hive/trunk/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteTextPartitioned.java Sat Mar 15 23:18:52 2014 @@ -47,7 +47,7 @@ import org.apache.hive.hcatalog.mapreduc * other columns. This is to simulate a typical operation in a map reduce * program to test that hcat hands the right data to the map reduce program * - * Usage: hadoop jar org.apache.hive.hcatalog.utils.WriteTextPartitioned -libjars + * Usage: hadoop jar org.apache.hcatalog.utils.HBaseReadWrite -libjars * <hcat_jar> * <serveruri> <input_tablename> <output_tablename> [filter] * If filter is given it will be provided as the partition to write to. */
Modified: hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf?rev=1577948&r1=1577947&r2=1577948&view=diff ============================================================================== --- hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf (original) +++ hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf Sat Mar 15 23:18:52 2014 @@ -152,9 +152,20 @@ $cfg = 'status_code' => 200, }, { + # GET queue?user.name=UNAME_OTHER, only get jobid as an array + 'num' => 8, + 'depends_on' => 'JOBS_1,JOBS_2,JOBS_3', + 'method' => 'GET', + 'url' => ':TEMPLETON_URL:/templeton/v1/queue?user.name=:UNAME_OTHER:', + 'user_name' => ':UNAME_OTHER:', + 'format_header' => 'Content-Type: application/json', + 'json_path' => {'$[-1:]' => 'job_.*'}, + 'status_code' => 200, + }, + { # GET jobs?user.name=UNAME_OTHER&fields=*, get all the details of the oldest 2 jobs whose # id is greater than job_0 - 'num' => 8, + 'num' => 9, 'depends_on' => 'JOBS_1,JOBS_2,JOBS_3', 'method' => 'GET', 'url' => ':TEMPLETON_URL:/templeton/v1/jobs?user.name=:UNAME_OTHER:&fields=*&numrecords=2&jobid=job_0', Modified: hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java?rev=1577948&r1=1577947&r2=1577948&view=diff ============================================================================== --- hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java (original) +++ hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java Sat Mar 15 23:18:52 2014 @@ -814,6 +814,49 @@ public class Server { /** * Return the status of the jobid. + * @deprecated use GET jobs/{jobid} instead. + */ + @Deprecated + @GET + @Path("queue/{jobid}") + @Produces({MediaType.APPLICATION_JSON}) + public QueueStatusBean showQueueId(@PathParam("jobid") String jobid) + throws NotAuthorizedException, BadParam, IOException, InterruptedException { + return showJobId(jobid); + } + + /** + * Kill a job in the queue. + * @deprecated use DELETE jobs/{jobid} instead. + */ + @Deprecated + @DELETE + @Path("queue/{jobid}") + @Produces({MediaType.APPLICATION_JSON}) + public QueueStatusBean deleteQueueId(@PathParam("jobid") String jobid) + throws NotAuthorizedException, BadParam, IOException, InterruptedException { + return deleteJobId(jobid); + } + + /** + * Return all the known job ids for this user. + * @deprecated use GET jobs instead. + */ + @Deprecated + @GET + @Path("queue") + @Produces({MediaType.APPLICATION_JSON}) + public List<String> showQueueList(@QueryParam("showall") boolean showall) + throws NotAuthorizedException, BadParam, IOException, InterruptedException { + + verifyUser(); + + ListDelegator d = new ListDelegator(appConf); + return d.run(getDoAsUser(), showall); + } + + /** + * Return the status of the jobid. */ @GET @Path("jobs/{jobid}")
