From 1401369d97b5acc229f584a2f0f0d183ba483d9f Mon Sep 17 00:00:00 2001 From: Nikolai Amelichev Date: Fri, 9 Aug 2024 18:37:56 +0200 Subject: [PATCH] FIX: Explicitly specify mapping mode (legacy vs recommended) for YqlTypeTest --- ...qlTypeTest.java => YqlTypeLegacyTest.java} | 8 +- .../ydb/YqlTypeRecommendedTest.java | 502 ++++++++++++++++++ 2 files changed, 507 insertions(+), 3 deletions(-) rename repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/{YqlTypeTest.java => YqlTypeLegacyTest.java} (98%) create mode 100644 repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeRecommendedTest.java diff --git a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeTest.java b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeLegacyTest.java similarity index 98% rename from repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeTest.java rename to repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeLegacyTest.java index 9131ce14..b9929121 100644 --- a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeTest.java +++ b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeLegacyTest.java @@ -7,6 +7,7 @@ import org.junit.Test; import tech.ydb.proto.ValueProtos; import tech.ydb.yoj.databind.DbType; +import tech.ydb.yoj.databind.FieldValueType; import tech.ydb.yoj.databind.schema.Column; import tech.ydb.yoj.databind.schema.GlobalIndex; import tech.ydb.yoj.databind.schema.ObjectSchema; @@ -27,9 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class YqlTypeTest { +public class YqlTypeLegacyTest { static { CommonConverters.defineJsonConverter(JacksonJsonConverter.getDefault()); + YqlPrimitiveType.useLegacyMappingFor(FieldValueType.values()); } @Test @@ -179,7 +181,7 @@ public void testBasicMappingAndId() { ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.UTF8, - ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.UTF8, // columns @@ -189,7 +191,7 @@ public void testBasicMappingAndId() { ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.UTF8, - ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.STRING, ValueProtos.Type.PrimitiveTypeId.UTF8), schema.flattenFields().stream() diff --git a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeRecommendedTest.java b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeRecommendedTest.java new file mode 100644 index 00000000..cb67b6da --- /dev/null +++ b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeRecommendedTest.java @@ -0,0 +1,502 @@ +package tech.ydb.yoj.repository.ydb; + +import lombok.AllArgsConstructor; +import lombok.NonNull; +import lombok.Value; +import org.junit.Assert; +import org.junit.Test; +import tech.ydb.proto.ValueProtos; +import tech.ydb.yoj.databind.DbType; +import tech.ydb.yoj.databind.FieldValueType; +import tech.ydb.yoj.databind.schema.Column; +import tech.ydb.yoj.databind.schema.GlobalIndex; +import tech.ydb.yoj.databind.schema.ObjectSchema; +import tech.ydb.yoj.databind.schema.Schema; +import tech.ydb.yoj.repository.db.Entity; +import tech.ydb.yoj.repository.db.common.CommonConverters; +import tech.ydb.yoj.repository.db.exception.ConversionException; +import tech.ydb.yoj.repository.db.json.JacksonJsonConverter; +import tech.ydb.yoj.repository.test.sample.model.NonDeserializableObject; +import tech.ydb.yoj.repository.ydb.yql.YqlPrimitiveType; +import tech.ydb.yoj.repository.ydb.yql.YqlType; + +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + +public class YqlTypeRecommendedTest { + static { + CommonConverters.defineJsonConverter(JacksonJsonConverter.getDefault()); + YqlPrimitiveType.useRecommendedMappingFor(FieldValueType.values()); + } + + @Test + public void fromYqlMustThrowConversionExceptionIfValueIsNonDeserializable() { + record WithNonDeserializableObject(NonDeserializableObject object) { + } + + Schema schema = new Schema<>(WithNonDeserializableObject.class) { + }; + + assertThatExceptionOfType(ConversionException.class) + .isThrownBy(() -> + YqlType.of(schema.getField("object")).fromYql(ValueProtos.Value.newBuilder() + .setTextValue("{}") + .build()) + ); + } + + @Test + public void toYqlMustThrowConversionExceptionIfValueIsNonSerializable() { + record WithNonSerializableObject(NonSerializableObject object) { + } + + Schema schema = new Schema<>(WithNonSerializableObject.class) { + }; + + assertThatExceptionOfType(ConversionException.class) + .isThrownBy(() -> YqlType.of(schema.getField("object")).toYql(new NonSerializableObject())); + } + + @Test + public void unknownEnumValuesAreDeserializedAsNull() { + record WithEmptyEnum(EmptyEnum emptyEnum) { + } + + Schema schema = new Schema<>(WithEmptyEnum.class) { + }; + + assertThat(YqlType.of(schema.getField("emptyEnum")).fromYql(ValueProtos.Value.newBuilder().setTextValue("UZHOS").build())) + .isNull(); + } + + @Test + public void testSimpleListResponse() { + Schema schema = new Schema<>(TestResponse.class) { + }; + var actual = YqlType.of(schema.getField("simpleListValue")).fromYql( + ValueProtos.Value.newBuilder() + .addItems(ValueProtos.Value.newBuilder().setTextValue("1")) + .addItems(ValueProtos.Value.newBuilder().setTextValue("2")) + .build()); + Assert.assertEquals(List.of("1", "2"), actual); + + actual = YqlType.of(schema.getField("simpleListValue")).fromYql( + ValueProtos.Value.newBuilder() + .addItems(ValueProtos.Value.newBuilder().setTextValue("{\"name\":\"two\"}")) + .build()); + Assert.assertEquals(List.of("{\"name\":\"two\"}"), actual); + } + + @Test + public void testComplexListResponse() { + Schema schema = new Schema(TestResponse.class) { + }; + var actual = YqlType.of(schema.getField("complexListValue")).fromYql( + ValueProtos.Value.newBuilder() + .addItems(ValueProtos.Value.newBuilder() + .addPairs(ValueProtos.ValuePair.newBuilder() + .setKey(ValueProtos.Value.newBuilder().setTextValue("name")) + .setPayload(ValueProtos.Value.newBuilder().setTextValue("one")) + )) + .addItems(ValueProtos.Value.newBuilder() + .addPairs(ValueProtos.ValuePair.newBuilder() + .setKey(ValueProtos.Value.newBuilder().setTextValue("name")) + .setPayload(ValueProtos.Value.newBuilder().setTextValue("two")) + )) + .build()); + Assert.assertEquals(List.of(new ListItem("one"), new ListItem("two")), actual); + } + + @Test(expected = ConversionException.class) + public void testInvalidComplexListResponse() { + Schema schema = new Schema(TestResponse.class) { + }; + YqlType.of(schema.getField("complexListValue")).fromYql( + ValueProtos.Value.newBuilder() + .addItems(ValueProtos.Value.newBuilder().setTextValue("{\"name\":\"two\"}")) + .build()); + } + + @Test + public void testEmptyListResponse() { + Schema schema = new Schema(TestResponse.class) { + }; + Assert.assertEquals(List.of(), YqlType.of(schema.getField("complexListValue")).fromYql( + ValueProtos.Value.newBuilder().build())); + } + + @Test + public void testDictResponse() { + Schema schema = new Schema(TestResponse.class) { + }; + var actual = YqlType.of(schema.getField("complexDictResponse")).fromYql( + ValueProtos.Value.newBuilder() + .addPairs(ValueProtos.ValuePair.newBuilder() + .setKey(ValueProtos.Value.newBuilder().setTextValue("info")) + .setPayload(ValueProtos.Value.newBuilder() + .addPairs(ValueProtos.ValuePair.newBuilder() + .setKey(ValueProtos.Value.newBuilder().setTextValue("name")) + .setPayload(ValueProtos.Value.newBuilder().setTextValue("two") + )))).build()); + Assert.assertEquals(new DictItem(new ListItem("two")), actual); + } + + @Test + public void testEmptyDictResponse() { + Schema schema = new Schema(TestResponse.class) { + }; + Assert.assertEquals(Map.of(), YqlType.of(schema.getField("complexDictResponse")).fromYql( + ValueProtos.Value.newBuilder().build())); + } + + @Test + public void testBasicMapping() { + var schema = ObjectSchema.of(BasicMapping.class); + + Assert.assertEquals( + List.of(ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, + ValueProtos.Type.PrimitiveTypeId.UTF8), + schema.getFields().stream() + .map(YqlType::of) + .map(YqlPrimitiveType::getYqlType) + .collect(Collectors.toList())); + + } + + @Test + public void testBasicMappingAndId() { + var schema = ObjectSchema.of(BasicMappingAndId.class); + + Assert.assertEquals( + List.of(// primary key + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, + ValueProtos.Type.PrimitiveTypeId.UTF8, + // columns + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.UTF8, + ValueProtos.Type.PrimitiveTypeId.STRING, + ValueProtos.Type.PrimitiveTypeId.UTF8), + schema.flattenFields().stream() + .map(YqlType::of) + .map(YqlPrimitiveType::getYqlType) + .collect(Collectors.toList())); + + } + + @Test + public void testGlobalIndexSimple() { + var schema = ObjectSchema.of(GlobalIndexSimple.class); + Assert.assertEquals(List.of(new Schema.Index("idx1", List.of("id3"))), + schema.getGlobalIndexes()); + } + + @Test + public void testGlobalIndexMultiIndex() { + var schema = ObjectSchema.of(GlobalIndexMultiIndex.class); + Assert.assertEquals(List.of( + new Schema.Index("idx1", List.of("id_id1", "id_3")), + new Schema.Index("idx2", List.of("id_2", "id_3"))), + schema.getGlobalIndexes()); + } + + @Test + public void testGlobalIndexInvalidMultiIndexSameName() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> ObjectSchema.of(GlobalIndexInvalidMultiIndexSameName.class)) + .withMessage(String.format("index with name \"idx1\" already defined for %s", + GlobalIndexInvalidMultiIndexSameName.class)); + } + + @Test + public void testGlobalIndexInvalidEmptyIndexName() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> ObjectSchema.of(GlobalIndexInvalidEmptyIndexName.class)) + .withMessage(String.format("index defined for %s has no name", + GlobalIndexInvalidEmptyIndexName.class)); + } + + @Test + public void testGlobalIndexInvalidEmptyFieldList() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> ObjectSchema.of(GlobalIndexInvalidEmptyFieldList.class)) + .withMessage(String.format("index \"idx1\" defined for %s has no fields", + GlobalIndexInvalidEmptyFieldList.class)); + } + + @Test + public void testGlobalIndexInvalidInvalidField() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> ObjectSchema.of(GlobalIndexInvalidInvalidField.class)) + .withMessage(String.format("index \"idx1\" defined for %s tries to access unknown field \"id4\"", + GlobalIndexInvalidInvalidField.class)); + } + + @Test + public void testGlobalIndexInvalidInvalidFlattenField() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> ObjectSchema.of(GlobalIndexInvalidInvalidFlattenField.class)) + .withMessage(String.format("index \"idx1\" defined for %s tries to access unknown field \"id.id3\"", + GlobalIndexInvalidInvalidFlattenField.class)); + } + + @Test + public void testGlobalIndexInvalidNonFlatten() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> ObjectSchema.of(GlobalIndexInvalidNonFlatten.class)) + .withMessage(String.format("index \"idx1\" defined for %s tries to access non-flat field \"id\"", + GlobalIndexInvalidNonFlatten.class)); + } + + private enum EmptyEnum {} + + @Value + @AllArgsConstructor + public static class TestResponse { + String key; + List simpleListValue; + List complexListValue; + @Column(flatten = false) + DictItem complexDictResponse; + } + + @Value + @AllArgsConstructor + public static class DictItem { + ListItem info; + } + + @Value + @AllArgsConstructor + public static class ListItem { + @NonNull + String name; + } + + enum SampleEnum { + V1, V2 + } + + @AllArgsConstructor + public static class BasicMapping { + String v1; + @Column(dbType = DbType.STRING) + String v2; + @Column(dbType = DbType.UTF8) + String v3; + SampleEnum v4; + @Column(dbType = DbType.STRING) + SampleEnum v5; + @Column(dbType = DbType.UTF8) + SampleEnum v6; + } + + @AllArgsConstructor + public static class BasicMappingAndId implements Entity { + Id id; + String v1; + @Column(dbType = DbType.STRING) + String v2; + @Column(dbType = DbType.UTF8) + String v3; + SampleEnum v4; + @Column(dbType = DbType.STRING) + SampleEnum v5; + @Column(dbType = DbType.UTF8) + SampleEnum v6; + UUID v7; + @Column(dbType = DbType.STRING) + UUID v8; + @Column(dbType = DbType.UTF8) + UUID v9; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + @Column(dbType = DbType.STRING) + String id2; + @Column(dbType = DbType.UTF8) + String id3; + UUID id4; + @Column(dbType = DbType.STRING) + UUID id5; + @Column(dbType = DbType.UTF8) + UUID id6; + } + } + + @GlobalIndex(name = "idx1", fields = {"id3"}) + @AllArgsConstructor + public static class GlobalIndexSimple implements Entity { + Id id; + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + String id2; + } + } + + @GlobalIndex(name = "idx1", fields = {"id.id1", "id3"}) + @GlobalIndex(name = "idx2", fields = {"id.id2", "id3"}) + @AllArgsConstructor + public static class GlobalIndexMultiIndex implements Entity { + Id id; + @Column(name = "id_3") + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + @Column(name = "id_2") + String id2; + } + } + + @GlobalIndex(name = "idx1", fields = {"id.id1", "id3"}) + @GlobalIndex(name = "idx1", fields = {"id.id2", "id3"}) + @AllArgsConstructor + public static class GlobalIndexInvalidMultiIndexSameName implements Entity { + Id id; + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + String id2; + } + } + + @GlobalIndex(name = "", fields = {"id.id1", "id3"}) + @AllArgsConstructor + public static class GlobalIndexInvalidEmptyIndexName implements Entity { + Id id; + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + String id2; + } + + } + + @GlobalIndex(name = "idx1", fields = {}) + @AllArgsConstructor + public static class GlobalIndexInvalidEmptyFieldList implements Entity { + Id id; + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + String id2; + } + + } + + @GlobalIndex(name = "idx1", fields = {"id4"}) + @AllArgsConstructor + public static class GlobalIndexInvalidInvalidField implements Entity { + Id id; + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + String id2; + } + + } + + @GlobalIndex(name = "idx1", fields = {"id.id3"}) + @AllArgsConstructor + public static class GlobalIndexInvalidInvalidFlattenField implements Entity { + Id id; + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + String id2; + } + + } + + @GlobalIndex(name = "idx1", fields = {"id"}) + @AllArgsConstructor + public static class GlobalIndexInvalidNonFlatten implements Entity { + Id id; + String id3; + + @Override + public Id getId() { + return id; + } + + @AllArgsConstructor + public static class Id implements Entity.Id { + String id1; + String id2; + } + + } +}