Skip to content

Commit d82953b

Browse files
committed
Remove unused testing utility ColumnAccessTracker
1 parent 9a6713e commit d82953b

File tree

4 files changed

+4
-62
lines changed

4 files changed

+4
-62
lines changed

core/api/core.api

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5672,10 +5672,6 @@ public final class org/jetbrains/kotlinx/dataframe/impl/CacheKt {
56725672
public static final fun getListType (Lkotlin/reflect/KType;)Lkotlin/reflect/KType;
56735673
}
56745674

5675-
public final class org/jetbrains/kotlinx/dataframe/impl/ColumnAccessTrackerKt {
5676-
public static final fun trackColumnAccess (Lkotlin/jvm/functions/Function0;)Ljava/util/List;
5677-
}
5678-
56795675
public final class org/jetbrains/kotlinx/dataframe/impl/ColumnNameGenerator {
56805676
public fun <init> ()V
56815677
public fun <init> (Ljava/util/List;)V

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,11 @@ internal open class DataRowImpl<T>(private val index: Int, private val df: DataF
1414

1515
override fun df() = df
1616

17-
override operator fun get(name: String): Any? {
18-
ColumnAccessTracker.registerColumnAccess(name)
19-
return df[name][index]
20-
}
17+
override operator fun get(name: String): Any? = df[name][index]
2118

22-
override operator fun <R> get(column: ColumnReference<R>): R {
23-
ColumnAccessTracker.registerColumnAccess(column.name())
24-
return column.getValue(this)
25-
}
19+
override operator fun <R> get(column: ColumnReference<R>): R = column.getValue(this)
2620

27-
override fun <R> getValueOrNull(column: ColumnReference<R>): R? {
28-
ColumnAccessTracker.registerColumnAccess(column.name())
29-
return column.getValueOrNull(this)
30-
}
21+
override fun <R> getValueOrNull(column: ColumnReference<R>): R? = column.getValueOrNull(this)
3122

3223
override fun index() = index
3324

@@ -37,7 +28,6 @@ internal open class DataRowImpl<T>(private val index: Int, private val df: DataF
3728

3829
override fun get(columnIndex: Int): Any? {
3930
val column = df.getColumn(columnIndex)
40-
ColumnAccessTracker.registerColumnAccess(column.name())
4131
return column[index]
4232
}
4333

@@ -50,10 +40,7 @@ internal open class DataRowImpl<T>(private val index: Int, private val df: DataF
5040

5141
override fun hashCode() = values.hashCode()
5242

53-
override fun getOrNull(name: String): Any? {
54-
ColumnAccessTracker.registerColumnAccess(name)
55-
return df.getColumnOrNull(name)?.get(index)
56-
}
43+
override fun getOrNull(name: String): Any? = df.getColumnOrNull(name)?.get(index)
5744
}
5845

5946
internal val <T> DataRow<T>.owner: DataFrame<T> get() = df()

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.isMissingColumn
174174
import org.jetbrains.kotlinx.dataframe.impl.emptyPath
175175
import org.jetbrains.kotlinx.dataframe.impl.getColumnsImpl
176176
import org.jetbrains.kotlinx.dataframe.impl.nothingType
177-
import org.jetbrains.kotlinx.dataframe.impl.trackColumnAccess
178177
import org.jetbrains.kotlinx.dataframe.index
179178
import org.jetbrains.kotlinx.dataframe.io.renderValueForStdout
180179
import org.jetbrains.kotlinx.dataframe.kind
@@ -278,13 +277,6 @@ class DataFrameTests : BaseTest() {
278277
sliced[0].name shouldBe typed[1].name
279278
}
280279

281-
@Test
282-
fun `access tracking`() {
283-
trackColumnAccess {
284-
typed[2].age
285-
} shouldBe listOf("age")
286-
}
287-
288280
@Test
289281
fun `indexing`() {
290282
val expected = 45

0 commit comments

Comments
 (0)