-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Ignore internal TableAlreadyExistsException in Iceberg #19650
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
Merged
ebyhr
merged 3 commits into
trinodb:master
from
pajaks:pajaks/iceberg_create_table_retry
Nov 14, 2023
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
155 changes: 155 additions & 0 deletions
155
...no-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergCreateTableInternalRetry.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,155 @@ | ||
| /* | ||
| * Licensed 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 io.trino.plugin.iceberg; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import io.trino.Session; | ||
| import io.trino.plugin.hive.NodeVersion; | ||
| import io.trino.plugin.hive.TableAlreadyExistsException; | ||
| import io.trino.plugin.hive.metastore.HiveMetastore; | ||
| import io.trino.plugin.hive.metastore.HiveMetastoreConfig; | ||
| import io.trino.plugin.hive.metastore.PrincipalPrivileges; | ||
| import io.trino.plugin.hive.metastore.Table; | ||
| import io.trino.plugin.hive.metastore.file.FileHiveMetastore; | ||
| import io.trino.plugin.hive.metastore.file.FileHiveMetastoreConfig; | ||
| import io.trino.plugin.iceberg.catalog.file.TestingIcebergFileMetastoreCatalogModule; | ||
| import io.trino.testing.AbstractTestQueryFramework; | ||
| import io.trino.testing.DistributedQueryRunner; | ||
| import io.trino.testing.QueryRunner; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.TestInstance; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.Optional; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import static com.google.common.base.Verify.verify; | ||
| import static com.google.common.io.MoreFiles.deleteRecursively; | ||
| import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; | ||
| import static com.google.inject.util.Modules.EMPTY_MODULE; | ||
| import static io.trino.plugin.hive.HiveMetadata.PRESTO_QUERY_ID_NAME; | ||
| import static io.trino.plugin.hive.HiveTestUtils.HDFS_FILE_SYSTEM_FACTORY; | ||
| import static io.trino.plugin.iceberg.IcebergQueryRunner.ICEBERG_CATALOG; | ||
| import static io.trino.testing.TestingSession.testSessionBuilder; | ||
| import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; | ||
|
|
||
| @TestInstance(PER_CLASS) | ||
| public class TestIcebergCreateTableInternalRetry | ||
| extends AbstractTestQueryFramework | ||
| { | ||
| private static final String SCHEMA_NAME = "iceberg_internal_retry_schema"; | ||
| private File metastoreDir; | ||
|
|
||
| @Override | ||
| protected QueryRunner createQueryRunner() | ||
| throws Exception | ||
| { | ||
| Session session = testSessionBuilder() | ||
| .setCatalog(ICEBERG_CATALOG) | ||
| .setSchema(SCHEMA_NAME) | ||
| .build(); | ||
| DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).build(); | ||
| metastoreDir = queryRunner.getCoordinator().getBaseDataDir().resolve("test_iceberg_table_smoke_test").toFile(); | ||
| this.metastoreDir.deleteOnExit(); | ||
| HiveMetastore metastore = new FileHiveMetastore( | ||
| new NodeVersion("testversion"), | ||
| HDFS_FILE_SYSTEM_FACTORY, | ||
| new HiveMetastoreConfig().isHideDeltaLakeTables(), | ||
| new FileHiveMetastoreConfig() | ||
| .setCatalogDirectory(metastoreDir.toURI().toString()) | ||
| .setMetastoreUser("test")) | ||
| { | ||
| @Override | ||
| public synchronized void createTable(Table table, PrincipalPrivileges principalPrivileges) | ||
| { | ||
| if (table.getTableName().startsWith("test_different_session")) { | ||
| // By modifying query id test simulates that table was created from different session. | ||
| table = Table.builder(table) | ||
| .setParameters(ImmutableMap.of(PRESTO_QUERY_ID_NAME, "new_query_id")) | ||
| .build(); | ||
| } | ||
| // Simulate retry mechanism with timeout failure of ThriftHiveMetastore. | ||
| // 1. createTable correctly create table but timeout is triggered | ||
| // 2. Retry to createTable throws TableAlreadyExistsException | ||
| super.createTable(table, principalPrivileges); | ||
| throw new TableAlreadyExistsException(table.getSchemaTableName()); | ||
| } | ||
| }; | ||
|
|
||
| queryRunner.installPlugin(new TestingIcebergPlugin(Optional.of(new TestingIcebergFileMetastoreCatalogModule(metastore)), Optional.empty(), EMPTY_MODULE)); | ||
| queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", ImmutableMap.of("iceberg.register-table-procedure.enabled", "true")); | ||
| queryRunner.execute("CREATE SCHEMA " + SCHEMA_NAME); | ||
| return queryRunner; | ||
| } | ||
|
|
||
| @AfterAll | ||
| public void tearDown() | ||
| throws IOException | ||
| { | ||
| deleteRecursively(metastoreDir.toPath(), ALLOW_INSECURE); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCreateTableInternalRetry() | ||
| { | ||
| assertQuerySucceeds("CREATE TABLE test_ct_internal_retry(a int)"); | ||
| assertQuery("SHOW TABLES LIKE 'test_ct_internal_retry'", "VALUES 'test_ct_internal_retry'"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCreateTableAsSelectInternalRetry() | ||
| { | ||
| assertQuerySucceeds("CREATE TABLE test_ctas_internal_retry AS SELECT 1 a"); | ||
| assertQuery("SHOW TABLES LIKE 'test_ctas_internal_retry'", "VALUES 'test_ctas_internal_retry'"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRegisterTableInternalRetry() | ||
pajaks marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| { | ||
| assertQuerySucceeds("CREATE TABLE test_register_table_internal_retry AS SELECT 1 a"); | ||
| String tableLocation = getTableLocation("test_register_table_internal_retry"); | ||
| assertUpdate("CALL system.unregister_table(current_schema, 'test_register_table_internal_retry')"); | ||
|
|
||
| assertQuerySucceeds("CALL system.register_table(current_schema, 'test_register_table_internal_retry', '" + tableLocation + "')"); | ||
| assertQuery("SHOW TABLES LIKE 'test_register_table_internal_retry'", "VALUES 'test_register_table_internal_retry'"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRegisterTableFailureWithDifferentSession() | ||
| { | ||
| assertQuerySucceeds("CREATE TABLE test_register_table_failure AS SELECT 1 a"); | ||
| String tableLocation = getTableLocation("test_register_table_failure"); | ||
| assertUpdate("CALL system.unregister_table(current_schema, 'test_register_table_failure')"); | ||
|
|
||
| assertQueryFails( | ||
| "CALL system.register_table(current_schema, 'test_different_session_register_table_failure', '" + tableLocation + "')", | ||
| "Table already exists: .*"); | ||
| assertQuery("SHOW TABLES LIKE 'test_different_session_register_table_failure'", "VALUES 'test_different_session_register_table_failure'"); | ||
| } | ||
|
|
||
| private String getTableLocation(String tableName) | ||
| { | ||
| Pattern locationPattern = Pattern.compile(".*location = '(.*?)'.*", Pattern.DOTALL); | ||
| Matcher m = locationPattern.matcher((String) computeActual("SHOW CREATE TABLE " + tableName).getOnlyValue()); | ||
| if (m.find()) { | ||
| String location = m.group(1); | ||
| verify(!m.find(), "Unexpected second match"); | ||
| return location; | ||
| } | ||
| throw new IllegalStateException("Location not found in SHOW CREATE TABLE result"); | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.