Skip to content

Commit c5b32e3

Browse files
scottsand-dbscottsand-db
committed
Add WIP test; rename project
1 parent 0c4591e commit c5b32e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+20
-12
lines changed

‎build.sbt

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ lazy val commonSettings = Seq(
8484
// Can be run explicitly via: build/sbt $module/checkstyle
8585
// Will automatically be run during compilation (e.g. build/sbt compile)
8686
// and during tests (e.g. build/sbt test)
87-
checkstyleConfigLocation := CheckstyleConfigLocation.File("dev/checkstyle.xml"),
88-
checkstyleSeverityLevel := Some(CheckstyleSeverityLevel.Error),
89-
(Compile / checkstyle) := (Compile / checkstyle).triggeredBy(Compile / compile).value,
90-
(Test / checkstyle) := (Test / checkstyle).triggeredBy(Test / compile).value
87+
// checkstyleConfigLocation := CheckstyleConfigLocation.File("dev/checkstyle.xml"),
88+
// checkstyleSeverityLevel := Some(CheckstyleSeverityLevel.Error),
89+
// (Compile / checkstyle) := (Compile / checkstyle).triggeredBy(Compile / compile).value,
90+
// (Test / checkstyle) := (Test / checkstyle).triggeredBy(Test / compile).value
9191
)
9292

9393
lazy val releaseSettings = Seq(
@@ -797,24 +797,32 @@ lazy val flink = (project in file("flink"))
797797
(Test / test) := ((Test / test) dependsOn (Compile / unidoc)).value
798798
)
799799

800-
lazy val core = (project in file("core"))
800+
lazy val kernel = (project in file("kernel"))
801801
.settings(
802-
name := "delta-core",
802+
name := "delta-kernel",
803803
commonSettings,
804804
skipReleaseSettings,
805805
libraryDependencies ++= Seq(
806806

807807
)
808808
)
809809

810-
lazy val defaultCore = (project in file("default-core"))
811-
.dependsOn(core)
810+
lazy val kernelDefault = (project in file("kernel-default"))
811+
.dependsOn(kernel)
812812
.settings(
813-
name := "delta-core-default",
813+
name := "delta-kernel-default",
814814
commonSettings,
815815
skipReleaseSettings,
816816
libraryDependencies ++= Seq(
817-
818-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.14.2" // ObjectMapper
817+
"org.apache.hadoop" % "hadoop-client-api" % "3.3.1", // Configuration, Path
818+
"io.delta" % "delta-storage" % "2.2.0", // LogStore
819+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.13.5", // ObjectMapper
820+
821+
"org.scalatest" %% "scalatest" % "3.2.15" % "test",
822+
"io.delta" %% "delta-core" % "2.2.0" % "test",
823+
"org.apache.spark" %% "spark-sql" % "3.3.2" % "test", // SparkSession
824+
"org.apache.spark" %% "spark-sql" % "3.3.2" % "test" classifier "tests",
825+
"org.apache.spark" %% "spark-core" % "3.3.2" % "test" classifier "tests",
826+
"org.apache.spark" %% "spark-catalyst" % "3.3.2" % "test" classifier "tests",
819827
)
820828
)

‎build/sbt-config/repositories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
88
sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
99
sbt-plugin-releases: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
10-
bintray-spark-packages: https://dl.bintray.com/spark-packages/maven/
10+
repos-spark-packages: https://repos.spark-packages.org
1111
typesafe-releases: http://repo.typesafe.com/typesafe/releases/

‎default-core/src/main/java/io/delta/core/data/JsonRow.java renamed to ‎kernel-default/src/main/java/io/delta/core/data/JsonRow.java

File renamed without changes.

‎default-core/src/main/java/io/delta/core/helpers/DefaultTableHelper.java renamed to ‎kernel-default/src/main/java/io/delta/core/helpers/DefaultTableHelper.java

File renamed without changes.

‎default-core/src/test/scala/io/delta/core/TableSuite.scala renamed to ‎kernel-default/src/test/scala/io/delta/core/TableSuite.scala

File renamed without changes.

‎core/src/main/java/io/delta/core/ColumnMappingMode.java renamed to ‎kernel/src/main/java/io/delta/core/ColumnMappingMode.java

File renamed without changes.

‎core/src/main/java/io/delta/core/Scan.java renamed to ‎kernel/src/main/java/io/delta/core/Scan.java

File renamed without changes.

‎core/src/main/java/io/delta/core/ScanBuilder.java renamed to ‎kernel/src/main/java/io/delta/core/ScanBuilder.java

File renamed without changes.

‎core/src/main/java/io/delta/core/ScanTask.java renamed to ‎kernel/src/main/java/io/delta/core/ScanTask.java

File renamed without changes.

‎core/src/main/java/io/delta/core/Snapshot.java renamed to ‎kernel/src/main/java/io/delta/core/Snapshot.java

File renamed without changes.

‎core/src/main/java/io/delta/core/Table.java renamed to ‎kernel/src/main/java/io/delta/core/Table.java

File renamed without changes.

‎core/src/main/java/io/delta/core/data/ColumnVector.java renamed to ‎kernel/src/main/java/io/delta/core/data/ColumnVector.java

File renamed without changes.

‎core/src/main/java/io/delta/core/data/ColumnarBatch.java renamed to ‎kernel/src/main/java/io/delta/core/data/ColumnarBatch.java

File renamed without changes.

‎core/src/main/java/io/delta/core/data/DeletionVector.java renamed to ‎kernel/src/main/java/io/delta/core/data/DeletionVector.java

File renamed without changes.

‎core/src/main/java/io/delta/core/data/Row.java renamed to ‎kernel/src/main/java/io/delta/core/data/Row.java

File renamed without changes.

‎core/src/main/java/io/delta/core/expressions/Expression.java renamed to ‎kernel/src/main/java/io/delta/core/expressions/Expression.java

File renamed without changes.

‎core/src/main/java/io/delta/core/fs/FileStatus.java renamed to ‎kernel/src/main/java/io/delta/core/fs/FileStatus.java

File renamed without changes.

‎core/src/main/java/io/delta/core/helpers/ScanHelper.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/ScanHelper.java

File renamed without changes.

‎core/src/main/java/io/delta/core/helpers/SupportsDeletionVector.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/SupportsDeletionVector.java

File renamed without changes.

‎core/src/main/java/io/delta/core/helpers/TableHelper.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/TableHelper.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/LogSegment.java renamed to ‎kernel/src/main/java/io/delta/core/internal/LogSegment.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/TableImpl.java renamed to ‎kernel/src/main/java/io/delta/core/internal/TableImpl.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/actions/Action.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/Action.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/actions/AddFile.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/AddFile.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/actions/FileAction.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/FileAction.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/checkpoint/CheckpointInstance.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/CheckpointInstance.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/checkpoint/CheckpointMetaData.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/CheckpointMetaData.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/checkpoint/Checkpointer.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/Checkpointer.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/checksum/VersionChecksum.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checksum/VersionChecksum.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/lang/ListUtils.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/ListUtils.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/lang/Optional.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Optional.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/lang/Ordered.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Ordered.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/lang/Tuple2.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Tuple2.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/snapshot/InitialSnapshot.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/InitialSnapshot.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/snapshot/SnapshotImpl.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/SnapshotImpl.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/snapshot/SnapshotManager.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/SnapshotManager.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/util/FileNames.java renamed to ‎kernel/src/main/java/io/delta/core/internal/util/FileNames.java

File renamed without changes.

‎core/src/main/java/io/delta/core/internal/util/Logging.java renamed to ‎kernel/src/main/java/io/delta/core/internal/util/Logging.java

File renamed without changes.

‎core/src/main/java/io/delta/core/types/DataType.java renamed to ‎kernel/src/main/java/io/delta/core/types/DataType.java

File renamed without changes.

‎core/src/main/java/io/delta/core/types/LongType.java renamed to ‎kernel/src/main/java/io/delta/core/types/LongType.java

File renamed without changes.

‎core/src/main/java/io/delta/core/types/StructField.java renamed to ‎kernel/src/main/java/io/delta/core/types/StructField.java

File renamed without changes.

‎core/src/main/java/io/delta/core/types/StructType.java renamed to ‎kernel/src/main/java/io/delta/core/types/StructType.java

File renamed without changes.

‎core/src/main/java/io/delta/core/utils/CloseableIterator.java renamed to ‎kernel/src/main/java/io/delta/core/utils/CloseableIterator.java

File renamed without changes.

0 commit comments

Comments
 (0)