RocMarshal commented on code in PR #27897: URL: https://github.com/apache/flink/pull/27897#discussion_r3087192857
########## flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/formats/raw/RawFormatLineDelimiterTest.java: ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.table.formats.raw; + +import org.apache.flink.api.common.serialization.DeserializationSchema; +import org.apache.flink.api.common.serialization.SerializationSchema; +import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.formats.raw.RawFormatDeserializationSchema; +import org.apache.flink.formats.raw.RawFormatSerializationSchema; +import org.apache.flink.metrics.MetricGroup; +import org.apache.flink.table.data.GenericRowData; +import org.apache.flink.table.data.RowData; +import org.apache.flink.table.data.StringData; +import org.apache.flink.table.types.logical.VarCharType; +import org.apache.flink.util.Collector; +import org.apache.flink.util.UserCodeClassLoader; + +import org.junit.jupiter.api.Test; + +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link RawFormatDeserializationSchema} and {@link RawFormatSerializationSchema} with + * the {@code raw.line-delimiter} option. + */ +class RawFormatLineDelimiterTest { + + private static final VarCharType STRING_TYPE = VarCharType.STRING_TYPE; + + // ----------------------------------------------------------------------- + // Deserialization tests + // ----------------------------------------------------------------------- + + @Test + void testDeserializeWithoutDelimiter_singleRow() throws Exception { + RawFormatDeserializationSchema schema = + new RawFormatDeserializationSchema( + STRING_TYPE, TypeInformation.of(RowData.class), "UTF-8", true, null); + openDeser(schema); + + List<RowData> rows = collectRows(schema, "hello".getBytes("UTF-8")); Review Comment: ```suggestion List<RowData> rows = collectRows(schema, "hello".getBytes(StandardCharsets.UTF_8)); ``` ########## flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/formats/raw/RawFormatLineDelimiterTest.java: ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.table.formats.raw; + +import org.apache.flink.api.common.serialization.DeserializationSchema; +import org.apache.flink.api.common.serialization.SerializationSchema; +import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.formats.raw.RawFormatDeserializationSchema; +import org.apache.flink.formats.raw.RawFormatSerializationSchema; +import org.apache.flink.metrics.MetricGroup; +import org.apache.flink.table.data.GenericRowData; +import org.apache.flink.table.data.RowData; +import org.apache.flink.table.data.StringData; +import org.apache.flink.table.types.logical.VarCharType; +import org.apache.flink.util.Collector; +import org.apache.flink.util.UserCodeClassLoader; + +import org.junit.jupiter.api.Test; + +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link RawFormatDeserializationSchema} and {@link RawFormatSerializationSchema} with + * the {@code raw.line-delimiter} option. + */ +class RawFormatLineDelimiterTest { + + private static final VarCharType STRING_TYPE = VarCharType.STRING_TYPE; + + // ----------------------------------------------------------------------- + // Deserialization tests + // ----------------------------------------------------------------------- + + @Test + void testDeserializeWithoutDelimiter_singleRow() throws Exception { + RawFormatDeserializationSchema schema = + new RawFormatDeserializationSchema( + STRING_TYPE, TypeInformation.of(RowData.class), "UTF-8", true, null); + openDeser(schema); + + List<RowData> rows = collectRows(schema, "hello".getBytes("UTF-8")); + assertThat(rows).hasSize(1); + assertThat(rows.get(0).getString(0).toString()).isEqualTo("hello"); Review Comment: ```suggestion assertThat(rows.get(0).getString(0)).hasToString("hello"); ``` ########## flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatDeserializationSchema.java: ########## @@ -55,6 +59,14 @@ public class RawFormatDeserializationSchema implements DeserializationSchema<Row private final boolean isBigEndian; + @Nullable private final String lineDelimiter; + + /** + * Pre-compiled pattern for splitting by {@link #lineDelimiter}, or {@code null} if no + * delimiter. + */ + @Nullable private final Pattern lineDelimiterPattern; Review Comment: Could we add a note indicating that these two attributes are either both null or both non-null? ########## flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatDeserializationSchema.java: ########## @@ -92,6 +116,41 @@ public RowData deserialize(byte[] message) throws IOException { return rowData; } + @Override + public void deserialize(byte[] message, Collector<RowData> out) throws IOException { + if (lineDelimiter == null) { + // no delimiter: default single-record behavior + RowData row = deserialize(message); + if (row != null) { + out.collect(row); + } + return; + } + + if (message == null) { + return; Review Comment: Should we follow the default serialization logic here? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
