Skip to content

Commit 7a4ad5c

Browse files
committed
Refactor DataFrame row limiting code
Replaced the usage of 'rows().take().toDataFrame()' with the more concise 'take()' method in multiple files.
1 parent e6becba commit 7a4ad5c

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/writeJson.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.dataframe.api.indices
1111
import org.jetbrains.kotlinx.dataframe.api.isList
1212
import org.jetbrains.kotlinx.dataframe.api.name
1313
import org.jetbrains.kotlinx.dataframe.api.rows
14-
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
14+
import org.jetbrains.kotlinx.dataframe.api.take
1515
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1616
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
1717
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
@@ -68,7 +68,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
6868

6969
is FrameColumn<*> -> {
7070
val data = if (rowLimit == null) encodeFrameWithMetadata(col[index])
71-
else encodeFrameWithMetadata(col[index].rows().take(rowLimit).toDataFrame(), rowLimit)
71+
else encodeFrameWithMetadata(col[index].take(rowLimit), rowLimit)
7272
obj(
7373
DATA to data,
7474
METADATA to obj(
@@ -205,7 +205,7 @@ internal fun KlaxonJson.encodeDataFrameWithMetadata(
205205
NCOL to frame.columnsCount()
206206
),
207207
KOTLIN_DATAFRAME to encodeFrameWithMetadata(
208-
frame.rows().take(rowLimit).toDataFrame(),
208+
frame.take(rowLimit),
209209
rowLimit = nestedRowLimit
210210
),
211211
)

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/JupyterHtmlRenderer.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.jetbrains.kotlinx.dataframe.jupyter
22

33
import com.beust.klaxon.json
4-
import org.jetbrains.kotlinx.dataframe.api.rows
5-
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
4+
import org.jetbrains.kotlinx.dataframe.api.take
65
import org.jetbrains.kotlinx.dataframe.impl.io.encodeFrame
76
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
87
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
@@ -71,7 +70,7 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
7170
"nrow" to df.size.nrow,
7271
"ncol" to df.size.ncol,
7372
"columns" to df.columnNames(),
74-
"kotlin_dataframe" to encodeFrame(df.rows().take(limit).toDataFrame()),
73+
"kotlin_dataframe" to encodeFrame(df.take(limit)),
7574
)
7675
}.toJsonString()
7776
} else {

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/writeJson.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.dataframe.api.indices
1111
import org.jetbrains.kotlinx.dataframe.api.isList
1212
import org.jetbrains.kotlinx.dataframe.api.name
1313
import org.jetbrains.kotlinx.dataframe.api.rows
14-
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
14+
import org.jetbrains.kotlinx.dataframe.api.take
1515
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1616
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
1717
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
@@ -68,7 +68,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
6868

6969
is FrameColumn<*> -> {
7070
val data = if (rowLimit == null) encodeFrameWithMetadata(col[index])
71-
else encodeFrameWithMetadata(col[index].rows().take(rowLimit).toDataFrame(), rowLimit)
71+
else encodeFrameWithMetadata(col[index].take(rowLimit), rowLimit)
7272
obj(
7373
DATA to data,
7474
METADATA to obj(
@@ -205,7 +205,7 @@ internal fun KlaxonJson.encodeDataFrameWithMetadata(
205205
NCOL to frame.columnsCount()
206206
),
207207
KOTLIN_DATAFRAME to encodeFrameWithMetadata(
208-
frame.rows().take(rowLimit).toDataFrame(),
208+
frame.take(rowLimit),
209209
rowLimit = nestedRowLimit
210210
),
211211
)

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/JupyterHtmlRenderer.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.jetbrains.kotlinx.dataframe.jupyter
22

33
import com.beust.klaxon.json
4-
import org.jetbrains.kotlinx.dataframe.api.rows
5-
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
4+
import org.jetbrains.kotlinx.dataframe.api.take
65
import org.jetbrains.kotlinx.dataframe.impl.io.encodeFrame
76
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
87
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
@@ -71,7 +70,7 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
7170
"nrow" to df.size.nrow,
7271
"ncol" to df.size.ncol,
7372
"columns" to df.columnNames(),
74-
"kotlin_dataframe" to encodeFrame(df.rows().take(limit).toDataFrame()),
73+
"kotlin_dataframe" to encodeFrame(df.take(limit)),
7574
)
7675
}.toJsonString()
7776
} else {

0 commit comments

Comments
 (0)