Skip to content

Commit 4b53733

Browse files
authored
Simplify Spark version specific Scala code (#333)
Some classes do not have alternatives for other Spark versions, so they are moved into `src/main/scala`. Removes `UnixMicros.unixMicros`, use `org.apache.spark.sql.catalyst.expressions.UnixMicros` instead.
1 parent 135fa16 commit 4b53733

File tree

15 files changed

+8
-64
lines changed

15 files changed

+8
-64
lines changed

src/main/scala-spark-3.2/uk/co/gresearch/spark/BinaryLikeWithNewChildrenInternal.scala

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

src/main/scala-spark-3.2/uk/co/gresearch/spark/UnixMicros.scala

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/scala-spark-3.3/uk/co/gresearch/spark/BinaryLikeWithNewChildrenInternal.scala

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/scala-spark-3.3/uk/co/gresearch/spark/UnixMicros.scala

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/scala-spark-3.4/uk/co/gresearch/spark/BinaryLikeWithNewChildrenInternal.scala

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/scala-spark-3.4/uk/co/gresearch/spark/UnixMicros.scala

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/scala-spark-3.5/org/apache/spark/sql/extension/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.apache.spark.sql.catalyst.expressions.Expression
2020

2121
package object extension {
2222
implicit class ColumnExtension(col: Column) {
23-
// Column.expr exists in this Spark version
23+
// Column.expr exists in this Spark version and earlier
2424
def sql: String = col.expr.sql
2525
}
2626

src/main/scala-spark-3.5/uk/co/gresearch/spark/BinaryLikeWithNewChildrenInternal.scala

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/scala-spark-3.5/uk/co/gresearch/spark/UnixMicros.scala

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

src/main/scala-spark-4.0/org/apache/spark/sql/extension/extension.scala renamed to src/main/scala-spark-4.0/org/apache/spark/sql/extension/package.scala

File renamed without changes.

0 commit comments

Comments
 (0)