Skip to content

Expected hasNulls behavior for #428 #429

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expected hasNulls behavior for #428 #429

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
2 changes: 1 addition & 1 deletion core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataColumn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public interface DataColumn<out T> : BaseColumn<T> {
public fun empty(name: String = ""): AnyCol = createValueColumn(name, emptyList<Unit>(), typeOf<Unit>())
}

public fun hasNulls(): Boolean = type().isMarkedNullable
public fun hasNulls(): Boolean = values().any { it == null }

override fun distinct(): DataColumn<T>

Expand Down
12 changes: 12 additions & 0 deletions core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/contains.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.jetbrains.kotlinx.dataframe.api

import io.kotest.matchers.shouldBe
import org.jetbrains.kotlinx.dataframe.DataColumn
import org.jetbrains.kotlinx.dataframe.hasNulls
import org.junit.Test
import kotlin.reflect.full.withNullability
import kotlin.reflect.typeOf

class ContainsTests {

Expand Down Expand Up @@ -61,4 +65,12 @@ class ContainsTests {
row.containsKey(b) shouldBe false
row.containsKey(A::b) shouldBe false
}

@Test
fun `nullable vs has nulls`() {
val nullable = DataColumn.create("nullable", listOf("a" as String?, "b" as String?, "c" as String?))
nullable.hasNulls shouldBe false
val notNullable = DataColumn.create("notNullable", listOf("a" as String?, "b" as String?, "c" as String?, null as String?), typeOf<String>().withNullability(false))
notNullable.hasNulls shouldBe true
}
}
2 changes: 1 addition & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataColumn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public interface DataColumn<out T> : BaseColumn<T> {
public fun empty(name: String = ""): AnyCol = createValueColumn(name, emptyList<Unit>(), typeOf<Unit>())
}

public fun hasNulls(): Boolean = type().isMarkedNullable
public fun hasNulls(): Boolean = values().any { it == null }

override fun distinct(): DataColumn<T>

Expand Down
12 changes: 12 additions & 0 deletions core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/contains.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.jetbrains.kotlinx.dataframe.api

import io.kotest.matchers.shouldBe
import org.jetbrains.kotlinx.dataframe.DataColumn
import org.jetbrains.kotlinx.dataframe.hasNulls
import org.junit.Test
import kotlin.reflect.full.withNullability
import kotlin.reflect.typeOf

class ContainsTests {

Expand Down Expand Up @@ -61,4 +65,12 @@ class ContainsTests {
row.containsKey(b) shouldBe false
row.containsKey(A::b) shouldBe false
}

@Test
fun `nullable vs has nulls`() {
val nullable = DataColumn.create("nullable", listOf("a" as String?, "b" as String?, "c" as String?))
nullable.hasNulls shouldBe false
val notNullable = DataColumn.create("notNullable", listOf("a" as String?, "b" as String?, "c" as String?, null as String?), typeOf<String>().withNullability(false))
notNullable.hasNulls shouldBe true
}
}