Skip to content

Commit 7ec0ff5

Browse files
committed
tiny fix for rendering the type in describe(). It could result in "Void?", while we already caught this case in renderType(kType)
1 parent fa896f0 commit 7ec0ff5

File tree

1 file changed

+2
-11
lines changed
  • core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api

1 file changed

+2
-11
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/describe.kt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import org.jetbrains.kotlinx.dataframe.columns.size
2525
import org.jetbrains.kotlinx.dataframe.columns.values
2626
import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
2727
import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn
28+
import org.jetbrains.kotlinx.dataframe.impl.renderType
2829
import org.jetbrains.kotlinx.dataframe.index
2930
import org.jetbrains.kotlinx.dataframe.kind
3031
import org.jetbrains.kotlinx.dataframe.type
31-
import kotlin.reflect.jvm.jvmErasure
3232

3333
internal fun describeImpl(cols: List<AnyCol>): DataFrame<ColumnDescription> {
3434
fun List<AnyCol>.collectAll(atAnyDepth: Boolean): List<AnyCol> =
@@ -65,7 +65,7 @@ internal fun describeImpl(cols: List<AnyCol>): DataFrame<ColumnDescription> {
6565
if (hasLongPaths) {
6666
ColumnDescription::path from { it.path() }
6767
}
68-
ColumnDescription::type from { buildTypeName(it) }
68+
ColumnDescription::type from { renderType(it.type) }
6969
ColumnDescription::count from { it.size }
7070
ColumnDescription::unique from { it.countDistinct() }
7171
ColumnDescription::nulls from { it.values.count { it == null } }
@@ -94,12 +94,3 @@ internal fun describeImpl(cols: List<AnyCol>): DataFrame<ColumnDescription> {
9494

9595
return df.cast()
9696
}
97-
98-
private fun buildTypeName(it: AnyCol): String {
99-
val rawJavaType = it.type.jvmErasure.simpleName.toString()
100-
return if (it.type.isMarkedNullable) {
101-
"$rawJavaType?"
102-
} else {
103-
rawJavaType
104-
}
105-
}

0 commit comments

Comments
 (0)