Copilot commented on code in PR #9608: URL: https://github.com/apache/seatunnel/pull/9608#discussion_r2227072794
########## seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/reader/StreamLineSplitterTest.java: ########## @@ -0,0 +1,227 @@ +/* + * 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.seatunnel.connectors.seatunnel.file.reader; + +import org.apache.seatunnel.connectors.seatunnel.file.source.reader.TextReadStrategy; + +import org.junit.jupiter.api.Test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class StreamLineSplitterTest { + + @Test + void testDefaultLineDelimiterWithReadLine() throws IOException { + String input = "line1\nline2\nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testDefaultLineDelimiterWithSkipHeader() throws IOException { + String input = "header1\nheader2\nline1\nline2\nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 2, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testCustomDelimiter() throws IOException { + String input = "line1|||line2|||line3|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testCustomDelimiterWithSkipHeader() throws IOException { + String input = "header1|||header2|||line1|||line2|||line3|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 2, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testEmptyLines() throws IOException { + String input = "line1\n\nline2\n \nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testPartialDelimiter() throws IOException { + String input = "line1||line2|||line3|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(2, lines.size()); + assertEquals("line1||line2", lines.get(0)); + assertEquals("line3", lines.get(1)); + } + + @Test + void testEmptyInput() throws IOException { + String input = ""; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertTrue(lines.isEmpty()); + } + + @Test + void testOnlyDelimiters() throws IOException { + String input = "|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(0, lines.size()); + } + + @Test + void testCarriageReturnLineFeed() throws IOException { + String input = "line1\r\nline2\r\nline3\r\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\r\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + /** Be consistent with the previous behavior */ + @Test + void testMixedDelimiters() throws IOException { + String input = "line1\nline2\r\nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + System.out.println("Actual lines: " + lines); + for (int i = 0; i < lines.size(); i++) { + System.out.println("Line " + i + ": '" + lines.get(i) + "'"); Review Comment: Debug print statements should not be left in production test code. Consider removing or replacing with proper logging. ```suggestion logger.info("Actual lines: " + lines); for (int i = 0; i < lines.size(); i++) { logger.info("Line " + i + ": '" + lines.get(i) + "'"); ``` ########## seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/reader/StreamLineSplitterTest.java: ########## @@ -0,0 +1,227 @@ +/* + * 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.seatunnel.connectors.seatunnel.file.reader; + +import org.apache.seatunnel.connectors.seatunnel.file.source.reader.TextReadStrategy; + +import org.junit.jupiter.api.Test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class StreamLineSplitterTest { + + @Test + void testDefaultLineDelimiterWithReadLine() throws IOException { + String input = "line1\nline2\nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testDefaultLineDelimiterWithSkipHeader() throws IOException { + String input = "header1\nheader2\nline1\nline2\nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 2, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testCustomDelimiter() throws IOException { + String input = "line1|||line2|||line3|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testCustomDelimiterWithSkipHeader() throws IOException { + String input = "header1|||header2|||line1|||line2|||line3|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 2, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testEmptyLines() throws IOException { + String input = "line1\n\nline2\n \nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testPartialDelimiter() throws IOException { + String input = "line1||line2|||line3|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(2, lines.size()); + assertEquals("line1||line2", lines.get(0)); + assertEquals("line3", lines.get(1)); + } + + @Test + void testEmptyInput() throws IOException { + String input = ""; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertTrue(lines.isEmpty()); + } + + @Test + void testOnlyDelimiters() throws IOException { + String input = "|||"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("|||", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(0, lines.size()); + } + + @Test + void testCarriageReturnLineFeed() throws IOException { + String input = "line1\r\nline2\r\nline3\r\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\r\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + /** Be consistent with the previous behavior */ + @Test + void testMixedDelimiters() throws IOException { + String input = "line1\nline2\r\nline3\n"; + List<String> lines = new ArrayList<>(); + + TextReadStrategy.StreamLineSplitter splitter = + new TextReadStrategy.StreamLineSplitter("\n", 0, lines::add); + try (BufferedReader reader = new BufferedReader(new StringReader(input))) { + splitter.processStream(reader); + } + + System.out.println("Actual lines: " + lines); + for (int i = 0; i < lines.size(); i++) { + System.out.println("Line " + i + ": '" + lines.get(i) + "'"); + } + Review Comment: Debug print statements should not be left in production test code. Consider removing the entire debug loop (lines 194-196). ```suggestion ``` ########## seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/source/reader/TextReadStrategy.java: ########## @@ -65,6 +66,106 @@ public class TextReadStrategy extends AbstractReadStrategy { private int[] indexes; private String encoding = FileBaseSourceOptions.ENCODING.defaultValue(); + /** Custom stream divider for splitting text streams by specified delimiters */ + public static class StreamLineSplitter { + private final String delimiter; + private final char[] delimiterChars; + private final StringBuilder lineBuffer; + private int delimiterIndex; + private int skipCount; + private final long skipHeaderNumber; + private final LineProcessor lineProcessor; + private final boolean useReadLine; + + public StreamLineSplitter( + String delimiter, long skipHeaderNumber, LineProcessor lineProcessor) { + this.delimiter = delimiter; + this.delimiterChars = delimiter.toCharArray(); + this.lineBuffer = new StringBuilder(); + this.delimiterIndex = 0; + this.skipCount = 0; + this.skipHeaderNumber = skipHeaderNumber; + this.lineProcessor = lineProcessor; + + this.useReadLine = isDefaultLineDelimiter(delimiter); + } + + private boolean isDefaultLineDelimiter(String delimiter) { + return "\n".equals(delimiter) || "\r\n".equals(delimiter); + } + + public void processStream(BufferedReader reader) throws IOException { + if (useReadLine) { + processWithReadLine(reader); + } else { + processWithCharByChar(reader); + } + } + + private void processWithReadLine(BufferedReader reader) throws IOException { + String line; + int lineCount = 0; + + while ((line = reader.readLine()) != null) { + if (lineCount >= skipHeaderNumber) { + if (!line.trim().isEmpty()) { + lineProcessor.processLine(line); + } + } else { + lineCount++; Review Comment: Logic error in skip header implementation: lineCount should be incremented before the condition check, not inside the else block. This causes one extra line to be skipped. ```suggestion lineCount++; if (lineCount > skipHeaderNumber) { if (!line.trim().isEmpty()) { lineProcessor.processLine(line); } ``` -- 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]
