Protobuf Validation & Conversion #691
Flow optimisation, module-info changes & bug fixes
- Loading branch information
commit a842df3675add8354f16777794ad559d505169be
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,5 +38,5 @@ bindings: | |
| catalog0: | ||
| - subject: test0 | ||
| version: latest | ||
| record: example | ||
| exit: test | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,11 +21,12 @@ | |
|
|
||
| import org.agrona.BitUtil; | ||
| import org.agrona.DirectBuffer; | ||
| import org.agrona.ExpandableDirectByteBuffer; | ||
| import org.agrona.collections.Int2IntHashMap; | ||
| import org.agrona.collections.Int2ObjectCache; | ||
| import org.agrona.collections.Object2ObjectHashMap; | ||
| import org.agrona.io.DirectBufferInputStream; | ||
| import org.agrona.io.ExpandableDirectBufferOutputStream; | ||
| import org.antlr.v4.runtime.BailErrorStrategy; | ||
| import org.antlr.v4.runtime.CharStream; | ||
| import org.antlr.v4.runtime.CharStreams; | ||
|
|
@@ -57,9 +58,10 @@ public class ProtobufValidator | |
| protected final String format; | ||
| protected final List<Integer> indexes; | ||
| protected final DirectBufferInputStream in; | ||
| protected final ExpandableDirectBufferOutputStream out; | ||
|
|
||
| private final Int2ObjectCache<FileDescriptor> descriptors; | ||
| private final Int2ObjectCache<DescriptorTree> tree; | ||
| private final Object2ObjectHashMap<String, DynamicMessage.Builder> builders; | ||
| private final FileDescriptor[] dependencies; | ||
| private final Int2IntHashMap paddings; | ||
|
|
@@ -76,12 +78,13 @@ protected ProtobufValidator( | |
| : config.subject; | ||
| this.format = config.format; | ||
| this.descriptors = new Int2ObjectCache<>(1, 1024, i -> {}); | ||
| this.tree = new Int2ObjectCache<>(1, 1024, i -> {}); | ||
| this.builders = new Object2ObjectHashMap<>(); | ||
| this.in = new DirectBufferInputStream(); | ||
| this.dependencies = new FileDescriptor[0]; | ||
| this.indexes = new LinkedList<>(); | ||
| this.paddings = new Int2IntHashMap(-1); | ||
| this.out = new ExpandableDirectBufferOutputStream(new ExpandableDirectByteBuffer()); | ||
| } | ||
|
|
||
| protected FileDescriptor supplyDescriptor( | ||
|
|
@@ -90,6 +93,12 @@ protected FileDescriptor supplyDescriptor( | |
| return descriptors.computeIfAbsent(schemaId, this::createDescriptors); | ||
| } | ||
|
|
||
| protected DescriptorTree supplyDescriptorTree( | ||
| int schemaId) | ||
| { | ||
| return tree.computeIfAbsent(schemaId, this::createDescriptorTree); | ||
| } | ||
|
|
||
| protected byte[] encodeIndexes() | ||
| { | ||
| int size = indexes.size(); | ||
|
|
@@ -118,6 +127,7 @@ protected int decodeIndexes( | |
| int length) | ||
| { | ||
| int progress = 0; | ||
| indexes.clear(); | ||
| int encodedLength = decodeIndex(data.getByte(index)); | ||
| progress += BitUtil.SIZE_OF_BYTE; | ||
| if (encodedLength == 0) | ||
|
|
@@ -135,7 +145,7 @@ protected int decodeIndexes( | |
| protected int supplyIndexPadding( | ||
| int schemaId) | ||
| { | ||
| return paddings.computeIfAbsent(schemaId, this::calculateIndexPadding); | ||
| } | ||
|
|
||
| protected int supplyJsonFormatPadding( | ||
|
|
@@ -148,14 +158,14 @@ protected DynamicMessage.Builder supplyDynamicMessageBuilder( | |
| Descriptors.Descriptor descriptor) | ||
| { | ||
| DynamicMessage.Builder builder; | ||
| if (builders.containsKey(descriptor.getFullName())) | ||
| { | ||
| builder = builders.get(descriptor.getFullName()); | ||
| } | ||
| else | ||
| { | ||
| builder = createDynamicMessageBuilder(descriptor); | ||
| builders.put(descriptor.getFullName(), builder); | ||
| } | ||
| return builder; | ||
| } | ||
|
|
@@ -181,12 +191,13 @@ private int decodeIndex( | |
| } | ||
|
|
||
| private int calculateIndexPadding( | ||
| int schemaId) | ||
| { | ||
| int padding = 0; | ||
| DescriptorTree trees = supplyDescriptorTree(schemaId); | ||
| if (trees != null && catalog.record != null) | ||
| { | ||
| DescriptorTree tree = trees.findByName(catalog.record); | ||
| if (tree != null) | ||
| { | ||
| padding = tree.indexes.size() + 1; | ||
|
|
@@ -245,4 +256,17 @@ private FileDescriptor createDescriptors( | |
| } | ||
| return descriptor; | ||
| } | ||
|
|
||
| private DescriptorTree createDescriptorTree( | ||
| int schemaId) | ||
| { | ||
| DescriptorTree tree = null; | ||
| FileDescriptor descriptor = supplyDescriptor(schemaId); | ||
|
|
||
| if (descriptor != null) | ||
| { | ||
| tree = new DescriptorTree(descriptor); | ||
| } | ||
| return tree; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,12 +15,12 @@ | |
| package io.aklivity.zilla.runtime.validator.protobuf; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStreamReader; | ||
| import java.util.function.LongFunction; | ||
|
|
||
| import org.agrona.DirectBuffer; | ||
| import org.agrona.concurrent.UnsafeBuffer; | ||
| import org.agrona.io.DirectBufferInputStream; | ||
|
|
||
| import com.google.protobuf.Descriptors; | ||
| import com.google.protobuf.DynamicMessage; | ||
|
|
@@ -36,15 +36,19 @@ | |
| public class ProtobufWriteValidator extends ProtobufValidator implements ValueValidator, FragmentValidator | ||
| { | ||
| private final DirectBuffer indexesRO; | ||
| private final InputStreamReader input; | ||
| private final DirectBufferInputStream in; | ||
| private final JsonFormat.Parser parser; | ||
|
|
||
| public ProtobufWriteValidator( | ||
| ProtobufValidatorConfig config, | ||
| LongFunction<CatalogHandler> supplyCatalog) | ||
| { | ||
| super(config, supplyCatalog); | ||
| this.indexesRO = new UnsafeBuffer(); | ||
| this.in = new DirectBufferInputStream(); | ||
| this.input = new InputStreamReader(in); | ||
| this.parser = JsonFormat.parser(); | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -113,19 +117,22 @@ private boolean validate( | |
| int length) | ||
| { | ||
| boolean status = false; | ||
| DescriptorTree trees = supplyDescriptorTree(schemaId); | ||
| if (trees != null && catalog.record != null) | ||
| { | ||
| DescriptorTree tree = trees.findByName(catalog.record); | ||
| if (tree != null) | ||
| { | ||
| Descriptors.Descriptor descriptor = tree.descriptor; | ||
| indexes.add(tree.indexes.size()); | ||
| indexes.addAll(tree.indexes); | ||
| in.wrap(buffer, index, length); | ||
| DynamicMessage.Builder builder = supplyDynamicMessageBuilder(descriptor); | ||
| try | ||
| { | ||
| builder.mergeFrom(in); | ||
| DynamicMessage message = builder.build(); | ||
| builder.clear(); | ||
| status = message.getUnknownFields().asMap().isEmpty(); | ||
| } | ||
| catch (IOException e) | ||
|
|
@@ -155,7 +162,8 @@ private int encode( | |
| indexesRO.wrap(encodeIndexes()); | ||
| valLength = indexes.size(); | ||
| } | ||
| indexes.clear(); | ||
| next.accept(indexesRO, 0, valLength); | ||
| next.accept(buffer, index, length); | ||
| return valLength + length; | ||
| } | ||
|
|
@@ -168,22 +176,22 @@ private int serializeJsonRecord( | |
| ValueConsumer next) | ||
| { | ||
| int valLength = -1; | ||
| DescriptorTree tree = supplyDescriptorTree(schemaId); | ||
| if (tree != null && catalog.record != null) | ||
| { | ||
| tree = tree.findByName(catalog.record); | ||
| if (tree != null) | ||
| { | ||
| Descriptors.Descriptor descriptor = tree.descriptor; | ||
| indexes.add(tree.indexes.size()); | ||
| indexes.addAll(tree.indexes); | ||
| DynamicMessage.Builder builder = supplyDynamicMessageBuilder(descriptor); | ||
| in.wrap(buffer, index, length); | ||
| try | ||
| { | ||
| parser.merge(input, builder); | ||
| DynamicMessage message = builder.build(); | ||
| builder.clear(); | ||
| if (message.isInitialized() && message.getUnknownFields().asMap().isEmpty()) | ||
| { | ||
| out.wrap(out.buffer()); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,9 +15,10 @@ | |
| module io.aklivity.zilla.runtime.validator.protobuf | ||
| { | ||
| requires org.antlr.antlr4.runtime; | ||
| requires protobuf.java; | ||
| requires io.aklivity.zilla.runtime.engine; | ||
|
|
||
| exports io.aklivity.zilla.runtime.validator.protobuf.config; | ||
|
|
||
| provides io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi | ||
| with io.aklivity.zilla.runtime.validator.protobuf.config.ProtobufValidatorConfigAdapter; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps
findByIndexesshould returnDescriptordirectly?