Skip to content

Commit

Permalink
code style
Browse files Browse the repository at this point in the history
  • Loading branch information
zhanghan18 committed Jun 19, 2024
1 parent 87fadeb commit ee2c22a
Showing 1 changed file with 55 additions and 97 deletions.
152 changes: 55 additions & 97 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 @@ -27,8 +27,8 @@
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.literals.Literal;
import com.datastrato.gravitino.rel.expressions.sorts.SortOrder;
import com.datastrato.gravitino.rel.expressions.transforms.Transform;
import com.datastrato.gravitino.rel.expressions.transforms.Transforms;
import com.datastrato.gravitino.rel.indexes.Index;
Expand Down Expand Up @@ -263,9 +263,7 @@ void testDorisSchemaBasicOperation() {

Assertions.assertThrows(
SchemaAlreadyExistsException.class,
() -> {
schemas.createSchema(schemaIdent.name(), schema_comment, Collections.emptyMap());
});
() -> schemas.createSchema(schemaIdent.name(), schema_comment, Collections.emptyMap()));

// test drop schema
Assertions.assertTrue(schemas.dropSchema(schemaIdent.name(), false));
Expand Down Expand Up @@ -315,11 +313,7 @@ void testDropDorisSchema() {

// Check database has been dropped
SupportsSchemas schemas = catalog.asSchemas();
Assertions.assertThrows(
NoSuchSchemaException.class,
() -> {
schemas.loadSchema(schemaName);
});
Assertions.assertThrows(NoSuchSchemaException.class, () -> schemas.loadSchema(schemaName));
}

@Test
Expand All @@ -333,52 +327,32 @@ void testSchemaWithIllegalName() {
String sqlInjection = databaseName + "`; DROP TABLE important_table; -- ";
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.createSchema(sqlInjection, comment, properties);
});
() -> schemas.createSchema(sqlInjection, comment, properties));
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.dropSchema(sqlInjection, false);
});
IllegalArgumentException.class, () -> schemas.dropSchema(sqlInjection, false));

String sqlInjection1 = databaseName + "`; SLEEP(10); -- ";
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.createSchema(sqlInjection1, comment, properties);
});
() -> schemas.createSchema(sqlInjection1, comment, properties));
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.dropSchema(sqlInjection1, false);
});
IllegalArgumentException.class, () -> schemas.dropSchema(sqlInjection1, false));

String sqlInjection2 =
databaseName + "`; UPDATE Users SET password = 'newpassword' WHERE username = 'admin'; -- ";
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.createSchema(sqlInjection2, comment, properties);
});
() -> schemas.createSchema(sqlInjection2, comment, properties));
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.dropSchema(sqlInjection2, false);
});
IllegalArgumentException.class, () -> schemas.dropSchema(sqlInjection2, false));

// should throw an exception with input that has more than 64 characters
String invalidInput = StringUtils.repeat("a", 65);
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.createSchema(invalidInput, comment, properties);
});
() -> schemas.createSchema(invalidInput, comment, properties));
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
schemas.dropSchema(invalidInput, false);
});
IllegalArgumentException.class, () -> schemas.dropSchema(invalidInput, false));
}

@Test
Expand Down Expand Up @@ -442,22 +416,18 @@ void testDorisIllegalTableName() {

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier,
columns,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t1_indexes);
});
() ->
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);
});
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);
Expand All @@ -468,22 +438,18 @@ void testDorisIllegalTableName() {

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

String t3_name =
table_name + "`; UPDATE Users SET password = 'newpassword' WHERE username = 'admin'; -- ";
Expand All @@ -495,22 +461,18 @@ void testDorisIllegalTableName() {

Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
tableCatalog.createTable(
tableIdentifier3,
columns3,
table_comment,
properties,
Transforms.EMPTY_TRANSFORM,
Distributions.NONE,
new SortOrder[0],
t3_indexes);
});
() ->
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);
});
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);
Expand All @@ -521,22 +483,18 @@ void testDorisIllegalTableName() {

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

@Test
Expand Down

0 comments on commit ee2c22a

Please sign in to comment.