Skip to content

CSV Column Filtering support + Test #982

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

Open
sapienza88 wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −2
Open

CSV Column Filtering support + Test #982

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
9 changes: 7 additions & 2 deletions fesod-sheet/src/main/java/org/apache/fesod/sheet/analysis/csv/CsvExcelReadExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,16 @@ private void dealRecord(CSVRecord record, int rowIndex) {
csvReadContext.csvReadWorkbookHolder().globalConfiguration().getAutoTrim();
Boolean autoStrip =
csvReadContext.csvReadWorkbookHolder().globalConfiguration().getAutoStrip();
List<Integer> includeColumnIndexes = csvReadContext.readSheetHolder().getColumnIndexes();
while (cellIterator.hasNext()) {
String cellString = cellIterator.next();
int currentColumnIndex = columnIndex++;
if (includeColumnIndexes != null && !includeColumnIndexes.contains(currentColumnIndex)) {
continue;
}
ReadCellData<String> readCellData = new ReadCellData<>();
readCellData.setRowIndex(rowIndex);
readCellData.setColumnIndex(columnIndex);
readCellData.setColumnIndex(currentColumnIndex);

// csv is an empty string of whether <code>,,</code> is read or <code>,"",</code>
if (StringUtils.isNotBlank(cellString)) {
Expand All @@ -242,7 +247,7 @@ private void dealRecord(CSVRecord record, int rowIndex) {
} else {
readCellData.setType(CellDataTypeEnum.EMPTY);
}
cellMap.put(columnIndex++, readCellData);
cellMap.put(currentColumnIndex, readCellData);
}

RowTypeEnum rowType = MapUtils.isEmpty(cellMap) ? RowTypeEnum.EMPTY : RowTypeEnum.DATA;
Expand Down
29 changes: 29 additions & 0 deletions fesod-sheet/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.fesod.sheet.read.builder.ExcelReaderBuilder;
import org.apache.fesod.sheet.read.builder.ExcelReaderSheetBuilder;
import org.apache.fesod.sheet.read.listener.ReadListener;
Expand Down Expand Up @@ -247,4 +252,28 @@ void testReadSheet_withAllParams_shouldReturnBuilder() {
ExcelReaderSheetBuilder builder = FesodSheet.readSheet(0, "DataSheet", 100);
Assertions.assertNotNull(builder);
}

@Test
void testReadCsv_withColumnIndexes_shouldFilterColumns() throws Exception {

String csvContent = "1,Alice,30,Female\n2,Bob,25,Male";
File csvFile = tempDir.resolve("test_columns.csv").toFile();
FileUtils.writeStringToFile(csvFile, csvContent, StandardCharsets.UTF_8);

List<Integer> targetColumns = Arrays.asList(0, 2);

List<Map<Integer, String>> readResults = FesodSheet.read(csvFile)
.includeColumnIndexes(targetColumns)
.sheet(0)
.doReadSync();

Assertions.assertNotNull(readResults);
Assertions.assertEquals(2, readResults.size());

Map<Integer, String> row1 = readResults.get(0);
Assertions.assertEquals(2, row1.size(), "Should only contain the 2 filtered columns");
Assertions.assertEquals("1", row1.get(0));
Assertions.assertEquals("30", row1.get(2));
Assertions.assertNull(row1.get(1), "Column index 1 (Name) should be omitted");
}
}