Skip to content

Commit

Permalink
Improvement: Add jdbc capabilities for creating and dropping table
Browse files Browse the repository at this point in the history
  • Loading branch information
@zivali @mchades
zivali authored and mchades committed Jun 18, 2024
1 parent b9c7095 commit 3e59aff
Show file tree
Hide file tree
Showing 5 changed files with 365 additions and 4 deletions.
113 changes: 113 additions & 0 deletions ...src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.datastrato.gravitino.rel.expressions.NamedReference;
import com.datastrato.gravitino.rel.expressions.distributions.Distribution;
import com.datastrato.gravitino.rel.expressions.distributions.Distributions;
import com.datastrato.gravitino.rel.expressions.sorts.SortOrder;
import com.datastrato.gravitino.rel.expressions.transforms.Transforms;
import com.datastrato.gravitino.rel.indexes.Index;
import com.datastrato.gravitino.rel.indexes.Indexes;
Expand Down Expand Up @@ -363,6 +364,118 @@ void testDorisTableBasicOperation() {
newTableName, table_comment, Arrays.asList(columns), properties, indexes, renamedTable);
}

@Test
void testDorisIllegalTableName() {
Map<String, String> properties = createTableProperties();
TableCatalog tableCatalog = catalog.asTableCatalog();
String table_name = "t123";

String t1_name = table_name + "`; DROP TABLE important_table; -- ";
Column t1_col = Column.of(t1_name, Types.LongType.get(), "id", false, false, null);
Column[] columns = {t1_col};
Index[] t1_indexes = {Indexes.unique("u1_key", new String[][] {{t1_name}})};
NameIdentifier tableIdentifier =
NameIdentifier.of(metalakeName, catalogName, schemaName, t1_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier,
columns,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t1_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier);
});

String t2_name = table_name + "`; SLEEP(10); -- ";
Column t2_col = Column.of(t2_name, Types.LongType.get(), "id", false, false, null);
Index[] t2_indexes = {Indexes.unique("u2_key", new String[][] {{t2_name}})};
Column[] columns2 = new Column[] {t2_col};
NameIdentifier tableIdentifier2 =
NameIdentifier.of(metalakeName, catalogName, schemaName, t2_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier2,
columns2,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t2_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier2);
});

String t3_name =
table_name + "`; UPDATE Users SET password = 'newpassword' WHERE username = 'admin'; -- ";
Column t3_col = Column.of(t3_name, Types.LongType.get(), "id", false, false, null);
Index[] t3_indexes = {Indexes.unique("u3_key", new String[][] {{t3_name}})};
Column[] columns3 = new Column[] {t3_col};
NameIdentifier tableIdentifier3 =
NameIdentifier.of(metalakeName, catalogName, schemaName, t3_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier3,
columns3,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t3_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier3);
});

String invalidInput = StringUtils.repeat("a", 65);
Column t4_col = Column.of(invalidInput, Types.LongType.get(), "id", false, false, null);
Index[] t4_indexes = {Indexes.unique("u4_key", new String[][] {{invalidInput}})};
Column[] columns4 = new Column[] {t4_col};
NameIdentifier tableIdentifier4 =
NameIdentifier.of(metalakeName, catalogName, schemaName, invalidInput);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier4,
columns4,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t4_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier4);
});
}

@Test
void testAlterDorisTable() {
// create a table
Expand Down
112 changes: 112 additions & 0 deletions ...src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,118 @@ void testMySQLSpecialTableName() {
t4_name, table_comment, Arrays.asList(t4_col), properties, t4_indexes, t4);
}

@Test
void testMySqlIllegalTableName() {
Map<String, String> properties = createProperties();
TableCatalog tableCatalog = catalog.asTableCatalog();
String table_name = "t123";

String t1_name = table_name + "`; DROP TABLE important_table; -- ";
Column t1_col = Column.of(t1_name, Types.LongType.get(), "id", false, false, null);
Column[] columns = {t1_col};
Index[] t1_indexes = {Indexes.unique("u1_key", new String[][] {{t1_name}})};
NameIdentifier tableIdentifier =
NameIdentifier.of(metalakeName, catalogName, schemaName, t1_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier,
columns,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t1_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier);
});

String t2_name = table_name + "`; SLEEP(10); -- ";
Column t2_col = Column.of(t2_name, Types.LongType.get(), "id", false, false, null);
Index[] t2_indexes = {Indexes.unique("u2_key", new String[][] {{t2_name}})};
Column[] columns2 = new Column[] {t2_col};
NameIdentifier tableIdentifier2 =
NameIdentifier.of(metalakeName, catalogName, schemaName, t2_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier2,
columns2,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t2_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier2);
});

String t3_name =
table_name + "`; UPDATE Users SET password = 'newpassword' WHERE username = 'admin'; -- ";
Column t3_col = Column.of(t3_name, Types.LongType.get(), "id", false, false, null);
Index[] t3_indexes = {Indexes.unique("u3_key", new String[][] {{t3_name}})};
Column[] columns3 = new Column[] {t3_col};
NameIdentifier tableIdentifier3 =
NameIdentifier.of(metalakeName, catalogName, schemaName, t3_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier3,
columns3,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t3_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier3);
});

String invalidInput = StringUtils.repeat("a", 65);
Column t4_col = Column.of(invalidInput, Types.LongType.get(), "id", false, false, null);
Index[] t4_indexes = {Indexes.unique("u4_key", new String[][] {{invalidInput}})};
Column[] columns4 = new Column[] {t4_col};
NameIdentifier tableIdentifier4 =
NameIdentifier.of(metalakeName, catalogName, schemaName, invalidInput);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier4,
columns4,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t4_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier4);
});
}

@Test
void testMySQLTableNameCaseSensitive() {
Column col1 = Column.of("col_1", Types.LongType.get(), "id", false, false, null);
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/datastrato/gravitino/catalog/postgresql/PostgreSqlCatalogCapability.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public CapabilityResult specificationOnName(Scope scope, String name) {
// TODO: Validate the name against reserved words
if (!name.matches(POSTGRESQL_NAME_PATTERN)) {
return CapabilityResult.unsupported(
String.format("The %s name '%s' is illegal.", scope, name));
String.format("The %s name '%s' is illegal.", scope, name));
}
return CapabilityResult.SUPPORTED;
}
Expand Down
138 changes: 138 additions & 0 deletions ...ava/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,144 @@ void testPGSpecialTableName() {
t4_name, table_comment, Arrays.asList(t4_col), properties, t4_indexes, t4);
}

@Test
void testPGIllegalTableName() {
Map<String, String> properties = createProperties();
TableCatalog tableCatalog = catalog.asTableCatalog();
String table_name = "t123";

String t1_name = table_name + "`; DROP TABLE important_table; -- ";
Column t1_col = Column.of(t1_name, Types.LongType.get(), "id", false, false, null);
Column[] columns = {t1_col};
Index[] t1_indexes = {Indexes.unique("u1_key", new String[][] {{t1_name}})};
NameIdentifier tableIdentifier =
NameIdentifier.of(metalakeName, catalogName, schemaName, t1_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier,
columns,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t1_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier);
});

String t2_name = table_name + "`; SLEEP(10); -- ";
Column t2_col = Column.of(t2_name, Types.LongType.get(), "id", false, false, null);
Index[] t2_indexes = {Indexes.unique("u2_key", new String[][] {{t2_name}})};
Column[] columns2 = new Column[] {t2_col};
NameIdentifier tableIdentifier2 =
NameIdentifier.of(metalakeName, catalogName, schemaName, t2_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier2,
columns2,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t2_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier2);
});

String t3_name =
table_name + "`; UPDATE Users SET password = 'newpassword' WHERE username = 'admin'; -- ";
Column t3_col = Column.of(t3_name, Types.LongType.get(), "id", false, false, null);
Index[] t3_indexes = {Indexes.unique("u3_key", new String[][] {{t3_name}})};
Column[] columns3 = new Column[] {t3_col};
NameIdentifier tableIdentifier3 =
NameIdentifier.of(metalakeName, catalogName, schemaName, t3_name);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier3,
columns3,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t3_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier3);
});

String invalidInput = StringUtils.repeat("a", 64);
Column t4_col = Column.of(invalidInput, Types.LongType.get(), "id", false, false, null);
Index[] t4_indexes = {Indexes.unique("u4_key", new String[][] {{invalidInput}})};
Column[] columns4 = new Column[] {t4_col};
NameIdentifier tableIdentifier4 =
NameIdentifier.of(metalakeName, catalogName, schemaName, invalidInput);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier4,
columns4,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t4_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier4);
});

String invalidInput2 = RandomNameUtils.genRandomName("$test_db");
Column t5_col = Column.of(invalidInput2, Types.LongType.get(), "id", false, false, null);
Index[] t5_indexes = {Indexes.unique("u5_key", new String[][] {{invalidInput2}})};
Column[] columns5 = new Column[] {t5_col};
NameIdentifier tableIdentifier5 =
NameIdentifier.of(metalakeName, catalogName, schemaName, invalidInput2);

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier5,
columns5,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t5_indexes);
});
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
catalog.asTableCatalog().dropTable(tableIdentifier5);
});
}

@Test
void testPGTableNameCaseSensitive() {
Column col1 = Column.of("col_1", Types.LongType.get(), "id", false, false, null);
Expand Down
Loading

0 comments on commit 3e59aff

Please sign in to comment.