Skip to content

KAFKA-8523 Enabling InsertField transform to be used with tombstone events #6914

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

Merged
rhauch merged 2 commits into from
Oct 3, 2019
Merged

KAFKA-8523 Enabling InsertField transform to be used with tombstone events #6914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63762e8
KAFKA-8523 Avoiding raw type usage
gunnarmorling Jun 11, 2019
c327e31
KAFKA-8523 Gracefully handling tombstone events in InsertField SMT
gunnarmorling Sep 27, 2019
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
8 changes: 7 additions & 1 deletion connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,19 @@ public void configure(Map<String, ?> props) {

@Override
public R apply(R record) {
if (operatingSchema(record) == null) {
if (isTombstoneRecord(record)) {
return record;
} else if (operatingSchema(record) == null) {
return applySchemaless(record);
} else {
return applyWithSchema(record);
}
}

private boolean isTombstoneRecord(R record) {
return record.value() == null;
}

private R applySchemaless(R record) {
final Map<String, Object> value = requireMap(operatingValue(record), PURPOSE);

Expand Down
52 changes: 47 additions & 5 deletions connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertFieldTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,53 @@ public void schemalessInsertConfiguredFields() {

final SourceRecord transformedRecord = xform.apply(record);

assertEquals(42L, ((Map) transformedRecord.value()).get("magic"));
assertEquals("test", ((Map) transformedRecord.value()).get("topic_field"));
assertEquals(0, ((Map) transformedRecord.value()).get("partition_field"));
assertEquals(null, ((Map) transformedRecord.value()).get("timestamp_field"));
assertEquals("my-instance-id", ((Map) transformedRecord.value()).get("instance_id"));
assertEquals(42L, ((Map<?, ?>) transformedRecord.value()).get("magic"));
assertEquals("test", ((Map<?, ?>) transformedRecord.value()).get("topic_field"));
assertEquals(0, ((Map<?, ?>) transformedRecord.value()).get("partition_field"));
assertEquals(null, ((Map<?, ?>) transformedRecord.value()).get("timestamp_field"));
assertEquals("my-instance-id", ((Map<?, ?>) transformedRecord.value()).get("instance_id"));
}


@Test
public void insertConfiguredFieldsIntoTombstoneEventWithoutSchemaLeavesValueUnchanged() {
final Map<String, Object> props = new HashMap<>();
props.put("topic.field", "topic_field!");
props.put("partition.field", "partition_field");
props.put("timestamp.field", "timestamp_field?");
props.put("static.field", "instance_id");
props.put("static.value", "my-instance-id");

xform.configure(props);

final SourceRecord record = new SourceRecord(null, null, "test", 0,
null, null);

final SourceRecord transformedRecord = xform.apply(record);

assertEquals(null, transformedRecord.value());
assertEquals(null, transformedRecord.valueSchema());
}

@Test
public void insertConfiguredFieldsIntoTombstoneEventWithSchemaLeavesValueUnchanged() {
final Map<String, Object> props = new HashMap<>();
props.put("topic.field", "topic_field!");
props.put("partition.field", "partition_field");
props.put("timestamp.field", "timestamp_field?");
props.put("static.field", "instance_id");
props.put("static.value", "my-instance-id");

xform.configure(props);

final Schema simpleStructSchema = SchemaBuilder.struct().name("name").version(1).doc("doc").field("magic", Schema.OPTIONAL_INT64_SCHEMA).build();

final SourceRecord record = new SourceRecord(null, null, "test", 0,
simpleStructSchema, null);

final SourceRecord transformedRecord = xform.apply(record);

assertEquals(null, transformedRecord.value());
assertEquals(simpleStructSchema, transformedRecord.valueSchema());
}
}