Light, fluffy, and always free - The AWS Local Emulator alternative
fix(athena): Add partition keys to table metadata response (#1454)
kazamagedb840c498d60
diff --git a/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.java b/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.javaindex b8fad01826..69b9156711 100644--- a/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.java+++ b/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.java@@ -480,14 +480,22 @@ public class AthenaService {metadata.put("TableType", table.getTableType() != null ? table.getTableType() : "EXTERNAL_TABLE");metadata.put("Columns", athenaColumns(table));metadata.put("Parameters", table.getParameters() != null ? table.getParameters() : Map.of());+ metadata.put("PartitionKeys", athenaColumns(table.getPartitionKeys()));return metadata;}private List<Map<String, String>> athenaColumns(Table table) {- if (table.getStorageDescriptor() == null || table.getStorageDescriptor().getColumns() == null) {+ if (table.getStorageDescriptor() == null) {+ return List.of();+ }+ return athenaColumns(table.getStorageDescriptor().getColumns());+ }++ private List<Map<String, String>> athenaColumns(List<Column> columns) {+ if (columns == null) {return List.of();}- return table.getStorageDescriptor().getColumns().stream()+ return columns.stream().map(column -> Map.of("Name", column.getName(),"Type", glueTypeToAthena(column)diff --git a/src/test/java/io/github/hectorvent/floci/services/athena/AthenaIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaIntegrationTest.javaindex 15cb569690..3046cf36a9 100644--- a/src/test/java/io/github/hectorvent/floci/services/athena/AthenaIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaIntegrationTest.java@@ -190,11 +190,77 @@ class AthenaIntegrationTest {.body("TableMetadata.Name", equalTo("orders")).body("TableMetadata.Columns[0].Name", equalTo("id")).body("TableMetadata.Columns[0].Type", equalTo("varchar"))- .body("TableMetadata.Columns[1].Type", equalTo("varchar"));+ .body("TableMetadata.Columns[1].Type", equalTo("varchar"))+ .body("TableMetadata.PartitionKeys", empty());}@Test@Order(8)+ void listsGlueDatabasesAndTablesAsAthenaMetadataHasPartitionKeys() {+ given()+ .header("X-Amz-Target", "AWSGlue.CreateDatabase")+ .contentType(CONTENT_TYPE)+ .body("{ \"DatabaseInput\": { \"Name\": \"analytics_test2\" } }")+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .header("X-Amz-Target", "AWSGlue.CreateTable")+ .contentType(CONTENT_TYPE)+ .body("""+ {+ "DatabaseName": "analytics_test2",+ "TableInput": {+ "Name": "orders",+ "TableType": "EXTERNAL_TABLE",+ "StorageDescriptor": {+ "Location": "s3://bucket/orders",+ "Columns": [+ { "Name": "id", "Type": "string" },+ { "Name": "payload", "Type": "struct<id:string>" }+ ]+ },+ "PartitionKeys": [+ { "Name": "pkey", "Type": "string" }+ ]+ }+ }+ """)+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .header("X-Amz-Target", "AmazonAthena.ListDatabases")+ .contentType(CONTENT_TYPE)+ .body("{ \"CatalogName\": \"AwsDataCatalog\" }")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("DatabaseList.Name", hasItem("analytics_test2"));++ given()+ .header("X-Amz-Target", "AmazonAthena.GetTableMetadata")+ .contentType(CONTENT_TYPE)+ .body("{ \"CatalogName\": \"AwsDataCatalog\", \"DatabaseName\": \"analytics_test2\", \"TableName\": \"orders\" }")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("TableMetadata.Name", equalTo("orders"))+ .body("TableMetadata.Columns[0].Name", equalTo("id"))+ .body("TableMetadata.Columns[0].Type", equalTo("varchar"))+ .body("TableMetadata.Columns[1].Type", equalTo("varchar"))+ .body("TableMetadata.PartitionKeys[0].Name", equalTo("pkey"))+ .body("TableMetadata.PartitionKeys[0].Type", equalTo("varchar"));+ }++ @Test+ @Order(9)void deleteWorkGroup() {given().header("X-Amz-Target", "AmazonAthena.DeleteWorkGroup")@@ -208,7 +274,7 @@ class AthenaIntegrationTest {}@Test- @Order(9)+ @Order(10)void deleteWorkGroupMissingOrBlank() {given().header("X-Amz-Target", "AmazonAthena.DeleteWorkGroup")@@ -256,7 +322,7 @@ class AthenaIntegrationTest {}@Test- @Order(10)+ @Order(11)void deletePrimaryWorkGroup() {given().header("X-Amz-Target", "AmazonAthena.DeleteWorkGroup")