Skip to content

perf: Clip column range instead of filtering in V2 DataLocator #1032

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nightscape wants to merge 2 commits into
base: main
Choose a base branch
from
Open

perf: Clip column range instead of filtering in V2 DataLocator #1032

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deb352b
perf: Clip column range instead of filtering in V2 DataLocator
nightscape Mar 31, 2026
b5a4fcb
Update src/main/scala/dev/mauch/spark/excel/v2/DataLocator.scala
nightscape Apr 1, 2026
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
21 changes: 9 additions & 12 deletions src/main/scala/dev/mauch/spark/excel/v2/DataLocator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,25 @@ trait DataLocator {
*/
def readFrom(workbook: Workbook): Iterator[Vector[Cell]]

private def readCells(r: org.apache.poi.ss.usermodel.Row, colInd: Range): Vector[Cell] = {
val lastCellNum = r.getLastCellNum.toInt
val effectiveCols = if (lastCellNum < colInd.last + 1) colInd.start to math.min(colInd.last, lastCellNum - 1)
else colInd
effectiveCols.map(r.getCell(_, MissingCellPolicy.CREATE_NULL_AS_BLANK)).toVector
Comment thread
nightscape marked this conversation as resolved.
Outdated
}

def actualReadFromSheet(options: ExcelOptions, sheet: Sheet, rowInd: Range, colInd: Range): Iterator[Vector[Cell]] = {
if (options.keepUndefinedRows) {
rowInd.iterator.map(rid => {
val r = sheet.getRow(rid)
if (r == null) { Vector.empty }
else {
colInd
.filter(_ < r.getLastCellNum)
.map(r.getCell(_, MissingCellPolicy.CREATE_NULL_AS_BLANK))
.toVector
}
else { readCells(r, colInd) }
})

} else {
sheet.iterator.asScala
.filter(r => rowInd.contains(r.getRowNum))
.map(r =>
colInd
.filter(_ < r.getLastCellNum)
.map(r.getCell(_, MissingCellPolicy.CREATE_NULL_AS_BLANK))
.toVector
)
.map(r => readCells(r, colInd))
.filter(_.exists(_.getCellType != CellType.BLANK)) // #965 filter rows that are completely empty
}
}
Expand Down
Loading