Skip to content
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.

Sign up for GitHub

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

Take into account existing metadata location in CREATE OR REPLACE TABLE #24588

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Take into account existing metadata location in CREATE OR REPLACE TABLE #24588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import io.trino.spi.TrinoException;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.SchemaTableName;
import io.trino.spi.connector.TableNotFoundException;
import jakarta.annotation.Nullable;
import org.apache.iceberg.TableMetadata;
import org.apache.iceberg.TableMetadataParser;
Expand Down Expand Up @@ -135,10 +136,18 @@ public TableMetadata refresh()
public TableMetadata refresh(boolean invalidateCaches)
{
if (location.isPresent()) {
refreshFromMetadataLocation(null);
try {
String newLocation = fixBrokenMetadataLocation(getRefreshedLocation(invalidateCaches));
refreshFromMetadataLocation(newLocation);
return currentMetadata;
}
catch (TableNotFoundException e) {
refreshFromMetadataLocation(null);
}
return currentMetadata;
}
refreshFromMetadataLocation(fixBrokenMetadataLocation(getRefreshedLocation(invalidateCaches)));
String newLocation = fixBrokenMetadataLocation(getRefreshedLocation(invalidateCaches));
refreshFromMetadataLocation(newLocation);
return currentMetadata;
}

Expand Down
47 changes: 47 additions & 0 deletions plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import io.airlift.concurrent.MoreFutures;
import io.airlift.log.Level;
import io.airlift.log.Logging;
import io.airlift.units.DataSize;
import io.airlift.units.Duration;
import io.trino.Session;
Expand Down Expand Up @@ -90,6 +93,9 @@
import java.util.Optional;
import java.util.OptionalInt;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -155,6 +161,7 @@
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static java.util.UUID.randomUUID;
import static java.util.concurrent.Executors.newFixedThreadPool;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
Expand Down Expand Up @@ -7095,6 +7102,46 @@ public void testCreateOrReplaceTableWithChangeInLocation()
}
}

@Test
public void testConcurrentCreateReplaceAndInserts()
throws Exception
{
Logging logging = Logging.initialize();
logging.setLevel("io.trino.event.QueryMonitor", Level.DEBUG);
int threads = 2;
CyclicBarrier barrier = new CyclicBarrier(threads);
ExecutorService executor = newFixedThreadPool(threads);
String tableName = "test_concurrent_update_and_inserts_table_" + randomNameSuffix();

assertUpdate("CREATE TABLE " + tableName + " (a) AS VALUES 1", 1);
assertUpdate("CREATE TABLE sourceTable AS select a, b, rand() as r from UNNEST(SEQUENCE(1, 9001), SEQUENCE(1, 9001)) AS t(a, b)", 9001);

try {
// Replace the table while concurrently adding new blind inserts
executor.invokeAll(ImmutableList.<Callable<Void>>builder()
.add(() -> {
barrier.await(10, SECONDS);
assertUpdate("CREATE OR REPLACE TABLE " + tableName + " AS SELECT a FROM sourceTable", 9001);
return null;
})
.add(() -> {
barrier.await(10, SECONDS);
getQueryRunner().execute("INSERT INTO " + tableName + " VALUES (2)");
return null;
})
.build())
.forEach(MoreFutures::getDone);

// TODO: validate query results
}
finally {
assertUpdate("DROP TABLE " + tableName);
assertUpdate("DROP TABLE sourceTable");
executor.shutdownNow();
assertThat(executor.awaitTermination(10, SECONDS)).isTrue();
}
}

@Test
public void testMergeSimpleSelectPartitioned()
{
Expand Down
Loading