hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hive git commit: HIVE-15622 : Remove HWI component from Hive, Addendum (Wei Zheng, reviewed by Eugene Koifman)
Date Sat, 21 Jan 2017 21:41:20 GMT
Repository: hive
Updated Branches:
  refs/heads/master 71a4a490f -> c53c63829


HIVE-15622 : Remove HWI component from Hive, Addendum (Wei Zheng, reviewed by Eugene Koifman)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c53c6382
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c53c6382
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c53c6382

Branch: refs/heads/master
Commit: c53c638291fa0b955619fcf4a8fc26b77ca07801
Parents: 71a4a49
Author: Wei Zheng <weiz@apache.org>
Authored: Sat Jan 21 13:41:30 2017 -0800
Committer: Wei Zheng <weiz@apache.org>
Committed: Sat Jan 21 13:41:30 2017 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hive/shims/Jetty23Shims.java  | 56 --------------------
 .../apache/hadoop/hive/shims/ShimLoader.java    | 22 --------
 2 files changed, 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/c53c6382/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Jetty23Shims.java
----------------------------------------------------------------------
diff --git a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Jetty23Shims.java b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Jetty23Shims.java
deleted file mode 100644
index 9328749..0000000
--- a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Jetty23Shims.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hive.shims;
-
-import java.io.IOException;
-
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.handler.RequestLogHandler;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-/**
- * Jetty23Shims.
- *
- */
-public class Jetty23Shims implements JettyShims {
-  public Server startServer(String listen, int port) throws IOException {
-    Server s = new Server();
-    s.setupListenerHostPort(listen, port);
-    return s;
-  }
-
-  private static class Server extends org.mortbay.jetty.Server implements JettyShims.Server
{
-    public void addWar(String war, String contextPath) {
-      WebAppContext wac = new WebAppContext();
-      wac.setContextPath(contextPath);
-      wac.setWar(war);
-      RequestLogHandler rlh = new RequestLogHandler();
-      rlh.setHandler(wac);
-      this.addHandler(rlh);
-    }
-
-    public void setupListenerHostPort(String listen, int port)
-        throws IOException {
-
-      SocketConnector connector = new SocketConnector();
-      connector.setPort(port);
-      connector.setHost(listen);
-      this.addConnector(connector);
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/c53c6382/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java
----------------------------------------------------------------------
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java b/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java
index f712c3c..0e27851 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java
@@ -51,17 +51,6 @@ public abstract class ShimLoader {
   }
 
   /**
-   * The names of the classes for shimming Jetty for each major version of
-   * Hadoop.
-   */
-  private static final HashMap<String, String> JETTY_SHIM_CLASSES =
-      new HashMap<String, String>();
-
-  static {
-    JETTY_SHIM_CLASSES.put(HADOOP23VERSIONNAME, "org.apache.hadoop.hive.shims.Jetty23Shims");
-  }
-
-  /**
    * The names of the classes for shimming Hadoop's event counter
    */
   private static final HashMap<String, String> EVENT_COUNTER_SHIM_CLASSES =
@@ -107,17 +96,6 @@ public abstract class ShimLoader {
     return hadoopShims;
   }
 
-  /**
-   * Factory method to get an instance of JettyShims based on the version
-   * of Hadoop on the classpath.
-   */
-  public static synchronized JettyShims getJettyShims() {
-    if (jettyShims == null) {
-      jettyShims = loadShims(JETTY_SHIM_CLASSES, JettyShims.class);
-    }
-    return jettyShims;
-  }
-
   public static synchronized AppenderSkeleton getEventCounter() {
     if (eventCounter == null) {
       eventCounter = loadShims(EVENT_COUNTER_SHIM_CLASSES, AppenderSkeleton.class);


Mime
View raw message