-
Notifications
You must be signed in to change notification settings - Fork 4.8k
HIVE-30056: Iceberg: Add client side support for REST catalog server-side scan planning #6789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
difin
wants to merge
1
commit into
apache:master
Choose a base branch
from
difin:file_planning
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
...-handler/src/test/java/org/apache/iceberg/rest/TestHiveIcebergServerSideScanPlanning.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| * 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 java.nio.file.Path; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hive.conf.HiveConf; | ||
| import org.apache.hadoop.hive.metastore.conf.MetastoreConf; | ||
| import org.apache.iceberg.BaseTable; | ||
| import org.apache.iceberg.CatalogUtil; | ||
| import org.apache.iceberg.PartitionSpec; | ||
| import org.apache.iceberg.Schema; | ||
| import org.apache.iceberg.SerializableTable; | ||
| import org.apache.iceberg.Table; | ||
| import org.apache.iceberg.hadoop.HadoopTables; | ||
| import org.apache.iceberg.hive.IcebergCatalogProperties; | ||
| import org.apache.iceberg.hive.rest.catalog.RestCatalogScanPlanning; | ||
| import org.apache.iceberg.mr.InputFormatConfig; | ||
| import org.apache.iceberg.mr.hive.HiveTableUtil; | ||
| import org.apache.iceberg.types.Types; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.io.TempDir; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** | ||
| * Unit tests for Hive server-side REST catalog scan planning via | ||
| * {@link HiveTableUtil#resolveTableForScanPlanning}. Embedded REST server coverage is in | ||
| * {@code TestHiveIcebergServerSideScanPlanningServerIT} in {@code itests/hive-iceberg-rest-server}. | ||
| */ | ||
| class TestHiveIcebergServerSideScanPlanning { | ||
|
|
||
| private static final String CATALOG_NAME = "ice01"; | ||
| private static final Schema SCHEMA = | ||
| new Schema(Types.NestedField.required(1, "id", Types.LongType.get())); | ||
|
|
||
| @TempDir | ||
| private Path warehouse; | ||
|
|
||
| /** | ||
| * Negative path: do not reload from the REST catalog unless {@code scan-planning-mode=server}. | ||
| * Even with a REST catalog and a serialized table in the job conf, split generation should keep | ||
| * using the snapshot ({@link SerializableTable}) when server mode is off. | ||
| */ | ||
| @Test | ||
| void usesDeserializedTableWhenServerModeDisabled() { | ||
| Table table = new HadoopTables().create(SCHEMA, PartitionSpec.unpartitioned(), warehouse.toString()); | ||
| Configuration conf = buildTableConf(table, false); | ||
|
|
||
| Table resolved = HiveTableUtil.resolveTableForScanPlanning(conf, table.name()); | ||
| assertThat(resolved).isInstanceOf(SerializableTable.class); | ||
| } | ||
|
|
||
| /** | ||
| * Negative path: intra-transaction read-after-write must not reload from the catalog even when | ||
| * server mode is enabled. {@link InputFormatConfig#TABLE_METADATA_LOCATION} points at uncommitted | ||
| * metadata that only exists in the job conf; reloading from the REST catalog would return stale | ||
| * committed state and break same-txn visibility (e.g. INSERT then SELECT). | ||
| */ | ||
| @Test | ||
| void usesDeserializedTableForIntraTxnMetadataEvenInServerMode() { | ||
| Table table = new HadoopTables().create(SCHEMA, PartitionSpec.unpartitioned(), warehouse.toString()); | ||
| Configuration conf = buildTableConf(table, true); | ||
| conf.set(InputFormatConfig.TABLE_METADATA_LOCATION, warehouse + "/metadata/snapshot.metadata.json"); | ||
|
|
||
| Table resolved = HiveTableUtil.resolveTableForScanPlanning(conf, table.name()); | ||
| assertThat(resolved).isInstanceOf(BaseTable.class); | ||
| } | ||
|
|
||
| private Configuration buildTableConf(Table table, boolean serverMode) { | ||
| Configuration conf = new Configuration(); | ||
| MetastoreConf.setVar(conf, MetastoreConf.ConfVars.CATALOG_DEFAULT, CATALOG_NAME); | ||
| conf.set(InputFormatConfig.TABLE_IDENTIFIER, table.name()); | ||
| conf.set(InputFormatConfig.TABLE_LOCATION, warehouse.toString()); | ||
| conf.set(InputFormatConfig.CATALOG_NAME, CATALOG_NAME); | ||
| conf.set( | ||
| IcebergCatalogProperties.catalogPropertyConfigKey(CATALOG_NAME, CatalogUtil.ICEBERG_CATALOG_TYPE), | ||
| CatalogUtil.ICEBERG_CATALOG_TYPE_REST); | ||
| if (serverMode) { | ||
| RestCatalogScanPlanning.setScanPlanningMode(conf, CATALOG_NAME, "server"); | ||
| HiveConf.setBoolVar( | ||
| conf, HiveConf.ConfVars.HIVE_ICEBERG_REST_SERVER_SIDE_SCAN_PLANNING_ENABLED, true); | ||
| } | ||
| conf.set( | ||
| InputFormatConfig.SERIALIZED_TABLE_PREFIX + table.name(), | ||
| HiveTableUtil.serializeTable(table, conf, null, null)); | ||
| return conf; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this will create a new RestCatalog Object/HttpClient on every call, curious if this can cause any connection leak?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes -
Catalogs.loadTablecreates a new REST catalog (and HTTP client) on each call, and we don’t close it on this path today. That’s the same pattern as otherCatalogs.loadTableusages in the handler. Here it runs once pergetSplitsduring split planning, not per input split. A reload only happens whenshouldReloadForServerSideScanPlanningis true.