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

[trino-ignite] Ensure primary_key columns exist while creating table #16266

Merged
merged 2 commits into from
Mar 20, 2023
Merged

[trino-ignite] Ensure primary_key columns exist while creating table #16266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d1f2fa
Remove unreachable code from IgniteClient
sahoss Feb 27, 2023
ab3f364
Check primary_key exist during Ignite create table
sahoss Feb 25, 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
32 changes: 18 additions & 14 deletions plugin/trino-ignite/src/main/java/io/trino/plugin/ignite/IgniteClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
import static io.trino.plugin.jdbc.StandardColumnMappings.varcharReadFunction;
import static io.trino.plugin.jdbc.StandardColumnMappings.varcharWriteFunction;
import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
import static io.trino.spi.StandardErrorCode.INVALID_TABLE_PROPERTY;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
import static io.trino.spi.type.BigintType.BIGINT;
import static io.trino.spi.type.BooleanType.BOOLEAN;
Expand Down Expand Up @@ -366,51 +367,54 @@ public JdbcOutputTableHandle beginCreateTable(ConnectorSession session, Connecto

int expectedSize = tableMetadata.getColumns().size();
ImmutableList.Builder<String> columns = ImmutableList.builderWithExpectedSize(expectedSize);
ImmutableList.Builder<String> columnNames = ImmutableList.builderWithExpectedSize(expectedSize);
ImmutableList.Builder<String> columnNamesBuilder = ImmutableList.builderWithExpectedSize(expectedSize);
sahoss marked this conversation as resolved.
Show resolved Hide resolved
ImmutableList.Builder<Type> columnTypes = ImmutableList.builderWithExpectedSize(expectedSize);
for (ColumnMetadata columnMetadata : tableMetadata.getColumns()) {
columns.add(getColumnDefinitionSql(session, columnMetadata, columnMetadata.getName()));
columnNames.add(columnMetadata.getName());
columnNamesBuilder.add(columnMetadata.getName());
columnTypes.add(columnMetadata.getType());
}
String sql = buildCreateSql(schemaTableName, columns.build(), tableMetadata.getProperties());

List<String> columnNames = columnNamesBuilder.build();
List<String> primaryKeys = IgniteTableProperties.getPrimaryKey(tableMetadata.getProperties());

for (String primaryKey : primaryKeys) {
if (!columnNames.contains(primaryKey)) {
throw new TrinoException(INVALID_TABLE_PROPERTY,
format("Column '%s' specified in property '%s' doesn't exist in table", primaryKey, PRIMARY_KEY_PROPERTY));
}
}

ebyhr marked this conversation as resolved.
Show resolved Hide resolved
String sql = buildCreateSql(schemaTableName, columns.build(), primaryKeys);

try (Connection connection = connectionFactory.openConnection(session)) {
execute(session, connection, sql);

return new IgniteOutputTableHandle(
schemaTableName.getSchemaName(),
schemaTableName.getTableName(),
columnNames.build(),
columnNames,
columnTypes.build(),
Optional.empty(),
IgniteTableProperties.getPrimaryKey(tableMetadata.getProperties()).isEmpty() ? Optional.of(IGNITE_DUMMY_ID) : Optional.empty());
primaryKeys.isEmpty() ? Optional.of(IGNITE_DUMMY_ID) : Optional.empty());
}
catch (SQLException e) {
throw new TrinoException(JDBC_ERROR, e);
}
}

private String buildCreateSql(SchemaTableName schemaTableName, List<String> columns, Map<String, Object> tableProperties)
private String buildCreateSql(SchemaTableName schemaTableName, List<String> columns, List<String> primaryKeys)
{
ImmutableList.Builder<String> columnDefinitions = ImmutableList.builder();
columnDefinitions.addAll(columns);

List<String> primaryKeys = IgniteTableProperties.getPrimaryKey(tableProperties);
checkArgument(primaryKeys.size() < columns.size(), "Ignite table must have at least one non PRIMARY KEY column.");
if (primaryKeys.isEmpty()) {
columnDefinitions.add(quoted(IGNITE_DUMMY_ID) + " VARCHAR NOT NULL");
primaryKeys = ImmutableList.of(IGNITE_DUMMY_ID);
}
columnDefinitions.add("PRIMARY KEY (" + join(", ", primaryKeys.stream().map(this::quoted).collect(joining(", "))) + ")");

for (Map.Entry<String, Object> propertyEntry : tableProperties.entrySet()) {
ebyhr marked this conversation as resolved.
Show resolved Hide resolved
String propertyKey = propertyEntry.getKey();
if (!PRIMARY_KEY_PROPERTY.equalsIgnoreCase(propertyKey)) {
throw new UnsupportedOperationException("Not support table property " + propertyKey);
}
}

String remoteTableName = quoted(null, schemaTableName.getSchemaName(), schemaTableName.getTableName());
return format("CREATE TABLE %s (%s) ", remoteTableName, join(", ", columnDefinitions.build()));
}
Expand Down
15 changes: 15 additions & 0 deletions plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import static com.google.common.base.Strings.nullToEmpty;
import static io.trino.plugin.ignite.IgniteQueryRunner.createIgniteQueryRunner;
import static io.trino.testing.TestingNames.randomNameSuffix;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down Expand Up @@ -147,6 +148,20 @@ public void testCreateTableWithCommaPropertyColumn()
}
}

@Test
public void testCreateTableWithNonExistingPrimaryKey()
{
String tableName = "test_invalid_primary_key" + randomNameSuffix();
assertQueryFails("CREATE TABLE " + tableName + "(a bigint) WITH (primary_key = ARRAY['not_existing_column'])",
"Column 'not_existing_column' specified in property 'primary_key' doesn't exist in table");

assertQueryFails("CREATE TABLE " + tableName + "(a bigint) WITH (primary_key = ARRAY['dummy_id'])",
"Column 'dummy_id' specified in property 'primary_key' doesn't exist in table");

assertQueryFails("CREATE TABLE " + tableName + "(a bigint) WITH (primary_key = ARRAY['A'])",
"Column 'A' specified in property 'primary_key' doesn't exist in table");
}
ebyhr marked this conversation as resolved.
Show resolved Hide resolved

@Test
public void testCreateTableWithAllProperties()
{
Expand Down