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

Fixed unintentionally finished of the page output after the first file was processed. #2

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Fixed unintentionally finished of the page output after the first file was processed. #2

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
29 changes: 28 additions & 1 deletion src/main/java/org/embulk/parser/poi_excel/PoiExcelParserPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.embulk.parser.poi_excel.visitor.PoiExcelVisitorValue;
import org.embulk.spi.Exec;
import org.embulk.spi.FileInput;
import org.embulk.spi.Page;
import org.embulk.spi.PageBuilder;
import org.embulk.spi.PageOutput;
import org.embulk.spi.ParserPlugin;
Expand Down Expand Up @@ -233,6 +234,7 @@ public void run(TaskSource taskSource, Schema schema, FileInput input, PageOutpu
}

try (FileInputInputStream is = new FileInputInputStream(input)) {
final PageOutput neverFinishOutput = new OnlyAddPageOutput(output); // never finish while iterating files
while (is.nextFile()) {
Workbook workbook;
try {
Expand All @@ -245,8 +247,9 @@ public void run(TaskSource taskSource, Schema schema, FileInput input, PageOutpu
if (log.isDebugEnabled()) {
log.debug("resolved sheet names={}", list);
}
run(task, schema, input, workbook, list, output);
run(task, schema, input, workbook, list, neverFinishOutput);
}
output.finish(); // explicitly finish at the end
}
}

Expand Down Expand Up @@ -297,6 +300,30 @@ private List<String> resolveSheetName(Workbook workbook, List<String> sheetNames
return new ArrayList<>(set);
}

// Wrapper for output that only add page
private static class OnlyAddPageOutput implements PageOutput {
private final PageOutput output;

OnlyAddPageOutput(PageOutput output) {
this.output = output;
}

@Override
public void add(Page page) {
output.add(page);
}

@Override
public void finish() {
// do nothing
}

@Override
public void close() {
// do nothing
}
}

protected void run(PluginTask task, Schema schema, FileInput input, Workbook workbook, List<String> sheetNames, PageOutput output) {
final int flushCount = task.getFlushCount();

Expand Down
Loading