Light, fluffy, and always free - The AWS Local Emulator alternative
fix(redshift-data): return QueryParameters in DescribeStatement and ListStatements (#6461)
Vũ Thế Huy217929bd65f2
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.javaindex 56a705049d..4d1081ab6f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.java@@ -22,6 +22,7 @@ import software.amazon.awssdk.services.redshiftdata.model.GetStatementResultRequimport software.amazon.awssdk.services.redshiftdata.model.GetStatementResultResponse;import software.amazon.awssdk.services.redshiftdata.model.GetStatementResultV2Response;import software.amazon.awssdk.services.redshiftdata.model.ResultFormatString;+import software.amazon.awssdk.services.redshiftdata.model.SqlParameter;import software.amazon.awssdk.services.redshiftdata.model.StatusString;import software.amazon.awssdk.services.redshiftdata.model.SubStatementData;import software.amazon.awssdk.services.redshiftdata.model.ValidationException;@@ -134,6 +135,25 @@ class RedshiftDataOperationsTest {assertThat(result.records().get(0).get(1).stringValue()).isEqualTo("a");}+ @Test+ @DisplayName("named SQL parameters are bound through the SDK model")+ void parameterizedStatementBindsSqlParameters() throws Exception {+ String id = data.executeStatement(ExecuteStatementRequest.builder()+ .clusterIdentifier(clusterId)+ .database(DATABASE)+ .dbUser(USERNAME)+ .sql("SELECT CAST(:value AS INTEGER) + 1 AS result")+ .parameters(SqlParameter.builder().name("value").value("41").build())+ .waitTimeSeconds(30)+ .build()).id();++ GetStatementResultResponse result = data.getStatementResult(request -> request.id(id));+ assertThat(result.records()).hasSize(1);+ assertThat(result.records().get(0).get(0).longValue()).isEqualTo(42L);+ assertThat(describe(id).queryParameters()).containsExactly(+ SqlParameter.builder().name("value").value("41").build());+ }+@Test@DisplayName("batch response and child statement results round trip through the SDK")void batchResultsExposeChildStatements() throws Exception {diff --git a/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataService.java b/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataService.javaindex 335464f487..1d9ce31a9b 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataService.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataService.java@@ -16,6 +16,8 @@ import io.github.hectorvent.floci.services.redshift.spectrum.SpectrumQueryPreparimport io.github.hectorvent.floci.services.redshift.spectrum.SpectrumReadException;import io.github.hectorvent.floci.services.redshift.spectrum.SpectrumSession;import io.github.hectorvent.floci.services.redshift.spectrum.SpectrumSqlException;+import io.github.hectorvent.floci.services.redshiftdata.RedshiftDataStatementStore.StoredParameter;+import io.github.hectorvent.floci.services.redshiftdata.RedshiftDataStatementStore.StoredStatement;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -380,6 +382,11 @@ public class RedshiftDataService implements Resettable {stored.dbUser = target.user();stored.database = target.database();stored.resultFormat = request.path("ResultFormat").asText("JSON");+ if (!parameters.isEmpty()) {+ stored.queryParameters = parameters.entrySet().stream()+ .map(entry -> new StoredParameter(entry.getKey(), entry.getValue()))+ .toList();+ }capture(stored, target, region, request);return new PendingStatement(stored, (execution, session) -> runStatement(stored, target, sql, parameters, execution, session),@@ -646,6 +653,7 @@ public class RedshiftDataService implements Resettable {response.put("Error", stored.error);}response.put("QueryString", stored.sql);+ putQueryParameters(response, stored.queryParameters);int stableId = stored.id.hashCode() & Integer.MAX_VALUE;response.put("RedshiftPid", stableId);response.put("RedshiftQueryId", (long) stableId);@@ -945,6 +953,7 @@ public class RedshiftDataService implements Resettable {node.put("StatementName", s.statementName);}node.put("IsBatchStatement", s.batch);+ putQueryParameters(node, s.queryParameters);node.put("ResultRows", s.resultRows);node.put("ResultSize", s.resultSize);node.put("Duration", s.durationNanos);@@ -1229,6 +1238,22 @@ public class RedshiftDataService implements Resettable {}}+ private static void putQueryParameters(ObjectNode target, List<StoredParameter> parameters) {+ if (parameters == null || parameters.isEmpty()) {+ return;+ }+ ArrayNode queryParameters = target.putArray("QueryParameters");+ for (StoredParameter parameter : parameters) {+ ObjectNode paramNode = queryParameters.addObject();+ paramNode.put("name", parameter.name());+ if (parameter.value() == null) {+ paramNode.putNull("value");+ } else {+ paramNode.put("value", parameter.value());+ }+ }+ }+private static String requiredText(JsonNode request, String name) {String value = textOrNull(request, name);if (value == null || value.isBlank()) {diff --git a/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.java b/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.javaindex 879952d86f..b00e423980 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.java@@ -162,6 +162,11 @@ class RedshiftDataStatementStore {}}+ @RegisterForReflection+ @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)+ record StoredParameter(String name, String value) {+ }+@RegisterForReflection@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)static final class StoredStatement {@@ -188,6 +193,7 @@ class RedshiftDataStatementStore {ArrayNode columnMetadata;List<ArrayNode> rows;List<StoredStatement> subStatements;+ List<StoredParameter> queryParameters;String accountId;String region;String resourceArn;@@ -229,6 +235,7 @@ class RedshiftDataStatementStore {copy.hasResultSet = hasResultSet;copy.resultRows = resultRows;copy.resultSize = resultSize;+ copy.queryParameters = queryParameters == null ? null : List.copyOf(queryParameters);if (withResults) {copy.columnMetadata = columnMetadata;copy.rows = rows == null ? null : List.copyOf(rows);diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.javaindex 5152ca86c5..4bc5d4f569 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.java@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;@@ -449,6 +450,37 @@ class RedshiftDataServiceTest {assertEquals("ValidationException", e.getErrorCode());}+ @Test+ void executeStatementStoresAndReturnsQueryParameters() {+ ObjectNode request = req("select CAST(:value AS INTEGER) + 1 as res");+ ArrayNode params = request.putArray("Parameters");+ params.addObject().put("name", "value").put("value", "41");+ String id = service.executeStatement(request, REGION).get("Id").asText();++ ObjectNode described = service.describeStatement(idOf(id));+ assertEquals("FINISHED", described.get("Status").asText());+ assertTrue(described.has("QueryParameters"));+ ArrayNode queryParams = (ArrayNode) described.get("QueryParameters");+ assertEquals(1, queryParams.size());+ assertEquals("value", queryParams.get(0).get("name").asText());+ assertEquals("41", queryParams.get(0).get("value").asText());++ ObjectNode listed = service.listStatements(om.createObjectNode());+ JsonNode listedStatement = null;+ for (JsonNode s : listed.get("Statements")) {+ if (id.equals(s.path("Id").asText())) {+ listedStatement = s;+ break;+ }+ }+ assertNotNull(listedStatement);+ assertTrue(listedStatement.has("QueryParameters"));+ ArrayNode listedParams = (ArrayNode) listedStatement.get("QueryParameters");+ assertEquals(1, listedParams.size());+ assertEquals("value", listedParams.get(0).get("name").asText());+ assertEquals("41", listedParams.get(0).get("value").asText());+ }+@Testvoid describeTableMatchesTheExactNameNotAPattern() {service.executeStatement(req("create table a_b (x int)"), REGION);diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.javaindex 92de293081..b6100c0073 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.java@@ -193,6 +193,17 @@ class RedshiftDataStatementStoreTest {original.columnMetadata = columnMetadata;original.rows = List.of(row);original.subStatements = List.of(sub);+ original.queryParameters = List.of(new RedshiftDataStatementStore.StoredParameter("param1", "val1"));++ RedshiftDataStatementStore.StoredStatement snapshot = original.snapshot();+ assertEquals(1, snapshot.queryParameters.size());+ assertEquals("param1", snapshot.queryParameters.get(0).name());+ assertEquals("val1", snapshot.queryParameters.get(0).value());++ RedshiftDataStatementStore.StoredStatement summary = original.summary();+ assertEquals(1, summary.queryParameters.size());+ assertEquals("param1", summary.queryParameters.get(0).name());+ assertEquals("val1", summary.queryParameters.get(0).value());String json = mapper.writeValueAsString(Map.of("parent", original));Map<String, RedshiftDataStatementStore.StoredStatement> back =@@ -215,5 +226,9 @@ class RedshiftDataStatementStoreTest {assertEquals(1, restored.subStatements.size());assertEquals("parent:1", restored.subStatements.get(0).id);assertEquals(RedshiftDataStatementStore.Status.FINISHED, restored.subStatements.get(0).status);+ assertNotNull(restored.queryParameters);+ assertEquals(1, restored.queryParameters.size());+ assertEquals("param1", restored.queryParameters.get(0).name());+ assertEquals("val1", restored.queryParameters.get(0).value());}}