Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support avro types for nullable fields generated by Connect. #592

Merged
merged 4 commits into from
Jan 10, 2018
Merged

Support avro types for nullable fields generated by Connect. #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
489ae8b
Support avro types for nullable fields generated by Connect.
hjafarpour Jan 4, 2018
e45199f
Applied review feedback.
hjafarpour Jan 5, 2018
4898842
Applied review feedback.
hjafarpour Jan 8, 2018
b69fc09
Merge remote-tracking branch 'upstream/master' into KSQL-515-handle-n…
hjafarpour Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ksql-engine/src/main/java/io/confluent/ksql/util/SerDeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaBuilder;

import java.util.List;


public class SerDeUtil {
Expand Down Expand Up @@ -54,6 +55,20 @@ private static Schema getKSQLSchemaForAvroSchema(org.apache.avro.Schema avroSche
case MAP:
return SchemaBuilder.map(Schema.STRING_SCHEMA,
getKSQLSchemaForAvroSchema(avroSchema.getValueType()));
case UNION:
List<org.apache.avro.Schema> schemaList = avroSchema.getTypes();
if (schemaList.size() == 1) {
return getKSQLSchemaForAvroSchema(schemaList.get(0));
} else if (schemaList.size() == 2) {
if (schemaList.get(0).getType() == org.apache.avro.Schema.Type.NULL) {
return getKSQLSchemaForAvroSchema(schemaList.get(1));
} else if (schemaList.get(1).getType() == org.apache.avro.Schema.Type.NULL) {
return getKSQLSchemaForAvroSchema(schemaList.get(0));
}
}
throw new KsqlException(String.format("Union type cannot have more than two types and "
+ "one of them should be null."));

default:
throw new KsqlException(String.format("Cannot find correct type for avro type: %s",
avroSchema.getFullName()));
Expand Down
196 changes: 196 additions & 0 deletions ksql-engine/src/test/java/io/confluent/ksql/util/SerDeUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
/**
* Copyright 2017 Confluent Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/

package io.confluent.ksql.util;

import org.apache.kafka.connect.data.Schema;
import org.junit.Test;
import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.fail;


public class SerDeUtilTest {

String avroSchemaStr = "{\n"
+ " \"type\": \"record\",\n"
+ " \"name\": \"LOGON\",\n"
+ " \"namespace\": \"ORCL.SOE2\",\n"
+ " \"fields\": [\n"
+ " {\n"
+ " \"name\": \"table\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"op_type\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"op_ts\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"current_ts\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"pos\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"LOGON_ID\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"double\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"CUSTOMER_ID\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"double\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"LOGON_DATE\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " }\n"
+ " ],\n"
+ " \"connect.name\": \"ORCL.SOE2.LOGON\"\n"
+ "}";

@Test
public void shouldReturnCorrectKsqlSchema() {
Schema schema = SerDeUtil.getSchemaFromAvro(avroSchemaStr);
assertThat("Incorrect schema.", schema.fields().size(), equalTo(8));
assertThat("Incorrect field schema.", schema.fields().get(0).schema(), equalTo(Schema.STRING_SCHEMA));
assertThat("Incorrect field schema.", schema.fields().get(1).schema(), equalTo(Schema
.STRING_SCHEMA));
assertThat("Incorrect field schema.", schema.fields().get(2).schema(), equalTo(Schema
.STRING_SCHEMA));
assertThat("Incorrect field schema.", schema.fields().get(3).schema(), equalTo(Schema
.STRING_SCHEMA));
assertThat("Incorrect field schema.", schema.fields().get(4).schema(), equalTo(Schema
.STRING_SCHEMA));
assertThat("Incorrect field schema.", schema.fields().get(5).schema(), equalTo(Schema
.FLOAT64_SCHEMA));
assertThat("Incorrect field schema.", schema.fields().get(6).schema(), equalTo(Schema
.FLOAT64_SCHEMA));
assertThat("Incorrect field schema.", schema.fields().get(7).schema(), equalTo(Schema
.STRING_SCHEMA));
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add some negative cases for union validation?


@Test
public void shouldFailForUnsupportedUnion() {

String avroSchemaStr = "{\n"
+ " \"type\": \"record\",\n"
+ " \"name\": \"LOGON\",\n"
+ " \"namespace\": \"ORCL.SOE2\",\n"
+ " \"fields\": [\n"
+ " {\n"
+ " \"name\": \"table\",\n"
+ " \"type\": [\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"LOGON_DATE\",\n"
+ " \"type\": [\n"
+ " \"null\",\n"
+ " \"int\",\n"
+ " \"long\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " }\n"
+ " ],\n"
+ " \"connect.name\": \"ORCL.SOE2.LOGON\"\n"
+ "}";

try {
Schema schema = SerDeUtil.getSchemaFromAvro(avroSchemaStr);
fail();
} catch (KsqlException ksqlException) {
assertThat(ksqlException.getMessage(), equalTo("Union type cannot have more than two "
+ "types and one of them should be null."));
}
}

@Test
public void shouldFailForUnionWithNoNull() {

String avroSchemaStr = "{\n"
+ " \"type\": \"record\",\n"
+ " \"name\": \"LOGON\",\n"
+ " \"namespace\": \"ORCL.SOE2\",\n"
+ " \"fields\": [\n"
+ " {\n"
+ " \"name\": \"table\",\n"
+ " \"type\": [\n"
+ " \"string\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"LOGON_DATE\",\n"
+ " \"type\": [\n"
+ " \"string\",\n"
+ " \"long\"\n"
+ " ],\n"
+ " \"default\": null\n"
+ " }\n"
+ " ],\n"
+ " \"connect.name\": \"ORCL.SOE2.LOGON\"\n"
+ "}";

try {
Schema schema = SerDeUtil.getSchemaFromAvro(avroSchemaStr);
fail();
} catch (KsqlException ksqlException) {
assertThat(ksqlException.getMessage(), equalTo("Union type cannot have more than two "
+ "types and one of them should be null."));
}
}

}