aturoczy commented on code in PR #5060: URL: https://github.com/apache/hive/pull/5060#discussion_r1478734254
########## hms-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogServer.java: ########## @@ -0,0 +1,145 @@ +/* + * 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.iceberg.rest; + +import org.apache.hadoop.conf.Configurable; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.SecureServletCaller; +import org.apache.hadoop.hive.metastore.ServletSecurity; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.hive.HiveCatalog; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.gzip.GzipHandler; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServlet; +import java.io.IOException; +import java.lang.ref.Reference; +import java.lang.ref.SoftReference; +import java.util.Collections; +import java.util.Map; +import java.util.TreeMap; + +public class HMSCatalogServer { + private static final Logger LOG = LoggerFactory.getLogger(HMSCatalogServer.class); + private static Reference<Catalog> catalogRef; + static Catalog getLastCatalog() { + return catalogRef != null? catalogRef.get() : null; + } + + private HMSCatalogServer() { + // nothing + } + + public static HttpServlet createServlet(SecureServletCaller security, Catalog catalog) throws IOException { Review Comment: Why are these servers are static? Maybe it has some meaning in Java, but in .NET it was an anti-pattern in server-side world. ########## hms-catalog/src/test/resources/auth/jwt/jwt-authorized-key.json: ########## @@ -0,0 +1,12 @@ +{ Review Comment: Why does this key file belong to the repository? It seems like sensitive keys. Or is this needed for the testing? ########## standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java: ########## @@ -732,10 +756,25 @@ public static void startMetaStore(int port, HadoopThriftAuthBridge bridge, } // optionally create and start the property server and servlet propertyServer = PropertyServlet.startServer(conf); + // optionally create and start the Iceberg REST server and servlet + icebergServer = startIcebergCatalog(conf); thriftServer.start(); } + static Server startIcebergCatalog(Configuration configuration) { + try { + Class<?> iceClazz = Class.forName("org.apache.iceberg.rest.HMSCatalogServer"); + Method iceStart = iceClazz.getMethod("startServer", Configuration.class); + return (Server) iceStart.invoke(null, configuration); + } catch (ClassNotFoundException xnf) { + return null; + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + LOG.error("error starting Iceberg REST server {}", e); Review Comment: Error: Unable to start Iceberg REST Catalog server. (Iceberg not the best in naming) ########## hms-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogServer.java: ########## @@ -0,0 +1,145 @@ +/* + * 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.iceberg.rest; + +import org.apache.hadoop.conf.Configurable; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.SecureServletCaller; +import org.apache.hadoop.hive.metastore.ServletSecurity; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.hive.HiveCatalog; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.gzip.GzipHandler; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServlet; +import java.io.IOException; +import java.lang.ref.Reference; +import java.lang.ref.SoftReference; +import java.util.Collections; +import java.util.Map; +import java.util.TreeMap; + +public class HMSCatalogServer { + private static final Logger LOG = LoggerFactory.getLogger(HMSCatalogServer.class); + private static Reference<Catalog> catalogRef; + static Catalog getLastCatalog() { + return catalogRef != null? catalogRef.get() : null; + } + + private HMSCatalogServer() { + // nothing + } + + public static HttpServlet createServlet(SecureServletCaller security, Catalog catalog) throws IOException { + try (HMSCatalogAdapter adapter = new HMSCatalogAdapter(catalog)) { + return new HMSCatalogServlet(security, adapter); + } + } + + public static Catalog createCatalog(Configuration configuration) { + final String clazz = MetastoreConf.getVar(configuration, MetastoreConf.ConfVars.CATALOG_CLASS); + final Catalog catalog; + final String name; + String curi = configuration.get(MetastoreConf.ConfVars.THRIFT_URIS.getVarname()); + String cwarehouse = configuration.get(MetastoreConf.ConfVars.WAREHOUSE.getVarname()); + String cextwarehouse = configuration.get(MetastoreConf.ConfVars.WAREHOUSE_EXTERNAL.getVarname()); + if ("HMSCatalog".equals(clazz)) { + name = "hms"; + catalog = new HMSCatalog(configuration); + } else { + name = "hive"; + catalog = new org.apache.iceberg.hive.HiveCatalog(); + if (catalog instanceof Configurable) { + ((HiveCatalog) catalog).setConf(configuration); + } + } + Map<String, String> properties; + properties = new TreeMap<>(); + if (curi != null) { + properties.put("uri", curi); + } + if (cwarehouse != null) { + properties.put("warehouse", cwarehouse); + } + if (cextwarehouse != null) { + properties.put("external-warehouse", cextwarehouse); + } + catalog.initialize(name, properties); + return catalog; + } + + public static HttpServlet createServlet(Configuration configuration, Catalog catalog) throws IOException { + String auth = MetastoreConf.getVar(configuration, MetastoreConf.ConfVars.CATALOG_SERVLET_AUTH); + boolean jwt = "jwt".equalsIgnoreCase(auth); + SecureServletCaller security = new ServletSecurity(configuration, jwt); + Catalog actualCatalog = catalog; + if (actualCatalog == null) { + actualCatalog = createCatalog(configuration); + actualCatalog.initialize("hive", Collections.emptyMap()); + } + catalogRef = new SoftReference<>(actualCatalog); + return createServlet(security, actualCatalog); + } + + /** + * Convenience method to start a http server that only serves this servlet. + * @param conf the configuration + * @return the server instance + * @throws Exception if servlet initialization fails + */ + + public static Server startServer(Configuration conf, HMSCatalog catalog) throws Exception { + int port = MetastoreConf.getIntVar(conf, MetastoreConf.ConfVars.CATALOG_SERVLET_PORT); + if (port < 0) { + return null; Review Comment: It should be an exception imho. ########## hms-catalog/src/main/java/org/apache/iceberg/rest/LocationUtil.java: ########## @@ -0,0 +1,37 @@ +/* + * 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.iceberg.rest; + +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +public class LocationUtil { + private LocationUtil() { + } + + public static String stripTrailingSlash(String path) { + Preconditions.checkArgument(path != null && path.length() > 0, "path must not be null or empty"); Review Comment: Big + for Preconditions check. I only see few times when somebody check the parameter accordingly ########## standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PropertyServlet.java: ########## @@ -359,14 +372,34 @@ public static Server startServer(Configuration conf) throws Exception { ServletHandler handler = new ServletHandler(); server.setHandler(handler); ServletHolder holder = handler.newServletHolder(Source.EMBEDDED); - holder.setServlet(new PropertyServlet(conf)); // - handler.addServletWithMapping(holder, "/"+cli+"/*"); + holder.setServlet(servlet); // + handler.addServletWithMapping(holder, "/"+path+"/*"); server.start(); if (!server.isStarted()) { - LOGGER.error("unable to start property-maps servlet server, path {}, port {}", cli, port); + LOGGER.error("unable to start property-maps servlet server, path {}, port {}", path, port); } else { LOGGER.info("started property-maps servlet server on {}", server.getURI()); } return server; } + + /* + public static void main(String[] args) throws Exception { + HttpServlet servlet = createServlet(null); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); + context.setContextPath("/"); + ServletHolder servletHolder = new ServletHolder(servlet); + servletHolder.setInitParameter("javax.ws.rs.Application", "ServiceListPublic"); + context.addServlet(servletHolder, "/*"); + context.setVirtualHosts(null); + context.setGzipHandler(new GzipHandler()); + + Server httpServer = + new Server(PropertyUtil.propertyAsInt(System.getenv(), "REST_PORT", 8181)); Review Comment: 8181 is a pretty generic port. It could cause port conflict. ########## hms-catalog/src/main/java/org/apache/iceberg/rest/LocationUtil.java: ########## @@ -0,0 +1,37 @@ +/* + * 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.iceberg.rest; + +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +public class LocationUtil { + private LocationUtil() { + } + + public static String stripTrailingSlash(String path) { + Preconditions.checkArgument(path != null && path.length() > 0, "path must not be null or empty"); + + String result; + for(result = path; result.endsWith("/"); result = result.substring(0, result.length() - 1)) { Review Comment: IMHO it is too compact to read it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org For additional commands, e-mail: gitbox-h...@hive.apache.org
