Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[PIXELS-437] update metadata service. #71

Merged
merged 8 commits into from
Jun 12, 2023
Merged

[PIXELS-437] update metadata service. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4101c12
sync.
bianhq Jun 11, 2023
38e6a86
refine.
bianhq Jun 11, 2023
c3bb4f2
update create table.
bianhq Jun 11, 2023
6ac72e1
update create table.
bianhq Jun 11, 2023
52ecea0
sync.
bianhq Jun 11, 2023
fcd9782
update create table.
bianhq Jun 11, 2023
834c98d
sync.
bianhq Jun 11, 2023
67ac647
fix table properties.
bianhq Jun 12, 2023
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
48 changes: 40 additions & 8 deletions connector/src/main/java/io/pixelsdb/pixels/trino/PixelsMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
import static com.google.common.base.Verify.verify;
import static com.google.common.base.Verify.verifyNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.pixelsdb.pixels.trino.properties.PixelsTableProperties.PATHS;
import static io.pixelsdb.pixels.trino.properties.PixelsTableProperties.STORAGE;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;

Expand Down Expand Up @@ -306,12 +308,41 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
SchemaTableName schemaTableName = tableMetadata.getTable();
String schemaName = schemaTableName.getSchemaName();
String tableName = schemaTableName.getTableName();
String storageScheme = ((String) Optional.ofNullable(tableMetadata.getProperties().get("storage"))
.orElse("hdfs")).toLowerCase(); // use HDFS by default.
if (!Storage.Scheme.isValid(storageScheme))
String storage = (String) tableMetadata.getProperties().get(STORAGE);
String paths = (String) tableMetadata.getProperties().get(PATHS);
if (storage == null)
{
throw new TrinoException(PixelsErrorCode.PIXELS_METASTORE_ERROR,
"Unsupported storage scheme '" + storageScheme + "'.");
throw new TrinoException(PixelsErrorCode.PIXELS_QUERY_PARSING_ERROR,
"Table must be created with the property 'storage'.");
}
if (paths == null)
{
throw new TrinoException(PixelsErrorCode.PIXELS_QUERY_PARSING_ERROR,
"Table must be created with the property 'paths'.");
}
if (!Storage.Scheme.isValid(storage))
{
throw new TrinoException(PixelsErrorCode.PIXELS_QUERY_PARSING_ERROR,
"Unsupported storage scheme '" + storage + "'.");
}
Storage.Scheme storageScheme = Storage.Scheme.from(storage);
String[] basePathUris = paths.split(";");
for (int i = 0; i < basePathUris.length; ++i)
{
Storage.Scheme scheme = Storage.Scheme.fromPath(basePathUris[i]);
if (scheme == null)
{
basePathUris[i] = storageScheme + "://" + basePathUris[i];
}
if (scheme != storageScheme)
{
throw new TrinoException(PixelsErrorCode.PIXELS_QUERY_PARSING_ERROR,
"The storage schemes in 'paths' are inconsistent with 'storage'.");
}
if (!basePathUris[i].endsWith("/"))
{
basePathUris[i] = basePathUris[i] + "/";
}
}
List<Column> columns = new ArrayList<>();
for (ColumnMetadata columnMetadata : tableMetadata.getColumns())
Expand All @@ -327,8 +358,9 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe
}
try
{
boolean res = this.metadataProxy.createTable(schemaName, tableName, storageScheme, columns);
if (res == false && ignoreExisting == false)
boolean res = this.metadataProxy.createTable(schemaName, tableName, storageScheme,
Arrays.asList(basePathUris), columns);
if (!res && !ignoreExisting)
{
throw new TrinoException(PixelsErrorCode.PIXELS_SQL_EXECUTE_ERROR,
"Table '" + schemaTableName + "' might already exist, failed to create it.");
Expand All @@ -349,7 +381,7 @@ public void dropTable(ConnectorSession session, ConnectorTableHandle tableHandle
try
{
boolean res = this.metadataProxy.dropTable(schemaName, tableName);
if (res == false)
if (!res)
{
throw new TrinoException(PixelsErrorCode.PIXELS_SQL_EXECUTE_ERROR,
"Table " + schemaName + "." + tableName + " does not exist.");
Expand Down
Loading