Skip to content

Commit ef8c188

Browse files
committed
rename OfSingleValueColumn -> ValueProperty
1 parent 4a826a5 commit ef8c188

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -206,62 +206,62 @@ string.toDataFrame()
206206
*/
207207

208208
@JvmName("toDataFrameByte")
209-
public inline fun <reified B : Byte?> Iterable<B>.toDataFrame(): DataFrame<OfSingleValueColumn<B>> = toDataFrame {
210-
OfSingleValueColumn<B>::value from { it }
209+
public inline fun <reified B : Byte?> Iterable<B>.toDataFrame(): DataFrame<ValueProperty<B>> = toDataFrame {
210+
ValueProperty<B>::value from { it }
211211
}.cast()
212212

213213
@JvmName("toDataFrameShort")
214-
public inline fun <reified S : Short?> Iterable<S>.toDataFrame(): DataFrame<OfSingleValueColumn<S>> = toDataFrame {
215-
OfSingleValueColumn<S>::value from { it }
214+
public inline fun <reified S : Short?> Iterable<S>.toDataFrame(): DataFrame<ValueProperty<S>> = toDataFrame {
215+
ValueProperty<S>::value from { it }
216216
}.cast()
217217

218218
@JvmName("toDataFrameInt")
219-
public inline fun <reified I : Int?> Iterable<I>.toDataFrame(): DataFrame<OfSingleValueColumn<I>> = toDataFrame {
220-
OfSingleValueColumn<I>::value from { it }
219+
public inline fun <reified I : Int?> Iterable<I>.toDataFrame(): DataFrame<ValueProperty<I>> = toDataFrame {
220+
ValueProperty<I>::value from { it }
221221
}.cast()
222222

223223
@JvmName("toDataFrameLong")
224-
public inline fun <reified L : Long?> Iterable<L>.toDataFrame(): DataFrame<OfSingleValueColumn<L>> = toDataFrame {
225-
OfSingleValueColumn<L>::value from { it }
224+
public inline fun <reified L : Long?> Iterable<L>.toDataFrame(): DataFrame<ValueProperty<L>> = toDataFrame {
225+
ValueProperty<L>::value from { it }
226226
}.cast()
227227

228228
@JvmName("toDataFrameString")
229-
public inline fun <reified S : String?> Iterable<S>.toDataFrame(): DataFrame<OfSingleValueColumn<S>> = toDataFrame {
230-
OfSingleValueColumn<S>::value from { it }
229+
public inline fun <reified S : String?> Iterable<S>.toDataFrame(): DataFrame<ValueProperty<S>> = toDataFrame {
230+
ValueProperty<S>::value from { it }
231231
}.cast()
232232

233233
@JvmName("toDataFrameChar")
234-
public inline fun <reified C : Char?> Iterable<C>.toDataFrame(): DataFrame<OfSingleValueColumn<C>> = toDataFrame {
235-
OfSingleValueColumn<C>::value from { it }
234+
public inline fun <reified C : Char?> Iterable<C>.toDataFrame(): DataFrame<ValueProperty<C>> = toDataFrame {
235+
ValueProperty<C>::value from { it }
236236
}.cast()
237237

238238
@JvmName("toDataFrameBoolean")
239-
public inline fun <reified B : Boolean?> Iterable<B>.toDataFrame(): DataFrame<OfSingleValueColumn<B>> = toDataFrame {
240-
OfSingleValueColumn<B>::value from { it }
239+
public inline fun <reified B : Boolean?> Iterable<B>.toDataFrame(): DataFrame<ValueProperty<B>> = toDataFrame {
240+
ValueProperty<B>::value from { it }
241241
}.cast()
242242

243243
@JvmName("toDataFrameUByte")
244-
public inline fun <reified U : UByte?> Iterable<U>.toDataFrame(): DataFrame<OfSingleValueColumn<U>> = toDataFrame {
245-
OfSingleValueColumn<U>::value from { it }
244+
public inline fun <reified U : UByte?> Iterable<U>.toDataFrame(): DataFrame<ValueProperty<U>> = toDataFrame {
245+
ValueProperty<U>::value from { it }
246246
}.cast()
247247

248248
@JvmName("toDataFrameUShort")
249-
public inline fun <reified U : UShort?> Iterable<U>.toDataFrame(): DataFrame<OfSingleValueColumn<U>> = toDataFrame {
250-
OfSingleValueColumn<U>::value from { it }
249+
public inline fun <reified U : UShort?> Iterable<U>.toDataFrame(): DataFrame<ValueProperty<U>> = toDataFrame {
250+
ValueProperty<U>::value from { it }
251251
}.cast()
252252

253253
@JvmName("toDataFrameUInt")
254-
public inline fun <reified U : UInt?> Iterable<U>.toDataFrame(): DataFrame<OfSingleValueColumn<U>> = toDataFrame {
255-
OfSingleValueColumn<U>::value from { it }
254+
public inline fun <reified U : UInt?> Iterable<U>.toDataFrame(): DataFrame<ValueProperty<U>> = toDataFrame {
255+
ValueProperty<U>::value from { it }
256256
}.cast()
257257

258258
@JvmName("toDataFrameULong")
259-
public inline fun <reified U : ULong?> Iterable<U>.toDataFrame(): DataFrame<OfSingleValueColumn<U>> = toDataFrame {
260-
OfSingleValueColumn<U>::value from { it }
259+
public inline fun <reified U : ULong?> Iterable<U>.toDataFrame(): DataFrame<ValueProperty<U>> = toDataFrame {
260+
ValueProperty<U>::value from { it }
261261
}.cast()
262262

263263
@DataSchema
264-
public interface OfSingleValueColumn<T> {
264+
public interface ValueProperty<T> {
265265
public val value: T
266266
}
267267

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ class CreateDataFrameTests {
216216
val typeParameter = type.first()
217217
val func = """
218218
@JvmName("toDataFrame$type")
219-
public inline fun <reified $typeParameter : $type?> Iterable<$typeParameter>.toDataFrame(): DataFrame<SingleColumn<$typeParameter>> = toDataFrame {
220-
OfSingleValueColumn<$typeParameter>::value from { it }
219+
public inline fun <reified $typeParameter : $type?> Iterable<$typeParameter>.toDataFrame(): DataFrame<ValueProperty<$typeParameter>> = toDataFrame {
220+
ValueProperty<$typeParameter>::value from { it }
221221
}.cast()
222222
""".trimIndent()
223223
println(func)

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Create.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.jetbrains.kotlinx.dataframe.samples.api
33
import io.kotest.matchers.shouldBe
44
import org.jetbrains.kotlinx.dataframe.DataFrame
55
import org.jetbrains.kotlinx.dataframe.api.Infer
6-
import org.jetbrains.kotlinx.dataframe.api.OfSingleValueColumn
6+
import org.jetbrains.kotlinx.dataframe.api.ValueProperty
77
import org.jetbrains.kotlinx.dataframe.api.add
88
import org.jetbrains.kotlinx.dataframe.api.column
99
import org.jetbrains.kotlinx.dataframe.api.columnGroup
@@ -321,7 +321,7 @@ class Create : TestBase() {
321321
fun readDataFrameFromValues() {
322322
// SampleStart
323323
val names = listOf("Alice", "Bob", "Charlie")
324-
val df: DataFrame<OfSingleValueColumn<String>> = names.toDataFrame()
324+
val df: DataFrame<ValueProperty<String>> = names.toDataFrame()
325325
df.add("length") { value.length }
326326
// SampleEnd
327327
df.value.toList() shouldBe names

docs/StardustDocs/topics/createDataFrame.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Return type of these overloads is a typed DataFrame. Its data schema defines col
142142

143143
```kotlin
144144
val names = listOf("Alice", "Bob", "Charlie")
145-
val df: DataFrame<OfSingleValueColumn<String>> = names.toDataFrame()
145+
val df: DataFrame<ValueProperty<String>> = names.toDataFrame()
146146
df.add("length") { value.length }
147147
```
148148

0 commit comments

Comments
 (0)