Skip to content

Use streamType for parsing and validating protobuf decoder config #11544

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

Closed
navina wants to merge 1 commit into from
Closed

Use streamType for parsing and validating protobuf decoder config #11544

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
17 changes: 11 additions & 6 deletions pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/TableConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ public static void validate(TableConfig tableConfig, @Nullable Schema schema, @N
} catch (Exception e) {
throw new IllegalStateException("Could not create StreamConfig using the streamConfig map", e);
}
validateDecoder(streamConfig);
validateDecoder(streamConfig.getStreamConfigsMap().getOrDefault(StreamConfigProperties.STREAM_TYPE,
"kafka"), streamConfig);
}
validateTierConfigList(tableConfig.getTierConfigsList());
validateIndexingConfig(tableConfig.getIndexingConfig(), schema);
Expand Down Expand Up @@ -515,14 +516,18 @@ public static void validateIngestionAggregation(AggregationFunctionType function
}

@VisibleForTesting
static void validateDecoder(StreamConfig streamConfig) {
static void validateDecoder(String streamType, StreamConfig streamConfig) {
if (streamConfig.getDecoderClass().equals("org.apache.pinot.plugin.inputformat.protobuf.ProtoBufMessageDecoder")) {
String descriptorFileKey = String.format("stream.%s.decoder.prop.descriptorFile", streamType);
// check the existence of the needed decoder props
if (!streamConfig.getDecoderProperties().containsKey("stream.kafka.decoder.prop.descriptorFile")) {
throw new IllegalStateException("Missing property of descriptorFile for ProtoBufMessageDecoder");
if (!streamConfig.getDecoderProperties().containsKey(descriptorFileKey)) {
throw new IllegalStateException("Missing property of descriptorFile for ProtoBufMessageDecoder: "
+ descriptorFileKey);
}
if (!streamConfig.getDecoderProperties().containsKey("stream.kafka.decoder.prop.protoClassName")) {
throw new IllegalStateException("Missing property of protoClassName for ProtoBufMessageDecoder");
String protoClassName = String.format("stream.%s.decoder.prop.protoClassName", streamType);
if (!streamConfig.getDecoderProperties().containsKey(protoClassName)) {
throw new IllegalStateException("Missing property of protoClassName for ProtoBufMessageDecoder: "
+ protoClassName);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...egment-local/src/test/java/org/apache/pinot/segment/local/utils/TableConfigUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,14 +622,14 @@ public void ingestionStreamConfigsTest() {
"org.apache.pinot.plugin.inputformat.protobuf.ProtoBufMessageDecoder");
streamConfigs.put("stream.kafka.decoder.prop.descriptorFile", "file://test");
try {
TableConfigUtils.validateDecoder(new StreamConfig("test", streamConfigs));
TableConfigUtils.validateDecoder("kafka", new StreamConfig("test", streamConfigs));
} catch (IllegalStateException e) {
// expected
}
streamConfigs.remove("stream.kafka.decoder.prop.descriptorFile");
streamConfigs.put("stream.kafka.decoder.prop.protoClassName", "test");
try {
TableConfigUtils.validateDecoder(new StreamConfig("test", streamConfigs));
TableConfigUtils.validateDecoder("kafka", new StreamConfig("test", streamConfigs));
} catch (IllegalStateException e) {
// expected
}
Expand Down