Skip to content

Fix table creation with ifNotExists to include index creation in DynamoAdmin #2773

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

Closed
wants to merge 1 commit into from
Closed

Fix table creation with ifNotExists to include index creation in DynamoAdmin #2773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
141 changes: 86 additions & 55 deletions core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,16 @@ private void createTableInternal(
if (!(ifNotExists && tableExistsInternal(namespace, table))) {
client.createTable(requestBuilder.build());
waitForTableCreation(namespace, table);
} else if (!metadata.getSecondaryIndexNames().isEmpty()) {
for (String indexColumnName : metadata.getSecondaryIndexNames()) {
createIndex(
namespace,
table,
indexColumnName,
metadata.getColumnDataType(indexColumnName),
ru,
true);
}
}
} catch (Exception e) {
throw new ExecutionException(
Expand Down Expand Up @@ -938,46 +948,7 @@ public void createIndex(
}

long ru = Long.parseLong(options.getOrDefault(REQUEST_UNIT, DEFAULT_REQUEST_UNIT));

try {
client.updateTable(
UpdateTableRequest.builder()
.tableName(getFullTableName(namespace, table))
.attributeDefinitions(
AttributeDefinition.builder()
.attributeName(columnName)
.attributeType(
SECONDARY_INDEX_DATATYPE_MAP.get(metadata.getColumnDataType(columnName)))
.build())
.globalSecondaryIndexUpdates(
GlobalSecondaryIndexUpdate.builder()
.create(
CreateGlobalSecondaryIndexAction.builder()
.indexName(getGlobalIndexName(namespace, table, columnName))
.keySchema(
KeySchemaElement.builder()
.attributeName(columnName)
.keyType(KeyType.HASH)
.build())
.projection(
Projection.builder().projectionType(ProjectionType.ALL).build())
.provisionedThroughput(
ProvisionedThroughput.builder()
.readCapacityUnits(ru)
.writeCapacityUnits(ru)
.build())
.build())
.build())
.build());
} catch (Exception e) {
throw new ExecutionException(
String.format(
"Creating the secondary index for the %s column of the %s table failed",
columnName, getFullTableName(namespace, table)),
e);
}

waitForIndexCreation(namespace, table, columnName);
createIndex(namespace, table, columnName, metadata.getColumnDataType(columnName), ru, false);

// enable auto scaling
boolean noScaling = Boolean.parseBoolean(options.getOrDefault(NO_SCALING, DEFAULT_NO_SCALING));
Expand Down Expand Up @@ -1007,26 +978,86 @@ columnName, getFullTableName(namespace, table)),
TableMetadata.newBuilder(tableMetadata).addSecondaryIndex(columnName).build());
}

private void waitForIndexCreation(Namespace namespace, String table, String columnName)
private void createIndex(
Namespace namespace,
String table,
String columnName,
DataType dataType,
Long ru,
boolean ifNotExists)
throws ExecutionException {
try {
String indexName = getGlobalIndexName(namespace, table, columnName);
while (true) {
Uninterruptibles.sleepUninterruptibly(waitingDurationSecs, TimeUnit.SECONDS);
DescribeTableResponse response =
client.describeTable(
DescribeTableRequest.builder()
.tableName(getFullTableName(namespace, table))
.build());
for (GlobalSecondaryIndexDescription globalSecondaryIndex :
response.table().globalSecondaryIndexes()) {
if (globalSecondaryIndex.indexName().equals(indexName)) {
if (globalSecondaryIndex.indexStatus() == IndexStatus.ACTIVE) {
return;
}
if (!(ifNotExists && indexExists(namespace, table, columnName))) {
client.updateTable(
UpdateTableRequest.builder()
.tableName(getFullTableName(namespace, table))
.attributeDefinitions(
AttributeDefinition.builder()
.attributeName(columnName)
.attributeType(SECONDARY_INDEX_DATATYPE_MAP.get(dataType))
.build())
.globalSecondaryIndexUpdates(
GlobalSecondaryIndexUpdate.builder()
.create(
CreateGlobalSecondaryIndexAction.builder()
.indexName(getGlobalIndexName(namespace, table, columnName))
.keySchema(
KeySchemaElement.builder()
.attributeName(columnName)
.keyType(KeyType.HASH)
.build())
.projection(
Projection.builder().projectionType(ProjectionType.ALL).build())
.provisionedThroughput(
ProvisionedThroughput.builder()
.readCapacityUnits(ru)
.writeCapacityUnits(ru)
.build())
.build())
.build())
.build());
waitForIndexCreation(namespace, table, columnName);
}
} catch (Exception e) {
throw new ExecutionException(
String.format(
"Creating the secondary index for the %s column of the %s table failed",
columnName, getFullTableName(namespace, table)),
e);
}
}

private boolean indexExists(Namespace namespace, String table, String columnName)
throws ExecutionException {
String indexName = getGlobalIndexName(namespace, table, columnName);
try {
DescribeTableResponse response =
client.describeTable(
DescribeTableRequest.builder().tableName(getFullTableName(namespace, table)).build());
for (GlobalSecondaryIndexDescription globalSecondaryIndex :
response.table().globalSecondaryIndexes()) {
if (globalSecondaryIndex.indexName().equals(indexName)) {
if (globalSecondaryIndex.indexStatus() == IndexStatus.ACTIVE) {
return true;
}
}
}
return false;
} catch (Exception e) {
throw new ExecutionException(
String.format(
"Checking the secondary index existence for the %s column of the %s table failed",
columnName, getFullTableName(namespace, table)),
e);
}
}

private void waitForIndexCreation(Namespace namespace, String table, String columnName)
throws ExecutionException {
try {
do {
Uninterruptibles.sleepUninterruptibly(waitingDurationSecs, TimeUnit.SECONDS);
} while (!indexExists(namespace, table, columnName));
} catch (Exception e) {
throw new ExecutionException(
String.format(
Expand Down