DBZ-1969 Fixing incorrect assertion and utility which concealed this

This commit is contained in:
Gunnar Morling 2020-04-29 11:59:46 +02:00 committed by Chris Cranford
parent f718302d36
commit 2310d6c792
3 changed files with 3 additions and 4 deletions

View File

@ -28,6 +28,7 @@ Ben Hardesty
Ben Williams
Bin Li
Bingqin Zhou
Braden Groom
Braden Staudacher
Brandon Brown
Brandon Maguire

View File

@ -2130,7 +2130,7 @@ public void shouldStreamEnumArrayAsKnownType() throws Exception {
List<SchemaAndValueField> expectedUpdate = Arrays.asList(
new SchemaAndValueField(PK_FIELD, Schema.INT32_SCHEMA, 1),
new SchemaAndValueField("value", SchemaBuilder.array(Enum.builder("V1"))
new SchemaAndValueField("value", SchemaBuilder.array(Enum.builder("V1,V2"))
.parameter(TestHelper.TYPE_NAME_PARAMETER_KEY, "_TEST_TYPE")
.parameter(TestHelper.TYPE_LENGTH_PARAMETER_KEY, String.valueOf(Integer.MAX_VALUE))
.parameter(TestHelper.TYPE_SCALE_PARAMETER_KEY, "0")

View File

@ -1090,9 +1090,7 @@ private static boolean areConnectSchemasEqual(Schema schema1, Schema schema2) {
valueSchemasEqual = Objects.equals(schema1.valueSchema(), schema2.valueSchema());
}
else if (schema1.type() == Type.ARRAY && schema2.type() == Type.ARRAY) {
String valueSchema1String = SchemaUtil.asString(schema1.valueSchema());
String valueSchema2String = SchemaUtil.asString(schema2.valueSchema());
valueSchemasEqual = valueSchema1String.equals(valueSchema2String);
valueSchemasEqual = areConnectSchemasEqual(schema1.valueSchema(), schema2.valueSchema());
}
else if (schema1.type() == Type.STRUCT && schema2.type() == Type.STRUCT) {
fieldsEqual = areFieldListsEqual(schema1.fields(), schema2.fields());