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

fix: do not throw error if VALUE_DELIMITER is set on non-DELIMITED topic #4366

Merged
merged 1 commit into from
Jan 23, 2020
Merged

fix: do not throw error if VALUE_DELIMITER is set on non-DELIMITED topic #4366

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
5 changes: 0 additions & 5 deletions ksql-common/src/main/java/io/confluent/ksql/serde/FormatInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ private FormatInfo(
}

this.delimiter = Objects.requireNonNull(delimiter, "delimiter");

if (format != Format.DELIMITED && delimiter.isPresent()) {
throw new KsqlException("Delimeter only supported with DELIMITED format");
}

}

public Format getFormat() {
Expand Down
20 changes: 0 additions & 20 deletions ksql-common/src/test/java/io/confluent/ksql/serde/FormatInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,24 +123,4 @@ public void shouldGetAvroSchemaName() {
assertThat(FormatInfo.of(AVRO, Optional.empty(), Optional.empty()).getFullSchemaName(),
is(Optional.empty()));
}

@Test
public void shouldThrowWhenAttemptingToUseValueDelimeterWithAvroFormat() {
// Then:
expectedException.expect(KsqlException.class);
expectedException.expectMessage("Delimeter only supported with DELIMITED format");

// When:
FormatInfo.of(Format.AVRO, Optional.of("something"), Optional.of(Delimiter.of('x')));
}

@Test
public void shouldThrowWhenAttemptingToUseValueDelimeterWithJsonFormat() {
// Then:
expectedException.expect(KsqlException.class);
expectedException.expectMessage("Delimeter only supported with DELIMITED format");

// When:
FormatInfo.of(Format.JSON, Optional.empty(), Optional.of(Delimiter.of('x')));
}
}
1 change: 1 addition & 0 deletions ksql-engine/src/main/java/io/confluent/ksql/analyzer/Analyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ private Optional<Delimiter> getValueDelimiter(final Sink sink) {
if (sink.getProperties().getValueDelimiter().isPresent()) {
return sink.getProperties().getValueDelimiter();
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra new line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's intentional - I thought it was cleaner to read with a new line than without

return analysis
.getFromDataSources()
.get(0)
Expand Down
38 changes: 17 additions & 21 deletions ksql-functional-tests/src/test/resources/query-validation-tests/delimited.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@
{"topic": "S2", "key": "100", "value": "100,100,100", "timestamp": 0}
]
},
{
"name": "select delimited value_format into another format",
"format": ["JSON", "AVRO"],
"statements": [
"CREATE STREAM TEST (ID bigint, NAME varchar, VALUE integer) WITH (kafka_topic='test_topic', value_format='DELIMITED', value_delimiter=',');",
"CREATE STREAM S2 WITH(value_format='{FORMAT}') as SELECT id, name, value FROM test;"
],
"inputs": [
{"topic": "test_topic", "key": "0", "value": "0,zero,0", "timestamp": 0}
],
"outputs": [
{"topic": "S2", "key": "0", "value": {"ID": 0, "NAME": "zero", "VALUE": 0}, "timestamp": 0}
]
},
{
"name": "validate value_delimiter to be single character",
"statements": [
Expand All @@ -35,7 +49,7 @@
"outputs": []
},
{
"name": "validate delimeter is not empty",
"name": "validate delimiter is not empty",
"statements": [
"CREATE STREAM TEST WITH (kafka_topic='test_topic', value_format='DELIMITED', value_delimiter='');"
],
Expand All @@ -53,7 +67,7 @@
"outputs": []
},
{
"name": "validate delimeter is not a space",
"name": "validate delimiter is not a space",
"statements": [
"CREATE STREAM TEST WITH (kafka_topic='test_topic', value_format='DELIMITED', value_delimiter=' ');"
],
Expand All @@ -65,7 +79,7 @@
"outputs": []
},
{
"name": "validate delimeter is not a tab character",
"name": "validate delimiter is not a tab character",
"statements": [
"CREATE STREAM TEST WITH (kafka_topic='test_topic', value_format='DELIMITED', value_delimiter='\t');"
],
Expand Down Expand Up @@ -151,24 +165,6 @@
{"topic": "S2", "key": "100", "value": "100\t100\t500", "timestamp": 0},
{"topic": "S2", "key": "100", "value": "100\t100\t100", "timestamp": 0}
]
},
{
"name": "validate cannot specify delimeter with json format",
"statements": [
"CREATE STREAM TEST WITH (kafka_topic='test_topic', value_format='JSON', value_delimiter='|');"
],
"topics": [
{
"name": "test_topic",
"format": "JSON"
}
],
"expectedException": {
"type": "io.confluent.ksql.util.KsqlStatementException",
"message": "Delimeter only supported with DELIMITED format"
},
"inputs": [],
"outputs": []
}
]
}
10 changes: 5 additions & 5 deletions ksql-serde/src/test/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,16 @@ public void shouldSerializeNegativeDecimalWithPaddedZeros() {
}

@Test
public void shouldSerializeRowCorrectlyWithTabDelimeter() {
shouldSerializeRowCorrectlyWithNonDefaultDelimeter('\t');
public void shouldSerializeRowCorrectlyWithTabDelimiter() {
shouldSerializeRowCorrectlyWithNonDefaultDelimiter('\t');
}

@Test
public void shouldSerializeRowCorrectlyWithBarDelimeter() {
shouldSerializeRowCorrectlyWithNonDefaultDelimeter('|');
public void shouldSerializeRowCorrectlyWithBarDelimiter() {
shouldSerializeRowCorrectlyWithNonDefaultDelimiter('|');
}

private void shouldSerializeRowCorrectlyWithNonDefaultDelimeter(final char delimiter) {
private void shouldSerializeRowCorrectlyWithNonDefaultDelimiter(final char delimiter) {
// Given:
final Struct data = new Struct(SCHEMA)
.put("ORDERTIME", 1511897796092L)
Expand Down