uuid as primary key

g31pranjal · g31pranjal · commit dd1974d6793c · 2025-02-27T21:18:57.000Z
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/typing/Type.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/typing/Type.java
@@ -2949,20 +2949,13 @@ public ExplainTokens describe() {
             return new ExplainTokens().addKeyword(getTypeCode().toString());
         }
 
-        @Override
-        public void defineProtoType(final TypeRepository.Builder typeRepositoryBuilder) {
-            if (typeRepositoryBuilder.getTypeByName(MESSAGE_NAME).isEmpty()) {
-                typeRepositoryBuilder.addMessageType(TupleFieldsProto.UUID.getDescriptor().toProto());
-                typeRepositoryBuilder.registerTypeToTypeNameMapping(this, MESSAGE_NAME);
-            }
-        }
-
         @Override
         public void addProtoField(@Nonnull final TypeRepository.Builder typeRepositoryBuilder, @Nonnull final DescriptorProto.Builder descriptorBuilder, final int fieldNumber, @Nonnull final String fieldName, @Nonnull final Optional<String> typeNameOptional, @Nonnull final FieldDescriptorProto.Label label) {
             FieldDescriptorProto.Builder builder = FieldDescriptorProto.newBuilder()
                     .setNumber(fieldNumber)
                     .setName(fieldName)
-                    .setLabel(label);
+                    .setLabel(label)
+                    .setTypeName(TupleFieldsProto.UUID.getDescriptor().getFullName());
             typeNameOptional.ifPresent(builder::setTypeName);
             descriptorBuilder.addField(builder);
         }
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/typing/TypeRepository.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/typing/TypeRepository.java
@@ -20,6 +20,7 @@
 
 package com.apple.foundationdb.record.query.plan.cascades.typing;
 
+import com.apple.foundationdb.record.TupleFieldsProto;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Verify;
 import com.google.common.collect.BiMap;
@@ -52,6 +53,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 /**
  * A utility class that enables mapping of a structured {@link Type} into a dynamically-generated equivalent Protobuf message
@@ -82,6 +84,9 @@ public class TypeRepository {
     @Nonnull
     private final Map<Type, String> typeToNameMap;
 
+    @Nonnull
+    public static List<FileDescriptor> DEPENDENCIES = List.of(TupleFieldsProto.getDescriptor());
+
     @Nonnull
     public static TypeRepository empty() {
         FileDescriptorSet.Builder resultBuilder = FileDescriptorSet.newBuilder();
@@ -341,13 +346,17 @@ private static Map<String, FileDescriptor> init(@Nonnull final FileDescriptorSet
                 List<String> dependencyList = fdProto.getDependencyList();
                 List<FileDescriptor> resolvedFdList = new ArrayList<>();
                 for (String depName : dependencyList) {
-                    if (!allFdProtoNames.contains(depName)) {
+                    final var dependencyMaybe = DEPENDENCIES.stream().filter(d -> d.getFullName().equals(depName)).findAny();
+                    if (dependencyMaybe.isPresent()) {
+                        resolvedFdList.add(dependencyMaybe.get());
+                    } else if (allFdProtoNames.contains(depName)) {
+                        FileDescriptor fd = resolvedFileDescMap.get(depName);
+                        if (fd != null) {
+                            resolvedFdList.add(fd);
+                        }
+                    } else {
                         throw new IllegalArgumentException("cannot resolve import " + depName + " in " + fdProto.getName());
                     }
-                    FileDescriptor fd = resolvedFileDescMap.get(depName);
-                    if (fd != null) {
-                        resolvedFdList.add(fd);
-                    }
                 }
 
                 if (resolvedFdList.size() == dependencyList.size()) { // dependencies resolved
@@ -430,6 +439,7 @@ public static class Builder {
 
         private Builder() {
             fileDescProtoBuilder = FileDescriptorProto.newBuilder();
+            fileDescProtoBuilder.addAllDependency(DEPENDENCIES.stream().map(FileDescriptor::getFullName).collect(Collectors.toList()));
             fileDescSetBuilder = FileDescriptorSet.newBuilder();
             typeToNameMap = HashBiMap.create();
         }
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/values/MessageHelpers.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/values/MessageHelpers.java
@@ -360,7 +360,9 @@ public static <M extends Message> Object transformMessage(@Nonnull final FDBReco
             } else {
                 if (currentMessage != null) {
                     final var currentFieldType = Verify.verifyNotNull(currentRecordType.getField(messageFieldDescriptor.getIndex())).getFieldType();
-                    final var fieldResult = NullableArrayTypeUtils.unwrapIfArray(getFieldOnMessage(currentMessage, messageFieldDescriptor), currentFieldType);
+                    var fieldResult = messageFieldDescriptor.getType().equals(Descriptors.FieldDescriptor.Type.MESSAGE) ?
+                                            getFieldMessageOnMessage(currentMessage, messageFieldDescriptor) : getFieldOnMessage(currentMessage, messageFieldDescriptor);
+                    fieldResult = NullableArrayTypeUtils.unwrapIfArray(fieldResult, currentFieldType);
                     final var coercedObject =
                             coerceObject(promotionTrieForField, targetFieldType, targetDescriptorForField, currentFieldType, fieldResult);
                     if (coercedObject != null) {
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/values/PromoteValue.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/values/PromoteValue.java
@@ -442,8 +442,8 @@ public static boolean isPromotionNeeded(@Nonnull final Type inType, @Nonnull fin
             }
             return false;
         }
-        SemanticException.check((inType.isPrimitive() || inType.isUuid() || inType.isArray()) ||
-                (promoteToType.isPrimitive() || promoteToType.isUuid() || promoteToType.isArray()), SemanticException.ErrorCode.INCOMPATIBLE_TYPE);
+        SemanticException.check((inType.isPrimitive() || inType.isEnum() || inType.isUuid()) &&
+                (promoteToType.isPrimitive() || promoteToType.isEnum() || promoteToType.isUuid()), SemanticException.ErrorCode.INCOMPATIBLE_TYPE);
         return inType.getTypeCode() != promoteToType.getTypeCode();
     }
 
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/MessageTuple.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/MessageTuple.java
@@ -21,11 +21,11 @@
 package com.apple.foundationdb.relational.recordlayer;
 
 import com.apple.foundationdb.annotation.API;
-import com.apple.foundationdb.record.query.plan.cascades.typing.Type;
+import com.apple.foundationdb.record.TupleFieldsProto;
 import com.apple.foundationdb.relational.api.exceptions.InvalidColumnReferenceException;
 import com.google.protobuf.Descriptors;
-import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Message;
+import com.google.protobuf.MessageOrBuilder;
 
 import java.util.UUID;
 
@@ -52,8 +52,8 @@ public Object getObject(int position) throws InvalidColumnReferenceException {
             final var field = message.getField(message.getDescriptorForType().getFields().get(position));
             if (fieldDescriptor.getType() == Descriptors.FieldDescriptor.Type.ENUM) {
                 return ((Descriptors.EnumValueDescriptor) field).getName();
-            } else if (fieldDescriptor.getType() == Descriptors.FieldDescriptor.Type.MESSAGE && fieldDescriptor.getMessageType().getName().equals(Type.Uuid.MESSAGE_NAME)) {
-                final var dynamicMsg = (DynamicMessage) field;
+            } else if (fieldDescriptor.getType() == Descriptors.FieldDescriptor.Type.MESSAGE && fieldDescriptor.getMessageType().equals(TupleFieldsProto.UUID.getDescriptor())) {
+                final var dynamicMsg = (MessageOrBuilder) field;
                 return new UUID((Long) dynamicMsg.getField(dynamicMsg.getDescriptorForType().findFieldByName("most_significant_bits")),
                         (Long) dynamicMsg.getField(dynamicMsg.getDescriptorForType().findFieldByName("least_significant_bits")));
             }
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/RecordLayerSchemaTemplate.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/RecordLayerSchemaTemplate.java
@@ -21,9 +21,9 @@
 package com.apple.foundationdb.relational.recordlayer.metadata;
 
 import com.apple.foundationdb.annotation.API;
-
 import com.apple.foundationdb.record.RecordMetaData;
 import com.apple.foundationdb.record.RecordMetaDataProto;
+import com.apple.foundationdb.record.TupleFieldsProto;
 import com.apple.foundationdb.record.metadata.Key;
 import com.apple.foundationdb.record.query.combinatorics.TopologicalSort;
 import com.apple.foundationdb.relational.api.exceptions.ErrorCode;
@@ -37,7 +37,6 @@
 import com.apple.foundationdb.relational.recordlayer.metadata.serde.RecordMetadataDeserializer;
 import com.apple.foundationdb.relational.recordlayer.metadata.serde.RecordMetadataSerializer;
 import com.apple.foundationdb.relational.util.Assert;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
@@ -160,7 +159,7 @@ private RecordMetaData buildRecordMetadata() {
         try {
             fileDescriptor = Descriptors.FileDescriptor.buildFrom(
                     fileDescriptorProtoSerializer.getFileBuilder().build(),
-                    new Descriptors.FileDescriptor[]{RecordMetaDataProto.getDescriptor()});
+                    new Descriptors.FileDescriptor[]{RecordMetaDataProto.getDescriptor(), TupleFieldsProto.getDescriptor()});
         } catch (Descriptors.DescriptorValidationException e) {
             throw new RelationalException(ErrorCode.SERIALIZATION_FAILURE, e).toUncheckedWrappedException();
         }
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/serde/FileDescriptorSerializer.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/serde/FileDescriptorSerializer.java
@@ -21,7 +21,6 @@
 package com.apple.foundationdb.relational.recordlayer.metadata.serde;
 
 import com.apple.foundationdb.annotation.API;
-
 import com.apple.foundationdb.record.RecordMetaDataOptionsProto;
 import com.apple.foundationdb.record.query.plan.cascades.typing.Type;
 import com.apple.foundationdb.record.query.plan.cascades.typing.TypeRepository;
@@ -31,14 +30,15 @@
 import com.apple.foundationdb.relational.recordlayer.metadata.RecordLayerTable;
 import com.apple.foundationdb.relational.recordlayer.metadata.SkeletonVisitor;
 import com.apple.foundationdb.relational.util.Assert;
-
 import com.google.protobuf.DescriptorProtos;
+import com.google.protobuf.Descriptors;
 
 import javax.annotation.Nonnull;
 import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @API(API.Status.EXPERIMENTAL)
 public class FileDescriptorSerializer extends SkeletonVisitor {
@@ -73,6 +73,7 @@ public FileDescriptorSerializer() {
 
     public FileDescriptorSerializer(@Nonnull DescriptorProtos.FileDescriptorProto.Builder fileBuilder) {
         this.fileBuilder = fileBuilder;
+        this.fileBuilder.addAllDependency(TypeRepository.DEPENDENCIES.stream().map(Descriptors.FileDescriptor::getFullName).collect(Collectors.toList()));
         this.unionDescriptorBuilder = DescriptorProtos.DescriptorProto.newBuilder().setName("RecordTypeUnion");
         final RecordMetaDataOptionsProto.RecordTypeOptions options = RecordMetaDataOptionsProto.RecordTypeOptions.newBuilder().setUsage(RecordMetaDataOptionsProto.RecordTypeOptions.Usage.UNION).build();
         unionDescriptorBuilder.getOptionsBuilder().setExtension(RecordMetaDataOptionsProto.record, options);
diff --git a/yaml-tests/src/test/resources/uuid.yamsql b/yaml-tests/src/test/resources/uuid.yamsql
@@ -22,8 +22,8 @@ options:
 ---
 schema_template:
     create table ta(a bigint, b uuid, primary key(a))
-#    create table tb(a uuid, b bigint, primary key(a))
-#    create table tc(a bigint, b uuid, primary key(a, b))
+    create table tb(a uuid, b bigint, primary key(a))
+    create table tc(a bigint, b uuid, c bigint, primary key(a, b))
 #    create table td(a bigint, b uuid, c bigint, primary key(a))
 ---
 setup:
@@ -36,6 +36,13 @@ setup:
                (5, 'a8708750-d70f-4800-8c3b-13700d5b369f'),
                (6, '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6')
     - query: INSERT INTO TA(A) VALUES (7), (8)
+    - query: INSERT INTO TB (B, A)
+        VALUES (1, '0920df1c-be81-4ec1-8a06-2180226f051d'),
+               (2, '64120112-4e39-40c3-94b9-2cc88a52e8df'),
+               (3, 'c35ba01f-f8fc-47d7-bb00-f077e8a75682'),
+               (4, '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b'),
+               (5, 'a8708750-d70f-4800-8c3b-13700d5b369f'),
+               (6, '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6')
 ---
 test_block:
   name: uuid-as-a-field-tests
@@ -134,4 +141,54 @@ test_block:
                           {4, !uuid '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b'},
                           {5, !uuid 'a8708750-d70f-4800-8c3b-13700d5b369f'},
                           {6, !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6'}]
+---
+test_block:
+  name: uuid-as-a-field-tests
+  tests:
+    -
+      - query: select B, A from TB
+      - unorderedResult: [{1, !uuid '0920df1c-be81-4ec1-8a06-2180226f051d'},
+                          {2, !uuid '64120112-4e39-40c3-94b9-2cc88a52e8df'},
+                          {3, !uuid 'c35ba01f-f8fc-47d7-bb00-f077e8a75682'},
+                          {4, !uuid '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b'},
+                          {5, !uuid 'a8708750-d70f-4800-8c3b-13700d5b369f'},
+                          {6, !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6'}]
+    -
+      - query: select B, A from TB where a > !! !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6' !!
+      - unorderedResult: [{3, !uuid 'c35ba01f-f8fc-47d7-bb00-f077e8a75682'},
+                          {5, !uuid 'a8708750-d70f-4800-8c3b-13700d5b369f'}]
+    -
+      - query: select B, A from TB where a < !! !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6' !!
+      - unorderedResult: [{1, !uuid '0920df1c-be81-4ec1-8a06-2180226f051d'},
+                          {2, !uuid '64120112-4e39-40c3-94b9-2cc88a52e8df'},
+                          {4, !uuid '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b'}]
+    -
+      - query: select B, A from TB where a >= !! !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6' !!
+      - unorderedResult: [{3, !uuid 'c35ba01f-f8fc-47d7-bb00-f077e8a75682'},
+                          {5, !uuid 'a8708750-d70f-4800-8c3b-13700d5b369f'},
+                          {6, !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6'}]
+    -
+      - query: select B, A from TB where a <= !! !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6' !!
+      - unorderedResult: [{1, !uuid '0920df1c-be81-4ec1-8a06-2180226f051d'},
+                          {2, !uuid '64120112-4e39-40c3-94b9-2cc88a52e8df'},
+                          {4, !uuid '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b'},
+                          {6, !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6'}]
+    -
+      - query: select B, A from TB where a = !! !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6' !!
+      - unorderedResult: [{6, !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6'}]
+    -
+      - query: select B, A from TB where a != !! !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6' !!
+      - unorderedResult: [{1, !uuid '0920df1c-be81-4ec1-8a06-2180226f051d'},
+                          {2, !uuid '64120112-4e39-40c3-94b9-2cc88a52e8df'},
+                          {3, !uuid 'c35ba01f-f8fc-47d7-bb00-f077e8a75682'},
+                          {4, !uuid '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b'},
+                          {5, !uuid 'a8708750-d70f-4800-8c3b-13700d5b369f'}]
+    -
+      - query: select B, A from TB where a is not null
+      - unorderedResult: [{1, !uuid '0920df1c-be81-4ec1-8a06-2180226f051d'},
+                          {2, !uuid '64120112-4e39-40c3-94b9-2cc88a52e8df'},
+                          {3, !uuid 'c35ba01f-f8fc-47d7-bb00-f077e8a75682'},
+                          {4, !uuid '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b'},
+                          {5, !uuid 'a8708750-d70f-4800-8c3b-13700d5b369f'},
+                          {6, !uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6'}]
 ...

Original file line number	Diff line number	Diff line change
`@@ -442,8 +442,8 @@ public static boolean isPromotionNeeded(@Nonnull final Type inType, @Nonnull fin`
`442`	`442`	`}`
`443`	`443`	`return false;`
`444`	`444`	`}`
`445`		`- SemanticException.check((inType.isPrimitive() \|\| inType.isUuid() \|\| inType.isArray()) \|\|`
`446`		`- (promoteToType.isPrimitive() \|\| promoteToType.isUuid() \|\| promoteToType.isArray()), SemanticException.ErrorCode.INCOMPATIBLE_TYPE);`
	`445`	`+ SemanticException.check((inType.isPrimitive() \|\| inType.isEnum() \|\| inType.isUuid()) &&`
	`446`	`+ (promoteToType.isPrimitive() \|\| promoteToType.isEnum() \|\| promoteToType.isUuid()), SemanticException.ErrorCode.INCOMPATIBLE_TYPE);`
`447`	`447`	`return inType.getTypeCode() != promoteToType.getTypeCode();`
`448`	`448`	`}`
`449`	`449`