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

Fix CreateTableOperation identifier issue, add several table ITs. #1348

Merged
merged 5 commits into from
Aug 20, 2024
Merged

Fix CreateTableOperation identifier issue, add several table ITs. #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8de3c48
init
Yuqi-Du Aug 19, 2024
b834156
init
Yuqi-Du Aug 19, 2024
780603c
Merge branch 'main' into add-table-IT
tatu-at-datastax Aug 20, 2024
6bfc07d
fix comments
Yuqi-Du Aug 20, 2024
053f8f1
fix comments
Yuqi-Du Aug 20, 2024
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
8 changes: 5 additions & 3 deletions src/main/java/io/stargate/sgv2/jsonapi/service/operation/tables/CreateTableOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;

import com.datastax.oss.driver.api.core.CqlIdentifier;
import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
Expand Down Expand Up @@ -55,9 +56,10 @@ public CreateTableOperation(
@Override
public Uni<Supplier<CommandResult>> execute(
DataApiRequestInfo dataApiRequestInfo, QueryExecutor queryExecutor) {

CreateTableStart create =
createTable(commandContext.schemaObject().name.keyspace(), tableName).ifNotExists();
CqlIdentifier keyspaceIdentifier =
CqlIdentifier.fromInternal(commandContext.schemaObject().name.keyspace());
CqlIdentifier tableIdentifier = CqlIdentifier.fromInternal(tableName);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok good!

CreateTableStart create = createTable(keyspaceIdentifier, tableIdentifier).ifNotExists();

// Add all primary keys and colunms
CreateTable createTable = addColumnsAndKeys(create);
Expand Down
68 changes: 68 additions & 0 deletions ...o/stargate/sgv2/jsonapi/api/v1/tableIntegrationTest/AbstractTableIntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package io.stargate.sgv2.jsonapi.api.v1.tableIntegrationTest;

import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;

import io.restassured.http.ContentType;
import io.stargate.sgv2.jsonapi.api.v1.AbstractNamespaceIntegrationTestBase;
import io.stargate.sgv2.jsonapi.api.v1.CollectionResource;
import io.stargate.sgv2.jsonapi.api.v1.NamespaceResource;

/** Abstract class for all table int tests that needs a collection to execute tests in. */
public class AbstractTableIntegrationTestBase extends AbstractNamespaceIntegrationTestBase {

protected void createTable(String tableName, String createTableJSON) {
given()
.port(getTestPort())
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(createTableJSON.formatted().formatted(tableName))
.when()
.post(NamespaceResource.BASE_PATH, namespaceName)
.then()
.statusCode(200);
}

protected void createTable(String createTableJSON) {
given()
.port(getTestPort())
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(createTableJSON)
.when()
.post(NamespaceResource.BASE_PATH, namespaceName)
.then()
.statusCode(200)
.body("status.ok", is(1));
}

protected void deleteAllRowsFromTable(String tableName) {
String json =
"""
{
"deleteMany": {
}
}
""";

while (true) {
Boolean moreData =
given()
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(json)
.when()
.post(CollectionResource.BASE_PATH, namespaceName, tableName)
.then()
.statusCode(200)
.body("errors", is(nullValue()))
.extract()
.path("status.moreData");

if (!Boolean.TRUE.equals(moreData)) {
break;
}
}
}
}
106 changes: 106 additions & 0 deletions ...va/io/stargate/sgv2/jsonapi/api/v1/tableIntegrationTest/AddTableIndexIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
package io.stargate.sgv2.jsonapi.api.v1.tableIntegrationTest;

import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.containsString;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.junit.QuarkusIntegrationTest;
import io.restassured.http.ContentType;
import io.stargate.sgv2.jsonapi.api.v1.CollectionResource;
import io.stargate.sgv2.jsonapi.testresource.DseTestResource;
import org.junit.jupiter.api.*;

@QuarkusIntegrationTest
@WithTestResource(value = DseTestResource.class, restrictToAnnotatedClass = false)
@TestClassOrder(ClassOrderer.OrderAnnotation.class)
// TODO, it is currently called AddIndex, do we want to change to createIndex
class AddTableIndexIntegrationTest extends AbstractTableIntegrationTestBase {
String simpleTableName = "simpleTableForAddIndexTest";

@BeforeAll
public final void createSimpleTable() {
String tableJson =
"""
{
"createTable": {
"name": "%s",
"definition": {
"columns": {
"id": {
"type": "text"
},
"age": {
"type": "int"
},
"name": {
"type": "text"
}
},
"primaryKey": "id"
}
}
}
"""
.formatted(simpleTableName);
createTable(tableJson);
}

@Nested
@Order(1)
class AddIndexSuccess {

@Test
@Order(1)
public void addIndex() {
String json =
"""
{
"addIndex": {
"column": "age",
"indexName": "age_index"
}
}
""";
given()
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(json)
.when()
.post(CollectionResource.BASE_PATH, namespaceName, simpleTableName)
.then()
.statusCode(200)
.body("status.ok", is(1));
}
}

@Nested
@Order(2)
class AddIndexFailure {
@Test
public void addIndex() {
String json =
"""
{
"addIndex": {
"column": "city",
"indexName": "city_index"
}
}
""";
given()
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(json)
.when()
.post(CollectionResource.BASE_PATH, namespaceName, simpleTableName)
.then()
.statusCode(200)
.body("errors", is(notNullValue()))
.body("errors", hasSize(1))
.body("errors[0].exceptionClass", is("JsonApiException"))
.body("errors[0].errorCode", is("INVALID_QUERY"))
.body("errors[0].message", containsString("Undefined column name city"));
}
}
}
126 changes: 126 additions & 0 deletions ...java/io/stargate/sgv2/jsonapi/api/v1/tableIntegrationTest/CreateTableIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
package io.stargate.sgv2.jsonapi.api.v1.tableIntegrationTest;

import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.is;

import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.junit.QuarkusIntegrationTest;
import io.restassured.http.ContentType;
import io.stargate.sgv2.jsonapi.api.v1.AbstractNamespaceIntegrationTestBase;
import io.stargate.sgv2.jsonapi.api.v1.NamespaceResource;
import io.stargate.sgv2.jsonapi.testresource.DseTestResource;
import org.junit.Test;
import org.junit.jupiter.api.ClassOrderer;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestClassOrder;

@QuarkusIntegrationTest
@WithTestResource(value = DseTestResource.class, restrictToAnnotatedClass = false)
@TestClassOrder(ClassOrderer.OrderAnnotation.class)
class CreateTableIntegrationTest extends AbstractNamespaceIntegrationTestBase {

@Nested
@Order(1)
class CreateTable {
@Test
public void primaryKeyAsString() {
String json =
"""
{
"createTable": {
"name": "primaryKeyAsStringTable",
"definition": {
"columns": {
"id": {
"type": "text"
},
"age": {
"type": "int"
},
"name": {
"type": "text"
}
},
"primaryKey": "id"
}
}
}
""";
given()
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(json)
.when()
.post(NamespaceResource.BASE_PATH, namespaceName)
.then()
.statusCode(200)
.body("status.ok", is(1));
deleteTable("primaryKeyAsStringTable");
}

@Test
public void primaryKeyAsJsonObject() {

String json =
"""
{
"createTable": {
"name": "primaryKeyAsJsonObjectTable",
"definition": {
"columns": {
"id": {
"type": "text"
},
"age": {
"type": "int"
},
"name": {
"type": "text"
}
},
"primaryKey": {
"partitionBy": [
"id"
],
"partitionSort" : {
"name" : 1, "age" : -1
}
}
}
}
}
""";
given()
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(json)
.when()
.post(NamespaceResource.BASE_PATH, namespaceName)
.then()
.statusCode(200)
.body("status.ok", is(1));
deleteTable("primaryKeyAsJsonObjectTable");
}
}

private void deleteTable(String tableName) {
given()
.headers(getHeaders())
.contentType(ContentType.JSON)
.body(
"""
{
"deleteTable": {
"name": "%s"
}
}
"""
.formatted(tableName))
.when()
.post(NamespaceResource.BASE_PATH, namespaceName)
.then()
.statusCode(200)
.body("status.ok", is(1));
}
}
Loading