Skip to content

[Compiler plugin] Remove outdated code #1128

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.

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
Apr 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import kotlin.reflect.KProperty

// region insert

@Interpretable("Insert0")
public fun <T, C> DataFrame<T>.insert(column: DataColumn<C>): InsertClause<T> = InsertClause(this, column)

@Interpretable("Insert1")
Expand All @@ -29,15 +28,13 @@ public inline fun <T, reified R> DataFrame<T>.insert(
noinline expression: RowExpression<T, R>,
): InsertClause<T> = insert(mapToColumn(name, infer, expression))

@Interpretable("Insert2")
@AccessApiOverload
public inline fun <T, reified R> DataFrame<T>.insert(
column: ColumnAccessor<R>,
infer: Infer = Infer.Nulls,
noinline expression: RowExpression<T, R>,
): InsertClause<T> = insert(column.name(), infer, expression)

@Interpretable("Insert3")
@AccessApiOverload
public inline fun <T, reified R> DataFrame<T>.insert(
column: KProperty<R>,
Expand All @@ -62,12 +59,9 @@ public fun <T> InsertClause<T>.under(column: ColumnSelector<T, *>): DataFrame<T>
public fun <T> InsertClause<T>.under(columnPath: ColumnPath): DataFrame<T> =
df.insertImpl(columnPath + column.name, column)

@Refine
@Interpretable("Under2")
@AccessApiOverload
public fun <T> InsertClause<T>.under(column: ColumnAccessor<*>): DataFrame<T> = under(column.path())

@Refine
@Interpretable("Under3")
@AccessApiOverload
public fun <T> InsertClause<T>.under(column: KProperty<*>): DataFrame<T> = under(column.columnName)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.fir.types.ConeNullability
import org.jetbrains.kotlin.fir.types.typeContext
import org.jetbrains.kotlin.fir.types.withNullability
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlinx.dataframe.api.Infer
import org.jetbrains.kotlinx.dataframe.plugin.extensions.KotlinTypeFacade
import org.jetbrains.kotlinx.dataframe.plugin.extensions.wrap
import org.jetbrains.kotlinx.dataframe.plugin.impl.Absent
Expand All @@ -24,7 +23,6 @@ import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleColumnGroup
import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleDataColumn
import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleFrameColumn
import org.jetbrains.kotlinx.dataframe.plugin.impl.dataFrame
import org.jetbrains.kotlinx.dataframe.plugin.impl.enum
import org.jetbrains.kotlinx.dataframe.plugin.impl.ignore
import org.jetbrains.kotlinx.dataframe.plugin.impl.simpleColumnOf
import org.jetbrains.kotlinx.dataframe.plugin.impl.type
Expand Down Expand Up @@ -54,7 +52,7 @@ class ConvertApproximation(val schema: PluginDataFrameSchema, val columns: List<
internal class Convert6 : AbstractInterpreter<PluginDataFrameSchema>() {
val Arguments.firstCol: String by arg()
val Arguments.cols: List<String> by arg(defaultValue = Present(emptyList()))
val Arguments.infer: Infer by enum(defaultValue = Present(Infer.Nulls))
val Arguments.infer by ignore()
val Arguments.expression: TypeApproximation by type()
val Arguments.receiver: PluginDataFrameSchema by dataFrame()
override val Arguments.startingSchema get() = receiver
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
package org.jetbrains.kotlinx.dataframe.plugin.impl.api

import org.jetbrains.kotlinx.dataframe.DataFrame
import org.jetbrains.kotlinx.dataframe.api.Infer
import org.jetbrains.kotlinx.dataframe.api.after
import org.jetbrains.kotlinx.dataframe.api.insert
import org.jetbrains.kotlinx.dataframe.api.pathOf
import org.jetbrains.kotlinx.dataframe.api.under
import org.jetbrains.kotlinx.dataframe.plugin.impl.AbstractInterpreter
import org.jetbrains.kotlinx.dataframe.plugin.impl.Arguments
import org.jetbrains.kotlinx.dataframe.plugin.impl.PluginDataFrameSchema
import org.jetbrains.kotlinx.dataframe.plugin.impl.Present
import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleCol
import org.jetbrains.kotlinx.dataframe.plugin.impl.asDataColumn
import org.jetbrains.kotlinx.dataframe.plugin.impl.asDataFrame
import org.jetbrains.kotlinx.dataframe.plugin.impl.data.ColumnAccessorApproximation
import org.jetbrains.kotlinx.dataframe.plugin.impl.data.ColumnPathApproximation
import org.jetbrains.kotlinx.dataframe.plugin.impl.data.InsertClauseApproximation
import org.jetbrains.kotlinx.dataframe.plugin.impl.data.KPropertyApproximation
import org.jetbrains.kotlinx.dataframe.plugin.impl.dataFrame
import org.jetbrains.kotlinx.dataframe.plugin.impl.enum
import org.jetbrains.kotlinx.dataframe.plugin.impl.ignore
import org.jetbrains.kotlinx.dataframe.plugin.impl.simpleColumnOf
import org.jetbrains.kotlinx.dataframe.plugin.impl.toPluginDataFrameSchema
import org.jetbrains.kotlinx.dataframe.plugin.impl.type
Expand All @@ -27,17 +22,18 @@ import org.jetbrains.kotlinx.dataframe.plugin.impl.type
* @see DataFrame.insert
*/
internal class Insert0 : AbstractInterpreter<InsertClauseApproximation>() {
val Arguments.column: SimpleCol by arg()
val Arguments.receiver: PluginDataFrameSchema by dataFrame()
val Arguments.receiver by dataFrame()
val Arguments.name: String by arg()
val Arguments.typeArg1 by type()

override fun Arguments.interpret(): InsertClauseApproximation {
return InsertClauseApproximation(receiver, column)
return InsertClauseApproximation(receiver, simpleColumnOf(name, typeArg1.type))
}
}

internal class Insert1 : AbstractInterpreter<InsertClauseApproximation>() {
val Arguments.name: String by arg()
val Arguments.infer: Infer by enum(defaultValue = Present(Infer.Nulls))
val Arguments.infer by ignore()
val Arguments.expression: TypeApproximation by type()
val Arguments.receiver: PluginDataFrameSchema by dataFrame()

Expand All @@ -46,28 +42,6 @@ internal class Insert1 : AbstractInterpreter<InsertClauseApproximation>() {
}
}

internal class Insert2 : AbstractInterpreter<InsertClauseApproximation>() {
val Arguments.column: ColumnAccessorApproximation by arg()
val Arguments.infer: Infer by enum(defaultValue = Present(Infer.Nulls))
val Arguments.expression: TypeApproximation by type()
val Arguments.receiver: PluginDataFrameSchema by dataFrame()

override fun Arguments.interpret(): InsertClauseApproximation {
return InsertClauseApproximation(receiver, simpleColumnOf(column.name, expression.type))
}
}

internal class Insert3 : AbstractInterpreter<InsertClauseApproximation>() {
val Arguments.column: KPropertyApproximation by arg()
val Arguments.infer: Infer by enum(defaultValue = Present(Infer.Nulls))
val Arguments.expression: TypeApproximation by type()
val Arguments.receiver: PluginDataFrameSchema by dataFrame()

override fun Arguments.interpret(): InsertClauseApproximation {
return InsertClauseApproximation(receiver, simpleColumnOf(column.name, expression.type))
}
}

internal class Under0 : AbstractInterpreter<PluginDataFrameSchema>() {
val Arguments.column: SingleColumnApproximation by arg()
val Arguments.receiver: InsertClauseApproximation by arg()
Expand All @@ -91,28 +65,6 @@ internal class Under1 : AbstractInterpreter<PluginDataFrameSchema>() {
}
}

internal class Under2 : AbstractInterpreter<PluginDataFrameSchema>() {
val Arguments.column: ColumnAccessorApproximation by arg()
val Arguments.receiver: InsertClauseApproximation by arg()

override fun Arguments.interpret(): PluginDataFrameSchema {
return receiver.df.asDataFrame()
.insert(receiver.column.asDataColumn()).under(pathOf(column.name))
.toPluginDataFrameSchema()
}
}

internal class Under3 : AbstractInterpreter<PluginDataFrameSchema>() {
val Arguments.column: KPropertyApproximation by arg()
val Arguments.receiver: InsertClauseApproximation by arg()

override fun Arguments.interpret(): PluginDataFrameSchema {
return receiver.df.asDataFrame()
.insert(receiver.column.asDataColumn()).under(pathOf(column.name))
.toPluginDataFrameSchema()
}
}

internal class Under4 : AbstractInterpreter<PluginDataFrameSchema>() {
val Arguments.column: String by arg()
val Arguments.receiver: InsertClauseApproximation by arg()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import org.jetbrains.kotlinx.dataframe.plugin.impl.api.AggregateDslInto
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.GroupByToDataFrame
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Insert0
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Insert1
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Insert2
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Insert3
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Into
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Into0
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Join0
Expand All @@ -44,8 +42,6 @@ import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Select0
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.To0
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Under0
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Under1
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Under2
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Under3
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Under4
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.Ungroup0
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.With0
Expand Down Expand Up @@ -306,12 +302,8 @@ internal inline fun <reified T> String.load(): T {
"Explode0" -> Explode0()
"Insert0" -> Insert0()
"Insert1" -> Insert1()
"Insert2" -> Insert2()
"Insert3" -> Insert3()
"Under0" -> Under0()
"Under1" -> Under1()
"Under2" -> Under2()
"Under3" -> Under3()
"Under4" -> Under4()
"InsertAfter0" -> InsertAfter0()
"Join0" -> Join0()
Expand Down