Light, fluffy, and always free - The AWS Local Emulator alternative
fix: support DynamoDB Query BETWEEN and ScanIndexForward=false (#160)
Fred Peñacf2c705b7d2e
diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.javaindex 2af73357a8..4e5cddb6e7 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java@@ -282,12 +282,14 @@ public class DynamoDbJsonHandler {String filterExpr = request.has("FilterExpression")? request.get("FilterExpression").asText() : null;Integer limit = request.has("Limit") ? request.get("Limit").asInt() : null;+ Boolean scanIndexForward = request.has("ScanIndexForward")+ ? request.get("ScanIndexForward").asBoolean() : null;String indexName = request.has("IndexName") ? request.get("IndexName").asText() : null;JsonNode exclusiveStartKey = request.has("ExclusiveStartKey")? request.get("ExclusiveStartKey") : null;DynamoDbService.QueryResult result = dynamoDbService.query(tableName, keyConditions,- exprAttrValues, keyConditionExpr, filterExpr, limit, indexName,+ exprAttrValues, keyConditionExpr, filterExpr, limit, scanIndexForward, indexName,exclusiveStartKey, exprAttrNames, region);ObjectNode response = objectMapper.createObjectNode();diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.javaindex cd823efd97..e5f242f12d 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java@@ -18,6 +18,7 @@ import org.jboss.logging.Logger;import java.time.Instant;import java.util.ArrayList;+import java.util.Collections;import java.util.HashMap;import java.util.Iterator;import java.util.List;@@ -379,19 +380,19 @@ public class DynamoDbService {JsonNode expressionAttrValues, String keyConditionExpression,String filterExpression, Integer limit) {return query(tableName, keyConditions, expressionAttrValues, keyConditionExpression,- filterExpression, limit, null, null, null, regionResolver.getDefaultRegion());+ filterExpression, limit, null, null, null, null, regionResolver.getDefaultRegion());}public QueryResult query(String tableName, JsonNode keyConditions,JsonNode expressionAttrValues, String keyConditionExpression,String filterExpression, Integer limit, String region) {return query(tableName, keyConditions, expressionAttrValues, keyConditionExpression,- filterExpression, limit, null, null, null, region);+ filterExpression, limit, null, null, null, null, region);}public QueryResult query(String tableName, JsonNode keyConditions,JsonNode expressionAttrValues, String keyConditionExpression,- String filterExpression, Integer limit, String indexName,+ String filterExpression, Integer limit, Boolean scanIndexForward, String indexName,JsonNode exclusiveStartKey, JsonNode exprAttrNames, String region) {String storageKey = regionKey(region, tableName);TableDefinition table = tableStore.get(storageKey)@@ -467,6 +468,9 @@ public class DynamoDbService {if (bVal == null) return 1;return compareValues(aVal, bVal);});+ if (Boolean.FALSE.equals(scanIndexForward)) {+ Collections.reverse(results);+ }}// Apply ExclusiveStartKey offset@@ -1459,6 +1463,23 @@ public class DynamoDbService {return prefix != null && actual.startsWith(prefix);}+ if (exprLower.contains(" between ")) {+ int betweenIdx = exprLower.indexOf(" between ");+ int andIdx = exprLower.indexOf(" and ", betweenIdx + " between ".length());+ if (andIdx < 0) return false;++ String lowerExpr = expression.substring(betweenIdx + " between ".length(), andIdx).trim();+ String upperExpr = expression.substring(andIdx + " and ".length()).trim();+ String lowerPlaceholder = lowerExpr.startsWith(":") ? lowerExpr.split("\\s+")[0] : null;+ String upperPlaceholder = upperExpr.startsWith(":") ? upperExpr.split("\\s+")[0] : null;+ String lower = lowerPlaceholder != null && exprValues != null+ ? extractScalarValue(exprValues.get(lowerPlaceholder)) : null;+ String upper = upperPlaceholder != null && exprValues != null+ ? extractScalarValue(exprValues.get(upperPlaceholder)) : null;+ if (lower == null || upper == null) return false;+ return compareValues(actual, lower) >= 0 && compareValues(actual, upper) <= 0;+ }+// Detect comparison operatorString[] operators = {"<>", "<=", ">=", "=", "<", ">"};for (String op : operators) {diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.javaindex f2d2277844..c34aca707b 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java@@ -311,6 +311,58 @@ class DynamoDbIntegrationTest {@Test@Order(11)+ void queryWithBetweenOnSortKey() {+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.Query")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {+ "TableName": "TestTable",+ "KeyConditionExpression": "pk = :pk AND sk BETWEEN :from AND :to",+ "ExpressionAttributeValues": {+ ":pk": {"S": "user-1"},+ ":from": {"S": "order-001"},+ ":to": {"S": "order-002"}+ }+ }+ """)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("Count", equalTo(2))+ .body("Items[0].sk.S", equalTo("order-001"))+ .body("Items[1].sk.S", equalTo("order-002"));+ }++ @Test+ @Order(12)+ void queryWithScanIndexForwardFalse() {+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.Query")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {+ "TableName": "TestTable",+ "KeyConditionExpression": "pk = :pk AND begins_with(sk, :prefix)",+ "ScanIndexForward": false,+ "ExpressionAttributeValues": {+ ":pk": {"S": "user-1"},+ ":prefix": {"S": "order"}+ }+ }+ """)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("Count", equalTo(2))+ .body("Items[0].sk.S", equalTo("order-002"))+ .body("Items[1].sk.S", equalTo("order-001"));+ }++ @Test+ @Order(13)void queryWithFilterExpression() {given().header("X-Amz-Target", "DynamoDB_20120810.Query")@@ -336,7 +388,7 @@ class DynamoDbIntegrationTest {}@Test- @Order(12)+ @Order(14)void queryWithFilterExpressionAndLimitReturnsLastEvaluatedKey() {given().header("X-Amz-Target", "DynamoDB_20120810.Query")@@ -365,7 +417,7 @@ class DynamoDbIntegrationTest {}@Test- @Order(13)+ @Order(15)void scan() {given().header("X-Amz-Target", "DynamoDB_20120810.Scan")@@ -382,7 +434,7 @@ class DynamoDbIntegrationTest {}@Test- @Order(14)+ @Order(16)void deleteItem() {given().header("X-Amz-Target", "DynamoDB_20120810.DeleteItem")@@ -422,7 +474,7 @@ class DynamoDbIntegrationTest {}@Test- @Order(15)+ @Order(17)void deleteTable() {given().header("X-Amz-Target", "DynamoDB_20120810.DeleteTable")diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.javaindex bc2dfa716e..f49739773b 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java@@ -220,6 +220,43 @@ class DynamoDbServiceTest {assertEquals(2, results.items().size());}+ @Test+ void queryWithBetweenOnSortKey() {+ createOrdersTable();+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-01"));+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-15"));+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-02-01"));++ ObjectNode exprValues = mapper.createObjectNode();+ exprValues.set(":pk", attributeValue("S", "c1"));+ exprValues.set(":from", attributeValue("S", "2024-01-10"));+ exprValues.set(":to", attributeValue("S", "2024-01-31"));++ DynamoDbService.QueryResult results = service.query("Orders", null, exprValues,+ "customerId = :pk AND orderId BETWEEN :from AND :to", null, null);++ assertEquals(1, results.items().size());+ assertEquals("2024-01-15", results.items().getFirst().get("orderId").get("S").asText());+ }++ @Test+ void queryWithScanIndexForwardFalseReturnsDescendingOrder() {+ createOrdersTable();+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1"));+ service.putItem("Orders", item("customerId", "c1", "orderId", "o2"));+ service.putItem("Orders", item("customerId", "c1", "orderId", "o3"));++ ObjectNode exprValues = mapper.createObjectNode();+ exprValues.set(":pk", attributeValue("S", "c1"));++ DynamoDbService.QueryResult results = service.query("Orders", null, exprValues,+ "customerId = :pk", null, null, false, null, null, null, "us-east-1");++ assertEquals(List.of("o3", "o2", "o1"), results.items().stream()+ .map(result -> result.get("orderId").get("S").asText())+ .toList());+ }+@Testvoid queryAppliesFilterExpressionAfterKeyCondition() {createOrdersTable();@@ -271,7 +308,7 @@ class DynamoDbServiceTest {exprValues.set(":min", attributeValue("N", "100"));DynamoDbService.QueryResult firstPage = service.query("Orders", null, exprValues,- "customerId = :pk", "total >= :min", 2, null, null, null, "us-east-1");+ "customerId = :pk", "total >= :min", 2, null, null, null, null, "us-east-1");assertEquals(1, firstPage.items().size());assertEquals("o1", firstPage.items().get(0).get("orderId").get("S").asText());@@ -280,7 +317,7 @@ class DynamoDbServiceTest {assertEquals("o2", firstPage.lastEvaluatedKey().get("orderId").get("S").asText());DynamoDbService.QueryResult secondPage = service.query("Orders", null, exprValues,- "customerId = :pk", "total >= :min", 2, null,+ "customerId = :pk", "total >= :min", 2, null, null,firstPage.lastEvaluatedKey(), null, "us-east-1");assertEquals(1, secondPage.items().size());