Skip to content

Prepare utility to assert compile time column order #1427

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 1 commit into from
Sep 4, 2025
Merged

Prepare utility to assert compile time column order #1427

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
8 changes: 6 additions & 2 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/schema.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@ public fun GroupBy<*, *>.schema(): DataFrameSchema = toDataFrame().schema()

// endregion

public inline fun <reified T> DataFrame<T>.compileTimeSchema(): DataFrameSchema =
compileTimeSchemaImpl(schema(), T::class)
/**
* [ordered] - if true, columns are ordered the same as in runtime schema for easier diff between the two.
* if false, columns are ordered as they are represented in the compiler plugin
*/
public inline fun <reified T> DataFrame<T>.compileTimeSchema(ordered: Boolean = true): DataFrameSchema =
compileTimeSchemaImpl(if (ordered) schema() else null, T::class)
5 changes: 2 additions & 3 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/schema.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
import kotlin.reflect.KClass

@PublishedApi
internal fun compileTimeSchemaImpl(runtimeSchema: DataFrameSchema, klass: KClass<*>): DataFrameSchema {
internal fun compileTimeSchemaImpl(runtimeSchema: DataFrameSchema?, klass: KClass<*>): DataFrameSchema {
val compileSchema = getSchema(klass)
if (runtimeSchema == null) return compileSchema
val root = ColumnPath(emptyList())
val order = buildMap {
putColumnsOrder(runtimeSchema, path = root)
Expand Down Expand Up @@ -41,8 +42,6 @@ internal fun DataFrameSchema.sortedBy(order: Map<ColumnPath, Int>, path: ColumnP
is ColumnSchema.Group -> ColumnSchema.Group(column.schema.sortedBy(order, path + name), column.contentType)

is ColumnSchema.Value -> column

else -> TODO("unexpected ColumnSchema class ${column::class}")
}
}.sortedBy { (name, _) ->
order[path + name]
Expand Down