difin commented on code in PR #6789: URL: https://github.com/apache/hive/pull/6789#discussion_r4340650201
########## iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/RestCatalogScanPlanningUtil.java: ########## @@ -0,0 +1,219 @@ +/* + * 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.mr.hive; + +import java.util.Locale; +import java.util.Map; +import java.util.function.BiConsumer; +import org.apache.commons.lang3.StringUtils; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.apache.hadoop.hive.ql.plan.TableDesc; +import org.apache.iceberg.CatalogUtil; +import org.apache.iceberg.hive.IcebergCatalogProperties; +import org.apache.iceberg.mr.InputFormatConfig; +import org.apache.iceberg.rest.RESTCatalogProperties; + +/** + * Utilities for Iceberg REST catalog server-side scan planning configuration. + * + * <p>When a REST catalog server advertises the scan-planning endpoints and + * {@link RESTCatalogProperties#SCAN_PLANNING_MODE} is set to + * {@link RESTCatalogProperties.ScanPlanningMode#SERVER}, Iceberg's {@code RESTSessionCatalog} returns a + * {@code RESTTable} that delegates {@code planTasks()} to the server. Hive's + * {@code IcebergInputFormat} calls {@code scan.planTasks()} via + * {@code IcebergInputFormat#getSplits}, which reloads a live REST catalog table for {@code POST /plan} + * (pinned to the serialized compile-time snapshot). The catalog decides the scan planning mode; + * {@link HiveConf.ConfVars#HIVE_ICEBERG_REST_SERVER_SIDE_SCAN_PLANNING_ENABLED} only controls whether + * Hive is allowed to follow it. + * + * <p>Tests: {@code TestRestCatalogScanPlanningUtil} in {@code iceberg-handler}; + * {@code TestHiveIcebergServerSideScanPlanning} in {@code iceberg-handler}; embedded REST server + * tests {@code TestRestCatalogScanPlanningServerIT} and {@code TestHiveIcebergServerSideScanPlanningServerIT} + * in {@code itests/hive-iceberg-rest-server}. + * + * <p>{@link #setScanPlanningMode(Configuration, String, String)} and + * {@link #getScanPlanningMode(Configuration, String)} are public so tests in other Maven modules + * (for example {@code itests/hive-iceberg-rest-server}) can configure scan planning; those modules + * compile against this artifact as a JAR and cannot call package-private members. They are not + * intended as a general operator or application API. + * + * @see <a href="https://iceberg.apache.org/docs/latest/catalog-properties/";>REST catalog properties</a> + */ +public final class RestCatalogScanPlanningUtil { + + private RestCatalogScanPlanningUtil() { + } + + public static void setScanPlanningMode(Configuration conf, String catalogName, String mode) { + conf.set( + IcebergCatalogProperties.catalogPropertyConfigKey( + catalogName, RESTCatalogProperties.SCAN_PLANNING_MODE), + RESTCatalogProperties.ScanPlanningMode.fromString(mode).modeName()); + } + + public static RESTCatalogProperties.ScanPlanningMode getScanPlanningMode( Review Comment: Done. The marker is now set in `overlayTableProperties` from the table Iceberg loaded (a `RESTTable`, checked by class name, gated by the kill switch), so a server-required mode is followed even when the client property is unset. It's keyed per table (`iceberg.mr.server-side-scan-planning.<table>`) even though it's in per-table job properties, because `HiveInputFormat.getSplits` and `FetchOperator` reuse one conf across tables, so an unkeyed flag would leak to the next table. configureJobConf no longer writes the marker. Job secrets now ship catalog properties for any REST catalog with the kill switch on, since the server decides the mode per table. Added ITs for a server-decided mode with no client property, and for the kill switch overriding 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
