You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2013/08/30 10:18:38 UTC

svn commit: r1518911 - in /hive/trunk: hcatalog/core/src/main/java/org/apache/hcatalog/shims/ hcatalog/shims/src/20/java/org/apache/hadoop/mapred/ hcatalog/shims/src/20/java/org/apache/hcatalog/shims/ hcatalog/shims/src/23/java/org/apache/hadoop/mapred...

Author: thejas
Date: Fri Aug 30 08:18:38 2013
New Revision: 1518911

URL: http://svn.apache.org/r1518911
Log:
Add missing files from - HIVE-4460 : Publish HCatalog artifacts for Hadoop 2.x

Added:
    hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/
    hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java
    hive/trunk/shims/src/0.23/java/org/apache/hadoop/mapred/
    hive/trunk/shims/src/0.23/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
Removed:
    hive/trunk/hcatalog/core/src/main/java/org/apache/hcatalog/shims/HCatHadoopShims.java
    hive/trunk/hcatalog/shims/src/20/java/org/apache/hadoop/mapred/TempletonJobTracker.java
    hive/trunk/hcatalog/shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java
    hive/trunk/hcatalog/shims/src/23/java/org/apache/hadoop/mapred/TempletonJobTracker.java
    hive/trunk/hcatalog/shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java

Added: hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java?rev=1518911&view=auto
==============================================================================
--- hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java (added)
+++ hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java Fri Aug 30 08:18:38 2013
@@ -0,0 +1,83 @@
+package org.apache.hadoop.mapred;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.shims.HadoopShims.WebHCatJTShim;
+import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.security.UserGroupInformation;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
+/**
+ * This is in org.apache.hadoop.mapred package because it relies on 
+ * JobSubmissionProtocol which is package private
+ */
+public class WebHCatJTShim20S implements WebHCatJTShim {
+    private JobSubmissionProtocol cnx;
+
+    /**
+     * Create a connection to the Job Tracker.
+     */
+    public WebHCatJTShim20S(Configuration conf)
+            throws IOException {
+      UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+      cnx = (JobSubmissionProtocol)
+              RPC.getProxy(JobSubmissionProtocol.class,
+                      JobSubmissionProtocol.versionID,
+                      getAddress(conf),
+                      ugi,
+                      conf,
+                      NetUtils.getSocketFactory(conf,
+                              JobSubmissionProtocol.class));
+    }
+
+    /**
+     * Grab a handle to a job that is already known to the JobTracker.
+     *
+     * @return Profile of the job, or null if not found.
+     */
+    public JobProfile getJobProfile(org.apache.hadoop.mapred.JobID jobid)
+            throws IOException {
+      return cnx.getJobProfile(jobid);
+    }
+
+    /**
+     * Grab a handle to a job that is already known to the JobTracker.
+     *
+     * @return Status of the job, or null if not found.
+     */
+    public org.apache.hadoop.mapred.JobStatus getJobStatus(org.apache.hadoop.mapred.JobID jobid)
+            throws IOException {
+      return cnx.getJobStatus(jobid);
+    }
+
+
+    /**
+     * Kill a job.
+     */
+    public void killJob(org.apache.hadoop.mapred.JobID jobid)
+            throws IOException {
+      cnx.killJob(jobid);
+    }
+
+    /**
+     * Get all the jobs submitted.
+     */
+    public org.apache.hadoop.mapred.JobStatus[] getAllJobs()
+            throws IOException {
+      return cnx.getAllJobs();
+    }
+
+    /**
+     * Close the connection to the Job Tracker.
+     */
+    public void close() {
+      RPC.stopProxy(cnx);
+    }
+    private InetSocketAddress getAddress(Configuration conf) {
+      String jobTrackerStr = conf.get("mapred.job.tracker", "localhost:8012");
+      return NetUtils.createSocketAddr(jobTrackerStr);
+    }
+  }
+

Added: hive/trunk/shims/src/0.23/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.23/java/org/apache/hadoop/mapred/WebHCatJTShim23.java?rev=1518911&view=auto
==============================================================================
--- hive/trunk/shims/src/0.23/java/org/apache/hadoop/mapred/WebHCatJTShim23.java (added)
+++ hive/trunk/shims/src/0.23/java/org/apache/hadoop/mapred/WebHCatJTShim23.java Fri Aug 30 08:18:38 2013
@@ -0,0 +1,73 @@
+package org.apache.hadoop.mapred;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.shims.HadoopShims.WebHCatJTShim;
+
+import java.io.IOException;
+
+public class WebHCatJTShim23 implements WebHCatJTShim {
+  private JobClient jc;
+
+  /**
+   * Create a connection to the Job Tracker.
+   */
+  public WebHCatJTShim23(Configuration conf)
+          throws IOException {
+
+    jc = new JobClient(conf);
+  }
+
+  /**
+   * Grab a handle to a job that is already known to the JobTracker.
+   *
+   * @return Profile of the job, or null if not found.
+   */
+  public JobProfile getJobProfile(JobID jobid)
+          throws IOException {
+    RunningJob rj = jc.getJob(jobid);
+    JobStatus jobStatus = rj.getJobStatus();
+    JobProfile jobProfile = new JobProfile(jobStatus.getUsername(), jobStatus.getJobID(),
+            jobStatus.getJobFile(), jobStatus.getTrackingUrl(), jobStatus.getJobName());
+    return jobProfile;
+  }
+
+  /**
+   * Grab a handle to a job that is already known to the JobTracker.
+   *
+   * @return Status of the job, or null if not found.
+   */
+  public JobStatus getJobStatus(JobID jobid)
+          throws IOException {
+    RunningJob rj = jc.getJob(jobid);
+    JobStatus jobStatus = rj.getJobStatus();
+    return jobStatus;
+  }
+
+
+  /**
+   * Kill a job.
+   */
+  public void killJob(JobID jobid)
+          throws IOException {
+    RunningJob rj = jc.getJob(jobid);
+    rj.killJob();
+  }
+
+  /**
+   * Get all the jobs submitted.
+   */
+  public JobStatus[] getAllJobs()
+          throws IOException {
+    return jc.getAllJobs();
+  }
+
+  /**
+   * Close the connection to the Job Tracker.
+   */
+  public void close() {
+    try {
+      jc.close();
+    } catch (IOException e) {
+    }
+  }
+}