Handle AWS SdkBytes de/serialization

Author: avibhstarburst

trino-aws-proxy-glue/src/main/java/io/trino/aws/proxy/glue/rest/GlueDeserializer.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkField;
 
 import java.io.IOException;
@@ -69,6 +70,9 @@ public T deserialize(JsonParser parser, DeserializationContext context)
                 if (type == null) {
                     return (T) context.handleUnexpectedToken(context.getContextualType(), parser);
                 }
+                if (type == SdkBytes.class) {
+                    sdkField.set(builder, SdkBytes.fromByteArray(fieldValue.binaryValue()));
+                }
                 else {
                     JavaType javaType = context.getTypeFactory().constructType(type);
                     sdkField.set(builder, mapper.convertValue(fieldValue, javaType));

trino-aws-proxy-glue/src/main/java/io/trino/aws/proxy/glue/rest/GlueSerializer.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkField;
 
 import java.io.IOException;
@@ -43,6 +44,7 @@ public void serialize(T value, JsonGenerator generator, SerializerProvider seria
             Object fieldValue = sdkField.getValueOrDefault(value);
             switch (fieldValue) {
                 case Instant instant -> generator.writePOJOField(sdkField.memberName(), formatUnixTimestampInstant(instant));  // per AWS spec
+                case SdkBytes sdkBytes -> generator.writePOJOField(sdkField.memberName(), sdkBytes.asByteArray());  // per AWS spec
                 case null -> {} // do nothing
                 default -> generator.writePOJOField(sdkField.memberName(), fieldValue);
             }

trino-aws-proxy-glue/src/test/java/io/trino/aws/proxy/glue/TestGlueBase.java

@@ -21,14 +21,20 @@
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.core.CompressionConfiguration;
+import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.glue.GlueClient;
 import software.amazon.awssdk.services.glue.model.Column;
+import software.amazon.awssdk.services.glue.model.ColumnStatistics;
+import software.amazon.awssdk.services.glue.model.ColumnStatisticsData;
+import software.amazon.awssdk.services.glue.model.ColumnStatisticsType;
 import software.amazon.awssdk.services.glue.model.CreateDatabaseRequest;
 import software.amazon.awssdk.services.glue.model.CreateTableRequest;
 import software.amazon.awssdk.services.glue.model.Database;
 import software.amazon.awssdk.services.glue.model.DatabaseIdentifier;
 import software.amazon.awssdk.services.glue.model.DatabaseInput;
+import software.amazon.awssdk.services.glue.model.DecimalColumnStatisticsData;
+import software.amazon.awssdk.services.glue.model.DecimalNumber;
 import software.amazon.awssdk.services.glue.model.EntityNotFoundException;
 import software.amazon.awssdk.services.glue.model.FederatedDatabase;
 import software.amazon.awssdk.services.glue.model.GetDatabaseRequest;
@@ -44,9 +50,11 @@
 import software.amazon.awssdk.services.glue.model.StorageDescriptor;
 import software.amazon.awssdk.services.glue.model.TableIdentifier;
 import software.amazon.awssdk.services.glue.model.TableInput;
+import software.amazon.awssdk.services.glue.model.UpdateColumnStatisticsForTableRequest;
 
 import java.net.URI;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
 import java.util.Map;
 
 import static io.trino.aws.proxy.glue.TestingGlueRequestHandler.DATABASE_1;
@@ -159,6 +167,27 @@ public void testComplexSerialization()
                 .partitionIndexes(PartitionIndex.builder().indexName("i1").keys("k1").build())
                 .transactionId("t1")
                 .build());
+
+        glueClient.updateColumnStatisticsForTable(
+                UpdateColumnStatisticsForTableRequest.builder()
+                        .catalogId(catalogId)
+                        .databaseName(databaseName)
+                        .tableName("table1")
+                        .columnStatisticsList(
+                                List.of(ColumnStatistics.builder()
+                                        .columnName("a")
+                                        .columnType("b")
+                                        .statisticsData(ColumnStatisticsData.builder()
+                                                .type(ColumnStatisticsType.DECIMAL)
+                                                .decimalColumnStatisticsData(DecimalColumnStatisticsData.builder()
+                                                        .maximumValue(DecimalNumber.builder()
+                                                                .scale(1)
+                                                                .unscaledValue(SdkBytes.fromUtf8String("MDk="))
+                                                                .build())
+                                                        .build())
+                                                .build())
+                                        .build()))
+                        .build());
     }
 
     @Test

trino-aws-proxy-glue/src/test/java/io/trino/aws/proxy/glue/TestingGlueRequestHandler.java

@@ -22,6 +22,7 @@
 import software.amazon.awssdk.services.glue.model.CreateDatabaseRequest;
 import software.amazon.awssdk.services.glue.model.CreateDatabaseResponse;
 import software.amazon.awssdk.services.glue.model.CreateTableRequest;
+import software.amazon.awssdk.services.glue.model.CreateTableResponse;
 import software.amazon.awssdk.services.glue.model.Database;
 import software.amazon.awssdk.services.glue.model.EntityNotFoundException;
 import software.amazon.awssdk.services.glue.model.GetDatabaseRequest;
@@ -31,6 +32,8 @@
 import software.amazon.awssdk.services.glue.model.GetResourcePoliciesResponse;
 import software.amazon.awssdk.services.glue.model.GluePolicy;
 import software.amazon.awssdk.services.glue.model.GlueResponse;
+import software.amazon.awssdk.services.glue.model.UpdateColumnStatisticsForTableRequest;
+import software.amazon.awssdk.services.glue.model.UpdateColumnStatisticsForTableResponse;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -113,7 +116,15 @@ public GlueResponse handleRequest(ParsedGlueRequest request, SigningMetadata sig
                 assertThat(tableRequest.tableInput().description()).isEqualTo("desc1");
                 assertThat(tableRequest.tableInput().name()).isEqualTo("tableName");
                 assertThat(tableRequest.tableInput().parameters()).isEqualTo(Map.of("k1", "v1"));
-                yield CreateDatabaseResponse.builder().build();
+                yield CreateTableResponse.builder().build();
+            }
+
+            case UpdateColumnStatisticsForTableRequest columnStatisticsForTableRequest -> {
+                assertThat(columnStatisticsForTableRequest.catalogId()).isEqualTo("1");
+                assertThat(columnStatisticsForTableRequest.databaseName()).isEqualTo("database1");
+                assertThat(columnStatisticsForTableRequest.columnStatisticsList()).hasSize(1);
+                assertThat(columnStatisticsForTableRequest.columnStatisticsList().getFirst().statisticsData()).isNotNull();
+                yield  UpdateColumnStatisticsForTableResponse.builder().build();
             }
 
             default -> throw new WebApplicationException(NOT_FOUND);