xzhseh
diff --git a/‎PROTOCOL.md
+2-4 b/‎PROTOCOL.md
+2-4
diff --git a/‎benchmarks/build.sbt
+1-1 b/‎benchmarks/build.sbt
+1-1
diff --git a/‎build.sbt
-110 b/‎build.sbt
-110
diff --git a/‎dev/check-delta-connect-codegen-python.py
-83 b/‎dev/check-delta-connect-codegen-python.py
-83
diff --git a/‎dev/delta-connect-gen-protos.sh
-104 b/‎dev/delta-connect-gen-protos.sh
-104
diff --git a/‎dev/pyproject.toml
-23 b/‎dev/pyproject.toml
-23
diff --git a/‎dev/requirements.txt
-9 b/‎dev/requirements.txt
-9
diff --git a/‎dev/tox.ini
+1-1 b/‎dev/tox.ini
+1-1
@@ -477,9 +477,7 @@ The following is an example `remove` action.
 ```
 
 ### Add CDC File
-The `cdc` action is used to add a [file](#change-data-files) containing only the data that was changed as part of the transaction. The `cdc` action is allowed to add a [Data File](#data-files) that is also added by an `add` action, when it does not contain any copied rows and the `_change_type` column is filled for all rows.
-
-When change data readers encounter a `cdc` action in a particular Delta table version, they must read the changes made in that version exclusively using the `cdc` files. If a version has no `cdc` action, then the data in `add` and `remove` actions are read as inserted and deleted rows, respectively.
+The `cdc` action is used to add a [file](#change-data-files) containing only the data that was changed as part of the transaction. When change data readers encounter a `cdc` action in a particular Delta table version, they must read the changes made in that version exclusively using the `cdc` files. If a version has no `cdc` action, then the data in `add` and `remove` actions are read as inserted and deleted rows, respectively.
 
 The schema of the `cdc` action is as follows:
 
@@ -525,7 +523,7 @@ Specifically, to read the row-level changes made in a version, the following str
 
 ##### Note for non-change data readers
 
-In a table with Change Data Feed enabled, the data Parquet files referenced by `add` and `remove` actions are allowed to contain an extra column `_change_type`. This column is not present in the table's schema. When accessing these files, readers should disregard this column and only process columns defined within the table's schema.
+In a table with Change Data Feed enabled, the data Parquet files referenced by `add` and `remove` actions are allowed to contain an extra column `_change_type`. This column is not present in the table's schema and will consistently have a `null` value. When accessing these files, readers should disregard this column and only process columns defined within the table's schema.
 
 ### Transaction Identifiers
 Incremental processing systems (e.g., streaming systems) that track progress using their own application-specific versions need to record what progress has been made, in order to avoid duplicating data in the face of failures and retries during a write.
 
@@ -15,7 +15,7 @@
  */
 
 name := "benchmarks"
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.17"
 
 lazy val root = (project in file("."))
   .settings(
 
@@ -17,12 +17,6 @@
 // scalastyle:off line.size.limit
 
 import java.nio.file.Files
-
-import sbt.internal.inc.Analysis
-import sbtprotoc.ProtocPlugin.autoImport._
-
-import xsbti.compile.CompileAnalysis
-
 import Checkstyle._
 import Mima._
 import Unidoc._
@@ -45,8 +39,6 @@ val LATEST_RELEASED_SPARK_VERSION = "3.5.0"
 val SPARK_MASTER_VERSION = "4.0.0-SNAPSHOT"
 val sparkVersion = settingKey[String]("Spark version")
 spark / sparkVersion := getSparkVersion()
-connectCommon / sparkVersion := getSparkVersion()
-connectServer / sparkVersion := getSparkVersion()
 
 // Dependent library versions
 val defaultSparkVersion = LATEST_RELEASED_SPARK_VERSION
@@ -66,9 +58,6 @@ val hadoopVersionForHive2 = "2.7.2"
 val hive2Version = "2.3.3"
 val tezVersionForHive2 = "0.8.4"
 
-val protoVersion = "3.25.1"
-val grpcVersion = "1.62.2"
-
 scalaVersion := default_scala_version.value
 
 // crossScalaVersions must be set to Nil on the root project
@@ -198,105 +187,6 @@ def crossSparkSettings(): Seq[Setting[_]] = getSparkVersion() match {
   )
 }
 
-def runTaskOnlyOnSparkMaster[T](
-    task: sbt.TaskKey[T],
-    taskName: String,
-    projectName: String,
-    emptyValue: => T): Def.Initialize[Task[T]] = {
-  if (getSparkVersion() == SPARK_MASTER_VERSION) {
-    Def.task(task.value)
-  } else {
-    Def.task {
-      // scalastyle:off println
-      println(s"Project $projectName: Skipping `$taskName` as Spark version " +
-        s"${getSparkVersion()} does not equal $SPARK_MASTER_VERSION.")
-      // scalastyle:on println
-      emptyValue
-    }
-  }
-}
-
-lazy val connectCommon = (project in file("spark-connect/common"))
-  .settings(
-    name := "delta-connect-common",
-    commonSettings,
-    crossSparkSettings(),
-    releaseSettings,
-    Compile / compile := runTaskOnlyOnSparkMaster(
-      task = Compile / compile,
-      taskName = "compile",
-      projectName = "delta-connect-common",
-      emptyValue = Analysis.empty.asInstanceOf[CompileAnalysis]
-    ).value,
-    Test / test := runTaskOnlyOnSparkMaster(
-      task = Test / test,
-      taskName = "test",
-      projectName = "delta-connect-common",
-      emptyValue = ()).value,
-    publish := runTaskOnlyOnSparkMaster(
-      task = publish,
-      taskName = "publish",
-      projectName = "delta-connect-common",
-      emptyValue = ()).value,
-    libraryDependencies ++= Seq(
-      "io.grpc" % "protoc-gen-grpc-java" % grpcVersion asProtocPlugin(),
-      "io.grpc" % "grpc-protobuf" % grpcVersion,
-      "io.grpc" % "grpc-stub" % grpcVersion,
-      "com.google.protobuf" % "protobuf-java" % protoVersion % "protobuf",
-      "javax.annotation" % "javax.annotation-api" % "1.3.2",
-
-      "org.apache.spark" %% "spark-connect-common" % sparkVersion.value % "provided",
-    ),
-    PB.protocVersion := protoVersion,
-    Compile / PB.targets := Seq(
-      PB.gens.java -> (Compile / sourceManaged).value,
-      PB.gens.plugin("grpc-java") -> (Compile / sourceManaged).value
-    ),
-  )
-
-lazy val connectServer = (project in file("spark-connect/server"))
-  .dependsOn(connectCommon % "compile->compile;test->test;provided->provided")
-  .dependsOn(spark % "compile->compile;test->test;provided->provided")
-  .settings(
-    name := "delta-connect-server",
-    commonSettings,
-    releaseSettings,
-    Compile / compile := runTaskOnlyOnSparkMaster(
-      task = Compile / compile,
-      taskName = "compile",
-      projectName = "delta-connect-server",
-      emptyValue = Analysis.empty.asInstanceOf[CompileAnalysis]
-    ).value,
-    Test / test := runTaskOnlyOnSparkMaster(
-      task = Test / test,
-      taskName = "test",
-      projectName = "delta-connect-server",
-      emptyValue = ()
-    ).value,
-    publish := runTaskOnlyOnSparkMaster(
-      task = publish,
-      taskName = "publish",
-      projectName = "delta-connect-server",
-      emptyValue = ()
-    ).value,
-    crossSparkSettings(),
-    libraryDependencies ++= Seq(
-      "com.google.protobuf" % "protobuf-java" % protoVersion % "protobuf",
-
-      "org.apache.spark" %% "spark-hive" % sparkVersion.value % "provided",
-      "org.apache.spark" %% "spark-sql" % sparkVersion.value % "provided",
-      "org.apache.spark" %% "spark-core" % sparkVersion.value % "provided",
-      "org.apache.spark" %% "spark-catalyst" % sparkVersion.value % "provided",
-      "org.apache.spark" %% "spark-connect" % sparkVersion.value % "provided",
-
-      "org.apache.spark" %% "spark-catalyst" % sparkVersion.value % "test" classifier "tests",
-      "org.apache.spark" %% "spark-core" % sparkVersion.value % "test" classifier "tests",
-      "org.apache.spark" %% "spark-sql" % sparkVersion.value % "test" classifier "tests",
-      "org.apache.spark" %% "spark-hive" % sparkVersion.value % "test" classifier "tests",
-      "org.apache.spark" %% "spark-connect" % sparkVersion.value % "test" classifier "tests",
-    ),
-  )
-
 lazy val spark = (project in file("spark"))
   .dependsOn(storage)
   .enablePlugins(Antlr4Plugin)
 
@@ -17,6 +17,6 @@
 [pycodestyle]
 ignore=E226,E241,E305,E402,E722,E731,E741,W503,W504
 max-line-length=100
-exclude=cloudpickle.py,heapq3.py,shared.py,python/docs/conf.py,work/*/*.py,python/.eggs/*,dist/*,*python/delta/connect*
+exclude=cloudpickle.py,heapq3.py,shared.py,python/docs/conf.py,work/*/*.py,python/.eggs/*,dist/*
 [pydocstyle]
 ignore=D100,D101,D102,D103,D104,D105,D106,D107,D200,D201,D202,D203,D204,D205,D206,D207,D208,D209,D210,D211,D212,D213,D214,D215,D300,D301,D302,D400,D401,D402,D403,D404,D405,D406,D407,D408,D409,D410,D411,D412,D413,D414,D415,D417