Skip to content

Code cleanups for TestKafkaWithConfluentSchemaRegistryMinimalFunctionality #26280

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
merged 1 commit into from
Jul 25, 2025
Merged

Code cleanups for TestKafkaWithConfluentSchemaRegistryMinimalFunctionality #26280

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
68 changes: 21 additions & 47 deletions ...ugin/kafka/schema/confluent/TestKafkaWithConfluentSchemaRegistryMinimalFunctionality.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*/
package io.trino.plugin.kafka.schema.confluent;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import dev.failsafe.Failsafe;
Expand Down Expand Up @@ -93,7 +91,7 @@ public void testBasicTopic()
{
String topic = "topic-basic-MixedCase-" + randomNameSuffix();
assertTopic(
testingKafka, topic,
topic,
format("SELECT col_1, col_2 FROM %s", toDoubleQuoted(topic)),
format("SELECT col_1, col_2, col_3 FROM %s", toDoubleQuoted(topic)),
false,
Expand All @@ -108,7 +106,7 @@ public void testTopicWithKeySubject()
{
String topic = "topic-Key-Subject-" + randomNameSuffix();
assertTopic(
testingKafka, topic,
topic,
format("SELECT \"%s-key\", col_1, col_2 FROM %s", topic, toDoubleQuoted(topic)),
format("SELECT \"%s-key\", col_1, col_2, col_3 FROM %s", topic, toDoubleQuoted(topic)),
true,
Expand Down Expand Up @@ -182,7 +180,7 @@ public void testTopicWithRecordNameStrategy()
{
String topic = "topic-Record-Name-Strategy-" + randomNameSuffix();
assertTopic(
testingKafka, topic,
topic,
format("SELECT \"%1$s-key\", col_1, col_2 FROM \"%1$s&value-subject=%2$s\"", topic, RECORD_NAME),
format("SELECT \"%1$s-key\", col_1, col_2, col_3 FROM \"%1$s&value-subject=%2$s\"", topic, RECORD_NAME),
true,
Expand All @@ -198,7 +196,7 @@ public void testTopicWithTopicRecordNameStrategy()
{
String topic = "topic-Topic-Record-Name-Strategy-" + randomNameSuffix();
assertTopic(
testingKafka, topic,
topic,
format("SELECT \"%1$s-key\", col_1, col_2 FROM \"%1$s&value-subject=%1$s-%2$s\"", topic, RECORD_NAME),
format("SELECT \"%1$s-key\", col_1, col_2, col_3 FROM \"%1$s&value-subject=%1$s-%2$s\"", topic, RECORD_NAME),
true,
Expand Down Expand Up @@ -263,7 +261,6 @@ private static ImmutableMap.Builder<String, String> schemaRegistryAwareProducer(
}

private void assertTopic(
TestingKafka testingKafka,
String topicName,
String initialQuery,
String evolvedQuery,
Expand All @@ -278,10 +275,7 @@ private void assertTopic(
waitUntilTableExists(topicName);
assertCount(topicName, MESSAGE_COUNT);

QueryAssertions queryAssertions = new QueryAssertions(getQueryRunner());
queryAssertions.query(initialQuery)
.assertThat()
.containsAll(getExpectedValues(messages, INITIAL_SCHEMA, isKeyIncluded));
assertThat(query(initialQuery)).matches(getExpectedValues(messages, INITIAL_SCHEMA, isKeyIncluded));

List<ProducerRecord<Long, GenericRecord>> newMessages = createMessages(topicName, MESSAGE_COUNT, false);
testingKafka.sendMessages(newMessages.stream(), producerConfig);
Expand All @@ -291,9 +285,8 @@ private void assertTopic(
.addAll(newMessages)
.build();
assertCount(topicName, allMessages.size());
queryAssertions.query(evolvedQuery)
.assertThat()
.containsAll(getExpectedValues(messages, EVOLVED_SCHEMA, isKeyIncluded));

assertThat(query(evolvedQuery)).containsAll(getExpectedValues(messages, EVOLVED_SCHEMA, isKeyIncluded));
}

private static String getExpectedValues(List<ProducerRecord<Long, GenericRecord>> messages, Schema schema, boolean isKeyIncluded)
Expand Down Expand Up @@ -365,25 +358,25 @@ private void assertNotExists(String tableName)
private void waitUntilTableExists(String tableName)
{
Failsafe.with(
RetryPolicy.builder()
.withMaxAttempts(10)
.withDelay(Duration.ofMillis(100))
.build())
RetryPolicy.builder()
.withMaxAttempts(10)
.withDelay(Duration.ofMillis(100))
.build())
.run(() -> assertThat(schemaExists()).isTrue());
Failsafe.with(
RetryPolicy.builder()
.withMaxAttempts(10)
.withDelay(Duration.ofMillis(100))
.build())
RetryPolicy.builder()
.withMaxAttempts(10)
.withDelay(Duration.ofMillis(100))
.build())
.run(() -> assertThat(tableExists(tableName)).isTrue());
}

private boolean schemaExists()
{
return getQueryRunner().execute(format(
"SHOW SCHEMAS FROM %s LIKE '%s'",
getSession().getCatalog().orElseThrow(),
getSession().getSchema().orElseThrow()))
"SHOW SCHEMAS FROM %s LIKE '%s'",
getSession().getCatalog().orElseThrow(),
getSession().getSchema().orElseThrow()))
.getRowCount() == 1;
}

Expand Down Expand Up @@ -441,30 +434,11 @@ private static GenericRecord createRecordWithEvolvedSchema(long key)
.build();
}

private static class JsonValue
private record JsonValue(int id, String value)
{
private final int id;
private final String value;

@JsonCreator
public JsonValue(
@JsonProperty("id") int id,
@JsonProperty("value") String value)
{
this.id = id;
this.value = requireNonNull(value, "value is null");
}

@JsonProperty("id")
public int getId()
{
return id;
}

@JsonProperty("value")
public String getValue()
private JsonValue
{
return value;
requireNonNull(value, "value is null");
}
}
}