Merge pull request #15 from VirtusLab/repackage-to-iskra

prolativ · web-flow · commit 2331e154fa49 · 2022-08-30T17:09:44.000+02:00
Rename packages to ...iskra
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Iskra tries to work around this problem by using its own encoders (unrelated to
 
 ## How does Iskra make things typesafe and efficient at the same time?
 
-TypedFrames provides thin (but strongly typed) wrappers around `DataFrame`s, which track types and names of columns at compile time but let Catalyst perform all of its optimizations at runtime.
+Iskra provides thin (but strongly typed) wrappers around `DataFrame`s, which track types and names of columns at compile time but let Catalyst perform all of its optimizations at runtime.
 
 Iskra uses structural types rather than case classes as data models, which gives us a lot of flexibility (no need to explicitly define a new case class when a column is added/removed/renamed!) but we still get compilation errors when we try to refer to a column which doesn't exist or can't be used in a given context.
 
diff --git a/publish-conf.scala b/publish-conf.scala
@@ -1,8 +1,8 @@
 //> using publish.organization "org.virtuslab"
-//> using publish.name "typed-frames"
+//> using publish.name "iskra"
 //> using publish.computeVersion "git:tag"
-//> using publish.url "https://github.com/VirtusLab/typed-frames"
-//> using publish.versionControl "scm:git:github.com/VirtusLab/typed-frames.git"
+//> using publish.url "https://github.com/VirtusLab/iskra"
+//> using publish.versionControl "scm:git:github.com/VirtusLab/iskra.git"
 //> using publish.license "Apache-2.0"
 //> using publish.repository "central"
 //> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ"
diff --git a/src/main/Aliasing.scala b/src/main/Aliasing.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 
diff --git a/src/main/Column.scala b/src/main/Column.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import org.apache.spark.sql.{ Column => UntypedColumn}
 import types.DataType
diff --git a/src/main/ColumnOp.scala b/src/main/ColumnOp.scala
@@ -1,11 +1,11 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 import org.apache.spark.sql
 import org.apache.spark.sql.functions.concat
-import org.virtuslab.typedframes.{Column as Col}
-import org.virtuslab.typedframes.UntypedOps.typed
-import org.virtuslab.typedframes.types.*
+import org.virtuslab.iskra.{Column as Col}
+import org.virtuslab.iskra.UntypedOps.typed
+import org.virtuslab.iskra.types.*
 import DataType.*
 
 object ColumnOp:
diff --git a/src/main/DataFrame.scala b/src/main/DataFrame.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import org.apache.spark.sql
 import org.apache.spark.sql.SparkSession
diff --git a/src/main/DataFrameBuilders.scala b/src/main/DataFrameBuilders.scala
@@ -1,10 +1,10 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted._
 import org.apache.spark.sql
 import org.apache.spark.sql.SparkSession
-import org.virtuslab.typedframes.DataFrame
-import org.virtuslab.typedframes.types.{DataType, StructType}
+import org.virtuslab.iskra.DataFrame
+import org.virtuslab.iskra.types.{DataType, StructType}
 import DataType.{Encoder, StructEncoder, PrimitiveEncoder}
 
 object DataFrameBuilders:
diff --git a/src/main/FrameSchema.scala b/src/main/FrameSchema.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 import scala.deriving.Mirror
diff --git a/src/main/Grouping.scala b/src/main/Grouping.scala
@@ -1,7 +1,7 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
-import org.virtuslab.typedframes.types.DataType
+import org.virtuslab.iskra.types.DataType
 import MacroHelpers.TupleSubtype
 
 class GroupBy[View <: SchemaView](val view: View, val underlying: UntypedDataFrame)
diff --git a/src/main/Join.scala b/src/main/Join.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 
diff --git a/src/main/JoinOnCondition.scala b/src/main/JoinOnCondition.scala
@@ -1,7 +1,7 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
-import org.virtuslab.typedframes.types.BooleanOptType
+import org.virtuslab.iskra.types.BooleanOptType
 
 abstract class JoinOnCondition[MergedSchema, MergedView <: SchemaView](
   val left: UntypedDataFrame, val right: UntypedDataFrame, val joinType: JoinType
diff --git a/src/main/MacroHelpers.scala b/src/main/MacroHelpers.scala
@@ -1,8 +1,8 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 
-private[typedframes] object MacroHelpers:
+private[iskra] object MacroHelpers:
   def callPosition(ownerExpr: Expr[?])(using Quotes): quotes.reflect.Position =
     import quotes.reflect.*
     val file = Position.ofMacroExpansion.sourceFile
diff --git a/src/main/Name.scala b/src/main/Name.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 type Name = String & Singleton
 object Name:
diff --git a/src/main/SchemaView.scala b/src/main/SchemaView.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted._
 import org.apache.spark.sql.functions.col
diff --git a/src/main/Select.scala b/src/main/Select.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 import MacroHelpers.TupleSubtype
diff --git a/src/main/UntypedOps.scala b/src/main/UntypedOps.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 import types.{DataType, StructType}
diff --git a/src/main/Where.scala b/src/main/Where.scala
@@ -1,9 +1,9 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 import scala.quoted.*
 import scala.annotation.implicitNotFound
 
-import org.virtuslab.typedframes.types.BooleanOptType
+import org.virtuslab.iskra.types.BooleanOptType
 
 trait Where[Schema, View <: SchemaView]:
   val view: View
diff --git a/src/main/api/api.scala b/src/main/api/api.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 package api
 
 export DataFrameBuilders.toTypedDF
@@ -24,11 +24,11 @@ export types.{
   StructOptType
 }
 export UntypedOps.typed
-export org.virtuslab.typedframes.$
-export org.virtuslab.typedframes.{Column, DataFrame, UntypedColumn, UntypedDataFrame}
+export org.virtuslab.iskra.$
+export org.virtuslab.iskra.{Column, DataFrame, UntypedColumn, UntypedDataFrame}
 
 object functions:
-  export org.virtuslab.typedframes.functions.lit
-  export org.virtuslab.typedframes.functions.Aggregates.*
+  export org.virtuslab.iskra.functions.lit
+  export org.virtuslab.iskra.functions.Aggregates.*
 
 export org.apache.spark.sql.SparkSession
diff --git a/src/main/functions/aggregates.scala b/src/main/functions/aggregates.scala
@@ -1,11 +1,11 @@
-package org.virtuslab.typedframes.functions
+package org.virtuslab.iskra.functions
 
 import org.apache.spark.sql
-import org.virtuslab.typedframes.Agg
-import org.virtuslab.typedframes.Column
-import org.virtuslab.typedframes.UntypedOps.typed
-import org.virtuslab.typedframes.types.*
-import org.virtuslab.typedframes.types.DataType.{NumericOptType, Nullable}
+import org.virtuslab.iskra.Agg
+import org.virtuslab.iskra.Column
+import org.virtuslab.iskra.UntypedOps.typed
+import org.virtuslab.iskra.types.*
+import org.virtuslab.iskra.types.DataType.{NumericOptType, Nullable}
 
 class Sum[A <: Agg](val agg: A):
   def apply[T <: NumericOptType](column: agg.View ?=> Column[T]): Column[Nullable[T]] =
diff --git a/src/main/functions/lit.scala b/src/main/functions/lit.scala
@@ -1,7 +1,7 @@
-package org.virtuslab.typedframes.functions
+package org.virtuslab.iskra.functions
 
 import org.apache.spark.sql
-import org.virtuslab.typedframes.Column
-import org.virtuslab.typedframes.types.DataType.PrimitiveEncoder
+import org.virtuslab.iskra.Column
+import org.virtuslab.iskra.types.DataType.PrimitiveEncoder
 
 def lit[A](value: A)(using encoder: PrimitiveEncoder[A]): Column[encoder.ColumnType] = Column(sql.functions.lit(encoder.encode(value)))
diff --git a/src/main/types/DataType.scala b/src/main/types/DataType.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 package types
 
 import scala.quoted._
diff --git a/src/main/untyped.scala b/src/main/untyped.scala
@@ -1,4 +1,4 @@
-package org.virtuslab.typedframes
+package org.virtuslab.iskra
 
 type UntypedDataFrame = org.apache.spark.sql.DataFrame
 type UntypedColumn = org.apache.spark.sql.Column
diff --git a/src/test/AggregatorsTest.scala b/src/test/AggregatorsTest.scala
@@ -1,7 +1,7 @@
-package org.virtuslab.typedframes.test
+package org.virtuslab.iskra.test
 
 class AggregatorsTest extends SparkUnitTest("AggregatorsTest"):
-  import org.virtuslab.typedframes.api.*
+  import org.virtuslab.iskra.api.*
   import functions.*
 
   case class Foo(string: String, int: Int, intOpt: Option[Int], float: Float, floatOpt: Option[Float])
diff --git a/src/test/CompilationTest.scala b/src/test/CompilationTest.scala
@@ -1,32 +1,32 @@
-package org.virtuslab.typedframes.test
+package org.virtuslab.iskra.test
 
 import org.scalatest.funsuite.AnyFunSuite
 
 class CompilationTest extends AnyFunSuite:
   test("Wrong collect type") {
     assertCompiles("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |given spark: SparkSession = ???
       |val elements = Seq(1, 2, 3).toTypedDF.collectAs[Int]
       |""".stripMargin)
 
     assertDoesNotCompile("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |given spark: SparkSession = ???
       |val elements = Seq(1, 2, 3).toTypedDF.collectAs[String]
       |""".stripMargin)
   }
 
   test("Select nonexistent column") {
     assertCompiles("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |case class Foo(string: String)
       |given spark: SparkSession = ???
       |val elements = Seq(Foo("abc")).toTypedDF.select($.string)
       |""".stripMargin)
 
     assertDoesNotCompile("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |case class Foo(string: String)
       |given spark: SparkSession = ???
       |val elements = Seq(Foo("abc")).toTypedDF.select($.strin)
@@ -35,25 +35,25 @@ class CompilationTest extends AnyFunSuite:
 
   test("Collect nullable") {
     assertCompiles("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |given spark: SparkSession = ???
       |val result = Seq(1, 2).toTypedDF.collectAs[Int]
       |""".stripMargin)
 
     assertCompiles("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |given spark: SparkSession = ???
       |val result = Seq(1, 2).toTypedDF.collectAs[Option[Int]]
       |""".stripMargin)
 
     assertDoesNotCompile("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |given spark: SparkSession = ???
       |val result = Seq(Some(1), None).toTypedDF.collectAs[Int]
       |""".stripMargin)
 
     assertCompiles("""
-      |import org.virtuslab.typedframes.api.*
+      |import org.virtuslab.iskra.api.*
       |given spark: SparkSession = ???
       |val result = Seq(Some(1), None).toTypedDF.collectAs[Option[Int]]
       |""".stripMargin)
diff --git a/src/test/OperatorsTest.scala b/src/test/OperatorsTest.scala
@@ -1,11 +1,11 @@
-package org.virtuslab.typedframes.test
+package org.virtuslab.iskra.test
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers.shouldEqual
 
 class OperatorsTest extends SparkUnitTest("OperatorsTest"):
-  import org.virtuslab.typedframes.api.*
+  import org.virtuslab.iskra.api.*
 
   case class Foo(boolean: Boolean, string: String, byte: Byte, short: Short, int: Int, long: Long, float: Float, double: Double)
   case class Bar(int: Int, intSome: Option[Int], intNone: Option[Int])
diff --git a/src/test/SparkUnitTest.scala b/src/test/SparkUnitTest.scala
@@ -1,8 +1,8 @@
-package org.virtuslab.typedframes.test
+package org.virtuslab.iskra.test
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.BeforeAndAfterAll
-import org.virtuslab.typedframes.api.*
+import org.virtuslab.iskra.api.*
 
 abstract class SparkUnitTest(suiteName: String) extends AnyFunSuite, BeforeAndAfterAll:
   given spark: SparkSession =
diff --git a/src/test/WhereTest.scala b/src/test/WhereTest.scala
@@ -1,11 +1,11 @@
-package org.virtuslab.typedframes.test
+package org.virtuslab.iskra.test
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers.shouldEqual
 
 class WhereTest extends SparkUnitTest("WhereTest"):
-  import org.virtuslab.typedframes.api.*
+  import org.virtuslab.iskra.api.*
   import functions.lit
 
   case class Foo(int: Int, intOpt: Option[Int])
diff --git a/src/test/example/Books.scala b/src/test/example/Books.scala
@@ -1,6 +1,6 @@
-package org.virtuslab.typedframes.example.books
+package org.virtuslab.iskra.example.books
 
-import org.virtuslab.typedframes.api.*
+import org.virtuslab.iskra.api.*
 
 @main def runExample(dataFilePath: String): Unit =
   given spark: SparkSession = {
diff --git a/src/test/example/Countries.scala b/src/test/example/Countries.scala
@@ -1,6 +1,6 @@
-package org.virtuslab.typedframes.example.countries
+package org.virtuslab.iskra.example.countries
 
-import org.virtuslab.typedframes.api.*
+import org.virtuslab.iskra.api.*
 import functions.avg
 
 @main def runExample(): Unit =
diff --git a/src/test/example/Workers.scala b/src/test/example/Workers.scala
@@ -1,6 +1,6 @@
-package org.virtuslab.typedframes.example.workers
+package org.virtuslab.iskra.example.workers
 
-import org.virtuslab.typedframes.api.*
+import org.virtuslab.iskra.api.*
 import functions.lit
 
 @main def runExample(): Unit =

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.virtuslab.typedframes`
	`1`	`+package org.virtuslab.iskra`
`2`	`2`
`3`	`3`	`import scala.quoted.*`
`4`	`4`