address concerns

Author: g31pranjal

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/typing/Type.java

@@ -421,7 +421,7 @@ private static Type fromProtoType(@Nullable Descriptors.GenericDescriptor descri
                 final var elementField = messageDescriptor.findFieldByName(NullableArrayTypeUtils.getRepeatedFieldName());
                 final var elementTypeCode = TypeCode.fromProtobufType(elementField.getType());
                 return fromProtoTypeToArray(descriptor, protoType, elementTypeCode, true);
-            } else if (Uuid.MESSAGE_NAME.equals(messageDescriptor.getName())) {
+            } else if (TupleFieldsProto.UUID.getDescriptor().equals(messageDescriptor)) {
                 return Type.uuidType(isNullable);
             } else {
                 return Record.fromFieldDescriptorsMap(isNullable, Record.toFieldDescriptorMap(messageDescriptor.getFields()));

fdb-relational-core/src/main/antlr/RelationalLexer.g4

@@ -1178,7 +1178,7 @@ UNIX_TIMESTAMP:                      'UNIX_TIMESTAMP';
 UPDATEXML:                           'UPDATEXML';
 UPPER:                               'UPPER';
 UUID:                                'UUID';
-//UUID_SHORT:                          'UUID_SHORT';
+UUID_SHORT:                          'UUID_SHORT';
 VALIDATE_PASSWORD_STRENGTH:          'VALIDATE_PASSWORD_STRENGTH';
 VERSION:                             'VERSION';
 WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS:   'WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS';