@@ -25,10 +25,10 @@ import org.jetbrains.kotlinx.dataframe.columns.size
25
25
import org.jetbrains.kotlinx.dataframe.columns.values
26
26
import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
27
27
import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn
28
+ import org.jetbrains.kotlinx.dataframe.impl.renderType
28
29
import org.jetbrains.kotlinx.dataframe.index
29
30
import org.jetbrains.kotlinx.dataframe.kind
30
31
import org.jetbrains.kotlinx.dataframe.type
31
- import kotlin.reflect.jvm.jvmErasure
32
32
33
33
internal fun describeImpl (cols : List <AnyCol >): DataFrame <ColumnDescription > {
34
34
fun List<AnyCol>.collectAll (atAnyDepth : Boolean ): List <AnyCol > =
@@ -65,7 +65,7 @@ internal fun describeImpl(cols: List<AnyCol>): DataFrame<ColumnDescription> {
65
65
if (hasLongPaths) {
66
66
ColumnDescription ::path from { it.path() }
67
67
}
68
- ColumnDescription ::type from { buildTypeName (it) }
68
+ ColumnDescription ::type from { renderType (it.type ) }
69
69
ColumnDescription ::count from { it.size }
70
70
ColumnDescription ::unique from { it.countDistinct() }
71
71
ColumnDescription ::nulls from { it.values.count { it == null } }
@@ -94,12 +94,3 @@ internal fun describeImpl(cols: List<AnyCol>): DataFrame<ColumnDescription> {
94
94
95
95
return df.cast()
96
96
}
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