Functions inline #1111

AndreiKingsley · 2025-03-27T12:54:15Z

koperagen · 2025-03-27T15:27:08Z

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

@@ -64,22 +64,23 @@ private interface CommonSelectDocs
 */
 @Refine
 @Interpretable("Select0")
-public fun <T> DataFrame<T>.select(columns: ColumnsSelector<T, *>): DataFrame<T> = get(columns).toDataFrame().cast()


There's seems to be no benefit in inline for select, so let's maybe keep it a regular function

koperagen · 2025-03-27T15:27:59Z

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt

@@ -135,6 +135,8 @@ public operator fun <T> DataFrame<T>.get(columnRange: ClosedRange<String>): Data

 internal val ColumnsContainer<*>.ncol get() = columnsCount()
 internal val AnyFrame.nrow get() = rowsCount()
+
+@PublishedApi
 internal val AnyFrame.indices get() = indices()


inline functions that use this internal properties can use already public functions instead

Jolanrensen

Could you do another run over the changes to see if crossinline is needed? I encountered a lot of cases already and crossinline blocks non-local returns, while allowing those is the main goal of the PR. crossinline is only needed for lambdas that need to be executed in a non-inlined scope

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

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

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

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

Jolanrensen · 2025-03-31T14:05:15Z

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

@@ -25,7 +25,7 @@ internal class JoinedDataRowImpl<A, B>(
    override val right: DataRow<B> = DataRowImpl(index1, rightOwner)
 }

-internal fun <A, B> DataFrame<A>.joinWithImpl(
+internal inline fun <A, B> DataFrame<A>.joinWithImpl(


hmm I'm doubting the benefits outweigh the downsides for inlining a function as large as this. Remember inlining copies over everthing in this function to the execution site increasing code size and compile time for the user. @koperagen, what do you think?

I agree, let's keep it a regular fun

Jolanrensen · 2025-03-31T14:07:49Z

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

-        isNumber() -> cast<Number?>().map {
-            if (it?.isPrimitiveNumber() == false) {
-                // Cannot calculate statistics of a non-primitive number type
+        isNumber() -> with(cast<Number?>()) {


I'd revert this back to map with non-local break. Then all values are visited just once, now they are visited twice.

Jolanrensen · 2025-03-31T14:10:40Z

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt

-    converter: (List<ColumnWithPath<A>>) -> List<ColumnWithPath<B>>,
+@PublishedApi
+internal inline fun <A, B> ColumnsResolver<A>.transform(
+    crossinline converter: (List<ColumnWithPath<A>>) -> List<ColumnWithPath<B>>,
 ): TransformableColumnSet<B> =
    object : TransformableColumnSet<B> {


remember me someday to remove this TransformableColumnSet stuff. It was the result of .recursively(). I have a hunch we can inline more if transformResolve doesn't exist anymore :)

Then maybe add an issue 😄?

Jolanrensen · 2025-03-31T14:13:49Z

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

@@ -60,8 +60,8 @@ public fun <T> DataFrame<T>.takeLast(n: Int = 1): DataFrame<T> {
 /**
 * Returns a DataFrame containing first rows that satisfy the given [predicate].
 */
-public fun <T> DataFrame<T>.takeWhile(predicate: RowFilter<T>): DataFrame<T> =
-    firstOrNull { !predicate(it, it) }?.let { take(it.index) } ?: this
+public inline fun <T> DataFrame<T>.takeWhile(crossinline predicate: RowFilter<T>): DataFrame<T> =


crossinline unneeded

Jolanrensen · 2025-03-31T14:16:04Z

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

@@ -11,7 +11,7 @@ public fun <T> DataFrame<T>.duplicate(n: Int): FrameColumn<T> = List(n) { this }

 public fun <T> DataFrame<T>.duplicateRows(n: Int): DataFrame<T> = duplicateRowsImpl(n)

-public fun <T> DataFrame<T>.duplicateRows(n: Int, filter: RowFilter<T>): DataFrame<T> =
+public inline fun <T> DataFrame<T>.duplicateRows(n: Int, crossinline filter: RowFilter<T>): DataFrame<T> =


crossinline unneeded

Jolanrensen · 2025-03-31T14:16:37Z

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


 /**
 * Returns a DataFrame containing all rows except first rows that satisfy the given [predicate].
 */
-public fun <T> DataFrame<T>.dropWhile(predicate: RowFilter<T>): DataFrame<T> =
-    firstOrNull { !predicate(it, it) }?.let { drop(it.index) } ?: this
+public inline fun <T> DataFrame<T>.dropWhile(crossinline predicate: RowFilter<T>): DataFrame<T> =


crossinline unneeded

Jolanrensen · 2025-03-31T14:17:18Z

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

@@ -205,7 +205,7 @@ public fun <T> DataRow<T>.relative(relativeIndices: IntRange): DataFrame<T> =
        (relativeIndices.first + index).coerceIn(df().indices)..(relativeIndices.last + index).coerceIn(df().indices),
    )

-public fun <T> DataRow<T>.movingAverage(k: Int, expression: RowExpression<T, Number>): Double {
+public inline fun <T> DataRow<T>.movingAverage(k: Int, crossinline expression: RowExpression<T, Number>): Double {


crossinline unneeded

Jolanrensen · 2025-03-31T14:20:03Z

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

@@ -199,9 +199,9 @@ public interface ColsOfKindColumnsSelectionDsl {
 * @param filter The filter function to apply on each column. Must accept a ColumnWithPath object and return a Boolean.
 * @return A [TransformableColumnSet] containing the columns of given kinds that satisfy the filter.
 */
-internal fun ColumnsResolver<*>.columnsOfKindInternal(
+internal inline fun ColumnsResolver<*>.columnsOfKindInternal(


currently there's no benefit for having these CS DSL internal functions inlined, because they are only called from non-inlined functions. However, I think they can stay inlined, because it reminds us we can move the CS DSL to a fully inlined context-parameter based API in the future :)

Jolanrensen · 2025-03-31T14:21:19Z

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

@@ -262,7 +262,10 @@ public inline fun <reified C> SingleColumn<DataRow<*>>.colsOf(
 * match the given [filter] and are the given [type].
 */
 @Suppress("UNCHECKED_CAST")
-internal fun <C> ColumnsResolver<*>.colsOfInternal(type: KType, filter: ColumnFilter<C>): TransformableColumnSet<C> =
+internal inline fun <C> ColumnsResolver<*>.colsOfInternal(


there are a couple more functions that be inline in this file

Which ones?

koperagen · 2025-04-02T18:08:25Z

Looking at changes that make some internal functions inline, can you please verify size of our core jar in core/build/libs before and after this change? Let's make sure we don't accidentally affect it too much

# Conflicts: # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/Utils.kt

AndreiKingsley added 2 commits March 26, 2025 16:45

inline functions

5ced6a0

inline functions

2472d17

koperagen reviewed Mar 27, 2025

View reviewed changes

Jolanrensen self-requested a review March 27, 2025 17:17

Jolanrensen requested changes Mar 27, 2025

View reviewed changes

remove unnecessary crossinline

0f9856e

AndreiKingsley requested review from koperagen and Jolanrensen March 28, 2025 12:54

Jolanrensen requested changes Mar 31, 2025

View reviewed changes

AndreiKingsley added 3 commits April 7, 2025 14:10

Merge branch 'master' into functions_inline

5293bde

# Conflicts: # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/Utils.kt

remove unneeded crossinlines

0b22f16

group kdocs fix

5bc9783

AndrewKis merged commit 5bc9783 into master Apr 11, 2025
7 checks passed

Functions inline #1111

Functions inline #1111

Uh oh!

Conversation

AndreiKingsley commented Mar 27, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jolanrensen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Jolanrensen Mar 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

koperagen commented Apr 2, 2025

Uh oh!

Uh oh!

Uh oh!

Jolanrensen Mar 31, 2025 •

edited

Loading