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

Handle & calculate complex schema padding #1038

Merged
merged 1 commit into from
May 20, 2024
Merged

Handle & calculate complex schema padding #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 36 additions & 7 deletions ...el-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ public abstract class AvroModelHandler
private static final InputStream EMPTY_INPUT_STREAM = new ByteArrayInputStream(new byte[0]);
private static final OutputStream EMPTY_OUTPUT_STREAM = new ByteArrayOutputStream(0);
private static final int JSON_FIELD_STRUCTURE_LENGTH = "\"\":\"\",".length();
private static final int JSON_FIELD_UNION_LENGTH = "\"\":{\"DATA_TYPE\":\"\"},".length();
private static final int COMMA_LENGTH = ",".length();
private static final int JSON_FIELD_ARRAY_LENGTH = "\"\":[]," .length() + COMMA_LENGTH * 100;
private static final int JSON_FIELD_MAP_LENGTH = "\"\":{},".length();

protected final SchemaConfig catalog;
protected final CatalogHandler handler;
Expand Down Expand Up @@ -207,15 +211,40 @@ private int calculatePadding(
if (schema != null)
{
padding = 2;
for (Schema.Field field : schema.getFields())
if (schema.getType().equals(Schema.Type.RECORD))
{
if (field.schema().getType().equals(Schema.Type.RECORD))
for (Schema.Field field : schema.getFields())
{
padding += calculatePadding(field.schema());
}
else
{
padding += field.name().getBytes().length + JSON_FIELD_STRUCTURE_LENGTH;
switch (field.schema().getType())
{
case RECORD:
{
padding += calculatePadding(field.schema());
break;
}
case UNION:
{
padding += field.name().getBytes().length + JSON_FIELD_UNION_LENGTH;
break;
}
case MAP:
{
padding += field.name().getBytes().length + JSON_FIELD_MAP_LENGTH +
calculatePadding(field.schema().getValueType());
break;
}
case ARRAY:
{
padding += field.name().getBytes().length + JSON_FIELD_ARRAY_LENGTH +
calculatePadding(field.schema().getElementType());
break;
}
default:
{
padding += field.name().getBytes().length + JSON_FIELD_STRUCTURE_LENGTH;
break;
}
}
}
}
}
Expand Down
14 changes: 12 additions & 2 deletions ...model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ public class AvroModelTest
"{\"name\":\"status\",\"type\":\"string\"}]," +
"\"name\":\"Event\",\"namespace\":\"io.aklivity.example\",\"type\":\"record\"}";

private static final String COMPLEX_SCHEMA = "{\"type\":\"record\",\"name\":\"example\",\"namespace\":\"com.example\"," +
"\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"preferences\",\"" +
"type\":{\"type\":\"map\",\"values\":\"string\"}},{\"name\":\"attributes\",\"" +
"type\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"Attribute\"," +
"\"fields\":[{\"name\":\"value\",\"type\":\"string\"},{\"name\":\"timestamp\",\"type\":\"long\"}]}}}," +
"{\"name\":\"addresses\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Address\"," +
"\"fields\":[{\"name\":\"street\",\"type\":\"string\"},{\"name\":\"city\",\"type\":\"string\"}," +
"{\"name\":\"state\",\"type\":\"string\"},{\"name\":\"zip\",\"type\":\"string\"}]}}}," +
"{\"name\":\"source\",\"type\":[\"null\",\"string\"],\"default\":null}]}";

private final AvroModelConfig avroConfig = AvroModelConfig.builder()
.catalog()
.name("test0")
Expand Down Expand Up @@ -205,7 +215,7 @@ public void shouldVerifyPaddingLength()
{
TestCatalogOptionsConfig testCatalogOptionsConfig = TestCatalogOptionsConfig.builder()
.id(9)
.schema(SCHEMA)
.schema(COMPLEX_SCHEMA)
.build();
CatalogConfig catalogConfig = new CatalogConfig("test", "test0", "test", testCatalogOptionsConfig);
when(context.supplyCatalog(catalogConfig.id)).thenReturn(new TestCatalogHandler(testCatalogOptionsConfig));
Expand All @@ -228,7 +238,7 @@ public void shouldVerifyPaddingLength()
0x30, 0x10, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65};
data.wrap(bytes, 0, bytes.length);

assertEquals(22, converter.padding(data, 0, data.capacity()));
assertEquals(260, converter.padding(data, 0, data.capacity()));

}
}