Skip to content

Commit 72e7506

Browse files
koperagenkoperagen
committed
Rename classes related to generic insert implementation
1 parent 1a88d09 commit 72e7506

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jetbrains.kotlinx.dataframe.AnyBaseCol
44
import org.jetbrains.kotlinx.dataframe.AnyCol
55
import org.jetbrains.kotlinx.dataframe.AnyRow
66
import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl
7-
import org.jetbrains.kotlinx.dataframe.impl.api.Col
7+
import org.jetbrains.kotlinx.dataframe.impl.api.GenericColumn
88
import org.jetbrains.kotlinx.dataframe.impl.asList
99
import org.jetbrains.kotlinx.dataframe.impl.columnName
1010
import org.jetbrains.kotlinx.dataframe.impl.columns.DataColumnInternal
@@ -19,7 +19,7 @@ import kotlin.reflect.KType
1919
*
2020
* @param T type of values contained in column.
2121
*/
22-
public interface BaseColumn<out T> : ColumnReference<T>, Col {
22+
public interface BaseColumn<out T> : ColumnReference<T>, GenericColumn {
2323

2424
// region info
2525

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/ColumnGroup.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.HasSchema
99
import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl
1010
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
1111
import org.jetbrains.kotlinx.dataframe.api.columnGroup
12-
import org.jetbrains.kotlinx.dataframe.impl.api.MyColumnGroup
12+
import org.jetbrains.kotlinx.dataframe.impl.api.GenericColumnGroup
1313
import kotlin.reflect.KProperty
1414

1515
/**
@@ -26,7 +26,7 @@ import kotlin.reflect.KProperty
2626
* @param T Schema marker. See [DataFrame] for details.
2727
*/
2828
@HasSchema(schemaArg = 0)
29-
public interface ColumnGroup<out T> : BaseColumn<DataRow<T>>, DataFrame<T>, MyColumnGroup<BaseColumn<*>> {
29+
public interface ColumnGroup<out T> : BaseColumn<DataRow<T>>, DataFrame<T>, GenericColumnGroup<BaseColumn<*>> {
3030

3131
/**
3232
* Gets the rows at given indices.

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/insert.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ internal fun <T> insertImplDataFrame(
6060
return if (columns.isEmpty()) df ?: DataFrame.empty().cast() else {
6161
insertImplGenericContainer(
6262
df?.let { DfAdapter(it) },
63-
columns.map { ColumnToInsert1(it.insertionPath, it.column, it.referenceNode) },
63+
columns.map { GenericColumnsToInsert(it.insertionPath, it.column, it.referenceNode) },
6464
treeNode,
6565
depth,
6666
factory = { DfAdapter(it.toDataFrame().cast()) },
@@ -73,20 +73,20 @@ internal fun <T> insertImplDataFrame(
7373
}
7474
}
7575

76-
internal interface DataFrameLikeContainer<T : Col> {
76+
internal interface DataFrameLikeContainer<T : GenericColumn> {
7777
fun columns(): List<T>
7878
}
7979

80-
internal fun <T : DataFrameLikeContainer<Column>, Column : Col, ColumnGroup> insertImplGenericContainer(
80+
internal fun <T : DataFrameLikeContainer<Column>, Column : GenericColumn, ColumnGroup> insertImplGenericContainer(
8181
df: T?,
82-
columns: List<ColumnToInsert1<Column>>,
82+
columns: List<GenericColumnsToInsert<Column>>,
8383
treeNode: ReadonlyTreeNode<ReferenceData>?,
8484
depth: Int,
8585
factory: (List<Column>) -> T,
8686
empty: T,
8787
rename: Column.(String) -> Column,
8888
createColumnGroup: (String, List<Column>) -> Column,
89-
): T where ColumnGroup : MyColumnGroup<Column> {
89+
): T where ColumnGroup : GenericColumnGroup<Column> {
9090
if (columns.isEmpty()) return df ?: empty
9191

9292
val res: List<Column> = insertImplGenericTree(
@@ -100,22 +100,22 @@ internal fun <T : DataFrameLikeContainer<Column>, Column : Col, ColumnGroup> ins
100100
return factory(res)
101101
}
102102

103-
public interface Col {
103+
public interface GenericColumn {
104104
public fun name(): String
105105
}
106106

107-
public interface MyColumnGroup<Column : Col> : Col {
107+
public interface GenericColumnGroup<Column : GenericColumn> : GenericColumn {
108108
public fun columns(): List<Column>
109109
}
110110

111-
internal data class ColumnToInsert1<Column : Col> (
111+
internal data class GenericColumnsToInsert<Column : GenericColumn> (
112112
val insertionPath: ColumnPath,
113113
val column: Column,
114114
val referenceNode: ReadonlyTreeNode<ReferenceData>? = null
115115
)
116116

117-
internal fun <Column : Col, ColumnGroup : MyColumnGroup<Column>> insertImplGenericTree(
118-
columns: List<ColumnToInsert1<Column>>,
117+
internal fun <Column : GenericColumn, ColumnGroup : GenericColumnGroup<Column>> insertImplGenericTree(
118+
columns: List<GenericColumnsToInsert<Column>>,
119119
treeNode: ReadonlyTreeNode<ReferenceData>?,
120120
depth: Int,
121121
existingColumns: List<Column>?,

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jetbrains.kotlinx.dataframe.AnyBaseCol
44
import org.jetbrains.kotlinx.dataframe.AnyCol
55
import org.jetbrains.kotlinx.dataframe.AnyRow
66
import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl
7-
import org.jetbrains.kotlinx.dataframe.impl.api.Col
7+
import org.jetbrains.kotlinx.dataframe.impl.api.GenericColumn
88
import org.jetbrains.kotlinx.dataframe.impl.asList
99
import org.jetbrains.kotlinx.dataframe.impl.columnName
1010
import org.jetbrains.kotlinx.dataframe.impl.columns.DataColumnInternal
@@ -19,7 +19,7 @@ import kotlin.reflect.KType
1919
*
2020
* @param T type of values contained in column.
2121
*/
22-
public interface BaseColumn<out T> : ColumnReference<T>, Col {
22+
public interface BaseColumn<out T> : ColumnReference<T>, GenericColumn {
2323

2424
// region info
2525

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/ColumnGroup.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.HasSchema
99
import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl
1010
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
1111
import org.jetbrains.kotlinx.dataframe.api.columnGroup
12-
import org.jetbrains.kotlinx.dataframe.impl.api.MyColumnGroup
12+
import org.jetbrains.kotlinx.dataframe.impl.api.GenericColumnGroup
1313
import kotlin.reflect.KProperty
1414

1515
/**
@@ -26,7 +26,7 @@ import kotlin.reflect.KProperty
2626
* @param T Schema marker. See [DataFrame] for details.
2727
*/
2828
@HasSchema(schemaArg = 0)
29-
public interface ColumnGroup<out T> : BaseColumn<DataRow<T>>, DataFrame<T>, MyColumnGroup<BaseColumn<*>> {
29+
public interface ColumnGroup<out T> : BaseColumn<DataRow<T>>, DataFrame<T>, GenericColumnGroup<BaseColumn<*>> {
3030

3131
/**
3232
* Gets the rows at given indices.

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ internal fun <T> insertImplDataFrame(
6060
return if (columns.isEmpty()) df ?: DataFrame.empty().cast() else {
6161
insertImplGenericContainer(
6262
df?.let { DfAdapter(it) },
63-
columns.map { ColumnToInsert1(it.insertionPath, it.column, it.referenceNode) },
63+
columns.map { GenericColumnsToInsert(it.insertionPath, it.column, it.referenceNode) },
6464
treeNode,
6565
depth,
6666
factory = { DfAdapter(it.toDataFrame().cast()) },
@@ -73,20 +73,20 @@ internal fun <T> insertImplDataFrame(
7373
}
7474
}
7575

76-
internal interface DataFrameLikeContainer<T : Col> {
76+
internal interface DataFrameLikeContainer<T : GenericColumn> {
7777
fun columns(): List<T>
7878
}
7979

80-
internal fun <T : DataFrameLikeContainer<Column>, Column : Col, ColumnGroup> insertImplGenericContainer(
80+
internal fun <T : DataFrameLikeContainer<Column>, Column : GenericColumn, ColumnGroup> insertImplGenericContainer(
8181
df: T?,
82-
columns: List<ColumnToInsert1<Column>>,
82+
columns: List<GenericColumnsToInsert<Column>>,
8383
treeNode: ReadonlyTreeNode<ReferenceData>?,
8484
depth: Int,
8585
factory: (List<Column>) -> T,
8686
empty: T,
8787
rename: Column.(String) -> Column,
8888
createColumnGroup: (String, List<Column>) -> Column,
89-
): T where ColumnGroup : MyColumnGroup<Column> {
89+
): T where ColumnGroup : GenericColumnGroup<Column> {
9090
if (columns.isEmpty()) return df ?: empty
9191

9292
val res: List<Column> = insertImplGenericTree(
@@ -100,22 +100,22 @@ internal fun <T : DataFrameLikeContainer<Column>, Column : Col, ColumnGroup> ins
100100
return factory(res)
101101
}
102102

103-
public interface Col {
103+
public interface GenericColumn {
104104
public fun name(): String
105105
}
106106

107-
public interface MyColumnGroup<Column : Col> : Col {
107+
public interface GenericColumnGroup<Column : GenericColumn> : GenericColumn {
108108
public fun columns(): List<Column>
109109
}
110110

111-
internal data class ColumnToInsert1<Column : Col> (
111+
internal data class GenericColumnsToInsert<Column : GenericColumn> (
112112
val insertionPath: ColumnPath,
113113
val column: Column,
114114
val referenceNode: ReadonlyTreeNode<ReferenceData>? = null
115115
)
116116

117-
internal fun <Column : Col, ColumnGroup : MyColumnGroup<Column>> insertImplGenericTree(
118-
columns: List<ColumnToInsert1<Column>>,
117+
internal fun <Column : GenericColumn, ColumnGroup : GenericColumnGroup<Column>> insertImplGenericTree(
118+
columns: List<GenericColumnsToInsert<Column>>,
119119
treeNode: ReadonlyTreeNode<ReferenceData>?,
120120
depth: Int,
121121
existingColumns: List<Column>?,

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/impl/api/insert.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import org.jetbrains.kotlinx.dataframe.annotations.*
88
import org.jetbrains.kotlinx.dataframe.api.Infer
99
import org.jetbrains.kotlinx.dataframe.api.pathOf
1010
import org.jetbrains.kotlinx.dataframe.api.toPath
11-
import org.jetbrains.kotlinx.dataframe.impl.api.Col
12-
import org.jetbrains.kotlinx.dataframe.impl.api.ColumnToInsert1
11+
import org.jetbrains.kotlinx.dataframe.impl.api.GenericColumn
12+
import org.jetbrains.kotlinx.dataframe.impl.api.GenericColumnsToInsert
1313
import org.jetbrains.kotlinx.dataframe.impl.api.DataFrameLikeContainer
14-
import org.jetbrains.kotlinx.dataframe.impl.api.MyColumnGroup
14+
import org.jetbrains.kotlinx.dataframe.impl.api.GenericColumnGroup
1515
import org.jetbrains.kotlinx.dataframe.impl.api.insertImplGenericContainer
1616
import org.jetbrains.kotlinx.dataframe.plugin.impl.data.ColumnAccessorApproximation
1717
import org.jetbrains.kotlinx.dataframe.plugin.impl.data.ColumnPathApproximation
@@ -79,7 +79,7 @@ internal class Under0 : AbstractInterpreter<PluginDataFrameSchema>() {
7979
val Arguments.receiver: InsertClauseApproximation by insertClause()
8080

8181
override fun Arguments.interpret(): PluginDataFrameSchema {
82-
return receiver.df.insertImpl(listOf(ColumnToInsert1(column.path.path.toPath(), receiver.column)), anyDataFrame)
82+
return receiver.df.insertImpl(listOf(GenericColumnsToInsert(column.path.path.toPath(), receiver.column)), anyDataFrame)
8383
}
8484
}
8585

@@ -88,7 +88,7 @@ internal class Under1 : AbstractInterpreter<PluginDataFrameSchema>() {
8888
val Arguments.receiver: InsertClauseApproximation by insertClause()
8989

9090
override fun Arguments.interpret(): PluginDataFrameSchema {
91-
return receiver.df.insertImpl(listOf(ColumnToInsert1(columnPath.path.toPath(), receiver.column)), anyRow)
91+
return receiver.df.insertImpl(listOf(GenericColumnsToInsert(columnPath.path.toPath(), receiver.column)), anyRow)
9292
}
9393
}
9494

@@ -97,7 +97,7 @@ internal class Under2 : AbstractInterpreter<PluginDataFrameSchema>() {
9797
val Arguments.receiver: InsertClauseApproximation by insertClause()
9898

9999
override fun Arguments.interpret(): PluginDataFrameSchema {
100-
return receiver.df.insertImpl(listOf(ColumnToInsert1(pathOf(column.name), receiver.column)), anyRow)
100+
return receiver.df.insertImpl(listOf(GenericColumnsToInsert(pathOf(column.name), receiver.column)), anyRow)
101101
}
102102
}
103103

@@ -106,7 +106,7 @@ internal class Under3 : AbstractInterpreter<PluginDataFrameSchema>() {
106106
val Arguments.receiver: InsertClauseApproximation by insertClause()
107107

108108
override fun Arguments.interpret(): PluginDataFrameSchema {
109-
return receiver.df.insertImpl(listOf(ColumnToInsert1(pathOf(column.name), receiver.column)), anyRow)
109+
return receiver.df.insertImpl(listOf(GenericColumnsToInsert(pathOf(column.name), receiver.column)), anyRow)
110110
}
111111
}
112112

@@ -115,7 +115,7 @@ internal class Under4 : AbstractInterpreter<PluginDataFrameSchema>() {
115115
val Arguments.receiver: InsertClauseApproximation by insertClause()
116116

117117
override fun Arguments.interpret(): PluginDataFrameSchema {
118-
return receiver.df.insertImpl(listOf(ColumnToInsert1(pathOf(column), receiver.column)), anyRow)
118+
return receiver.df.insertImpl(listOf(GenericColumnsToInsert(pathOf(column), receiver.column)), anyRow)
119119
}
120120
}
121121

@@ -156,7 +156,7 @@ private fun List<SimpleCol>.asString(indent: String = ""): String {
156156
open class SimpleCol(
157157
val name: String,
158158
open val type: TypeApproximation
159-
) : Col {
159+
) : GenericColumn {
160160

161161
override fun name(): String {
162162
return name
@@ -208,7 +208,7 @@ data class SimpleFrameColumn(
208208
// exists only because SimpleCol has it
209209
// but in fact it's for `materialize` to decide what should be the type of the property / accessors
210210
val anyFrameType: TypeApproximation,
211-
) : MyColumnGroup<SimpleCol>, SimpleCol(name1, anyFrameType) {
211+
) : GenericColumnGroup<SimpleCol>, SimpleCol(name1, anyFrameType) {
212212
override fun columns(): List<SimpleCol> {
213213
return columns
214214
}
@@ -226,7 +226,7 @@ class SimpleColumnGroup(
226226
name: String,
227227
private val columns: List<SimpleCol>,
228228
columnGroupType: TypeApproximation
229-
) : MyColumnGroup<SimpleCol>, SimpleCol(name, columnGroupType) {
229+
) : GenericColumnGroup<SimpleCol>, SimpleCol(name, columnGroupType) {
230230

231231
override fun columns(): List<SimpleCol> {
232232
return columns
@@ -267,10 +267,10 @@ class SimpleColumnGroup(
267267

268268
@PublishedApi
269269
internal fun PluginDataFrameSchema.insertImpl(
270-
columns: List<ColumnToInsert1<SimpleCol>>,
270+
columns: List<GenericColumnsToInsert<SimpleCol>>,
271271
columnGroupType: TypeApproximation
272272
): PluginDataFrameSchema {
273-
return insertImplGenericContainer<PluginDataFrameSchema, SimpleCol, MyColumnGroup<SimpleCol>>(
273+
return insertImplGenericContainer<PluginDataFrameSchema, SimpleCol, GenericColumnGroup<SimpleCol>>(
274274
this,
275275
columns,
276276
columns.firstOrNull()?.referenceNode?.getRoot(),

0 commit comments

Comments
 (0)