Skip to content

Commit f3af396

Browse files
g31pranjalg31pranjal
committed
more fixes
1 parent a909254 commit f3af396

File tree

3 files changed

+31
-31
lines changed
  • fdb-record-layer-core/src
    • main/java/com/apple/foundationdb/record/query/plan/cascades/typing
    • test/java/com/apple/foundationdb/record/query/plan/cascades
  • fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata

3 files changed

+31
-31
lines changed

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

+26-26
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ public interface Type extends Narrowable<Type>, PlanSerializable {
9595
@Nonnull
9696
None NONE = new None();
9797

98+
@Nonnull
99+
Uuid UUID_NULL_INSTANCE = new Uuid(true);
100+
101+
@Nonnull
102+
Uuid UUID_NON_NULL_INSTANCE = new Uuid(false);
103+
104+
98105
/**
99106
* A map from Java {@link Class} to corresponding {@link TypeCode}.
100107
*/
@@ -333,6 +340,15 @@ static None noneType() {
333340
return Type.NONE;
334341
}
335342

343+
@Nonnull
344+
static Uuid uuidType(boolean withNullability) {
345+
if (withNullability) {
346+
return UUID_NULL_INSTANCE;
347+
} else {
348+
return UUID_NON_NULL_INSTANCE;
349+
}
350+
}
351+
336352
/**
337353
* For a given {@link TypeCode}, it returns a corresponding <i>nullable</i> {@link Type}.
338354
* <br>
@@ -388,14 +404,12 @@ private static Type fromProtoType(@Nullable Descriptors.GenericDescriptor descri
388404
@Nonnull Descriptors.FieldDescriptor.Type protoType,
389405
@Nonnull FieldDescriptorProto.Label protoLabel,
390406
boolean isNullable) {
391-
final var typeCode = TypeCode.fromProtobufInfo(descriptor, protoType);
407+
final var typeCode = TypeCode.fromProtobufInfo(protoType);
392408
if (protoLabel == FieldDescriptorProto.Label.LABEL_REPEATED) {
393409
// collection type
394410
return fromProtoTypeToArray(descriptor, protoType, typeCode, false);
395411
} else if (typeCode.isPrimitive()) {
396412
return primitiveType(typeCode, isNullable);
397-
} else if (typeCode == TypeCode.UUID) {
398-
return Uuid.getInstance(isNullable);
399413
} else if (typeCode == TypeCode.ENUM) {
400414
final var enumDescriptor = (Descriptors.EnumDescriptor)Objects.requireNonNull(descriptor);
401415
return Enum.fromProtoValues(isNullable, enumDescriptor.getValues());
@@ -405,8 +419,10 @@ private static Type fromProtoType(@Nullable Descriptors.GenericDescriptor descri
405419
if (NullableArrayTypeUtils.describesWrappedArray(messageDescriptor)) {
406420
// find TypeCode of array elements
407421
final var elementField = messageDescriptor.findFieldByName(NullableArrayTypeUtils.getRepeatedFieldName());
408-
final var elementTypeCode = TypeCode.fromProtobufInfo(elementField.getMessageType(), elementField.getType());
422+
final var elementTypeCode = TypeCode.fromProtobufInfo(elementField.getType());
409423
return fromProtoTypeToArray(descriptor, protoType, elementTypeCode, true);
424+
} else if (Uuid.MESSAGE_NAME.equals(messageDescriptor.getName())) {
425+
return Type.uuidType(isNullable);
410426
} else {
411427
return Record.fromFieldDescriptorsMap(isNullable, Record.toFieldDescriptorMap(messageDescriptor.getFields()));
412428
}
@@ -627,7 +643,7 @@ static Type fromObject(@Nullable final Object object) {
627643
return Type.primitiveType(typeCode, false);
628644
}
629645
if (typeCode == TypeCode.UUID) {
630-
return Type.Uuid.getInstance(false);
646+
return Type.uuidType(false);
631647
}
632648
throw new RecordCoreException("Unable to convert value to Type")
633649
.addLogInfo(LogMessageKeys.VALUE, object);
@@ -786,8 +802,7 @@ private static BiMap<Class<?>, TypeCode> computeClassToTypeCodeMap() {
786802
* @return A corresponding {@link TypeCode} instance.
787803
*/
788804
@Nonnull
789-
public static TypeCode fromProtobufInfo(@Nullable Descriptors.GenericDescriptor descriptor,
790-
@Nonnull final Descriptors.FieldDescriptor.Type protobufType) {
805+
public static TypeCode fromProtobufInfo(@Nonnull final Descriptors.FieldDescriptor.Type protobufType) {
791806
switch (protobufType) {
792807
case DOUBLE:
793808
return TypeCode.DOUBLE;
@@ -804,10 +819,6 @@ public static TypeCode fromProtobufInfo(@Nullable Descriptors.GenericDescriptor
804819
case ENUM:
805820
return TypeCode.ENUM;
806821
case MESSAGE:
807-
Verify.verify(descriptor != null);
808-
if (Uuid.MESSAGE_NAME.equals(descriptor.getName())) {
809-
return TypeCode.UUID;
810-
}
811822
return TypeCode.RECORD;
812823
case BYTES:
813824
return TypeCode.BYTES;
@@ -2904,20 +2915,9 @@ public Array fromProto(@Nonnull final PlanSerializationContext serializationCont
29042915

29052916
class Uuid implements Type {
29062917

2907-
private static final Uuid NULL_INSTANCE = new Uuid(true);
2908-
private static final Uuid NON_NULL_INSTANCE = new Uuid(false);
2909-
29102918
public static final String MESSAGE_NAME = TupleFieldsProto.UUID.getDescriptor().getName();
29112919

2912-
final boolean isNullable;
2913-
2914-
public static Uuid getInstance(boolean nullable) {
2915-
if (nullable) {
2916-
return NULL_INSTANCE;
2917-
} else {
2918-
return NON_NULL_INSTANCE;
2919-
}
2920-
}
2920+
private final boolean isNullable;
29212921

29222922
private Uuid(boolean isNullable) {
29232923
this.isNullable = isNullable;
@@ -2937,9 +2937,9 @@ public boolean isNullable() {
29372937
@Override
29382938
public Type withNullability(final boolean newIsNullable) {
29392939
if (newIsNullable) {
2940-
return NULL_INSTANCE;
2940+
return UUID_NULL_INSTANCE;
29412941
} else {
2942-
return NON_NULL_INSTANCE;
2942+
return UUID_NON_NULL_INSTANCE;
29432943
}
29442944
}
29452945

@@ -2990,7 +2990,7 @@ public boolean isUuid() {
29902990
public static Uuid fromProto(@Nonnull final PlanSerializationContext serializationContext,
29912991
@Nonnull final PUuidType uuidTypeProto) {
29922992
Verify.verify(uuidTypeProto.hasIsNullable());
2993-
return Uuid.getInstance(uuidTypeProto.getIsNullable());
2993+
return Type.uuidType(uuidTypeProto.getIsNullable());
29942994
}
29952995

29962996

‎fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/query/plan/cascades/BooleanValueTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ class BooleanValueTest {
110110
private static final LiteralValue<String> ENUM_STRING_2 = new LiteralValue<>(Type.primitiveType(Type.TypeCode.STRING, false), "DIAMONDS");
111111
private static final LiteralValue<String> UUID_STRING_1 = new LiteralValue<>(Type.primitiveType(Type.TypeCode.STRING, false), "0920df1c-be81-4ec1-8a06-2180226f051d");
112112
private static final LiteralValue<String> UUID_STRING_2 = new LiteralValue<>(Type.primitiveType(Type.TypeCode.STRING, false), "a8708750-d70f-4800-8c3b-13700d5b369f");
113-
private static final LiteralValue<UUID> UUID_1 = new LiteralValue<>(Type.Uuid.getInstance(false), UUID.fromString(UUID_STRING_1.getLiteralValue()));
114-
private static final LiteralValue<UUID> UUID_2 = new LiteralValue<>(Type.Uuid.getInstance(false), UUID.fromString(UUID_STRING_2.getLiteralValue()));
115-
private static final LiteralValue<UUID> UUID_NULL = new LiteralValue<>(Type.Uuid.getInstance(true), null);
113+
private static final LiteralValue<UUID> UUID_1 = new LiteralValue<>(Type.uuidType(false), UUID.fromString(UUID_STRING_1.getLiteralValue()));
114+
private static final LiteralValue<UUID> UUID_2 = new LiteralValue<>(Type.uuidType(false), UUID.fromString(UUID_STRING_2.getLiteralValue()));
115+
private static final LiteralValue<UUID> UUID_NULL = new LiteralValue<>(Type.uuidType(true), null);
116116

117117
private static final LiteralValue<byte[]> BYTES_1 = new LiteralValue<>("foo".getBytes(StandardCharsets.UTF_8));
118118
private static final LiteralValue<byte[]> BYTES_2 = new LiteralValue<>("bar".getBytes(StandardCharsets.UTF_8));

‎fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/DataTypeUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public static Type toRecordLayerType(@Nonnull final DataType type) {
148148
primitivesMap.put(DataType.Primitives.BYTES.type(), Type.primitiveType(Type.TypeCode.BYTES, false));
149149
primitivesMap.put(DataType.Primitives.STRING.type(), Type.primitiveType(Type.TypeCode.STRING, false));
150150
primitivesMap.put(DataType.Primitives.VERSION.type(), Type.primitiveType(Type.TypeCode.VERSION, false));
151-
primitivesMap.put(DataType.Primitives.UUID.type(), Type.Uuid.getInstance(false));
151+
primitivesMap.put(DataType.Primitives.UUID.type(), Type.uuidType(false));
152152

153153
primitivesMap.put(DataType.Primitives.NULLABLE_BOOLEAN.type(), Type.primitiveType(Type.TypeCode.BOOLEAN, true));
154154
primitivesMap.put(DataType.Primitives.NULLABLE_INTEGER.type(), Type.primitiveType(Type.TypeCode.INT, true));
@@ -158,6 +158,6 @@ public static Type toRecordLayerType(@Nonnull final DataType type) {
158158
primitivesMap.put(DataType.Primitives.NULLABLE_BYTES.type(), Type.primitiveType(Type.TypeCode.BYTES, true));
159159
primitivesMap.put(DataType.Primitives.NULLABLE_STRING.type(), Type.primitiveType(Type.TypeCode.STRING, true));
160160
primitivesMap.put(DataType.Primitives.NULLABLE_VERSION.type(), Type.primitiveType(Type.TypeCode.VERSION, true));
161-
primitivesMap.put(DataType.Primitives.NULLABLE_UUID.type(), Type.Uuid.getInstance(true));
161+
primitivesMap.put(DataType.Primitives.NULLABLE_UUID.type(), Type.uuidType(true));
162162
}
163163
}

0 commit comments

Comments
 (0)