Skip to content

Commit 1a88d09

Browse files
committed
[Compiler plugin] remove unused code and outdated overload
1 parent 3c1811b commit 1a88d09

File tree

20 files changed

+10
-65
lines changed

20 files changed

+10
-65
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ val projectName: String by project
3636
repositories {
3737
mavenLocal()
3838
mavenCentral()
39-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
4039
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
4140
maven(jupyterApiTCRepo)
4241
}
@@ -178,7 +177,6 @@ koverMerged {
178177
":plugins:dataframe-gradle-plugin",
179178
":plugins:symbol-processor",
180179
":plugins:dataframe-gradle-plugin",
181-
":plugins:dataframe-introspection"
182180
)
183181
}
184182
}

core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ repositories {
3939
mavenLocal()
4040
mavenCentral()
4141
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
42-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
4342
maven(jupyterApiTCRepo)
4443
}
4544

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@ import kotlin.reflect.KProperty
1515
private val defaultExplodeColumns: ColumnsSelector<*, *> = { colsAtAnyDepth { it.isList() || it.isFrameColumn() } }
1616

1717
// region explode DataFrame
18-
18+
@Refine
19+
@Interpretable("Explode0")
1920
public fun <T> DataFrame<T>.explode(
2021
dropEmpty: Boolean = true,
2122
selector: ColumnsSelector<T, *> = defaultExplodeColumns
2223
): DataFrame<T> = explodeImpl(dropEmpty, selector)
2324

24-
@Refine
25-
@Interpretable("Explode0")
26-
public fun <T> DataFrame<T>.explode(selector: ColumnsSelector<T, *>): DataFrame<T> =
27-
explodeImpl(true, selector)
28-
2925
public fun <T> DataFrame<T>.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame<T> =
3026
explode(dropEmpty) { columns.toColumnSet() }
3127

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ public fun <T> Iterable<DataFrame<T>>.joinOrNull(
9898
public interface JoinDsl<out A, out B> : ColumnsSelectionDsl<A> {
9999

100100
public val right: DataFrame<B>
101-
@Interpretable("Match0")
102101

102+
@Interpretable("Match0")
103103
public infix fun <C> ColumnReference<C>.match(other: ColumnReference<C>): ColumnMatch<C> = ColumnMatch(this, other)
104104

105105
public infix fun <C> String.match(other: ColumnReference<C>): ColumnMatch<C> = ColumnMatch(toColumnOf(), other)

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.jetbrains.kotlinx.dataframe.api
33
import io.kotest.assertions.throwables.shouldNotThrowAny
44
import io.kotest.matchers.shouldBe
55
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
6-
import org.jetbrains.kotlinx.dataframe.impl.api.dataFrameOf
76
import org.junit.Test
87

98
class MoveTests {
@@ -92,20 +91,4 @@ class MoveTests {
9291
df.move("1").after("2") shouldBe dataFrameOf("2", "1")(2, 1)
9392
}
9493
}
95-
96-
@Test
97-
fun test() {
98-
val df = dataFrameOf("a", "b", "c").withValues(emptyList())
99-
100-
//val df1 = df.move("a", "b").under("c") // Can not insert columns under a column 'c', because it is not a column group
101-
val df1 = df.move("a", "b").under("d")
102-
// df1.schema().print()
103-
104-
// df.group("a", "b").into { pathOf("d", "e") }.schema().print()
105-
106-
df1.group("c").into("d").schema().print()
107-
108-
// df.ungroup("")
109-
// grouped.schema().print()
110-
}
11194
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@ import kotlin.reflect.KProperty
1515
private val defaultExplodeColumns: ColumnsSelector<*, *> = { colsAtAnyDepth { it.isList() || it.isFrameColumn() } }
1616

1717
// region explode DataFrame
18-
18+
@Refine
19+
@Interpretable("Explode0")
1920
public fun <T> DataFrame<T>.explode(
2021
dropEmpty: Boolean = true,
2122
selector: ColumnsSelector<T, *> = defaultExplodeColumns
2223
): DataFrame<T> = explodeImpl(dropEmpty, selector)
2324

24-
@Refine
25-
@Interpretable("Explode0")
26-
public fun <T> DataFrame<T>.explode(selector: ColumnsSelector<T, *>): DataFrame<T> =
27-
explodeImpl(true, selector)
28-
2925
public fun <T> DataFrame<T>.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame<T> =
3026
explode(dropEmpty) { columns.toColumnSet() }
3127

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ public fun <T> Iterable<DataFrame<T>>.joinOrNull(
9898
public interface JoinDsl<out A, out B> : ColumnsSelectionDsl<A> {
9999

100100
public val right: DataFrame<B>
101-
@Interpretable("Match0")
102101

102+
@Interpretable("Match0")
103103
public infix fun <C> ColumnReference<C>.match(other: ColumnReference<C>): ColumnMatch<C> = ColumnMatch(this, other)
104104

105105
public infix fun <C> String.match(other: ColumnReference<C>): ColumnMatch<C> = ColumnMatch(toColumnOf(), other)

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.jetbrains.kotlinx.dataframe.api
33
import io.kotest.assertions.throwables.shouldNotThrowAny
44
import io.kotest.matchers.shouldBe
55
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
6-
import org.jetbrains.kotlinx.dataframe.impl.api.dataFrameOf
76
import org.junit.Test
87

98
class MoveTests {
@@ -92,20 +91,4 @@ class MoveTests {
9291
df.move("1").after("2") shouldBe dataFrameOf("2", "1")(2, 1)
9392
}
9493
}
95-
96-
@Test
97-
fun test() {
98-
val df = dataFrameOf("a", "b", "c").withValues(emptyList())
99-
100-
//val df1 = df.move("a", "b").under("c") // Can not insert columns under a column 'c', because it is not a column group
101-
val df1 = df.move("a", "b").under("d")
102-
// df1.schema().print()
103-
104-
// df.group("a", "b").into { pathOf("d", "e") }.schema().print()
105-
106-
df1.group("c").into("d").schema().print()
107-
108-
// df.ungroup("")
109-
// grouped.schema().print()
110-
}
11194
}

dataframe-arrow/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ group = "org.jetbrains.kotlinx"
1111

1212
repositories {
1313
mavenCentral()
14-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
1514
}
1615

1716
dependencies {

dataframe-excel/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ group = "org.jetbrains.kotlinx"
1111

1212
repositories {
1313
mavenCentral()
14-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
1514
}
1615

1716
dependencies {

0 commit comments

Comments
 (0)