Skip to content

Empty csv fix #835

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

Merged
merged 3 commits into from
Aug 23, 2024
Merged

Empty csv fix #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13d4fe1
added tests for empty delimStr, csv and tsv
Jolanrensen Aug 23, 2024
1a5002c
fixed crash for empty csv
Jolanrensen Aug 23, 2024
6f93a47
fixed test in gradle plugin
Jolanrensen Aug 23, 2024
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
2 changes: 1 addition & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public fun DataFrame.Companion.readDelim(
}

val columnNames = csvParser.headerNames.takeIf { it.isNotEmpty() }
?: (1..records[0].count()).map { index -> "X$index" }
?: (1..(records.firstOrNull()?.count() ?: 0)).map { index -> "X$index" }

val generator = ColumnNameGenerator()
val uniqueNames = columnNames.map { generator.addUnique(it) }
Expand Down
35 changes: 35 additions & 0 deletions core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/CsvTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
import org.jetbrains.kotlinx.dataframe.api.group
import org.jetbrains.kotlinx.dataframe.api.groupBy
import org.jetbrains.kotlinx.dataframe.api.into
import org.jetbrains.kotlinx.dataframe.api.isEmpty
import org.jetbrains.kotlinx.dataframe.api.schema
import org.jetbrains.kotlinx.dataframe.api.toStr
import org.jetbrains.kotlinx.dataframe.ncol
Expand Down Expand Up @@ -282,6 +283,40 @@ class CsvTests {
df.columnNames() shouldBe listOf("Column1", "Column2")
}

@Test
fun `read empty delimStr or CSV`() {
val emptyDelimStr = DataFrame.readDelimStr("")
emptyDelimStr shouldBe DataFrame.empty()

val emptyDelimFile = DataFrame.readDelim(File.createTempFile("empty", "csv").reader())
emptyDelimFile shouldBe DataFrame.empty()

val emptyCsvFile = DataFrame.readCSV(File.createTempFile("empty", "csv"))
emptyCsvFile shouldBe DataFrame.empty()

val emptyCsvFileManualHeader = DataFrame.readCSV(
file = File.createTempFile("empty", "csv"),
header = listOf("a", "b", "c"),
)
emptyCsvFileManualHeader.apply {
isEmpty() shouldBe true
columnNames() shouldBe listOf("a", "b", "c")
columnTypes() shouldBe listOf(typeOf<String>(), typeOf<String>(), typeOf<String>())
}

val emptyCsvFileWithHeader = DataFrame.readCSV(
file = File.createTempFile("empty", "csv").also { it.writeText("a,b,c") },
)
emptyCsvFileWithHeader.apply {
isEmpty() shouldBe true
columnNames() shouldBe listOf("a", "b", "c")
columnTypes() shouldBe listOf(typeOf<String>(), typeOf<String>(), typeOf<String>())
}

val emptyTsvStr = DataFrame.readTSV(File.createTempFile("empty", "tsv"))
emptyTsvStr shouldBe DataFrame.empty()
}

companion object {
private val simpleCsv = testCsv("testCSV")
private val csvWithFrenchLocale = testCsv("testCSVwithFrenchLocale")
Expand Down
5 changes: 2 additions & 3 deletions ...taframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/DataFrameReadTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import io.kotest.assertions.throwables.shouldThrowAny
import io.kotest.matchers.shouldBe
import kotlinx.serialization.SerializationException
import org.jetbrains.kotlinx.dataframe.DataFrame
import org.jetbrains.kotlinx.dataframe.api.isEmpty
import org.jetbrains.kotlinx.dataframe.io.read
import org.jetbrains.kotlinx.dataframe.io.readSqlTable
import org.junit.Test
Expand Down Expand Up @@ -42,9 +43,7 @@ class DataFrameReadTest {
fun `file with invalid csv`() {
val temp = Files.createTempDirectory("").toFile()
val invalidCsv = File(temp, "test.csv").also { it.writeText("") }
shouldThrow<IndexOutOfBoundsException> {
DataFrame.read(invalidCsv)
}
DataFrame.read(invalidCsv).isEmpty() shouldBe true
}

@Test
Expand Down
Loading