Skip to content

Commit 0677836

Browse files
committed
Move ExtraColumns enum to correct package.
1 parent f8a399d commit 0677836

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
1414
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1515
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1616
import org.jetbrains.kotlinx.dataframe.columns.ValueColumn
17-
import org.jetbrains.kotlinx.dataframe.impl.api.ExtraColumns
1817
import org.jetbrains.kotlinx.dataframe.impl.api.convertToImpl
1918
import kotlin.reflect.typeOf
2019

2120
public fun <T> AnyFrame.cast(): DataFrame<T> = this as DataFrame<T>
2221

23-
public inline fun <reified T> AnyFrame.cast(verify: Boolean = true): DataFrame<T> = if (verify) convertToImpl(typeOf<T>(), allowConversion = false, org.jetbrains.kotlinx.dataframe.impl.api.ExtraColumns.Keep)
22+
public inline fun <reified T> AnyFrame.cast(verify: Boolean = true): DataFrame<T> = if (verify) convertToImpl(typeOf<T>(), allowConversion = false, ExtraColumns.Keep)
2423
else cast()
2524

2625
public fun <T> AnyRow.cast(): DataRow<T> = this as DataRow<T>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package org.jetbrains.kotlinx.dataframe.api
22

33
import org.jetbrains.kotlinx.dataframe.AnyFrame
44
import org.jetbrains.kotlinx.dataframe.DataFrame
5-
import org.jetbrains.kotlinx.dataframe.impl.api.ExtraColumns
65
import org.jetbrains.kotlinx.dataframe.impl.api.convertToImpl
76
import kotlin.reflect.typeOf
87

8+
public enum class ExtraColumns { Remove, Keep, Fail }
9+
910
// region DataFrame
1011

1112
public inline fun <reified T> AnyFrame.convertTo(extraColumnsBehavior: ExtraColumns = ExtraColumns.Keep): DataFrame<T> = convertToImpl(typeOf<T>(), true, extraColumnsBehavior)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.impl.api
33
import org.jetbrains.kotlinx.dataframe.AnyFrame
44
import org.jetbrains.kotlinx.dataframe.DataColumn
55
import org.jetbrains.kotlinx.dataframe.DataFrame
6+
import org.jetbrains.kotlinx.dataframe.api.ExtraColumns
67
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
78
import org.jetbrains.kotlinx.dataframe.api.cast
89
import org.jetbrains.kotlinx.dataframe.api.convertTo
@@ -20,8 +21,6 @@ import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
2021
import kotlin.reflect.KType
2122
import kotlin.reflect.jvm.jvmErasure
2223

23-
public enum class ExtraColumns { Remove, Keep, Fail }
24-
2524
@PublishedApi
2625
internal fun <T> AnyFrame.convertToImpl(type: KType, allowConversion: Boolean, extraColumns: ExtraColumns): DataFrame<T> {
2726
fun AnyFrame.convertToSchema(schema: DataFrameSchema): AnyFrame {

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.DataRow
1212
import org.jetbrains.kotlinx.dataframe.RowExpression
1313
import org.jetbrains.kotlinx.dataframe.annotations.ColumnName
1414
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
15+
import org.jetbrains.kotlinx.dataframe.api.ExtraColumns
1516
import org.jetbrains.kotlinx.dataframe.api.GroupBy
1617
import org.jetbrains.kotlinx.dataframe.api.ParserOptions
1718
import org.jetbrains.kotlinx.dataframe.api.add
@@ -159,7 +160,6 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
159160
import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
160161
import org.jetbrains.kotlinx.dataframe.hasNulls
161162
import org.jetbrains.kotlinx.dataframe.impl.DataFrameSize
162-
import org.jetbrains.kotlinx.dataframe.impl.api.ExtraColumns
163163
import org.jetbrains.kotlinx.dataframe.impl.api.convertToImpl
164164
import org.jetbrains.kotlinx.dataframe.impl.between
165165
import org.jetbrains.kotlinx.dataframe.impl.columns.isMissingColumn

0 commit comments

Comments
 (0)