feat: add UUID support for GSQL and PG dialect mappings in AvroToValueMapper

Author: pratickchokhani

v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/MySQLDatastreamToSpannerDataTypesAndExpressionIT.java

@@ -611,6 +611,7 @@ private Map<String, List<Map<String, Object>>> getExpectedData() {
     expectedData.put("set", createRows("set", "v1,v2", "NULL"));
     expectedData.put(
         "integer_unsigned", createRows("integer_unsigned", "0", "42", "4294967295", "NULL"));
+    expectedData.put("uuid", createRows("uuid", "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11", "NULL"));
     return expectedData;
   }
 

v2/datastream-to-spanner/src/test/resources/MySQLDataTypesIT/mysql-data-types.sql

@@ -739,4 +739,9 @@ CREATE TABLE IF NOT EXISTS spatial_geometrycollection (
 
 INSERT INTO spatial_geometrycollection (geoms) VALUES (MultiPoint(Point(77.5946, 12.9716), Point(77.6100, 12.9600)));
 
+CREATE TABLE IF NOT EXISTS `uuid_table` (
+    `id` INT PRIMARY KEY,
+    `uuid_col` VARCHAR(36) DEFAULT NULL
+);
 
+INSERT INTO `uuid_table` (`id`, `uuid_col`) VALUES (1, 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'), (2, NULL);

v2/datastream-to-spanner/src/test/resources/MySQLDataTypesIT/pg-dialect-spanner-schema.sql

@@ -477,3 +477,9 @@ CREATE TABLE IF NOT EXISTS spatial_geometrycollection (
   geom_coll VARCHAR,
   PRIMARY KEY (id)
 );
+
+CREATE TABLE IF NOT EXISTS uuid_table (
+  id INT8 NOT NULL,
+  uuid_col UUID,
+  PRIMARY KEY (id)
+);

v2/datastream-to-spanner/src/test/resources/MySQLDataTypesIT/spanner-schema.sql

@@ -424,3 +424,8 @@ CREATE TABLE IF NOT EXISTS `generated_to_non_generated_column_table` (
 	`generated_column_col` STRING(100) DEFAULT(NULL),
 	`generated_column_pk_col` STRING(100) DEFAULT(NULL),
 ) PRIMARY KEY (`generated_column_pk_col`);
+
+CREATE TABLE IF NOT EXISTS uuid_table (
+  id INT64 NOT NULL,
+  uuid_col UUID,
+) PRIMARY KEY(id);

v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/MySQLDataTypesIT.java

@@ -474,6 +474,7 @@ private Map<String, List<Map<String, Object>>> getExpectedData() {
             "-2.2250738585072014E-308"));
     expectedData.put(
         "time_pk", createRows("time_pk", "15:50:00.200000", "838:59:58.123000", "-838:59:59"));
+    expectedData.put("uuid", createRows("uuid", "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11", "NULL"));
     return expectedData;
   }
 

v2/sourcedb-to-spanner/src/test/resources/DataTypesIT/mysql-data-types.sql

@@ -899,4 +899,9 @@ CREATE TABLE IF NOT EXISTS spatial_geometrycollection (
 
 INSERT INTO spatial_geometrycollection (geoms) VALUES (MultiPoint(Point(77.5946, 12.9716), Point(77.6100, 12.9600)));
 
+CREATE TABLE IF NOT EXISTS `uuid_table` (
+    `id` INT PRIMARY KEY,
+    `uuid_col` VARCHAR(36) DEFAULT NULL
+);
 
+INSERT INTO `uuid_table` (`id`, `uuid_col`) VALUES (1, 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'), (2, NULL);

v2/sourcedb-to-spanner/src/test/resources/DataTypesIT/mysql-spanner-schema.sql

@@ -546,3 +546,8 @@ CREATE TABLE time_pk_table (
   id STRING(MAX) NOT NULL,
   time_pk_col STRING(MAX) NOT NULL
 ) PRIMARY KEY(id);
+
+CREATE TABLE IF NOT EXISTS uuid_table (
+  id INT64 NOT NULL,
+  uuid_col UUID,
+) PRIMARY KEY(id);

v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/avro/AvroToValueMapper.java

@@ -148,6 +148,10 @@ static Map<Type, AvroToValueFunction> getGsqlMap() {
                 avroArrayFieldToSpannerArray(
                     recordValue, fieldSchema, AvroToValueMapper::avroFieldToString)));
 
+    gsqlFunctions.put(
+        Type.uuid(),
+        (recordValue, fieldSchema) -> Value.string(avroFieldToString(recordValue, fieldSchema)));
+
     gsqlFunctions.put(
         Type.json(),
         (recordValue, fieldSchema) -> Value.string(avroFieldToString(recordValue, fieldSchema)));
@@ -245,6 +249,9 @@ static Map<Type, AvroToValueFunction> getPgMap() {
     pgFunctions.put(
         Type.pgDate(),
         (recordValue, fieldSchema) -> Value.date(avroFieldToDate(recordValue, fieldSchema)));
+    pgFunctions.put(
+        Type.pgUuid(),
+        (recordValue, fieldSchema) -> Value.string(avroFieldToString(recordValue, fieldSchema)));
     return pgFunctions;
   }
 

v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/avro/GenericRecordTypeConvertor.java

@@ -572,21 +572,10 @@ private Value getSpannerValueFromObject(
       throw new NullPointerException("schemaMapper returned null spanner dialect.");
     }
     if (AvroToValueMapper.convertorMap().get(dialect).containsKey(spannerType)) {
-      try {
-        return AvroToValueMapper.convertorMap()
-            .get(dialect)
-            .get(spannerType)
-            .apply(value, fieldSchema);
-      } catch (Exception e) {
-        LOG.error(
-            "Exception while converting record value {} to Field Schema: {}, colName: {}, spannerType: {}",
-            value,
-            fieldSchema,
-            recordColName,
-            spannerType,
-            e);
-        throw e;
-      }
+      return AvroToValueMapper.convertorMap()
+          .get(dialect)
+          .get(spannerType)
+          .apply(value, fieldSchema);
     } else {
       throw new IllegalArgumentException(
           "Found unsupported Spanner column type("

v2/spanner-common/src/test/java/com/google/cloud/teleport/v2/spanner/migrations/avro/AvroToValueMapperTest.java

@@ -561,6 +561,7 @@ public void testAvroValueToArrayBasic() {
     assertThat(
             AvroToValueMapper.getGsqlMap().keySet().stream()
                 .filter(t -> !t.getCode().equals(Code.ARRAY))
+                .filter(t -> !t.getCode().equals(Code.UUID))
                 .map(t -> t.toString())
                 .sorted()
                 .collect(Collectors.toList()))