From 5cda88dd0a7292355a644ba5dcff91211dfbe126 Mon Sep 17 00:00:00 2001
From: liferoad <huxiangqian@gmail.com>
Date: Wed, 15 Jan 2025 09:43:47 -0500
Subject: [PATCH 01/56] Switch to Java 17 for all Dataflow Templates (#2050)

* [DO NOT MERGE] Test Java 17

* Polished the test

* changed other places to java 17

* mvn spotless:apply

* updated maven and maven plugin versions

* fixed action.yml

* changed maven-plugin.version

* changed maven-dependency-plugin.version

* use System.out.printf

* updated the new hash caused by Java 17
---
 .github/actions/setup-env/action.yml                  |  2 +-
 .github/actions/setup-java-env/action.yml             |  2 +-
 contributor-docs/code-contributions.md                |  2 +-
 .../it/gcp/artifacts/matchers/ArtifactsSubject.java   | 11 +++++++++++
 metadata/pom.xml                                      |  4 ++--
 plaintext-logging/pom.xml                             |  2 +-
 plugins/core-plugin/pom.xml                           |  4 ++--
 .../cloud/teleport/plugin/DockerfileGenerator.java    |  2 +-
 plugins/templates-maven-plugin/pom.xml                |  8 ++++----
 .../plugin/maven/TemplatesReleaseFinishMojo.java      |  2 +-
 pom.xml                                               |  4 ++--
 python/pom.xml                                        |  4 ++--
 v1/pom.xml                                            |  2 +-
 .../cloud/teleport/templates/BulkCompressorIT.java    |  2 +-
 .../docs/AstraDbToBigQuery/README.md                  |  2 +-
 v2/azure-eventhub-to-pubsub/README.md                 |  2 +-
 v2/bigquery-to-bigtable/README.md                     |  2 +-
 v2/bigquery-to-parquet/README.md                      |  2 +-
 v2/datastream-to-bigquery/README.md                   |  2 +-
 v2/datastream-to-mongodb/readme.md                    |  2 +-
 v2/datastream-to-postgres/README.md                   |  2 +-
 v2/datastream-to-spanner/README.md                    |  2 +-
 v2/datastream-to-sql/README.md                        |  2 +-
 v2/file-format-conversion/README.md                   |  2 +-
 v2/gcs-to-sourcedb/README.md                          |  2 +-
 .../docs/BigQueryToElasticsearch/README.md            |  2 +-
 .../docs/GCSToElasticsearch/README.md                 |  2 +-
 .../docs/PubSubToElasticsearch/README.md              |  2 +-
 .../docs/SpannerChangeStreamsToGcs/README.md          |  2 +-
 .../docs/SpannerToBigQuery/README.md                  |  2 +-
 .../docs/BigQueryToMongoDb/README.md                  |  2 +-
 v2/googlecloud-to-neo4j/docs/README.md                |  2 +-
 v2/googlecloud-to-splunk/docs/GCSToSplunk/README.md   |  2 +-
 v2/jms-to-pubsub/README.md                            |  2 +-
 v2/kafka-to-bigquery/README.md                        |  2 +-
 v2/kafka-to-gcs/README.md                             |  2 +-
 v2/kinesis-to-pubsub/README.md                        |  2 +-
 v2/kudu-to-bigquery/README.md                         |  2 +-
 .../docs/MongoDbToBigQuery/README.md                  |  2 +-
 .../docs/MongoDbToBigQueryCDC/README.md               |  2 +-
 v2/mqtt-to-pubsub/README.md                           |  2 +-
 v2/pom.xml                                            |  2 +-
 .../docs/PubSubAvroToBigQuery/README.md               |  2 +-
 .../docs/PubSubProtoToBigQuery/README.md              |  2 +-
 v2/pubsub-cdc-to-bigquery/README.md                   |  2 +-
 v2/pubsub-to-jms/README.md                            |  2 +-
 v2/pubsub-to-mongodb/README.md                        |  2 +-
 v2/pubsub-to-redis/README.md                          |  2 +-
 v2/sourcedb-to-spanner/README.md                      |  2 +-
 .../README.md                                         |  2 +-
 v2/streaming-data-generator/README.md                 |  2 +-
 yaml/pom.xml                                          |  4 ++--
 52 files changed, 70 insertions(+), 59 deletions(-)

diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
index 8ef59df42a..4f2a968de2 100644
--- a/.github/actions/setup-env/action.yml
+++ b/.github/actions/setup-env/action.yml
@@ -35,7 +35,7 @@ inputs:
     type: string
     description: 'The version of Java to install'
     required: false
-    default: '11'
+    default: '17'
   go-version:
     type: string
     description: 'The version of Go to install'
diff --git a/.github/actions/setup-java-env/action.yml b/.github/actions/setup-java-env/action.yml
index c3b50c7158..1d736f179c 100644
--- a/.github/actions/setup-java-env/action.yml
+++ b/.github/actions/setup-java-env/action.yml
@@ -30,7 +30,7 @@ inputs:
     type: string
     description: 'The version of Java to install'
     required: false
-    default: '11'
+    default: '17'
 outputs:
   cache-hit:
     description: 'Whether or not there was a cache hit'
diff --git a/contributor-docs/code-contributions.md b/contributor-docs/code-contributions.md
index 0e3f6efceb..073881adfa 100644
--- a/contributor-docs/code-contributions.md
+++ b/contributor-docs/code-contributions.md
@@ -28,7 +28,7 @@ these can be found in the following locations:
 
 ### Requirements
 
-* Java 11
+* Java 17
 * Maven 3
 * IntelliJ (recommended) or another editor of your choice
 
diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java
index 06ea14d039..770f32386d 100644
--- a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java
+++ b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java
@@ -36,6 +36,8 @@
 import org.apache.beam.it.gcp.artifacts.utils.JsonTestUtil;
 import org.apache.beam.it.gcp.artifacts.utils.ParquetTestUtil;
 import org.apache.beam.it.truthmatchers.RecordsSubject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Subject that has assertion operations for artifact lists (GCS files), usually coming from the
@@ -46,6 +48,8 @@
 })
 public final class ArtifactsSubject extends Subject {
 
+  private static final Logger LOG = LoggerFactory.getLogger(ArtifactsSubject.class);
+
   private final List<Artifact> actual;
 
   private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -96,8 +100,15 @@ public void hasContent(String content) {
    * @param hash Content to search for
    */
   public void hasHash(String hash) {
+
     if (actual.stream()
         .noneMatch(artifact -> sha256().hashBytes(artifact.contents()).toString().equals(hash))) {
+      actual.stream()
+          .forEach(
+              artifact -> {
+                String calculatedHash = sha256().hashBytes(artifact.contents()).toString();
+                System.out.printf("Calculated Hash (no match found): {%s} \n", calculatedHash);
+              });
       failWithActual("expected to contain hash", hash);
     }
   }
diff --git a/metadata/pom.xml b/metadata/pom.xml
index 674388eb91..a7dc4b3269 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -34,8 +34,8 @@
   <url>https://github.com/GoogleCloudPlatform/DataflowTemplates</url>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/plaintext-logging/pom.xml b/plaintext-logging/pom.xml
index 723de36fcc..d1d731dd86 100644
--- a/plaintext-logging/pom.xml
+++ b/plaintext-logging/pom.xml
@@ -27,7 +27,7 @@
   <artifactId>plaintext-logging</artifactId>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <surefire.version>2.21.0</surefire.version>
   </properties>
 
diff --git a/plugins/core-plugin/pom.xml b/plugins/core-plugin/pom.xml
index 68e4ac0079..e29e8f4e9b 100644
--- a/plugins/core-plugin/pom.xml
+++ b/plugins/core-plugin/pom.xml
@@ -32,8 +32,8 @@
   <url>https://github.com/GoogleCloudPlatform/DataflowTemplates</url>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
 
     <reflections.version>0.9.11</reflections.version>
     <gson.version>2.9.1</gson.version>
diff --git a/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java b/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java
index 35b4181ecc..575470db27 100644
--- a/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java
+++ b/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java
@@ -43,7 +43,7 @@
 public class DockerfileGenerator {
 
   public static final String BASE_CONTAINER_IMAGE =
-      "gcr.io/dataflow-templates-base/java11-template-launcher-base-distroless:latest";
+      "gcr.io/dataflow-templates-base/java17-template-launcher-base-distroless:latest";
   // Keep in sync with python version used in
   // https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/python/generate_dependencies.sh
   public static final String BASE_PYTHON_CONTAINER_IMAGE =
diff --git a/plugins/templates-maven-plugin/pom.xml b/plugins/templates-maven-plugin/pom.xml
index 84202358f2..214373a3b2 100644
--- a/plugins/templates-maven-plugin/pom.xml
+++ b/plugins/templates-maven-plugin/pom.xml
@@ -36,12 +36,12 @@
   </prerequisites>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <maven.version>3.3.9</maven.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <maven.version>3.9.9</maven.version>
     <dataflow.api.version>0.7.6</dataflow.api.version>
     <mojo.executor.version>2.4.0</mojo.executor.version>
-    <maven-plugin.version>3.6.0</maven-plugin.version>
+    <maven-plugin.version>3.15.1</maven-plugin.version>
   </properties>
 
   <dependencies>
diff --git a/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java b/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java
index 227734d2e6..083c75aaaf 100644
--- a/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java
+++ b/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java
@@ -85,7 +85,7 @@ public class TemplatesReleaseFinishMojo extends TemplatesBaseMojo {
   @Parameter(
       name = "baseContainerImage",
       defaultValue =
-          "gcr.io/dataflow-templates-base/java11-template-launcher-base-distroless:latest",
+          "gcr.io/dataflow-templates-base/java17-template-launcher-base-distroless:latest",
       required = false)
   protected String baseContainerImage;
 
diff --git a/pom.xml b/pom.xml
index bfc8983fc6..659b12343d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,13 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
 <!--    <os.detected.classifier>osx-x86_64</os.detected.classifier>-->
     <!-- Plugins -->
     <templates-maven-plugin.version>1.0-SNAPSHOT</templates-maven-plugin.version>
     <maven-checkstyle-plugin.version>3.2.1</maven-checkstyle-plugin.version>
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-    <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
+    <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
     <extra.enforcer.rules.version>1.8.0</extra.enforcer.rules.version>
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
diff --git a/python/pom.xml b/python/pom.xml
index 63996fbf94..f107d5886f 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -34,8 +34,8 @@
   <url>https://github.com/GoogleCloudPlatform/DataflowTemplates</url>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
 
     <!-- TODO - remove line when repo is upgraded to Beam 2.59.0 -->
     <beam-python.version>2.57.0</beam-python.version>
diff --git a/v1/pom.xml b/v1/pom.xml
index f329ac49ef..d1123a8380 100644
--- a/v1/pom.xml
+++ b/v1/pom.xml
@@ -801,7 +801,7 @@
             <configuration>
               <rules>
                 <enforceBytecodeVersion>
-                  <maxJdkVersion>11</maxJdkVersion>
+                  <maxJdkVersion>17</maxJdkVersion>
                   <excludes>
                     <!--
                       Supplied by the user JDK and compiled with matching
diff --git a/v1/src/test/java/com/google/cloud/teleport/templates/BulkCompressorIT.java b/v1/src/test/java/com/google/cloud/teleport/templates/BulkCompressorIT.java
index 6dafa20cbe..4342b42436 100644
--- a/v1/src/test/java/com/google/cloud/teleport/templates/BulkCompressorIT.java
+++ b/v1/src/test/java/com/google/cloud/teleport/templates/BulkCompressorIT.java
@@ -53,7 +53,7 @@ public void setup() throws IOException, URISyntaxException {
   @Test
   public void testCompressGzip() throws IOException {
     baseCompress(
-        Compression.GZIP, "81f7b7afd932b4754caaa9ba6ced7a8bcb2cbfec6857cf823e4d112125c6e939");
+        Compression.GZIP, "050f90e5523bc0ed37beb817f1ff7c68f48a537bd6246dd309132576bab009fd");
   }
 
   @Test
diff --git a/v2/astradb-to-bigquery/docs/AstraDbToBigQuery/README.md b/v2/astradb-to-bigquery/docs/AstraDbToBigQuery/README.md
index 0cc613b5c5..370f6bacb1 100644
--- a/v2/astradb-to-bigquery/docs/AstraDbToBigQuery/README.md
+++ b/v2/astradb-to-bigquery/docs/AstraDbToBigQuery/README.md
@@ -46,7 +46,7 @@ export PROJECT=<project-id>
 export IMAGE_NAME="astradb-to-bigquery"
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE="astradb-to-bigquery"
 export APP_ROOT="/template/astradb-to-bigquery"
diff --git a/v2/azure-eventhub-to-pubsub/README.md b/v2/azure-eventhub-to-pubsub/README.md
index d9200bddf9..b7d7c9dd18 100644
--- a/v2/azure-eventhub-to-pubsub/README.md
+++ b/v2/azure-eventhub-to-pubsub/README.md
@@ -55,7 +55,7 @@ export PROJECT=my-project
 export IMAGE_NAME=azure-eventhub-to-pubsub
 export MODULE_NAME=azure-eventhub-to-pubsub
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT="/template/${MODULE_NAME}"
 export COMMAND_SPEC="${APP_ROOT}/resources/${MODULE_NAME}-command-spec.json"
diff --git a/v2/bigquery-to-bigtable/README.md b/v2/bigquery-to-bigtable/README.md
index ef7a5e2d32..9a06c731f6 100644
--- a/v2/bigquery-to-bigtable/README.md
+++ b/v2/bigquery-to-bigtable/README.md
@@ -26,7 +26,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=bigquery-to-bigtable
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/bigquery-to-parquet/README.md b/v2/bigquery-to-parquet/README.md
index aeb518828b..8f1eab1ce9 100644
--- a/v2/bigquery-to-parquet/README.md
+++ b/v2/bigquery-to-parquet/README.md
@@ -22,7 +22,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=bigquery-to-parquet
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/datastream-to-bigquery/README.md b/v2/datastream-to-bigquery/README.md
index 8a26740b01..3be7a3236a 100644
--- a/v2/datastream-to-bigquery/README.md
+++ b/v2/datastream-to-bigquery/README.md
@@ -25,7 +25,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=datastream-to-bigquery
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/datastream-to-mongodb/readme.md b/v2/datastream-to-mongodb/readme.md
index 1998c61569..a8ebcaf946 100644
--- a/v2/datastream-to-mongodb/readme.md
+++ b/v2/datastream-to-mongodb/readme.md
@@ -26,7 +26,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=datastream-to-mongodb
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/datastream-to-postgres/README.md b/v2/datastream-to-postgres/README.md
index 5c6ab53d58..0d68c24f45 100644
--- a/v2/datastream-to-postgres/README.md
+++ b/v2/datastream-to-postgres/README.md
@@ -24,7 +24,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=datastream-to-postgres
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/datastream-to-spanner/README.md b/v2/datastream-to-spanner/README.md
index e2f6e53428..095d687bc5 100644
--- a/v2/datastream-to-spanner/README.md
+++ b/v2/datastream-to-spanner/README.md
@@ -24,7 +24,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=datastream-to-spanner
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/datastream-to-sql/README.md b/v2/datastream-to-sql/README.md
index f56f1ce300..7817457b79 100644
--- a/v2/datastream-to-sql/README.md
+++ b/v2/datastream-to-sql/README.md
@@ -29,7 +29,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=datastream-to-postgres
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/file-format-conversion/README.md b/v2/file-format-conversion/README.md
index cb1beabbc0..2fc49c2899 100644
--- a/v2/file-format-conversion/README.md
+++ b/v2/file-format-conversion/README.md
@@ -25,7 +25,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=file-format-conversion
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/gcs-to-sourcedb/README.md b/v2/gcs-to-sourcedb/README.md
index d992de43e6..83ae5d6c06 100644
--- a/v2/gcs-to-sourcedb/README.md
+++ b/v2/gcs-to-sourcedb/README.md
@@ -26,7 +26,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=gcs-to-sourcedb
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/googlecloud-to-elasticsearch/docs/BigQueryToElasticsearch/README.md b/v2/googlecloud-to-elasticsearch/docs/BigQueryToElasticsearch/README.md
index f7c8f9af47..0a93da58d8 100644
--- a/v2/googlecloud-to-elasticsearch/docs/BigQueryToElasticsearch/README.md
+++ b/v2/googlecloud-to-elasticsearch/docs/BigQueryToElasticsearch/README.md
@@ -26,7 +26,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=bigquery-to-elasticsearch
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/googlecloud-to-elasticsearch/docs/GCSToElasticsearch/README.md b/v2/googlecloud-to-elasticsearch/docs/GCSToElasticsearch/README.md
index d19b7b7f5e..c7c06d1b7e 100644
--- a/v2/googlecloud-to-elasticsearch/docs/GCSToElasticsearch/README.md
+++ b/v2/googlecloud-to-elasticsearch/docs/GCSToElasticsearch/README.md
@@ -35,7 +35,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=GCS-to-elasticsearch
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/googlecloud-to-elasticsearch/docs/PubSubToElasticsearch/README.md b/v2/googlecloud-to-elasticsearch/docs/PubSubToElasticsearch/README.md
index 1f87d3aaca..5ee6081b16 100644
--- a/v2/googlecloud-to-elasticsearch/docs/PubSubToElasticsearch/README.md
+++ b/v2/googlecloud-to-elasticsearch/docs/PubSubToElasticsearch/README.md
@@ -68,7 +68,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=pubsub-to-elasticsearch
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/googlecloud-to-googlecloud/docs/SpannerChangeStreamsToGcs/README.md b/v2/googlecloud-to-googlecloud/docs/SpannerChangeStreamsToGcs/README.md
index edb7348e61..5f4b1874f6 100644
--- a/v2/googlecloud-to-googlecloud/docs/SpannerChangeStreamsToGcs/README.md
+++ b/v2/googlecloud-to-googlecloud/docs/SpannerChangeStreamsToGcs/README.md
@@ -39,7 +39,7 @@ export PROJECT=project
 export IMAGE_NAME=googlecloud-to-googlecloud
 export BUCKET_NAME=gs://bucket
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/images/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=googlecloud-to-googlecloud
 export COMMAND_MODULE=spanner-changestreams-to-gcs
diff --git a/v2/googlecloud-to-googlecloud/docs/SpannerToBigQuery/README.md b/v2/googlecloud-to-googlecloud/docs/SpannerToBigQuery/README.md
index 2d7367e8a9..fa81b039c0 100644
--- a/v2/googlecloud-to-googlecloud/docs/SpannerToBigQuery/README.md
+++ b/v2/googlecloud-to-googlecloud/docs/SpannerToBigQuery/README.md
@@ -28,7 +28,7 @@ export TEMPLATE_MODULE=googlecloud-to-googlecloud
 export COMMAND_MODULE=spanner-to-bigquery
 
 export TARGET_GCR_IMAGE="gcr.io/$PROJECT/images/$IMAGE_NAME"
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT="/template/$COMMAND_MODULE"
 export COMMAND_SPEC="$APP_ROOT/resources/$COMMAND_MODULE-command-spec.json"
diff --git a/v2/googlecloud-to-mongodb/docs/BigQueryToMongoDb/README.md b/v2/googlecloud-to-mongodb/docs/BigQueryToMongoDb/README.md
index 32fa311f5a..c3bfff711c 100644
--- a/v2/googlecloud-to-mongodb/docs/BigQueryToMongoDb/README.md
+++ b/v2/googlecloud-to-mongodb/docs/BigQueryToMongoDb/README.md
@@ -31,7 +31,7 @@ export PROJECT=<project-id>
 export IMAGE_NAME="bigquery-to-mongodb"
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE="googlecloud-to-mongodb"
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/googlecloud-to-neo4j/docs/README.md b/v2/googlecloud-to-neo4j/docs/README.md
index 160d86d4d4..74b85446de 100644
--- a/v2/googlecloud-to-neo4j/docs/README.md
+++ b/v2/googlecloud-to-neo4j/docs/README.md
@@ -119,7 +119,7 @@ export IMAGE_NAME=neo4j-dataflow
 export IMAGE_NAME_VERSION=b0.12
 export BUCKET_NAME= [URI FOR CLOUD STORAGE BUCKET AND FOLDER (ex. gs://bucket-name/folder-name)] 
 export TARGET_GCR_IMAGE=us.gcr.io/${PROJECT}/${IMAGE_NAME}-${IMAGE_NAME_VERSION}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_POM_MODULE=googlecloud-to-neo4j
 export APP_ROOT=/template/${APP_NAME}
diff --git a/v2/googlecloud-to-splunk/docs/GCSToSplunk/README.md b/v2/googlecloud-to-splunk/docs/GCSToSplunk/README.md
index e160dee64e..2a5ad04d75 100644
--- a/v2/googlecloud-to-splunk/docs/GCSToSplunk/README.md
+++ b/v2/googlecloud-to-splunk/docs/GCSToSplunk/README.md
@@ -37,7 +37,7 @@ export REGION=us-central1
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=googlecloud-to-splunk
 export APP_ROOT=/template/gcs-to-splunk 
diff --git a/v2/jms-to-pubsub/README.md b/v2/jms-to-pubsub/README.md
index f8b44726f6..96ffd7e517 100644
--- a/v2/jms-to-pubsub/README.md
+++ b/v2/jms-to-pubsub/README.md
@@ -54,7 +54,7 @@ export PROJECT=my-project
 export IMAGE_NAME=jms-to-pubsub-image
 export MODULE_NAME=jms-to-pubsub
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT="/template/${MODULE_NAME}"
 export COMMAND_SPEC="${APP_ROOT}/resources/${MODULE_NAME}-command-spec.json"
diff --git a/v2/kafka-to-bigquery/README.md b/v2/kafka-to-bigquery/README.md
index 07902bdc5d..04aa2ecebc 100644
--- a/v2/kafka-to-bigquery/README.md
+++ b/v2/kafka-to-bigquery/README.md
@@ -26,7 +26,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=kafka-to-bigquery
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/kafka-to-gcs/README.md b/v2/kafka-to-gcs/README.md
index e0a5650d04..04de839237 100644
--- a/v2/kafka-to-gcs/README.md
+++ b/v2/kafka-to-gcs/README.md
@@ -22,7 +22,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=kafka-to-gcs
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/kinesis-to-pubsub/README.md b/v2/kinesis-to-pubsub/README.md
index 78e9e1d7e9..bc1ac34fad 100644
--- a/v2/kinesis-to-pubsub/README.md
+++ b/v2/kinesis-to-pubsub/README.md
@@ -64,7 +64,7 @@ gsutil mb gs://${BUCKET_NAME}
 IMAGE_NAME="$USERNAME-kinesis-to-pubsub"
 MODULE_NAME=kinesis-to-pubsub
 TARGET_GCR_IMAGE="gcr.io/$PROJECT/$IMAGE_NAME"
-BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 BASE_CONTAINER_IMAGE_VERSION=latest
 APP_ROOT="/template/$MODULE_NAME"
 COMMAND_SPEC="$APP_ROOT/resources/$MODULE_NAME-command-spec.json"
diff --git a/v2/kudu-to-bigquery/README.md b/v2/kudu-to-bigquery/README.md
index d2a53e0329..5c290ea812 100644
--- a/v2/kudu-to-bigquery/README.md
+++ b/v2/kudu-to-bigquery/README.md
@@ -24,7 +24,7 @@ export PROJECT=my-project
 export IMAGE_NAME=my-image-name
 export OUTPUT_TABLE=${PROJECT}:dataflow_template.bigquery_table
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/kudu-to-bigquery
 export COMMAND_SPEC=${APP_ROOT}/resources/kudu-to-bigquery-command-spec.json
diff --git a/v2/mongodb-to-googlecloud/docs/MongoDbToBigQuery/README.md b/v2/mongodb-to-googlecloud/docs/MongoDbToBigQuery/README.md
index dc3a582dcd..f8d2ab1572 100644
--- a/v2/mongodb-to-googlecloud/docs/MongoDbToBigQuery/README.md
+++ b/v2/mongodb-to-googlecloud/docs/MongoDbToBigQuery/README.md
@@ -32,7 +32,7 @@ export PROJECT=<project-id>
 export IMAGE_NAME="mongodb-to-bigquery"
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE="mongodb-to-googlecloud"
 export APP_ROOT="/template/mongodb-to-googlecloud"
diff --git a/v2/mongodb-to-googlecloud/docs/MongoDbToBigQueryCDC/README.md b/v2/mongodb-to-googlecloud/docs/MongoDbToBigQueryCDC/README.md
index fc9a8e38d2..b6410cc8a7 100644
--- a/v2/mongodb-to-googlecloud/docs/MongoDbToBigQueryCDC/README.md
+++ b/v2/mongodb-to-googlecloud/docs/MongoDbToBigQueryCDC/README.md
@@ -35,7 +35,7 @@ export PROJECT=<project-id>
 export IMAGE_NAME="mongodb-to-bigquery-cdc"
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=mongodb-to-googlecloud
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/mqtt-to-pubsub/README.md b/v2/mqtt-to-pubsub/README.md
index 5f808fb0b8..bfae7e768e 100644
--- a/v2/mqtt-to-pubsub/README.md
+++ b/v2/mqtt-to-pubsub/README.md
@@ -54,7 +54,7 @@ export PROJECT=my-project
 export IMAGE_NAME=mqtt-to-pubsub
 export MODULE_NAME=mqtt-to-pubsub
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT="/template/${MODULE_NAME}"
 export COMMAND_SPEC="${APP_ROOT}/resources/${MODULE_NAME}-command-spec.json"
diff --git a/v2/pom.xml b/v2/pom.xml
index ae9308ea27..f99075b664 100644
--- a/v2/pom.xml
+++ b/v2/pom.xml
@@ -418,7 +418,7 @@
                         <configuration>
                             <rules>
                                 <enforceBytecodeVersion>
-                                    <maxJdkVersion>11</maxJdkVersion>
+                                    <maxJdkVersion>17</maxJdkVersion>
                                     <excludes>
                                         <!--
                                           Supplied by the user JDK and compiled with matching
diff --git a/v2/pubsub-binary-to-bigquery/docs/PubSubAvroToBigQuery/README.md b/v2/pubsub-binary-to-bigquery/docs/PubSubAvroToBigQuery/README.md
index d4972d73ac..151f1898b3 100644
--- a/v2/pubsub-binary-to-bigquery/docs/PubSubAvroToBigQuery/README.md
+++ b/v2/pubsub-binary-to-bigquery/docs/PubSubAvroToBigQuery/README.md
@@ -55,7 +55,7 @@ __Set environment variables that will be used in the build process.__
 export PROJECT=my-project
 export IMAGE_NAME=pubsub-avro-to-bigquery
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/pubsub-avro-to-bigquery
 export COMMAND_SPEC=${APP_ROOT}/resources/pubsub-avro-to-bigquery-command-spec.json
diff --git a/v2/pubsub-binary-to-bigquery/docs/PubSubProtoToBigQuery/README.md b/v2/pubsub-binary-to-bigquery/docs/PubSubProtoToBigQuery/README.md
index d760cd5477..00392eb3a6 100644
--- a/v2/pubsub-binary-to-bigquery/docs/PubSubProtoToBigQuery/README.md
+++ b/v2/pubsub-binary-to-bigquery/docs/PubSubProtoToBigQuery/README.md
@@ -60,7 +60,7 @@ __Set environment variables that will be used in the build process.__
 export PROJECT=my-project
 export IMAGE_NAME=pubsub-proto-to-bigquery
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/pubsub-proto-to-bigquery
 export COMMAND_SPEC=${APP_ROOT}/resources/pubsub-proto-to-bigquery-command-spec.json
diff --git a/v2/pubsub-cdc-to-bigquery/README.md b/v2/pubsub-cdc-to-bigquery/README.md
index 28da7212c7..b8b0128e05 100644
--- a/v2/pubsub-cdc-to-bigquery/README.md
+++ b/v2/pubsub-cdc-to-bigquery/README.md
@@ -24,7 +24,7 @@ export IMAGE_NAME=pubsub-cdc-to-bigquery
 export BUCKET_NAME=gs://<bucket-name>
 export DATASET_TEMPLATE=<dataset-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/pubsub-cdc-to-bigquery
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/pubsub-cdc-to-bigquery-command-spec.json
diff --git a/v2/pubsub-to-jms/README.md b/v2/pubsub-to-jms/README.md
index 2a8c3712cd..78dac7aecb 100644
--- a/v2/pubsub-to-jms/README.md
+++ b/v2/pubsub-to-jms/README.md
@@ -54,7 +54,7 @@ export PROJECT=my-project
 export IMAGE_NAME=pubsub-to-jms-image
 export MODULE_NAME=pubsub-to-jms
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT="/template/${MODULE_NAME}"
 export COMMAND_SPEC="${APP_ROOT}/resources/${MODULE_NAME}-command-spec.json"
diff --git a/v2/pubsub-to-mongodb/README.md b/v2/pubsub-to-mongodb/README.md
index ab11f7834e..ad6a697b36 100644
--- a/v2/pubsub-to-mongodb/README.md
+++ b/v2/pubsub-to-mongodb/README.md
@@ -22,7 +22,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=pubsub-to-mongodb
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/pubsub-to-redis/README.md b/v2/pubsub-to-redis/README.md
index 0cdc55c5ea..d1eeb61476 100644
--- a/v2/pubsub-to-redis/README.md
+++ b/v2/pubsub-to-redis/README.md
@@ -22,7 +22,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=pubsub-to-redis
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/v2/sourcedb-to-spanner/README.md b/v2/sourcedb-to-spanner/README.md
index 53dd33be24..7309844db0 100644
--- a/v2/sourcedb-to-spanner/README.md
+++ b/v2/sourcedb-to-spanner/README.md
@@ -31,7 +31,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=sourcedb-to-spanner
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/spanner-change-streams-to-sharded-file-sink/README.md b/v2/spanner-change-streams-to-sharded-file-sink/README.md
index 861fa30c4c..759d1e046b 100644
--- a/v2/spanner-change-streams-to-sharded-file-sink/README.md
+++ b/v2/spanner-change-streams-to-sharded-file-sink/README.md
@@ -23,7 +23,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=spanner-change-streams-to-sharded-file-sink
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/spanner-change-streams-to-sharded-file-sink
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export APP_ROOT=/template/${IMAGE_NAME}
 export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
diff --git a/v2/streaming-data-generator/README.md b/v2/streaming-data-generator/README.md
index da8a974b9a..d88188e594 100644
--- a/v2/streaming-data-generator/README.md
+++ b/v2/streaming-data-generator/README.md
@@ -186,7 +186,7 @@ export PROJECT=<my-project>
 export IMAGE_NAME=<my-image-name>
 export BUCKET_NAME=gs://<bucket-name>
 export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
-export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
+export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
 export BASE_CONTAINER_IMAGE_VERSION=latest
 export TEMPLATE_MODULE=streaming-data-generator
 export APP_ROOT=/template/${TEMPLATE_MODULE}
diff --git a/yaml/pom.xml b/yaml/pom.xml
index fb6d8e98c7..b2b6da43a2 100644
--- a/yaml/pom.xml
+++ b/yaml/pom.xml
@@ -34,8 +34,8 @@
   <url>https://github.com/GoogleCloudPlatform/DataflowTemplates</url>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>

From f2abe930d5d1f2514953f0dea50bc1b1682569ed Mon Sep 17 00:00:00 2001
From: darshan-sj <darshan-sj@users.noreply.github.com>
Date: Fri, 17 Jan 2025 11:54:51 +0530
Subject: [PATCH 02/56] Changing project id for spanner-staging-tests and run
 on spanner runners (#2127)

* Changing project id for spanner-staging-tests and Make them run on spanner runners

* Reducing parallelism

* Reverting parallelism changes

* Configuring spanner staging tests to run on PRs changing the config file

* Removing internal maven temporarily

* Reverting back to pulling dependencies from Internal maven

* Upgrading version of actions/upload-artifact
---
 .github/workflows/spanner-staging-tests.yml | 22 +++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/spanner-staging-tests.yml b/.github/workflows/spanner-staging-tests.yml
index 5b24877a66..ad45111991 100644
--- a/.github/workflows/spanner-staging-tests.yml
+++ b/.github/workflows/spanner-staging-tests.yml
@@ -15,6 +15,17 @@
 name: Spanner Staging integration tests
 
 on:
+  pull_request:
+    branches:
+    - 'main'
+    paths:
+    - '.github/workflows/spanner-staging-tests.yml'
+    inputs:
+      spannerHost:
+        description: 'Spanner host URL.'
+        type: string
+        required: false
+        default: 'https://staging-wrenchworks.sandbox.googleapis.com'
   workflow_dispatch:
     inputs:
       commitOrTag:
@@ -35,7 +46,7 @@ jobs:
     name: Spanner Dataflow Templates Integration Tests
     timeout-minutes: 180
     # Run on any runner that matches all the specified runs-on values.
-    runs-on: [ self-hosted, it ]
+    runs-on: [ self-hosted, spanner ]
     steps:
     - name: Checkout Code
       uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
@@ -47,14 +58,13 @@ jobs:
     - name: Run Integration Tests
       run: |
         ./cicd/run-spanner-staging-it-tests \
-        --modules-to-build="ALL" \
+        --modules-to-build="v1" \
         --it-region="us-central1" \
-        --it-project="cloud-teleport-testing" \
-        --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
-        --it-private-connectivity="datastream-private-connect-us-central1" \
+        --it-project="span-cloud-migrations-staging" \
+        --it-artifact-bucket="dataflow-testing-it-spanner-staging" \
         --it-spanner-host=${{ inputs.spannerHost }}
     - name: Upload Integration Tests Report
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      uses: actions/upload-artifact@v4
       if: always() # always run even if the previous step fails
       with:
         name: surefire-test-results

From 31f62398b067d7fd4e66042be67c303b461c5ed4 Mon Sep 17 00:00:00 2001
From: Vardhan Vinay Thigle <39047439+VardhanThigle@users.noreply.github.com>
Date: Fri, 17 Jan 2025 17:36:39 +0530
Subject: [PATCH 03/56] Fix for Cassandra bulk e2e test (#2137)

---
 .../io/jdbc/iowrapper/config/SQLDialect.java     |  6 +++++-
 .../avro/GenericRecordTypeConvertor.java         | 16 ++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/config/SQLDialect.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/config/SQLDialect.java
index 8ec60af0bb..57a97ae126 100644
--- a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/config/SQLDialect.java
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/config/SQLDialect.java
@@ -21,9 +21,13 @@
  * <ul>
  *   <lI>MYSQL
  *   <lI>POSTGRESQL
+ *   <LI>CASSANDRA
  * </ul>
+ *
+ * TODO(b/390535694): move this to non-jdbc package.
  */
 public enum SQLDialect {
   MYSQL,
-  POSTGRESQL
+  POSTGRESQL,
+  CASSANDRA
 }
diff --git a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/avro/GenericRecordTypeConvertor.java b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/avro/GenericRecordTypeConvertor.java
index cf75ffa86a..28870cea3f 100644
--- a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/avro/GenericRecordTypeConvertor.java
+++ b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/avro/GenericRecordTypeConvertor.java
@@ -537,9 +537,9 @@ static String handleRecordFieldType(String fieldName, GenericRecord element, Sch
     } else if (fieldSchema.getName().equals("intervalNano")) {
       Period period =
           Period.ZERO
-              .plusYears(getOrDefault(element, "years", 0L))
-              .plusMonths(getOrDefault(element, "months", 0L))
-              .plusDays(getOrDefault(element, "days", 0L));
+              .plusYears(((Number) getOrDefault(element, "years", 0L)).longValue())
+              .plusMonths(((Number) getOrDefault(element, "months", 0L)).longValue())
+              .plusDays(((Number) getOrDefault(element, "days", 0L)).longValue());
       /*
        * Convert the period to a ISO-8601 period formatted String, such as P6Y3M1D.
        * A zero period will be represented as zero days, 'P0D'.
@@ -548,10 +548,10 @@ static String handleRecordFieldType(String fieldName, GenericRecord element, Sch
       String periodIso8061 = period.toString();
       java.time.Duration duration =
           java.time.Duration.ZERO
-              .plusHours(getOrDefault(element, "hours", 0L))
-              .plusMinutes(getOrDefault(element, "minutes", 0L))
-              .plusSeconds(getOrDefault(element, "seconds", 0L))
-              .plusNanos(getOrDefault(element, "nanos", 0L));
+              .plusHours(((Number) getOrDefault(element, "hours", 0L)).longValue())
+              .plusMinutes(((Number) getOrDefault(element, "minutes", 0L)).longValue())
+              .plusSeconds(((Number) getOrDefault(element, "seconds", 0L)).longValue())
+              .plusNanos(((Number) getOrDefault(element, "nanos", 0L)).longValue());
       /*
        * Convert the duration to a ISO-8601 period formatted String, such as  PT8H6M12.345S
        * refer to javadoc for Duration#toString.
@@ -572,7 +572,7 @@ static String handleRecordFieldType(String fieldName, GenericRecord element, Sch
   }
 
   private static <T> T getOrDefault(GenericRecord element, String name, T def) {
-    if (element.get(name) == null) {
+    if ((T) element.get(name) == null) {
       return def;
     }
     return (T) element.get(name);

From a2779d4345f5a25e94de200f8ba79ec87cb3ac7f Mon Sep 17 00:00:00 2001
From: Deep1998 <deepchowdhury1998@gmail.com>
Date: Tue, 21 Jan 2025 13:25:17 +0530
Subject: [PATCH 04/56] Support shadow table in different database (#2138)

* Changes with SQL Statements; Latest version in unit test

* Resolve comments and add unit test coverage
---
 .../v2/templates/DataStreamToSpanner.java     |  88 ++++++-
 .../templates/SpannerTransactionWriter.java   |  20 +-
 .../SpannerTransactionWriterDoFn.java         | 199 +++++++++++---
 .../datastream/ChangeEventContext.java        |  14 +-
 .../datastream/ChangeEventContextFactory.java |  12 +-
 .../ChangeEventSequenceFactory.java           |  20 +-
 .../datastream/MySqlChangeEventContext.java   |   5 +-
 .../datastream/MySqlChangeEventSequence.java  |  32 ++-
 .../datastream/OracleChangeEventContext.java  |   5 +-
 .../datastream/OracleChangeEventSequence.java |  26 +-
 .../PostgresChangeEventContext.java           |   5 +-
 .../PostgresChangeEventSequence.java          |  27 +-
 .../datastream/ShadowTableReadUtils.java      | 104 ++++++++
 .../spanner/ProcessInformationSchema.java     | 159 +++++++++---
 .../v2/templates/DataStreamToSpannerTest.java |  53 ++++
 .../SpannerStreamingWriteIntegrationTest.java |  27 +-
 .../SpannerTransactionWriterDoFnTest.java     |  29 ++-
 .../ChangeEventContextFactoryTest.java        |   4 +-
 .../ChangeEventSequenceFactoryTest.java       |  18 +-
 .../MySqlChangeEventContextTest.java          |   3 +
 .../MySqlChangeEventSequenceTest.java         |  63 +++++
 .../OracleChangeEventContextTest.java         |   3 +
 .../OracleChangeEventSequenceTest.java        |  58 +++++
 .../PostgresChangeEventContextTest.java       |   3 +
 .../PostgresChangeEventSequenceTest.java      |  59 ++++-
 .../datastream/ShadowTableReadUtilsTest.java  | 141 ++++++++++
 ...ocessInformationSchemaIntegrationTest.java |   6 +-
 .../spanner/ProcessInformationSchemaTest.java | 242 +++++++++++++++++-
 28 files changed, 1297 insertions(+), 128 deletions(-)
 create mode 100644 v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtils.java
 create mode 100644 v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtilsTest.java

diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java
index d16fe44497..ba4462bbe4 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java
@@ -535,6 +535,30 @@ public interface Options
     String getSchemaOverridesFilePath();
 
     void setSchemaOverridesFilePath(String value);
+
+    @TemplateParameter.Text(
+        order = 33,
+        optional = true,
+        groupName = "Target",
+        description = "Cloud Spanner Shadow Table Instance Id.",
+        helpText =
+            "Optional separate instance for shadow tables. If not specified, shadow tables will be created in the main instance.")
+    @Default.String("")
+    String getShadowTableSpannerInstanceId();
+
+    void setShadowTableSpannerInstanceId(String value);
+
+    @TemplateParameter.Text(
+        order = 33,
+        optional = true,
+        groupName = "Target",
+        description = "Cloud Spanner Shadow Table Database Id.",
+        helpText =
+            "Optional separate database for shadow tables. If not specified, shadow tables will be created in the main database.")
+    @Default.String("")
+    String getShadowTableSpannerDatabaseId();
+
+    void setShadowTableSpannerDatabaseId(String value);
   }
 
   private static void validateSourceType(Options options) {
@@ -643,20 +667,31 @@ public static PipelineResult run(Options options) {
                     .setMaxRpcTimeout(org.threeten.bp.Duration.ofMinutes(4))
                     .setMaxAttempts(1)
                     .build());
+    SpannerConfig shadowTableSpannerConfig = getShadowTableSpannerConfig(options);
     /* Process information schema
      * 1) Read information schema from destination Cloud Spanner database
      * 2) Check if shadow tables are present and create if necessary
      * 3) Return new information schema
      */
-    PCollection<Ddl> ddl =
+    PCollectionTuple ddlTuple =
         pipeline.apply(
             "Process Information Schema",
             new ProcessInformationSchema(
                 spannerConfig,
+                shadowTableSpannerConfig,
                 options.getShouldCreateShadowTables(),
                 options.getShadowTablePrefix(),
                 options.getDatastreamSourceType()));
-    PCollectionView<Ddl> ddlView = ddl.apply("Cloud Spanner DDL as view", View.asSingleton());
+    PCollectionView<Ddl> ddlView =
+        ddlTuple
+            .get(ProcessInformationSchema.MAIN_DDL_TAG)
+            .apply("Cloud Spanner Main DDL as view", View.asSingleton());
+
+    PCollectionView<Ddl> shadowTableDdlView =
+        ddlTuple
+            .get(ProcessInformationSchema.SHADOW_TABLE_DDL_TAG)
+            .apply("Cloud Spanner shadow tables DDL as view", View.asSingleton());
+
     PCollection<FailsafeElement<String, String>> jsonRecords = null;
     // Elements sent to the Dead Letter Queue are to be reconsumed.
     // A DLQManager is to be created using PipelineOptions, and it is in charge
@@ -781,7 +816,6 @@ public static PipelineResult run(Options options) {
     /*
      * Stage 4: Write transformed records to Cloud Spanner
      */
-
     SpannerTransactionWriter.Result spannerWriteResults =
         transformedRecords
             .get(DatastreamToSpannerConstants.TRANSFORMED_EVENT_TAG)
@@ -789,7 +823,9 @@ public static PipelineResult run(Options options) {
                 "Write events to Cloud Spanner",
                 new SpannerTransactionWriter(
                     spannerConfig,
+                    shadowTableSpannerConfig,
                     ddlView,
+                    shadowTableDdlView,
                     options.getShadowTablePrefix(),
                     options.getDatastreamSourceType(),
                     isRegularMode));
@@ -842,6 +878,52 @@ public static PipelineResult run(Options options) {
     return pipeline.run();
   }
 
+  static SpannerConfig getShadowTableSpannerConfig(Options options) {
+    // Validate shadow table Spanner config - both instance and database must be specified together
+    String shadowTableSpannerInstanceId = options.getShadowTableSpannerInstanceId();
+    String shadowTableSpannerDatabaseId = options.getShadowTableSpannerDatabaseId();
+    LOG.info(
+        "Input Shadow table db -  instance {} and database {}",
+        shadowTableSpannerInstanceId,
+        shadowTableSpannerDatabaseId);
+
+    if ((Strings.isNullOrEmpty(shadowTableSpannerInstanceId)
+            && !Strings.isNullOrEmpty(shadowTableSpannerDatabaseId))
+        || (!Strings.isNullOrEmpty(shadowTableSpannerInstanceId)
+            && Strings.isNullOrEmpty(shadowTableSpannerDatabaseId))) {
+      throw new IllegalArgumentException(
+          "Both shadowTableSpannerInstanceId and shadowTableSpannerDatabaseId must be specified together");
+    }
+    // If not specified, use main instance and database values. The shadow table database stores the
+    // shadow tables and by default, is the same as he main database for backwards compatibility.
+    if (Strings.isNullOrEmpty(shadowTableSpannerInstanceId)
+        && Strings.isNullOrEmpty(shadowTableSpannerDatabaseId)) {
+      shadowTableSpannerInstanceId = options.getInstanceId();
+      shadowTableSpannerDatabaseId = options.getDatabaseId();
+      LOG.info(
+          "Overwrote shadow table instance - {} and db- {}",
+          shadowTableSpannerInstanceId,
+          shadowTableSpannerDatabaseId);
+    }
+    return SpannerConfig.create()
+        .withProjectId(ValueProvider.StaticValueProvider.of(options.getProjectId()))
+        .withHost(ValueProvider.StaticValueProvider.of(options.getSpannerHost()))
+        .withInstanceId(ValueProvider.StaticValueProvider.of(shadowTableSpannerInstanceId))
+        .withDatabaseId(ValueProvider.StaticValueProvider.of(shadowTableSpannerDatabaseId))
+        .withRpcPriority(ValueProvider.StaticValueProvider.of(options.getSpannerPriority()))
+        .withCommitRetrySettings(
+            RetrySettings.newBuilder()
+                .setTotalTimeout(org.threeten.bp.Duration.ofMinutes(4))
+                .setInitialRetryDelay(org.threeten.bp.Duration.ofMinutes(0))
+                .setRetryDelayMultiplier(1)
+                .setMaxRetryDelay(org.threeten.bp.Duration.ofMinutes(0))
+                .setInitialRpcTimeout(org.threeten.bp.Duration.ofMinutes(4))
+                .setRpcTimeoutMultiplier(1)
+                .setMaxRpcTimeout(org.threeten.bp.Duration.ofMinutes(4))
+                .setMaxAttempts(1)
+                .build());
+  }
+
   private static DeadLetterQueueManager buildDlqManager(Options options) {
     String tempLocation =
         options.as(DataflowPipelineOptions.class).getTempLocation().endsWith("/")
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriter.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriter.java
index c0623c2118..44f5258886 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriter.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriter.java
@@ -54,9 +54,15 @@ public class SpannerTransactionWriter
   /* The spanner config specifying the destination Cloud Spanner database to connect to */
   private final SpannerConfig spannerConfig;
 
+  /* The spanner config specifying the shadow table Cloud Spanner database to connect to */
+  private final SpannerConfig shadowTableSpannerConfig;
+
   /* The information schema of the Cloud Spanner database */
   private final PCollectionView<Ddl> ddlView;
 
+  /* The information schema of the shadow table Cloud Spanner database */
+  private final PCollectionView<Ddl> shadowTableDdlView;
+
   /* The prefix for shadow tables */
   private final String shadowTablePrefix;
 
@@ -68,13 +74,17 @@ public class SpannerTransactionWriter
 
   public SpannerTransactionWriter(
       SpannerConfig spannerConfig,
+      SpannerConfig shadowTableSpannerConfig,
       PCollectionView<Ddl> ddlView,
+      PCollectionView<Ddl> shadowTableDdlView,
       String shadowTablePrefix,
       String sourceType,
       Boolean isRegularRunMode) {
     Preconditions.checkNotNull(spannerConfig);
     this.spannerConfig = spannerConfig;
+    this.shadowTableSpannerConfig = shadowTableSpannerConfig;
     this.ddlView = ddlView;
+    this.shadowTableDdlView = shadowTableDdlView;
     this.shadowTablePrefix = shadowTablePrefix;
     this.sourceType = sourceType;
     this.isRegularRunMode = isRegularRunMode;
@@ -88,8 +98,14 @@ public SpannerTransactionWriter.Result expand(
             "Write Mutations",
             ParDo.of(
                     new SpannerTransactionWriterDoFn(
-                        spannerConfig, ddlView, shadowTablePrefix, sourceType, isRegularRunMode))
-                .withSideInputs(ddlView)
+                        spannerConfig,
+                        shadowTableSpannerConfig,
+                        ddlView,
+                        shadowTableDdlView,
+                        shadowTablePrefix,
+                        sourceType,
+                        isRegularRunMode))
+                .withSideInputs(ddlView, shadowTableDdlView)
                 .withOutputTags(
                     DatastreamToSpannerConstants.SUCCESSFUL_EVENT_TAG,
                     TupleTagList.of(
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFn.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFn.java
index de5ced3645..7c173d456c 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFn.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFn.java
@@ -28,7 +28,7 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.Options;
 import com.google.cloud.spanner.SpannerException;
-import com.google.cloud.spanner.TransactionRunner.TransactionCallable;
+import com.google.cloud.spanner.TransactionRunner;
 import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.ChangeEventConvertorException;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.DroppedTableException;
@@ -81,8 +81,10 @@ class SpannerTransactionWriterDoFn extends DoFn<FailsafeElement<String, String>,
   private static final Logger LOG = LoggerFactory.getLogger(SpannerTransactionWriterDoFn.class);
 
   private final PCollectionView<Ddl> ddlView;
+  private final PCollectionView<Ddl> shadowTableDdlView;
 
   private final SpannerConfig spannerConfig;
+  private final SpannerConfig shadowTableSpannerConfig;
 
   // The prefix for shadow tables.
   private final String shadowTablePrefix;
@@ -95,6 +97,8 @@ class SpannerTransactionWriterDoFn extends DoFn<FailsafeElement<String, String>,
 
   /* SpannerAccessor must be transient so that its value is not serialized at runtime. */
   private transient SpannerAccessor spannerAccessor;
+  /* SpannerAccessor for shadow table database must be transient so that its value is not serialized at runtime. */
+  private transient SpannerAccessor shadowTableSpannerAccessor;
 
   // Number of events successfully processed.
   private final Counter successfulEvents =
@@ -172,25 +176,38 @@ class SpannerTransactionWriterDoFn extends DoFn<FailsafeElement<String, String>,
   private transient AtomicBoolean keepWatchdogRunning;
   private transient Thread watchdogThread;
 
+  private final boolean usesSeparateShadowTableDb;
+
   SpannerTransactionWriterDoFn(
       SpannerConfig spannerConfig,
+      SpannerConfig shadowTableSpannerConfig,
       PCollectionView<Ddl> ddlView,
+      PCollectionView<Ddl> shadowTableDdlView,
       String shadowTablePrefix,
       String sourceType,
       Boolean isRegularRunMode) {
     Preconditions.checkNotNull(spannerConfig);
     this.spannerConfig = spannerConfig;
+    this.shadowTableSpannerConfig = shadowTableSpannerConfig;
     this.ddlView = ddlView;
+    this.shadowTableDdlView = shadowTableDdlView;
     this.shadowTablePrefix =
         (shadowTablePrefix.endsWith("_")) ? shadowTablePrefix : shadowTablePrefix + "_";
     this.sourceType = sourceType;
     this.isRegularRunMode = isRegularRunMode;
+    this.usesSeparateShadowTableDb =
+        !(spannerConfig.getInstanceId().equals(shadowTableSpannerConfig.getInstanceId())
+            && spannerConfig.getDatabaseId().equals(shadowTableSpannerConfig.getDatabaseId()));
   }
 
   /** Setup function connects to Cloud Spanner. */
   @Setup
   public void setup() {
     spannerAccessor = SpannerAccessor.getOrCreate(spannerConfig);
+    shadowTableSpannerAccessor =
+        usesSeparateShadowTableDb
+            ? SpannerAccessor.getOrCreate(shadowTableSpannerConfig)
+            : spannerAccessor;
     mapper = new ObjectMapper();
     mapper.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
     // Setup and start the watchdog thread.
@@ -209,6 +226,9 @@ public void setup() {
   @Teardown
   public void teardown() {
     spannerAccessor.close();
+    if (usesSeparateShadowTableDb) {
+      shadowTableSpannerAccessor.close();
+    }
     // Stop the watchdog thread.
     keepWatchdogRunning.set(false);
   }
@@ -217,6 +237,8 @@ public void teardown() {
   public void processElement(ProcessContext c) {
     FailsafeElement<String, String> msg = c.element();
     Ddl ddl = c.sideInput(ddlView);
+    // TODO: pass shadow table ddl to shdaow tble mutaiton generator and sequence reader.
+    Ddl shadowTableDdl = c.sideInput(shadowTableDdlView);
     Instant startTimestamp = Instant.now();
     String migrationShardId = null;
     boolean isRetryRecord = false;
@@ -240,43 +262,20 @@ public void processElement(ProcessContext c) {
       }
       ChangeEventContext changeEventContext =
           ChangeEventContextFactory.createChangeEventContext(
-              changeEvent, ddl, shadowTablePrefix, sourceType);
+              changeEvent, ddl, shadowTableDdl, shadowTablePrefix, sourceType);
 
       // Sequence information for the current change event.
       ChangeEventSequence currentChangeEventSequence =
           ChangeEventSequenceFactory.createChangeEventSequenceFromChangeEventContext(
               changeEventContext);
 
-      // Start transaction
-      spannerAccessor
-          .getDatabaseClient()
-          .readWriteTransaction(
-              Options.tag(getTxnTag(c.getPipelineOptions())),
-              Options.priority(spannerConfig.getRpcPriority().get()))
-          .run(
-              (TransactionCallable<Void>)
-                  transaction -> {
-                    isInTransaction.set(true);
-                    transactionAttemptCount.incrementAndGet();
-                    // Sequence information for the last change event.
-                    ChangeEventSequence previousChangeEventSequence =
-                        ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-                            transaction, changeEventContext);
-
-                    /* There was a previous event recorded with a greater sequence information
-                     * than current. Hence, skip the current event.
-                     */
-                    if (previousChangeEventSequence != null
-                        && previousChangeEventSequence.compareTo(currentChangeEventSequence) >= 0) {
-                      skippedEvents.inc();
-                      return null;
-                    }
-
-                    // Apply shadow and data table mutations.
-                    transaction.buffer(changeEventContext.getMutations());
-                    isInTransaction.set(false);
-                    return null;
-                  });
+      if (usesSeparateShadowTableDb) {
+        processCrossDatabaseTransaction(
+            c, changeEventContext, currentChangeEventSequence, shadowTableDdl);
+      } else {
+        processSingleDatabaseTransaction(
+            c, changeEventContext, currentChangeEventSequence, shadowTableDdl);
+      }
       com.google.cloud.Timestamp timestamp = com.google.cloud.Timestamp.now();
       c.output(timestamp);
       if (migrationShardId != null) {
@@ -345,6 +344,138 @@ public void processElement(ProcessContext c) {
     }
   }
 
+  private void processSingleDatabaseTransaction(
+      ProcessContext c,
+      ChangeEventContext changeEventContext,
+      ChangeEventSequence currentChangeEventSequence,
+      Ddl shadowDdl) {
+
+    spannerAccessor
+        .getDatabaseClient()
+        .readWriteTransaction(
+            Options.tag(getTxnTag(c.getPipelineOptions())),
+            Options.priority(spannerConfig.getRpcPriority().get()))
+        .run(
+            (TransactionRunner.TransactionCallable<Void>)
+                transaction -> {
+                  isInTransaction.set(true);
+                  transactionAttemptCount.incrementAndGet();
+                  // Sequence information for the last change event.
+                  ChangeEventSequence previousChangeEventSequence =
+                      ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
+                          transaction, changeEventContext, shadowDdl, false);
+                  /* There was a previous event recorded with a greater sequence information
+                   * than current. Hence, skip the current event.
+                   */
+                  if (previousChangeEventSequence != null
+                      && previousChangeEventSequence.compareTo(currentChangeEventSequence) >= 0) {
+                    skippedEvents.inc();
+                    return null;
+                  }
+                  // Apply shadow and data table mutations.
+                  transaction.buffer(changeEventContext.getMutations());
+                  isInTransaction.set(false);
+                  return null;
+                });
+  }
+
+  /**
+   * This method does a cross database transaction across the shadow table db and the main db. It
+   * performs the following steps:
+   *
+   * <ul>
+   *   <li>Start shadow table transaction - tx1
+   *   <li>Read the shadow table row with exclusive lock - tx1.read()
+   *   <li>Start main table transaction - tx2
+   *   <li>Write to main table - tx2.write()
+   *   <li>Before committing tx2, read the shadow table row again using tx1 inside tx2.
+   *   <li>Commit main transaction - tx2.commit()
+   *   <li>Update shadow table - tx1.write()
+   *   <li>Commit shadow table transaction - tx1.commit()
+   * </ul>
+   *
+   * <p>Step 5 acts as a lock validation ensuring that no other process is writing this row. If due
+   * to some network partition/machine failure, the lock is lost during main table write, Spanner
+   * will release the exclusive lock while the thread still continues its attempt to write. This
+   * validation ensures that main table write also fails in such cases and the event goes for
+   * retrial. This ensures no 2 processes are updating the same row together.
+   */
+  void processCrossDatabaseTransaction(
+      ProcessContext c,
+      ChangeEventContext changeEventContext,
+      ChangeEventSequence currentChangeEventSequence,
+      Ddl shadowDdl) {
+
+    shadowTableSpannerAccessor
+        .getDatabaseClient()
+        .readWriteTransaction(
+            Options.tag(getTxnTag(c.getPipelineOptions())),
+            Options.priority(spannerConfig.getRpcPriority().get()))
+        .allowNestedTransaction()
+        .run(
+            (TransactionRunner.TransactionCallable<Void>)
+                shadowTxn -> {
+                  isInTransaction.set(true);
+                  transactionAttemptCount.incrementAndGet();
+
+                  // Build lock query based on source type
+                  ChangeEventSequence previousChangeEventSequence =
+                      ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
+                          shadowTxn, changeEventContext, shadowDdl, /* useSqlStatments= */ true);
+
+                  if (previousChangeEventSequence != null
+                      && previousChangeEventSequence.compareTo(currentChangeEventSequence) >= 0) {
+                    skippedEvents.inc();
+                    return null;
+                  }
+
+                  // Start main table transaction
+                  spannerAccessor
+                      .getDatabaseClient()
+                      .readWriteTransaction(
+                          Options.tag(getTxnTag(c.getPipelineOptions())),
+                          Options.priority(spannerConfig.getRpcPriority().get()))
+                      .run(
+                          (TransactionRunner.TransactionCallable<Void>)
+                              mainTxn -> {
+                                // Write to main table
+                                mainTxn.buffer(changeEventContext.getDataMutation());
+
+                                // Validate the row still holds the exclusive lock. In case of
+                                // network
+                                // partitions, it could happen that Spanner releases the lock while
+                                // this
+                                // thread gets killed.
+                                ChangeEventSequence validationSequence =
+                                    ChangeEventSequenceFactory
+                                        .createChangeEventSequenceFromShadowTable(
+                                            shadowTxn,
+                                            changeEventContext,
+                                            shadowDdl,
+                                            /* useSqlStatments= */ true);
+
+                                if (validationSequence != null
+                                    && validationSequence.compareTo(previousChangeEventSequence)
+                                        != 0) {
+                                  // This code path should never execute since Spanner automatically
+                                  // aborts transactions when locks are released.
+                                  LOG.error(
+                                      "Sequence mismatch: validation sequence {}, previous sequence {}",
+                                      validationSequence,
+                                      previousChangeEventSequence);
+                                  throw new Exception(
+                                      "Shadow table sequence changed during transaction");
+                                }
+                                return null;
+                              });
+
+                  // Update shadow table if main transaction succeeded
+                  shadowTxn.buffer(changeEventContext.getShadowMutation());
+                  isInTransaction.set(false);
+                  return null;
+                });
+  }
+
   void updateLatencyMetrics(JsonNode changeEvent, Instant startTimestamp) {
     Instant endTimestamp = Instant.now();
     spannerWriterLatencyMs.update(new Duration(startTimestamp, endTimestamp).getMillis());
@@ -396,6 +527,10 @@ public void setSpannerAccessor(SpannerAccessor spannerAccessor) {
     this.spannerAccessor = spannerAccessor;
   }
 
+  public void setShadowTableSpannerAccessor(SpannerAccessor shadowTableSpannerAccessor) {
+    this.shadowTableSpannerAccessor = shadowTableSpannerAccessor;
+  }
+
   public void setTransactionAttemptCount(AtomicLong transactionAttemptCount) {
     this.transactionAttemptCount = transactionAttemptCount;
   }
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContext.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContext.java
index b383e7e0cd..2e0facbd67 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContext.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContext.java
@@ -60,7 +60,7 @@ public abstract class ChangeEventContext {
   abstract Mutation generateShadowTableMutation(Ddl ddl) throws ChangeEventConvertorException;
 
   // Helper method to convert change event to mutation.
-  protected void convertChangeEventToMutation(Ddl ddl)
+  protected void convertChangeEventToMutation(Ddl ddl, Ddl shadowTableDdl)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
     ChangeEventConvertor.convertChangeEventColumnKeysToLowerCase(changeEvent);
     ChangeEventConvertor.verifySpannerSchema(ddl, changeEvent);
@@ -71,7 +71,7 @@ protected void convertChangeEventToMutation(Ddl ddl)
             changeEvent,
             /* convertNameToLowerCase= */ true);
     this.dataMutation = ChangeEventConvertor.changeEventToMutation(ddl, changeEvent);
-    this.shadowTableMutation = generateShadowTableMutation(ddl);
+    this.shadowTableMutation = generateShadowTableMutation(shadowTableDdl);
   }
 
   public JsonNode getChangeEvent() {
@@ -83,6 +83,16 @@ public Iterable<Mutation> getMutations() {
     return Arrays.asList(dataMutation, shadowTableMutation);
   }
 
+  // Returns the data table mutation
+  public Mutation getDataMutation() {
+    return dataMutation;
+  }
+
+  // Returns the shadow table mutation
+  public Mutation getShadowMutation() {
+    return shadowTableMutation;
+  }
+
   // Getter method for the primary key of the change event.
   public Key getPrimaryKey() {
     return primaryKey;
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactory.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactory.java
index 85be2c6aa3..9f6f5ef0d1 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactory.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactory.java
@@ -38,7 +38,11 @@ private static String getSourceType(JsonNode changeEvent) throws InvalidChangeEv
    * Creates ChangeEventContext depending on the change event type.
    */
   public static ChangeEventContext createChangeEventContext(
-      JsonNode changeEvent, Ddl ddl, String shadowTablePrefix, String sourceType)
+      JsonNode changeEvent,
+      Ddl ddl,
+      Ddl shadowTableDdl,
+      String shadowTablePrefix,
+      String sourceType)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
     String sourceTypeFromChangeEvent;
     try {
@@ -57,11 +61,11 @@ public static ChangeEventContext createChangeEventContext(
     }
 
     if (DatastreamConstants.MYSQL_SOURCE_TYPE.equals(sourceType)) {
-      return new MySqlChangeEventContext(changeEvent, ddl, shadowTablePrefix);
+      return new MySqlChangeEventContext(changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
     } else if (DatastreamConstants.ORACLE_SOURCE_TYPE.equals(sourceType)) {
-      return new OracleChangeEventContext(changeEvent, ddl, shadowTablePrefix);
+      return new OracleChangeEventContext(changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
     } else if (DatastreamConstants.POSTGRES_SOURCE_TYPE.equals(sourceType)) {
-      return new PostgresChangeEventContext(changeEvent, ddl, shadowTablePrefix);
+      return new PostgresChangeEventContext(changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
     }
 
     throw new InvalidChangeEventException("Unsupported source database: " + sourceType);
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactory.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactory.java
index 50ef97286d..8cf77caceb 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactory.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactory.java
@@ -17,6 +17,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.cloud.spanner.TransactionContext;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.ChangeEventConvertorException;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.InvalidChangeEventException;
 
@@ -29,7 +30,7 @@ public class ChangeEventSequenceFactory {
 
   private ChangeEventSequenceFactory() {}
 
-  private static String getSourceType(JsonNode changeEvent) throws InvalidChangeEventException {
+  static String getSourceType(JsonNode changeEvent) throws InvalidChangeEventException {
     try {
       return changeEvent.get(DatastreamConstants.EVENT_SOURCE_TYPE_KEY).asText();
     } catch (Exception e) {
@@ -62,7 +63,10 @@ public static ChangeEventSequence createChangeEventSequenceFromChangeEventContex
    * from shadow tables.
    */
   public static ChangeEventSequence createChangeEventSequenceFromShadowTable(
-      final TransactionContext transactionContext, final ChangeEventContext changeEventContext)
+      final TransactionContext transactionContext,
+      final ChangeEventContext changeEventContext,
+      Ddl shadowDdl,
+      boolean useSqlStatements)
       throws ChangeEventSequenceCreationException, InvalidChangeEventException {
 
     String sourceType = getSourceType(changeEventContext.getChangeEvent());
@@ -71,17 +75,23 @@ public static ChangeEventSequence createChangeEventSequenceFromShadowTable(
       return MySqlChangeEventSequence.createFromShadowTable(
           transactionContext,
           changeEventContext.getShadowTable(),
-          changeEventContext.getPrimaryKey());
+          shadowDdl,
+          changeEventContext.getPrimaryKey(),
+          useSqlStatements);
     } else if (DatastreamConstants.ORACLE_SOURCE_TYPE.equals(sourceType)) {
       return OracleChangeEventSequence.createFromShadowTable(
           transactionContext,
           changeEventContext.getShadowTable(),
-          changeEventContext.getPrimaryKey());
+          shadowDdl,
+          changeEventContext.getPrimaryKey(),
+          useSqlStatements);
     } else if (DatastreamConstants.POSTGRES_SOURCE_TYPE.equals(sourceType)) {
       return PostgresChangeEventSequence.createFromShadowTable(
           transactionContext,
           changeEventContext.getShadowTable(),
-          changeEventContext.getPrimaryKey());
+          shadowDdl,
+          changeEventContext.getPrimaryKey(),
+          useSqlStatements);
     }
     throw new InvalidChangeEventException("Unsupported source database: " + sourceType);
   }
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContext.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContext.java
index 6d36eb1744..250d0011c5 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContext.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContext.java
@@ -30,13 +30,14 @@
  */
 class MySqlChangeEventContext extends ChangeEventContext {
 
-  public MySqlChangeEventContext(JsonNode changeEvent, Ddl ddl, String shadowTablePrefix)
+  public MySqlChangeEventContext(
+      JsonNode changeEvent, Ddl ddl, Ddl shadowTableDdl, String shadowTablePrefix)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
     this.changeEvent = changeEvent;
     this.shadowTablePrefix = shadowTablePrefix;
     this.dataTable = changeEvent.get(DatastreamConstants.EVENT_TABLE_NAME_KEY).asText();
     this.shadowTable = shadowTablePrefix + this.dataTable;
-    convertChangeEventToMutation(ddl);
+    convertChangeEventToMutation(ddl, shadowTableDdl);
   }
 
   /*
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequence.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequence.java
index 86bb0cbffc..e933a60161 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequence.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequence.java
@@ -16,8 +16,11 @@
 package com.google.cloud.teleport.v2.templates.datastream;
 
 import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.Struct;
 import com.google.cloud.spanner.TransactionContext;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import com.google.cloud.teleport.v2.spanner.migrations.convertors.ChangeEventTypeConvertor;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.ChangeEventConvertorException;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.InvalidChangeEventException;
@@ -90,9 +93,17 @@ public static MySqlChangeEventSequence createFromChangeEvent(ChangeEventContext
 
   /*
    * Creates a MySqlChangeEventSequence by reading from a shadow table.
+   * @param transactionContext The transaction context to use for reading from the shadow table
+   * @param shadowTable The name of the shadow table to read from
+   * @param primaryKey The primary key to look up in the shadow table
+   * @param useSqlStatements If true, performs shadow table read using SQL statement with exclusive lock on row
    */
   public static MySqlChangeEventSequence createFromShadowTable(
-      final TransactionContext transactionContext, String shadowTable, Key primaryKey)
+      final TransactionContext transactionContext,
+      String shadowTable,
+      Ddl shadowTableDdl,
+      Key primaryKey,
+      boolean useSqlStatements)
       throws ChangeEventSequenceCreationException {
 
     try {
@@ -101,13 +112,26 @@ public static MySqlChangeEventSequence createFromShadowTable(
           DatastreamConstants.MYSQL_SORT_ORDER.values().stream()
               .map(p -> p.getLeft())
               .collect(Collectors.toList());
-      Struct row = transactionContext.readRow(shadowTable, primaryKey, readColumnList);
-
+      Struct row;
+      // TODO: After beam release, use the latest client lib version which supports setting lock
+      // hints via the read api. SQL string generation should be removed.
+      if (useSqlStatements) {
+        Statement sql =
+            ShadowTableReadUtils.generateShadowTableReadSQL(
+                shadowTable, readColumnList, primaryKey, shadowTableDdl);
+        ResultSet resultSet = transactionContext.executeQuery(sql);
+        if (!resultSet.next()) {
+          return null;
+        }
+        row = resultSet.getCurrentRowAsStruct();
+      } else {
+        // Use direct row read
+        row = transactionContext.readRow(shadowTable, primaryKey, readColumnList);
+      }
       // This is the first event for the primary key and hence the latest event.
       if (row == null) {
         return null;
       }
-
       return new MySqlChangeEventSequence(
           row.getLong(readColumnList.get(0)),
           row.getString(readColumnList.get(1)),
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContext.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContext.java
index d162899013..666a44ec3d 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContext.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContext.java
@@ -30,13 +30,14 @@
  */
 class OracleChangeEventContext extends ChangeEventContext {
 
-  public OracleChangeEventContext(JsonNode changeEvent, Ddl ddl, String shadowTablePrefix)
+  public OracleChangeEventContext(
+      JsonNode changeEvent, Ddl ddl, Ddl shadowTableDdl, String shadowTablePrefix)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
     this.changeEvent = changeEvent;
     this.shadowTablePrefix = shadowTablePrefix;
     this.dataTable = changeEvent.get(DatastreamConstants.EVENT_TABLE_NAME_KEY).asText();
     this.shadowTable = shadowTablePrefix + this.dataTable;
-    convertChangeEventToMutation(ddl);
+    convertChangeEventToMutation(ddl, shadowTableDdl);
   }
 
   /*
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequence.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequence.java
index 69ec055ca3..cc61493391 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequence.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequence.java
@@ -16,8 +16,11 @@
 package com.google.cloud.teleport.v2.templates.datastream;
 
 import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.Struct;
 import com.google.cloud.spanner.TransactionContext;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import com.google.cloud.teleport.v2.spanner.migrations.convertors.ChangeEventTypeConvertor;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.ChangeEventConvertorException;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.InvalidChangeEventException;
@@ -73,7 +76,11 @@ public static OracleChangeEventSequence createFromChangeEvent(ChangeEventContext
    * Creates a OracleChangeEventSequence by reading from a shadow table.
    */
   public static OracleChangeEventSequence createFromShadowTable(
-      final TransactionContext transactionContext, String shadowTable, Key primaryKey)
+      final TransactionContext transactionContext,
+      String shadowTable,
+      Ddl shadowTableDdl,
+      Key primaryKey,
+      boolean useSqlStatements)
       throws ChangeEventSequenceCreationException {
 
     try {
@@ -82,7 +89,22 @@ public static OracleChangeEventSequence createFromShadowTable(
           DatastreamConstants.ORACLE_SORT_ORDER.values().stream()
               .map(p -> p.getLeft())
               .collect(Collectors.toList());
-      Struct row = transactionContext.readRow(shadowTable, primaryKey, readColumnList);
+      Struct row;
+      // TODO: After beam release, use the latest client lib version which supports setting lock
+      // hints via the read api. SQL string generation should be removed.
+      if (useSqlStatements) {
+        Statement sql =
+            ShadowTableReadUtils.generateShadowTableReadSQL(
+                shadowTable, readColumnList, primaryKey, shadowTableDdl);
+        ResultSet resultSet = transactionContext.executeQuery(sql);
+        if (!resultSet.next()) {
+          return null;
+        }
+        row = resultSet.getCurrentRowAsStruct();
+      } else {
+        // Use direct row read
+        row = transactionContext.readRow(shadowTable, primaryKey, readColumnList);
+      }
 
       // This is the first event for the primary key and hence the latest event.
       if (row == null) {
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContext.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContext.java
index 23cefd3893..18a31153bf 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContext.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContext.java
@@ -30,13 +30,14 @@
  */
 class PostgresChangeEventContext extends ChangeEventContext {
 
-  public PostgresChangeEventContext(JsonNode changeEvent, Ddl ddl, String shadowTablePrefix)
+  public PostgresChangeEventContext(
+      JsonNode changeEvent, Ddl ddl, Ddl shadowTableDdl, String shadowTablePrefix)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
     this.changeEvent = changeEvent;
     this.shadowTablePrefix = shadowTablePrefix;
     this.dataTable = changeEvent.get(DatastreamConstants.EVENT_TABLE_NAME_KEY).asText();
     this.shadowTable = shadowTablePrefix + this.dataTable;
-    convertChangeEventToMutation(ddl);
+    convertChangeEventToMutation(ddl, shadowTableDdl);
   }
 
   /*
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequence.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequence.java
index a6ac52c91e..8e2ba3f9e9 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequence.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequence.java
@@ -16,8 +16,11 @@
 package com.google.cloud.teleport.v2.templates.datastream;
 
 import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.Struct;
 import com.google.cloud.spanner.TransactionContext;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import com.google.cloud.teleport.v2.spanner.migrations.convertors.ChangeEventTypeConvertor;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.ChangeEventConvertorException;
 import com.google.cloud.teleport.v2.spanner.migrations.exceptions.InvalidChangeEventException;
@@ -73,7 +76,11 @@ public static PostgresChangeEventSequence createFromChangeEvent(ChangeEventConte
    * Creates a PostgresChangeEventSequence by reading from a shadow table.
    */
   public static PostgresChangeEventSequence createFromShadowTable(
-      final TransactionContext transactionContext, String shadowTable, Key primaryKey)
+      final TransactionContext transactionContext,
+      String shadowTable,
+      Ddl shadowTableDdl,
+      Key primaryKey,
+      boolean useSqlStatements)
       throws ChangeEventSequenceCreationException {
 
     try {
@@ -82,8 +89,22 @@ public static PostgresChangeEventSequence createFromShadowTable(
           DatastreamConstants.POSTGRES_SORT_ORDER.values().stream()
               .map(p -> p.getLeft())
               .collect(Collectors.toList());
-      Struct row = transactionContext.readRow(shadowTable, primaryKey, readColumnList);
-
+      Struct row;
+      // TODO: After beam release, use the latest client lib version which supports setting lock
+      // hints via the read api. SQL string generation should be removed.
+      if (useSqlStatements) {
+        Statement sql =
+            ShadowTableReadUtils.generateShadowTableReadSQL(
+                shadowTable, readColumnList, primaryKey, shadowTableDdl);
+        ResultSet resultSet = transactionContext.executeQuery(sql);
+        if (!resultSet.next()) {
+          return null;
+        }
+        row = resultSet.getCurrentRowAsStruct();
+      } else {
+        // Use direct row read
+        row = transactionContext.readRow(shadowTable, primaryKey, readColumnList);
+      }
       // This is the first event for the primary key and hence the latest event.
       if (row == null) {
         return null;
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtils.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtils.java
new file mode 100644
index 0000000000..b4f10f9c8c
--- /dev/null
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtils.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates.datastream;
+
+import com.google.cloud.ByteArray;
+import com.google.cloud.Date;
+import com.google.cloud.Timestamp;
+import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.teleport.v2.spanner.ddl.Column;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
+import com.google.cloud.teleport.v2.spanner.ddl.Table;
+import com.google.cloud.teleport.v2.spanner.type.Type;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ShadowTableReadUtils {
+  // TODO: After beam release, use the latest client lib version which supports setting lock
+  // hints via the read api. SQL string generation should be removed.
+  public static Statement generateShadowTableReadSQL(
+      String shadowTable, List<String> readColumnList, Key primaryKey, Ddl shadowTableDdl) {
+    String columnNames = String.join(", ", readColumnList);
+    // TODO: Handle json type as PKs.
+    String whereClause =
+        String.join(
+            " AND ",
+            shadowTableDdl.table(shadowTable).primaryKeys().stream()
+                .map(col -> col.name() + "=@" + col.name())
+                .collect(Collectors.toList()));
+    String sql =
+        "@{LOCK_SCANNED_RANGES=exclusive} SELECT "
+            + columnNames
+            + " FROM "
+            + shadowTable
+            + " WHERE "
+            + whereClause;
+
+    Statement.Builder stmtBuilder = Statement.newBuilder(sql);
+    int i = 0;
+    for (Object value : primaryKey.getParts()) {
+      Table table = shadowTableDdl.table(shadowTable);
+      String colName = table.primaryKeys().get(i).name();
+      Column key = table.column(colName);
+      Type keyColType = key.type();
+
+      switch (keyColType.getCode()) {
+        case BOOL:
+        case PG_BOOL:
+          stmtBuilder.bind(colName).to((Boolean) value);
+          break;
+        case INT64:
+        case PG_INT8:
+          stmtBuilder.bind(colName).to((Long) value);
+          break;
+        case FLOAT64:
+        case PG_FLOAT8:
+          stmtBuilder.bind(colName).to((Double) value);
+          break;
+        case STRING:
+        case PG_VARCHAR:
+        case PG_TEXT:
+        case JSON:
+        case PG_JSONB:
+          stmtBuilder.bind(colName).to((String) value);
+          break;
+        case NUMERIC:
+        case PG_NUMERIC:
+          stmtBuilder.bind(colName).to((BigDecimal) value);
+          break;
+        case BYTES:
+        case PG_BYTEA:
+          stmtBuilder.bind(colName).to((ByteArray) value);
+          break;
+        case TIMESTAMP:
+        case PG_COMMIT_TIMESTAMP:
+        case PG_TIMESTAMPTZ:
+          stmtBuilder.bind(colName).to((Timestamp) value);
+          break;
+        case DATE:
+        case PG_DATE:
+          stmtBuilder.bind(colName).to((Date) value);
+          break;
+        default:
+          throw new IllegalArgumentException("Unsupported type: " + keyColType);
+      }
+      i++;
+    }
+    return stmtBuilder.build();
+  }
+}
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchema.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchema.java
index e06796b080..fc174e0c5b 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchema.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchema.java
@@ -38,47 +38,58 @@
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.PBegin;
-import org.apache.beam.sdk.values.PCollection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.beam.sdk.values.PCollectionTuple;
+import org.apache.beam.sdk.values.TupleTag;
+import org.apache.beam.sdk.values.TupleTagList;
 
 /**
- * Beam transform which 1) Reads information schema using {@link InformationSchemaScanner}. 2)
- * Create shadow tables in the destination Cloud Spanner database. 3) Outputs the updated
- * information schema.
+ * Beam transform which 1) Reads information schema from both main and shadow table database. 2)
+ * Create shadow tables in the shadow table database 3) Outputs both DDL schemas
+ *
+ * <p>The shadow table database housing the shadow tables can be the same as the main database.
  */
-public class ProcessInformationSchema extends PTransform<PBegin, PCollection<Ddl>> {
-  private static final Logger LOG = LoggerFactory.getLogger(ProcessInformationSchema.class);
+public class ProcessInformationSchema extends PTransform<PBegin, PCollectionTuple> {
+  public static final TupleTag<Ddl> MAIN_DDL_TAG = new TupleTag<>() {};
+  public static final TupleTag<Ddl> SHADOW_TABLE_DDL_TAG = new TupleTag<>() {};
   private final SpannerConfig spannerConfig;
+  private final SpannerConfig shadowTableSpannerConfig;
   private final Boolean shouldCreateShadowTables;
   private final String shadowTablePrefix;
   private final String sourceType;
 
   public ProcessInformationSchema(
       SpannerConfig spannerConfig,
+      SpannerConfig shadowTableSpannerConfig,
       Boolean shouldCreateShadowTables,
       String shadowTablePrefix,
       String sourceType) {
     this.spannerConfig = spannerConfig;
+    this.shadowTableSpannerConfig = shadowTableSpannerConfig;
     this.shouldCreateShadowTables = shouldCreateShadowTables;
     this.shadowTablePrefix = shadowTablePrefix;
     this.sourceType = sourceType;
   }
 
   @Override
-  public PCollection<Ddl> expand(PBegin p) {
+  public PCollectionTuple expand(PBegin p) {
     return p.apply("Create empty", Create.of((Void) null))
         .apply(
-            "Create Shadow tables and return Information Schema",
+            "Create Shadow tables and return Information Schemas",
             ParDo.of(
-                new ProcessInformationSchemaFn(
-                    spannerConfig, shouldCreateShadowTables,
-                    shadowTablePrefix, sourceType)));
+                    new ProcessInformationSchemaFn(
+                        spannerConfig,
+                        shadowTableSpannerConfig,
+                        shouldCreateShadowTables,
+                        shadowTablePrefix,
+                        sourceType))
+                .withOutputTags(MAIN_DDL_TAG, TupleTagList.of(SHADOW_TABLE_DDL_TAG)));
   }
 
   static class ProcessInformationSchemaFn extends DoFn<Void, Ddl> {
     private final SpannerConfig spannerConfig;
+    private final SpannerConfig shadowTableSpannerConfig;
     private transient SpannerAccessor spannerAccessor;
+    private transient SpannerAccessor shadowTableSpannerAccessor;
     private transient Dialect dialect;
     private final Boolean shouldCreateShadowTables;
     private final String shadowTablePrefix;
@@ -87,12 +98,16 @@ static class ProcessInformationSchemaFn extends DoFn<Void, Ddl> {
     // Timeout for Cloud Spanner schema update.
     private static final int SCHEMA_UPDATE_WAIT_MIN = 5;
 
+    private boolean useSeparateShadowTableDb = false;
+
     public ProcessInformationSchemaFn(
         SpannerConfig spannerConfig,
+        SpannerConfig shadowTableSpannerConfig,
         Boolean shouldCreateShadowTables,
         String shadowTablePrefix,
         String sourceType) {
       this.spannerConfig = spannerConfig;
+      this.shadowTableSpannerConfig = shadowTableSpannerConfig;
       this.shouldCreateShadowTables = shouldCreateShadowTables;
       this.shadowTablePrefix =
           (shadowTablePrefix.endsWith("_")) ? shadowTablePrefix : shadowTablePrefix + "_";
@@ -107,39 +122,101 @@ public void setup() throws Exception {
           databaseAdminClient
               .getDatabase(spannerConfig.getInstanceId().get(), spannerConfig.getDatabaseId().get())
               .getDialect();
+
+      // If both point to same database.
+      if (spannerConfig.getInstanceId().equals(shadowTableSpannerConfig.getInstanceId())
+          && spannerConfig.getDatabaseId().equals(shadowTableSpannerConfig.getDatabaseId())) {
+        shadowTableSpannerAccessor = spannerAccessor;
+        useSeparateShadowTableDb = false;
+      } else {
+        shadowTableSpannerAccessor = SpannerAccessor.getOrCreate(shadowTableSpannerConfig);
+        useSeparateShadowTableDb = true;
+      }
     }
 
     @Teardown
     public void teardown() throws Exception {
       spannerAccessor.close();
+      if (useSeparateShadowTableDb) {
+        shadowTableSpannerAccessor.close();
+      }
     }
 
     @ProcessElement
     public void processElement(ProcessContext c) {
+      // TODO: Add pgsql support/ cross dialect support.
+      Ddl mainDdl = getInformationSchemaAsDdl(spannerAccessor);
+      Ddl shadowTableDdl = getInformationSchemaAsDdl(shadowTableSpannerAccessor);
+
       if (shouldCreateShadowTables) {
-        createShadowTablesInSpanner(getInformationSchemaAsDdl());
+        createShadowTablesInSpanner(mainDdl, shadowTableDdl);
+        // Refresh shadow table DDL after creating new shadow tables
+        shadowTableDdl = getInformationSchemaAsDdl(shadowTableSpannerAccessor);
       }
-      c.output(getInformationSchemaAsDdl());
+      // Clean up DDLs to ensure proper separation of main and shadow tables. Note that this is only
+      // for data hygiene, the downstream methods using these can handle Ddl with excess tables as
+      // well.
+      mainDdl = cleanupDdl(mainDdl, shadowTablePrefix, /* isMainDdl= */ true);
+      shadowTableDdl = cleanupDdl(shadowTableDdl, shadowTablePrefix, /* isMainDdl= */ false);
+      c.output(MAIN_DDL_TAG, mainDdl);
+      c.output(SHADOW_TABLE_DDL_TAG, shadowTableDdl);
+    }
+
+    /**
+     * Cleans up the DDL by removing tables that do not match the specified criteria.
+     *
+     * <p>This method filters the tables in the DDL based on whether they are shadow tables or not.
+     * If the method is called to clean up the main DDL, it removes all tables that are shadow
+     * tables. If the method is called to clean up the shadow DDL, it removes all tables that are
+     * not shadow tables.
+     *
+     * @param originalDdl The original DDL to be cleaned up.
+     * @param shadowPrefix The prefix used to identify shadow tables.
+     * @param isMainDdl Indicates whether the DDL being cleaned up is the main DDL or the shadow
+     *     DDL.
+     * @return A new DDL with the filtered tables.
+     */
+    Ddl cleanupDdl(Ddl originalDdl, String shadowPrefix, boolean isMainDdl) {
+      // Create a new DDL builder with the same dialect as the original
+      Ddl.Builder cleanedDdlBuilder = Ddl.builder(dialect);
+
+      // Filter tables based on whether we're cleaning main DDL or shadow DDL
+      List<Table> filteredTables =
+          originalDdl.allTables().stream()
+              .filter(
+                  table -> {
+                    boolean isTableShadow = table.name().startsWith(shadowPrefix);
+                    // For main DDL, keep tables that are NOT shadow tables
+                    // For shadow DDL, keep tables that ARE shadow tables
+                    return isMainDdl ? !isTableShadow : isTableShadow;
+                  })
+              .collect(Collectors.toList());
+
+      // Add all filtered tables to the new DDL builder
+      filteredTables.forEach(cleanedDdlBuilder::addTable);
+
+      // Build and return the cleaned DDL
+      return cleanedDdlBuilder.build();
     }
 
-    Ddl getInformationSchemaAsDdl() {
-      BatchClient batchClient = spannerAccessor.getBatchClient();
+    Ddl getInformationSchemaAsDdl(SpannerAccessor accessor) {
+      BatchClient batchClient = accessor.getBatchClient();
       BatchReadOnlyTransaction context =
           batchClient.batchReadOnlyTransaction(TimestampBound.strong());
       InformationSchemaScanner scanner = new InformationSchemaScanner(context, dialect);
       return scanner.scan();
     }
 
-    void createShadowTablesInSpanner(Ddl informationSchema) {
+    void createShadowTablesInSpanner(Ddl mainDdl, Ddl shadowTableDdl) {
       List<String> dataTablesWithoutShadowTables =
-          getDataTablesWithNoShadowTables(informationSchema);
+          getDataTablesWithNoShadowTables(mainDdl, shadowTableDdl);
 
       Ddl.Builder shadowTableBuilder = Ddl.builder(dialect);
       ShadowTableCreator shadowTableCreator =
           new ShadowTableCreator(sourceType, shadowTablePrefix, dialect);
       for (String dataTableName : dataTablesWithoutShadowTables) {
         Table shadowTable =
-            shadowTableCreator.constructShadowTable(informationSchema, dataTableName, dialect);
+            shadowTableCreator.constructShadowTable(mainDdl, dataTableName, dialect);
         shadowTableBuilder.addTable(shadowTable);
       }
       List<String> createShadowTableStatements = shadowTableBuilder.build().createTableStatements();
@@ -148,12 +225,12 @@ void createShadowTablesInSpanner(Ddl informationSchema) {
         return;
       }
 
-      DatabaseAdminClient databaseAdminClient = spannerAccessor.getDatabaseAdminClient();
+      DatabaseAdminClient databaseAdminClient = shadowTableSpannerAccessor.getDatabaseAdminClient();
 
       OperationFuture<Void, UpdateDatabaseDdlMetadata> op =
           databaseAdminClient.updateDatabaseDdl(
-              spannerConfig.getInstanceId().get(),
-              spannerConfig.getDatabaseId().get(),
+              shadowTableSpannerConfig.getInstanceId().get(),
+              shadowTableSpannerConfig.getDatabaseId().get(),
               createShadowTableStatements,
               null);
 
@@ -162,7 +239,6 @@ void createShadowTablesInSpanner(Ddl informationSchema) {
       } catch (InterruptedException | ExecutionException | TimeoutException e) {
         throw new RuntimeException(e);
       }
-      return;
     }
 
     /*
@@ -180,22 +256,22 @@ Set<String> getShadowTablesInDdl(Ddl informationSchema) {
     }
 
     /*
-     * Returns the list of data table names that don't have a corresponding shadow table.
+     * Returns the list of data table names from main DB that don't have a corresponding shadow table.
+     * Shadow table db could be the same as main db or a separate database. Both of these cases get handled by this method.
      */
-    List<String> getDataTablesWithNoShadowTables(Ddl ddl) {
-      // Get the list of shadow tables in the information schema based on the prefix.
-      Set<String> existingShadowTables = getShadowTablesInDdl(ddl);
+    List<String> getDataTablesWithNoShadowTables(Ddl mainDdl, Ddl shadowTableDdl) {
+      // Get the list of shadow tables in the shadow table db based on the prefix
+      Set<String> existingShadowTables = getShadowTablesInDdl(shadowTableDdl);
 
-      List<String> allTables =
-          ddl.allTables().stream().map(t -> t.name()).collect(Collectors.toList());
-      /*
-       * Filter out the following from the list of all table names to get the list of
-       * data tables which do not have corresponding shadow tables:
-       * (1) Existing shadow tables
-       * (2) Data tables which have corresponding shadow tables.
-       */
-      return allTables.stream()
-          .filter(f -> !f.startsWith(shadowTablePrefix))
+      // Get all non-shadow tables from main DB
+      List<String> mainTables =
+          mainDdl.allTables().stream()
+              .map(t -> t.name())
+              .filter(f -> !f.startsWith(shadowTablePrefix))
+              .collect(Collectors.toList());
+
+      // Return tables that don't have corresponding shadow tables
+      return mainTables.stream()
           .filter(f -> !existingShadowTables.contains(shadowTablePrefix + f))
           .collect(Collectors.toList());
     }
@@ -213,5 +289,12 @@ public void setDialect(Dialect dialect) {
     public void setSpannerAccessor(SpannerAccessor spannerAccessor) {
       this.spannerAccessor = spannerAccessor;
     }
+
+    /*
+      Added for the purpose of unit testing
+    */
+    public void setshadowTableSpannerAccessor(SpannerAccessor shadowTableSpannerAccessor) {
+      this.shadowTableSpannerAccessor = shadowTableSpannerAccessor;
+    }
   }
 }
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerTest.java
index 1be7b88d1b..c18a38cf6e 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerTest.java
@@ -25,6 +25,7 @@
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SchemaFileOverridesParser;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SchemaStringOverridesParser;
 import com.google.common.io.Resources;
+import org.apache.beam.sdk.io.gcp.spanner.SpannerConfig;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.junit.Rule;
 import org.junit.Test;
@@ -151,4 +152,56 @@ public void testConfigureSchemaOverrides_incorrectConfiguration() {
         IllegalArgumentException.class,
         () -> DataStreamToSpanner.configureSchemaOverrides(options));
   }
+
+  @Test
+  public void testGetShadowTableSpannerConfig_validInput() {
+    DataStreamToSpanner.Options options = mock(DataStreamToSpanner.Options.class);
+    when(options.getShadowTableSpannerInstanceId()).thenReturn("shadow-instance-id");
+    when(options.getShadowTableSpannerDatabaseId()).thenReturn("shadow-database-id");
+    when(options.getProjectId()).thenReturn("project-id");
+
+    SpannerConfig spannerConfig = DataStreamToSpanner.getShadowTableSpannerConfig(options);
+
+    assertEquals("shadow-instance-id", spannerConfig.getInstanceId().get());
+    assertEquals("shadow-database-id", spannerConfig.getDatabaseId().get());
+    assertEquals("project-id", spannerConfig.getProjectId().get());
+  }
+
+  @Test
+  public void testGetShadowTableSpannerConfig_missingInstanceId() {
+    DataStreamToSpanner.Options options = mock(DataStreamToSpanner.Options.class);
+    when(options.getShadowTableSpannerInstanceId()).thenReturn("");
+    when(options.getShadowTableSpannerDatabaseId()).thenReturn("shadow-database-id");
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> DataStreamToSpanner.getShadowTableSpannerConfig(options));
+  }
+
+  @Test
+  public void testGetShadowTableSpannerConfig_missingDatabaseId() {
+    DataStreamToSpanner.Options options = mock(DataStreamToSpanner.Options.class);
+    when(options.getShadowTableSpannerInstanceId()).thenReturn("shadow-instance-id");
+    when(options.getShadowTableSpannerDatabaseId()).thenReturn("");
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> DataStreamToSpanner.getShadowTableSpannerConfig(options));
+  }
+
+  @Test
+  public void testGetShadowTableSpannerConfig_defaultValues() {
+    DataStreamToSpanner.Options options = mock(DataStreamToSpanner.Options.class);
+    when(options.getShadowTableSpannerInstanceId()).thenReturn("");
+    when(options.getShadowTableSpannerDatabaseId()).thenReturn("");
+    when(options.getInstanceId()).thenReturn("main-instance-id");
+    when(options.getDatabaseId()).thenReturn("main-database-id");
+    when(options.getProjectId()).thenReturn("project-id");
+
+    SpannerConfig spannerConfig = DataStreamToSpanner.getShadowTableSpannerConfig(options);
+
+    assertEquals("main-instance-id", spannerConfig.getInstanceId().get());
+    assertEquals("main-database-id", spannerConfig.getDatabaseId().get());
+    assertEquals("project-id", spannerConfig.getProjectId().get());
+  }
 }
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerStreamingWriteIntegrationTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerStreamingWriteIntegrationTest.java
index c284f32e09..1f3de69111 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerStreamingWriteIntegrationTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerStreamingWriteIntegrationTest.java
@@ -41,6 +41,7 @@
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.View;
 import org.apache.beam.sdk.values.PCollection;
+import org.apache.beam.sdk.values.PCollectionTuple;
 import org.apache.beam.sdk.values.PCollectionView;
 import org.json.JSONObject;
 import org.junit.After;
@@ -141,16 +142,34 @@ private void verifyDataInTable1(long primaryKey, long data) {
   private void constructAndRunPipeline(PCollection<FailsafeElement<String, String>> jsonRecords) {
     String shadowTablePrefix = "shadow";
     SpannerConfig spannerConfig = spannerServer.getSpannerConfig(testDb);
-    PCollection<Ddl> ddl =
+
+    PCollectionTuple ddlTuple =
         testPipeline.apply(
             "Process Information Schema",
-            new ProcessInformationSchema(spannerConfig, true, shadowTablePrefix, "oracle"));
-    PCollectionView<Ddl> ddlView = ddl.apply("Cloud Spanner DDL as view", View.asSingleton());
+            new ProcessInformationSchema(
+                spannerConfig, spannerConfig, true, shadowTablePrefix, "oracle"));
+    PCollectionView<Ddl> ddlView =
+        ddlTuple
+            .get(ProcessInformationSchema.MAIN_DDL_TAG)
+            .apply("Cloud Spanner Main DDL as view", View.asSingleton());
+
+    PCollectionView<Ddl> shadowTableDdlView =
+        ddlTuple
+            .get(ProcessInformationSchema.SHADOW_TABLE_DDL_TAG)
+            .apply("Cloud Spanner shadow tables DDL as view", View.asSingleton());
+
     Schema schema = new Schema();
 
     jsonRecords.apply(
         "Write events to Cloud Spanner",
-        new SpannerTransactionWriter(spannerConfig, ddlView, shadowTablePrefix, "oracle", true));
+        new SpannerTransactionWriter(
+            spannerConfig,
+            spannerConfig,
+            ddlView,
+            shadowTableDdlView,
+            shadowTablePrefix,
+            "oracle",
+            true));
 
     PipelineResult testResult = testPipeline.run();
     testResult.waitUntilFinish();
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFnTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFnTest.java
index 766ffd2a2b..834b3b66a4 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFnTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/SpannerTransactionWriterDoFnTest.java
@@ -52,14 +52,22 @@
 
 /** Unit tests for SpannerTransactionWriterDoFn class. */
 public class SpannerTransactionWriterDoFnTest {
+
   @Test
   public void testGetTxnTag() {
     String[] args = new String[] {"--jobId=123"};
     SpannerConfig spannerConfig = mock(SpannerConfig.class);
     DataflowWorkerHarnessOptions options =
         PipelineOptionsFactory.fromArgs(args).as(DataflowWorkerHarnessOptions.class);
+    ValueProvider<String> instanceId = mock(ValueProvider.class);
+    ValueProvider<String> databaseId = mock(ValueProvider.class);
+    when(spannerConfig.getInstanceId()).thenReturn(instanceId);
+    when(spannerConfig.getDatabaseId()).thenReturn(databaseId);
+    when(instanceId.get()).thenReturn("test-instance");
+    when(databaseId.get()).thenReturn("test-database");
     SpannerTransactionWriterDoFn spannerTransactionWriterDoFn =
-        new SpannerTransactionWriterDoFn(spannerConfig, null, "", "mysql", true);
+        new SpannerTransactionWriterDoFn(
+            spannerConfig, spannerConfig, null, null, "", "mysql", true);
     String result = spannerTransactionWriterDoFn.getTxnTag(options);
     assertEquals(result, "txBy=123");
   }
@@ -118,6 +126,8 @@ public void testProcessElement() {
     TransactionRunner transactionCallableMock = mock(TransactionRunner.class);
     TransactionContext transactionContext = mock(TransactionContext.class);
     ValueProvider<Options.RpcPriority> rpcPriorityValueProviderMock = mock(ValueProvider.class);
+    ValueProvider<String> instanceId = mock(ValueProvider.class);
+    ValueProvider<String> databaseId = mock(ValueProvider.class);
 
     String[] args = new String[] {"--jobId=123"};
     DataflowWorkerHarnessOptions options =
@@ -140,6 +150,10 @@ public void testProcessElement() {
     when(schema.isEmpty()).thenReturn(true);
     when(rpcPriorityValueProviderMock.get()).thenReturn(Options.RpcPriority.LOW);
     when(spannerConfig.getRpcPriority()).thenReturn(rpcPriorityValueProviderMock);
+    when(spannerConfig.getInstanceId()).thenReturn(instanceId);
+    when(spannerConfig.getDatabaseId()).thenReturn(databaseId);
+    when(instanceId.get()).thenReturn("test-instance");
+    when(databaseId.get()).thenReturn("test-database");
     when(spannerAccessor.getDatabaseClient()).thenReturn(databaseClientMock);
     when(transactionCallableMock.run(any()))
         .thenAnswer(
@@ -150,7 +164,8 @@ public void testProcessElement() {
     when(databaseClientMock.readWriteTransaction(any(), any())).thenReturn(transactionCallableMock);
 
     SpannerTransactionWriterDoFn spannerTransactionWriterDoFn =
-        new SpannerTransactionWriterDoFn(spannerConfig, ddlView, "shadow", "mysql", true);
+        new SpannerTransactionWriterDoFn(
+            spannerConfig, spannerConfig, ddlView, ddlView, "shadow", "mysql", true);
     spannerTransactionWriterDoFn.setMapper(mapper);
     spannerTransactionWriterDoFn.setSpannerAccessor(spannerAccessor);
     spannerTransactionWriterDoFn.setIsInTransaction(new AtomicBoolean(false));
@@ -202,6 +217,13 @@ public void testProcessElementWithInvalidChangeEvent() {
     Schema schema = mock(Schema.class);
     DoFn.ProcessContext processContextMock = mock(DoFn.ProcessContext.class);
 
+    String instanceId = "test-instance";
+    String databaseId = "test-database";
+    when(spannerConfig.getInstanceId())
+        .thenReturn(ValueProvider.StaticValueProvider.of(instanceId));
+    when(spannerConfig.getDatabaseId())
+        .thenReturn(ValueProvider.StaticValueProvider.of(databaseId));
+
     ObjectNode outputObject = mapper.createObjectNode();
     outputObject.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, "random");
     outputObject.put(DatastreamConstants.EVENT_TABLE_NAME_KEY, "Users1");
@@ -218,7 +240,8 @@ public void testProcessElementWithInvalidChangeEvent() {
     when(schema.isEmpty()).thenReturn(true);
 
     SpannerTransactionWriterDoFn spannerTransactionWriterDoFn =
-        new SpannerTransactionWriterDoFn(spannerConfig, ddlView, "shadow", "mysql", true);
+        new SpannerTransactionWriterDoFn(
+            spannerConfig, spannerConfig, ddlView, ddlView, "shadow", "mysql", true);
     spannerTransactionWriterDoFn.setMapper(mapper);
     spannerTransactionWriterDoFn.setSpannerAccessor(spannerAccessor);
     spannerTransactionWriterDoFn.processElement(processContextMock);
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactoryTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactoryTest.java
index 2b53564ab8..262b33a3c0 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactoryTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventContextFactoryTest.java
@@ -46,6 +46,7 @@ public void testCreateChangeEventContextWithEmptySourceType() throws Exception {
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.MYSQL_SOURCE_TYPE);
   }
@@ -63,6 +64,7 @@ public void testCreateChangeEventContextWithNonMatchingSourceType() throws Excep
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.MYSQL_SOURCE_TYPE);
   }
@@ -77,6 +79,6 @@ public void testCreateChangeEventContextWithNotSupportedSource() throws Exceptio
     Ddl ddl = ChangeEventConvertorTest.getTestDdl();
     ChangeEventContext changeEventContext =
         ChangeEventContextFactory.createChangeEventContext(
-            getJsonNode(changeEvent.toString()), ddl, "shadow_", "xyz");
+            getJsonNode(changeEvent.toString()), ddl, ddl, "shadow_", "xyz");
   }
 }
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactoryTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactoryTest.java
index cc326d29c4..9107abbea5 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactoryTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ChangeEventSequenceFactoryTest.java
@@ -197,7 +197,7 @@ public void canCreateMySqlChangeEventSequenceFromShadowTable() throws Exception
 
     ChangeEventSequence changeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertThat(changeEventSequence, instanceOf(MySqlChangeEventSequence.class));
     MySqlChangeEventSequence mysqlChangeEventSequence =
@@ -225,7 +225,7 @@ public void canCreateMySqlChangeEventSequenceFromShadowTableForDumpEvent() throw
 
     ChangeEventSequence changeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertThat(changeEventSequence, instanceOf(MySqlChangeEventSequence.class));
     MySqlChangeEventSequence mysqlChangeEventSequence =
@@ -249,7 +249,7 @@ public void cannotCreateMySqlChangeEventSequenceWhenMissingRecordInShadowTable()
 
     ChangeEventSequence mysqlChangeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertNull(mysqlChangeEventSequence);
   }
@@ -321,7 +321,7 @@ public void canCreateOracleChangeEventSequenceFromShadowTable() throws Exception
 
     ChangeEventSequence changeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertThat(changeEventSequence, instanceOf(OracleChangeEventSequence.class));
     OracleChangeEventSequence oracleChangeEventSequence =
@@ -347,7 +347,7 @@ public void canCreateOracleChangeEventSequenceFromShadowTableForDumpEvent() thro
 
     ChangeEventSequence changeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertThat(changeEventSequence, instanceOf(OracleChangeEventSequence.class));
     OracleChangeEventSequence oracleChangeEventSequence =
@@ -370,7 +370,7 @@ public void cannotCreateOracleChangeEventSequenceWhenMissingRecordInShadowTable(
 
     ChangeEventSequence oracleChangeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertNull(oracleChangeEventSequence);
   }
@@ -446,7 +446,7 @@ public void canCreatePostgresChangeEventSequenceFromShadowTable() throws Excepti
 
     ChangeEventSequence changeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertThat(changeEventSequence, instanceOf(PostgresChangeEventSequence.class));
     PostgresChangeEventSequence postgresChangeEventSequence =
@@ -474,7 +474,7 @@ public void canCreatePostgresChangeEventSequenceFromShadowTableForDumpEvent() th
 
     ChangeEventSequence changeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertThat(changeEventSequence, instanceOf(PostgresChangeEventSequence.class));
     PostgresChangeEventSequence postgresChangeEventSequence =
@@ -498,7 +498,7 @@ public void cannotCreatePostgresChangeEventSequenceWhenMissingRecordInShadowTabl
 
     ChangeEventSequence postgresChangeEventSequence =
         ChangeEventSequenceFactory.createChangeEventSequenceFromShadowTable(
-            mockTransaction, mockContext);
+            mockTransaction, mockContext, null, false);
 
     assertNull(postgresChangeEventSequence);
   }
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContextTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContextTest.java
index aabfbc1eba..2b547acb65 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContextTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventContextTest.java
@@ -63,6 +63,7 @@ public void canGenerateShadowTableMutation() throws Exception {
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.MYSQL_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
@@ -105,6 +106,7 @@ public void canGenerateShadowTableMutationForBackfillEvents() throws Exception {
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.MYSQL_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
@@ -145,6 +147,7 @@ public void canGenerateShadowTableMutationForBackfillEventsWithMissingSortOrderK
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.MYSQL_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequenceTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequenceTest.java
index 09d73e98e7..3aa8687a30 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequenceTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/MySqlChangeEventSequenceTest.java
@@ -15,8 +15,19 @@
  */
 package com.google.cloud.teleport.v2.templates.datastream;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.spanner.Struct;
+import com.google.cloud.spanner.TransactionContext;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import org.junit.Test;
 
 /** Unit tests for testing change event comparison logic in MySql database. */
@@ -68,4 +79,56 @@ public void canOrderDumpEventAndCDCEventAtSameTimestamp() {
     assertTrue(dumpEvent.compareTo(cdcEvent) < 0);
     assertTrue(cdcEvent.compareTo(dumpEvent) > 0);
   }
+
+  @Test
+  public void testCreateFromShadowTableWithUseSqlStatements() throws Exception {
+    // Arrange
+    TransactionContext transactionContext = mock(TransactionContext.class);
+    String shadowTable = "shadow_table1";
+    Ddl shadowTableDdl =
+        Ddl.builder()
+            .createTable("shadow_table1")
+            .column("id")
+            .int64()
+            .endColumn()
+            .column("timestamp")
+            .int64()
+            .endColumn()
+            .column("log_file")
+            .string()
+            .endColumn()
+            .column("log_position")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .build();
+    Key primaryKey = Key.of(1L);
+    boolean useSqlStatements = true;
+
+    // Mock the behavior of the transaction context
+    Struct mockRow = mock(Struct.class);
+    when(mockRow.getLong("id")).thenReturn(1L);
+    when(mockRow.getLong("timestamp")).thenReturn(1615159728L); // Updated to match new column
+    when(mockRow.getString("log_file")).thenReturn("file1.log");
+    when(mockRow.getLong("log_position")).thenReturn(2L); // Updated to match new column
+
+    ResultSet mockResultSet = mock(ResultSet.class);
+    when(mockResultSet.next()).thenReturn(true);
+    when(mockResultSet.getCurrentRowAsStruct()).thenReturn(mockRow);
+    when(transactionContext.executeQuery(any(Statement.class))).thenReturn(mockResultSet);
+
+    // Act
+    MySqlChangeEventSequence result =
+        MySqlChangeEventSequence.createFromShadowTable(
+            transactionContext, shadowTable, shadowTableDdl, primaryKey, useSqlStatements);
+
+    // Assert
+    assertNotNull(result);
+    assertEquals((Object) 1615159728L, result.getTimestamp()); // Updated to match new column
+    assertEquals("file1.log", result.getLogFile());
+    assertEquals((Object) 2L, result.getLogPosition());
+  }
 }
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContextTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContextTest.java
index 7dd0ddaaec..9eb39a40e6 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContextTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventContextTest.java
@@ -62,6 +62,7 @@ public void canGenerateShadowTableMutation() throws Exception {
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.ORACLE_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
@@ -99,6 +100,7 @@ public void canGenerateShadowTableMutationForBackfillEvent() throws Exception {
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.ORACLE_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
@@ -135,6 +137,7 @@ public void canGenerateShadowTableMutationForBackfillEventWithMissingKeys() thro
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.ORACLE_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequenceTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequenceTest.java
index 7676e2fe38..df1d15c893 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequenceTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/OracleChangeEventSequenceTest.java
@@ -15,8 +15,19 @@
  */
 package com.google.cloud.teleport.v2.templates.datastream;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.spanner.Struct;
+import com.google.cloud.spanner.TransactionContext;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import org.junit.Test;
 
 /** Unit tests for testing change event comparison logic in Oracle database. */
@@ -52,4 +63,51 @@ public void canOrderDumpEventAndCDCEventAtSameTimestamp() {
     assertTrue(dumpEvent.compareTo(cdcEvent) < 0);
     assertTrue(cdcEvent.compareTo(dumpEvent) > 0);
   }
+
+  @Test
+  public void testCreateFromShadowTableWithUseSqlStatements_Oracle() throws Exception {
+    // Arrange
+    TransactionContext transactionContext = mock(TransactionContext.class);
+    String shadowTable = "shadow_table_oracle";
+    Ddl shadowTableDdl =
+        Ddl.builder()
+            .createTable("shadow_table_oracle")
+            .column("id")
+            .int64()
+            .endColumn()
+            .column("timestamp")
+            .int64()
+            .endColumn()
+            .column("scn")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .build();
+    Key primaryKey = Key.of(1L);
+    boolean useSqlStatements = true;
+
+    // Mock the behavior of the transaction context
+    Struct mockRow = mock(Struct.class);
+    when(mockRow.getLong("id")).thenReturn(1L);
+    when(mockRow.getLong("timestamp")).thenReturn(1615159728L);
+    when(mockRow.getLong("scn")).thenReturn(100L);
+
+    ResultSet mockResultSet = mock(ResultSet.class);
+    when(mockResultSet.next()).thenReturn(true);
+    when(mockResultSet.getCurrentRowAsStruct()).thenReturn(mockRow);
+    when(transactionContext.executeQuery(any(Statement.class))).thenReturn(mockResultSet);
+
+    // Act
+    OracleChangeEventSequence result =
+        OracleChangeEventSequence.createFromShadowTable(
+            transactionContext, shadowTable, shadowTableDdl, primaryKey, useSqlStatements);
+
+    // Assert
+    assertNotNull(result);
+    assertEquals((Object) 1615159728L, result.getTimestamp());
+    assertEquals((Object) 100L, result.getSCN());
+  }
 }
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContextTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContextTest.java
index 23b0366be1..9f1bda5fe7 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContextTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventContextTest.java
@@ -62,6 +62,7 @@ public void canGenerateShadowTableMutation() throws Exception {
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.POSTGRES_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
@@ -99,6 +100,7 @@ public void canGenerateShadowTableMutationForBackfillEvent() throws Exception {
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.POSTGRES_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
@@ -135,6 +137,7 @@ public void canGenerateShadowTableMutationForBackfillEventWithMissingKeys() thro
         ChangeEventContextFactory.createChangeEventContext(
             getJsonNode(changeEvent.toString()),
             ddl,
+            ddl,
             "shadow_",
             DatastreamConstants.POSTGRES_SOURCE_TYPE);
     Mutation shadowMutation = changeEventContext.getShadowTableMutation();
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequenceTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequenceTest.java
index 861035a7a2..ed3a025dc2 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequenceTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/PostgresChangeEventSequenceTest.java
@@ -16,9 +16,19 @@
 package com.google.cloud.teleport.v2.templates.datastream;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.spanner.Struct;
+import com.google.cloud.spanner.TransactionContext;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
 import org.junit.Test;
 
 /** Unit tests for testing change event comparison logic in Postgres database. */
@@ -102,4 +112,51 @@ public void canOrderDumpEventAndCDCEventAtSameTimestamp() {
     assertTrue(dumpEvent.compareTo(cdcEvent) < 0);
     assertTrue(cdcEvent.compareTo(dumpEvent) > 0);
   }
+
+  @Test
+  public void testCreateFromShadowTableWithUseSqlStatements_Postgres() throws Exception {
+    // Arrange
+    TransactionContext transactionContext = mock(TransactionContext.class);
+    String shadowTable = "shadow_table_postgres";
+    Ddl shadowTableDdl =
+        Ddl.builder()
+            .createTable("shadow_table_postgres")
+            .column("id")
+            .int64()
+            .endColumn()
+            .column("timestamp")
+            .int64()
+            .endColumn()
+            .column("lsn")
+            .string()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .build();
+    Key primaryKey = Key.of(1L);
+    boolean useSqlStatements = true;
+
+    // Mock the behavior of the transaction context
+    Struct mockRow = mock(Struct.class);
+    when(mockRow.getLong("id")).thenReturn(1L);
+    when(mockRow.getLong("timestamp")).thenReturn(1615159728L);
+    when(mockRow.getString("lsn")).thenReturn("0/123456");
+
+    ResultSet mockResultSet = mock(ResultSet.class);
+    when(mockResultSet.next()).thenReturn(true);
+    when(mockResultSet.getCurrentRowAsStruct()).thenReturn(mockRow);
+    when(transactionContext.executeQuery(any(Statement.class))).thenReturn(mockResultSet);
+
+    // Act
+    PostgresChangeEventSequence result =
+        PostgresChangeEventSequence.createFromShadowTable(
+            transactionContext, shadowTable, shadowTableDdl, primaryKey, useSqlStatements);
+
+    // Assert
+    assertNotNull(result);
+    assertEquals((Object) 1615159728L, result.getTimestamp());
+    assertEquals("0/123456", result.getLSN());
+  }
 }
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtilsTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtilsTest.java
new file mode 100644
index 0000000000..268d6a2a62
--- /dev/null
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/ShadowTableReadUtilsTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates.datastream;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.cloud.ByteArray;
+import com.google.cloud.Date;
+import com.google.cloud.Timestamp;
+import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.spanner.Value;
+import com.google.cloud.teleport.v2.spanner.ddl.Ddl;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ShadowTableReadUtilsTest {
+  private Ddl ddl;
+  private static final String SHADOW_TABLE = "shadow_test_table";
+  private static final List<String> READ_COLUMNS =
+      Arrays.asList("bool_field", "string_field", "version");
+
+  @Before
+  public void setUp() {
+    ddl =
+        Ddl.builder()
+            .createTable("shadow_test_table")
+            // Primary key columns - one of each type
+            .column("bool_field")
+            .bool()
+            .endColumn()
+            .column("int64_field")
+            .int64()
+            .endColumn()
+            .column("float64_field")
+            .float64()
+            .endColumn()
+            .column("numeric_field")
+            .numeric()
+            .endColumn()
+            .column("string_field")
+            .string()
+            .max()
+            .endColumn()
+            .column("bytes_field")
+            .bytes()
+            .max()
+            .endColumn() // BYTES
+            .column("timestamp_field")
+            .timestamp()
+            .endColumn() // TIMESTAMP
+            .column("date_field")
+            .date()
+            .endColumn() // DATE
+            // Additional non-PK columns
+            .column("version")
+            .int64()
+            .endColumn()
+            .column("extra_field")
+            .string()
+            .max()
+            .endColumn()
+            .primaryKey()
+            .asc("bool_field")
+            .asc("int64_field")
+            .asc("float64_field")
+            .asc("numeric_field")
+            .asc("string_field")
+            .asc("bytes_field")
+            .asc("timestamp_field")
+            .asc("date_field")
+            .end()
+            .endTable()
+            .build();
+  }
+
+  @Test
+  public void testGenerateShadowTableReadSQL_AllTypes() {
+    boolean boolValue = true;
+    long int64Value = 123L;
+    double float64Value = 123.45;
+    BigDecimal numericValue = new BigDecimal("123.456");
+    String stringValue = "test_string";
+    ByteArray bytesValue = ByteArray.copyFrom("test_bytes");
+    Timestamp timestampValue = Timestamp.ofTimeMicroseconds(1234567);
+    Date dateValue = Date.fromYearMonthDay(2024, 1, 1);
+
+    Key primaryKey =
+        Key.of(
+            boolValue, // BOOL
+            int64Value, // INT64
+            float64Value, // FLOAT64
+            numericValue, // NUMERIC
+            stringValue, // STRING
+            bytesValue, // BYTES
+            timestampValue, // TIMESTAMP
+            dateValue // DATE
+            );
+
+    Statement stmt =
+        ShadowTableReadUtils.generateShadowTableReadSQL(
+            SHADOW_TABLE, READ_COLUMNS, primaryKey, ddl);
+
+    String expectedSql =
+        "@{LOCK_SCANNED_RANGES=exclusive} SELECT bool_field, string_field, version "
+            + "FROM shadow_test_table WHERE bool_field=@bool_field AND int64_field=@int64_field AND "
+            + "float64_field=@float64_field AND numeric_field=@numeric_field AND "
+            + "string_field=@string_field AND bytes_field=@bytes_field AND "
+            + "timestamp_field=@timestamp_field AND date_field=@date_field";
+
+    assertEquals(expectedSql, stmt.getSql());
+
+    Map<String, Value> params = stmt.getParameters();
+
+    assertEquals(Value.bool(boolValue), params.get("bool_field"));
+    assertEquals(Value.int64(int64Value), params.get("int64_field"));
+    assertEquals(Value.float64(float64Value), params.get("float64_field"));
+    assertEquals(Value.numeric(numericValue), params.get("numeric_field"));
+    assertEquals(Value.string(stringValue), params.get("string_field"));
+    assertEquals(Value.bytes(bytesValue), params.get("bytes_field"));
+    assertEquals(Value.timestamp(timestampValue), params.get("timestamp_field"));
+    assertEquals(Value.date(dateValue), params.get("date_field"));
+  }
+}
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaIntegrationTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaIntegrationTest.java
index d43f7e38e0..45c98582af 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaIntegrationTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaIntegrationTest.java
@@ -112,7 +112,7 @@ public void canCreateShadowTablesForAllDataTables() throws Exception {
     testPipeline.apply(
         "Process Information Schema",
         new ProcessInformationSchema(
-            sourceConfig, /* shouldCreateShadowTables= */ true, "shadow", "oracle"));
+            sourceConfig, sourceConfig, /* shouldCreateShadowTables= */ true, "shadow", "oracle"));
     PipelineResult testResult = testPipeline.run();
     testResult.waitUntilFinish();
     Ddl finalDdl = readDdl(testDb);
@@ -142,7 +142,7 @@ public void canFlagProtectShadowTableCreation() throws Exception {
     testPipeline.apply(
         "Read Information Schema",
         new ProcessInformationSchema(
-            sourceConfig, /* shouldCreateShadowTables= */ false, "shadow", "oracle"));
+            sourceConfig, sourceConfig, /* shouldCreateShadowTables= */ false, "shadow", "oracle"));
     PipelineResult testResult = testPipeline.run();
     testResult.waitUntilFinish();
     Ddl finalDdl = readDdl(testDb);
@@ -176,7 +176,7 @@ public void canCreateMissingShadowTables() throws Exception {
     testPipeline.apply(
         "Process Information Schema",
         new ProcessInformationSchema(
-            sourceConfig, /* shouldCreateShadowTables= */ true, "shadow", "oracle"));
+            sourceConfig, sourceConfig, /* shouldCreateShadowTables= */ true, "shadow", "oracle"));
     PipelineResult testResult = testPipeline.run();
     testResult.waitUntilFinish();
     Ddl finalDdl = readDdl(testDb);
diff --git a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaTest.java b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaTest.java
index 03f0c0d26d..3b36c4be99 100644
--- a/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaTest.java
+++ b/v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/spanner/ProcessInformationSchemaTest.java
@@ -36,6 +36,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.beam.sdk.io.gcp.spanner.SpannerAccessor;
 import org.apache.beam.sdk.io.gcp.spanner.SpannerConfig;
 import org.apache.beam.sdk.options.ValueProvider;
@@ -371,7 +372,11 @@ public void canListShadowTablesInDdl() throws Exception {
     SpannerConfig spannerConfig = mock(SpannerConfig.class);
     ProcessInformationSchema.ProcessInformationSchemaFn processInformationSchema =
         new ProcessInformationSchema.ProcessInformationSchemaFn(
-            spannerConfig, /* shouldCreateShadowTables= */ true, "shadow_", "oracle");
+            spannerConfig,
+            spannerConfig,
+            /* shouldCreateShadowTables= */ true,
+            "shadow_",
+            "oracle");
     Set<String> shadowTables =
         processInformationSchema.getShadowTablesInDdl(getTestDdlWithGSqlDialect());
     assertThat(shadowTables, is(new HashSet<String>(Arrays.asList("shadow_Users"))));
@@ -382,12 +387,34 @@ public void canListDataTablesWithNoShadowTablesInDdl() throws Exception {
     SpannerConfig spannerConfig = mock(SpannerConfig.class);
     ProcessInformationSchema.ProcessInformationSchemaFn processInformationSchema =
         new ProcessInformationSchema.ProcessInformationSchemaFn(
-            spannerConfig, /* shouldCreateShadowTables= */ true, "shadow_", "oracle");
+            spannerConfig,
+            spannerConfig,
+            /* shouldCreateShadowTables= */ true,
+            "shadow_",
+            "oracle");
     List<String> dataTablesWithNoShadowTables =
-        processInformationSchema.getDataTablesWithNoShadowTables(getTestDdlWithGSqlDialect());
+        processInformationSchema.getDataTablesWithNoShadowTables(
+            getTestDdlWithGSqlDialect(), getTestDdlWithGSqlDialect());
     assertThat(dataTablesWithNoShadowTables, is(Arrays.asList("Users_interleaved")));
   }
 
+  @Test
+  public void canListDataTablesWithNoShadowTables_separateDatabase() {
+    SpannerConfig spannerConfig = mock(SpannerConfig.class);
+    ProcessInformationSchema.ProcessInformationSchemaFn processInformationSchema =
+        new ProcessInformationSchema.ProcessInformationSchemaFn(
+            spannerConfig,
+            spannerConfig,
+            /* shouldCreateShadowTables= */ true,
+            "shadow_",
+            "oracle");
+
+    List<String> dataTablesWithNoShadowTables =
+        processInformationSchema.getDataTablesWithNoShadowTables(
+            getMiniMainDdl(), getMiniShadowDdl());
+    assertThat(dataTablesWithNoShadowTables, is(Arrays.asList("table2")));
+  }
+
   @Test
   public void canCreateShadowTablesInSpanner() throws Exception {
     SpannerConfig spannerConfig = mock(SpannerConfig.class);
@@ -397,9 +424,9 @@ public void canCreateShadowTablesInSpanner() throws Exception {
 
     ProcessInformationSchema.ProcessInformationSchemaFn processInformationSchema =
         new ProcessInformationSchema.ProcessInformationSchemaFn(
-            spannerConfig, /* shouldCreateShadowTables= */ true, "shadow_", "mysql");
+            spannerConfig, spannerConfig, /* shouldCreateShadowTables= */ true, "shadow_", "mysql");
     processInformationSchema.setDialect(Dialect.GOOGLE_STANDARD_SQL);
-    processInformationSchema.setSpannerAccessor(spannerAccessor);
+    processInformationSchema.setshadowTableSpannerAccessor(spannerAccessor);
 
     // Mock method calls
     when(databaseAdminClient.updateDatabaseDdl(anyString(), anyString(), any(), any()))
@@ -411,7 +438,8 @@ public void canCreateShadowTablesInSpanner() throws Exception {
     when(spannerConfig.getInstanceId()).thenReturn(sampleValueProvider);
     when(spannerConfig.getDatabaseId()).thenReturn(sampleValueProvider);
 
-    processInformationSchema.createShadowTablesInSpanner(getTestDdlWithGSqlDialect());
+    processInformationSchema.createShadowTablesInSpanner(
+        getTestDdlWithGSqlDialect(), getTestDdlWithGSqlDialect());
 
     List<String> createShadowTableStatements =
         Collections.singletonList(
@@ -437,4 +465,206 @@ public void canCreateShadowTablesInSpanner() throws Exception {
             eq("sample-value"), eq("sample-value"), eq(createShadowTableStatements), eq(null));
     verify(operationFuture, times(1)).get(anyLong(), any());
   }
+
+  @Test
+  public void canCreateShadowTablesInSpanner_separateDb() throws Exception {
+    SpannerConfig spannerConfig = mock(SpannerConfig.class);
+    SpannerConfig shadowSpannerConfig = mock(SpannerConfig.class);
+    SpannerAccessor shadowSpannerAccessor = mock(SpannerAccessor.class);
+    DatabaseAdminClient databaseAdminClient = mock(DatabaseAdminClient.class);
+    OperationFuture<Void, UpdateDatabaseDdlMetadata> operationFuture = mock(OperationFuture.class);
+
+    ProcessInformationSchema.ProcessInformationSchemaFn processInformationSchema =
+        new ProcessInformationSchema.ProcessInformationSchemaFn(
+            spannerConfig,
+            shadowSpannerConfig,
+            /* shouldCreateShadowTables= */ true,
+            "shadow_",
+            "mysql");
+    processInformationSchema.setDialect(Dialect.GOOGLE_STANDARD_SQL);
+    processInformationSchema.setshadowTableSpannerAccessor(shadowSpannerAccessor);
+
+    // Mock method calls
+    when(databaseAdminClient.updateDatabaseDdl(anyString(), anyString(), any(), any()))
+        .thenReturn(operationFuture);
+    when(shadowSpannerAccessor.getDatabaseAdminClient()).thenReturn(databaseAdminClient);
+    when(operationFuture.get(anyLong(), any())).thenReturn(null);
+    ValueProvider<String> sampleValueProvider =
+        ValueProvider.StaticValueProvider.of("sample-value");
+    when(shadowSpannerConfig.getInstanceId()).thenReturn(sampleValueProvider);
+    when(shadowSpannerConfig.getDatabaseId()).thenReturn(sampleValueProvider);
+
+    processInformationSchema.createShadowTablesInSpanner(getMiniMainDdl(), getMiniShadowDdl());
+
+    List<String> createShadowTableStatements =
+        Collections.singletonList(
+            "CREATE TABLE `shadow_table2` (\n"
+                + "\t`id`                                    INT64,\n"
+                + "\t`timestamp`                             INT64,\n"
+                + "\t`log_file`                              STRING(MAX),\n"
+                + "\t`log_position`                          INT64,\n"
+                + ") PRIMARY KEY (`id` ASC)");
+    // Verify method calls
+    verify(databaseAdminClient, times(1))
+        .updateDatabaseDdl(
+            eq("sample-value"), eq("sample-value"), eq(createShadowTableStatements), eq(null));
+    verify(operationFuture, times(1)).get(anyLong(), any());
+  }
+
+  private Ddl getMiniShadowDdl() {
+    // Create shadow DDL with 1 shadow table
+    return Ddl.builder()
+        .createTable("shadow_table1")
+        .column("id")
+        .int64()
+        .endColumn()
+        .primaryKey()
+        .asc("id")
+        .end()
+        .endTable()
+        .build();
+  }
+
+  private Ddl getMiniMainDdl() {
+    // Create main DDL with 2 tables
+    return Ddl.builder()
+        .createTable("table1")
+        .column("id")
+        .int64()
+        .endColumn()
+        .primaryKey()
+        .asc("id")
+        .end()
+        .endTable()
+        .createTable("table2")
+        .column("id")
+        .int64()
+        .endColumn()
+        .primaryKey()
+        .asc("id")
+        .end()
+        .endTable()
+        .build();
+  }
+
+  @Test
+  public void testCleanupDdl_sameDatabaseScenario() {
+    SpannerConfig spannerConfig = mock(SpannerConfig.class);
+    ProcessInformationSchema.ProcessInformationSchemaFn processInformationSchema =
+        new ProcessInformationSchema.ProcessInformationSchemaFn(
+            spannerConfig, spannerConfig, true, "shadow_", "mysql");
+    processInformationSchema.setDialect(Dialect.GOOGLE_STANDARD_SQL);
+
+    // Create test DDL with both main and shadow tables
+    Ddl testDdl =
+        Ddl.builder()
+            .createTable("users")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .createTable("customers")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .createTable("shadow_users")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .createTable("shadow_customers")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .build();
+
+    // Test cleanup for main DDL (should only keep non-shadow tables)
+    Ddl cleanedMainDdl = processInformationSchema.cleanupDdl(testDdl, "shadow_", true);
+    assertThat(
+        cleanedMainDdl.allTables().stream().map(t -> t.name()).collect(Collectors.toSet()),
+        is(new HashSet<>(Arrays.asList("users", "customers"))));
+
+    // Test cleanup for shadow DDL (should only keep shadow tables)
+    Ddl cleanedShadowDdl = processInformationSchema.cleanupDdl(testDdl, "shadow_", false);
+    assertThat(
+        cleanedShadowDdl.allTables().stream().map(t -> t.name()).collect(Collectors.toSet()),
+        is(new HashSet<>(Arrays.asList("shadow_users", "shadow_customers"))));
+  }
+
+  @Test
+  public void testCleanupDdl_differentDatabaseScenario() {
+    SpannerConfig spannerConfig = mock(SpannerConfig.class);
+    ProcessInformationSchema.ProcessInformationSchemaFn processInformationSchema =
+        new ProcessInformationSchema.ProcessInformationSchemaFn(
+            spannerConfig, spannerConfig, true, "shadow_", "mysql");
+    processInformationSchema.setDialect(Dialect.GOOGLE_STANDARD_SQL);
+
+    // Create main DDL with an extra shadow table that shouldn't be there
+    Ddl mainDdl =
+        Ddl.builder()
+            .createTable("users")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .createTable("shadow_unexpected")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .build();
+
+    // Create shadow DDL with an extra non-shadow table that shouldn't be there
+    Ddl shadowDdl =
+        Ddl.builder()
+            .createTable("shadow_users")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .createTable("unexpected_table")
+            .column("id")
+            .int64()
+            .endColumn()
+            .primaryKey()
+            .asc("id")
+            .end()
+            .endTable()
+            .build();
+
+    // Test cleanup for main DDL (should remove the unexpected shadow table)
+    Ddl cleanedMainDdl = processInformationSchema.cleanupDdl(mainDdl, "shadow_", true);
+    assertThat(
+        cleanedMainDdl.allTables().stream().map(t -> t.name()).collect(Collectors.toSet()),
+        is(new HashSet<>(Collections.singletonList("users"))));
+
+    // Test cleanup for shadow DDL (should remove the unexpected non-shadow table)
+    Ddl cleanedShadowDdl = processInformationSchema.cleanupDdl(shadowDdl, "shadow_", false);
+    assertThat(
+        cleanedShadowDdl.allTables().stream().map(t -> t.name()).collect(Collectors.toSet()),
+        is(new HashSet<>(Collections.singletonList("shadow_users"))));
+  }
 }

From 409a5cc2893330aed4fbfc6dd536e68d959807fd Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Tue, 21 Jan 2025 23:35:53 -0500
Subject: [PATCH 05/56] Set maven version requirement to 3.6.3 (#2142)

In alignment with https://github.com/apache/maven-plugin-tools/blob/maven-plugin-tools-3.15.1/maven-plugin-plugin/pom.xml#L38
---
 plugins/templates-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/templates-maven-plugin/pom.xml b/plugins/templates-maven-plugin/pom.xml
index 214373a3b2..900e3f4a30 100644
--- a/plugins/templates-maven-plugin/pom.xml
+++ b/plugins/templates-maven-plugin/pom.xml
@@ -38,7 +38,7 @@
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <maven.version>3.9.9</maven.version>
+    <maven.version>3.6.3</maven.version>
     <dataflow.api.version>0.7.6</dataflow.api.version>
     <mojo.executor.version>2.4.0</mojo.executor.version>
     <maven-plugin.version>3.15.1</maven-plugin.version>

From 6e01aae7777d496be1241bb30e12dace05d2da02 Mon Sep 17 00:00:00 2001
From: Florent Biville <445792+fbiville@users.noreply.github.com>
Date: Wed, 22 Jan 2025 16:35:45 +0100
Subject: [PATCH 06/56] feat: bump to Neo4j driver v5 (#2136)

---
 v2/googlecloud-to-neo4j/pom.xml                              | 5 +++++
 .../teleport/v2/neo4j/database/Neo4jConnectionTest.java      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/v2/googlecloud-to-neo4j/pom.xml b/v2/googlecloud-to-neo4j/pom.xml
index 1f980ea0b6..684fb2e53c 100644
--- a/v2/googlecloud-to-neo4j/pom.xml
+++ b/v2/googlecloud-to-neo4j/pom.xml
@@ -33,6 +33,11 @@
         <artifactId>snakeyaml</artifactId>
         <version>1.33</version>
       </dependency>
+      <dependency>
+        <groupId>org.neo4j.driver</groupId>
+        <artifactId>neo4j-java-driver</artifactId>
+        <version>5.27.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/v2/googlecloud-to-neo4j/src/test/java/com/google/cloud/teleport/v2/neo4j/database/Neo4jConnectionTest.java b/v2/googlecloud-to-neo4j/src/test/java/com/google/cloud/teleport/v2/neo4j/database/Neo4jConnectionTest.java
index ee3c9e8b9b..c1e4d73d59 100644
--- a/v2/googlecloud-to-neo4j/src/test/java/com/google/cloud/teleport/v2/neo4j/database/Neo4jConnectionTest.java
+++ b/v2/googlecloud-to-neo4j/src/test/java/com/google/cloud/teleport/v2/neo4j/database/Neo4jConnectionTest.java
@@ -41,6 +41,7 @@
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Result;
 import org.neo4j.driver.Session;
+import org.neo4j.driver.SessionConfig;
 import org.neo4j.driver.Value;
 import org.neo4j.driver.Values;
 import org.neo4j.driver.internal.InternalRecord;
@@ -59,7 +60,7 @@ public class Neo4jConnectionTest {
   @Before
   public void setUp() {
     when(session.run(anyString(), anyMap(), any())).thenReturn(result);
-    when(driver.session(any())).thenReturn(session);
+    when(driver.session(any(SessionConfig.class))).thenReturn(session);
     neo4jConnection = new Neo4jConnection("a-database", () -> driver);
   }
 

From 6638feb47968847d446201c1cd2c289756cdaf2d Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Wed, 22 Jan 2025 13:40:14 -0500
Subject: [PATCH 07/56] Bump Beam to 2.62.0 (#2143)

* Bump Beam to 2.62.0

* remove rc validation leftover (staging repo ref)
---
 pom.xml                                       |  10 +-
 .../job-builder-server/requirements.txt       | 203 +++++++++---------
 .../python/streaming-llm/requirements.txt     |  63 +++---
 .../python/word-count-python/requirements.txt | 117 +++++++---
 .../python/yaml-template/requirements.txt     | 203 +++++++++---------
 .../src/main/resources/requirements.txt       | 203 +++++++++---------
 .../src/main/resources/requirements.txt       | 203 +++++++++---------
 .../src/main/resources/requirements.txt       | 203 +++++++++---------
 .../src/main/resources/requirements.txt       | 203 +++++++++---------
 .../src/main/resources/requirements.txt       | 203 +++++++++---------
 10 files changed, 835 insertions(+), 776 deletions(-)

diff --git a/pom.xml b/pom.xml
index 659b12343d..2ea969ac7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,8 +48,8 @@
     <jacoco.version>0.8.8</jacoco.version>
 
     <!-- Beam and linked versions -->
-    <beam.version>2.61.0</beam.version>
-    <beam-python.version>2.61.0</beam-python.version>
+    <beam.version>2.62.0</beam.version>
+    <beam-python.version>2.62.0</beam-python.version>
     <beam-maven-repo></beam-maven-repo>
 
     <!-- Common dependency versions -->
@@ -66,7 +66,7 @@
     <failsafe.version>3.3.0</failsafe.version>
     <grpc.gen.version>1.13.1</grpc.gen.version>
     <guava.version>32.0.1-jre</guava.version>
-    <hadoop.version>3.4.0</hadoop.version>
+    <hadoop.version>3.4.1</hadoop.version>
     <hamcrest.version>2.1</hamcrest.version>
     <hbase.client.version>2.5.3-hadoop3</hbase.client.version>
     <mockito.version>4.11.0</mockito.version>
@@ -77,14 +77,14 @@
     <junit.version>4.13.2</junit.version>
     <re2j.version>1.6</re2j.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <snakeyaml.version>2.0</snakeyaml.version>
+    <snakeyaml.version>2.2</snakeyaml.version>
     <snappy.version>1.1.10.4</snappy.version>
     <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
     <surefire.version>2.21.0</surefire.version>
     <truth.version>1.1.5</truth.version>
 
     <!-- TODO(https://github.com/apache/beam/issues/30700): Remove once Beam gets the latest version of gax. -->
-    <gax.version>2.48.0</gax.version>
+    <gax.version>2.55.0</gax.version>
 
     <!-- Drop pinned version once maven-dependency-plugin gets past plexus-archiver 4.8.0 -->
     <plexus-archiver.version>4.8.0</plexus-archiver.version>
diff --git a/python/src/main/python/job-builder-server/requirements.txt b/python/src/main/python/job-builder-server/requirements.txt
index 4095f3e5bc..ec9e39172c 100644
--- a/python/src/main/python/job-builder-server/requirements.txt
+++ b/python/src/main/python/job-builder-server/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[dataframe,gcp,test,yaml]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[dataframe,gcp,test,yaml]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_yaml_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1072,74 +1066,79 @@ protobuf==4.25.5 \
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-psycopg2-binary==2.9.10 \
-    --hash=sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff \
-    --hash=sha256:056470c3dc57904bbf63d6f534988bafc4e970ffd50f6271fc4ee7daad9498a5 \
-    --hash=sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f \
-    --hash=sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5 \
-    --hash=sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0 \
-    --hash=sha256:19721ac03892001ee8fdd11507e6a2e01f4e37014def96379411ca99d78aeb2c \
-    --hash=sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c \
-    --hash=sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341 \
-    --hash=sha256:230eeae2d71594103cd5b93fd29d1ace6420d0b86f4778739cb1a5a32f607d1f \
-    --hash=sha256:245159e7ab20a71d989da00f280ca57da7641fa2cdcf71749c193cea540a74f7 \
-    --hash=sha256:26540d4a9a4e2b096f1ff9cce51253d0504dca5a85872c7f7be23be5a53eb18d \
-    --hash=sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007 \
-    --hash=sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92 \
-    --hash=sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb \
-    --hash=sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5 \
-    --hash=sha256:30e34c4e97964805f715206c7b789d54a78b70f3ff19fbe590104b71c45600e5 \
-    --hash=sha256:3216ccf953b3f267691c90c6fe742e45d890d8272326b4a8b20850a03d05b7b8 \
-    --hash=sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1 \
-    --hash=sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68 \
-    --hash=sha256:3abb691ff9e57d4a93355f60d4f4c1dd2d68326c968e7db17ea96df3c023ef73 \
-    --hash=sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1 \
-    --hash=sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53 \
-    --hash=sha256:3c4ded1a24b20021ebe677b7b08ad10bf09aac197d6943bfe6fec70ac4e4690d \
-    --hash=sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906 \
-    --hash=sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0 \
-    --hash=sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2 \
-    --hash=sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a \
-    --hash=sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b \
-    --hash=sha256:5c370b1e4975df846b0277b4deba86419ca77dbc25047f535b0bb03d1a544d44 \
-    --hash=sha256:6b269105e59ac96aba877c1707c600ae55711d9dcd3fc4b5012e4af68e30c648 \
-    --hash=sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7 \
-    --hash=sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f \
-    --hash=sha256:73aa0e31fa4bb82578f3a6c74a73c273367727de397a7a0f07bd83cbea696baa \
-    --hash=sha256:7559bce4b505762d737172556a4e6ea8a9998ecac1e39b5233465093e8cee697 \
-    --hash=sha256:79625966e176dc97ddabc142351e0409e28acf4660b88d1cf6adb876d20c490d \
-    --hash=sha256:7a813c8bdbaaaab1f078014b9b0b13f5de757e2b5d9be6403639b298a04d218b \
-    --hash=sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526 \
-    --hash=sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4 \
-    --hash=sha256:7f5d859928e635fa3ce3477704acee0f667b3a3d3e4bb109f2b18d4005f38287 \
-    --hash=sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e \
-    --hash=sha256:8608c078134f0b3cbd9f89b34bd60a943b23fd33cc5f065e8d5f840061bd0673 \
-    --hash=sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0 \
-    --hash=sha256:8aabf1c1a04584c168984ac678a668094d831f152859d06e055288fa515e4d30 \
-    --hash=sha256:8aecc5e80c63f7459a1a2ab2c64df952051df196294d9f739933a9f6687e86b3 \
-    --hash=sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e \
-    --hash=sha256:8de718c0e1c4b982a54b41779667242bc630b2197948405b7bd8ce16bcecac92 \
-    --hash=sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a \
-    --hash=sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c \
-    --hash=sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8 \
-    --hash=sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909 \
-    --hash=sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47 \
-    --hash=sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864 \
-    --hash=sha256:d00924255d7fc916ef66e4bf22f354a940c67179ad3fd7067d7a0a9c84d2fbfc \
-    --hash=sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00 \
-    --hash=sha256:e217ce4d37667df0bc1c397fdcd8de5e81018ef305aed9415c3b093faaeb10fb \
-    --hash=sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539 \
-    --hash=sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b \
-    --hash=sha256:e8b58f0a96e7a1e341fc894f62c1177a7c83febebb5ff9123b579418fdc8a481 \
-    --hash=sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5 \
-    --hash=sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4 \
-    --hash=sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64 \
-    --hash=sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392 \
-    --hash=sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4 \
-    --hash=sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1 \
-    --hash=sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1 \
-    --hash=sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567 \
-    --hash=sha256:ffe8ed017e4ed70f68b7b371d84b7d4a790368db9203dfc2d222febd3a9c8863
+psycopg2-binary==2.9.9 \
+    --hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \
+    --hash=sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77 \
+    --hash=sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e \
+    --hash=sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84 \
+    --hash=sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3 \
+    --hash=sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2 \
+    --hash=sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67 \
+    --hash=sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876 \
+    --hash=sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152 \
+    --hash=sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f \
+    --hash=sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a \
+    --hash=sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6 \
+    --hash=sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503 \
+    --hash=sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f \
+    --hash=sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493 \
+    --hash=sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996 \
+    --hash=sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f \
+    --hash=sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e \
+    --hash=sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59 \
+    --hash=sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94 \
+    --hash=sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7 \
+    --hash=sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682 \
+    --hash=sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420 \
+    --hash=sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae \
+    --hash=sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291 \
+    --hash=sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe \
+    --hash=sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980 \
+    --hash=sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93 \
+    --hash=sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692 \
+    --hash=sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119 \
+    --hash=sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716 \
+    --hash=sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472 \
+    --hash=sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b \
+    --hash=sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2 \
+    --hash=sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc \
+    --hash=sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c \
+    --hash=sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5 \
+    --hash=sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab \
+    --hash=sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984 \
+    --hash=sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9 \
+    --hash=sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf \
+    --hash=sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0 \
+    --hash=sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f \
+    --hash=sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212 \
+    --hash=sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb \
+    --hash=sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be \
+    --hash=sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90 \
+    --hash=sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041 \
+    --hash=sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7 \
+    --hash=sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860 \
+    --hash=sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d \
+    --hash=sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245 \
+    --hash=sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27 \
+    --hash=sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417 \
+    --hash=sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359 \
+    --hash=sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202 \
+    --hash=sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0 \
+    --hash=sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7 \
+    --hash=sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba \
+    --hash=sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1 \
+    --hash=sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd \
+    --hash=sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07 \
+    --hash=sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98 \
+    --hash=sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55 \
+    --hash=sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d \
+    --hash=sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972 \
+    --hash=sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f \
+    --hash=sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e \
+    --hash=sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26 \
+    --hash=sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957 \
+    --hash=sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53 \
+    --hash=sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52
     # via apache-beam
 pyarrow==16.1.0 \
     --hash=sha256:06ebccb6f8cb7357de85f60d5da50e83507954af617d7b05f48af1621d331c9a \
@@ -1820,7 +1819,9 @@ six==1.16.0 \
 sortedcontainers==2.4.0 \
     --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
     --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
-    # via hypothesis
+    # via
+    #   apache-beam
+    #   hypothesis
 sqlalchemy==2.0.36 \
     --hash=sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763 \
     --hash=sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436 \
diff --git a/python/src/main/python/streaming-llm/requirements.txt b/python/src/main/python/streaming-llm/requirements.txt
index f1e5f9da90..0af80d21db 100644
--- a/python/src/main/python/streaming-llm/requirements.txt
+++ b/python/src/main/python/streaming-llm/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[gcp]==2.60.0 \
-    --hash=sha256:02239d5290f79bf22c651d15d8e8f667da19dcca32922a7cd0acb5cfd78c03ac \
-    --hash=sha256:0764d1f83b6010e1712d783c5c9bd46c4aa1e8064f00480eb53ef59a64573adb \
-    --hash=sha256:0e834fc077111ad86610f0a69e4ea76f58874f557b9fc08a13476ab03689a0e6 \
-    --hash=sha256:116950f1cf4f5e3769a5f6b5b97b579c7bea71a59dfc82a335d7d8765ca0c655 \
-    --hash=sha256:1c7a90cebddd5175077bab59cfb1909e5c8a5341c59ea2a7d7622ecd3ac1d829 \
-    --hash=sha256:269d85a44f32fd279d80b27b0ef8a20e38d2715e5c24d009d90363c4b6b54c86 \
-    --hash=sha256:29294cb3b9033d92c0f1ef4474f42ec45c8dc3eefdb89f6d30a2337ca43452a1 \
-    --hash=sha256:3311cd1ef7848df444c75a2f502bd04b40f6e565c7ca0044da8b9362d4bdca73 \
-    --hash=sha256:39cae208c16929a8bd2b6d31011de553dd458e88acfee9649dbd72c1617d9c39 \
-    --hash=sha256:4002abe6c0b872dfba99d4785211d15ec368a0c6f67fe989db5342fba022e260 \
-    --hash=sha256:55e4cbf0f8fc2a759addfd6e58913383c54631c933ee04e280aad058f6cf744c \
-    --hash=sha256:6324eb39bfaabb4dab6e4210f95d84811c88dcad6577fa6e6e5cc560ba18bea7 \
-    --hash=sha256:6405ad1612b232acfad2b8def68db7d54cd4b16bd4fdca121bc8bd03c6263fe9 \
-    --hash=sha256:6678d5c9408be842a7f87842925a5468423bb3eed8182c99d34a95541ad0d2b2 \
-    --hash=sha256:7baea8eb6b021d794552316e8cdccb681d5a7a811727b00fb9d51683e03f3a7c \
-    --hash=sha256:8d8e38068783ad3ecab0e2beaab389ff4796375604c9104f7b1e19945e496970 \
-    --hash=sha256:9b33a4a168a895dc5c18b1a4d2b9176f76cb3109bcc8c68cce3573f72e490e6d \
-    --hash=sha256:a97f302b434df44d6f3dcb241c475ebff445f34459425d7f3bbb982011afad81 \
-    --hash=sha256:abbc1c7b23e340c5091b791545079c14d32ecae0cb7c840f762e9abe6540fe2b \
-    --hash=sha256:b3a90d5f9c453442ceccc95c67c918fa28f567759f718d9064ac75ecb985b77e \
-    --hash=sha256:b428dd82522ad926c2172e8741723b66a6662c9033c744b25fd069e1c8e5e1db \
-    --hash=sha256:b9cfa06daefd356cc318140ad9e0dc66fdbaa93e5a3e59f187d7c74252072fe9 \
-    --hash=sha256:bf85fe978889e39b8ac3e52f22ebe8169d48460b637342ba3a8bd2024c3b5ef4 \
-    --hash=sha256:c9fbbc16d3575559f1c2259d00adf96a2eb0e9a2f708f65d32089e85d2be0239 \
-    --hash=sha256:db2e7e51565d1b29ce9e599542e3ee716bc36745d9c1253377c9690cfe764d0e \
-    --hash=sha256:e281ca1e447ee4858984a3c72f1846ec867002e0a31c874b18c440604f745245 \
-    --hash=sha256:ea315ec12637c5ca474f3bf7f8afabe9981cf6f1a67ddfff8bef1c8f035b228c \
-    --hash=sha256:eab5b461936751d849decba594c1c0a081492cfeca3fe241eda6bc51816be9b1 \
-    --hash=sha256:ecf74d123ddd10a114ca47f7b9c74b354121c1c1911da2b05e0e964e86ecbac8 \
-    --hash=sha256:f1b7c019af38b4f1ff899824dbf8380a6e7245c158814546b62e8b4ab7a1d483 \
-    --hash=sha256:fc0788f7313762eaedffbda4e8139e8a65b658a84dc577a5a4e106e4b0a21556
+apache-beam[gcp]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/../python/src/main/python/streaming-llm/base_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1359,6 +1353,7 @@ pyyaml==6.0.2 \
     --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
     --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
     # via
+    #   apache-beam
     #   huggingface-hub
     #   transformers
 redis==5.0.8 \
@@ -1762,6 +1757,10 @@ six==1.16.0 \
     #   hdfs
     #   oauth2client
     #   python-dateutil
+sortedcontainers==2.4.0 \
+    --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
+    --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
+    # via apache-beam
 sqlparse==0.5.1 \
     --hash=sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4 \
     --hash=sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e
diff --git a/python/src/main/python/word-count-python/requirements.txt b/python/src/main/python/word-count-python/requirements.txt
index a691f40a0f..a9cedcb360 100644
--- a/python/src/main/python/word-count-python/requirements.txt
+++ b/python/src/main/python/word-count-python/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[gcp]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[gcp]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_python_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1084,6 +1078,61 @@ pytz==2024.2 \
     --hash=sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a \
     --hash=sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725
     # via apache-beam
+pyyaml==6.0.2 \
+    --hash=sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff \
+    --hash=sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48 \
+    --hash=sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086 \
+    --hash=sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e \
+    --hash=sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133 \
+    --hash=sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5 \
+    --hash=sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484 \
+    --hash=sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee \
+    --hash=sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5 \
+    --hash=sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68 \
+    --hash=sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a \
+    --hash=sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf \
+    --hash=sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99 \
+    --hash=sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8 \
+    --hash=sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85 \
+    --hash=sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19 \
+    --hash=sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc \
+    --hash=sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a \
+    --hash=sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1 \
+    --hash=sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317 \
+    --hash=sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c \
+    --hash=sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631 \
+    --hash=sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d \
+    --hash=sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652 \
+    --hash=sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5 \
+    --hash=sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e \
+    --hash=sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b \
+    --hash=sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8 \
+    --hash=sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476 \
+    --hash=sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706 \
+    --hash=sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563 \
+    --hash=sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237 \
+    --hash=sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b \
+    --hash=sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083 \
+    --hash=sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180 \
+    --hash=sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425 \
+    --hash=sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e \
+    --hash=sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f \
+    --hash=sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725 \
+    --hash=sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183 \
+    --hash=sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab \
+    --hash=sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774 \
+    --hash=sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725 \
+    --hash=sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e \
+    --hash=sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5 \
+    --hash=sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d \
+    --hash=sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290 \
+    --hash=sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44 \
+    --hash=sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed \
+    --hash=sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4 \
+    --hash=sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba \
+    --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
+    --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
+    # via apache-beam
 redis==5.1.1 \
     --hash=sha256:f6c997521fedbae53387307c5d0bf784d9acc28d9f1d058abeac566ec4dbed72 \
     --hash=sha256:f8ea06b7482a668c6475ae202ed8d9bcaa409f6e87fb77ed1043d912afd62e24
@@ -1369,6 +1418,10 @@ six==1.16.0 \
     #   hdfs
     #   oauth2client
     #   python-dateutil
+sortedcontainers==2.4.0 \
+    --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
+    --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
+    # via apache-beam
 sqlparse==0.5.1 \
     --hash=sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4 \
     --hash=sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e
diff --git a/python/src/main/python/yaml-template/requirements.txt b/python/src/main/python/yaml-template/requirements.txt
index 4095f3e5bc..ec9e39172c 100644
--- a/python/src/main/python/yaml-template/requirements.txt
+++ b/python/src/main/python/yaml-template/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[dataframe,gcp,test,yaml]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[dataframe,gcp,test,yaml]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_yaml_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1072,74 +1066,79 @@ protobuf==4.25.5 \
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-psycopg2-binary==2.9.10 \
-    --hash=sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff \
-    --hash=sha256:056470c3dc57904bbf63d6f534988bafc4e970ffd50f6271fc4ee7daad9498a5 \
-    --hash=sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f \
-    --hash=sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5 \
-    --hash=sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0 \
-    --hash=sha256:19721ac03892001ee8fdd11507e6a2e01f4e37014def96379411ca99d78aeb2c \
-    --hash=sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c \
-    --hash=sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341 \
-    --hash=sha256:230eeae2d71594103cd5b93fd29d1ace6420d0b86f4778739cb1a5a32f607d1f \
-    --hash=sha256:245159e7ab20a71d989da00f280ca57da7641fa2cdcf71749c193cea540a74f7 \
-    --hash=sha256:26540d4a9a4e2b096f1ff9cce51253d0504dca5a85872c7f7be23be5a53eb18d \
-    --hash=sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007 \
-    --hash=sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92 \
-    --hash=sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb \
-    --hash=sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5 \
-    --hash=sha256:30e34c4e97964805f715206c7b789d54a78b70f3ff19fbe590104b71c45600e5 \
-    --hash=sha256:3216ccf953b3f267691c90c6fe742e45d890d8272326b4a8b20850a03d05b7b8 \
-    --hash=sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1 \
-    --hash=sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68 \
-    --hash=sha256:3abb691ff9e57d4a93355f60d4f4c1dd2d68326c968e7db17ea96df3c023ef73 \
-    --hash=sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1 \
-    --hash=sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53 \
-    --hash=sha256:3c4ded1a24b20021ebe677b7b08ad10bf09aac197d6943bfe6fec70ac4e4690d \
-    --hash=sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906 \
-    --hash=sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0 \
-    --hash=sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2 \
-    --hash=sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a \
-    --hash=sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b \
-    --hash=sha256:5c370b1e4975df846b0277b4deba86419ca77dbc25047f535b0bb03d1a544d44 \
-    --hash=sha256:6b269105e59ac96aba877c1707c600ae55711d9dcd3fc4b5012e4af68e30c648 \
-    --hash=sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7 \
-    --hash=sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f \
-    --hash=sha256:73aa0e31fa4bb82578f3a6c74a73c273367727de397a7a0f07bd83cbea696baa \
-    --hash=sha256:7559bce4b505762d737172556a4e6ea8a9998ecac1e39b5233465093e8cee697 \
-    --hash=sha256:79625966e176dc97ddabc142351e0409e28acf4660b88d1cf6adb876d20c490d \
-    --hash=sha256:7a813c8bdbaaaab1f078014b9b0b13f5de757e2b5d9be6403639b298a04d218b \
-    --hash=sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526 \
-    --hash=sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4 \
-    --hash=sha256:7f5d859928e635fa3ce3477704acee0f667b3a3d3e4bb109f2b18d4005f38287 \
-    --hash=sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e \
-    --hash=sha256:8608c078134f0b3cbd9f89b34bd60a943b23fd33cc5f065e8d5f840061bd0673 \
-    --hash=sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0 \
-    --hash=sha256:8aabf1c1a04584c168984ac678a668094d831f152859d06e055288fa515e4d30 \
-    --hash=sha256:8aecc5e80c63f7459a1a2ab2c64df952051df196294d9f739933a9f6687e86b3 \
-    --hash=sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e \
-    --hash=sha256:8de718c0e1c4b982a54b41779667242bc630b2197948405b7bd8ce16bcecac92 \
-    --hash=sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a \
-    --hash=sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c \
-    --hash=sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8 \
-    --hash=sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909 \
-    --hash=sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47 \
-    --hash=sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864 \
-    --hash=sha256:d00924255d7fc916ef66e4bf22f354a940c67179ad3fd7067d7a0a9c84d2fbfc \
-    --hash=sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00 \
-    --hash=sha256:e217ce4d37667df0bc1c397fdcd8de5e81018ef305aed9415c3b093faaeb10fb \
-    --hash=sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539 \
-    --hash=sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b \
-    --hash=sha256:e8b58f0a96e7a1e341fc894f62c1177a7c83febebb5ff9123b579418fdc8a481 \
-    --hash=sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5 \
-    --hash=sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4 \
-    --hash=sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64 \
-    --hash=sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392 \
-    --hash=sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4 \
-    --hash=sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1 \
-    --hash=sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1 \
-    --hash=sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567 \
-    --hash=sha256:ffe8ed017e4ed70f68b7b371d84b7d4a790368db9203dfc2d222febd3a9c8863
+psycopg2-binary==2.9.9 \
+    --hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \
+    --hash=sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77 \
+    --hash=sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e \
+    --hash=sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84 \
+    --hash=sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3 \
+    --hash=sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2 \
+    --hash=sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67 \
+    --hash=sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876 \
+    --hash=sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152 \
+    --hash=sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f \
+    --hash=sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a \
+    --hash=sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6 \
+    --hash=sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503 \
+    --hash=sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f \
+    --hash=sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493 \
+    --hash=sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996 \
+    --hash=sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f \
+    --hash=sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e \
+    --hash=sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59 \
+    --hash=sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94 \
+    --hash=sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7 \
+    --hash=sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682 \
+    --hash=sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420 \
+    --hash=sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae \
+    --hash=sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291 \
+    --hash=sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe \
+    --hash=sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980 \
+    --hash=sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93 \
+    --hash=sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692 \
+    --hash=sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119 \
+    --hash=sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716 \
+    --hash=sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472 \
+    --hash=sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b \
+    --hash=sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2 \
+    --hash=sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc \
+    --hash=sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c \
+    --hash=sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5 \
+    --hash=sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab \
+    --hash=sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984 \
+    --hash=sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9 \
+    --hash=sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf \
+    --hash=sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0 \
+    --hash=sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f \
+    --hash=sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212 \
+    --hash=sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb \
+    --hash=sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be \
+    --hash=sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90 \
+    --hash=sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041 \
+    --hash=sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7 \
+    --hash=sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860 \
+    --hash=sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d \
+    --hash=sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245 \
+    --hash=sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27 \
+    --hash=sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417 \
+    --hash=sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359 \
+    --hash=sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202 \
+    --hash=sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0 \
+    --hash=sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7 \
+    --hash=sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba \
+    --hash=sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1 \
+    --hash=sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd \
+    --hash=sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07 \
+    --hash=sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98 \
+    --hash=sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55 \
+    --hash=sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d \
+    --hash=sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972 \
+    --hash=sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f \
+    --hash=sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e \
+    --hash=sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26 \
+    --hash=sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957 \
+    --hash=sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53 \
+    --hash=sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52
     # via apache-beam
 pyarrow==16.1.0 \
     --hash=sha256:06ebccb6f8cb7357de85f60d5da50e83507954af617d7b05f48af1621d331c9a \
@@ -1820,7 +1819,9 @@ six==1.16.0 \
 sortedcontainers==2.4.0 \
     --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
     --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
-    # via hypothesis
+    # via
+    #   apache-beam
+    #   hypothesis
 sqlalchemy==2.0.36 \
     --hash=sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763 \
     --hash=sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436 \
diff --git a/v2/googlecloud-to-elasticsearch/src/main/resources/requirements.txt b/v2/googlecloud-to-elasticsearch/src/main/resources/requirements.txt
index 4095f3e5bc..ec9e39172c 100644
--- a/v2/googlecloud-to-elasticsearch/src/main/resources/requirements.txt
+++ b/v2/googlecloud-to-elasticsearch/src/main/resources/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[dataframe,gcp,test,yaml]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[dataframe,gcp,test,yaml]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_yaml_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1072,74 +1066,79 @@ protobuf==4.25.5 \
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-psycopg2-binary==2.9.10 \
-    --hash=sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff \
-    --hash=sha256:056470c3dc57904bbf63d6f534988bafc4e970ffd50f6271fc4ee7daad9498a5 \
-    --hash=sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f \
-    --hash=sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5 \
-    --hash=sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0 \
-    --hash=sha256:19721ac03892001ee8fdd11507e6a2e01f4e37014def96379411ca99d78aeb2c \
-    --hash=sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c \
-    --hash=sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341 \
-    --hash=sha256:230eeae2d71594103cd5b93fd29d1ace6420d0b86f4778739cb1a5a32f607d1f \
-    --hash=sha256:245159e7ab20a71d989da00f280ca57da7641fa2cdcf71749c193cea540a74f7 \
-    --hash=sha256:26540d4a9a4e2b096f1ff9cce51253d0504dca5a85872c7f7be23be5a53eb18d \
-    --hash=sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007 \
-    --hash=sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92 \
-    --hash=sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb \
-    --hash=sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5 \
-    --hash=sha256:30e34c4e97964805f715206c7b789d54a78b70f3ff19fbe590104b71c45600e5 \
-    --hash=sha256:3216ccf953b3f267691c90c6fe742e45d890d8272326b4a8b20850a03d05b7b8 \
-    --hash=sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1 \
-    --hash=sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68 \
-    --hash=sha256:3abb691ff9e57d4a93355f60d4f4c1dd2d68326c968e7db17ea96df3c023ef73 \
-    --hash=sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1 \
-    --hash=sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53 \
-    --hash=sha256:3c4ded1a24b20021ebe677b7b08ad10bf09aac197d6943bfe6fec70ac4e4690d \
-    --hash=sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906 \
-    --hash=sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0 \
-    --hash=sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2 \
-    --hash=sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a \
-    --hash=sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b \
-    --hash=sha256:5c370b1e4975df846b0277b4deba86419ca77dbc25047f535b0bb03d1a544d44 \
-    --hash=sha256:6b269105e59ac96aba877c1707c600ae55711d9dcd3fc4b5012e4af68e30c648 \
-    --hash=sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7 \
-    --hash=sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f \
-    --hash=sha256:73aa0e31fa4bb82578f3a6c74a73c273367727de397a7a0f07bd83cbea696baa \
-    --hash=sha256:7559bce4b505762d737172556a4e6ea8a9998ecac1e39b5233465093e8cee697 \
-    --hash=sha256:79625966e176dc97ddabc142351e0409e28acf4660b88d1cf6adb876d20c490d \
-    --hash=sha256:7a813c8bdbaaaab1f078014b9b0b13f5de757e2b5d9be6403639b298a04d218b \
-    --hash=sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526 \
-    --hash=sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4 \
-    --hash=sha256:7f5d859928e635fa3ce3477704acee0f667b3a3d3e4bb109f2b18d4005f38287 \
-    --hash=sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e \
-    --hash=sha256:8608c078134f0b3cbd9f89b34bd60a943b23fd33cc5f065e8d5f840061bd0673 \
-    --hash=sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0 \
-    --hash=sha256:8aabf1c1a04584c168984ac678a668094d831f152859d06e055288fa515e4d30 \
-    --hash=sha256:8aecc5e80c63f7459a1a2ab2c64df952051df196294d9f739933a9f6687e86b3 \
-    --hash=sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e \
-    --hash=sha256:8de718c0e1c4b982a54b41779667242bc630b2197948405b7bd8ce16bcecac92 \
-    --hash=sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a \
-    --hash=sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c \
-    --hash=sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8 \
-    --hash=sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909 \
-    --hash=sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47 \
-    --hash=sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864 \
-    --hash=sha256:d00924255d7fc916ef66e4bf22f354a940c67179ad3fd7067d7a0a9c84d2fbfc \
-    --hash=sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00 \
-    --hash=sha256:e217ce4d37667df0bc1c397fdcd8de5e81018ef305aed9415c3b093faaeb10fb \
-    --hash=sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539 \
-    --hash=sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b \
-    --hash=sha256:e8b58f0a96e7a1e341fc894f62c1177a7c83febebb5ff9123b579418fdc8a481 \
-    --hash=sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5 \
-    --hash=sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4 \
-    --hash=sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64 \
-    --hash=sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392 \
-    --hash=sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4 \
-    --hash=sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1 \
-    --hash=sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1 \
-    --hash=sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567 \
-    --hash=sha256:ffe8ed017e4ed70f68b7b371d84b7d4a790368db9203dfc2d222febd3a9c8863
+psycopg2-binary==2.9.9 \
+    --hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \
+    --hash=sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77 \
+    --hash=sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e \
+    --hash=sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84 \
+    --hash=sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3 \
+    --hash=sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2 \
+    --hash=sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67 \
+    --hash=sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876 \
+    --hash=sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152 \
+    --hash=sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f \
+    --hash=sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a \
+    --hash=sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6 \
+    --hash=sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503 \
+    --hash=sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f \
+    --hash=sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493 \
+    --hash=sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996 \
+    --hash=sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f \
+    --hash=sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e \
+    --hash=sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59 \
+    --hash=sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94 \
+    --hash=sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7 \
+    --hash=sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682 \
+    --hash=sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420 \
+    --hash=sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae \
+    --hash=sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291 \
+    --hash=sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe \
+    --hash=sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980 \
+    --hash=sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93 \
+    --hash=sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692 \
+    --hash=sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119 \
+    --hash=sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716 \
+    --hash=sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472 \
+    --hash=sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b \
+    --hash=sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2 \
+    --hash=sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc \
+    --hash=sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c \
+    --hash=sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5 \
+    --hash=sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab \
+    --hash=sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984 \
+    --hash=sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9 \
+    --hash=sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf \
+    --hash=sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0 \
+    --hash=sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f \
+    --hash=sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212 \
+    --hash=sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb \
+    --hash=sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be \
+    --hash=sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90 \
+    --hash=sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041 \
+    --hash=sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7 \
+    --hash=sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860 \
+    --hash=sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d \
+    --hash=sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245 \
+    --hash=sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27 \
+    --hash=sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417 \
+    --hash=sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359 \
+    --hash=sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202 \
+    --hash=sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0 \
+    --hash=sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7 \
+    --hash=sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba \
+    --hash=sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1 \
+    --hash=sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd \
+    --hash=sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07 \
+    --hash=sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98 \
+    --hash=sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55 \
+    --hash=sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d \
+    --hash=sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972 \
+    --hash=sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f \
+    --hash=sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e \
+    --hash=sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26 \
+    --hash=sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957 \
+    --hash=sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53 \
+    --hash=sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52
     # via apache-beam
 pyarrow==16.1.0 \
     --hash=sha256:06ebccb6f8cb7357de85f60d5da50e83507954af617d7b05f48af1621d331c9a \
@@ -1820,7 +1819,9 @@ six==1.16.0 \
 sortedcontainers==2.4.0 \
     --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
     --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
-    # via hypothesis
+    # via
+    #   apache-beam
+    #   hypothesis
 sqlalchemy==2.0.36 \
     --hash=sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763 \
     --hash=sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436 \
diff --git a/v2/googlecloud-to-googlecloud/src/main/resources/requirements.txt b/v2/googlecloud-to-googlecloud/src/main/resources/requirements.txt
index 4095f3e5bc..ec9e39172c 100644
--- a/v2/googlecloud-to-googlecloud/src/main/resources/requirements.txt
+++ b/v2/googlecloud-to-googlecloud/src/main/resources/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[dataframe,gcp,test,yaml]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[dataframe,gcp,test,yaml]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_yaml_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1072,74 +1066,79 @@ protobuf==4.25.5 \
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-psycopg2-binary==2.9.10 \
-    --hash=sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff \
-    --hash=sha256:056470c3dc57904bbf63d6f534988bafc4e970ffd50f6271fc4ee7daad9498a5 \
-    --hash=sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f \
-    --hash=sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5 \
-    --hash=sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0 \
-    --hash=sha256:19721ac03892001ee8fdd11507e6a2e01f4e37014def96379411ca99d78aeb2c \
-    --hash=sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c \
-    --hash=sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341 \
-    --hash=sha256:230eeae2d71594103cd5b93fd29d1ace6420d0b86f4778739cb1a5a32f607d1f \
-    --hash=sha256:245159e7ab20a71d989da00f280ca57da7641fa2cdcf71749c193cea540a74f7 \
-    --hash=sha256:26540d4a9a4e2b096f1ff9cce51253d0504dca5a85872c7f7be23be5a53eb18d \
-    --hash=sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007 \
-    --hash=sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92 \
-    --hash=sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb \
-    --hash=sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5 \
-    --hash=sha256:30e34c4e97964805f715206c7b789d54a78b70f3ff19fbe590104b71c45600e5 \
-    --hash=sha256:3216ccf953b3f267691c90c6fe742e45d890d8272326b4a8b20850a03d05b7b8 \
-    --hash=sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1 \
-    --hash=sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68 \
-    --hash=sha256:3abb691ff9e57d4a93355f60d4f4c1dd2d68326c968e7db17ea96df3c023ef73 \
-    --hash=sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1 \
-    --hash=sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53 \
-    --hash=sha256:3c4ded1a24b20021ebe677b7b08ad10bf09aac197d6943bfe6fec70ac4e4690d \
-    --hash=sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906 \
-    --hash=sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0 \
-    --hash=sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2 \
-    --hash=sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a \
-    --hash=sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b \
-    --hash=sha256:5c370b1e4975df846b0277b4deba86419ca77dbc25047f535b0bb03d1a544d44 \
-    --hash=sha256:6b269105e59ac96aba877c1707c600ae55711d9dcd3fc4b5012e4af68e30c648 \
-    --hash=sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7 \
-    --hash=sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f \
-    --hash=sha256:73aa0e31fa4bb82578f3a6c74a73c273367727de397a7a0f07bd83cbea696baa \
-    --hash=sha256:7559bce4b505762d737172556a4e6ea8a9998ecac1e39b5233465093e8cee697 \
-    --hash=sha256:79625966e176dc97ddabc142351e0409e28acf4660b88d1cf6adb876d20c490d \
-    --hash=sha256:7a813c8bdbaaaab1f078014b9b0b13f5de757e2b5d9be6403639b298a04d218b \
-    --hash=sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526 \
-    --hash=sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4 \
-    --hash=sha256:7f5d859928e635fa3ce3477704acee0f667b3a3d3e4bb109f2b18d4005f38287 \
-    --hash=sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e \
-    --hash=sha256:8608c078134f0b3cbd9f89b34bd60a943b23fd33cc5f065e8d5f840061bd0673 \
-    --hash=sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0 \
-    --hash=sha256:8aabf1c1a04584c168984ac678a668094d831f152859d06e055288fa515e4d30 \
-    --hash=sha256:8aecc5e80c63f7459a1a2ab2c64df952051df196294d9f739933a9f6687e86b3 \
-    --hash=sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e \
-    --hash=sha256:8de718c0e1c4b982a54b41779667242bc630b2197948405b7bd8ce16bcecac92 \
-    --hash=sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a \
-    --hash=sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c \
-    --hash=sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8 \
-    --hash=sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909 \
-    --hash=sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47 \
-    --hash=sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864 \
-    --hash=sha256:d00924255d7fc916ef66e4bf22f354a940c67179ad3fd7067d7a0a9c84d2fbfc \
-    --hash=sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00 \
-    --hash=sha256:e217ce4d37667df0bc1c397fdcd8de5e81018ef305aed9415c3b093faaeb10fb \
-    --hash=sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539 \
-    --hash=sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b \
-    --hash=sha256:e8b58f0a96e7a1e341fc894f62c1177a7c83febebb5ff9123b579418fdc8a481 \
-    --hash=sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5 \
-    --hash=sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4 \
-    --hash=sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64 \
-    --hash=sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392 \
-    --hash=sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4 \
-    --hash=sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1 \
-    --hash=sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1 \
-    --hash=sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567 \
-    --hash=sha256:ffe8ed017e4ed70f68b7b371d84b7d4a790368db9203dfc2d222febd3a9c8863
+psycopg2-binary==2.9.9 \
+    --hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \
+    --hash=sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77 \
+    --hash=sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e \
+    --hash=sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84 \
+    --hash=sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3 \
+    --hash=sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2 \
+    --hash=sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67 \
+    --hash=sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876 \
+    --hash=sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152 \
+    --hash=sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f \
+    --hash=sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a \
+    --hash=sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6 \
+    --hash=sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503 \
+    --hash=sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f \
+    --hash=sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493 \
+    --hash=sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996 \
+    --hash=sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f \
+    --hash=sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e \
+    --hash=sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59 \
+    --hash=sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94 \
+    --hash=sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7 \
+    --hash=sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682 \
+    --hash=sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420 \
+    --hash=sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae \
+    --hash=sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291 \
+    --hash=sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe \
+    --hash=sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980 \
+    --hash=sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93 \
+    --hash=sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692 \
+    --hash=sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119 \
+    --hash=sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716 \
+    --hash=sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472 \
+    --hash=sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b \
+    --hash=sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2 \
+    --hash=sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc \
+    --hash=sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c \
+    --hash=sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5 \
+    --hash=sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab \
+    --hash=sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984 \
+    --hash=sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9 \
+    --hash=sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf \
+    --hash=sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0 \
+    --hash=sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f \
+    --hash=sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212 \
+    --hash=sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb \
+    --hash=sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be \
+    --hash=sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90 \
+    --hash=sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041 \
+    --hash=sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7 \
+    --hash=sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860 \
+    --hash=sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d \
+    --hash=sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245 \
+    --hash=sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27 \
+    --hash=sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417 \
+    --hash=sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359 \
+    --hash=sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202 \
+    --hash=sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0 \
+    --hash=sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7 \
+    --hash=sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba \
+    --hash=sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1 \
+    --hash=sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd \
+    --hash=sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07 \
+    --hash=sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98 \
+    --hash=sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55 \
+    --hash=sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d \
+    --hash=sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972 \
+    --hash=sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f \
+    --hash=sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e \
+    --hash=sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26 \
+    --hash=sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957 \
+    --hash=sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53 \
+    --hash=sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52
     # via apache-beam
 pyarrow==16.1.0 \
     --hash=sha256:06ebccb6f8cb7357de85f60d5da50e83507954af617d7b05f48af1621d331c9a \
@@ -1820,7 +1819,9 @@ six==1.16.0 \
 sortedcontainers==2.4.0 \
     --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
     --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
-    # via hypothesis
+    # via
+    #   apache-beam
+    #   hypothesis
 sqlalchemy==2.0.36 \
     --hash=sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763 \
     --hash=sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436 \
diff --git a/v2/googlecloud-to-splunk/src/main/resources/requirements.txt b/v2/googlecloud-to-splunk/src/main/resources/requirements.txt
index 4095f3e5bc..ec9e39172c 100644
--- a/v2/googlecloud-to-splunk/src/main/resources/requirements.txt
+++ b/v2/googlecloud-to-splunk/src/main/resources/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[dataframe,gcp,test,yaml]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[dataframe,gcp,test,yaml]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_yaml_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1072,74 +1066,79 @@ protobuf==4.25.5 \
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-psycopg2-binary==2.9.10 \
-    --hash=sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff \
-    --hash=sha256:056470c3dc57904bbf63d6f534988bafc4e970ffd50f6271fc4ee7daad9498a5 \
-    --hash=sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f \
-    --hash=sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5 \
-    --hash=sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0 \
-    --hash=sha256:19721ac03892001ee8fdd11507e6a2e01f4e37014def96379411ca99d78aeb2c \
-    --hash=sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c \
-    --hash=sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341 \
-    --hash=sha256:230eeae2d71594103cd5b93fd29d1ace6420d0b86f4778739cb1a5a32f607d1f \
-    --hash=sha256:245159e7ab20a71d989da00f280ca57da7641fa2cdcf71749c193cea540a74f7 \
-    --hash=sha256:26540d4a9a4e2b096f1ff9cce51253d0504dca5a85872c7f7be23be5a53eb18d \
-    --hash=sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007 \
-    --hash=sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92 \
-    --hash=sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb \
-    --hash=sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5 \
-    --hash=sha256:30e34c4e97964805f715206c7b789d54a78b70f3ff19fbe590104b71c45600e5 \
-    --hash=sha256:3216ccf953b3f267691c90c6fe742e45d890d8272326b4a8b20850a03d05b7b8 \
-    --hash=sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1 \
-    --hash=sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68 \
-    --hash=sha256:3abb691ff9e57d4a93355f60d4f4c1dd2d68326c968e7db17ea96df3c023ef73 \
-    --hash=sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1 \
-    --hash=sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53 \
-    --hash=sha256:3c4ded1a24b20021ebe677b7b08ad10bf09aac197d6943bfe6fec70ac4e4690d \
-    --hash=sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906 \
-    --hash=sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0 \
-    --hash=sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2 \
-    --hash=sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a \
-    --hash=sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b \
-    --hash=sha256:5c370b1e4975df846b0277b4deba86419ca77dbc25047f535b0bb03d1a544d44 \
-    --hash=sha256:6b269105e59ac96aba877c1707c600ae55711d9dcd3fc4b5012e4af68e30c648 \
-    --hash=sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7 \
-    --hash=sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f \
-    --hash=sha256:73aa0e31fa4bb82578f3a6c74a73c273367727de397a7a0f07bd83cbea696baa \
-    --hash=sha256:7559bce4b505762d737172556a4e6ea8a9998ecac1e39b5233465093e8cee697 \
-    --hash=sha256:79625966e176dc97ddabc142351e0409e28acf4660b88d1cf6adb876d20c490d \
-    --hash=sha256:7a813c8bdbaaaab1f078014b9b0b13f5de757e2b5d9be6403639b298a04d218b \
-    --hash=sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526 \
-    --hash=sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4 \
-    --hash=sha256:7f5d859928e635fa3ce3477704acee0f667b3a3d3e4bb109f2b18d4005f38287 \
-    --hash=sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e \
-    --hash=sha256:8608c078134f0b3cbd9f89b34bd60a943b23fd33cc5f065e8d5f840061bd0673 \
-    --hash=sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0 \
-    --hash=sha256:8aabf1c1a04584c168984ac678a668094d831f152859d06e055288fa515e4d30 \
-    --hash=sha256:8aecc5e80c63f7459a1a2ab2c64df952051df196294d9f739933a9f6687e86b3 \
-    --hash=sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e \
-    --hash=sha256:8de718c0e1c4b982a54b41779667242bc630b2197948405b7bd8ce16bcecac92 \
-    --hash=sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a \
-    --hash=sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c \
-    --hash=sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8 \
-    --hash=sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909 \
-    --hash=sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47 \
-    --hash=sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864 \
-    --hash=sha256:d00924255d7fc916ef66e4bf22f354a940c67179ad3fd7067d7a0a9c84d2fbfc \
-    --hash=sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00 \
-    --hash=sha256:e217ce4d37667df0bc1c397fdcd8de5e81018ef305aed9415c3b093faaeb10fb \
-    --hash=sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539 \
-    --hash=sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b \
-    --hash=sha256:e8b58f0a96e7a1e341fc894f62c1177a7c83febebb5ff9123b579418fdc8a481 \
-    --hash=sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5 \
-    --hash=sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4 \
-    --hash=sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64 \
-    --hash=sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392 \
-    --hash=sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4 \
-    --hash=sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1 \
-    --hash=sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1 \
-    --hash=sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567 \
-    --hash=sha256:ffe8ed017e4ed70f68b7b371d84b7d4a790368db9203dfc2d222febd3a9c8863
+psycopg2-binary==2.9.9 \
+    --hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \
+    --hash=sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77 \
+    --hash=sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e \
+    --hash=sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84 \
+    --hash=sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3 \
+    --hash=sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2 \
+    --hash=sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67 \
+    --hash=sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876 \
+    --hash=sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152 \
+    --hash=sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f \
+    --hash=sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a \
+    --hash=sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6 \
+    --hash=sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503 \
+    --hash=sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f \
+    --hash=sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493 \
+    --hash=sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996 \
+    --hash=sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f \
+    --hash=sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e \
+    --hash=sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59 \
+    --hash=sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94 \
+    --hash=sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7 \
+    --hash=sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682 \
+    --hash=sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420 \
+    --hash=sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae \
+    --hash=sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291 \
+    --hash=sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe \
+    --hash=sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980 \
+    --hash=sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93 \
+    --hash=sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692 \
+    --hash=sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119 \
+    --hash=sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716 \
+    --hash=sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472 \
+    --hash=sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b \
+    --hash=sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2 \
+    --hash=sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc \
+    --hash=sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c \
+    --hash=sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5 \
+    --hash=sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab \
+    --hash=sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984 \
+    --hash=sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9 \
+    --hash=sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf \
+    --hash=sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0 \
+    --hash=sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f \
+    --hash=sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212 \
+    --hash=sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb \
+    --hash=sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be \
+    --hash=sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90 \
+    --hash=sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041 \
+    --hash=sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7 \
+    --hash=sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860 \
+    --hash=sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d \
+    --hash=sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245 \
+    --hash=sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27 \
+    --hash=sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417 \
+    --hash=sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359 \
+    --hash=sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202 \
+    --hash=sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0 \
+    --hash=sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7 \
+    --hash=sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba \
+    --hash=sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1 \
+    --hash=sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd \
+    --hash=sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07 \
+    --hash=sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98 \
+    --hash=sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55 \
+    --hash=sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d \
+    --hash=sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972 \
+    --hash=sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f \
+    --hash=sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e \
+    --hash=sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26 \
+    --hash=sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957 \
+    --hash=sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53 \
+    --hash=sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52
     # via apache-beam
 pyarrow==16.1.0 \
     --hash=sha256:06ebccb6f8cb7357de85f60d5da50e83507954af617d7b05f48af1621d331c9a \
@@ -1820,7 +1819,9 @@ six==1.16.0 \
 sortedcontainers==2.4.0 \
     --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
     --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
-    # via hypothesis
+    # via
+    #   apache-beam
+    #   hypothesis
 sqlalchemy==2.0.36 \
     --hash=sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763 \
     --hash=sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436 \
diff --git a/v2/pubsub-binary-to-bigquery/src/main/resources/requirements.txt b/v2/pubsub-binary-to-bigquery/src/main/resources/requirements.txt
index 4095f3e5bc..ec9e39172c 100644
--- a/v2/pubsub-binary-to-bigquery/src/main/resources/requirements.txt
+++ b/v2/pubsub-binary-to-bigquery/src/main/resources/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[dataframe,gcp,test,yaml]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[dataframe,gcp,test,yaml]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_yaml_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1072,74 +1066,79 @@ protobuf==4.25.5 \
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-psycopg2-binary==2.9.10 \
-    --hash=sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff \
-    --hash=sha256:056470c3dc57904bbf63d6f534988bafc4e970ffd50f6271fc4ee7daad9498a5 \
-    --hash=sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f \
-    --hash=sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5 \
-    --hash=sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0 \
-    --hash=sha256:19721ac03892001ee8fdd11507e6a2e01f4e37014def96379411ca99d78aeb2c \
-    --hash=sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c \
-    --hash=sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341 \
-    --hash=sha256:230eeae2d71594103cd5b93fd29d1ace6420d0b86f4778739cb1a5a32f607d1f \
-    --hash=sha256:245159e7ab20a71d989da00f280ca57da7641fa2cdcf71749c193cea540a74f7 \
-    --hash=sha256:26540d4a9a4e2b096f1ff9cce51253d0504dca5a85872c7f7be23be5a53eb18d \
-    --hash=sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007 \
-    --hash=sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92 \
-    --hash=sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb \
-    --hash=sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5 \
-    --hash=sha256:30e34c4e97964805f715206c7b789d54a78b70f3ff19fbe590104b71c45600e5 \
-    --hash=sha256:3216ccf953b3f267691c90c6fe742e45d890d8272326b4a8b20850a03d05b7b8 \
-    --hash=sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1 \
-    --hash=sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68 \
-    --hash=sha256:3abb691ff9e57d4a93355f60d4f4c1dd2d68326c968e7db17ea96df3c023ef73 \
-    --hash=sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1 \
-    --hash=sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53 \
-    --hash=sha256:3c4ded1a24b20021ebe677b7b08ad10bf09aac197d6943bfe6fec70ac4e4690d \
-    --hash=sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906 \
-    --hash=sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0 \
-    --hash=sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2 \
-    --hash=sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a \
-    --hash=sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b \
-    --hash=sha256:5c370b1e4975df846b0277b4deba86419ca77dbc25047f535b0bb03d1a544d44 \
-    --hash=sha256:6b269105e59ac96aba877c1707c600ae55711d9dcd3fc4b5012e4af68e30c648 \
-    --hash=sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7 \
-    --hash=sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f \
-    --hash=sha256:73aa0e31fa4bb82578f3a6c74a73c273367727de397a7a0f07bd83cbea696baa \
-    --hash=sha256:7559bce4b505762d737172556a4e6ea8a9998ecac1e39b5233465093e8cee697 \
-    --hash=sha256:79625966e176dc97ddabc142351e0409e28acf4660b88d1cf6adb876d20c490d \
-    --hash=sha256:7a813c8bdbaaaab1f078014b9b0b13f5de757e2b5d9be6403639b298a04d218b \
-    --hash=sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526 \
-    --hash=sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4 \
-    --hash=sha256:7f5d859928e635fa3ce3477704acee0f667b3a3d3e4bb109f2b18d4005f38287 \
-    --hash=sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e \
-    --hash=sha256:8608c078134f0b3cbd9f89b34bd60a943b23fd33cc5f065e8d5f840061bd0673 \
-    --hash=sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0 \
-    --hash=sha256:8aabf1c1a04584c168984ac678a668094d831f152859d06e055288fa515e4d30 \
-    --hash=sha256:8aecc5e80c63f7459a1a2ab2c64df952051df196294d9f739933a9f6687e86b3 \
-    --hash=sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e \
-    --hash=sha256:8de718c0e1c4b982a54b41779667242bc630b2197948405b7bd8ce16bcecac92 \
-    --hash=sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a \
-    --hash=sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c \
-    --hash=sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8 \
-    --hash=sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909 \
-    --hash=sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47 \
-    --hash=sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864 \
-    --hash=sha256:d00924255d7fc916ef66e4bf22f354a940c67179ad3fd7067d7a0a9c84d2fbfc \
-    --hash=sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00 \
-    --hash=sha256:e217ce4d37667df0bc1c397fdcd8de5e81018ef305aed9415c3b093faaeb10fb \
-    --hash=sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539 \
-    --hash=sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b \
-    --hash=sha256:e8b58f0a96e7a1e341fc894f62c1177a7c83febebb5ff9123b579418fdc8a481 \
-    --hash=sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5 \
-    --hash=sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4 \
-    --hash=sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64 \
-    --hash=sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392 \
-    --hash=sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4 \
-    --hash=sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1 \
-    --hash=sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1 \
-    --hash=sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567 \
-    --hash=sha256:ffe8ed017e4ed70f68b7b371d84b7d4a790368db9203dfc2d222febd3a9c8863
+psycopg2-binary==2.9.9 \
+    --hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \
+    --hash=sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77 \
+    --hash=sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e \
+    --hash=sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84 \
+    --hash=sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3 \
+    --hash=sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2 \
+    --hash=sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67 \
+    --hash=sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876 \
+    --hash=sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152 \
+    --hash=sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f \
+    --hash=sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a \
+    --hash=sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6 \
+    --hash=sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503 \
+    --hash=sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f \
+    --hash=sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493 \
+    --hash=sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996 \
+    --hash=sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f \
+    --hash=sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e \
+    --hash=sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59 \
+    --hash=sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94 \
+    --hash=sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7 \
+    --hash=sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682 \
+    --hash=sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420 \
+    --hash=sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae \
+    --hash=sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291 \
+    --hash=sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe \
+    --hash=sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980 \
+    --hash=sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93 \
+    --hash=sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692 \
+    --hash=sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119 \
+    --hash=sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716 \
+    --hash=sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472 \
+    --hash=sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b \
+    --hash=sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2 \
+    --hash=sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc \
+    --hash=sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c \
+    --hash=sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5 \
+    --hash=sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab \
+    --hash=sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984 \
+    --hash=sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9 \
+    --hash=sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf \
+    --hash=sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0 \
+    --hash=sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f \
+    --hash=sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212 \
+    --hash=sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb \
+    --hash=sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be \
+    --hash=sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90 \
+    --hash=sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041 \
+    --hash=sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7 \
+    --hash=sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860 \
+    --hash=sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d \
+    --hash=sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245 \
+    --hash=sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27 \
+    --hash=sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417 \
+    --hash=sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359 \
+    --hash=sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202 \
+    --hash=sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0 \
+    --hash=sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7 \
+    --hash=sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba \
+    --hash=sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1 \
+    --hash=sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd \
+    --hash=sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07 \
+    --hash=sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98 \
+    --hash=sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55 \
+    --hash=sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d \
+    --hash=sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972 \
+    --hash=sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f \
+    --hash=sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e \
+    --hash=sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26 \
+    --hash=sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957 \
+    --hash=sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53 \
+    --hash=sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52
     # via apache-beam
 pyarrow==16.1.0 \
     --hash=sha256:06ebccb6f8cb7357de85f60d5da50e83507954af617d7b05f48af1621d331c9a \
@@ -1820,7 +1819,9 @@ six==1.16.0 \
 sortedcontainers==2.4.0 \
     --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
     --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
-    # via hypothesis
+    # via
+    #   apache-beam
+    #   hypothesis
 sqlalchemy==2.0.36 \
     --hash=sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763 \
     --hash=sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436 \
diff --git a/v2/pubsub-to-mongodb/src/main/resources/requirements.txt b/v2/pubsub-to-mongodb/src/main/resources/requirements.txt
index 4095f3e5bc..ec9e39172c 100644
--- a/v2/pubsub-to-mongodb/src/main/resources/requirements.txt
+++ b/v2/pubsub-to-mongodb/src/main/resources/requirements.txt
@@ -27,38 +27,32 @@ annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
     # via pydantic
-apache-beam[dataframe,gcp,test,yaml]==2.60.0 \
-    --hash=sha256:04644d4021522674b56c32b199c8ca89ee9ffef6eee1b21a29a6b8cd0fdfc16c \
-    --hash=sha256:0594dff34776f4929aa24b35b677d5b2688c6e565e6a32921fad7d7c6a4063a0 \
-    --hash=sha256:10e4ecd11e7b3c9149e3704b6fc3a5f98ae63c889167681e4e18d9633d34957c \
-    --hash=sha256:12f292ee820e37ba0bf47ed54173cb6d15cce24beaa28a676e85ddb3f0a55263 \
-    --hash=sha256:239b02a82d8abd0400e8f2316b2b4ee08092c898d3eac36ffa7e3a632612fbb4 \
-    --hash=sha256:354f8c058b15608d1a79da55edc4f8fa724fff92269db02a81ccb3dfa82e08a5 \
-    --hash=sha256:3728ee7c0e9efcd9e1323ccf5dbebf5d56f7ce0fcc5ec78e63747ec4d7496c44 \
-    --hash=sha256:398dc3dc9e7079290548be96102b5bb9179c922534ef166bf22478b6b477b42c \
-    --hash=sha256:401593f23e85d5531754ca0fb5bb4e251959dcd1b2864e5a28844004ab1a7231 \
-    --hash=sha256:4252bee4ec51effe858aa3ac17ca09520a7dedfe4456a23dd286332e501ea7b9 \
-    --hash=sha256:4297dd4d13869f14192ae257527cb8d499273509e6bc166ac92eb0a8ec25f1fe \
-    --hash=sha256:447ff21a0eb76dfa78a6164e752a1c1205c055f22145178048cd619dada4e72f \
-    --hash=sha256:482ee5caad2244472d7572c555a777e459207770483775d6a694c3ef2f9e5e45 \
-    --hash=sha256:4bd24eedddbdd7980e698ab0f588e2e9d641c434f586970a57164259f9ce2db4 \
-    --hash=sha256:6062b07b25c766cb8c7a94a64755093a7bc7e7aa0ff39f0f44d13a47d5696619 \
-    --hash=sha256:68121213c675ebf23c4d1e0c7f3e60f2db7648e2d7da6323efd62a684b2a64b6 \
-    --hash=sha256:7b7e17ff038795f96b64a1e0261338aba2d36857324bd582fedbe05d41542a81 \
-    --hash=sha256:8064c7896361a5451371c2d4b03660ba85f673ce00e4c57fed5e355f268dca9b \
-    --hash=sha256:83c54241552e35174ad44e90915aebd251beee31f9176a16ec931e8ce65c882d \
-    --hash=sha256:863a67bbd0899deefdb1cc7c5b7c03a3f98aae237b0f5fb6311beed2901102e2 \
-    --hash=sha256:875f8755842a38db7cda27dfa7f92fe4ef004aaaa49d8b23721193c2010076ef \
-    --hash=sha256:951b6a7e49dacef27181f6d1b15db368d9584e0a802dd61cd9fab949ce339ee8 \
-    --hash=sha256:aad7ca6f38e7e82bc28ed8473a4649d24249f438543ed6879776d8ef5dc2e743 \
-    --hash=sha256:b043748caaeb82655982479b39189f76c1948903230e7cd33057efc66737003f \
-    --hash=sha256:ba0404ddf8f95206328993f3db1b50f06d3034bc84c4440c4df4ce86060cee73 \
-    --hash=sha256:bcc4142e0465dcfecbec6908896aa4b43ae8d4ca0b3fa88a23fe6d4ee5033b96 \
-    --hash=sha256:c7ab3edbac04723bbc3d8c849d824f7bab63c969c14dc0f876d894d06787919a \
-    --hash=sha256:f5543ff7c6c64afbded02e9d99b5f142efc12ed5cefefa070a6914b3641d7b02 \
-    --hash=sha256:f56d680c2129dcbb5d96439921a1f14a2a072db904fa96ed2c52bef6daa8559c \
-    --hash=sha256:fbe467dc7800e257306d43761b61aeaaead8b8ac8ab35d0b296cf4ec9e1d71de \
-    --hash=sha256:ffae157ecde933f4dca4c13775ad3c0e7fc846c6b538965bd9222d4bf7ccfa9a
+apache-beam[dataframe,gcp,test,yaml]==2.62.0 \
+    --hash=sha256:02d33aae5a4cc3acc7a2fb86e3632cdbd240522256778e1da0f6b9192eeef91e \
+    --hash=sha256:04c58ef6827142b39a4c95f3403e388646fde8d88e823c7d4f624b45dea459fa \
+    --hash=sha256:04e99ef0fd74b645971549a16576f41a7a3c7a5360b67723a906334d70d04be3 \
+    --hash=sha256:147491dfde40c9ac0353899fc6632d92d24663c8f9d44ea30157e66752b6f54c \
+    --hash=sha256:158bce813662a39e2ee504273cc5fc492779703b8f596ef1a3210a62a5263b10 \
+    --hash=sha256:1e8f741de5c66122f5c97f8a6838ab7bfdbe7bbbbdadeef9f91bd0561487c26d \
+    --hash=sha256:3489d45fb04d542061af8f59b908e7a0168da5aacded308bb7825fd43f7068c7 \
+    --hash=sha256:34d353f5a9aeda4a3ee484907b14e2942b9e8f7f8a112b5a98d69663ed4ef68a \
+    --hash=sha256:3d5112494e4e672af404a8cb13dce3c12e3e11e5aaae7d78bc1b2c640f1e8c05 \
+    --hash=sha256:5044f2e2608d8e52b8267ec0fba250814388dd97c3ca7107d7cad0897895cbb8 \
+    --hash=sha256:5e5584dd4d68e1f1ace4c1775707afb5309852332ecc4975344bcc8a300d7399 \
+    --hash=sha256:8843a8306c0548c0224e7f0567de9494552068bd76101b6cc4bef445c3ffa495 \
+    --hash=sha256:8b79b8dc2968321d433d8d353a5b4c86c63e3a16cd9aced62c73e8ce3269d3cb \
+    --hash=sha256:b158b0c0d8a18e0f0b5c32031b61c51e19b12825312d8c01533c61d65b5fbda4 \
+    --hash=sha256:b61f298a43b7672604a4d3c4f3eef413f6c9b55aeadcacd06631d6ccc319aee8 \
+    --hash=sha256:b771ad9202816ddd1d887cbe1083b9711b8b3593c0a78f2e85a1d7f5c0adbdac \
+    --hash=sha256:b9d97df88b9b9e4585fff5ee09959d76b0ab596bb78ae986fac8c04bf8cc78db \
+    --hash=sha256:bc5dd62c005526c82d6ed1ffde7324e5347c1ff417061b5e63c330dc02e9e601 \
+    --hash=sha256:c4d5a43bb601520ce5ba30505a1597d2f4f0a02fbf56ca78213565b4c0ae7420 \
+    --hash=sha256:c7c1632a29ed785a93e5f9c8bed3e18d962789d06c8acc943f6faf9e24a177b7 \
+    --hash=sha256:c947f13bf6b8f7904994a3d846fe71ea2b28991373316c205987a42da8df4084 \
+    --hash=sha256:e24db3b37969353f0fdf8c13f2127a391d4483dcb81b2cf6211d37108bd8599a \
+    --hash=sha256:e65d11b8ac8eb84cbff56fe2aefb6da6449aee07339755138c8bce3d4d7df206 \
+    --hash=sha256:f28d8a79552fceeaaf0ed0b0f2b41b2143e1013745a5847d7defbb4a6ebfe9a1 \
+    --hash=sha256:f30e40163a23a64a4469ca2c74674eff7b1b5fcfd49c1461565c4aeda978a096
     # via -r python/default_base_yaml_requirements.txt
 attrs==24.2.0 \
     --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
@@ -1072,74 +1066,79 @@ protobuf==4.25.5 \
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-psycopg2-binary==2.9.10 \
-    --hash=sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff \
-    --hash=sha256:056470c3dc57904bbf63d6f534988bafc4e970ffd50f6271fc4ee7daad9498a5 \
-    --hash=sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f \
-    --hash=sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5 \
-    --hash=sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0 \
-    --hash=sha256:19721ac03892001ee8fdd11507e6a2e01f4e37014def96379411ca99d78aeb2c \
-    --hash=sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c \
-    --hash=sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341 \
-    --hash=sha256:230eeae2d71594103cd5b93fd29d1ace6420d0b86f4778739cb1a5a32f607d1f \
-    --hash=sha256:245159e7ab20a71d989da00f280ca57da7641fa2cdcf71749c193cea540a74f7 \
-    --hash=sha256:26540d4a9a4e2b096f1ff9cce51253d0504dca5a85872c7f7be23be5a53eb18d \
-    --hash=sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007 \
-    --hash=sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92 \
-    --hash=sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb \
-    --hash=sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5 \
-    --hash=sha256:30e34c4e97964805f715206c7b789d54a78b70f3ff19fbe590104b71c45600e5 \
-    --hash=sha256:3216ccf953b3f267691c90c6fe742e45d890d8272326b4a8b20850a03d05b7b8 \
-    --hash=sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1 \
-    --hash=sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68 \
-    --hash=sha256:3abb691ff9e57d4a93355f60d4f4c1dd2d68326c968e7db17ea96df3c023ef73 \
-    --hash=sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1 \
-    --hash=sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53 \
-    --hash=sha256:3c4ded1a24b20021ebe677b7b08ad10bf09aac197d6943bfe6fec70ac4e4690d \
-    --hash=sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906 \
-    --hash=sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0 \
-    --hash=sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2 \
-    --hash=sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a \
-    --hash=sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b \
-    --hash=sha256:5c370b1e4975df846b0277b4deba86419ca77dbc25047f535b0bb03d1a544d44 \
-    --hash=sha256:6b269105e59ac96aba877c1707c600ae55711d9dcd3fc4b5012e4af68e30c648 \
-    --hash=sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7 \
-    --hash=sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f \
-    --hash=sha256:73aa0e31fa4bb82578f3a6c74a73c273367727de397a7a0f07bd83cbea696baa \
-    --hash=sha256:7559bce4b505762d737172556a4e6ea8a9998ecac1e39b5233465093e8cee697 \
-    --hash=sha256:79625966e176dc97ddabc142351e0409e28acf4660b88d1cf6adb876d20c490d \
-    --hash=sha256:7a813c8bdbaaaab1f078014b9b0b13f5de757e2b5d9be6403639b298a04d218b \
-    --hash=sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526 \
-    --hash=sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4 \
-    --hash=sha256:7f5d859928e635fa3ce3477704acee0f667b3a3d3e4bb109f2b18d4005f38287 \
-    --hash=sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e \
-    --hash=sha256:8608c078134f0b3cbd9f89b34bd60a943b23fd33cc5f065e8d5f840061bd0673 \
-    --hash=sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0 \
-    --hash=sha256:8aabf1c1a04584c168984ac678a668094d831f152859d06e055288fa515e4d30 \
-    --hash=sha256:8aecc5e80c63f7459a1a2ab2c64df952051df196294d9f739933a9f6687e86b3 \
-    --hash=sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e \
-    --hash=sha256:8de718c0e1c4b982a54b41779667242bc630b2197948405b7bd8ce16bcecac92 \
-    --hash=sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a \
-    --hash=sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c \
-    --hash=sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8 \
-    --hash=sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909 \
-    --hash=sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47 \
-    --hash=sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864 \
-    --hash=sha256:d00924255d7fc916ef66e4bf22f354a940c67179ad3fd7067d7a0a9c84d2fbfc \
-    --hash=sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00 \
-    --hash=sha256:e217ce4d37667df0bc1c397fdcd8de5e81018ef305aed9415c3b093faaeb10fb \
-    --hash=sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539 \
-    --hash=sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b \
-    --hash=sha256:e8b58f0a96e7a1e341fc894f62c1177a7c83febebb5ff9123b579418fdc8a481 \
-    --hash=sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5 \
-    --hash=sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4 \
-    --hash=sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64 \
-    --hash=sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392 \
-    --hash=sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4 \
-    --hash=sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1 \
-    --hash=sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1 \
-    --hash=sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567 \
-    --hash=sha256:ffe8ed017e4ed70f68b7b371d84b7d4a790368db9203dfc2d222febd3a9c8863
+psycopg2-binary==2.9.9 \
+    --hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \
+    --hash=sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77 \
+    --hash=sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e \
+    --hash=sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84 \
+    --hash=sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3 \
+    --hash=sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2 \
+    --hash=sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67 \
+    --hash=sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876 \
+    --hash=sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152 \
+    --hash=sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f \
+    --hash=sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a \
+    --hash=sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6 \
+    --hash=sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503 \
+    --hash=sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f \
+    --hash=sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493 \
+    --hash=sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996 \
+    --hash=sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f \
+    --hash=sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e \
+    --hash=sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59 \
+    --hash=sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94 \
+    --hash=sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7 \
+    --hash=sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682 \
+    --hash=sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420 \
+    --hash=sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae \
+    --hash=sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291 \
+    --hash=sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe \
+    --hash=sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980 \
+    --hash=sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93 \
+    --hash=sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692 \
+    --hash=sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119 \
+    --hash=sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716 \
+    --hash=sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472 \
+    --hash=sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b \
+    --hash=sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2 \
+    --hash=sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc \
+    --hash=sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c \
+    --hash=sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5 \
+    --hash=sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab \
+    --hash=sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984 \
+    --hash=sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9 \
+    --hash=sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf \
+    --hash=sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0 \
+    --hash=sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f \
+    --hash=sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212 \
+    --hash=sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb \
+    --hash=sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be \
+    --hash=sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90 \
+    --hash=sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041 \
+    --hash=sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7 \
+    --hash=sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860 \
+    --hash=sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d \
+    --hash=sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245 \
+    --hash=sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27 \
+    --hash=sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417 \
+    --hash=sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359 \
+    --hash=sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202 \
+    --hash=sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0 \
+    --hash=sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7 \
+    --hash=sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba \
+    --hash=sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1 \
+    --hash=sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd \
+    --hash=sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07 \
+    --hash=sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98 \
+    --hash=sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55 \
+    --hash=sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d \
+    --hash=sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972 \
+    --hash=sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f \
+    --hash=sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e \
+    --hash=sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26 \
+    --hash=sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957 \
+    --hash=sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53 \
+    --hash=sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52
     # via apache-beam
 pyarrow==16.1.0 \
     --hash=sha256:06ebccb6f8cb7357de85f60d5da50e83507954af617d7b05f48af1621d331c9a \
@@ -1820,7 +1819,9 @@ six==1.16.0 \
 sortedcontainers==2.4.0 \
     --hash=sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 \
     --hash=sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0
-    # via hypothesis
+    # via
+    #   apache-beam
+    #   hypothesis
 sqlalchemy==2.0.36 \
     --hash=sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763 \
     --hash=sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436 \

From b844b9eafb3cddf43f1a56bcfe01acaccfee8a6b Mon Sep 17 00:00:00 2001
From: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date: Thu, 23 Jan 2025 10:32:59 +0530
Subject: [PATCH 08/56] Cassandra DML Generator - Spanner to SourceDB (#2120)

* Dml integration (#53)

* Added extensive UT

Added extensive UT

* Cassandra pr bug fixes (#57)

* Cassandra Consolidate Unit Test case and Regression testing fixes (#58)

* Added Mapping fixes

* Added Spoltles fixes

* Added Consolidated fixes

* Added TODO

* Addess Data and Time

* Cassandra pr bug fixes (#64)

* Handle TypeHandler Parsing issue fixes (#65)

Co-authored-by: pawankashyapollion <v-pawan.kumar@ollion.com>

* Added Safe handle (#68)

* Handle LocalTime For Time Data Type In Cassandra (#69)

* Cassandra pr bug fixes (#70)

* Handle Timestamp Fixes (#72)

* Added Code Combined in a single way

* Address The Unwanted Hop

* Cassandra pr bug fixes (#75)

* Added PR Review Comments

* Remove NamesCol Dependecy as spannerTableName is same as In Given Mapping

* Added spannerTableId for fetching Mapping

* Removed SpannerToID and also Updated Session file with proper structure

* Timestamp in milisecond

* removed assertNotNull from UT wherever possible

* Added Fixes

* Added Note Instead of Question

* -- review fixes (#78)

* Added Bytes to hex to blob conversion

* Handling Bytes as Binary encoded As of now

* Passing Null Value to Primary Key as well for cassandra

* Added UT fixes

* Added UT refectoring

* Reverse merge confict fixes

---------

Co-authored-by: pawankashyapollion <v-pawan.kumar@ollion.com>
Co-authored-by: Akash Thawait <aakash@ollion.com>
---
 .../v2/spanner/migrations/schema/Schema.java  |    2 +
 .../v2/templates/constants/Constants.java     |    1 -
 .../dbutils/dao/source/CassandraDao.java      |   37 +-
 .../dbutils/dml/CassandraDMLGenerator.java    |  416 ++++
 .../dbutils/dml/CassandraTypeHandler.java     | 1206 ++++-------
 .../processor/InputRecordProcessor.java       |   25 +-
 .../processor/SourceProcessorFactory.java     |   14 +-
 .../templates/models/DMLGeneratorRequest.java |   13 +
 .../templates/transforms/SourceWriterFn.java  |    3 +-
 .../dbutils/dao/source/CassandraDaoTest.java  |   22 +
 .../dml/CassandraDMLGeneratorTest.java        |  925 ++++++++
 .../dbutils/dml/CassandraTypeHandlerTest.java | 1856 ++++++++---------
 .../processor/SourceProcessorFactoryTest.java |    4 +-
 .../src/test/resources/cassandraSession.json  | 1064 ++++++++++
 14 files changed, 3827 insertions(+), 1761 deletions(-)
 create mode 100644 v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json

diff --git a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
index 55bd22b9aa..c49fcba6a3 100644
--- a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
+++ b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
@@ -77,6 +77,8 @@ public Schema(
     this.srcSchema = srcSchema;
     this.toSpanner = toSpanner;
     this.toSource = toSource;
+    this.srcToID = toSource;
+    this.spannerToID = toSpanner;
     this.empty = (spSchema == null || srcSchema == null);
   }
 
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java
index 476d199d46..35c354f267 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java
@@ -75,7 +75,6 @@ public class Constants {
   public static final String DEFAULT_SHARD_ID = "single_shard";
 
   public static final String SOURCE_MYSQL = "mysql";
-
   public static final String SOURCE_CASSANDRA = "cassandra";
 
   // Message written to the file for filtered records
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
index 5960a413c2..7181741de0 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
@@ -19,10 +19,10 @@
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
 import com.google.cloud.teleport.v2.templates.dbutils.connection.IConnectionHelper;
+import com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler;
 import com.google.cloud.teleport.v2.templates.exceptions.ConnectionException;
 import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
-import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
 
 public class CassandraDao implements IDao<DMLGeneratorResponse> {
   private final String cassandraUrl;
@@ -38,22 +38,25 @@ public CassandraDao(
 
   @Override
   public void write(DMLGeneratorResponse dmlGeneratorResponse) throws Exception {
-    try (CqlSession session =
-        (CqlSession)
-            connectionHelper.getConnection(this.cassandraUrl)) { // Ensure connection is obtained
-      if (session == null) {
-        throw new ConnectionException("Connection is null");
-      }
-      PreparedStatementGeneratedResponse preparedStatementGeneratedResponse =
-          (PreparedStatementGeneratedResponse) dmlGeneratorResponse;
-      String dmlStatement = preparedStatementGeneratedResponse.getDmlStatement();
-      PreparedStatement preparedStatement = session.prepare(dmlStatement);
-      BoundStatement boundStatement =
-          preparedStatement.bind(
-              preparedStatementGeneratedResponse.getValues().stream()
-                  .map(PreparedStatementValueObject::value)
-                  .toArray());
-      session.execute(boundStatement);
+    CqlSession session = (CqlSession) connectionHelper.getConnection(this.cassandraUrl);
+    if (session == null) {
+      throw new ConnectionException("Connection is null");
     }
+    PreparedStatementGeneratedResponse preparedStatementGeneratedResponse =
+        (PreparedStatementGeneratedResponse) dmlGeneratorResponse;
+    String dmlStatement = preparedStatementGeneratedResponse.getDmlStatement();
+    PreparedStatement preparedStatement = session.prepare(dmlStatement);
+    BoundStatement boundStatement =
+        preparedStatement.bind(
+            preparedStatementGeneratedResponse.getValues().stream()
+                .map(
+                    v -> {
+                      if (v.value() == CassandraTypeHandler.NullClass.INSTANCE) {
+                        return null;
+                      }
+                      return CassandraTypeHandler.castToExpectedType(v.dataType(), v.value());
+                    })
+                .toArray());
+    session.execute(boundStatement);
   }
 }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
new file mode 100644
index 0000000000..990acfc64d
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates.dbutils.dml;
+
+import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceTable;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerTable;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorRequest;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A generator for creating Data Manipulation Language (DML) statements for Cassandra. Implements
+ * the {@link IDMLGenerator} interface to handle various types of DML operations, such as insert,
+ * update, delete, and upsert.
+ *
+ * <p>This class is designed to construct Cassandra-specific DML statements by mapping input data
+ * and schema information to query formats that align with Cassandra's syntax and structure. It also
+ * validates primary keys, handles data type conversions, and manages timestamps in queries.
+ *
+ * <p>Key Responsibilities:
+ *
+ * <ul>
+ *   <li>Generating upsert statements for inserting or updating records.
+ *   <li>Creating delete statements for rows identified by primary key values.
+ *   <li>Mapping input data to Cassandra-compatible column values.
+ *   <li>Handling specific data types and ensuring query compatibility with Cassandra.
+ * </ul>
+ *
+ * <p>Usage Example:
+ *
+ * <pre>{@code
+ * IDMLGenerator generator = new CassandraDMLGenerator();
+ * DMLGeneratorResponse response = generator.getDMLStatement(dmlGeneratorRequest);
+ * }</pre>
+ *
+ * @see IDMLGenerator
+ */
+public class CassandraDMLGenerator implements IDMLGenerator {
+  private static final Logger LOG = LoggerFactory.getLogger(CassandraDMLGenerator.class);
+
+  /**
+   * @param dmlGeneratorRequest the request containing necessary information to construct the DML
+   *     statement, including modification type, table schema, new values, and key values.
+   * @return DMLGeneratorResponse
+   */
+  @Override
+  public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequest) {
+    if (dmlGeneratorRequest == null) {
+      LOG.warn("DMLGeneratorRequest is null. Cannot process the request.");
+      return new DMLGeneratorResponse("");
+    }
+
+    String spannerTableName = dmlGeneratorRequest.getSpannerTableName();
+    Schema schema = dmlGeneratorRequest.getSchema();
+
+    if (schema == null
+        || schema.getSpannerToID() == null
+        || schema.getSpSchema() == null
+        || schema.getSrcSchema() == null) {
+      LOG.warn("Schema is invalid or incomplete for table: {}", spannerTableName);
+      return new DMLGeneratorResponse("");
+    }
+    SpannerTable spannerTable = schema.getSpSchema().get(spannerTableName);
+    if (spannerTable == null) {
+      LOG.warn("Spanner table {} not found. Dropping the record.", spannerTableName);
+      return new DMLGeneratorResponse("");
+    }
+
+    SourceTable sourceTable = schema.getSrcSchema().get(spannerTableName);
+    if (sourceTable == null) {
+      LOG.warn(
+          "Source table {} not found for Spanner table Name: {}",
+          spannerTableName,
+          spannerTableName);
+      return new DMLGeneratorResponse("");
+    }
+
+    if (sourceTable.getPrimaryKeys() == null || sourceTable.getPrimaryKeys().length == 0) {
+      LOG.warn(
+          "Cannot reverse replicate table {} without primary key. Skipping the record.",
+          sourceTable.getName());
+      return new DMLGeneratorResponse("");
+    }
+
+    Map<String, PreparedStatementValueObject<?>> pkColumnNameValues =
+        getPkColumnValues(
+            spannerTable,
+            sourceTable,
+            dmlGeneratorRequest.getNewValuesJson(),
+            dmlGeneratorRequest.getKeyValuesJson(),
+            dmlGeneratorRequest.getSourceDbTimezoneOffset());
+    if (pkColumnNameValues == null) {
+      LOG.warn(
+          "Failed to generate primary key values for table {}. Skipping the record.",
+          sourceTable.getName());
+      return new DMLGeneratorResponse("");
+    }
+    java.sql.Timestamp timestamp = dmlGeneratorRequest.getCommitTimestamp().toSqlTimestamp();
+    String modType = dmlGeneratorRequest.getModType();
+    return generateDMLResponse(
+        spannerTable, sourceTable, dmlGeneratorRequest, pkColumnNameValues, timestamp, modType);
+  }
+
+  /**
+   * Generates a DML response based on the given modification type (INSERT, UPDATE, or DELETE).
+   *
+   * <p>This method processes the data from SpannerTable, SourceTable, and DMLGeneratorRequest to
+   * construct a corresponding CQL statement (INSERT, UPDATE, or DELETE) for Cassandra. The
+   * statement is generated based on the modification type and includes the appropriate primary key
+   * and column values, along with an optional timestamp.
+   *
+   * @param spannerTable the SpannerTable object containing schema information of the Spanner table
+   * @param sourceTable the SourceTable object containing details of the source table (e.g., name)
+   * @param dmlGeneratorRequest the request object containing new and key value data in JSON format
+   * @param pkColumnNameValues a map of primary key column names and their corresponding value
+   *     objects
+   * @param timestamp the optional timestamp to be included in the Cassandra statement (can be null)
+   * @param modType the type of modification to perform, either "INSERT", "UPDATE", or "DELETE"
+   * @return DMLGeneratorResponse the response containing the generated CQL statement and bound
+   *     values
+   * @throws IllegalArgumentException if the modType is unsupported or if any required data is
+   *     invalid
+   * @implNote The method uses the following logic: - Combines primary key values and column values
+   *     into a single list of entries. - Depending on the modType: - For "INSERT" or "UPDATE",
+   *     calls {@link #getUpsertStatementCQL}. - For "DELETE", calls {@link #getDeleteStatementCQL}.
+   *     - For unsupported modType values, logs an error and returns an empty response.
+   */
+  private static DMLGeneratorResponse generateDMLResponse(
+      SpannerTable spannerTable,
+      SourceTable sourceTable,
+      DMLGeneratorRequest dmlGeneratorRequest,
+      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues,
+      java.sql.Timestamp timestamp,
+      String modType) {
+    Map<String, PreparedStatementValueObject<?>> columnNameValues =
+        getColumnValues(
+            spannerTable,
+            sourceTable,
+            dmlGeneratorRequest.getNewValuesJson(),
+            dmlGeneratorRequest.getKeyValuesJson(),
+            dmlGeneratorRequest.getSourceDbTimezoneOffset());
+    Map<String, PreparedStatementValueObject<?>> allColumnNamesAndValues =
+        ImmutableMap.<String, PreparedStatementValueObject<?>>builder()
+            .putAll(pkColumnNameValues)
+            .putAll(columnNameValues)
+            .build();
+    switch (modType) {
+      case "INSERT":
+      case "UPDATE":
+        return getUpsertStatementCQL(sourceTable.getName(), timestamp, allColumnNamesAndValues);
+      case "DELETE":
+        return getDeleteStatementCQL(sourceTable.getName(), timestamp, allColumnNamesAndValues);
+      default:
+        LOG.error("Unsupported modType: {} for table {}", modType, spannerTable.getName());
+        return new DMLGeneratorResponse("");
+    }
+  }
+
+  /**
+   * Constructs an upsert (insert or update) CQL statement for a Cassandra or similar database using
+   * the provided table name, timestamp, column values, and primary key values.
+   *
+   * @param tableName the name of the table to which the upsert statement applies.
+   * @param timestamp the timestamp (in java.sql.Timestamp) to use for the operation.
+   * @param allColumnNamesAndValues a map of column names and their corresponding prepared statement
+   *     value objects for non-primary key columns.
+   * @return a {@link DMLGeneratorResponse} containing the generated CQL statement and a list of
+   *     values to be used with the prepared statement.
+   *     <p>This method: 1. Iterates through the primary key and column values, appending column
+   *     names and placeholders to the generated CQL statement. 2. Constructs the `INSERT INTO` CQL
+   *     statement with the provided table name, columns, and placeholders. 3. Appends a `USING
+   *     TIMESTAMP` clause to include the provided timestamp in the statement. 4. Creates a list of
+   *     values to bind to the placeholders in the prepared statement.
+   *     <p>The returned response contains the complete prepared CQL statement and the values
+   *     required to execute it.
+   */
+  private static DMLGeneratorResponse getUpsertStatementCQL(
+      String tableName,
+      java.sql.Timestamp timestamp,
+      Map<String, PreparedStatementValueObject<?>> allColumnNamesAndValues) {
+
+    String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
+
+    String allColumns =
+        allColumnNamesAndValues.keySet().stream()
+            .map(columnName -> "\"" + columnName.replace("\"", "\"\"") + "\"")
+            .collect(Collectors.joining(", "));
+
+    String placeholders =
+        allColumnNamesAndValues.keySet().stream()
+            .map(columnName -> "?")
+            .collect(Collectors.joining(", "));
+
+    List<PreparedStatementValueObject<?>> values =
+        new ArrayList<>(allColumnNamesAndValues.values());
+
+    PreparedStatementValueObject<Long> timestampObj =
+        PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp.getTime());
+    values.add(timestampObj);
+
+    String preparedStatement =
+        String.format(
+            "INSERT INTO %s (%s) VALUES (%s) USING TIMESTAMP ?",
+            escapedTableName, allColumns, placeholders);
+
+    return new PreparedStatementGeneratedResponse(preparedStatement, values);
+  }
+
+  /**
+   * Constructs a delete statement in CQL (Cassandra Query Language) using the provided table name,
+   * primary key values, and timestamp.
+   *
+   * @param tableName the name of the table from which records will be deleted.
+   * @param timestamp the timestamp (in java.sql.Timestamp) to use for the delete operation.
+   * @return a {@link DMLGeneratorResponse} containing the generated CQL delete statement and a list
+   *     of values to bind to the prepared statement.
+   *     <p>This method: 1. Iterates through the provided primary key column values, appending
+   *     conditions to the WHERE clause of the CQL delete statement. 2. Constructs the `DELETE FROM`
+   *     CQL statement with the specified table name, primary key conditions, and a `USING
+   *     TIMESTAMP` clause. 3. Creates a list of values to be used with the prepared statement,
+   *     including the timestamp.
+   *     <p>If no primary key column values are provided, an empty WHERE clause is generated. An
+   *     exception may be thrown if any value type does not match the expected type.
+   */
+  private static DMLGeneratorResponse getDeleteStatementCQL(
+      String tableName,
+      java.sql.Timestamp timestamp,
+      Map<String, PreparedStatementValueObject<?>> allColumnNamesAndValues) {
+
+    String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
+
+    String deleteConditions =
+        allColumnNamesAndValues.keySet().stream()
+            .map(columnName -> "\"" + columnName.replace("\"", "\"\"") + "\" = ?")
+            .collect(Collectors.joining(" AND "));
+
+    List<PreparedStatementValueObject<?>> values =
+        new ArrayList<>(allColumnNamesAndValues.values());
+
+    if (timestamp != null) {
+      PreparedStatementValueObject<Long> timestampObj =
+          PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp.getTime());
+      values.add(0, timestampObj);
+    }
+
+    String preparedStatement =
+        String.format(
+            "DELETE FROM %s USING TIMESTAMP ? WHERE %s", escapedTableName, deleteConditions);
+
+    return new PreparedStatementGeneratedResponse(preparedStatement, values);
+  }
+
+  /**
+   * Extracts the column values from the source table based on the provided Spanner schema, new
+   * values, and key values JSON objects.
+   *
+   * @param spannerTable the Spanner table schema.
+   * @param sourceTable the source table schema.
+   * @param newValuesJson the JSON object containing new values for columns.
+   * @param keyValuesJson the JSON object containing key values for columns.
+   * @param sourceDbTimezoneOffset the timezone offset of the source database.
+   * @return a map of column names to their corresponding prepared statement value objects.
+   *     <p>This method: 1. Iterates over the non-primary key column definitions in the source table
+   *     schema. 2. Maps each column in the source table schema to its corresponding column in the
+   *     Spanner schema. 3. Checks if the column values exist in the `keyValuesJson` or
+   *     `newValuesJson` and retrieves the appropriate value. 4. Skips columns that do not exist in
+   *     any of the JSON objects or are marked as null.
+   */
+  private static Map<String, PreparedStatementValueObject<?>> getColumnValues(
+      SpannerTable spannerTable,
+      SourceTable sourceTable,
+      JSONObject newValuesJson,
+      JSONObject keyValuesJson,
+      String sourceDbTimezoneOffset) {
+    Map<String, PreparedStatementValueObject<?>> response = new HashMap<>();
+    Set<String> sourcePKs = sourceTable.getPrimaryKeySet();
+    for (Map.Entry<String, SourceColumnDefinition> entry : sourceTable.getColDefs().entrySet()) {
+      SourceColumnDefinition sourceColDef = entry.getValue();
+
+      String colName = sourceColDef.getName();
+      if (sourcePKs.contains(colName)) {
+        continue; // we only need non-primary keys
+      }
+
+      String colId = entry.getKey();
+      SpannerColumnDefinition spannerColDef = spannerTable.getColDefs().get(colId);
+      if (spannerColDef == null) {
+        continue;
+      }
+      String spannerColumnName = spannerColDef.getName();
+      PreparedStatementValueObject<?> columnValue;
+      if (keyValuesJson.has(spannerColumnName)) {
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, keyValuesJson, sourceDbTimezoneOffset);
+      } else if (newValuesJson.has(spannerColumnName)) {
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, newValuesJson, sourceDbTimezoneOffset);
+      } else {
+        continue;
+      }
+
+      response.put(sourceColDef.getName(), columnValue);
+    }
+
+    return response;
+  }
+
+  /**
+   * Extracts the primary key column values from the source table based on the provided Spanner
+   * schema, new values, and key values JSON objects.
+   *
+   * @param spannerTable the Spanner table schema.
+   * @param sourceTable the source table schema.
+   * @param newValuesJson the JSON object containing new values for columns.
+   * @param keyValuesJson the JSON object containing key values for columns.
+   * @param sourceDbTimezoneOffset the timezone offset of the source database.
+   * @return a map of primary key column names to their corresponding prepared statement value
+   *     objects, or null if a required column is missing.
+   *     <p>This method: 1. Iterates over the primary key definitions in the source table schema. 2.
+   *     Maps each primary key column in the source table schema to its corresponding column in the
+   *     Spanner schema. 3. Checks if the primary key column values exist in the `keyValuesJson` or
+   *     `newValuesJson` and retrieves the appropriate value. 4. Returns null if any required
+   *     primary key column is missing in the JSON objects.
+   */
+  private static Map<String, PreparedStatementValueObject<?>> getPkColumnValues(
+      SpannerTable spannerTable,
+      SourceTable sourceTable,
+      JSONObject newValuesJson,
+      JSONObject keyValuesJson,
+      String sourceDbTimezoneOffset) {
+    Map<String, PreparedStatementValueObject<?>> response = new HashMap<>();
+    ColumnPK[] sourcePKs = sourceTable.getPrimaryKeys();
+
+    for (ColumnPK currentSourcePK : sourcePKs) {
+      String colId = currentSourcePK.getColId();
+      SourceColumnDefinition sourceColDef = sourceTable.getColDefs().get(colId);
+      SpannerColumnDefinition spannerColDef = spannerTable.getColDefs().get(colId);
+      if (spannerColDef == null) {
+        LOG.warn(
+            "The corresponding primary key column {} was not found in Spanner",
+            sourceColDef.getName());
+        return null;
+      }
+      String spannerColumnName = spannerColDef.getName();
+      PreparedStatementValueObject<?> columnValue;
+      if (keyValuesJson.has(spannerColumnName)) {
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, keyValuesJson, sourceDbTimezoneOffset);
+      } else if (newValuesJson.has(spannerColumnName)) {
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, newValuesJson, sourceDbTimezoneOffset);
+      } else {
+        LOG.warn("The column {} was not found in input record", spannerColumnName);
+        return null;
+      }
+
+      response.put(sourceColDef.getName(), columnValue);
+    }
+
+    return response;
+  }
+
+  /**
+   * Maps a column value from the source table to its corresponding Spanner column value based on
+   * their respective definitions.
+   *
+   * @param spannerColDef the Spanner column definition.
+   * @param sourceColDef the source column definition.
+   * @param valuesJson the JSON object containing column values.
+   * @param sourceDbTimezoneOffset the timezone offset of the source database.
+   * @return a {@link PreparedStatementValueObject} containing the mapped value for the column.
+   *     <p>This method: 1. Retrieves the value of the column from the JSON object. 2. Converts the
+   *     value to the appropriate type based on the Spanner and source column definitions. 3. Uses a
+   *     type handler to map the value if necessary.
+   */
+  private static PreparedStatementValueObject<?> getMappedColumnValue(
+      SpannerColumnDefinition spannerColDef,
+      SourceColumnDefinition sourceColDef,
+      JSONObject valuesJson,
+      String sourceDbTimezoneOffset) {
+    return CassandraTypeHandler.getColumnValueByType(
+        spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index 54edd291dd..39e51d63ab 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -15,102 +15,111 @@
  */
 package com.google.cloud.teleport.v2.templates.dbutils.dml;
 
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
 import com.google.common.net.InetAddresses;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
+import org.apache.commons.lang3.BooleanUtils;
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
-
-class CassandraTypeHandler {
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CassandraTypeHandler {
+  private static final Logger LOG = LoggerFactory.getLogger(CassandraTypeHandler.class);
+
+  /**
+   * A singleton class representing a null or empty state.
+   *
+   * <p>This class cannot be instantiated directly, and its single instance is accessed via the
+   * {@link #INSTANCE} field. It provides a custom {@link #toString()} implementation that returns
+   * the string representation "NULL_CLASS". This can be used to signify a special state where an
+   * object is not present or explicitly set to null.
+   */
+  public static final class NullClass {
+
+    /**
+     * Private constructor to prevent instantiation of the NULL_CLASS.
+     *
+     * <p>This ensures that only one instance of the NULL_CLASS exists, following the singleton
+     * pattern.
+     */
+    private NullClass() {}
+
+    /**
+     * The singleton instance of the NULL_CLASS.
+     *
+     * <p>This instance can be accessed statically via this field to represent a "null" or empty
+     * value in various contexts.
+     */
+    public static final NullClass INSTANCE = new NullClass();
+
+    /**
+     * Returns the string representation of the NULL_CLASS instance.
+     *
+     * @return the string "NULL_CLASS"
+     */
+    @Override
+    public String toString() {
+      return "NULL_CLASS";
+    }
+  }
 
   @FunctionalInterface
-  public interface TypeParser<T> {
-    T parse(Object value);
+  private interface HandlerSupplier<T> {
+
+    /**
+     * Supplies a value of type {@code T}.
+     *
+     * @return A value of type {@code T}.
+     * @throws Exception If an error occurs while supplying the value.
+     */
+    T get() throws Exception;
   }
 
   /**
-   * Converts a {@link String} to an ASCII representation for Cassandra's {@link String} or other
-   * ASCII-based types.
+   * Converts the provided {@link Object} value to a {@link BigInteger} representing a Cassandra
+   * varint.
    *
-   * <p>This method ensures that the string contains only valid ASCII characters (0-127). If any
-   * non-ASCII characters are found, an exception is thrown.
+   * <p>This method checks the type of the provided {@code value}. If it is a string, it tries to
+   * convert it to a {@link BigInteger}. If it is a byte array, it interprets it as a varint and
+   * converts it to a {@link BigInteger}. If the value is a {@link ByteBuffer}, it converts the
+   * content of the buffer to a byte array and then to a {@link BigInteger}. If the value is neither
+   * a valid number string, byte array, nor a {@link ByteBuffer}, it throws an {@link
+   * IllegalArgumentException}.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link String} representing the ASCII value for the column in Cassandra.
-   * @throws IllegalArgumentException If the string contains non-ASCII characters.
+   * @param value The value to be converted to a {@link BigInteger}. This could either be a string
+   *     representing a number, a byte array representing a varint, or a {@link ByteBuffer}.
+   * @return A {@link BigInteger} object representing the varint value.
+   * @throws IllegalArgumentException If the value is neither a valid number string, byte array, nor
+   *     a valid {@link ByteBuffer} for varint representation.
    */
-  public static String handleCassandraAsciiType(String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-    if (value instanceof String) {
-      String stringValue = (String) value;
-      if (isAscii(stringValue)) {
-        return stringValue;
-      } else {
-        throw new IllegalArgumentException(
-            "Invalid ASCII format for column: "
-                + colName
-                + ". String contains non-ASCII characters.");
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Generates a {@link BigInteger} based on the provided {@link CassandraTypeHandler}.
-   *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, and converts it to a {@link BigInteger}. The value can either be
-   * a string representing a number or a binary representation of a large integer (varint).
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link BigInteger} object representing the varint value from the Cassandra data.
-   * @throws IllegalArgumentException If the value is not a valid format for varint (neither a valid
-   *     number string nor a byte array).
-   */
-  public static BigInteger handleCassandraVarintType(String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-
-    if (value instanceof String) {
-      try {
-        return new BigInteger((String) value);
-      } catch (NumberFormatException e) {
-        throw new IllegalArgumentException(
-            "Invalid varint format (string) for column: " + colName, e);
-      }
-    } else if (value instanceof byte[]) {
-      try {
-        return new BigInteger((byte[]) value);
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            "Invalid varint format (byte array) for column: " + colName, e);
-      }
-    } else {
-      return null;
-    }
+  private static BigInteger handleCassandraVarintType(String value) {
+    return new BigInteger(value);
   }
 
   /**
@@ -120,108 +129,42 @@ public static BigInteger handleCassandraVarintType(String colName, JSONObject va
    * column name {@code colName}, and converts it into a {@link Duration} object. The string value
    * should be in the ISO-8601 duration format (e.g., "PT20.345S").
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
+   * @param durationString - The column value used to fetched from {@code valuesJson}.
    * @return A {@link Duration} object representing the duration value from the Cassandra data.
    * @throws IllegalArgumentException if the value is not a valid duration string.
    */
-  public static Duration handleCassandraDurationType(String colName, JSONObject valuesJson) {
-    String durationString = valuesJson.optString(colName, null);
-    if (durationString == null) {
-      return null;
-    }
+  private static Duration handleCassandraDurationType(String durationString) {
     try {
       return Duration.parse(durationString);
     } catch (Exception e) {
-      throw new IllegalArgumentException("Invalid duration format for column: " + colName, e);
+      throw new IllegalArgumentException("Invalid duration format for: " + durationString, e);
     }
   }
 
   /**
    * Generates a Type based on the provided {@link CassandraTypeHandler}.
    *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
+   * @param inetString - which is used to generate InetAddress.
    * @return a {@link InetAddress} object containing InetAddress as value represented in cassandra
    *     type.
    */
-  public static InetAddress handleCassandraInetAddressType(String colName, JSONObject valuesJson) {
-    String inetString = valuesJson.optString(colName, null);
-    if (inetString == null) {
-      return null;
-    }
+  private static InetAddress handleCassandraInetAddressType(String inetString) {
     try {
       return InetAddresses.forString(inetString);
     } catch (IllegalArgumentException e) {
-      throw new IllegalArgumentException("Invalid IP address format for column: " + colName, e);
-    }
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Boolean} object containing the value represented in cassandra type.
-   */
-  public static Boolean handleCassandraBoolType(String colName, JSONObject valuesJson) {
-    return valuesJson.optBoolean(colName, false);
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Float} object containing the value represented in cassandra type.
-   */
-  public static Float handleCassandraFloatType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigDecimal(colName).floatValue();
-    } catch (JSONException e) {
-      return null;
-    }
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Double} object containing the value represented in cassandra type.
-   */
-  public static Double handleCassandraDoubleType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigDecimal(colName).doubleValue();
-    } catch (JSONException e) {
-      return null;
+      throw new IllegalArgumentException("Invalid IP address format for: " + inetString, e);
     }
   }
 
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link ByteBuffer} object containing the value represented in cassandra type.
-   */
-  public static ByteBuffer handleCassandraBlobType(String colName, JSONObject valuesJson) {
-    Object colValue = valuesJson.opt(colName);
-    if (colValue == null) {
-      return null;
-    }
-    return parseBlobType(colValue);
-  }
-
   /**
    * Generates a Type based on the provided {@link CassandraTypeHandler}.
    *
    * @param colValue - contains all the key value for current incoming stream.
    * @return a {@link ByteBuffer} object containing the value represented in cassandra type.
    */
-  public static ByteBuffer parseBlobType(Object colValue) {
+  private static ByteBuffer parseBlobType(Object colValue) {
     byte[] byteArray;
+
     if (colValue instanceof byte[]) {
       byteArray = (byte[]) colValue;
     } else if (colValue instanceof String) {
@@ -229,25 +172,30 @@ public static ByteBuffer parseBlobType(Object colValue) {
     } else {
       throw new IllegalArgumentException("Unsupported type for column");
     }
+
     return ByteBuffer.wrap(byteArray);
   }
 
   /**
-   * Generates a {@link LocalDate} based on the provided {@link CassandraTypeHandler}.
-   *
-   * <p>This method processes the given JSON object to extract a date value using the specified
-   * column name and formatter. It specifically handles the "Cassandra Date" format (yyyy-MM-dd).
-   * The resulting {@link LocalDate} represents the date value associated with the column.
-   *
-   * @param colName - the key used to fetch the value from the provided {@link JSONObject}.
-   * @param valuesJson - the JSON object containing all key-value pairs for the current incoming
-   *     data stream.
-   * @return a {@link LocalDate} object containing the date value represented in Cassandra type
-   *     format. If the column is missing or contains an invalid value, this will return {@code
-   *     null}.
+   * Converts a hexadecimal string into a byte array.
+   *
+   * @param binaryEncodedStr the hexadecimal string to be converted. It must have an even number of
+   *     characters, as each pair of characters represents one byte.
+   * @return a byte array representing the binary data equivalent of the hexadecimal string.
    */
-  public static LocalDate handleCassandraDateType(String colName, JSONObject valuesJson) {
-    return handleCassandraGenericDateType(colName, valuesJson, "yyyy-MM-dd");
+  private static byte[] convertBinaryEncodedStringToByteArray(String binaryEncodedStr) {
+    int length = binaryEncodedStr.length();
+    int byteCount = (length + 7) / 8;
+    byte[] byteArray = new byte[byteCount];
+
+    for (int i = 0; i < byteCount; i++) {
+      int startIndex = i * 8;
+      int endIndex = Math.min(startIndex + 8, length);
+      String byteString = binaryEncodedStr.substring(startIndex, endIndex);
+      byteArray[i] = (byte) Integer.parseInt(byteString, 2);
+    }
+
+    return byteArray;
   }
 
   /**
@@ -265,710 +213,482 @@ public static LocalDate handleCassandraDateType(String colName, JSONObject value
    * <p>This method is particularly useful for processing timestamp data stored in Cassandra, where
    * timestamps are often stored as ISO-8601 strings.
    *
-   * @param colName the key used to fetch the value from the provided {@link JSONObject}.
-   * @param valuesJson the JSON object containing key-value pairs, including the timestamp value.
+   * @param timestampValue the used to parse the Instant.
    * @return an {@link Instant} representing the parsed timestamp value in UTC.
    * @throws IllegalArgumentException if the column value is missing, empty, or cannot be parsed as
    *     a valid timestamp.
    */
-  public static Instant handleCassandraTimestampType(String colName, JSONObject valuesJson) {
-    String timestampValue = valuesJson.optString(colName, null);
+  private static Instant handleCassandraTimestampType(String timestampValue) {
     if (timestampValue == null || timestampValue.isEmpty()) {
       throw new IllegalArgumentException(
-          "Timestamp value for column " + colName + " is null or empty.");
+          "Timestamp value for " + timestampValue + " is null or empty.");
     }
     return convertToCassandraTimestamp(timestampValue);
   }
 
-  /**
-   * A helper method that handles the conversion of a given column value to a {@link LocalDate}
-   * based on the specified date format (formatter).
-   *
-   * <p>This method extracts the value for the given column name from the provided JSON object and
-   * parses it into a {@link LocalDate} based on the provided date format. If the value is in an
-   * unsupported type or format, an exception is thrown.
-   *
-   * @param colName - the key used to fetch the value from the provided {@link JSONObject}.
-   * @param valuesJson - the JSON object containing all key-value pairs for the current incoming
-   *     data stream.
-   * @param formatter - the date format pattern used to parse the value (e.g., "yyyy-MM-dd").
-   * @return a {@link LocalDate} object containing the parsed date value. If the column is missing
-   *     or invalid, this method returns {@code null}.
-   */
-  public static LocalDate handleCassandraGenericDateType(
-      String colName, JSONObject valuesJson, String formatter) {
-    Object colValue = valuesJson.opt(colName);
-    if (colValue == null) {
-      return null;
-    }
-
-    if (formatter == null) {
-      formatter = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-    }
-
-    return parseDate(colName, colValue, formatter);
-  }
-
-  /**
-   * Parses a column value (String, {@link java.util.Date}, or {@code Long}) into a {@link
-   * LocalDate} using the specified date format.
-   *
-   * <p>This method handles different data types (String, Date, Long) by converting them into a
-   * {@link LocalDate}. The provided formatter is used to parse date strings, while other types are
-   * converted based on their corresponding representations.
-   *
-   * @param colName - the key used to fetch the value from the provided {@link JSONObject}.
-   * @param colValue - the value to be parsed into a {@link LocalDate}.
-   * @param formatter - the date format pattern used to parse date strings.
-   * @return a {@link LocalDate} object parsed from the given value.
-   * @throws IllegalArgumentException if the value cannot be parsed or is of an unsupported type.
-   */
-  public static LocalDate parseDate(String colName, Object colValue, String formatter) {
-    LocalDate localDate;
-    if (colValue instanceof String) {
-      try {
-        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(formatter);
-        localDate = LocalDate.parse((String) colValue, dateFormatter);
-      } catch (DateTimeParseException e) {
-        throw new IllegalArgumentException("Invalid date format for column " + colName, e);
-      }
-    } else if (colValue instanceof java.util.Date) {
-      localDate =
-          ((java.util.Date) colValue)
-              .toInstant()
-              .atZone(java.time.ZoneId.systemDefault())
-              .toLocalDate();
-    } else if (colValue instanceof Long) {
-      localDate =
-          java.time.Instant.ofEpochMilli((Long) colValue)
-              .atZone(java.time.ZoneId.systemDefault())
-              .toLocalDate();
-    } else {
-      throw new IllegalArgumentException("Unsupported type for column " + colName);
-    }
-    return localDate;
-  }
-
   /**
    * Generates a Type based on the provided {@link CassandraTypeHandler}.
    *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link String} object containing String as value represented in cassandra type.
-   */
-  public static String handleCassandraTextType(String colName, JSONObject valuesJson) {
-    return valuesJson.optString(
-        colName, null); // Get the value or null if the key is not found or the value is null
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
+   * @param uuidString - which is used to parsed and return UUID.
    * @return a {@link UUID} object containing UUID as value represented in cassandra type.
    */
-  public static UUID handleCassandraUuidType(String colName, JSONObject valuesJson) {
-    String uuidString =
-        valuesJson.optString(
-            colName, null); // Get the value or null if the key is not found or the value is null
-
+  private static UUID handleCassandraUuidType(String uuidString) {
     if (uuidString == null) {
       return null;
     }
-
     return UUID.fromString(uuidString);
   }
 
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Long} object containing Long as value represented in cassandra type.
-   */
-  public static Long handleCassandraBigintType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigInteger(colName).longValue();
-    } catch (JSONException e) {
-      return null;
+  private static Instant convertToCassandraTimestamp(String timestampValue) {
+    if (timestampValue == null || timestampValue.trim().isEmpty()) {
+      throw new IllegalArgumentException("Timestamp value cannot be null or empty");
     }
-  }
 
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Integer} object containing Integer as value represented in cassandra type.
-   */
-  public static Integer handleCassandraIntType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigInteger(colName).intValue();
-    } catch (JSONException e) {
-      return null;
-    }
-  }
+    List<DateTimeFormatter> formatters =
+        Arrays.asList(
+            DateTimeFormatter.ISO_INSTANT,
+            DateTimeFormatter.ISO_DATE_TIME,
+            DateTimeFormatter.ISO_LOCAL_DATE,
+            DateTimeFormatter.ISO_TIME,
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"),
+            DateTimeFormatter.ofPattern("MM/dd/yyyy"),
+            DateTimeFormatter.ofPattern("yyyy/MM/dd"),
+            DateTimeFormatter.ofPattern("dd-MM-yyyy"),
+            DateTimeFormatter.ofPattern("dd/MM/yyyy"),
+            DateTimeFormatter.ofPattern("MM-dd-yyyy"),
+            DateTimeFormatter.ofPattern("dd MMM yyyy"));
+
+    for (DateTimeFormatter formatter : formatters) {
+      try {
+        TemporalAccessor temporal = formatter.parse(timestampValue);
 
-  /**
-   * Generates a {@link List} object containing a list of long values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of long values represented in Cassandra.
-   */
-  public static List<Long> handleInt64ArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName,
-        valuesJson,
-        obj -> {
-          if (obj instanceof Long) {
-            return (Long) obj;
-          } else if (obj instanceof Number) {
-            return ((Number) obj).longValue();
-          } else if (obj instanceof String) {
-            try {
-              return Long.getLong((String) obj);
-            } catch (NumberFormatException e) {
-              throw new IllegalArgumentException("Invalid number format for column " + colName, e);
-            }
-          } else {
-            throw new IllegalArgumentException("Unsupported type for column " + colName);
-          }
-        });
-  }
+        if (temporal.isSupported(ChronoField.INSTANT_SECONDS)) {
+          return Instant.from(temporal);
+        }
 
-  /**
-   * Generates a {@link Set} object containing a set of long values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of long values represented in Cassandra.
-   */
-  public static Set<Long> handleInt64SetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleInt64ArrayType(colName, valuesJson));
-  }
+        if (temporal.isSupported(ChronoField.EPOCH_DAY)) {
+          return LocalDate.from(temporal).atStartOfDay(ZoneOffset.UTC).toInstant();
+        }
 
-  /**
-   * Generates a {@link List} object containing a list of integer values from Cassandra by
-   * converting long values to int.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of integer values represented in Cassandra.
-   */
-  public static List<Integer> handleInt64ArrayAsInt32Array(String colName, JSONObject valuesJson) {
-    return handleInt64ArrayType(colName, valuesJson).stream()
-        .map(Long::intValue)
-        .collect(Collectors.toList());
-  }
+        if (temporal.isSupported(ChronoField.SECOND_OF_DAY)) {
+          return LocalTime.from(temporal)
+              .atDate(LocalDate.now(ZoneOffset.UTC))
+              .atZone(ZoneOffset.UTC)
+              .toInstant();
+        }
+      } catch (DateTimeParseException ex) {
+        LOG.debug("Formatter failed: {}, Exception: {}", formatter, ex.getMessage());
+      }
+    }
 
-  /**
-   * Generates a {@link Set} object containing a set of integer values from Cassandra by converting
-   * long values to int.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of integer values represented in Cassandra.
-   */
-  public static Set<Integer> handleInt64ArrayAsInt32Set(String colName, JSONObject valuesJson) {
-    return handleInt64ArrayType(colName, valuesJson).stream()
-        .map(Long::intValue)
-        .collect(Collectors.toSet());
+    throw new IllegalArgumentException("Failed to parse timestamp value: " + timestampValue);
   }
 
   /**
-   * Generates a {@link Set} object containing a set of string values from Cassandra.
+   * Safely executes a handler method, catching exceptions and rethrowing them as
+   * IllegalArgumentException exceptions.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of string values represented in Cassandra.
-   */
-  public static Set<String> handleStringSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleStringArrayType(colName, valuesJson));
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of string values from Cassandra.
+   * <p>This method provides exception safety by wrapping the execution of a supplier function.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of string values represented in Cassandra.
+   * @param <T> The return type of the handler.
+   * @param supplier A functional interface providing the value.
+   * @return The result of the supplier function.
+   * @throws IllegalArgumentException If an exception occurs during the supplier execution.
    */
-  public static List<String> handleStringArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(colName, valuesJson, String::valueOf);
+  private static <T> T safeHandle(HandlerSupplier<T> supplier) {
+    try {
+      return supplier.get();
+    } catch (Exception e) {
+      LOG.error(e.getMessage());
+      throw new IllegalArgumentException("Error handling type: " + e.getMessage(), e);
+    }
   }
 
   /**
-   * Generates a {@link List} object containing a list of boolean values from Cassandra.
+   * Handles the conversion of a Spanner column type to an appropriate value.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of boolean values represented in Cassandra.
-   */
-  public static List<Boolean> handleBoolArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName, valuesJson, obj -> obj instanceof String && Boolean.parseBoolean((String) obj));
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of boolean values from Cassandra.
+   * <p>This method attempts to retrieve the value for the specified column from the provided JSON
+   * object and return it as a string. If the value is not found or an error occurs, it handles the
+   * exception and returns null or throws an exception accordingly.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of boolean values represented in Cassandra.
+   * @param spannerType The type of the Spanner column (currently unused in the method, but might be
+   *     used for further expansion).
+   * @param columnName The name of the column whose value is to be retrieved.
+   * @param valuesJson The JSON object containing the values of the columns.
+   * @return The value of the column as a string, or null if the value is not found.
+   * @throws IllegalArgumentException If an error occurs during the processing of the value.
    */
-  public static Set<Boolean> handleBoolSetTypeString(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleBoolArrayType(colName, valuesJson));
+  private static Object handleSpannerColumnType(
+      String spannerType, String columnName, JSONObject valuesJson) {
+    try {
+      if (spannerType.contains("string")) {
+        return valuesJson.optString(columnName);
+      } else if (spannerType.contains("bytes")) {
+        if (valuesJson.isNull(columnName)) {
+          return null;
+        }
+        String hexEncodedString = valuesJson.optString(columnName);
+        return convertBinaryEncodedStringToByteArray(hexEncodedString);
+      } else {
+        return valuesJson.isNull(columnName) ? null : valuesJson.opt(columnName);
+      }
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Exception Caught During parsing for Spanner column type: " + spannerType);
+    }
   }
 
   /**
-   * Generates a {@link List} object containing a list of double values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of double values represented in Cassandra.
-   */
-  public static List<Double> handleFloat64ArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName,
-        valuesJson,
-        obj -> {
-          if (obj instanceof Number) {
-            return ((Number) obj).doubleValue();
-          } else if (obj instanceof String) {
-            try {
-              return Double.valueOf((String) obj);
-            } catch (NumberFormatException e) {
-              throw new IllegalArgumentException("Invalid number format for column " + colName, e);
-            }
-          } else {
-            throw new IllegalArgumentException("Unsupported type for column " + colName);
-          }
-        });
-  }
+   * Parses a column value based on its Cassandra column type and wraps it into {@link
+   * PreparedStatementValueObject}.
+   *
+   * <p>This method processes basic Cassandra types (e.g., text, bigint, boolean, timestamp) and
+   * special types such as {@link Instant}, {@link UUID}, {@link BigInteger}, and {@link Duration}.
+   *
+   * @param columnType The Cassandra column type (e.g., "text", "timestamp").
+   * @param colValue The column value to parse and wrap.
+   * @return A {@link PreparedStatementValueObject} containing the parsed column value.
+   * @throws IllegalArgumentException If the column value cannot be converted to the specified type.
+   */
+  private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
+      String columnType, Object colValue) {
+
+    // Handle collection types
+    if (columnType.startsWith("list<")) {
+      return safeHandle(
+          () -> {
+            JSONArray parsedJSONArray =
+                colValue instanceof JSONArray
+                    ? (JSONArray) colValue
+                    : new JSONArray((String) colValue);
+            return PreparedStatementValueObject.create(
+                columnType, parseCassandraList(columnType, parsedJSONArray));
+          });
+    } else if (columnType.startsWith("set<")) {
+      return safeHandle(
+          () -> {
+            JSONArray parsedJSONArray =
+                colValue instanceof JSONArray
+                    ? (JSONArray) colValue
+                    : new JSONArray((String) colValue);
+            return PreparedStatementValueObject.create(
+                columnType, parseCassandraSet(columnType, parsedJSONArray));
+          });
+    } else if (columnType.startsWith("map<")) {
+      return safeHandle(
+          () -> {
+            JSONObject parsedJSON =
+                colValue instanceof JSONObject
+                    ? (JSONObject) colValue
+                    : new JSONObject((String) colValue);
+            return PreparedStatementValueObject.create(
+                columnType, parseCassandraMap(columnType, parsedJSON));
+          });
+    }
 
-  /**
-   * Generates a {@link Set} object containing a set of double values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of double values represented in Cassandra.
-   */
-  public static Set<Double> handleFloat64SetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleFloat64ArrayType(colName, valuesJson));
+    // Handle primitive and standard types
+    switch (columnType) {
+      case "ascii":
+      case "text":
+      case "varchar":
+        return PreparedStatementValueObject.create(columnType, (String) colValue);
+
+      case "bigint":
+      case "int":
+      case "smallint":
+      case "tinyint":
+        return safeHandle(
+            () ->
+                PreparedStatementValueObject.create(
+                    columnType, parseNumericType(columnType, colValue.toString())));
+
+      case "boolean":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> parseBoolean(colValue.toString())));
+
+      case "decimal":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> parseDecimal(colValue.toString())));
+
+      case "double":
+      case "float":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> parseFloatingPoint(columnType, colValue.toString())));
+
+      case "inet":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> handleCassandraInetAddressType(colValue.toString())));
+
+      case "time":
+        return PreparedStatementValueObject.create(
+            columnType,
+            safeHandle(
+                () ->
+                    handleCassandraTimestampType(colValue.toString())
+                        .atZone(ZoneId.systemDefault())
+                        .toLocalTime()));
+      case "timestamp":
+      case "datetime":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> handleCassandraTimestampType(colValue.toString())));
+
+      case "date":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> parseDate(colValue.toString())));
+
+      case "timeuuid":
+      case "uuid":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> handleCassandraUuidType(colValue.toString())));
+
+      case "varint":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> handleCassandraVarintType(colValue.toString())));
+
+      case "duration":
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> handleCassandraDurationType(colValue.toString())));
+
+      case "blob":
+        return safeHandle(
+            () -> PreparedStatementValueObject.create(columnType, parseBlobType(colValue)));
+
+      default:
+        return PreparedStatementValueObject.create(columnType, colValue);
+    }
   }
 
   /**
-   * Generates a {@link List} object containing a list of float values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of float values represented in Cassandra.
-   */
-  public static List<Float> handleFloatArrayType(String colName, JSONObject valuesJson) {
-    return handleFloat64ArrayType(colName, valuesJson).stream()
-        .map(Double::floatValue)
-        .collect(Collectors.toList());
+   * Parses a numeric value to the corresponding type based on the given column type.
+   *
+   * @param columnType the type of the column (e.g., "bigint", "int", "smallint", "tinyint").
+   * @param colValue the value to parse, either as a {@code String} or a {@code Number}.
+   * @return the parsed numeric value as the appropriate type (e.g., {@code Long}, {@code Integer},
+   *     {@code Short}, {@code Byte}).
+   * @throws IllegalArgumentException if the {@code colValue} type is unsupported or does not match
+   *     the column type.
+   */
+  private static Object parseNumericType(String columnType, Object colValue) {
+    return safeHandle(
+        () -> {
+          switch (columnType) {
+            case "bigint":
+              return Long.parseLong((String) colValue);
+            case "int":
+              return Integer.parseInt((String) colValue);
+            case "smallint":
+              return Short.parseShort((String) colValue);
+            case "tinyint":
+              return Byte.parseByte((String) colValue);
+          }
+          throw new IllegalArgumentException(
+              "Unsupported type for " + columnType + ": " + colValue.getClass());
+        });
   }
 
   /**
-   * Generates a {@link Set} object containing a set of float values from Cassandra.
+   * Parses a boolean value from the provided input.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of float values represented in Cassandra.
+   * @param colValue the value to parse, either as a {@code String} or a {@code Boolean}.
+   * @return the parsed boolean value.
+   * @throws ClassCastException if the {@code colValue} is not a {@code String} or {@code Boolean}.
    */
-  public static Set<Float> handleFloatSetType(String colName, JSONObject valuesJson) {
-    return handleFloat64SetType(colName, valuesJson).stream()
-        .map(Double::floatValue)
-        .collect(Collectors.toSet());
+  private static Boolean parseBoolean(Object colValue) {
+    if (Arrays.asList("0", "1").contains((String) colValue)) {
+      return colValue.equals("1");
+    }
+    return BooleanUtils.toBoolean((String) colValue);
   }
 
   /**
-   * Generates a {@link List} object containing a list of LocalDate values from Cassandra.
+   * Parses a decimal value from the provided input.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of LocalDate values represented in Cassandra.
+   * @param colValue the value to parse, either as a {@code String} or a {@code Number}.
+   * @return the parsed decimal value as a {@code BigDecimal}.
+   * @throws NumberFormatException if the {@code colValue} is a {@code String} and cannot be
+   *     converted to {@code BigDecimal}.
+   * @throws ClassCastException if the {@code colValue} is not a {@code String}, {@code Number}, or
+   *     {@code BigDecimal}.
    */
-  public static List<LocalDate> handleDateArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName, valuesJson, obj -> LocalDate.parse(obj.toString(), DateTimeFormatter.ISO_DATE));
+  private static BigDecimal parseDecimal(Object colValue) {
+    return new BigDecimal((String) colValue);
   }
 
   /**
-   * Generates a {@link Set} object containing a set of LocalDate values from Cassandra.
+   * Parses a floating-point value to the corresponding type based on the given column type.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of LocalDate values represented in Cassandra.
+   * @param columnType the type of the column (e.g., "double", "float").
+   * @param colValue the value to parse, either as a {@code String} or a {@code Number}.
+   * @return the parsed floating-point value as a {@code Double} or {@code Float}.
+   * @throws IllegalArgumentException if the column type is invalid or the value cannot be parsed.
    */
-  public static Set<LocalDate> handleDateSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleDateArrayType(colName, valuesJson));
+  private static Object parseFloatingPoint(String columnType, Object colValue) {
+    return columnType.equals("double")
+        ? Double.parseDouble((String) colValue)
+        : Float.parseFloat((String) colValue);
   }
 
-  /**
-   * Generates a {@link List} object containing a list of Timestamp values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of Timestamp values represented in Cassandra.
-   */
-  public static List<Timestamp> handleTimestampArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName,
-        valuesJson,
-        value ->
-            Timestamp.valueOf(
-                parseDate(colName, value, "yyyy-MM-dd'T'HH:mm:ss.SSSX").atStartOfDay()));
+  private static LocalDate parseDate(Object colValue) {
+    return handleCassandraTimestampType((String) colValue)
+        .atZone(ZoneId.systemDefault())
+        .toLocalDate();
   }
 
   /**
-   * Generates a {@link Set} object containing a set of Timestamp values from Cassandra.
+   * Parses a Cassandra list from the given JSON array.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of Timestamp values represented in Cassandra.
+   * @param columnType the Cassandra column type (e.g., "list of int", "list of text")
+   * @param colValue the JSON array representing the list values
+   * @return a {@link List} containing parsed values, or an empty list if {@code colValue} is null
    */
-  public static Set<Timestamp> handleTimestampSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleTimestampArrayType(colName, valuesJson));
+  private static List<?> parseCassandraList(String columnType, JSONArray colValue) {
+    if (colValue == null) {
+      return Collections.emptyList();
+    }
+    String innerType = extractInnerType(columnType);
+    List<Object> parsedList = new ArrayList<>();
+    for (int i = 0; i < colValue.length(); i++) {
+      Object value = colValue.get(i);
+      parsedList.add(parseNestedType(innerType, value).value());
+    }
+    return parsedList;
   }
 
   /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
+   * Extracts the inner type of a Cassandra collection column (e.g., "list of int" -> "int").
    *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link List} object containing List of ByteBuffer as value represented in cassandra
-   *     type.
+   * @param columnType the Cassandra column type
+   * @return the extracted inner type as a {@link String}
    */
-  public static List<ByteBuffer> handleByteArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(colName, valuesJson, CassandraTypeHandler::parseBlobType);
+  private static String extractInnerType(String columnType) {
+    return columnType.substring(columnType.indexOf('<') + 1, columnType.lastIndexOf('>'));
   }
 
   /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
+   * Extracts the key and value types from a Cassandra map column type (e.g., "map of int and
+   * text").
    *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link List} object containing List of Type T as value represented in cassandra type
-   *     which will be assigned runtime.
+   * @param columnType the Cassandra column type
+   * @return an array of two {@link String}s, where the first element is the key type and the second
+   *     element is the value type
    */
-  public static <T> List<T> handleArrayType(
-      String colName, JSONObject valuesJson, TypeParser<T> parser) {
-    return valuesJson.getJSONArray(colName).toList().stream()
-        .map(parser::parse)
-        .collect(Collectors.toList());
+  private static String[] extractKeyValueTypes(String columnType) {
+    String innerTypes =
+        columnType.substring(columnType.indexOf('<') + 1, columnType.lastIndexOf('>'));
+    return innerTypes.split(",", 2);
   }
 
   /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
+   * Parses a nested Cassandra type from a given value.
    *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Set} object containing Set of ByteBuffer as value represented in cassandra
-   *     type.
+   * @param type the Cassandra column type (e.g., "int", "text", "map of int of text")
+   * @param value the value to parse
+   * @return a {@link PreparedStatementValueObject} representing the parsed type
    */
-  public static Set<ByteBuffer> handleByteSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleByteArrayType(colName, valuesJson));
+  private static PreparedStatementValueObject<?> parseNestedType(String type, Object value) {
+    return parseAndCastToCassandraType(type.trim(), value);
   }
 
   /**
-   * Converts a stringified JSON object to a {@link Map} representation for Cassandra.
-   *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, parses the stringified JSON, and returns it as a {@link Map}.
+   * Parses a Cassandra set from the given JSON array.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link Map} representing the parsed JSON from the stringified JSON.
-   * @throws IllegalArgumentException If the value is not a valid stringified JSON or cannot be
-   *     parsed.
+   * @param columnType the Cassandra column type (e.g., "set of int", "set of text")
+   * @param colValue the JSON array representing the set values
+   * @return a {@link Set} containing parsed values, or an empty set if {@code colValue} is null
    */
-  public static Map<String, Object> handleStringifiedJsonToMap(
-      String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-    if (value instanceof String) {
-      String jsonString = (String) value;
-      try {
-        JSONObject jsonObject = new JSONObject(jsonString);
-        Map<String, Object> map = new HashMap<>();
-        for (String key : jsonObject.keySet()) {
-          Object jsonValue = jsonObject.get(key);
-          if (jsonValue instanceof JSONArray) {
-            map.put(key, jsonObject.getJSONArray(key));
-          } else if (jsonValue instanceof JSONObject) {
-            map.put(key, jsonObject.getJSONObject(key));
-          } else {
-            map.put(key, jsonValue);
-          }
-        }
-        return map;
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            "Invalid stringified JSON format for column: " + colName, e);
-      }
-    } else {
-      throw new IllegalArgumentException(
-          "Invalid format for column: " + colName + ". Expected a stringified JSON.");
+  private static Set<?> parseCassandraSet(String columnType, JSONArray colValue) {
+    if (colValue == null) {
+      return Collections.emptySet();
     }
-  }
-
-  /**
-   * Converts a stringified JSON array to a {@link List} representation for Cassandra.
-   *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, parses the stringified JSON array, and returns it as a {@link
-   * List}.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link List} representing the parsed JSON array from the stringified JSON.
-   * @throws IllegalArgumentException If the value is not a valid stringified JSON array or cannot
-   *     be parsed.
-   */
-  public static List<Object> handleStringifiedJsonToList(String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-    if (value instanceof String) {
-      String jsonString = (String) value;
-      try {
-        JSONArray jsonArray = new JSONArray(jsonString);
-        List<Object> list = new ArrayList<>();
-        for (int i = 0; i < jsonArray.length(); i++) {
-          list.add(jsonArray.get(i));
-        }
-        return list;
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            "Invalid stringified JSON array format for column: " + colName, e);
-      }
-    } else {
-      throw new IllegalArgumentException(
-          "Invalid format for column: " + colName + ". Expected a stringified JSON array.");
+    String innerType = extractInnerType(columnType);
+    Set<Object> parsedSet = new HashSet<>();
+    for (int i = 0; i < colValue.length(); i++) {
+      Object value = colValue.get(i);
+      parsedSet.add(parseNestedType(innerType, value).value());
     }
+    return parsedSet;
   }
 
   /**
-   * Converts a stringified JSON array to a {@link Set} representation for Cassandra.
-   *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, parses the stringified JSON array, and returns it as a {@link
-   * Set}.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link Set} representing the parsed JSON array from the stringified JSON.
-   * @throws IllegalArgumentException If the value is not a valid stringified JSON array or cannot
-   *     be parsed.
-   */
-  public static Set<Object> handleStringifiedJsonToSet(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleStringifiedJsonToList(colName, valuesJson));
-  }
-
-  /**
-   * Converts an {@link Integer} to a {@code short} (SmallInt).
-   *
-   * <p>This method checks if the {@code integerValue} is within the valid range for a {@code
-   * smallint} (i.e., between {@link Short#MIN_VALUE} and {@link Short#MAX_VALUE}). If the value is
-   * out of range, it throws an {@link IllegalArgumentException}.
+   * Parses a Cassandra map from the given JSON object.
    *
-   * @param integerValue The integer value to be converted.
-   * @return The converted {@code short} value.
-   * @throws IllegalArgumentException If the {@code integerValue} is out of range for a {@code
-   *     smallint}.
+   * @param columnType the Cassandra column type (e.g., "map of int and text")
+   * @param colValue the JSON object representing the map values
+   * @return a {@link Map} containing parsed key-value pairs, or an empty map if {@code colValue} is
+   *     null
    */
-  public static short convertToSmallInt(Integer integerValue) {
-    if (integerValue < Short.MIN_VALUE || integerValue > Short.MAX_VALUE) {
-      throw new IllegalArgumentException("Value is out of range for smallint.");
+  private static Map<?, ?> parseCassandraMap(String columnType, JSONObject colValue) {
+    if (colValue == null) {
+      return Collections.emptyMap();
     }
-    return integerValue.shortValue();
-  }
-
-  /**
-   * Converts an {@link Integer} to a {@code byte} (TinyInt).
-   *
-   * <p>This method checks if the {@code integerValue} is within the valid range for a {@code
-   * tinyint} (i.e., between {@link Byte#MIN_VALUE} and {@link Byte#MAX_VALUE}). If the value is out
-   * of range, it throws an {@link IllegalArgumentException}.
-   *
-   * @param integerValue The integer value to be converted.
-   * @return The converted {@code byte} value.
-   * @throws IllegalArgumentException If the {@code integerValue} is out of range for a {@code
-   *     tinyint}.
-   */
-  public static byte convertToTinyInt(Integer integerValue) {
-    if (integerValue < Byte.MIN_VALUE || integerValue > Byte.MAX_VALUE) {
-      throw new IllegalArgumentException("Value is out of range for tinyint.");
+    String[] keyValueTypes = extractKeyValueTypes(columnType);
+    String keyType = keyValueTypes[0];
+    String valueType = keyValueTypes[1];
+
+    Map<Object, Object> parsedMap = new HashMap<>();
+    for (String key : colValue.keySet()) {
+      Object parsedKey = parseNestedType(keyType, key).value();
+      Object parsedValue = parseNestedType(valueType, colValue.get(key)).value();
+      parsedMap.put(parsedKey, parsedValue);
     }
-    return integerValue.byteValue();
+    return parsedMap;
   }
 
   /**
-   * Escapes single quotes in a Cassandra string by replacing them with double single quotes.
+   * Parses a column's value from a JSON object based on Spanner and source database column types.
    *
-   * <p>This method is commonly used to sanitize strings before inserting them into Cassandra
-   * queries, where single quotes need to be escaped by doubling them (i.e., `'` becomes `''`).
+   * <p>This method determines the column type, extracts the value using helper methods, and returns
+   * a {@link PreparedStatementValueObject} containing the column value formatted for Cassandra.
    *
-   * @param value The string to be escaped.
-   * @return The escaped string where single quotes are replaced with double single quotes.
+   * @param spannerColDef The Spanner column definition containing column name and type.
+   * @param sourceColDef The source database column definition containing column type.
+   * @param valuesJson The JSON object containing column values.
+   * @param sourceDbTimezoneOffset The timezone offset for date-time columns (if applicable).
+   * @return A {@link PreparedStatementValueObject} containing the parsed column value.
    */
-  public static String escapeCassandraString(String value) {
-    return value.replace("'", "''");
-  }
+  public static PreparedStatementValueObject<?> getColumnValueByType(
+      SpannerColumnDefinition spannerColDef,
+      SourceColumnDefinition sourceColDef,
+      JSONObject valuesJson,
+      String sourceDbTimezoneOffset) {
 
-  /**
-   * Converts a string representation of a timestamp to a Cassandra-compatible timestamp.
-   *
-   * <p>The method parses the {@code value} as a {@link ZonedDateTime}, applies the given timezone
-   * offset to adjust the time, and converts the result into a UTC timestamp string that is
-   * compatible with Cassandra.
-   *
-   * @param value The timestamp string in ISO-8601 format (e.g., "2024-12-05T10:15:30+01:00").
-   * @param timezoneOffset The timezone offset (e.g., "+02:00") to apply to the timestamp.
-   * @return A string representation of the timestamp in UTC that is compatible with Cassandra.
-   * @throws RuntimeException If the timestamp string is invalid or the conversion fails.
-   */
-  public static String convertToCassandraTimestamp(String value, String timezoneOffset) {
-    try {
-      ZonedDateTime dateTime = ZonedDateTime.parse(value);
-      ZoneOffset offset = ZoneOffset.of(timezoneOffset);
-      dateTime = dateTime.withZoneSameInstant(offset);
-      return "'" + dateTime.withZoneSameInstant(ZoneOffset.UTC).toString() + "'";
-    } catch (DateTimeParseException e) {
-      throw new RuntimeException(e);
+    if (spannerColDef == null || sourceColDef == null) {
+      throw new IllegalArgumentException("Column definitions cannot be null.");
     }
-  }
 
-  /**
-   * Converts a string representation of a date to a {@link LocalDate} compatible with Cassandra.
-   *
-   * <p>The method parses the {@code dateString} into an {@link Instant}, converts it to a {@link
-   * Date}, and then retrieves the corresponding {@link LocalDate} from the system's default time
-   * zone.
-   *
-   * @param dateString The date string in ISO-8601 format (e.g., "2024-12-05T00:00:00Z").
-   * @return The {@link LocalDate} representation of the date.
-   */
-  public static LocalDate convertToCassandraDate(String dateString) {
-    Instant instant = convertToCassandraTimestamp(dateString);
-    ZonedDateTime zonedDateTime = instant.atZone(ZoneId.systemDefault());
-    return zonedDateTime.toLocalDate();
-  }
+    String spannerType = spannerColDef.getType().getName().toLowerCase();
+    String cassandraType = sourceColDef.getType().getName().toLowerCase();
+    String columnName = spannerColDef.getName();
 
-  /**
-   * Converts a string representation of a timestamp to an {@link Instant} compatible with
-   * Cassandra.
-   *
-   * <p>The method parses the {@code dateString} into an {@link Instant}, which represents an
-   * instantaneous point in time and is compatible with Cassandra timestamp types.
-   *
-   * @param timestampValue The timestamp string in ISO-8601 format (e.g., "2024-12-05T10:15:30Z").
-   * @return The {@link Instant} representation of the timestamp.
-   */
-  public static Instant convertToCassandraTimestamp(String timestampValue) {
-    try {
-      return Instant.parse(timestampValue);
-    } catch (DateTimeParseException e) {
-      try {
-        return ZonedDateTime.parse(timestampValue)
-            .withZoneSameInstant(java.time.ZoneOffset.UTC)
-            .toInstant();
-      } catch (DateTimeParseException nestedException) {
-        throw new IllegalArgumentException(
-            "Failed to parse timestamp value" + timestampValue, nestedException);
-      }
-    }
-  }
+    Object columnValue = handleSpannerColumnType(spannerType, columnName, valuesJson);
 
-  /**
-   * Validates if the given string represents a valid UUID.
-   *
-   * <p>This method attempts to parse the provided string as a UUID using {@link
-   * UUID#fromString(String)}. If parsing is successful, it returns {@code true}, indicating that
-   * the string is a valid UUID. Otherwise, it returns {@code false}.
-   *
-   * @param value The string to check if it represents a valid UUID.
-   * @return {@code true} if the string is a valid UUID, {@code false} otherwise.
-   */
-  public static boolean isValidUUID(String value) {
-    try {
-      UUID.fromString(value);
-      return true;
-    } catch (IllegalArgumentException e) {
-      return false;
-    }
-  }
-
-  /**
-   * Validates if the given string represents a valid IP address.
-   *
-   * <p>This method attempts to resolve the provided string as an {@link InetAddresses} using {@link
-   * InetAddresses#forString(String)}. If successful, it returns {@code true}, indicating that the
-   * string is a valid IP address. Otherwise, it returns {@code false}.
-   *
-   * @param value The string to check if it represents a valid IP address.
-   * @return {@code true} if the string is a valid IP address, {@code false} otherwise.
-   */
-  public static boolean isValidIPAddress(String value) {
-    try {
-      InetAddresses.forString(value);
-      return true;
-    } catch (Exception e) {
-      return false;
+    if (columnValue == null) {
+      LOG.warn("Column value is null for column: {}, type: {}", columnName, spannerType);
+      return PreparedStatementValueObject.create(cassandraType, NullClass.INSTANCE);
     }
+    return PreparedStatementValueObject.create(cassandraType, columnValue);
   }
 
   /**
-   * Validates if the given string is a valid JSON object.
+   * Casts the given column value to the expected type based on the Cassandra column type.
    *
-   * <p>This method attempts to parse the string using {@link JSONObject} to check if the value
-   * represents a valid JSON object. If the string is valid JSON, it returns {@code true}, otherwise
-   * {@code false}.
+   * <p>This method attempts to parse and cast the column value to a type compatible with the
+   * provided Cassandra column type using {@code parseAndGenerateCassandraType}. If the value cannot
+   * be cast correctly, an error is logged, and an exception is thrown.
    *
-   * @param value The string to check if it represents a valid JSON object.
-   * @return {@code true} if the string is a valid JSON object, {@code false} otherwise.
+   * @param cassandraType the Cassandra data type of the column (e.g., "text", "bigint", "list of
+   *     text")
+   * @param columnValue the value of the column to be cast
+   * @return the column value cast to the expected type
+   * @throws IllegalArgumentException if the Cassandra type is unsupported or the value is invalid
    */
-  public static boolean isValidJSON(String value) {
+  public static Object castToExpectedType(String cassandraType, Object columnValue) {
     try {
-      new JSONObject(value);
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  /**
-   * Helper method to check if a string contains only ASCII characters (0-127).
-   *
-   * @param value - The string to check.
-   * @return true if the string contains only ASCII characters, false otherwise.
-   */
-  public static boolean isAscii(String value) {
-    for (int i = 0; i < value.length(); i++) {
-      if (value.charAt(i) > 127) {
-        return false;
-      }
+      return parseAndCastToCassandraType(cassandraType, columnValue).value();
+    } catch (IllegalArgumentException e) {
+      LOG.error("Error converting value for column: {}, type: {}", cassandraType, e.getMessage());
+      throw new IllegalArgumentException(
+          "Error converting value for cassandraType: " + cassandraType);
     }
-    return true;
   }
 }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
index 9bdfe2bcda..6ea5047c6a 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.teleport.v2.templates.dbutils.processor;
 
+import static com.google.cloud.teleport.v2.templates.constants.Constants.SOURCE_CASSANDRA;
+
 import com.google.cloud.teleport.v2.spanner.exceptions.InvalidTransformationException;
 import com.google.cloud.teleport.v2.spanner.migrations.convertors.ChangeEventToMapConvertor;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
@@ -53,7 +55,8 @@ public static boolean processRecord(
       String shardId,
       String sourceDbTimezoneOffset,
       IDMLGenerator dmlGenerator,
-      ISpannerMigrationTransformer spannerToSourceTransformer)
+      ISpannerMigrationTransformer spannerToSourceTransformer,
+      String source)
       throws Exception {
 
     try {
@@ -95,6 +98,7 @@ public static boolean processRecord(
                   modType, tableName, newValuesJson, keysJson, sourceDbTimezoneOffset)
               .setSchema(schema)
               .setCustomTransformationResponse(customTransformationResponse)
+              .setCommitTimestamp(spannerRecord.getCommitTimestamp())
               .build();
 
       DMLGeneratorResponse dmlGeneratorResponse = dmlGenerator.getDMLStatement(dmlGeneratorRequest);
@@ -102,7 +106,24 @@ public static boolean processRecord(
         LOG.warn("DML statement is empty for table: " + tableName);
         return false;
       }
-      dao.write(dmlGeneratorResponse.getDmlStatement());
+      // TODO we need to handle it as proper Interface Level as of now we have handle Prepared
+      // TODO Statement and Raw Statement Differently
+      /*
+       * TODO:
+       * Note: The `SOURCE_CASSANDRA` case not covered in the unit tests.
+       * Answer: Currently, we have implemented unit tests for the Input Record Processor under the SourceWrittenFn.
+       *         These tests cover the majority of scenarios, but they are tightly coupled with the existing code.
+       *         Adding unit tests for SOURCE_CASSANDRA would require a significant refactoring of the entire unit test file.
+       *         Given the current implementation, such refactoring is deemed unnecessary as it would not provide substantial value or impact.
+       */
+      switch (source) {
+        case SOURCE_CASSANDRA:
+          dao.write(dmlGeneratorResponse);
+          break;
+        default:
+          dao.write(dmlGeneratorResponse.getDmlStatement());
+          break;
+      }
 
       Counter numRecProcessedMetric =
           Metrics.counter(shardId, "records_written_to_source_" + shardId);
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java
index 54d70d33c1..5d68c5a256 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java
@@ -24,12 +24,11 @@
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.CassandraDao;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.IDao;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.JdbcDao;
+import com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraDMLGenerator;
 import com.google.cloud.teleport.v2.templates.dbutils.dml.IDMLGenerator;
 import com.google.cloud.teleport.v2.templates.dbutils.dml.MySQLDMLGenerator;
 import com.google.cloud.teleport.v2.templates.exceptions.UnsupportedSourceException;
 import com.google.cloud.teleport.v2.templates.models.ConnectionHelperRequest;
-import com.google.cloud.teleport.v2.templates.models.DMLGeneratorRequest;
-import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,16 +53,7 @@ public class SourceProcessorFactory {
 
   static {
     dmlGeneratorMap.put(Constants.SOURCE_MYSQL, new MySQLDMLGenerator());
-    dmlGeneratorMap.put(
-        Constants.SOURCE_CASSANDRA,
-        new IDMLGenerator() {
-          // TODO It will get removed in DML PR added Now for Test case eg: new
-          // CassandraDMLGenerator()
-          @Override
-          public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequest) {
-            return new DMLGeneratorResponse("");
-          }
-        });
+    dmlGeneratorMap.put(Constants.SOURCE_CASSANDRA, new CassandraDMLGenerator());
 
     connectionHelperMap.put(Constants.SOURCE_MYSQL, new JdbcConnectionHelper());
     connectionHelperMap.put(Constants.SOURCE_CASSANDRA, new CassandraConnectionHelper());
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java
index 3db153c51e..dcb0693ecf 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java
@@ -15,6 +15,7 @@
  */
 package com.google.cloud.teleport.v2.templates.models;
 
+import com.google.cloud.Timestamp;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
 import java.util.Map;
 import org.json.JSONObject;
@@ -53,6 +54,7 @@ public class DMLGeneratorRequest {
   private final String sourceDbTimezoneOffset;
 
   private Map<String, Object> customTransformationResponse;
+  private final Timestamp commitTimestamp;
 
   public DMLGeneratorRequest(Builder builder) {
     this.modType = builder.modType;
@@ -62,6 +64,11 @@ public DMLGeneratorRequest(Builder builder) {
     this.keyValuesJson = builder.keyValuesJson;
     this.sourceDbTimezoneOffset = builder.sourceDbTimezoneOffset;
     this.customTransformationResponse = builder.customTransformationResponse;
+    this.commitTimestamp = builder.commitTimestamp;
+  }
+
+  public Timestamp getCommitTimestamp() {
+    return this.commitTimestamp;
   }
 
   public String getModType() {
@@ -100,6 +107,7 @@ public static class Builder {
     private final String sourceDbTimezoneOffset;
     private Schema schema;
     private Map<String, Object> customTransformationResponse;
+    private Timestamp commitTimestamp;
 
     public Builder(
         String modType,
@@ -119,6 +127,11 @@ public Builder setSchema(Schema schema) {
       return this;
     }
 
+    public Builder setCommitTimestamp(Timestamp commitTimestamp) {
+      this.commitTimestamp = commitTimestamp;
+      return this;
+    }
+
     public Builder setCustomTransformationResponse(
         Map<String, Object> customTransformationResponse) {
       this.customTransformationResponse = customTransformationResponse;
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
index 795284a9d4..bb1a2bc715 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
@@ -210,7 +210,8 @@ public void processElement(ProcessContext c) {
                   shardId,
                   sourceDbTimezoneOffset,
                   sourceProcessor.getDmlGenerator(),
-                  spannerToSourceTransformer);
+                  spannerToSourceTransformer,
+                  this.source);
           if (isEventFiltered) {
             outputWithTag(c, Constants.FILTERED_TAG, Constants.FILTERED_TAG_MESSAGE, spannerRec);
           }
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDaoTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDaoTest.java
index 967dd8b83a..494d207eb7 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDaoTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDaoTest.java
@@ -27,6 +27,7 @@
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import com.google.cloud.teleport.v2.templates.dbutils.connection.IConnectionHelper;
+import com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler;
 import com.google.cloud.teleport.v2.templates.exceptions.ConnectionException;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
@@ -90,6 +91,27 @@ public void testPreparedStatementExecution() throws Exception {
     verify(mockSession).execute(ArgumentMatchers.eq(mockBoundStatement));
   }
 
+  @Test
+  public void testPreparedStatementExecutionForNullAsValue() throws Exception {
+    String preparedDmlStatement = "INSERT INTO test (id, name) VALUES (?, ?)";
+    List<PreparedStatementValueObject<?>> values =
+        Arrays.asList(
+            PreparedStatementValueObject.create("date", CassandraTypeHandler.NullClass.INSTANCE),
+            PreparedStatementValueObject.create("varchar", "text"));
+
+    when(mockPreparedStatementGeneratedResponse.getDmlStatement()).thenReturn(preparedDmlStatement);
+    when(mockPreparedStatementGeneratedResponse.getValues()).thenReturn(values);
+    when(mockConnectionHelper.getConnection(anyString())).thenReturn(mockSession);
+    when(mockSession.prepare(preparedDmlStatement)).thenReturn(mockPreparedStatement);
+    when(mockPreparedStatement.bind(ArgumentMatchers.any())).thenReturn(mockBoundStatement);
+
+    cassandraDao.write(mockPreparedStatementGeneratedResponse);
+
+    verify(mockSession).prepare(ArgumentMatchers.eq(preparedDmlStatement));
+    verify(mockPreparedStatement).bind(ArgumentMatchers.any());
+    verify(mockSession).execute(ArgumentMatchers.eq(mockBoundStatement));
+  }
+
   @Test
   public void testWriteWithExceptionInPreparedStatement() throws Exception {
     String preparedDmlStatement = "INSERT INTO test (id, name) VALUES (?, ?)";
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
new file mode 100644
index 0000000000..092fe0e00d
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
@@ -0,0 +1,925 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates.dbutils.dml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.cloud.Timestamp;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.NameAndCols;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceTable;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnType;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerTable;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SyntheticPKey;
+import com.google.cloud.teleport.v2.spanner.migrations.utils.SessionFileReader;
+import com.google.cloud.teleport.v2.templates.dbutils.processor.InputRecordProcessor;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorRequest;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CassandraDMLGeneratorTest {
+
+  private CassandraDMLGenerator cassandraDMLGenerator;
+
+  @Before
+  public void setUp() {
+    cassandraDMLGenerator = new CassandraDMLGenerator();
+  }
+
+  @Test
+  public void testGetDMLStatement_NullRequest() {
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(null);
+    assertNotNull(response);
+    assertEquals("", response.getDmlStatement());
+  }
+
+  @Test
+  public void testGetDMLStatement_InvalidSchema() {
+    DMLGeneratorRequest dmlGeneratorRequest =
+        new DMLGeneratorRequest.Builder("insert", "text", null, null, null).setSchema(null).build();
+
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(dmlGeneratorRequest);
+    assertNotNull(response);
+    assertEquals("", response.getDmlStatement());
+  }
+
+  @Test
+  public void testGetDMLStatement_MissingTableMapping() {
+    Schema schema = new Schema();
+    schema.setSpannerToID(null);
+    DMLGeneratorRequest dmlGeneratorRequest =
+        new DMLGeneratorRequest.Builder("insert", "text", null, null, null)
+            .setSchema(schema)
+            .build();
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(dmlGeneratorRequest);
+    assertNotNull(response);
+    assertEquals("", response.getDmlStatement());
+  }
+
+  @Test
+  public void tableAndAllColumnNameTypesMatch() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void tableAndAllColumnNameTypesForNullValueMatch() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "sample_table";
+    String newValueStr = "{\"date_column\":null}";
+    JSONObject newValuesJson = new JSONObject(newValueStr);
+    String keyValueString = "{\"id\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("id"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "999",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(values.get(1).value() instanceof CassandraTypeHandler.NullClass);
+  }
+
+  @Test
+  public void tableNameMatchSourceColumnNotPresentInSpanner() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void tableNameMatchSpannerColumnNotPresentInSource() {
+
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"hb_shardId\":\"shardA\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+    assertEquals(
+        "shardA",
+        CassandraTypeHandler.castToExpectedType(values.get(2).dataType(), values.get(2).value()));
+  }
+
+  @Test
+  public void primaryKeyNotFoundInJson() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SomeRandomName\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void primaryKeyNotPresentInSourceSchema() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"musicId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void primaryKeyMismatch() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"SingerId\":\"999\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"FirstName\":\"kk\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void deleteMultiplePKColumns() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"LastName\":null}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\",\"FirstName\":\"kk\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "DELETE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void testSingleQuoteMatch() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"k\u0027k\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void singleQuoteBytesDML() throws Exception {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"Jw\u003d\u003d\",\"string_column\":\"\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void testParseBlobType_hexString() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"0102030405\",\"string_column\":\"\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void testParseBlobType_base64String() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"AQIDBAU=\",\"string_column\":\"\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void twoSingleEscapedQuoteDML() throws Exception {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"Jyc\u003d\",\"string_column\":\"\u0027\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void threeEscapesAndSingleQuoteDML() throws Exception {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"XCc\u003d\",\"string_column\":\"\\\\\\\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void tabEscapeDML() throws Exception {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"CQ==\",\"string_column\":\"\\t\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void backSpaceEscapeDML() throws Exception {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"CA==\",\"string_column\":\"\\b\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void newLineEscapeDML() throws Exception {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"Cg==\",\"string_column\":\"\\n\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        "12",
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertTrue(
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value())
+            instanceof ByteBuffer);
+  }
+
+  @Test
+  public void bitColumnSql() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"YmlsX2NvbA\u003d\u003d\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "YmlsX2NvbA==",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void testSpannerKeyIsNull() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":null}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(CassandraTypeHandler.NullClass.INSTANCE, values.get(0).value());
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void testSourcePKNotInSpanner() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "customer";
+    String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"Dont\":\"care\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "DELETE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void primaryKeyMismatchSpannerNull() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"SingerId\":\"999\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"FirstName\":null}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void testUnsupportedModType() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "JUNK";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testUpdateModType() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "UPDATE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    List<PreparedStatementValueObject<?>> values =
+        ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues();
+    assertEquals(
+        999,
+        CassandraTypeHandler.castToExpectedType(values.get(0).dataType(), values.get(0).value()));
+    assertEquals(
+        "ll",
+        CassandraTypeHandler.castToExpectedType(values.get(1).dataType(), values.get(1).value()));
+  }
+
+  @Test
+  public void testSpannerTableIdMismatch() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"Dont\":\"care\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "DELETE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSourcePkNull() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Persons";
+    String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"Dont\":\"care\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSpannerTableNotInSchemaObject() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+    schema.getSpSchema().remove(schema.getSpannerToID().get(tableName).getName());
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"SingerId\":null}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SmthingElse\":null}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSpannerColDefsNull() {
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
+    String tableName = "Singers";
+
+    String spannerTableId = schema.getSpannerToID().get(tableName).getName();
+    SpannerTable spannerTable = schema.getSpSchema().get(spannerTableId);
+    spannerTable.getColDefs().remove("c5");
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"23\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    CassandraDMLGenerator test = new CassandraDMLGenerator();
+    InputRecordProcessor test2 = new InputRecordProcessor();
+    assertTrue(sql.isEmpty());
+  }
+
+  public static Schema getSchemaObject() {
+    Map<String, SyntheticPKey> syntheticPKeys = new HashMap<String, SyntheticPKey>();
+    Map<String, SourceTable> srcSchema = new HashMap<String, SourceTable>();
+    Map<String, SpannerTable> spSchema = getSampleSpSchema();
+    Map<String, NameAndCols> spannerToID = getSampleSpannerToId();
+    Schema expectedSchema = new Schema(spSchema, syntheticPKeys, srcSchema);
+    expectedSchema.setSpannerToID(spannerToID);
+    return expectedSchema;
+  }
+
+  public static Map<String, SpannerTable> getSampleSpSchema() {
+    Map<String, SpannerTable> spSchema = new HashMap<String, SpannerTable>();
+    Map<String, SpannerColumnDefinition> t1SpColDefs =
+        new HashMap<String, SpannerColumnDefinition>();
+    t1SpColDefs.put(
+        "c1", new SpannerColumnDefinition("accountId", new SpannerColumnType("STRING", false)));
+    t1SpColDefs.put(
+        "c2", new SpannerColumnDefinition("accountName", new SpannerColumnType("STRING", false)));
+    t1SpColDefs.put(
+        "c3",
+        new SpannerColumnDefinition("migration_shard_id", new SpannerColumnType("STRING", false)));
+    t1SpColDefs.put(
+        "c4", new SpannerColumnDefinition("accountNumber", new SpannerColumnType("INT", false)));
+    spSchema.put(
+        "t1",
+        new SpannerTable(
+            "tableName",
+            new String[] {"c1", "c2", "c3", "c4"},
+            t1SpColDefs,
+            new ColumnPK[] {new ColumnPK("c1", 1)},
+            "c3"));
+    return spSchema;
+  }
+
+  public static Map<String, NameAndCols> getSampleSpannerToId() {
+    Map<String, NameAndCols> spannerToId = new HashMap<String, NameAndCols>();
+    Map<String, String> t1ColIds = new HashMap<String, String>();
+    t1ColIds.put("accountId", "c1");
+    t1ColIds.put("accountName", "c2");
+    t1ColIds.put("migration_shard_id", "c3");
+    t1ColIds.put("accountNumber", "c4");
+    spannerToId.put("tableName", new NameAndCols("t1", t1ColIds));
+    return spannerToId;
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index 33bd3cfece..463fc5589d 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -15,72 +15,43 @@
  */
 package com.google.cloud.teleport.v2.templates.dbutils.dml;
 
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToCassandraDate;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToCassandraTimestamp;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToSmallInt;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToTinyInt;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.escapeCassandraString;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleBoolSetTypeString;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleByteArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleByteSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraAsciiType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraBigintType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraBlobType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraBoolType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraDateType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraDoubleType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraDurationType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraFloatType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraInetAddressType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraIntType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraTextType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraTimestampType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraUuidType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraVarintType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleDateSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleFloat64ArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleFloatArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleFloatSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleInt64ArrayAsInt32Array;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleInt64ArrayAsInt32Set;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleInt64SetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringifiedJsonToMap;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringifiedJsonToSet;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.isValidIPAddress;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.isValidJSON;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.isValidUUID;
+import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.castToExpectedType;
+import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.getColumnValueByType;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import static org.mockito.Mockito.mock;
+
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnType;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnType;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
+import com.google.common.net.InetAddresses;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.util.Arrays;
-import java.util.Base64;
-import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -88,1230 +59,1149 @@
 public class CassandraTypeHandlerTest {
 
   @Test
-  public void convertSpannerValueJsonToBooleanType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"isAdmin\":\"true\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "isAdmin";
-    Boolean convertedValue = handleCassandraBoolType(colKey, newValuesJson);
-    assertTrue(convertedValue);
-  }
+  public void testGetColumnValueByTypeForString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("varchar", null, null);
+    String columnName = "test_column";
+    String sourceDbTimezoneOffset = null;
 
-  @Test
-  public void convertSpannerValueJsonToBooleanType_False() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"isAdmin\":\"false\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "isAdmin";
-    Boolean convertedValue = handleCassandraBoolType(colKey, newValuesJson);
-    Assert.assertFalse(convertedValue);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void convertSpannerValueJsonToFloatType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"age\":23.5}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Float convertedValue = handleCassandraFloatType(colKey, newValuesJson);
-    assertEquals(23.5f, convertedValue, 0.01f);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "test_value");
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void convertSpannerValueJsonToDoubleType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"salary\":100000.75}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "salary";
-    Double convertedValue = handleCassandraDoubleType(colKey, newValuesJson);
-    assertEquals(100000.75, convertedValue, 0.01);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+    assertEquals("test_value", castResult);
   }
 
   @Test
-  public void convertSpannerValueJsonToBlobType_FromByteArray() {
-    String newValuesString =
-        "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":\"QUJDQDEyMzQ=\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    byte[] expectedBytes = java.util.Base64.getDecoder().decode("QUJDQDEyMzQ=");
-    byte[] actualBytes = new byte[convertedValue.remaining()];
-    convertedValue.get(actualBytes);
-    Assert.assertArrayEquals(expectedBytes, actualBytes);
-  }
+  public void testGetColumnValueByType() {
+    String spannerColumnType = "string";
+    String sourceType = "varchar";
+    SpannerColumnType spannerType = new SpannerColumnType(spannerColumnType, false);
+    SourceColumnType sourceColumnType = new SourceColumnType(sourceType, null, null);
+    String columnValue = "é";
+    String columnName = "LastName";
+    String sourceDbTimezoneOffset = null;
 
-  @Rule public ExpectedException expectedEx = ExpectedException.none();
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleNullBooleanType() {
-    String newValuesString = "{\"isAdmin\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "isAdmin";
-    assertEquals(false, handleCassandraBoolType(colKey, newValuesJson));
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-  @Test
-  public void testHandleNullFloatType() {
-    String newValuesString = "{\"age\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    assertNull(handleCassandraFloatType(colKey, newValuesJson));
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleNullDoubleType() {
-    String newValuesString = "{\"salary\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "salary";
-    Double value = handleCassandraDoubleType(colKey, newValuesJson);
-    assertNull(value);
-  }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-  @Test
-  public void testHandleMaxInteger() {
-    String newValuesString = "{\"age\":2147483647}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Integer value = handleCassandraIntType(colKey, newValuesJson);
-    assertEquals(Integer.MAX_VALUE, value.longValue());
+    assertEquals("é", castResult);
   }
 
   @Test
-  public void testHandleMinInteger() {
-    String newValuesString = "{\"age\":-2147483648}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Integer value = handleCassandraIntType(colKey, newValuesJson);
-    assertEquals(Integer.MIN_VALUE, value.longValue());
-  }
+  public void testGetColumnValueByTypeForNumericToInt() {
+    String spannerColumnName = "NUMERIC";
+    String sourceColumnName = "int";
+    SpannerColumnType spannerType = new SpannerColumnType(spannerColumnName, false);
+    SourceColumnType sourceColumnType = new SourceColumnType(sourceColumnName, null, null);
+    String columnName = "Salary";
+    String sourceDbTimezoneOffset = null;
 
-  @Test
-  public void testHandleMaxLong() {
-    String newValuesString = "{\"age\":9223372036854775807}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Long value = handleCassandraBigintType(colKey, newValuesJson);
-    assertEquals(Long.MAX_VALUE, value.longValue());
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleMinLong() {
-    String newValuesString = "{\"age\":-9223372036854775808}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Long value = handleCassandraBigintType(colKey, newValuesJson);
-    assertEquals(Long.MIN_VALUE, value.longValue());
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 12345);
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleMaxFloat() {
-    String newValuesString = "{\"value\":3.4028235E38}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Float value = handleCassandraFloatType(colKey, newValuesJson);
-    assertEquals(Float.MAX_VALUE, value, 0.01f);
-  }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-  @Test
-  public void testHandleMinFloat() {
-    String newValuesString = "{\"value\":-3.4028235E38}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Float value = handleCassandraFloatType(colKey, newValuesJson);
-    assertEquals(-Float.MAX_VALUE, value, 0.01f);
+    assertEquals(12345, castResult);
   }
 
   @Test
-  public void testHandleMaxDouble() {
-    String newValuesString = "{\"value\":1.7976931348623157E308}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Double value = handleCassandraDoubleType(colKey, newValuesJson);
-    assertEquals(Double.MAX_VALUE, value, 0.01);
-  }
+  public void testGetColumnValueByTypeForStringUUID() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("uuid", null, null);
+    String columnName = "id";
+    String columnValue = "123e4567-e89b-12d3-a456-426614174000";
+    String sourceDbTimezoneOffset = null;
 
-  @Test
-  public void testHandleMinDouble() {
-    String newValuesString = "{\"value\":-1.7976931348623157E308}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Double value = handleCassandraDoubleType(colKey, newValuesJson);
-    assertEquals(-Double.MAX_VALUE, value, 0.01);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleInvalidIntegerFormat() {
-    String newValuesString = "{\"age\":\"invalid_integer\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    handleCassandraIntType(colKey, newValuesJson);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-  @Test
-  public void testHandleInvalidLongFormat() {
-    String newValuesString = "{\"age\":\"invalid_long\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    handleCassandraBigintType(colKey, newValuesJson);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleInvalidFloatFormat() {
-    String newValuesString = "{\"value\":\"invalid_float\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    handleCassandraFloatType(colKey, newValuesJson);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(UUID.fromString(columnValue), castResult);
   }
 
   @Test
-  public void testHandleInvalidDoubleFormat() {
-    String newValuesString = "{\"value\":\"invalid_double\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    handleCassandraDoubleType(colKey, newValuesJson);
-  }
+  public void testGetColumnValueByTypeForStringIpAddress() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("inet", null, null);
+    String columnValue = "192.168.1.1";
+    String columnName = "ipAddress";
+    String sourceDbTimezoneOffset = null;
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidBlobFormat() {
-    String newValuesString = "{\"data\":\"not_base64\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    handleCassandraBlobType(colKey, newValuesJson);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidDateFormat() {
-    String newValuesString = "{\"birthdate\":\"invalid_date_format\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "birthdate";
-    handleCassandraDateType(colKey, newValuesJson);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-  @Test
-  public void testHandleNullTextType() {
-    String newValuesString = "{\"name\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    String value = handleCassandraTextType(colKey, newValuesJson);
-    assertNull(value);
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(InetAddresses.forString(columnValue), castResult);
   }
 
   @Test
-  public void testHandleUnsupportedBooleanType() {
-    String newValuesString = "{\"values\":[true, false]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
+  public void testGetColumnValueByTypeForStringJsonArray() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("set<text>", null, null);
+    String columnValue = "[\"apple\", \"banana\", \"cherry\"]";
+    String columnName = "fruits";
+    String sourceDbTimezoneOffset = null;
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    handleFloatSetType("values", newValuesJson);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+    Set<String> expectedSet = new HashSet<>(Arrays.asList("apple", "banana", "cherry"));
+    assertEquals(expectedSet, castResult);
   }
 
   @Test
-  public void testHandleUnsupportedListType() {
-    String newValuesString = "{\"values\":[[1, 2], [3, 4]]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
+  public void testGetColumnValueByTypeForStringJsonObject() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("map<text, text>", null, null);
+    String columnName = "user";
+    String columnValue = "{\"name\": \"John\", \"age\": \"30\"}";
+    String sourceDbTimezoneOffset = null;
 
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    handleFloatSetType("values", newValuesJson);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-  @Test
-  public void testHandleUnsupportedMapType() {
-    String newValuesString = "{\"values\":[{\"key1\":\"value1\"}, {\"key2\":\"value2\"}]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    handleFloatSetType("values", newValuesJson);
+    Map<String, String> expectedMap = new HashMap<>();
+    expectedMap.put("name", "John");
+    expectedMap.put("age", "30");
+    assertEquals(expectedMap, castResult);
   }
 
   @Test
-  public void testHandleUnsupportedType() {
-    String newValuesString = "{\"values\":[true, false]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
+  public void testGetColumnValueByTypeForStringHex() {
+    SpannerColumnType spannerType = new SpannerColumnType("bytes", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("blob", null, null);
+    String columnName = "lastName";
+    byte[] expectedBytes = new byte[] {1, 2, 3, 4, 5};
+    StringBuilder binaryString = new StringBuilder();
+    for (byte b : expectedBytes) {
+      binaryString.append(String.format("%8s", Integer.toBinaryString(b & 0xFF)).replace(' ', '0'));
+    }
+    String columnValue = binaryString.toString();
+    String sourceDbTimezoneOffset = null;
 
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    handleFloatSetType("values", newValuesJson);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    byte[] actualBytes;
+    if (castResult instanceof ByteBuffer) {
+      ByteBuffer byteBuffer = (ByteBuffer) castResult;
+      actualBytes = new byte[byteBuffer.remaining()];
+      byteBuffer.get(actualBytes);
+    } else if (castResult instanceof byte[]) {
+      actualBytes = (byte[]) castResult;
+    } else {
+      throw new AssertionError("Unexpected type for castResult");
+    }
+    assertArrayEquals(expectedBytes, actualBytes);
   }
 
   @Test
-  public void convertSpannerValueJsonToBlobType_FromBase64() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":\"QUJDRA==\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    byte[] expectedBytes = Base64.getDecoder().decode("QUJDRA==");
-    byte[] actualBytes = new byte[convertedValue.remaining()];
-    convertedValue.get(actualBytes);
-    Assert.assertArrayEquals(expectedBytes, actualBytes);
-  }
+  public void testGetColumnValueByTypeForBlobEncodeInStringHexToBlob() {
+    SpannerColumnType spannerType = new SpannerColumnType("bytes", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("blob", null, null);
+    String columnName = "lastName";
+    byte[] expectedBytes = new byte[] {1, 2, 3, 4, 5};
+    StringBuilder binaryString = new StringBuilder();
+    for (byte b : expectedBytes) {
+      binaryString.append(String.format("%8s", Integer.toBinaryString(b & 0xFF)).replace(' ', '0'));
+    }
+    String columnValue = binaryString.toString();
+    String sourceDbTimezoneOffset = null;
 
-  @Test
-  public void convertSpannerValueJsonToBlobType_EmptyString() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":\"\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    Assert.assertNotNull(convertedValue);
-    assertEquals(0, convertedValue.remaining());
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void convertSpannerValueJsonToBlobType_InvalidType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":12345}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    handleCassandraBlobType(colKey, newValuesJson);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    byte[] actualBytes;
+    if (castResult instanceof ByteBuffer) {
+      ByteBuffer byteBuffer = (ByteBuffer) castResult;
+      actualBytes = new byte[byteBuffer.remaining()];
+      byteBuffer.get(actualBytes);
+    } else if (castResult instanceof byte[]) {
+      actualBytes = (byte[]) castResult;
+    } else {
+      throw new AssertionError("Unexpected type for castResult");
+    }
+    assertArrayEquals(expectedBytes, actualBytes);
   }
 
   @Test
-  public void convertSpannerValueJsonToInvalidFloatType() {
-    String newValuesString =
-        "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"age\":\"invalid_value\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    handleCassandraFloatType(colKey, newValuesJson);
-  }
+  public void testGetColumnValueByTypeForStringDuration() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("duration", null, null);
+    String columnValue = "P4DT1H";
+    String columnName = "total_time";
+    String sourceDbTimezoneOffset = null;
 
-  @Test
-  public void convertSpannerValueJsonToInvalidDoubleType() {
-    String newValuesString =
-        "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"salary\":\"invalid_value\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "salary";
-    handleCassandraDoubleType(colKey, newValuesJson);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void convertSpannerValueJsonToBlobType_MissingColumn() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    Assert.assertNull(convertedValue);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-  @Test
-  public void testHandleByteArrayType() {
-    String newValuesString = "{\"data\":[\"QUJDRA==\", \"RkZIRg==\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<ByteBuffer> value = handleByteArrayType("data", newValuesJson);
-
-    List<ByteBuffer> expected =
-        Arrays.asList(
-            ByteBuffer.wrap(Base64.getDecoder().decode("QUJDRA==")),
-            ByteBuffer.wrap(Base64.getDecoder().decode("RkZIRg==")));
-    assertEquals(expected, value);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleByteSetType() {
-    String newValuesString = "{\"data\":[\"QUJDRA==\", \"RkZIRg==\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<ByteBuffer> value = handleByteSetType("data", newValuesJson);
-
-    Set<ByteBuffer> expected =
-        new HashSet<>(
-            Arrays.asList(
-                ByteBuffer.wrap(Base64.getDecoder().decode("QUJDRA==")),
-                ByteBuffer.wrap(Base64.getDecoder().decode("RkZIRg=="))));
-    assertEquals(expected, value);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(Duration.parse("P4DT1H"), castResult);
   }
 
   @Test
-  public void testHandleStringArrayType() {
-    String newValuesString = "{\"names\":[\"Alice\", \"Bob\", \"Charlie\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<String> value = handleStringArrayType("names", newValuesJson);
+  public void testGetColumnValueByTypeForDates() {
+    SpannerColumnType spannerType = new SpannerColumnType("date", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("timestamp", null, null);
+    String columnValue = "2025-01-01T00:00:00Z";
+    String columnName = "created_on";
+    String sourceDbTimezoneOffset = null;
 
-    List<String> expected = Arrays.asList("Alice", "Bob", "Charlie");
-    assertEquals(expected, value);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleStringSetType() {
-    String newValuesString = "{\"names\":[\"Alice\", \"Bob\", \"Alice\", \"Charlie\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<String> valueList = handleStringSetType("names", newValuesJson);
-    HashSet<String> value = new HashSet<>(valueList);
-    HashSet<String> expected = new HashSet<>(Arrays.asList("Alice", "Bob", "Charlie"));
-    assertEquals(expected, value);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-  @Test
-  public void testHandleBoolSetTypeString() {
-    String newValuesString = "{\"flags\":[\"true\", \"false\", \"true\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Boolean> value = handleBoolSetTypeString("flags", newValuesJson);
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    Set<Boolean> expected = new HashSet<>(Arrays.asList(true, false));
-    assertEquals(expected, value);
+    ZonedDateTime expectedDate = ZonedDateTime.parse(columnValue).withSecond(0).withNano(0);
+    Instant instant = (Instant) castResult;
+    ZonedDateTime actualDate = instant.atZone(ZoneOffset.UTC).withSecond(0).withNano(0);
+    assertEquals(expectedDate, actualDate);
   }
 
   @Test
-  public void testHandleFloatArrayType() {
-    String newValuesString = "{\"values\":[1.1, 2.2, 3.3]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<Float> value = handleFloatArrayType("values", newValuesJson);
+  public void testGetColumnValueByTypeForBigInt() {
+    SpannerColumnType spannerType = new SpannerColumnType("bigint", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("bigint", null, null);
+    String columnName = "Salary";
+    String sourceDbTimezoneOffset = null;
 
-    List<Float> expected = Arrays.asList(1.1f, 2.2f, 3.3f);
-    assertEquals(expected, value);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleFloatSetType() {
-    String newValuesString = "{\"values\":[1.1, 2.2, 3.3, 2.2]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Float> value = handleFloatSetType("values", newValuesJson);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, BigInteger.valueOf(123456789L));
 
-    Set<Float> expected = new HashSet<>(Arrays.asList(1.1f, 2.2f, 3.3f));
-    assertEquals(expected, value);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleFloatSetType_InvalidString() {
-    String newValuesString = "{\"values\":[\"1.1\", \"2.2\", \"abc\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    try {
-      handleFloatSetType("values", newValuesJson);
-      fail("Expected IllegalArgumentException for invalid number format");
-    } catch (IllegalArgumentException e) {
-      assertTrue(e.getMessage().contains("Invalid number format for column values"));
-    }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    Long expectedBigInt = 123456789L;
+
+    assertEquals(expectedBigInt, castResult);
   }
 
   @Test
-  public void testHandleFloat64ArrayType() {
-    String newValuesString = "{\"values\":[1.1, \"2.2\", 3.3]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<Double> value = handleFloat64ArrayType("values", newValuesJson);
+  public void testGetColumnValueByTypeForBytesForHexString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("bytes", null, null);
+    String columnName = "Name";
+    String sourceDbTimezoneOffset = null;
 
-    List<Double> expected = Arrays.asList(1.1, 2.2, 3.3);
-    assertEquals(expected, value);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleFloat64ArrayTypeInvalid() {
-    String newValuesString = "{\"values\":[\"1.1\", \"abc\", \"3.3\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleFloat64ArrayType("values", newValuesJson);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "48656c6c6f20576f726c64");
 
-  @Test
-  public void testHandleDateSetType() {
-    String newValuesString = "{\"dates\":[\"2024-12-05\", \"2024-12-06\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<LocalDate> value = handleDateSetType("dates", newValuesJson);
-    Set<LocalDate> expected =
-        new HashSet<>(Arrays.asList(LocalDate.of(2024, 12, 5), LocalDate.of(2024, 12, 6)));
-    assertEquals(expected, value);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleFloat64ArrayType_WithUnsupportedList() {
-    String jsonStr = "{\"colName\": [[1, 2, 3], [4, 5, 6]]}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    CassandraTypeHandler.handleFloat64ArrayType("colName", valuesJson);
-  }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-  @Test
-  public void testHandleInt64SetType_ValidLongValues() {
-    String newValuesString = "{\"numbers\":[1, 2, 3, 4]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Long> result = handleInt64SetType("numbers", newValuesJson);
-    Set<Long> expected = new HashSet<>(Arrays.asList(1L, 2L, 3L, 4L));
-    assertEquals(expected, result);
+    assertEquals("48656c6c6f20576f726c64", castResult);
   }
 
   @Test
-  public void testHandleCassandraIntType_ValidInteger() {
-    String newValuesString = "{\"age\":1234}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Integer result = handleCassandraIntType("age", newValuesJson);
-    Integer expected = 1234;
-    assertEquals(expected, result);
-  }
+  public void testGetColumnValueByTypeForBigIntForString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("bigint", null, null);
+    String columnName = "Salary";
+    String sourceDbTimezoneOffset = null;
 
-  @Test
-  public void testHandleCassandraBigintType_ValidConversion() {
-    String newValuesString = "{\"age\":1234567890123}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Long result = handleCassandraBigintType("age", newValuesJson);
-    Long expected = 1234567890123L;
-    assertEquals(expected, result);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleInt64ArrayAsInt32Array() {
-    String newValuesString = "{\"values\":[1, 2, 3, 4]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<Integer> value = handleInt64ArrayAsInt32Array("values", newValuesJson);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "123456789");
 
-    List<Integer> expected = Arrays.asList(1, 2, 3, 4);
-    assertEquals(expected, value);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleInt64ArrayAsInt32Set() {
-    String newValuesString = "{\"values\":[1, 2, 3, 2]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Integer> value = handleInt64ArrayAsInt32Set("values", newValuesJson);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    Set<Integer> expected = new HashSet<>(Arrays.asList(1, 2, 3));
-    assertEquals(expected, value);
+    long expectedValue = 123456789L;
+    assertEquals(expectedValue, castResult);
   }
 
   @Test
-  public void testHandleCassandraUuidTypeNull() {
-    String newValuesString = "{\"uuid\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    UUID value = handleCassandraUuidType("uuid", newValuesJson);
-    Assert.assertNull(value);
-  }
+  public void testGetColumnValueByTypeForBoolentForString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("boolean", null, null);
+    String columnName = "Male";
+    String sourceDbTimezoneOffset = null;
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleCassandraTimestampInvalidFormat() {
-    String newValuesString = "{\"createdAt\":\"2024-12-05 10:15:30.123\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleCassandraTimestampType("createdAt", newValuesJson);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleCassandraTimestampInvalidFormatColNull() {
-    String newValuesString = "{\"createdAt\":\"2024-12-05 10:15:30.123\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleCassandraTimestampType("timestamp", newValuesJson);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "1");
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleCassandraDateInvalidFormat() {
-    String newValuesString = "{\"birthdate\":\"2024/12/05\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleCassandraDateType("birthdate", newValuesJson);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleCassandraTextTypeNull() {
-    String newValuesString = "{\"name\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String value = handleCassandraTextType("name", newValuesJson);
-    Assert.assertNull(value);
-  }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-  @Test
-  public void testHandleBoolArrayType_ValidBooleanStrings() {
-    String jsonStr = "{\"colName\": [\"true\", \"false\", \"true\"]}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    List<Boolean> result = CassandraTypeHandler.handleBoolArrayType("colName", valuesJson);
-    assertEquals(3, result.size());
-    assertTrue(result.get(0));
-    assertFalse(result.get(1));
-    assertTrue(result.get(2));
+    assertEquals(true, castResult);
   }
 
   @Test
-  public void testHandleBoolArrayType_InvalidBooleanStrings() {
-    String jsonStr = "{\"colName\": [\"yes\", \"no\", \"true\"]}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    List<Boolean> result = CassandraTypeHandler.handleBoolArrayType("colName", valuesJson);
-    assertEquals(3, result.size());
-    assertFalse(result.get(0));
-    assertFalse(result.get(1));
-    assertTrue(result.get(2));
-  }
+  public void testGetColumnValueByTypeForBoolent() {
+    SpannerColumnType spannerType = new SpannerColumnType("Boolean", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("boolean", null, null);
+    String columnName = "Male";
+    String sourceDbTimezoneOffset = null;
 
-  @Test
-  public void testHandleBoolArrayType_EmptyArray() {
-    String jsonStr = "{\"colName\": []}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    List<Boolean> result = CassandraTypeHandler.handleBoolArrayType("colName", valuesJson);
-    assertTrue(result.isEmpty());
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleTimestampSetType_validArray() {
-    String jsonString =
-        "{\"timestamps\": [\"2024-12-04T12:34:56.123Z\", \"2024-12-05T13:45:00.000Z\"]}";
-    JSONObject valuesJson = new JSONObject(jsonString);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, false);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    Set<Timestamp> result = CassandraTypeHandler.handleTimestampSetType("timestamps", valuesJson);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(result);
-    assertEquals(2, result.size());
-    assertTrue(result.contains(Timestamp.valueOf("2024-12-04 00:00:00.0")));
-    assertTrue(result.contains(Timestamp.valueOf("2024-12-05 00:00:00.0")));
+    assertEquals(false, castResult);
   }
 
   @Test
-  public void testHandleValidAsciiString() {
-    String newValuesString = "{\"name\":\"JohnDoe\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    assertEquals("JohnDoe", handleCassandraAsciiType(colKey, newValuesJson));
-  }
+  public void testGetColumnValueByTypeForIntegerValue() {
+    SpannerColumnType spannerType = new SpannerColumnType("Integer", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("bigint", null, null);
+    String columnName = "Salary";
+    String sourceDbTimezoneOffset = null;
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleNonAsciiString() {
-    String newValuesString = "{\"name\":\"JoãoDoe\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    handleCassandraAsciiType(colKey, newValuesJson);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-  @Test
-  public void testHandleNullForAsciiColumn() {
-    String newValuesString = "{\"name\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    handleCassandraAsciiType(colKey, newValuesJson);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 225000);
 
-  @Test
-  public void testHandleValidStringVarint() {
-    String newValuesString = "{\"amount\":\"123456789123456789\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "amount";
-    BigInteger expected = new BigInteger("123456789123456789");
-    assertEquals(expected, handleCassandraVarintType(colKey, newValuesJson));
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidStringVarint() {
-    String newValuesString = "{\"amount\":\"abcxyz\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "amount";
-    handleCassandraVarintType(colKey, newValuesJson);
-  }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-  @Test
-  public void testHandleInvalidTypeVarint() {
-    String newValuesString = "{\"amount\":12345}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "amount";
-    handleCassandraVarintType(colKey, newValuesJson);
+    long expectedValue = 225000L;
+    assertEquals(expectedValue, castResult);
   }
 
   @Test
-  public void testHandleValidDuration() {
-    String newValuesString = "{\"duration\":\"P1DT1H\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "duration";
-    Duration expected = Duration.parse("P1DT1H");
-    assertEquals(expected, handleCassandraDurationType(colKey, newValuesJson));
+  public void testGetColumnValueByTypeForBoolentSamllCaseForString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", false);
+    SourceColumnType sourceColumnType = new SourceColumnType("boolean", null, null);
+    String columnName = "Male";
+    String sourceDbTimezoneOffset = null;
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "f");
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(false, castResult);
   }
 
+  // Revised and Improved Tests
+
   @Test
-  public void testHandleNullDuration() {
-    String newValuesString = "{\"duration\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "duration";
-    assertNull(handleCassandraDurationType(colKey, newValuesJson));
+  public void testGetColumnValueByTypeForInteger() {
+    SpannerColumnType spannerType = new SpannerColumnType("NUMERIC", false);
+    SourceColumnType sourceColType = new SourceColumnType("integer", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, BigInteger.valueOf(5));
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(BigInteger.valueOf(5), castResult);
   }
 
   @Test
-  public void testHandleMissingColumnKey() {
-    String newValuesString = "{\"otherColumn\":\"P1DT1H\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "duration";
-    assertNull(handleCassandraDurationType(colKey, newValuesJson));
+  public void testGetColumnValueByTypeForValidBigInteger() {
+    SpannerColumnType spannerType = new SpannerColumnType("integer", false);
+    SourceColumnType sourceColType = new SourceColumnType("int64", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, BigInteger.valueOf(5));
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(BigInteger.valueOf(5), castResult);
   }
 
   @Test
-  public void testHandleValidIPv4Address() throws UnknownHostException {
-    String newValuesString = "{\"ipAddress\":\"192.168.0.1\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    InetAddress expected = InetAddress.getByName("192.168.0.1");
-    assertEquals(expected, handleCassandraInetAddressType(colKey, newValuesJson));
+  public void testConvertToCassandraTimestampWithISOInstant() {
+    String timestamp = "2025-01-15T10:15:30Z";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    LocalDate expectedValue = Instant.parse(timestamp).atZone(ZoneId.systemDefault()).toLocalDate();
+    assertEquals(expectedValue, castResult);
   }
 
   @Test
-  public void testHandleValidIPv6Address() throws Exception {
-    String newValuesString = "{\"ipAddress\":\"2001:0db8:85a3:0000:0000:8a2e:0370:7334\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    InetAddress actual = CassandraTypeHandler.handleCassandraInetAddressType(colKey, newValuesJson);
-    InetAddress expected = InetAddress.getByName("2001:0db8:85a3:0000:0000:8a2e:0370:7334");
-    assertEquals(expected, actual);
-  }
+  public void testConvertToCassandraTimestampWithISODateTime() {
+    String timestamp = "2025-01-15T10:15:30";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("datetime", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidIPAddressFormat() throws IllegalArgumentException {
-    String newValuesString = "{\"ipAddress\":\"invalid-ip-address\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    handleCassandraInetAddressType(colKey, newValuesJson);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals("2025-01-15T00:00:00Z", castResult.toString());
   }
 
   @Test
-  public void testHandleEmptyStringIPAddress() {
-    String newValuesString = "{\"ipAddress\":\"192.168.1.1\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    Object result = handleCassandraInetAddressType(colKey, newValuesJson);
-    assertTrue("Expected result to be of type InetAddress", result instanceof InetAddress);
-    assertEquals(
-        "IP address does not match", "192.168.1.1", ((InetAddress) result).getHostAddress());
+  public void testConvertToCassandraTimestampWithISODate() {
+    String timestamp = "2025-01-15";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(timestamp, castResult.toString());
   }
 
   @Test
-  public void testHandleStringifiedJsonToMapWithEmptyJson() {
-    String newValuesString = "{}";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Map<String, Object> expected = Map.of();
-    Map<String, Object> result = handleStringifiedJsonToMap(colKey, newValuesJson);
-    assertEquals(expected, result);
+  public void testConvertToCassandraTimestampWithCustomFormat1() {
+    String timestamp = "01/15/2025";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
-  public void testHandleStringifiedJsonToMapWithSimpleJson() {
-    String newValuesString = "{\"name\":\"John\", \"age\":30}";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Map<String, Object> expected = Map.of("name", "John", "age", 30);
-    Map<String, Object> result = handleStringifiedJsonToMap(colKey, newValuesJson);
-    assertEquals(expected, result);
-  }
+  public void testConvertToCassandraTimestampWithCustomFormat2() {
+    String timestamp = "2025/01/15";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleStringifiedJsonToMapWithInvalidJson() {
-    String newValuesString = "{\"user\":{\"name\":\"John\", \"age\":30";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    handleStringifiedJsonToMap(colKey, newValuesJson);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
-  public void testHandleStringifiedJsonToMapWithNullValues() {
-    String newValuesString = "{\"name\":null, \"age\":null}";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Map<String, Object> expected =
-        Map.of(
-            "name", JSONObject.NULL,
-            "age", JSONObject.NULL);
-    Map<String, Object> result = handleStringifiedJsonToMap(colKey, newValuesJson);
-    assertEquals(expected, result);
-  }
+  public void testConvertToCassandraTimestampWithCustomFormat3() {
+    String timestamp = "15-01-2025";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidStringifiedJson() {
-    String newValuesString = "{\"user\":{\"name\":\"John\", \"age\":30";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    handleStringifiedJsonToMap(colKey, newValuesJson);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleNonStringValue() {
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", 12345);
-    String colKey = "data";
-    handleStringifiedJsonToMap(colKey, newValuesJson);
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
-  public void testHandleValidStringifiedJsonArray() {
-    String newValuesString = "[\"apple\", \"banana\", \"cherry\"]";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-
-    Set<Object> expected = new HashSet<>();
-    expected.add("apple");
-    expected.add("banana");
-    expected.add("cherry");
-    assertEquals(expected, handleStringifiedJsonToSet(colKey, newValuesJson));
+  public void testConvertToCassandraTimestampWithCustomFormat4() {
+    String timestamp = "15/01/2025";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
-  public void testHandleEmptyStringifiedJsonArray() {
-    String newValuesString = "[]";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Set<Object> expected = new HashSet<>();
-    assertEquals(expected, handleStringifiedJsonToSet(colKey, newValuesJson));
+  public void testConvertToCassandraTimestampWithCustomFormat5() {
+    String timestamp = "2025-01-15 10:15:30";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
-  public void testHandleNonArrayValue() {
-    String newValuesString = "\"apple\"";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
+  public void testConvertToCassandraTimestampWithInvalidFormat() {
+    String timestamp = "invalid-timestamp";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
     assertThrows(
-        IllegalArgumentException.class, () -> handleStringifiedJsonToSet(colKey, newValuesJson));
+        IllegalArgumentException.class,
+        () -> {
+          PreparedStatementValueObject result =
+              getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+          CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+        });
   }
 
   @Test
-  public void testConvertToSmallIntValidInput() {
-    Integer validValue = 100;
-    short result = convertToSmallInt(validValue);
-    assertEquals(100, result);
-  }
+  public void testConvertToCassandraTimestampWithNull() {
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
 
-  @Test
-  public void testConvertToSmallIntBelowMinValue() {
-    Integer invalidValue = Short.MIN_VALUE - 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToSmallInt(invalidValue));
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, " ");
 
-  @Test
-  public void testConvertToSmallIntAboveMaxValue() {
-    Integer invalidValue = Short.MAX_VALUE + 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToSmallInt(invalidValue));
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              PreparedStatementValueObject result =
+                  getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+              CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+            });
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
-  public void testConvertToTinyIntValidInput() {
-    Integer validValue = 100;
-    byte result = convertToTinyInt(validValue);
-    assertEquals(100, result);
-  }
+  public void testConvertToCassandraTimestampWithWhitespaceString() {
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", false);
+    SourceColumnType sourceColType = new SourceColumnType("date", null, null);
+    String columnName = "test_column";
 
-  @Test
-  public void testConvertToTinyIntBelowMinValue() {
-    Integer invalidValue = Byte.MIN_VALUE - 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToTinyInt(invalidValue));
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "   ");
 
-  @Test
-  public void testConvertToTinyIntAboveMaxValue() {
-    Integer invalidValue = Byte.MAX_VALUE + 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToTinyInt(invalidValue));
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              PreparedStatementValueObject result =
+                  getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+              CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+            });
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
-  public void testEscapeCassandraStringNoQuotes() {
-    String input = "Hello World";
-    String expected = "Hello World";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
-  }
+  public void testGetColumnValueByTypeForFloat() {
+    SpannerColumnType spannerType = new SpannerColumnType("float", false);
+    SourceColumnType sourceColType = new SourceColumnType("float", null, null);
+    String columnName = "test_column";
 
-  @Test
-  public void testEscapeCassandraStringWithSingleQuote() {
-    String input = "O'Reilly";
-    String expected = "O''Reilly";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, new BigDecimal("5.5"));
 
-  @Test
-  public void testEscapeCassandraStringEmpty() {
-    String input = "";
-    String expected = "";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-  @Test
-  public void testEscapeCassandraStringWithMultipleQuotes() {
-    String input = "It's John's book.";
-    String expected = "It''s John''s book.";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
-  }
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-  @Test
-  public void testConvertToCassandraTimestampWithValidOffset() {
-    String value = "2024-12-12T10:15:30+02:00";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T08:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
-  }
+    assertTrue(result instanceof PreparedStatementValueObject);
 
-  @Test
-  public void testConvertToCassandraTimestampWithNonZeroOffset() {
-    String value = "2024-12-12T10:15:30+02:00";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T08:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
+    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
+    assertEquals(new BigDecimal(5.5), actualValue);
   }
 
   @Test
-  public void testConvertToCassandraTimestampWithNegativeOffset() {
-    String value = "2024-12-12T10:15:30-05:00";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T15:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
-  }
+  public void testGetColumnValueByTypeForFloat64() {
+    SpannerColumnType spannerType = new SpannerColumnType("float64", false);
+    SourceColumnType sourceColType = new SourceColumnType("double", null, null);
+    String columnName = "test_column";
 
-  @Test(expected = RuntimeException.class)
-  public void testConvertToCassandraTimestampWithInvalidFormat() {
-    String value = "2024-12-12T25:15:30+02:00";
-    String timezoneOffset = "+00:00";
-    convertToCassandraTimestamp(value, timezoneOffset);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, new BigDecimal("5.5"));
 
-  @Test
-  public void testConvertToCassandraTimestampWithoutTimezone() {
-    String value = "2024-12-12T10:15:30Z";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T10:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-  @Test
-  public void testConvertToCassandraDateWithValidDate() {
-    String dateString = "2024-12-12T10:15:30Z";
-    LocalDate result = convertToCassandraDate(dateString);
-    LocalDate expected = LocalDate.of(2024, 12, 12);
-    assertEquals(expected, result);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-  @Test
-  public void testConvertToCassandraDateLeapYear() {
-    String dateString = "2024-02-29T00:00:00Z";
-    LocalDate result = convertToCassandraDate(dateString);
-    LocalDate expected = LocalDate.of(2024, 2, 29);
-    assertEquals(expected, result);
-  }
+    assertTrue(result instanceof PreparedStatementValueObject);
 
-  @Test
-  public void testConvertToCassandraDateWithDifferentTimeZone() {
-    String dateString = "2024-12-12T10:15:30+02:00";
-    LocalDate result = convertToCassandraDate(dateString);
-    LocalDate expected = LocalDate.of(2024, 12, 12);
-    assertEquals(expected, result);
-  }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testConvertToCassandraDateWithInvalidDate() {
-    String dateString = "2024-13-12T10:15:30Z";
-    convertToCassandraDate(dateString);
+    assertEquals(5.5, castResult);
   }
 
   @Test
-  public void testConvertToCassandraTimestampWithValidDate() {
-    String dateString = "2024-12-12T10:15:30Z";
-    Instant result = convertToCassandraTimestamp(dateString);
-    Instant expected = Instant.parse(dateString);
-    assertEquals(expected, result);
-  }
+  public void testGetColumnValueByTypeForFloat64FromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColType = new SourceColumnType("double", null, null);
+    String columnName = "test_column";
 
-  @Test
-  public void testConvertToCassandraTimestampWithTimezoneOffset() {
-    String dateString = "2024-12-12T10:15:30+02:00";
-    Instant result = convertToCassandraTimestamp(dateString);
-    Instant expected = Instant.parse("2024-12-12T08:15:30Z");
-    assertEquals(expected, result);
-  }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5.5");
 
-  @Test
-  public void testConvertToCassandraTimestampLeapYear() {
-    String dateString = "2024-02-29T00:00:00Z";
-    Instant result = convertToCassandraTimestamp(dateString);
-    Instant expected = Instant.parse(dateString);
-    assertEquals(expected, result);
-  }
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testConvertToCassandraTimestampWithInvalidDate() {
-    String dateString = "2024-13-12T10:15:30Z";
-    convertToCassandraTimestamp(dateString);
-  }
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-  @Test
-  public void testIsValidUUIDWithValidUUID() {
-    String validUUID = "123e4567-e89b-12d3-a456-426614174000";
-    boolean result = isValidUUID(validUUID);
-    assertTrue(result);
-  }
+    assertTrue(result instanceof PreparedStatementValueObject);
 
-  @Test
-  public void testIsValidUUIDWithInvalidUUID() {
-    String invalidUUID = "123e4567-e89b-12d3-a456-426614174000Z";
-    boolean result = isValidUUID(invalidUUID);
-    assertFalse(result);
-  }
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-  @Test
-  public void testIsValidUUIDWithEmptyString() {
-    String emptyString = "";
-    boolean result = isValidUUID(emptyString);
-    assertFalse(result);
+    assertEquals(5.5, castResult);
   }
 
   @Test
-  public void testIsValidIPAddressWithValidIPv4() {
-    String validIPv4 = "192.168.1.1";
-    boolean result = isValidIPAddress(validIPv4);
-    assertTrue(result);
-  }
+  public void testGetColumnValueByTypeForDecimalFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColType = new SourceColumnType("decimal", null, null);
+    String columnName = "test_column";
 
-  @Test
-  public void testIsValidIPAddressWithValidIPv6() {
-    String validIPv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
-    boolean result = isValidIPAddress(validIPv6);
-    assertTrue(result);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5.5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(BigDecimal.valueOf(5.5), castResult);
   }
 
   @Test
-  public void testIsValidIPAddressWithInvalidFormat() {
-    String invalidIP = "999.999.999.999";
-    boolean result = isValidIPAddress(invalidIP);
-    assertFalse(result);
+  public void testGetColumnValueByTypeForDecimalFromFloat() {
+    SpannerColumnType spannerType = new SpannerColumnType("float", false);
+    SourceColumnType sourceColType = new SourceColumnType("decimal", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 5.5);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(BigDecimal.valueOf(5.5), castResult);
   }
 
   @Test
-  public void testIsValidJSONWithValidJSON() {
-    String validJson = "{\"name\":\"John\", \"age\":30}";
-    boolean result = isValidJSON(validJson);
-    assertTrue(result);
+  public void testGetColumnValueByTypeForDecimalFromFloat64() {
+    SpannerColumnType spannerType = new SpannerColumnType("float64", false);
+    SourceColumnType sourceColType = new SourceColumnType("decimal", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 5.5);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(BigDecimal.valueOf(5.5), castResult);
   }
 
   @Test
-  public void testIsValidJSONWithInvalidJSON() {
-    String invalidJson = "{\"name\":\"John\", \"age\":30";
-    boolean result = isValidJSON(invalidJson);
-    assertFalse(result);
+  public void testGetColumnValueByTypeForFloatFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColType = new SourceColumnType("float", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5.5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(5.5, castResult);
   }
 
   @Test
-  public void testIsValidJSONWithEmptyString() {
-    String emptyString = "";
-    boolean result = isValidJSON(emptyString);
-    assertFalse(result);
+  public void testGetColumnValueByTypeForBigIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColType = new SourceColumnType("bigint", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(Long.valueOf("5"), castResult);
   }
 
   @Test
-  public void testIsValidJSONWithNull() {
-    String nullString = null;
-    boolean result = isValidJSON(nullString);
-    assertFalse(result);
+  public void testGetColumnValueByTypeForIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColType = new SourceColumnType("int", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(Integer.valueOf("5"), castResult);
   }
 
   @Test
-  public void testConvertToCassandraDate_validDateString() {
-    String dateString = "2024-12-16T14:30:00Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-12-16'", LocalDate.of(2024, 12, 16), result);
+  public void testGetColumnValueByTypeForSmallIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColType = new SourceColumnType("smallint", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(Integer.valueOf("5").shortValue(), castResult);
   }
 
   @Test
-  public void testConvertToCassandraDate_leapYear() {
-    String dateString = "2024-02-29T00:00:00Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-02-29'", LocalDate.of(2024, 2, 29), result);
+  public void testGetColumnValueByTypeForTinyIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", false);
+    SourceColumnType sourceColType = new SourceColumnType("tinyint", null, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(Byte.valueOf("5"), castResult);
   }
 
   @Test
-  public void testConvertToCassandraDate_validDateWithMilliseconds() {
-    String dateString = "2024-12-16T14:30:00.123Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-12-16'", LocalDate.of(2024, 12, 16), result);
+  public void testGetColumnValueByTypeForBytes() {
+    SpannerColumnType spannerType = new SpannerColumnType("bytes", false);
+    SourceColumnType sourceColType = new SourceColumnType("bytes", null, null);
+    String columnName = "test_column";
+
+    byte[] expectedBytes = new byte[] {1, 2, 3, 4, 5};
+    StringBuilder binaryString = new StringBuilder();
+    for (byte b : expectedBytes) {
+      binaryString.append(String.format("%8s", Integer.toBinaryString(b & 0xFF)).replace(' ', '0'));
+    }
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, binaryString.toString());
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
+    assertArrayEquals(expectedBytes, (byte[]) actualValue);
   }
 
   @Test
-  public void testConvertToCassandraDate_timezoneOffsetImpact() {
-    String dateString = "2024-12-16T14:30:00+01:00";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
+  public void testCastToExpectedTypeForVariousTypes() throws UnknownHostException {
+    assertEquals("Test String", castToExpectedType("text", "Test String"));
+    assertEquals(123L, castToExpectedType("bigint", "123"));
+    assertEquals(true, castToExpectedType("boolean", "true"));
+    assertEquals(
+        new BigDecimal("123.456"),
+        castToExpectedType("decimal", new BigDecimal("123.456").toString()));
+    assertEquals(123.456, castToExpectedType("double", "123.456"));
+    assertEquals(123.45f, ((Double) castToExpectedType("float", "123.45")).floatValue(), 0.00001);
+    assertEquals(InetAddress.getByName("127.0.0.1"), castToExpectedType("inet", "127.0.0.1"));
+    assertEquals(123, castToExpectedType("int", "123"));
+    assertEquals((short) 123, castToExpectedType("smallint", "123"));
     assertEquals(
-        "The parsed LocalDate should be '2024-12-16' regardless of timezone.",
-        LocalDate.of(2024, 12, 16),
-        result);
+        UUID.fromString("123e4567-e89b-12d3-a456-426614174000"),
+        castToExpectedType("uuid", "123e4567-e89b-12d3-a456-426614174000"));
+    assertEquals((byte) 100, castToExpectedType("tinyint", "100"));
+    assertEquals(
+        new BigInteger("123456789123456789123456789"),
+        castToExpectedType("varint", "123456789123456789123456789"));
+    String timeString = "14:30:45";
+    Object localTime1 = castToExpectedType("time", "14:30:45");
+    assertTrue(localTime1 instanceof LocalTime);
+    assertEquals(
+        Duration.ofHours(5), castToExpectedType("duration", Duration.ofHours(5).toString()));
   }
 
   @Test
-  public void testConvertToCassandraDate_validDateWithOffset() {
-    String dateString = "2024-12-16T14:30:00+01:00";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-12-16'", LocalDate.of(2024, 12, 16), result);
+  public void testCastToExpectedTypeForJSONArrayStringifyToSet() {
+    String cassandraType = "set<int>";
+    String columnValue = "[1, 2, 3]";
+    Object result = castToExpectedType(cassandraType, columnValue);
+    assertTrue(result instanceof Set);
+    assertEquals(3, ((Set<?>) result).size());
   }
 
   @Test
-  public void testConvertToCassandraDate_withTimeZoneOffset() {
-    String validDateWithOffset = "2024-12-16T14:30:00+02:00";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(validDateWithOffset);
-    assertNotNull(String.valueOf(result), "The result should not be null");
-    assertEquals(
-        "The parsed LocalDate should match the expected value (timezone offset ignored).",
-        LocalDate.of(2024, 12, 16),
-        result);
+  public void testCastToExpectedTypeForJSONObjectStringifyToMap() {
+    String cassandraType = "map<int, text>";
+    String columnValue = "{\"2024-12-12\": \"One\", \"2\": \"Two\"}";
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          castToExpectedType(cassandraType, columnValue);
+        });
   }
 
   @Test
-  public void testConvertToCassandraDate_endOfMonth() {
-    String endOfMonthDate = "2024-01-31T12:00:00Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(endOfMonthDate);
-    assertNotNull(String.valueOf(result), "The result should not be null");
-    assertEquals(
-        "The parsed LocalDate should be correct for end of month.",
-        LocalDate.of(2024, 1, 31),
-        result);
+  public void testCastToExpectedTypeForExceptionScenario() {
+    String cassandraType = "int";
+    String columnValue = "InvalidInt";
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          castToExpectedType(cassandraType, columnValue);
+        });
   }
 
   @Test
-  public void testParseDate_validStringWithCustomFormatter() {
-    String dateStr = "2024-12-16T14:30:00.000";
-    String formatter = "yyyy-MM-dd'T'HH:mm:ss.SSS";
-    String colName = "testDate";
-
-    LocalDate result = CassandraTypeHandler.parseDate(colName, dateStr, formatter);
-
-    assertNotNull(String.valueOf(result), "The parsed LocalDate should not be null.");
-    assertEquals(
-        "The parsed LocalDate should match the expected value.",
-        LocalDate.of(2024, 12, 16),
-        result);
+  public void testGetColumnValueByTypeForNullBothColumnDefs() {
+    JSONObject valuesJson = mock(JSONObject.class);
+    String sourceDbTimezoneOffset = null;
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          getColumnValueByType(null, null, valuesJson, sourceDbTimezoneOffset);
+        });
   }
 
   @Test
-  public void testParseDate_validString() {
-    String validDateStr = "2024-12-16T14:30:00.000+0000";
-    String formatter = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-    String colName = "testDate";
-    LocalDate result = CassandraTypeHandler.parseDate(colName, validDateStr, formatter);
-    assertNotNull(result);
-    assertEquals(LocalDate.of(2024, 12, 16), result);
+  public void testCastToExpectedTypeForAscii() {
+    String expected = "test string";
+    Object result = CassandraTypeHandler.castToExpectedType("ascii", expected);
+    assertEquals(expected, result);
   }
 
   @Test
-  public void testParseDate_validDate() {
-    Date date = new Date(1700000000000L);
-    String colName = "testDate";
-
-    LocalDate result = CassandraTypeHandler.parseDate(colName, date, "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+  public void testCastToExpectedTypeForVarchar() {
+    String expected = "test varchar";
+    Object result = CassandraTypeHandler.castToExpectedType("varchar", expected);
+    assertEquals(expected, result);
+  }
 
-    assertNotNull(result);
-    assertNotEquals(LocalDate.of(2024, 12, 15), result);
+  @Test
+  public void testCastToExpectedTypeForList() {
+    JSONArray listValue = new JSONArray(Arrays.asList("value1", "value2"));
+    Object result = CassandraTypeHandler.castToExpectedType("list<text>", listValue.toString());
+    assertTrue(result instanceof List);
+    assertEquals(2, ((List<?>) result).size());
   }
 
   @Test
-  public void testHandleCassandraGenericDateType_NullFormatter() {
-    String newValuesString = "{\"date\":\"2024-12-16T10:15:30.000+0000\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "date";
-    LocalDate result =
-        CassandraTypeHandler.handleCassandraGenericDateType(colKey, newValuesJson, null);
-    assertEquals(LocalDate.of(2024, 12, 16), result);
+  public void testCastToExpectedTypeForSet() {
+    JSONArray setValue = new JSONArray(Arrays.asList("value1", "value2"));
+    Object result = CassandraTypeHandler.castToExpectedType("set<text>", setValue.toString());
+    assertTrue(result instanceof Set);
+    assertEquals(2, ((Set<?>) result).size());
   }
 
   @Test
-  public void testHandleStringifiedJsonToList_InvalidFormat() {
-    String newValuesString = "{\"column\": \"{\\\"key\\\":\\\"value\\\"}\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "column";
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              CassandraTypeHandler.handleStringifiedJsonToList(colKey, newValuesJson);
-            });
-    assertTrue(thrown.getMessage().contains("Invalid stringified JSON array format"));
+  public void testCastToExpectedTypeForInvalidType() {
+    Object object = CassandraTypeHandler.castToExpectedType("unknownType", new Object());
+    assertNotNull(object);
   }
 
   @Test
-  public void testHandleStringifiedJsonToList_NullInput() {
-    JSONObject newValuesJson = null;
-    String colKey = "column";
+  public void testCastToExpectedTypeForNull() {
     assertThrows(
         NullPointerException.class,
         () -> {
-          CassandraTypeHandler.handleStringifiedJsonToList(colKey, newValuesJson);
+          CassandraTypeHandler.castToExpectedType("text", null);
         });
   }
 
   @Test
-  public void testHandleStringifiedJsonToMap_EmptyString() {
-    // Test case with an empty string as input, which is also an invalid JSON format
-    String newValuesString = "{\"column\": \"\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "column";
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              CassandraTypeHandler.handleStringifiedJsonToMap(colKey, newValuesJson);
-            });
-    assertTrue(thrown.getMessage().contains("Invalid stringified JSON format for column"));
+  public void testCastToExpectedTypeForDate_String() {
+    String dateString = "2025-01-09"; // Format: yyyy-MM-dd
+    Object result = CassandraTypeHandler.castToExpectedType("date", dateString);
+    LocalDate expected = LocalDate.parse(dateString);
+    assertEquals(expected, result);
   }
 
   @Test
-  public void testHandleStringifiedJsonToMap_NonJsonString() {
-    String newValuesString = "{\"column\": \"just a plain string\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "column";
-    IllegalArgumentException thrown =
+  public void testCastToExpectedTypeForDate_InvalidString() {
+    String invalidDateString = "invalid-date";
+    IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
             () -> {
-              CassandraTypeHandler.handleStringifiedJsonToMap(colKey, newValuesJson);
+              CassandraTypeHandler.castToExpectedType("date", invalidDateString);
             });
-    assertTrue(thrown.getMessage().contains("Invalid stringified JSON format for column"));
-  }
-
-  @Test
-  public void testHandleCassandraVarintType_ValidByteArray() {
-    JSONObject valuesJson = new JSONObject();
-    byte[] byteArray = new BigInteger("12345678901234567890").toByteArray();
-    valuesJson.put("varint", byteArray);
-    BigInteger result = CassandraTypeHandler.handleCassandraVarintType("varint", valuesJson);
-    BigInteger expected = new BigInteger(byteArray);
-    assertEquals(expected, result);
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
-  public void testHandleCassandraVarintType_InvalidStringFormat() {
-    JSONObject valuesJson = new JSONObject();
-    valuesJson.put("col1", "invalid-number");
+  public void testCastToExpectedTypeForDate_UnsupportedType() {
+    Integer unsupportedType = 123;
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
             () -> {
-              handleCassandraVarintType("col1", valuesJson);
+              CassandraTypeHandler.castToExpectedType("date", unsupportedType);
             });
-    assertTrue(exception.getMessage().contains("Invalid varint format (string) for column: col1"));
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
-  public void testParseDate_UnsupportedType() {
-    JSONObject valuesJson = new JSONObject();
-    valuesJson.put("col1", 12345);
-    String formatter = "yyyy-MM-dd";
+  public void testHandleCassandraVarintType_String() {
+    String validString = "12345678901234567890";
+    Object result = CassandraTypeHandler.castToExpectedType("varint", validString);
+    BigInteger expected = new BigInteger(validString);
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testHandleCassandraVarintType_InvalidString() {
+    String invalidString = "invalid-number";
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
             () -> {
-              CassandraTypeHandler.parseDate("col1", valuesJson.get("col1"), formatter);
+              CassandraTypeHandler.castToExpectedType("varint", invalidString);
             });
-    assertTrue(exception.getMessage().contains("Unsupported type for column col1"));
+    assertEquals("Error converting value for cassandraType: varint", exception.getMessage());
   }
 
   @Test
-  public void testHandleCassandraUuidType_ValidUuidString() {
-    JSONObject valuesJson = new JSONObject();
-    String validUuidString = "123e4567-e89b-12d3-a456-426614174000";
-    valuesJson.put("col1", validUuidString);
-    UUID result = handleCassandraUuidType("col1", valuesJson);
-    UUID expectedUuid = UUID.fromString(validUuidString);
-    assertEquals(expectedUuid, result);
-  }
-
-  @Test
-  public void testHandleCassandraInetAddressType_Hostname() {
-    JSONObject valuesJson = new JSONObject();
-    valuesJson.put("col1", "www.google.com");
+  public void testHandleCassandraVarintType_UnsupportedType() {
+    String unsupportedType = "dsdsdd";
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
             () -> {
-              CassandraTypeHandler.handleCassandraInetAddressType("col1", valuesJson);
+              CassandraTypeHandler.castToExpectedType("varint", unsupportedType);
             });
-    assertTrue(exception.getMessage().contains("Invalid IP address format for column: col1"));
+    assertEquals("Error converting value for cassandraType: varint", exception.getMessage());
   }
 }
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java
index eb29cd0d0a..a5e4f583ba 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java
@@ -25,6 +25,7 @@
 import com.google.cloud.teleport.v2.templates.dbutils.connection.JdbcConnectionHelper;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.CassandraDao;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.JdbcDao;
+import com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraDMLGenerator;
 import com.google.cloud.teleport.v2.templates.dbutils.dml.MySQLDMLGenerator;
 import com.google.cloud.teleport.v2.templates.exceptions.UnsupportedSourceException;
 import java.util.Arrays;
@@ -104,8 +105,7 @@ public void testCreateSourceProcessor_cassandra_validSource() throws Exception {
             Constants.SOURCE_CASSANDRA, shards, maxConnections);
 
     Assert.assertNotNull(processor);
-    // ToDo this Particular line will get enable in DML PR
-    //    Assert.assertTrue(processor.getDmlGenerator() instanceof CassandraDMLGenerator);
+    Assert.assertTrue(processor.getDmlGenerator() instanceof CassandraDMLGenerator);
     Assert.assertEquals(1, processor.getSourceDaoMap().size());
     Assert.assertTrue(processor.getSourceDaoMap().get("shard1") instanceof CassandraDao);
   }
diff --git a/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json b/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
new file mode 100644
index 0000000000..3bb4bd8942
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
@@ -0,0 +1,1064 @@
+{
+  "SyntheticPKeys": {
+    "t4": {
+      "ColId": "c22",
+      "Sequence": 0
+    }
+  },
+  "SpSchema": {
+    "sample_table": {
+      "Name": "sample_table",
+      "ColIds":  [
+        "id",
+        "varchar_column",
+        "tinyint_column",
+        "text_column",
+        "date_column",
+        "smallint_column",
+        "mediumint_column",
+        "bigint_column",
+        "float_column",
+        "double_column",
+        "decimal_column",
+        "datetime_column",
+        "timestamp_column",
+        "time_column",
+        "year_column",
+        "char_column",
+        "tinyblob_column",
+        "tinytext_column",
+        "blob_column",
+        "mediumblob_column",
+        "mediumtext_column",
+        "longblob_column",
+        "longtext_column",
+        "enum_column",
+        "set_column",
+        "bool_column",
+        "binary_column",
+        "varbinary_column"
+      ],
+      "ColDefs": {
+        "bigint_column": {
+          "Name": "bigint_column",
+          "T": {
+            "Name": "INT64"
+          },
+          "Id": "c9"
+        },
+        "binary_column": {
+          "Name": "binary_column",
+          "T": {
+            "Name": "BYTES"
+          },
+          "Id": "c25"
+        },
+        "blob_column": {
+          "Name": "blob_column",
+          "T": {
+            "Name": "blob",
+            "Len": 9223372036854776000,
+            "IsArray": false
+          },
+          "Id": "c11",
+          "NotNull": false,
+          "Comment": "From: blob_column blob(65535)"
+        },
+        "bool_column": {
+          "Name": "bool_column",
+          "T": {
+            "Name": "BOOL"
+          },
+          "Id": "c19"
+        },
+        "char_column": {
+          "Name": "char_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c10"
+        },
+        "date_column": {
+          "Name": "date_column",
+          "T": {
+            "Name": "DATE"
+          },
+          "Id": "c13"
+        },
+        "datetime_column": {
+          "Name": "datetime_column",
+          "T": {
+            "Name": "TIMESTAMP"
+          },
+          "Id": "c15"
+        },
+        "decimal_column": {
+          "Name": "decimal_column",
+          "T": {
+            "Name": "NUMERIC"
+          },
+          "Id": "c28"
+        },
+        "double_column": {
+          "Name": "double_column",
+          "T": {
+            "Name": "FLOAT64"
+          },
+          "Id": "c17"
+        },
+        "enum_column": {
+          "Name": "enum_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c24"
+        },
+        "float_column": {
+          "Name": "float_column",
+          "T": {
+            "Name": "FLOAT64"
+          },
+          "Id": "c14"
+        },
+        "id": {
+          "Name": "id",
+          "T": {
+            "Name": "bigint",
+            "Len": 0,
+            "IsArray": false
+          },
+          "Id": "c2",
+          "NotNull": true,
+          "Comment": "From: id int"
+        },
+        "longblob_column": {
+          "Name": "longblob_column",
+          "T": {
+            "Name": "BYTES"
+          },
+          "Id": "c23"
+        },
+        "longtext_column": {
+          "Name": "longtext_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c12"
+        },
+        "mediumblob_column": {
+          "Name": "mediumblob_column",
+          "T": {
+            "Name": "BYTES"
+          },
+          "Id": "c18"
+        },
+        "mediumint_column": {
+          "Name": "mediumint_column",
+          "T": {
+            "Name": "INT64"
+          },
+          "Id": "c8"
+        },
+        "mediumtext_column": {
+          "Name": "mediumtext_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c22"
+        },
+        "set_column": {
+          "Name": "set_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c5"
+        },
+        "smallint_column": {
+          "Name": "smallint_column",
+          "T": {
+            "Name": "INT64"
+          },
+          "Id": "c3"
+        },
+        "text_column": {
+          "Name": "text_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c27"
+        },
+        "time_column": {
+          "Name": "time_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c29"
+        },
+        "timestamp_column": {
+          "Name": "timestamp_column",
+          "T": {
+            "Name": "TIMESTAMP"
+          },
+          "Id": "c16"
+        },
+        "tinyblob_column": {
+          "Name": "tinyblob_column",
+          "T": {
+            "Name": "BYTES"
+          },
+          "NotNull": false,
+          "Id": "c4"
+        },
+        "tinyint_column": {
+          "Name": "tinyint_column",
+          "T": {
+            "Name": "INT64"
+          },
+          "Id": "c26"
+        },
+        "tinytext_column": {
+          "Name": "tinytext_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c7"
+        },
+        "varbinary_column": {
+          "Name": "varbinary_column",
+          "T": {
+            "Name": "BYTES"
+          },
+          "Id": "c20"
+        },
+        "varchar_column": {
+          "Name": "varchar_column",
+          "T": {
+            "Name": "varchar",
+            "Len": 20,
+            "IsArray": false
+          },
+          "Id": "c21",
+          "NotNull": false,
+          "Comment": "From: varchar_column varchar(20)"
+        },
+        "year_column": {
+          "Name": "year_column",
+          "T": {
+            "Name": "STRING"
+          },
+          "Id": "c6"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t1",
+      "Comment": "Spanner schema for source table sample_table"
+    },
+    "Singers": {
+      "Name": "Singers",
+      "ColIds": [
+        "c5",
+        "c6",
+        "c7",
+        "c8"
+      ],
+      "ColDefs": {
+        "c5": {
+          "Name": "SingerId",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: SingerId int",
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "Bday",
+          "T": {
+            "Name": "TIMESTAMP",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: FirstName varchar(1024)",
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "LastName",
+          "T": {
+            "Name": "STRING",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: LastName varchar(1024)",
+          "Id": "c7"
+        },
+        "c8": {
+          "Name": "hb_shardId",
+          "T": {
+            "Name": "STRING",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "HB shard id",
+          "Id": "c8"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c5",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t1"
+    },
+    "contact": {
+      "Name": "contact",
+      "ColIds": [
+        "c18",
+        "c19",
+        "c20",
+        "c21"
+      ],
+      "ColDefs": {
+        "c18": {
+          "Name": "ID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: ID int",
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "Customer_Id",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Customer_Id int",
+          "Id": "c19"
+        },
+        "c20": {
+          "Name": "Customer_Info",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Customer_Info varchar(50)",
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "Type",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Type varchar(50)",
+          "Id": "c21"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c18",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c19",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "Id": "t2"
+    },
+    "customer": {
+      "Name": "customer",
+      "ColIds": [
+        "c10",
+        "c11",
+        "c12"
+      ],
+      "ColDefs": {
+        "c10": {
+          "Name": "ID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: ID int",
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "Name",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Name varchar(50)",
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "City",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: City varchar(50)",
+          "Id": "c12"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c10",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c11",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "Id": "t3"
+    },
+    "Persons": {
+      "Name": "Persons",
+      "ColIds": [
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17",
+        "c22"
+      ],
+      "ColDefs": {
+        "c13": {
+          "Name": "PersonID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: PersonID int",
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "LastName",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: LastName varchar(255)",
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "FirstName",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: FirstName varchar(255)",
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "Address",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: Address varchar(255)",
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "City",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: City varchar(255)",
+          "Id": "c17"
+        },
+        "c22": {
+          "Name": "synth_id",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "",
+          "Id": "c22"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c22",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t4"
+    }
+  },
+  "SrcSchema": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Schema": "test",
+      "ColIds": [
+        "id",
+        "varchar_column",
+        "tinyint_column",
+        "text_column",
+        "date_column",
+        "smallint_column",
+        "mediumint_column",
+        "bigint_column",
+        "float_column",
+        "double_column",
+        "decimal_column",
+        "datetime_column",
+        "timestamp_column",
+        "time_column",
+        "year_column",
+        "char_column",
+        "tinyblob_column",
+        "tinytext_column",
+        "blob_column",
+        "mediumblob_column",
+        "mediumtext_column",
+        "longblob_column",
+        "longtext_column",
+        "enum_column",
+        "set_column",
+        "bool_column",
+        "binary_column",
+        "varbinary_column",
+        "blob_column"
+      ],
+      "ColDefs": {
+        "bigint_column": {
+          "Name": "bigint_column",
+          "Type": {
+            "Name": "bigint"
+          },
+          "Id": "c9"
+        },
+        "binary_column": {
+          "Name": "binary_column",
+          "Type": {
+            "Name": "binary"
+          },
+          "Id": "c25"
+        },
+        "blob_column": {
+          "Name": "blob_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              65535
+            ],
+            "ArrayBounds": null
+          },
+          "Id": "c11",
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          }
+        },
+        "bool_column": {
+          "Name": "bool_column",
+          "Type": {
+            "Name": "tinyint"
+          },
+          "Id": "c19"
+        },
+        "char_column": {
+          "Name": "char_column",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c10"
+        },
+        "date_column": {
+          "Name": "date_column",
+          "Type": {
+            "Name": "timestamp"
+          },
+          "Id": "c13"
+        },
+        "datetime_column": {
+          "Name": "datetime_column",
+          "Type": {
+            "Name": "timestamp"
+          },
+          "Id": "c15"
+        },
+        "decimal_column": {
+          "Name": "decimal_column",
+          "Type": {
+            "Name": "float"
+          },
+          "Id": "c28"
+        },
+        "double_column": {
+          "Name": "double_column",
+          "Type": {
+            "Name": "float"
+          },
+          "Id": "c17"
+        },
+        "enum_column": {
+          "Name": "enum_column",
+          "Type": {
+            "Name": "enum"
+          },
+          "Id": "c24"
+        },
+        "float_column": {
+          "Name": "float_column",
+          "Type": {
+            "Name": "float"
+          },
+          "Id": "c14"
+        },
+        "id": {
+          "Name": "id",
+          "Type": {
+            "Name": "integer",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "Id": "c2",
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          }
+        },
+        "longblob_column": {
+          "Name": "longblob_column",
+          "Type": {
+            "Name": "blob"
+          },
+          "Id": "c23"
+        },
+        "longtext_column": {
+          "Name": "longtext_column",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c12"
+        },
+        "mediumblob_column": {
+          "Name": "mediumblob_column",
+          "Type": {
+            "Name": "blob"
+          },
+          "Id": "c18"
+        },
+        "mediumint_column": {
+          "Name": "mediumint_column",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c8"
+        },
+        "mediumtext_column": {
+          "Name": "mediumtext_column",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c22"
+        },
+        "set_column": {
+          "Name": "set_column",
+          "Type": {
+            "Name": "set"
+          },
+          "Id": "c5"
+        },
+        "smallint_column": {
+          "Name": "smallint_column",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c3"
+        },
+        "text_column": {
+          "Name": "text_column",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c27"
+        },
+        "time_column": {
+          "Name": "time_column",
+          "Type": {
+            "Name": "time"
+          },
+          "Id": "c29"
+        },
+        "timestamp_column": {
+          "Name": "timestamp_column",
+          "Type": {
+            "Name": "timestamp"
+          },
+          "Id": "c16"
+        },
+        "tinyblob_column": {
+          "Name": "tinyblob_column",
+          "Type": {
+            "Name": "blob"
+          },
+          "Id": "c4"
+        },
+        "tinyint_column": {
+          "Name": "tinyint_column",
+          "Type": {
+            "Name": "tinyint"
+          },
+          "Id": "c26"
+        },
+        "tinytext_column": {
+          "Name": "tinytext_column",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c7"
+        },
+        "varbinary_column": {
+          "Name": "varbinary_column",
+          "Type": {
+            "Name": "varbinary"
+          },
+          "Id": "c20"
+        },
+        "varchar_column": {
+          "Name": "varchar_column",
+          "Type": {
+            "Name": "String",
+            "Mods": [
+              20
+            ],
+            "ArrayBounds": null
+          },
+          "Id": "c21",
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          }
+        },
+        "year_column": {
+          "Name": "year_column",
+          "Type": {
+            "Name": "year"
+          },
+          "Id": "c6"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t1"
+    },
+    "Singers": {
+      "Name": "Singers",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c5",
+        "c6",
+        "c7",
+        "c8"
+      ],
+      "ColDefs": {
+        "c5": {
+          "Name": "SingerId",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "Bday",
+          "Type": {
+            "Name": "timestamp"
+          },
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "LastName",
+          "Type": {
+            "Name": "String"
+          },
+          "Id": "c7"
+        },
+        "c8": {
+          "Name": "Age",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c8"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c5",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t1"
+    },
+    "contact": {
+      "Name": "contact",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c18",
+        "c19",
+        "c20",
+        "c21"
+      ],
+      "ColDefs": {
+        "c18": {
+          "Name": "ID",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "Customer_Id",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c19"
+        },
+        "c20": {
+          "Name": "Customer_Info",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "Type",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c21"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c18",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c19",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t2"
+    },
+    "customer": {
+      "Name": "customer",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c10",
+        "c11",
+        "c12"
+      ],
+      "ColDefs": {
+        "c10": {
+          "Name": "ID",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "Name",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "City",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c12"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c10",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t3"
+    },
+    "Persons": {
+      "Name": "Persons",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17"
+      ],
+      "ColDefs": {
+        "c13": {
+          "Name": "PersonID",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "LastName",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "FirstName",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "Address",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "City",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c17"
+        }
+      },
+      "PrimaryKeys": null,
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t4"
+    }
+  },
+  "ToSource": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Cols": {
+        "bigint_column": "bigint_column",
+        "binary_column": "binary_column",
+        "blob_column": "blob_column",
+        "bool_column": "bool_column",
+        "char_column": "char_column",
+        "date_column": "date_column",
+        "datetime_column": "datetime_column",
+        "decimal_column": "decimal_column",
+        "double_column": "double_column",
+        "enum_column": "enum_column",
+        "float_column": "float_column",
+        "id": "id",
+        "longblob_column": "longblob_column",
+        "longtext_column": "longtext_column",
+        "mediumblob_column": "mediumblob_column",
+        "mediumint_column": "mediumint_column",
+        "mediumtext_column": "mediumtext_column",
+        "set_column": "set_column",
+        "smallint_column": "smallint_column",
+        "text_column": "text_column",
+        "time_column": "time_column",
+        "timestamp_column": "timestamp_column",
+        "tinyblob_column": "tinyblob_column",
+        "tinyint_column": "tinyint_column",
+        "tinytext_column": "tinytext_column",
+        "varbinary_column": "varbinary_column",
+        "varchar_column": "varchar_column",
+        "year_column": "year_column"
+      }
+    }
+  },
+  "ToSpanner": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Cols": {
+        "blob_column": "blob_column",
+        "id": "id",
+        "varchar_column": "varchar_column"
+      }
+    }
+  }
+}
\ No newline at end of file

From 59a6543dba9bbe2c5e4c2a257af69885b1a97e47 Mon Sep 17 00:00:00 2001
From: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date: Wed, 8 Jan 2025 17:48:21 +0530
Subject: [PATCH 09/56] Dml integration (#53)

---
 .../v2/spanner/migrations/schema/Schema.java  |    7 +
 .../v2/templates/constants/Constants.java     |    1 -
 .../dbutils/dml/CassandraDMLGenerator.java    |  460 +++++
 .../dbutils/dml/CassandraTypeHandler.java     |  727 ++++++--
 .../processor/InputRecordProcessor.java       |   11 +-
 .../processor/SourceProcessorFactory.java     |   14 +-
 .../templates/transforms/AssignShardIdFn.java |    7 +-
 .../templates/transforms/SourceWriterFn.java  |    3 +-
 .../dml/CassandraDMLGeneratorTest.java        |  151 ++
 .../dbutils/dml/CassandraTypeHandlerTest.java | 1480 +++++------------
 .../processor/SourceProcessorFactoryTest.java |    4 +-
 .../cassandraAllDatatypeSession.json          |  603 +++++++
 12 files changed, 2227 insertions(+), 1241 deletions(-)
 create mode 100644 v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json

diff --git a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
index 55bd22b9aa..597280ed9d 100644
--- a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
+++ b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
@@ -66,6 +66,13 @@ public Schema() {
     this.empty = true;
   }
 
+  public Schema(Map<String, SpannerTable> spSchema, Map<String, SourceTable> srcSchema) {
+    this.spSchema = spSchema;
+    this.srcSchema = srcSchema;
+    this.syntheticPKeys = new HashMap<String, SyntheticPKey>();
+    this.empty = (spSchema == null || srcSchema == null);
+  }
+
   public Schema(
       Map<String, SpannerTable> spSchema,
       Map<String, SyntheticPKey> syntheticPKeys,
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java
index 476d199d46..35c354f267 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/constants/Constants.java
@@ -75,7 +75,6 @@ public class Constants {
   public static final String DEFAULT_SHARD_ID = "single_shard";
 
   public static final String SOURCE_MYSQL = "mysql";
-
   public static final String SOURCE_CASSANDRA = "cassandra";
 
   // Message written to the file for filtered records
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
new file mode 100644
index 0000000000..4b2fa8e1e6
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -0,0 +1,460 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates.dbutils.dml;
+
+import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.NameAndCols;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceTable;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerTable;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorRequest;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A generator for creating Data Manipulation Language (DML) statements for Cassandra. Implements
+ * the {@link IDMLGenerator} interface to handle various types of DML operations, such as insert,
+ * update, delete, and upsert.
+ *
+ * <p>This class is designed to construct Cassandra-specific DML statements by mapping input data
+ * and schema information to query formats that align with Cassandra's syntax and structure. It also
+ * validates primary keys, handles data type conversions, and manages timestamps in queries.
+ *
+ * <p>Key Responsibilities:
+ *
+ * <ul>
+ *   <li>Generating upsert statements for inserting or updating records.
+ *   <li>Creating delete statements for rows identified by primary key values.
+ *   <li>Mapping input data to Cassandra-compatible column values.
+ *   <li>Handling specific data types and ensuring query compatibility with Cassandra.
+ * </ul>
+ *
+ * <p>Usage Example:
+ *
+ * <pre>{@code
+ * IDMLGenerator generator = new CassandraDMLGenerator();
+ * DMLGeneratorResponse response = generator.getDMLStatement(dmlGeneratorRequest);
+ * }</pre>
+ *
+ * @see IDMLGenerator
+ */
+public class CassandraDMLGenerator implements IDMLGenerator {
+  private static final Logger LOG = LoggerFactory.getLogger(CassandraDMLGenerator.class);
+
+  /**
+   * @param dmlGeneratorRequest the request containing necessary information to construct the DML
+   *     statement, including modification type, table schema, new values, and key values.
+   * @return DMLGeneratorResponse
+   */
+  @Override
+  public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequest) {
+    if (dmlGeneratorRequest == null) {
+      LOG.warn("DMLGeneratorRequest is null. Cannot process the request.");
+      return new DMLGeneratorResponse("");
+    }
+
+    String spannerTableName = dmlGeneratorRequest.getSpannerTableName();
+    Schema schema = dmlGeneratorRequest.getSchema();
+
+    if (schema == null
+        || schema.getSpannerToID() == null
+        || schema.getSpSchema() == null
+        || schema.getSrcSchema() == null) {
+      LOG.warn("Schema is invalid or incomplete for table: {}", spannerTableName);
+      return new DMLGeneratorResponse("");
+    }
+
+    NameAndCols tableMapping = schema.getSpannerToID().get(spannerTableName);
+    if (tableMapping == null) {
+      LOG.warn(
+          "Spanner table {} not found in session file. Dropping the record.", spannerTableName);
+      return new DMLGeneratorResponse("");
+    }
+
+    String spannerTableId = tableMapping.getName();
+    SpannerTable spannerTable = schema.getSpSchema().get(spannerTableId);
+    if (spannerTable == null) {
+      LOG.warn(
+          "Spanner table {} not found in session file. Dropping the record.", spannerTableName);
+      return new DMLGeneratorResponse("");
+    }
+
+    SourceTable sourceTable = schema.getSrcSchema().get(spannerTableId);
+    if (sourceTable == null) {
+      LOG.warn(
+          "Source table {} not found for Spanner table ID: {}", spannerTableName, spannerTableId);
+      return new DMLGeneratorResponse("");
+    }
+
+    if (sourceTable.getPrimaryKeys() == null || sourceTable.getPrimaryKeys().length == 0) {
+      LOG.warn(
+          "Cannot reverse replicate table {} without primary key. Skipping the record.",
+          sourceTable.getName());
+      return new DMLGeneratorResponse("");
+    }
+
+    Map<String, PreparedStatementValueObject<?>> pkColumnNameValues =
+        getPkColumnValues(
+            spannerTable,
+            sourceTable,
+            dmlGeneratorRequest.getNewValuesJson(),
+            dmlGeneratorRequest.getKeyValuesJson(),
+            dmlGeneratorRequest.getSourceDbTimezoneOffset());
+    if (pkColumnNameValues == null) {
+      LOG.warn(
+          "Failed to generate primary key values for table {}. Skipping the record.",
+          sourceTable.getName());
+      return new DMLGeneratorResponse("");
+    }
+
+    String modType = dmlGeneratorRequest.getModType();
+    switch (modType) {
+      case "INSERT":
+      case "UPDATE":
+        return generateUpsertStatement(
+            spannerTable, sourceTable, dmlGeneratorRequest, pkColumnNameValues);
+      case "DELETE":
+        long timestamp = Instant.now().toEpochMilli() * 1000;
+        return getDeleteStatementCQL(sourceTable.getName(), pkColumnNameValues, timestamp);
+      default:
+        LOG.error("Unsupported modType: {} for table {}", modType, spannerTableName);
+        return new DMLGeneratorResponse("");
+    }
+  }
+
+  /**
+   * Generates an upsert (insert or update) DML statement for a given Spanner table based on the
+   * provided source table, request parameters, and primary key column values.
+   *
+   * @param spannerTable the Spanner table metadata containing column definitions and constraints.
+   * @param sourceTable the source table metadata containing the table name and structure.
+   * @param dmlGeneratorRequest the request containing new values, key values, and timezone offset
+   *     for generating the DML.
+   * @param pkColumnNameValues a map of primary key column names and their corresponding prepared
+   *     statement value objects.
+   * @return a {@link DMLGeneratorResponse} containing the generated upsert statement and associated
+   *     data.
+   *     <p>This method: 1. Extracts column values from the provided request using the
+   *     `getColumnValues` method. 2. Combines the column values with the primary key column values.
+   *     3. Constructs the upsert statement using the `getUpsertStatementCQL` method.
+   *     <p>The upsert statement ensures that the record is inserted or updated in the Spanner table
+   *     based on the primary key.
+   */
+  private static DMLGeneratorResponse generateUpsertStatement(
+      SpannerTable spannerTable,
+      SourceTable sourceTable,
+      DMLGeneratorRequest dmlGeneratorRequest,
+      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues) {
+    Map<String, PreparedStatementValueObject<?>> columnNameValues =
+        getColumnValues(
+            spannerTable,
+            sourceTable,
+            dmlGeneratorRequest.getNewValuesJson(),
+            dmlGeneratorRequest.getKeyValuesJson(),
+            dmlGeneratorRequest.getSourceDbTimezoneOffset());
+    return getUpsertStatementCQL(
+        sourceTable.getName(),
+        Instant.now().toEpochMilli() * 1000,
+        columnNameValues,
+        pkColumnNameValues);
+  }
+
+  /**
+   * Constructs an upsert (insert or update) CQL statement for a Cassandra or similar database using
+   * the provided table name, timestamp, column values, and primary key values.
+   *
+   * @param tableName the name of the table to which the upsert statement applies.
+   * @param timestamp the timestamp (in microseconds) to use for the operation.
+   * @param columnNameValues a map of column names and their corresponding prepared statement value
+   *     objects for non-primary key columns.
+   * @param pkColumnNameValues a map of primary key column names and their corresponding prepared
+   *     statement value objects.
+   * @return a {@link DMLGeneratorResponse} containing the generated CQL statement and a list of
+   *     values to be used with the prepared statement.
+   *     <p>This method: 1. Iterates through the primary key and column values, appending column
+   *     names and placeholders to the generated CQL statement. 2. Constructs the `INSERT INTO` CQL
+   *     statement with the provided table name, columns, and placeholders. 3. Appends a `USING
+   *     TIMESTAMP` clause to include the provided timestamp in the statement. 4. Creates a list of
+   *     values to bind to the placeholders in the prepared statement.
+   *     <p>The returned response contains the complete prepared CQL statement and the values
+   *     required to execute it.
+   */
+  private static DMLGeneratorResponse getUpsertStatementCQL(
+      String tableName,
+      long timestamp,
+      Map<String, PreparedStatementValueObject<?>> columnNameValues,
+      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues) {
+
+    StringBuilder allColumns = new StringBuilder();
+    StringBuilder placeholders = new StringBuilder();
+    List<PreparedStatementValueObject<?>> values = new ArrayList<>();
+
+    for (Map.Entry<String, PreparedStatementValueObject<?>> entry : pkColumnNameValues.entrySet()) {
+      String colName = entry.getKey();
+      PreparedStatementValueObject<?> colValue = entry.getValue();
+      if (colValue.value() != null) {
+        allColumns.append(colName).append(", ");
+        placeholders.append("?, ");
+        values.add(colValue);
+      }
+    }
+
+    for (Map.Entry<String, PreparedStatementValueObject<?>> entry : columnNameValues.entrySet()) {
+      String colName = entry.getKey();
+      PreparedStatementValueObject<?> colValue = entry.getValue();
+      if (colValue.value() != null) {
+        allColumns.append(colName).append(", ");
+        placeholders.append("?, ");
+        values.add(colValue);
+      }
+    }
+
+    if (allColumns.length() > 0) {
+      allColumns.setLength(allColumns.length() - 2);
+    }
+    if (placeholders.length() > 0) {
+      placeholders.setLength(placeholders.length() - 2);
+    }
+
+    String preparedStatement =
+        "INSERT INTO "
+            + tableName
+            + " ("
+            + allColumns
+            + ") VALUES ("
+            + placeholders
+            + ") USING TIMESTAMP ?;";
+
+    PreparedStatementValueObject<Long> timestampObj =
+        PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
+    values.add(timestampObj);
+
+    return new PreparedStatementGeneratedResponse(preparedStatement, values);
+  }
+
+  /**
+   * Constructs a delete statement in CQL (Cassandra Query Language) using the provided table name,
+   * primary key values, and timestamp.
+   *
+   * @param tableName the name of the table from which records will be deleted.
+   * @param pkColumnNameValues a map containing the primary key column names and their corresponding
+   *     prepared statement value objects.
+   * @param timestamp the timestamp (in microseconds) to use for the delete operation.
+   * @return a {@link DMLGeneratorResponse} containing the generated CQL delete statement and a list
+   *     of values to bind to the prepared statement.
+   *     <p>This method: 1. Iterates through the provided primary key column values, appending
+   *     conditions to the WHERE clause of the CQL delete statement. 2. Constructs the `DELETE FROM`
+   *     CQL statement with the specified table name, primary key conditions, and a `USING
+   *     TIMESTAMP` clause. 3. Creates a list of values to be used with the prepared statement,
+   *     including the timestamp.
+   *     <p>If no primary key column values are provided, an empty WHERE clause is generated. An
+   *     exception may be thrown if any value type does not match the expected type.
+   */
+  private static DMLGeneratorResponse getDeleteStatementCQL(
+      String tableName,
+      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues,
+      long timestamp) {
+
+    StringBuilder deleteConditions = new StringBuilder();
+    List<PreparedStatementValueObject<?>> values = new ArrayList<>();
+
+    for (Map.Entry<String, PreparedStatementValueObject<?>> entry : pkColumnNameValues.entrySet()) {
+      String colName = entry.getKey();
+      PreparedStatementValueObject<?> colValue = entry.getValue();
+      if (colValue.value() != null) {
+        deleteConditions.append(colName).append(" = ? AND ");
+        values.add(entry.getValue());
+      }
+    }
+
+    if (deleteConditions.length() > 0) {
+      deleteConditions.setLength(deleteConditions.length() - 5);
+    }
+
+    String preparedStatement =
+        "DELETE FROM " + tableName + " WHERE " + deleteConditions + " USING TIMESTAMP ?;";
+
+    PreparedStatementValueObject<Long> timestampObj =
+        PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
+    values.add(timestampObj);
+
+    return new PreparedStatementGeneratedResponse(preparedStatement, values);
+  }
+
+  /**
+   * Extracts the column values from the source table based on the provided Spanner schema, new
+   * values, and key values JSON objects.
+   *
+   * @param spannerTable the Spanner table schema.
+   * @param sourceTable the source table schema.
+   * @param newValuesJson the JSON object containing new values for columns.
+   * @param keyValuesJson the JSON object containing key values for columns.
+   * @param sourceDbTimezoneOffset the timezone offset of the source database.
+   * @return a map of column names to their corresponding prepared statement value objects.
+   *     <p>This method: 1. Iterates over the non-primary key column definitions in the source table
+   *     schema. 2. Maps each column in the source table schema to its corresponding column in the
+   *     Spanner schema. 3. Checks if the column values exist in the `keyValuesJson` or
+   *     `newValuesJson` and retrieves the appropriate value. 4. Skips columns that do not exist in
+   *     any of the JSON objects or are marked as null.
+   */
+  private static Map<String, PreparedStatementValueObject<?>> getColumnValues(
+      SpannerTable spannerTable,
+      SourceTable sourceTable,
+      JSONObject newValuesJson,
+      JSONObject keyValuesJson,
+      String sourceDbTimezoneOffset) {
+    Map<String, PreparedStatementValueObject<?>> response = new HashMap<>();
+    Set<String> sourcePKs = sourceTable.getPrimaryKeySet();
+    for (Map.Entry<String, SourceColumnDefinition> entry : sourceTable.getColDefs().entrySet()) {
+      SourceColumnDefinition sourceColDef = entry.getValue();
+
+      String colName = sourceColDef.getName();
+      if (sourcePKs.contains(colName)) {
+        continue; // we only need non-primary keys
+      }
+
+      String colId = entry.getKey();
+      SpannerColumnDefinition spannerColDef = spannerTable.getColDefs().get(colId);
+      if (spannerColDef == null) {
+        continue;
+      }
+      String spannerColumnName = spannerColDef.getName();
+      PreparedStatementValueObject<?> columnValue;
+      if (keyValuesJson.has(spannerColumnName)) {
+        // get the value based on Spanner and Source type
+        if (keyValuesJson.isNull(spannerColumnName)) {
+          continue;
+        }
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, keyValuesJson, sourceDbTimezoneOffset);
+      } else if (newValuesJson.has(spannerColumnName)) {
+        // get the value based on Spanner and Source type
+        if (newValuesJson.isNull(spannerColumnName)) {
+          continue;
+        }
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, newValuesJson, sourceDbTimezoneOffset);
+      } else {
+        continue;
+      }
+
+      response.put(sourceColDef.getName(), columnValue);
+    }
+
+    return response;
+  }
+
+  /**
+   * Extracts the primary key column values from the source table based on the provided Spanner
+   * schema, new values, and key values JSON objects.
+   *
+   * @param spannerTable the Spanner table schema.
+   * @param sourceTable the source table schema.
+   * @param newValuesJson the JSON object containing new values for columns.
+   * @param keyValuesJson the JSON object containing key values for columns.
+   * @param sourceDbTimezoneOffset the timezone offset of the source database.
+   * @return a map of primary key column names to their corresponding prepared statement value
+   *     objects, or null if a required column is missing.
+   *     <p>This method: 1. Iterates over the primary key definitions in the source table schema. 2.
+   *     Maps each primary key column in the source table schema to its corresponding column in the
+   *     Spanner schema. 3. Checks if the primary key column values exist in the `keyValuesJson` or
+   *     `newValuesJson` and retrieves the appropriate value. 4. Returns null if any required
+   *     primary key column is missing in the JSON objects.
+   */
+  private static Map<String, PreparedStatementValueObject<?>> getPkColumnValues(
+      SpannerTable spannerTable,
+      SourceTable sourceTable,
+      JSONObject newValuesJson,
+      JSONObject keyValuesJson,
+      String sourceDbTimezoneOffset) {
+    Map<String, PreparedStatementValueObject<?>> response = new HashMap<>();
+    ColumnPK[] sourcePKs = sourceTable.getPrimaryKeys();
+
+    for (ColumnPK currentSourcePK : sourcePKs) {
+      String colId = currentSourcePK.getColId();
+      SourceColumnDefinition sourceColDef = sourceTable.getColDefs().get(colId);
+      SpannerColumnDefinition spannerColDef = spannerTable.getColDefs().get(colId);
+      if (spannerColDef == null) {
+        LOG.warn(
+            "The corresponding primary key column {} was not found in Spanner",
+            sourceColDef.getName());
+        return null;
+      }
+      String spannerColumnName = spannerColDef.getName();
+      PreparedStatementValueObject<?> columnValue;
+      if (keyValuesJson.has(spannerColumnName)) {
+        // get the value based on Spanner and Source type
+        if (keyValuesJson.isNull(spannerColumnName)) {
+          continue;
+        }
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, keyValuesJson, sourceDbTimezoneOffset);
+      } else if (newValuesJson.has(spannerColumnName)) {
+        // get the value based on Spanner and Source type
+        if (newValuesJson.isNull(spannerColumnName)) {
+          continue;
+        }
+        columnValue =
+            getMappedColumnValue(
+                spannerColDef, sourceColDef, newValuesJson, sourceDbTimezoneOffset);
+      } else {
+        LOG.warn("The column {} was not found in input record", spannerColumnName);
+        return null;
+      }
+
+      response.put(sourceColDef.getName(), columnValue);
+    }
+
+    return response;
+  }
+
+  /**
+   * Maps a column value from the source table to its corresponding Spanner column value based on
+   * their respective definitions.
+   *
+   * @param spannerColDef the Spanner column definition.
+   * @param sourceColDef the source column definition.
+   * @param valuesJson the JSON object containing column values.
+   * @param sourceDbTimezoneOffset the timezone offset of the source database.
+   * @return a {@link PreparedStatementValueObject} containing the mapped value for the column.
+   *     <p>This method: 1. Retrieves the value of the column from the JSON object. 2. Converts the
+   *     value to the appropriate type based on the Spanner and source column definitions. 3. Uses a
+   *     type handler to map the value if necessary.
+   */
+  private static PreparedStatementValueObject<?> getMappedColumnValue(
+      SpannerColumnDefinition spannerColDef,
+      SourceColumnDefinition sourceColDef,
+      JSONObject valuesJson,
+      String sourceDbTimezoneOffset) {
+    return CassandraTypeHandler.getColumnValueByType(
+        spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index 54edd291dd..1a1e6c72c6 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -15,7 +15,11 @@
  */
 package com.google.cloud.teleport.v2.templates.dbutils.dml;
 
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
 import com.google.common.net.InetAddresses;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
@@ -24,11 +28,11 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -37,17 +41,81 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import org.eclipse.jetty.util.StringUtil;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-class CassandraTypeHandler {
+public class CassandraTypeHandler {
+  private static final Logger LOG = LoggerFactory.getLogger(CassandraTypeHandler.class);
 
+  /**
+   * Functional interface for parsing an object value to a specific type.
+   *
+   * <p>This interface provides a contract to implement type conversion logic where an input object
+   * is parsed and transformed into the desired target type.
+   *
+   * <p>Example usage:
+   *
+   * <pre>{@code
+   * TypeParser<Integer> intParser = value -> Integer.parseInt(value.toString());
+   * Integer parsedValue = intParser.parse("123");
+   * }</pre>
+   *
+   * @param <T> The target type to which the value will be parsed.
+   */
   @FunctionalInterface
   public interface TypeParser<T> {
+
+    /**
+     * Parses the given value and converts it into the target type {@code T}.
+     *
+     * @param value The input value to be parsed.
+     * @return The parsed value of type {@code T}.
+     */
     T parse(Object value);
   }
 
+  /**
+   * Functional interface for supplying a value with exception handling.
+   *
+   * <p>This interface provides a mechanism to execute logic that may throw a checked exception,
+   * making it useful for methods where exception handling is required.
+   *
+   * <p>Example usage:
+   *
+   * <pre>{@code
+   * HandlerSupplier<String> supplier = () -> {
+   *     if (someCondition) {
+   *         throw new IOException("Error occurred");
+   *     }
+   *     return "Success";
+   * };
+   *
+   * try {
+   *     String result = supplier.get();
+   *     System.out.println(result);
+   * } catch (Exception e) {
+   *     e.printStackTrace();
+   * }
+   * }</pre>
+   *
+   * @param <T> The type of value supplied by the supplier.
+   */
+  @FunctionalInterface
+  private interface HandlerSupplier<T> {
+
+    /**
+     * Supplies a value of type {@code T}.
+     *
+     * @return A value of type {@code T}.
+     * @throws Exception If an error occurs while supplying the value.
+     */
+    T get() throws Exception;
+  }
+
   /**
    * Converts a {@link String} to an ASCII representation for Cassandra's {@link String} or other
    * ASCII-based types.
@@ -61,7 +129,7 @@ public interface TypeParser<T> {
    * @return A {@link String} representing the ASCII value for the column in Cassandra.
    * @throws IllegalArgumentException If the string contains non-ASCII characters.
    */
-  public static String handleCassandraAsciiType(String colName, JSONObject valuesJson) {
+  private static String handleCassandraAsciiType(String colName, JSONObject valuesJson) {
     Object value = valuesJson.get(colName);
     if (value instanceof String) {
       String stringValue = (String) value;
@@ -91,7 +159,7 @@ public static String handleCassandraAsciiType(String colName, JSONObject valuesJ
    * @throws IllegalArgumentException If the value is not a valid format for varint (neither a valid
    *     number string nor a byte array).
    */
-  public static BigInteger handleCassandraVarintType(String colName, JSONObject valuesJson) {
+  private static BigInteger handleCassandraVarintType(String colName, JSONObject valuesJson) {
     Object value = valuesJson.get(colName);
 
     if (value instanceof String) {
@@ -126,7 +194,7 @@ public static BigInteger handleCassandraVarintType(String colName, JSONObject va
    * @return A {@link Duration} object representing the duration value from the Cassandra data.
    * @throws IllegalArgumentException if the value is not a valid duration string.
    */
-  public static Duration handleCassandraDurationType(String colName, JSONObject valuesJson) {
+  private static Duration handleCassandraDurationType(String colName, JSONObject valuesJson) {
     String durationString = valuesJson.optString(colName, null);
     if (durationString == null) {
       return null;
@@ -146,7 +214,7 @@ public static Duration handleCassandraDurationType(String colName, JSONObject va
    * @return a {@link InetAddress} object containing InetAddress as value represented in cassandra
    *     type.
    */
-  public static InetAddress handleCassandraInetAddressType(String colName, JSONObject valuesJson) {
+  private static InetAddress handleCassandraInetAddressType(String colName, JSONObject valuesJson) {
     String inetString = valuesJson.optString(colName, null);
     if (inetString == null) {
       return null;
@@ -165,7 +233,7 @@ public static InetAddress handleCassandraInetAddressType(String colName, JSONObj
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link Boolean} object containing the value represented in cassandra type.
    */
-  public static Boolean handleCassandraBoolType(String colName, JSONObject valuesJson) {
+  private static Boolean handleCassandraBoolType(String colName, JSONObject valuesJson) {
     return valuesJson.optBoolean(colName, false);
   }
 
@@ -176,7 +244,7 @@ public static Boolean handleCassandraBoolType(String colName, JSONObject valuesJ
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link Float} object containing the value represented in cassandra type.
    */
-  public static Float handleCassandraFloatType(String colName, JSONObject valuesJson) {
+  private static Float handleCassandraFloatType(String colName, JSONObject valuesJson) {
     try {
       return valuesJson.getBigDecimal(colName).floatValue();
     } catch (JSONException e) {
@@ -191,7 +259,7 @@ public static Float handleCassandraFloatType(String colName, JSONObject valuesJs
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link Double} object containing the value represented in cassandra type.
    */
-  public static Double handleCassandraDoubleType(String colName, JSONObject valuesJson) {
+  private static Double handleCassandraDoubleType(String colName, JSONObject valuesJson) {
     try {
       return valuesJson.getBigDecimal(colName).doubleValue();
     } catch (JSONException e) {
@@ -206,7 +274,7 @@ public static Double handleCassandraDoubleType(String colName, JSONObject values
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link ByteBuffer} object containing the value represented in cassandra type.
    */
-  public static ByteBuffer handleCassandraBlobType(String colName, JSONObject valuesJson) {
+  private static ByteBuffer handleCassandraBlobType(String colName, JSONObject valuesJson) {
     Object colValue = valuesJson.opt(colName);
     if (colValue == null) {
       return null;
@@ -220,18 +288,51 @@ public static ByteBuffer handleCassandraBlobType(String colName, JSONObject valu
    * @param colValue - contains all the key value for current incoming stream.
    * @return a {@link ByteBuffer} object containing the value represented in cassandra type.
    */
-  public static ByteBuffer parseBlobType(Object colValue) {
+  private static ByteBuffer parseBlobType(Object colValue) {
     byte[] byteArray;
+
     if (colValue instanceof byte[]) {
       byteArray = (byte[]) colValue;
     } else if (colValue instanceof String) {
-      byteArray = java.util.Base64.getDecoder().decode((String) colValue);
+      String strValue = (String) colValue;
+      if (StringUtil.isHex(strValue, 0, strValue.length())) {
+        byteArray = convertHexStringToByteArray(strValue);
+      } else {
+        byteArray = java.util.Base64.getDecoder().decode((String) colValue);
+      }
     } else {
       throw new IllegalArgumentException("Unsupported type for column");
     }
+
     return ByteBuffer.wrap(byteArray);
   }
 
+  /**
+   * Converts a hexadecimal string into a byte array.
+   *
+   * @param hex the hexadecimal string to be converted. It must have an even number of characters,
+   *     as each pair of characters represents one byte.
+   * @return a byte array representing the binary data equivalent of the hexadecimal string.
+   * @throws IllegalArgumentException if the input string contains non-hexadecimal characters.
+   *     <p>This method: 1. Calculates the length of the input string and initializes a byte array
+   *     of half the length, as two hexadecimal characters represent one byte. 2. Iterates through
+   *     the string in steps of two characters. 3. Converts each pair of characters into a single
+   *     byte by: - Extracting the numeric value of the first character (most significant 4 bits). -
+   *     Extracting the numeric value of the second character (least significant 4 bits). -
+   *     Combining the two values into a single byte. 4. Returns the resulting byte array.
+   *     <p>Example: Input: "4A3F" Output: byte[] { 0x4A, 0x3F }
+   */
+  private static byte[] convertHexStringToByteArray(String hex) {
+    int len = hex.length();
+    byte[] data = new byte[len / 2];
+    for (int i = 0; i < len; i += 2) {
+      data[i / 2] =
+          (byte)
+              ((Character.digit(hex.charAt(i), 16) << 4) + Character.digit(hex.charAt(i + 1), 16));
+    }
+    return data;
+  }
+
   /**
    * Generates a {@link LocalDate} based on the provided {@link CassandraTypeHandler}.
    *
@@ -246,7 +347,7 @@ public static ByteBuffer parseBlobType(Object colValue) {
    *     format. If the column is missing or contains an invalid value, this will return {@code
    *     null}.
    */
-  public static LocalDate handleCassandraDateType(String colName, JSONObject valuesJson) {
+  private static LocalDate handleCassandraDateType(String colName, JSONObject valuesJson) {
     return handleCassandraGenericDateType(colName, valuesJson, "yyyy-MM-dd");
   }
 
@@ -271,7 +372,7 @@ public static LocalDate handleCassandraDateType(String colName, JSONObject value
    * @throws IllegalArgumentException if the column value is missing, empty, or cannot be parsed as
    *     a valid timestamp.
    */
-  public static Instant handleCassandraTimestampType(String colName, JSONObject valuesJson) {
+  private static Instant handleCassandraTimestampType(String colName, JSONObject valuesJson) {
     String timestampValue = valuesJson.optString(colName, null);
     if (timestampValue == null || timestampValue.isEmpty()) {
       throw new IllegalArgumentException(
@@ -295,7 +396,7 @@ public static Instant handleCassandraTimestampType(String colName, JSONObject va
    * @return a {@link LocalDate} object containing the parsed date value. If the column is missing
    *     or invalid, this method returns {@code null}.
    */
-  public static LocalDate handleCassandraGenericDateType(
+  private static LocalDate handleCassandraGenericDateType(
       String colName, JSONObject valuesJson, String formatter) {
     Object colValue = valuesJson.opt(colName);
     if (colValue == null) {
@@ -323,7 +424,7 @@ public static LocalDate handleCassandraGenericDateType(
    * @return a {@link LocalDate} object parsed from the given value.
    * @throws IllegalArgumentException if the value cannot be parsed or is of an unsupported type.
    */
-  public static LocalDate parseDate(String colName, Object colValue, String formatter) {
+  private static LocalDate parseDate(String colName, Object colValue, String formatter) {
     LocalDate localDate;
     if (colValue instanceof String) {
       try {
@@ -356,7 +457,7 @@ public static LocalDate parseDate(String colName, Object colValue, String format
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link String} object containing String as value represented in cassandra type.
    */
-  public static String handleCassandraTextType(String colName, JSONObject valuesJson) {
+  private static String handleCassandraTextType(String colName, JSONObject valuesJson) {
     return valuesJson.optString(
         colName, null); // Get the value or null if the key is not found or the value is null
   }
@@ -368,7 +469,7 @@ public static String handleCassandraTextType(String colName, JSONObject valuesJs
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link UUID} object containing UUID as value represented in cassandra type.
    */
-  public static UUID handleCassandraUuidType(String colName, JSONObject valuesJson) {
+  private static UUID handleCassandraUuidType(String colName, JSONObject valuesJson) {
     String uuidString =
         valuesJson.optString(
             colName, null); // Get the value or null if the key is not found or the value is null
@@ -387,7 +488,7 @@ public static UUID handleCassandraUuidType(String colName, JSONObject valuesJson
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link Long} object containing Long as value represented in cassandra type.
    */
-  public static Long handleCassandraBigintType(String colName, JSONObject valuesJson) {
+  private static Long handleCassandraBigintType(String colName, JSONObject valuesJson) {
     try {
       return valuesJson.getBigInteger(colName).longValue();
     } catch (JSONException e) {
@@ -402,7 +503,7 @@ public static Long handleCassandraBigintType(String colName, JSONObject valuesJs
    * @param valuesJson - contains all the key value for current incoming stream.
    * @return a {@link Integer} object containing Integer as value represented in cassandra type.
    */
-  public static Integer handleCassandraIntType(String colName, JSONObject valuesJson) {
+  private static Integer handleCassandraIntType(String colName, JSONObject valuesJson) {
     try {
       return valuesJson.getBigInteger(colName).intValue();
     } catch (JSONException e) {
@@ -418,7 +519,7 @@ public static Integer handleCassandraIntType(String colName, JSONObject valuesJs
    *     stream.
    * @return a {@link List} object containing a list of long values represented in Cassandra.
    */
-  public static List<Long> handleInt64ArrayType(String colName, JSONObject valuesJson) {
+  private static List<Long> handleInt64ArrayType(String colName, JSONObject valuesJson) {
     return handleArrayType(
         colName,
         valuesJson,
@@ -447,7 +548,7 @@ public static List<Long> handleInt64ArrayType(String colName, JSONObject valuesJ
    *     stream.
    * @return a {@link Set} object containing a set of long values represented in Cassandra.
    */
-  public static Set<Long> handleInt64SetType(String colName, JSONObject valuesJson) {
+  private static Set<Long> handleInt64SetType(String colName, JSONObject valuesJson) {
     return new HashSet<>(handleInt64ArrayType(colName, valuesJson));
   }
 
@@ -460,7 +561,7 @@ public static Set<Long> handleInt64SetType(String colName, JSONObject valuesJson
    *     stream.
    * @return a {@link List} object containing a list of integer values represented in Cassandra.
    */
-  public static List<Integer> handleInt64ArrayAsInt32Array(String colName, JSONObject valuesJson) {
+  private static List<Integer> handleInt64ArrayAsInt32Array(String colName, JSONObject valuesJson) {
     return handleInt64ArrayType(colName, valuesJson).stream()
         .map(Long::intValue)
         .collect(Collectors.toList());
@@ -475,7 +576,7 @@ public static List<Integer> handleInt64ArrayAsInt32Array(String colName, JSONObj
    *     stream.
    * @return a {@link Set} object containing a set of integer values represented in Cassandra.
    */
-  public static Set<Integer> handleInt64ArrayAsInt32Set(String colName, JSONObject valuesJson) {
+  private static Set<Integer> handleInt64ArrayAsInt32Set(String colName, JSONObject valuesJson) {
     return handleInt64ArrayType(colName, valuesJson).stream()
         .map(Long::intValue)
         .collect(Collectors.toSet());
@@ -489,7 +590,7 @@ public static Set<Integer> handleInt64ArrayAsInt32Set(String colName, JSONObject
    *     stream.
    * @return a {@link Set} object containing a set of string values represented in Cassandra.
    */
-  public static Set<String> handleStringSetType(String colName, JSONObject valuesJson) {
+  private static Set<String> handleStringSetType(String colName, JSONObject valuesJson) {
     return new HashSet<>(handleStringArrayType(colName, valuesJson));
   }
 
@@ -501,7 +602,7 @@ public static Set<String> handleStringSetType(String colName, JSONObject valuesJ
    *     stream.
    * @return a {@link List} object containing a list of string values represented in Cassandra.
    */
-  public static List<String> handleStringArrayType(String colName, JSONObject valuesJson) {
+  private static List<String> handleStringArrayType(String colName, JSONObject valuesJson) {
     return handleArrayType(colName, valuesJson, String::valueOf);
   }
 
@@ -513,7 +614,7 @@ public static List<String> handleStringArrayType(String colName, JSONObject valu
    *     stream.
    * @return a {@link List} object containing a list of boolean values represented in Cassandra.
    */
-  public static List<Boolean> handleBoolArrayType(String colName, JSONObject valuesJson) {
+  private static List<Boolean> handleBoolArrayType(String colName, JSONObject valuesJson) {
     return handleArrayType(
         colName, valuesJson, obj -> obj instanceof String && Boolean.parseBoolean((String) obj));
   }
@@ -526,7 +627,7 @@ public static List<Boolean> handleBoolArrayType(String colName, JSONObject value
    *     stream.
    * @return a {@link Set} object containing a set of boolean values represented in Cassandra.
    */
-  public static Set<Boolean> handleBoolSetTypeString(String colName, JSONObject valuesJson) {
+  private static Set<Boolean> handleBoolSetTypeString(String colName, JSONObject valuesJson) {
     return new HashSet<>(handleBoolArrayType(colName, valuesJson));
   }
 
@@ -538,7 +639,7 @@ public static Set<Boolean> handleBoolSetTypeString(String colName, JSONObject va
    *     stream.
    * @return a {@link List} object containing a list of double values represented in Cassandra.
    */
-  public static List<Double> handleFloat64ArrayType(String colName, JSONObject valuesJson) {
+  private static List<Double> handleFloat64ArrayType(String colName, JSONObject valuesJson) {
     return handleArrayType(
         colName,
         valuesJson,
@@ -565,7 +666,7 @@ public static List<Double> handleFloat64ArrayType(String colName, JSONObject val
    *     stream.
    * @return a {@link Set} object containing a set of double values represented in Cassandra.
    */
-  public static Set<Double> handleFloat64SetType(String colName, JSONObject valuesJson) {
+  private static Set<Double> handleFloat64SetType(String colName, JSONObject valuesJson) {
     return new HashSet<>(handleFloat64ArrayType(colName, valuesJson));
   }
 
@@ -577,7 +678,7 @@ public static Set<Double> handleFloat64SetType(String colName, JSONObject values
    *     stream.
    * @return a {@link List} object containing a list of float values represented in Cassandra.
    */
-  public static List<Float> handleFloatArrayType(String colName, JSONObject valuesJson) {
+  private static List<Float> handleFloatArrayType(String colName, JSONObject valuesJson) {
     return handleFloat64ArrayType(colName, valuesJson).stream()
         .map(Double::floatValue)
         .collect(Collectors.toList());
@@ -591,7 +692,7 @@ public static List<Float> handleFloatArrayType(String colName, JSONObject values
    *     stream.
    * @return a {@link Set} object containing a set of float values represented in Cassandra.
    */
-  public static Set<Float> handleFloatSetType(String colName, JSONObject valuesJson) {
+  private static Set<Float> handleFloatSetType(String colName, JSONObject valuesJson) {
     return handleFloat64SetType(colName, valuesJson).stream()
         .map(Double::floatValue)
         .collect(Collectors.toSet());
@@ -605,7 +706,7 @@ public static Set<Float> handleFloatSetType(String colName, JSONObject valuesJso
    *     stream.
    * @return a {@link List} object containing a list of LocalDate values represented in Cassandra.
    */
-  public static List<LocalDate> handleDateArrayType(String colName, JSONObject valuesJson) {
+  private static List<LocalDate> handleDateArrayType(String colName, JSONObject valuesJson) {
     return handleArrayType(
         colName, valuesJson, obj -> LocalDate.parse(obj.toString(), DateTimeFormatter.ISO_DATE));
   }
@@ -618,7 +719,7 @@ public static List<LocalDate> handleDateArrayType(String colName, JSONObject val
    *     stream.
    * @return a {@link Set} object containing a set of LocalDate values represented in Cassandra.
    */
-  public static Set<LocalDate> handleDateSetType(String colName, JSONObject valuesJson) {
+  private static Set<LocalDate> handleDateSetType(String colName, JSONObject valuesJson) {
     return new HashSet<>(handleDateArrayType(colName, valuesJson));
   }
 
@@ -630,7 +731,7 @@ public static Set<LocalDate> handleDateSetType(String colName, JSONObject values
    *     stream.
    * @return a {@link List} object containing a list of Timestamp values represented in Cassandra.
    */
-  public static List<Timestamp> handleTimestampArrayType(String colName, JSONObject valuesJson) {
+  private static List<Timestamp> handleTimestampArrayType(String colName, JSONObject valuesJson) {
     return handleArrayType(
         colName,
         valuesJson,
@@ -647,7 +748,7 @@ public static List<Timestamp> handleTimestampArrayType(String colName, JSONObjec
    *     stream.
    * @return a {@link Set} object containing a set of Timestamp values represented in Cassandra.
    */
-  public static Set<Timestamp> handleTimestampSetType(String colName, JSONObject valuesJson) {
+  private static Set<Timestamp> handleTimestampSetType(String colName, JSONObject valuesJson) {
     return new HashSet<>(handleTimestampArrayType(colName, valuesJson));
   }
 
@@ -659,7 +760,7 @@ public static Set<Timestamp> handleTimestampSetType(String colName, JSONObject v
    * @return a {@link List} object containing List of ByteBuffer as value represented in cassandra
    *     type.
    */
-  public static List<ByteBuffer> handleByteArrayType(String colName, JSONObject valuesJson) {
+  private static List<ByteBuffer> handleByteArrayType(String colName, JSONObject valuesJson) {
     return handleArrayType(colName, valuesJson, CassandraTypeHandler::parseBlobType);
   }
 
@@ -671,7 +772,7 @@ public static List<ByteBuffer> handleByteArrayType(String colName, JSONObject va
    * @return a {@link List} object containing List of Type T as value represented in cassandra type
    *     which will be assigned runtime.
    */
-  public static <T> List<T> handleArrayType(
+  private static <T> List<T> handleArrayType(
       String colName, JSONObject valuesJson, TypeParser<T> parser) {
     return valuesJson.getJSONArray(colName).toList().stream()
         .map(parser::parse)
@@ -686,105 +787,10 @@ public static <T> List<T> handleArrayType(
    * @return a {@link Set} object containing Set of ByteBuffer as value represented in cassandra
    *     type.
    */
-  public static Set<ByteBuffer> handleByteSetType(String colName, JSONObject valuesJson) {
+  private static Set<ByteBuffer> handleByteSetType(String colName, JSONObject valuesJson) {
     return new HashSet<>(handleByteArrayType(colName, valuesJson));
   }
 
-  /**
-   * Converts a stringified JSON object to a {@link Map} representation for Cassandra.
-   *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, parses the stringified JSON, and returns it as a {@link Map}.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link Map} representing the parsed JSON from the stringified JSON.
-   * @throws IllegalArgumentException If the value is not a valid stringified JSON or cannot be
-   *     parsed.
-   */
-  public static Map<String, Object> handleStringifiedJsonToMap(
-      String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-    if (value instanceof String) {
-      String jsonString = (String) value;
-      try {
-        JSONObject jsonObject = new JSONObject(jsonString);
-        Map<String, Object> map = new HashMap<>();
-        for (String key : jsonObject.keySet()) {
-          Object jsonValue = jsonObject.get(key);
-          if (jsonValue instanceof JSONArray) {
-            map.put(key, jsonObject.getJSONArray(key));
-          } else if (jsonValue instanceof JSONObject) {
-            map.put(key, jsonObject.getJSONObject(key));
-          } else {
-            map.put(key, jsonValue);
-          }
-        }
-        return map;
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            "Invalid stringified JSON format for column: " + colName, e);
-      }
-    } else {
-      throw new IllegalArgumentException(
-          "Invalid format for column: " + colName + ". Expected a stringified JSON.");
-    }
-  }
-
-  /**
-   * Converts a stringified JSON array to a {@link List} representation for Cassandra.
-   *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, parses the stringified JSON array, and returns it as a {@link
-   * List}.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link List} representing the parsed JSON array from the stringified JSON.
-   * @throws IllegalArgumentException If the value is not a valid stringified JSON array or cannot
-   *     be parsed.
-   */
-  public static List<Object> handleStringifiedJsonToList(String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-    if (value instanceof String) {
-      String jsonString = (String) value;
-      try {
-        JSONArray jsonArray = new JSONArray(jsonString);
-        List<Object> list = new ArrayList<>();
-        for (int i = 0; i < jsonArray.length(); i++) {
-          list.add(jsonArray.get(i));
-        }
-        return list;
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            "Invalid stringified JSON array format for column: " + colName, e);
-      }
-    } else {
-      throw new IllegalArgumentException(
-          "Invalid format for column: " + colName + ". Expected a stringified JSON array.");
-    }
-  }
-
-  /**
-   * Converts a stringified JSON array to a {@link Set} representation for Cassandra.
-   *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, parses the stringified JSON array, and returns it as a {@link
-   * Set}.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link Set} representing the parsed JSON array from the stringified JSON.
-   * @throws IllegalArgumentException If the value is not a valid stringified JSON array or cannot
-   *     be parsed.
-   */
-  public static Set<Object> handleStringifiedJsonToSet(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleStringifiedJsonToList(colName, valuesJson));
-  }
-
   /**
    * Converts an {@link Integer} to a {@code short} (SmallInt).
    *
@@ -797,7 +803,7 @@ public static Set<Object> handleStringifiedJsonToSet(String colName, JSONObject
    * @throws IllegalArgumentException If the {@code integerValue} is out of range for a {@code
    *     smallint}.
    */
-  public static short convertToSmallInt(Integer integerValue) {
+  private static short convertToSmallInt(Integer integerValue) {
     if (integerValue < Short.MIN_VALUE || integerValue > Short.MAX_VALUE) {
       throw new IllegalArgumentException("Value is out of range for smallint.");
     }
@@ -816,7 +822,7 @@ public static short convertToSmallInt(Integer integerValue) {
    * @throws IllegalArgumentException If the {@code integerValue} is out of range for a {@code
    *     tinyint}.
    */
-  public static byte convertToTinyInt(Integer integerValue) {
+  private static byte convertToTinyInt(Integer integerValue) {
     if (integerValue < Byte.MIN_VALUE || integerValue > Byte.MAX_VALUE) {
       throw new IllegalArgumentException("Value is out of range for tinyint.");
     }
@@ -832,33 +838,10 @@ public static byte convertToTinyInt(Integer integerValue) {
    * @param value The string to be escaped.
    * @return The escaped string where single quotes are replaced with double single quotes.
    */
-  public static String escapeCassandraString(String value) {
+  private static String escapeCassandraString(String value) {
     return value.replace("'", "''");
   }
 
-  /**
-   * Converts a string representation of a timestamp to a Cassandra-compatible timestamp.
-   *
-   * <p>The method parses the {@code value} as a {@link ZonedDateTime}, applies the given timezone
-   * offset to adjust the time, and converts the result into a UTC timestamp string that is
-   * compatible with Cassandra.
-   *
-   * @param value The timestamp string in ISO-8601 format (e.g., "2024-12-05T10:15:30+01:00").
-   * @param timezoneOffset The timezone offset (e.g., "+02:00") to apply to the timestamp.
-   * @return A string representation of the timestamp in UTC that is compatible with Cassandra.
-   * @throws RuntimeException If the timestamp string is invalid or the conversion fails.
-   */
-  public static String convertToCassandraTimestamp(String value, String timezoneOffset) {
-    try {
-      ZonedDateTime dateTime = ZonedDateTime.parse(value);
-      ZoneOffset offset = ZoneOffset.of(timezoneOffset);
-      dateTime = dateTime.withZoneSameInstant(offset);
-      return "'" + dateTime.withZoneSameInstant(ZoneOffset.UTC).toString() + "'";
-    } catch (DateTimeParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   /**
    * Converts a string representation of a date to a {@link LocalDate} compatible with Cassandra.
    *
@@ -869,7 +852,7 @@ public static String convertToCassandraTimestamp(String value, String timezoneOf
    * @param dateString The date string in ISO-8601 format (e.g., "2024-12-05T00:00:00Z").
    * @return The {@link LocalDate} representation of the date.
    */
-  public static LocalDate convertToCassandraDate(String dateString) {
+  private static LocalDate convertToCassandraDate(String dateString) {
     Instant instant = convertToCassandraTimestamp(dateString);
     ZonedDateTime zonedDateTime = instant.atZone(ZoneId.systemDefault());
     return zonedDateTime.toLocalDate();
@@ -885,7 +868,7 @@ public static LocalDate convertToCassandraDate(String dateString) {
    * @param timestampValue The timestamp string in ISO-8601 format (e.g., "2024-12-05T10:15:30Z").
    * @return The {@link Instant} representation of the timestamp.
    */
-  public static Instant convertToCassandraTimestamp(String timestampValue) {
+  private static Instant convertToCassandraTimestamp(String timestampValue) {
     try {
       return Instant.parse(timestampValue);
     } catch (DateTimeParseException e) {
@@ -910,7 +893,7 @@ public static Instant convertToCassandraTimestamp(String timestampValue) {
    * @param value The string to check if it represents a valid UUID.
    * @return {@code true} if the string is a valid UUID, {@code false} otherwise.
    */
-  public static boolean isValidUUID(String value) {
+  private static boolean isValidUUID(String value) {
     try {
       UUID.fromString(value);
       return true;
@@ -929,7 +912,7 @@ public static boolean isValidUUID(String value) {
    * @param value The string to check if it represents a valid IP address.
    * @return {@code true} if the string is a valid IP address, {@code false} otherwise.
    */
-  public static boolean isValidIPAddress(String value) {
+  private static boolean isValidIPAddress(String value) {
     try {
       InetAddresses.forString(value);
       return true;
@@ -948,7 +931,45 @@ public static boolean isValidIPAddress(String value) {
    * @param value The string to check if it represents a valid JSON object.
    * @return {@code true} if the string is a valid JSON object, {@code false} otherwise.
    */
-  public static boolean isValidJSON(String value) {
+  private static boolean isValidJSON(String value) {
+    try {
+      new JSONObject(value);
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+
+  /**
+   * Validates if the given string is a valid JSONArray.
+   *
+   * <p>This method attempts to parse the string using {@link JSONArray} to check if the value
+   * represents a valid JSON object. If the string is valid JSON, it returns {@code true}, otherwise
+   * {@code false}.
+   *
+   * @param value The string to check if it represents a valid JSON object.
+   * @return {@code true} if the string is a valid JSON object, {@code false} otherwise.
+   */
+  private static boolean isValidJSONArray(String value) {
+    try {
+      new JSONArray(value);
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+
+  /**
+   * Validates if the given string is a valid JSONObject.
+   *
+   * <p>This method attempts to parse the string using {@link JSONObject} to check if the value
+   * represents a valid JSON object. If the string is valid JSON, it returns {@code true}, otherwise
+   * {@code false}.
+   *
+   * @param value The string to check if it represents a valid JSON object.
+   * @return {@code true} if the string is a valid JSON object, {@code false} otherwise.
+   */
+  private static boolean isValidJSONObject(String value) {
     try {
       new JSONObject(value);
       return true;
@@ -963,7 +984,7 @@ public static boolean isValidJSON(String value) {
    * @param value - The string to check.
    * @return true if the string contains only ASCII characters, false otherwise.
    */
-  public static boolean isAscii(String value) {
+  private static boolean isAscii(String value) {
     for (int i = 0; i < value.length(); i++) {
       if (value.charAt(i) > 127) {
         return false;
@@ -971,4 +992,378 @@ public static boolean isAscii(String value) {
     }
     return true;
   }
+
+  /**
+   * Helper method to check if a string contains Duration Character.
+   *
+   * @param value - The string to check.
+   * @return true if the string contains Duration Character, false otherwise.
+   */
+  private static boolean isDurationString(String value) {
+    try {
+      Duration.parse(value);
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+
+  /**
+   * Safely executes a handler method, catching exceptions and rethrowing them as runtime
+   * exceptions.
+   *
+   * <p>This method provides exception safety by wrapping the execution of a supplier function.
+   *
+   * @param <T> The return type of the handler.
+   * @param supplier A functional interface providing the value.
+   * @return The result of the supplier function.
+   * @throws IllegalArgumentException If an exception occurs during the supplier execution.
+   */
+  private static <T> T safeHandle(HandlerSupplier<T> supplier) {
+    try {
+      return supplier.get();
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Error handling type: " + e.getMessage(), e);
+    }
+  }
+
+  /**
+   * Handles and extracts column values based on the Spanner column type.
+   *
+   * <p>This method processes Spanner column types (e.g., bigint, string, timestamp, etc.) and
+   * returns the parsed value for further handling.
+   *
+   * @param spannerType The Spanner column type (e.g., "string", "bigint").
+   * @param columnName The name of the column.
+   * @param valuesJson The JSON object containing the column value.
+   * @return The extracted value for the column, or {@code null} if the column type is unsupported.
+   */
+  private static Object handleSpannerColumnType(
+      String spannerType, String columnName, JSONObject valuesJson) {
+    switch (spannerType) {
+      case "bigint":
+      case "int64":
+        return CassandraTypeHandler.handleCassandraBigintType(columnName, valuesJson);
+
+      case "string":
+        return handleStringType(columnName, valuesJson);
+
+      case "timestamp":
+      case "date":
+      case "datetime":
+        return CassandraTypeHandler.handleCassandraTimestampType(columnName, valuesJson);
+
+      case "boolean":
+        return CassandraTypeHandler.handleCassandraBoolType(columnName, valuesJson);
+
+      case "float64":
+        return CassandraTypeHandler.handleCassandraDoubleType(columnName, valuesJson);
+
+      case "numeric":
+      case "float":
+        return CassandraTypeHandler.handleCassandraFloatType(columnName, valuesJson);
+
+      case "bytes":
+      case "bytes(max)":
+        return CassandraTypeHandler.handleCassandraBlobType(columnName, valuesJson);
+
+      case "integer":
+        return CassandraTypeHandler.handleCassandraIntType(columnName, valuesJson);
+
+      default:
+        LOG.warn("Unsupported Spanner column type: {}", spannerType);
+        return null;
+    }
+  }
+
+  /**
+   * Handles and parses column values for string types, determining specific subtypes dynamically.
+   *
+   * <p>This method identifies if the string can be a UUID, IP address, JSON, blob, duration, or
+   * ASCII type. If none match, it treats the value as a simple text type.
+   *
+   * @param colName The name of the column.
+   * @param valuesJson The JSON object containing the column value.
+   * @return The parsed value as the appropriate type (e.g., UUID, JSON, etc.).
+   */
+  private static Object handleStringType(String colName, JSONObject valuesJson) {
+    String inputValue = CassandraTypeHandler.handleCassandraTextType(colName, valuesJson);
+
+    if (isValidUUID(inputValue)) {
+      return CassandraTypeHandler.handleCassandraUuidType(colName, valuesJson);
+    } else if (isValidIPAddress(inputValue)) {
+      return safeHandle(
+          () -> CassandraTypeHandler.handleCassandraInetAddressType(colName, valuesJson));
+    } else if (isValidJSONArray(inputValue)) {
+      return new JSONArray(inputValue);
+    } else if (isValidJSONObject(inputValue)) {
+      return new JSONObject(inputValue);
+    } else if (StringUtil.isHex(inputValue, 0, inputValue.length())) {
+      return CassandraTypeHandler.handleCassandraBlobType(colName, valuesJson);
+    } else if (isAscii(inputValue)) {
+      return CassandraTypeHandler.handleCassandraAsciiType(colName, valuesJson);
+    } else if (isDurationString(inputValue)) {
+      return CassandraTypeHandler.handleCassandraDurationType(colName, valuesJson);
+    }
+    return inputValue;
+  }
+
+  /**
+   * Parses a column value based on its Cassandra column type and wraps it into {@link
+   * PreparedStatementValueObject}.
+   *
+   * <p>This method processes basic Cassandra types (e.g., text, bigint, boolean, timestamp) and
+   * special types such as {@link Instant}, {@link UUID}, {@link BigInteger}, and {@link Duration}.
+   *
+   * @param columnType The Cassandra column type (e.g., "text", "timestamp").
+   * @param colValue The column value to parse and wrap.
+   * @return A {@link PreparedStatementValueObject} containing the parsed column value.
+   * @throws IllegalArgumentException If the column value cannot be converted to the specified type.
+   */
+  private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
+      String columnType, Object colValue) {
+
+    if (columnType.startsWith("list<") && colValue instanceof JSONArray) {
+      return PreparedStatementValueObject.create(
+          columnType, parseCassandraList(columnType, (JSONArray) colValue));
+    } else if (columnType.startsWith("set<") && colValue instanceof JSONArray) {
+      return PreparedStatementValueObject.create(
+          columnType, parseCassandraSet(columnType, (JSONArray) colValue));
+    } else if (columnType.startsWith("map<") && colValue instanceof JSONObject) {
+      return PreparedStatementValueObject.create(
+          columnType, parseCassandraMap(columnType, (JSONObject) colValue));
+    }
+
+    switch (columnType) {
+      case "ascii":
+      case "text":
+      case "varchar":
+        return PreparedStatementValueObject.create(columnType, (String) colValue);
+
+      case "bigint":
+        return PreparedStatementValueObject.create(columnType, (Long) colValue);
+
+      case "boolean":
+        return PreparedStatementValueObject.create(columnType, (Boolean) colValue);
+
+      case "decimal":
+        return PreparedStatementValueObject.create(columnType, (BigDecimal) colValue);
+
+      case "double":
+        return PreparedStatementValueObject.create(columnType, (Double) colValue);
+
+      case "float":
+        return PreparedStatementValueObject.create(columnType, (Float) colValue);
+
+      case "inet":
+        return PreparedStatementValueObject.create(columnType, (java.net.InetAddress) colValue);
+
+      case "int":
+        return PreparedStatementValueObject.create(columnType, (Integer) colValue);
+
+      case "smallint":
+        return PreparedStatementValueObject.create(
+            columnType, convertToSmallInt((Integer) colValue));
+
+      case "time":
+      case "timestamp":
+      case "datetime":
+        return PreparedStatementValueObject.create(columnType, (Instant) colValue);
+
+      case "date":
+        return PreparedStatementValueObject.create(
+            columnType,
+            safeHandle(
+                () -> {
+                  if (colValue instanceof String) {
+                    return LocalDate.parse((String) colValue);
+                  } else if (colValue instanceof Instant) {
+                    return ((Instant) colValue).atZone(ZoneId.systemDefault()).toLocalDate();
+                  } else if (colValue instanceof Date) {
+                    return ((Date) colValue)
+                        .toInstant()
+                        .atZone(ZoneId.systemDefault())
+                        .toLocalDate();
+                  }
+                  throw new IllegalArgumentException(
+                      "Unsupported value for date conversion: " + colValue);
+                }));
+
+      case "timeuuid":
+      case "uuid":
+        return PreparedStatementValueObject.create(columnType, (UUID) colValue);
+
+      case "tinyint":
+        return PreparedStatementValueObject.create(
+            columnType, convertToTinyInt((Integer) colValue));
+
+      case "varint":
+        return PreparedStatementValueObject.create(
+            columnType, new BigInteger(((ByteBuffer) colValue).array()));
+
+      case "duration":
+        return PreparedStatementValueObject.create(columnType, (Duration) colValue);
+
+      default:
+        return PreparedStatementValueObject.create(columnType, colValue);
+    }
+  }
+
+  /**
+   * Parses a Cassandra list from the given JSON array.
+   *
+   * @param columnType the Cassandra column type (e.g., "list of int", "list of text")
+   * @param colValue the JSON array representing the list values
+   * @return a {@link List} containing parsed values, or an empty list if {@code colValue} is null
+   */
+  private static List<?> parseCassandraList(String columnType, JSONArray colValue) {
+    if (colValue == null) {
+      return Collections.emptyList();
+    }
+    String innerType = extractInnerType(columnType);
+    List<Object> parsedList = new ArrayList<>();
+    for (int i = 0; i < colValue.length(); i++) {
+      Object value = colValue.get(i);
+      parsedList.add(parseNestedType(innerType, value).value());
+    }
+    return parsedList;
+  }
+
+  /**
+   * Extracts the inner type of a Cassandra collection column (e.g., "list of int" -> "int").
+   *
+   * @param columnType the Cassandra column type
+   * @return the extracted inner type as a {@link String}
+   */
+  private static String extractInnerType(String columnType) {
+    return columnType.substring(columnType.indexOf('<') + 1, columnType.lastIndexOf('>'));
+  }
+
+  /**
+   * Extracts the key and value types from a Cassandra map column type (e.g., "map of int and
+   * text").
+   *
+   * @param columnType the Cassandra column type
+   * @return an array of two {@link String}s, where the first element is the key type and the second
+   *     element is the value type
+   */
+  private static String[] extractKeyValueTypes(String columnType) {
+    String innerTypes =
+        columnType.substring(columnType.indexOf('<') + 1, columnType.lastIndexOf('>'));
+    return innerTypes.split(",", 2);
+  }
+
+  /**
+   * Parses a nested Cassandra type from a given value.
+   *
+   * @param type the Cassandra column type (e.g., "int", "text", "map of int of text")
+   * @param value the value to parse
+   * @return a {@link PreparedStatementValueObject} representing the parsed type
+   */
+  private static PreparedStatementValueObject<?> parseNestedType(String type, Object value) {
+    return parseAndCastToCassandraType(type.trim(), value);
+  }
+
+  /**
+   * Parses a Cassandra set from the given JSON array.
+   *
+   * @param columnType the Cassandra column type (e.g., "set of int", "set of text")
+   * @param colValue the JSON array representing the set values
+   * @return a {@link Set} containing parsed values, or an empty set if {@code colValue} is null
+   */
+  private static Set<?> parseCassandraSet(String columnType, JSONArray colValue) {
+    if (colValue == null) {
+      return Collections.emptySet();
+    }
+    String innerType = extractInnerType(columnType);
+    Set<Object> parsedSet = new HashSet<>();
+    for (int i = 0; i < colValue.length(); i++) {
+      Object value = colValue.get(i);
+      parsedSet.add(parseNestedType(innerType, value).value());
+    }
+    return parsedSet;
+  }
+
+  /**
+   * Parses a Cassandra map from the given JSON object.
+   *
+   * @param columnType the Cassandra column type (e.g., "map of int and text")
+   * @param colValue the JSON object representing the map values
+   * @return a {@link Map} containing parsed key-value pairs, or an empty map if {@code colValue} is
+   *     null
+   */
+  private static Map<?, ?> parseCassandraMap(String columnType, JSONObject colValue) {
+    if (colValue == null) {
+      return Collections.emptyMap();
+    }
+    String[] keyValueTypes = extractKeyValueTypes(columnType);
+    String keyType = keyValueTypes[0];
+    String valueType = keyValueTypes[1];
+
+    Map<Object, Object> parsedMap = new HashMap<>();
+    for (String key : colValue.keySet()) {
+      Object parsedKey = parseNestedType(keyType, key).value();
+      Object parsedValue = parseNestedType(valueType, colValue.get(key)).value();
+      parsedMap.put(parsedKey, parsedValue);
+    }
+    return parsedMap;
+  }
+
+  /**
+   * Parses a column's value from a JSON object based on Spanner and source database column types.
+   *
+   * <p>This method determines the column type, extracts the value using helper methods, and returns
+   * a {@link PreparedStatementValueObject} containing the column value formatted for Cassandra.
+   *
+   * @param spannerColDef The Spanner column definition containing column name and type.
+   * @param sourceColDef The source database column definition containing column type.
+   * @param valuesJson The JSON object containing column values.
+   * @param sourceDbTimezoneOffset The timezone offset for date-time columns (if applicable).
+   * @return A {@link PreparedStatementValueObject} containing the parsed column value.
+   */
+  public static PreparedStatementValueObject<?> getColumnValueByType(
+      SpannerColumnDefinition spannerColDef,
+      SourceColumnDefinition sourceColDef,
+      JSONObject valuesJson,
+      String sourceDbTimezoneOffset) {
+
+    if (spannerColDef == null || sourceColDef == null) {
+      throw new IllegalArgumentException("Column definitions cannot be null.");
+    }
+
+    String spannerType = spannerColDef.getType().getName().toLowerCase();
+    String cassandraType = sourceColDef.getType().getName().toLowerCase();
+    String columnName = spannerColDef.getName();
+
+    Object columnValue = handleSpannerColumnType(spannerType, columnName, valuesJson);
+
+    if (columnValue == null) {
+      LOG.warn("Column value is null for column: {}, type: {}", columnName, spannerType);
+      return PreparedStatementValueObject.create(cassandraType, null);
+    }
+    return PreparedStatementValueObject.create(cassandraType, columnValue);
+  }
+
+  /**
+   * Casts the given column value to the expected type based on the Cassandra column type.
+   *
+   * <p>This method attempts to parse and cast the column value to a type compatible with the
+   * provided Cassandra column type using {@code parseAndGenerateCassandraType}. If the value cannot
+   * be cast correctly, an error is logged, and an exception is thrown.
+   *
+   * @param cassandraType the Cassandra data type of the column (e.g., "text", "bigint", "list of
+   *     text")
+   * @param columnValue the value of the column to be cast
+   * @return the column value cast to the expected type
+   * @throws ClassCastException if the value cannot be cast to the expected type
+   * @throws IllegalArgumentException if the Cassandra type is unsupported or the value is invalid
+   */
+  public static Object castToExpectedType(String cassandraType, Object columnValue) {
+    try {
+      return parseAndCastToCassandraType(cassandraType, columnValue).value();
+    } catch (ClassCastException | IllegalArgumentException e) {
+      LOG.error("Error converting value for column: {}, type: {}", cassandraType, e.getMessage());
+      throw e;
+    }
+  }
 }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
index 9bdfe2bcda..d94496f468 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.teleport.v2.templates.dbutils.processor;
 
+import static com.google.cloud.teleport.v2.templates.constants.Constants.SOURCE_CASSANDRA;
+
 import com.google.cloud.teleport.v2.spanner.exceptions.InvalidTransformationException;
 import com.google.cloud.teleport.v2.spanner.migrations.convertors.ChangeEventToMapConvertor;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
@@ -53,7 +55,8 @@ public static boolean processRecord(
       String shardId,
       String sourceDbTimezoneOffset,
       IDMLGenerator dmlGenerator,
-      ISpannerMigrationTransformer spannerToSourceTransformer)
+      ISpannerMigrationTransformer spannerToSourceTransformer,
+      String source)
       throws Exception {
 
     try {
@@ -102,7 +105,11 @@ public static boolean processRecord(
         LOG.warn("DML statement is empty for table: " + tableName);
         return false;
       }
-      dao.write(dmlGeneratorResponse.getDmlStatement());
+      if (source.equals(SOURCE_CASSANDRA)) {
+        dao.write(dmlGeneratorResponse);
+      } else {
+        dao.write(dmlGeneratorResponse.getDmlStatement());
+      }
 
       Counter numRecProcessedMetric =
           Metrics.counter(shardId, "records_written_to_source_" + shardId);
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java
index 54d70d33c1..5d68c5a256 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactory.java
@@ -24,12 +24,11 @@
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.CassandraDao;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.IDao;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.JdbcDao;
+import com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraDMLGenerator;
 import com.google.cloud.teleport.v2.templates.dbutils.dml.IDMLGenerator;
 import com.google.cloud.teleport.v2.templates.dbutils.dml.MySQLDMLGenerator;
 import com.google.cloud.teleport.v2.templates.exceptions.UnsupportedSourceException;
 import com.google.cloud.teleport.v2.templates.models.ConnectionHelperRequest;
-import com.google.cloud.teleport.v2.templates.models.DMLGeneratorRequest;
-import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,16 +53,7 @@ public class SourceProcessorFactory {
 
   static {
     dmlGeneratorMap.put(Constants.SOURCE_MYSQL, new MySQLDMLGenerator());
-    dmlGeneratorMap.put(
-        Constants.SOURCE_CASSANDRA,
-        new IDMLGenerator() {
-          // TODO It will get removed in DML PR added Now for Test case eg: new
-          // CassandraDMLGenerator()
-          @Override
-          public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequest) {
-            return new DMLGeneratorResponse("");
-          }
-        });
+    dmlGeneratorMap.put(Constants.SOURCE_CASSANDRA, new CassandraDMLGenerator());
 
     connectionHelperMap.put(Constants.SOURCE_MYSQL, new JdbcConnectionHelper());
     connectionHelperMap.put(Constants.SOURCE_CASSANDRA, new CassandraConnectionHelper());
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
index 76b78d4a4e..ca9bae3781 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
@@ -181,6 +181,7 @@ public void processElement(ProcessContext c) throws Exception {
     String qualifiedShard = "";
     String tableName = record.getTableName();
     String keysJsonStr = record.getMod().getKeysJson();
+    long finalKey;
 
     try {
       if (shardingMode.equals(Constants.SHARDING_MODE_SINGLE_SHARD)) {
@@ -231,9 +232,7 @@ public void processElement(ProcessContext c) throws Exception {
 
       record.setShard(qualifiedShard);
       String finalKeyString = tableName + "_" + keysJsonStr + "_" + qualifiedShard;
-      Long finalKey =
-          finalKeyString.hashCode() % maxConnectionsAcrossAllShards; // The total parallelism is
-      // maxConnectionsAcrossAllShards
+      finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
       c.output(KV.of(finalKey, record));
 
     } catch (Exception e) {
@@ -242,7 +241,7 @@ public void processElement(ProcessContext c) throws Exception {
       LOG.error("Error fetching shard Id column: " + e.getMessage() + ": " + errors.toString());
       // The record has no shard hence will be sent to DLQ in subsequent steps
       String finalKeyString = record.getTableName() + "_" + keysJsonStr + "_" + skipDirName;
-      Long finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
+      finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
       c.output(KV.of(finalKey, record));
     }
   }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
index 795284a9d4..bb1a2bc715 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
@@ -210,7 +210,8 @@ public void processElement(ProcessContext c) {
                   shardId,
                   sourceDbTimezoneOffset,
                   sourceProcessor.getDmlGenerator(),
-                  spannerToSourceTransformer);
+                  spannerToSourceTransformer,
+                  this.source);
           if (isEventFiltered) {
             outputWithTag(c, Constants.FILTERED_TAG, Constants.FILTERED_TAG_MESSAGE, spannerRec);
           }
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
new file mode 100644
index 0000000000..9aef70e36c
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates.dbutils.dml;
+
+import static org.junit.Assert.assertTrue;
+
+import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.NameAndCols;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceTable;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnType;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerTable;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SyntheticPKey;
+import com.google.cloud.teleport.v2.spanner.migrations.utils.SessionFileReader;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorRequest;
+import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
+import java.util.HashMap;
+import java.util.Map;
+import org.json.JSONObject;
+import org.junit.Test;
+
+public class CassandraDMLGeneratorTest {
+
+  @Test
+  public void primaryKeyNotFoundInJson() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllDatatypeSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SomeRandomName\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void primaryKeyNotPresentInSourceSchema() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllDatatypeSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSpannerTableNotInSchema() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllDatatypeSession.json");
+    String tableName = "SomeRandomTableNotInSchema";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  public static Schema getSchemaObject() {
+    Map<String, SyntheticPKey> syntheticPKeys = new HashMap<String, SyntheticPKey>();
+    Map<String, SourceTable> srcSchema = new HashMap<String, SourceTable>();
+    Map<String, SpannerTable> spSchema = getSampleSpSchema();
+    Map<String, NameAndCols> spannerToID = getSampleSpannerToId();
+    Schema expectedSchema = new Schema(spSchema, syntheticPKeys, srcSchema);
+    expectedSchema.setSpannerToID(spannerToID);
+    return expectedSchema;
+  }
+
+  public static Map<String, SpannerTable> getSampleSpSchema() {
+    Map<String, SpannerTable> spSchema = new HashMap<String, SpannerTable>();
+    Map<String, SpannerColumnDefinition> t1SpColDefs =
+        new HashMap<String, SpannerColumnDefinition>();
+    t1SpColDefs.put(
+        "c1", new SpannerColumnDefinition("accountId", new SpannerColumnType("STRING", false)));
+    t1SpColDefs.put(
+        "c2", new SpannerColumnDefinition("accountName", new SpannerColumnType("STRING", false)));
+    t1SpColDefs.put(
+        "c3",
+        new SpannerColumnDefinition("migration_shard_id", new SpannerColumnType("STRING", false)));
+    t1SpColDefs.put(
+        "c4", new SpannerColumnDefinition("accountNumber", new SpannerColumnType("INT", false)));
+    spSchema.put(
+        "t1",
+        new SpannerTable(
+            "tableName",
+            new String[] {"c1", "c2", "c3", "c4"},
+            t1SpColDefs,
+            new ColumnPK[] {new ColumnPK("c1", 1)},
+            "c3"));
+    return spSchema;
+  }
+
+  public static Map<String, NameAndCols> getSampleSpannerToId() {
+    Map<String, NameAndCols> spannerToId = new HashMap<String, NameAndCols>();
+    Map<String, String> t1ColIds = new HashMap<String, String>();
+    t1ColIds.put("accountId", "c1");
+    t1ColIds.put("accountName", "c2");
+    t1ColIds.put("migration_shard_id", "c3");
+    t1ColIds.put("accountNumber", "c4");
+    spannerToId.put("tableName", new NameAndCols("t1", t1ColIds));
+    return spannerToId;
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index 33bd3cfece..861c7ee38b 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -15,1303 +15,677 @@
  */
 package com.google.cloud.teleport.v2.templates.dbutils.dml;
 
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToCassandraDate;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToCassandraTimestamp;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToSmallInt;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.convertToTinyInt;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.escapeCassandraString;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleBoolSetTypeString;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleByteArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleByteSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraAsciiType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraBigintType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraBlobType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraBoolType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraDateType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraDoubleType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraDurationType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraFloatType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraInetAddressType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraIntType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraTextType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraTimestampType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraUuidType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleCassandraVarintType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleDateSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleFloat64ArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleFloatArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleFloatSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleInt64ArrayAsInt32Array;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleInt64ArrayAsInt32Set;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleInt64SetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringArrayType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringSetType;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringifiedJsonToMap;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.handleStringifiedJsonToSet;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.isValidIPAddress;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.isValidJSON;
-import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.isValidUUID;
+import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.castToExpectedType;
+import static com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler.getColumnValueByType;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnType;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnType;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Arrays;
-import java.util.Base64;
-import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mockito;
+import org.slf4j.Logger;
 
 @RunWith(JUnit4.class)
 public class CassandraTypeHandlerTest {
 
-  @Test
-  public void convertSpannerValueJsonToBooleanType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"isAdmin\":\"true\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "isAdmin";
-    Boolean convertedValue = handleCassandraBoolType(colKey, newValuesJson);
-    assertTrue(convertedValue);
-  }
+  private SpannerColumnDefinition spannerColDef;
 
-  @Test
-  public void convertSpannerValueJsonToBooleanType_False() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"isAdmin\":\"false\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "isAdmin";
-    Boolean convertedValue = handleCassandraBoolType(colKey, newValuesJson);
-    Assert.assertFalse(convertedValue);
-  }
+  private SourceColumnDefinition sourceColDef;
 
-  @Test
-  public void convertSpannerValueJsonToFloatType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"age\":23.5}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Float convertedValue = handleCassandraFloatType(colKey, newValuesJson);
-    assertEquals(23.5f, convertedValue, 0.01f);
-  }
+  private JSONObject valuesJson;
 
-  @Test
-  public void convertSpannerValueJsonToDoubleType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"salary\":100000.75}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "salary";
-    Double convertedValue = handleCassandraDoubleType(colKey, newValuesJson);
-    assertEquals(100000.75, convertedValue, 0.01);
+  private static final Logger LOG = mock(Logger.class);
+
+  private void mockLogging(ClassCastException e) {
+    Mockito.doNothing().when(LOG).error(Mockito.anyString(), Mockito.any(), Mockito.any());
   }
 
   @Test
-  public void convertSpannerValueJsonToBlobType_FromByteArray() {
-    String newValuesString =
-        "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":\"QUJDQDEyMzQ=\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    byte[] expectedBytes = java.util.Base64.getDecoder().decode("QUJDQDEyMzQ=");
-    byte[] actualBytes = new byte[convertedValue.remaining()];
-    convertedValue.get(actualBytes);
-    Assert.assertArrayEquals(expectedBytes, actualBytes);
-  }
+  public void testGetColumnValueByTypeForString() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "test_column";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Rule public ExpectedException expectedEx = ExpectedException.none();
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleNullBooleanType() {
-    String newValuesString = "{\"isAdmin\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "isAdmin";
-    assertEquals(false, handleCassandraBoolType(colKey, newValuesJson));
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleNullFloatType() {
-    String newValuesString = "{\"age\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    assertNull(handleCassandraFloatType(colKey, newValuesJson));
-  }
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleNullDoubleType() {
-    String newValuesString = "{\"salary\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "salary";
-    Double value = handleCassandraDoubleType(colKey, newValuesJson);
-    assertNull(value);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleMaxInteger() {
-    String newValuesString = "{\"age\":2147483647}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Integer value = handleCassandraIntType(colKey, newValuesJson);
-    assertEquals(Integer.MAX_VALUE, value.longValue());
-  }
+  public void testGetColumnValueByType() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "é";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleMinInteger() {
-    String newValuesString = "{\"age\":-2147483648}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Integer value = handleCassandraIntType(colKey, newValuesJson);
-    assertEquals(Integer.MIN_VALUE, value.longValue());
-  }
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleMaxLong() {
-    String newValuesString = "{\"age\":9223372036854775807}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Long value = handleCassandraBigintType(colKey, newValuesJson);
-    assertEquals(Long.MAX_VALUE, value.longValue());
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleMinLong() {
-    String newValuesString = "{\"age\":-9223372036854775808}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    Long value = handleCassandraBigintType(colKey, newValuesJson);
-    assertEquals(Long.MIN_VALUE, value.longValue());
-  }
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleMaxFloat() {
-    String newValuesString = "{\"value\":3.4028235E38}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Float value = handleCassandraFloatType(colKey, newValuesJson);
-    assertEquals(Float.MAX_VALUE, value, 0.01f);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleMinFloat() {
-    String newValuesString = "{\"value\":-3.4028235E38}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Float value = handleCassandraFloatType(colKey, newValuesJson);
-    assertEquals(-Float.MAX_VALUE, value, 0.01f);
-  }
+  public void testGetColumnValueByTypeForNonString() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "DEL";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleMaxDouble() {
-    String newValuesString = "{\"value\":1.7976931348623157E308}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Double value = handleCassandraDoubleType(colKey, newValuesJson);
-    assertEquals(Double.MAX_VALUE, value, 0.01);
-  }
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleMinDouble() {
-    String newValuesString = "{\"value\":-1.7976931348623157E308}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    Double value = handleCassandraDoubleType(colKey, newValuesJson);
-    assertEquals(-Double.MAX_VALUE, value, 0.01);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleInvalidIntegerFormat() {
-    String newValuesString = "{\"age\":\"invalid_integer\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    handleCassandraIntType(colKey, newValuesJson);
-  }
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleInvalidLongFormat() {
-    String newValuesString = "{\"age\":\"invalid_long\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    handleCassandraBigintType(colKey, newValuesJson);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleInvalidFloatFormat() {
-    String newValuesString = "{\"value\":\"invalid_float\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    handleCassandraFloatType(colKey, newValuesJson);
-  }
+  public void testGetColumnValueByTypeForStringUUID() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "123e4567-e89b-12d3-a456-426614174000";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleInvalidDoubleFormat() {
-    String newValuesString = "{\"value\":\"invalid_double\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "value";
-    handleCassandraDoubleType(colKey, newValuesJson);
-  }
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidBlobFormat() {
-    String newValuesString = "{\"data\":\"not_base64\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    handleCassandraBlobType(colKey, newValuesJson);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidDateFormat() {
-    String newValuesString = "{\"birthdate\":\"invalid_date_format\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "birthdate";
-    handleCassandraDateType(colKey, newValuesJson);
-  }
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleNullTextType() {
-    String newValuesString = "{\"name\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    String value = handleCassandraTextType(colKey, newValuesJson);
-    assertNull(value);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleUnsupportedBooleanType() {
-    String newValuesString = "{\"values\":[true, false]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+  public void testGetColumnValueByTypeForStringIpAddress() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "192.168.1.1";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-    handleFloatSetType("values", newValuesJson);
-  }
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleUnsupportedListType() {
-    String newValuesString = "{\"values\":[[1, 2], [3, 4]]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    handleFloatSetType("values", newValuesJson);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleUnsupportedMapType() {
-    String newValuesString = "{\"values\":[{\"key1\":\"value1\"}, {\"key2\":\"value2\"}]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
+  public void testGetColumnValueByTypeForStringJsonArray() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "[\"apple\", \"banana\", \"cherry\"]";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-    handleFloatSetType("values", newValuesJson);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleUnsupportedType() {
-    String newValuesString = "{\"values\":[true, false]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-
-    expectedEx.expect(IllegalArgumentException.class);
-    expectedEx.expectMessage("Unsupported type for column values");
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    handleFloatSetType("values", newValuesJson);
+    assertNotNull(result);
   }
 
   @Test
-  public void convertSpannerValueJsonToBlobType_FromBase64() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":\"QUJDRA==\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    byte[] expectedBytes = Base64.getDecoder().decode("QUJDRA==");
-    byte[] actualBytes = new byte[convertedValue.remaining()];
-    convertedValue.get(actualBytes);
-    Assert.assertArrayEquals(expectedBytes, actualBytes);
-  }
+  public void testGetColumnValueByTypeForStringJsonObject() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "{\"name\": \"John\", \"age\": 30}";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void convertSpannerValueJsonToBlobType_EmptyString() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":\"\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    Assert.assertNotNull(convertedValue);
-    assertEquals(0, convertedValue.remaining());
-  }
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void convertSpannerValueJsonToBlobType_InvalidType() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"data\":12345}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    handleCassandraBlobType(colKey, newValuesJson);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void convertSpannerValueJsonToInvalidFloatType() {
-    String newValuesString =
-        "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"age\":\"invalid_value\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "age";
-    handleCassandraFloatType(colKey, newValuesJson);
-  }
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void convertSpannerValueJsonToInvalidDoubleType() {
-    String newValuesString =
-        "{\"FirstName\":\"kk\",\"LastName\":\"ll\", \"salary\":\"invalid_value\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "salary";
-    handleCassandraDoubleType(colKey, newValuesJson);
+    assertNotNull(result);
   }
 
   @Test
-  public void convertSpannerValueJsonToBlobType_MissingColumn() {
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "data";
-    ByteBuffer convertedValue = handleCassandraBlobType(colKey, newValuesJson);
-    Assert.assertNull(convertedValue);
-  }
+  public void testGetColumnValueByTypeForStringHex() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "a3f5b7";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleByteArrayType() {
-    String newValuesString = "{\"data\":[\"QUJDRA==\", \"RkZIRg==\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<ByteBuffer> value = handleByteArrayType("data", newValuesJson);
-
-    List<ByteBuffer> expected =
-        Arrays.asList(
-            ByteBuffer.wrap(Base64.getDecoder().decode("QUJDRA==")),
-            ByteBuffer.wrap(Base64.getDecoder().decode("RkZIRg==")));
-    assertEquals(expected, value);
-  }
-
-  @Test
-  public void testHandleByteSetType() {
-    String newValuesString = "{\"data\":[\"QUJDRA==\", \"RkZIRg==\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<ByteBuffer> value = handleByteSetType("data", newValuesJson);
-
-    Set<ByteBuffer> expected =
-        new HashSet<>(
-            Arrays.asList(
-                ByteBuffer.wrap(Base64.getDecoder().decode("QUJDRA==")),
-                ByteBuffer.wrap(Base64.getDecoder().decode("RkZIRg=="))));
-    assertEquals(expected, value);
-  }
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleStringArrayType() {
-    String newValuesString = "{\"names\":[\"Alice\", \"Bob\", \"Charlie\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<String> value = handleStringArrayType("names", newValuesJson);
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-    List<String> expected = Arrays.asList("Alice", "Bob", "Charlie");
-    assertEquals(expected, value);
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+        });
   }
 
   @Test
-  public void testHandleStringSetType() {
-    String newValuesString = "{\"names\":[\"Alice\", \"Bob\", \"Alice\", \"Charlie\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<String> valueList = handleStringSetType("names", newValuesJson);
-    HashSet<String> value = new HashSet<>(valueList);
-    HashSet<String> expected = new HashSet<>(Arrays.asList("Alice", "Bob", "Charlie"));
-    assertEquals(expected, value);
-  }
+  public void testGetColumnValueByTypeForStringDuration() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    String columnName = "P4DT1H";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleBoolSetTypeString() {
-    String newValuesString = "{\"flags\":[\"true\", \"false\", \"true\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Boolean> value = handleBoolSetTypeString("flags", newValuesJson);
+    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-    Set<Boolean> expected = new HashSet<>(Arrays.asList(true, false));
-    assertEquals(expected, value);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleFloatArrayType() {
-    String newValuesString = "{\"values\":[1.1, 2.2, 3.3]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<Float> value = handleFloatArrayType("values", newValuesJson);
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    List<Float> expected = Arrays.asList(1.1f, 2.2f, 3.3f);
-    assertEquals(expected, value);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleFloatSetType() {
-    String newValuesString = "{\"values\":[1.1, 2.2, 3.3, 2.2]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Float> value = handleFloatSetType("values", newValuesJson);
+  public void testGetColumnValueByTypeForDates() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("date", true);
+    String columnName = "timestampColumn";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-    Set<Float> expected = new HashSet<>(Arrays.asList(1.1f, 2.2f, 3.3f));
-    assertEquals(expected, value);
-  }
-
-  @Test
-  public void testHandleFloatSetType_InvalidString() {
-    String newValuesString = "{\"values\":[\"1.1\", \"2.2\", \"abc\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    try {
-      handleFloatSetType("values", newValuesJson);
-      fail("Expected IllegalArgumentException for invalid number format");
-    } catch (IllegalArgumentException e) {
-      assertTrue(e.getMessage().contains("Invalid number format for column values"));
-    }
-  }
+    when(valuesJson.optString(columnName, null)).thenReturn("2025-01-01T00:00:00Z");
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleFloat64ArrayType() {
-    String newValuesString = "{\"values\":[1.1, \"2.2\", 3.3]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<Double> value = handleFloat64ArrayType("values", newValuesJson);
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-    List<Double> expected = Arrays.asList(1.1, 2.2, 3.3);
-    assertEquals(expected, value);
-  }
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleFloat64ArrayTypeInvalid() {
-    String newValuesString = "{\"values\":[\"1.1\", \"abc\", \"3.3\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleFloat64ArrayType("values", newValuesJson);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleDateSetType() {
-    String newValuesString = "{\"dates\":[\"2024-12-05\", \"2024-12-06\"]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<LocalDate> value = handleDateSetType("dates", newValuesJson);
-    Set<LocalDate> expected =
-        new HashSet<>(Arrays.asList(LocalDate.of(2024, 12, 5), LocalDate.of(2024, 12, 6)));
-    assertEquals(expected, value);
-  }
+  public void testGetColumnValueByTypeForBigInt() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("bigint", true);
+    String columnName = "test_column";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleFloat64ArrayType_WithUnsupportedList() {
-    String jsonStr = "{\"colName\": [[1, 2, 3], [4, 5, 6]]}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    CassandraTypeHandler.handleFloat64ArrayType("colName", valuesJson);
-  }
+    when(valuesJson.getBigInteger(columnName)).thenReturn(BigInteger.valueOf(5));
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleInt64SetType_ValidLongValues() {
-    String newValuesString = "{\"numbers\":[1, 2, 3, 4]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Long> result = handleInt64SetType("numbers", newValuesJson);
-    Set<Long> expected = new HashSet<>(Arrays.asList(1L, 2L, 3L, 4L));
-    assertEquals(expected, result);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleCassandraIntType_ValidInteger() {
-    String newValuesString = "{\"age\":1234}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Integer result = handleCassandraIntType("age", newValuesJson);
-    Integer expected = 1234;
-    assertEquals(expected, result);
-  }
+    Object result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-  @Test
-  public void testHandleCassandraBigintType_ValidConversion() {
-    String newValuesString = "{\"age\":1234567890123}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Long result = handleCassandraBigintType("age", newValuesJson);
-    Long expected = 1234567890123L;
-    assertEquals(expected, result);
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleInt64ArrayAsInt32Array() {
-    String newValuesString = "{\"values\":[1, 2, 3, 4]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    List<Integer> value = handleInt64ArrayAsInt32Array("values", newValuesJson);
+  public void testGetColumnValueByTypeForInteger() {
+    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
+    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
+    JSONObject valuesJson = mock(JSONObject.class);
 
-    List<Integer> expected = Arrays.asList(1, 2, 3, 4);
-    assertEquals(expected, value);
-  }
+    String columnName = "test_column";
+    SpannerColumnType spannerType = new SpannerColumnType("integer", true);
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleInt64ArrayAsInt32Set() {
-    String newValuesString = "{\"values\":[1, 2, 3, 2]}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    Set<Integer> value = handleInt64ArrayAsInt32Set("values", newValuesJson);
+    when(valuesJson.getBigInteger(columnName)).thenReturn(BigInteger.valueOf(5));
+
+    when(valuesJson.getInt(columnName)).thenReturn(5);
 
-    Set<Integer> expected = new HashSet<>(Arrays.asList(1, 2, 3));
-    assertEquals(expected, value);
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleCassandraUuidTypeNull() {
-    String newValuesString = "{\"uuid\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    UUID value = handleCassandraUuidType("uuid", newValuesJson);
-    Assert.assertNull(value);
-  }
+  public void testGetColumnValueByTypeForValidBigInteger() {
+    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
+    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
+    JSONObject valuesJson = mock(JSONObject.class);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleCassandraTimestampInvalidFormat() {
-    String newValuesString = "{\"createdAt\":\"2024-12-05 10:15:30.123\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleCassandraTimestampType("createdAt", newValuesJson);
-  }
+    String columnName = "test_column";
+    SpannerColumnType spannerType = new SpannerColumnType("boolean", true);
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleCassandraTimestampInvalidFormatColNull() {
-    String newValuesString = "{\"createdAt\":\"2024-12-05 10:15:30.123\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleCassandraTimestampType("timestamp", newValuesJson);
-  }
+    when(valuesJson.getBigInteger(columnName)).thenReturn(BigInteger.valueOf(5));
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleCassandraDateInvalidFormat() {
-    String newValuesString = "{\"birthdate\":\"2024/12/05\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    handleCassandraDateType("birthdate", newValuesJson);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleCassandraTextTypeNull() {
-    String newValuesString = "{\"name\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String value = handleCassandraTextType("name", newValuesJson);
-    Assert.assertNull(value);
-  }
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-  @Test
-  public void testHandleBoolArrayType_ValidBooleanStrings() {
-    String jsonStr = "{\"colName\": [\"true\", \"false\", \"true\"]}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    List<Boolean> result = CassandraTypeHandler.handleBoolArrayType("colName", valuesJson);
-    assertEquals(3, result.size());
-    assertTrue(result.get(0));
-    assertFalse(result.get(1));
-    assertTrue(result.get(2));
+    assertNotNull(result);
   }
 
   @Test
-  public void testHandleBoolArrayType_InvalidBooleanStrings() {
-    String jsonStr = "{\"colName\": [\"yes\", \"no\", \"true\"]}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    List<Boolean> result = CassandraTypeHandler.handleBoolArrayType("colName", valuesJson);
-    assertEquals(3, result.size());
-    assertFalse(result.get(0));
-    assertFalse(result.get(1));
-    assertTrue(result.get(2));
-  }
+  public void testGetColumnValueByTypeFor() {
+    spannerColDef = mock(SpannerColumnDefinition.class);
+    sourceColDef = mock(SourceColumnDefinition.class);
+    valuesJson = mock(JSONObject.class);
+    SpannerColumnType spannerType = new SpannerColumnType("float", true);
+    String columnName = "test_column";
+    String sourceDbTimezoneOffset = "UTC";
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleBoolArrayType_EmptyArray() {
-    String jsonStr = "{\"colName\": []}";
-    JSONObject valuesJson = new JSONObject(jsonStr);
-    List<Boolean> result = CassandraTypeHandler.handleBoolArrayType("colName", valuesJson);
-    assertTrue(result.isEmpty());
-  }
+    when(valuesJson.getBigDecimal(columnName)).thenReturn(new BigDecimal("5.5"));
+    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-  @Test
-  public void testHandleTimestampSetType_validArray() {
-    String jsonString =
-        "{\"timestamps\": [\"2024-12-04T12:34:56.123Z\", \"2024-12-05T13:45:00.000Z\"]}";
-    JSONObject valuesJson = new JSONObject(jsonString);
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-    Set<Timestamp> result = CassandraTypeHandler.handleTimestampSetType("timestamps", valuesJson);
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
     assertNotNull(result);
-    assertEquals(2, result.size());
-    assertTrue(result.contains(Timestamp.valueOf("2024-12-04 00:00:00.0")));
-    assertTrue(result.contains(Timestamp.valueOf("2024-12-05 00:00:00.0")));
-  }
 
-  @Test
-  public void testHandleValidAsciiString() {
-    String newValuesString = "{\"name\":\"JohnDoe\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    assertEquals("JohnDoe", handleCassandraAsciiType(colKey, newValuesJson));
-  }
+    assertTrue(result instanceof PreparedStatementValueObject);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleNonAsciiString() {
-    String newValuesString = "{\"name\":\"JoãoDoe\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    handleCassandraAsciiType(colKey, newValuesJson);
-  }
+    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
 
-  @Test
-  public void testHandleNullForAsciiColumn() {
-    String newValuesString = "{\"name\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "name";
-    handleCassandraAsciiType(colKey, newValuesJson);
+    assertEquals(5.5f, actualValue);
   }
 
   @Test
-  public void testHandleValidStringVarint() {
-    String newValuesString = "{\"amount\":\"123456789123456789\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "amount";
-    BigInteger expected = new BigInteger("123456789123456789");
-    assertEquals(expected, handleCassandraVarintType(colKey, newValuesJson));
-  }
+  public void testGetColumnValueByTypeForFloat64() {
+    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
+    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
+    JSONObject valuesJson = mock(JSONObject.class);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidStringVarint() {
-    String newValuesString = "{\"amount\":\"abcxyz\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "amount";
-    handleCassandraVarintType(colKey, newValuesJson);
-  }
+    String columnName = "test_column";
+    SpannerColumnType spannerType = new SpannerColumnType("float64", true);
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleInvalidTypeVarint() {
-    String newValuesString = "{\"amount\":12345}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "amount";
-    handleCassandraVarintType(colKey, newValuesJson);
-  }
+    when(valuesJson.getBigDecimal(columnName)).thenReturn(new BigDecimal("5.5"));
 
-  @Test
-  public void testHandleValidDuration() {
-    String newValuesString = "{\"duration\":\"P1DT1H\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "duration";
-    Duration expected = Duration.parse("P1DT1H");
-    assertEquals(expected, handleCassandraDurationType(colKey, newValuesJson));
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleNullDuration() {
-    String newValuesString = "{\"duration\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "duration";
-    assertNull(handleCassandraDurationType(colKey, newValuesJson));
-  }
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-  @Test
-  public void testHandleMissingColumnKey() {
-    String newValuesString = "{\"otherColumn\":\"P1DT1H\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "duration";
-    assertNull(handleCassandraDurationType(colKey, newValuesJson));
-  }
+    assertNotNull(result);
 
-  @Test
-  public void testHandleValidIPv4Address() throws UnknownHostException {
-    String newValuesString = "{\"ipAddress\":\"192.168.0.1\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    InetAddress expected = InetAddress.getByName("192.168.0.1");
-    assertEquals(expected, handleCassandraInetAddressType(colKey, newValuesJson));
-  }
+    assertTrue(result instanceof PreparedStatementValueObject);
 
-  @Test
-  public void testHandleValidIPv6Address() throws Exception {
-    String newValuesString = "{\"ipAddress\":\"2001:0db8:85a3:0000:0000:8a2e:0370:7334\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    InetAddress actual = CassandraTypeHandler.handleCassandraInetAddressType(colKey, newValuesJson);
-    InetAddress expected = InetAddress.getByName("2001:0db8:85a3:0000:0000:8a2e:0370:7334");
-    assertEquals(expected, actual);
-  }
+    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidIPAddressFormat() throws IllegalArgumentException {
-    String newValuesString = "{\"ipAddress\":\"invalid-ip-address\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    handleCassandraInetAddressType(colKey, newValuesJson);
+    assertEquals(5.5, actualValue);
   }
 
   @Test
-  public void testHandleEmptyStringIPAddress() {
-    String newValuesString = "{\"ipAddress\":\"192.168.1.1\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "ipAddress";
-    Object result = handleCassandraInetAddressType(colKey, newValuesJson);
-    assertTrue("Expected result to be of type InetAddress", result instanceof InetAddress);
-    assertEquals(
-        "IP address does not match", "192.168.1.1", ((InetAddress) result).getHostAddress());
-  }
+  public void testGetColumnValueByTypeForBytes() {
+    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
+    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
+    JSONObject valuesJson = mock(JSONObject.class);
 
-  @Test
-  public void testHandleStringifiedJsonToMapWithEmptyJson() {
-    String newValuesString = "{}";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Map<String, Object> expected = Map.of();
-    Map<String, Object> result = handleStringifiedJsonToMap(colKey, newValuesJson);
-    assertEquals(expected, result);
-  }
+    String columnName = "test_column";
+    SpannerColumnType spannerType = new SpannerColumnType("bytes", true);
+    Long[] myArray = new Long[5];
+    myArray[0] = 10L;
+    myArray[1] = 20L;
 
-  @Test
-  public void testHandleStringifiedJsonToMapWithSimpleJson() {
-    String newValuesString = "{\"name\":\"John\", \"age\":30}";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Map<String, Object> expected = Map.of("name", "John", "age", 30);
-    Map<String, Object> result = handleStringifiedJsonToMap(colKey, newValuesJson);
-    assertEquals(expected, result);
-  }
+    byte[] expectedBytes = new byte[] {1, 2, 3, 4, 5};
+    when(valuesJson.opt(columnName)).thenReturn(expectedBytes);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleStringifiedJsonToMapWithInvalidJson() {
-    String newValuesString = "{\"user\":{\"name\":\"John\", \"age\":30";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    handleStringifiedJsonToMap(colKey, newValuesJson);
-  }
+    when(spannerColDef.getType()).thenReturn(spannerType);
+    when(spannerColDef.getName()).thenReturn(columnName);
+    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
 
-  @Test
-  public void testHandleStringifiedJsonToMapWithNullValues() {
-    String newValuesString = "{\"name\":null, \"age\":null}";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Map<String, Object> expected =
-        Map.of(
-            "name", JSONObject.NULL,
-            "age", JSONObject.NULL);
-    Map<String, Object> result = handleStringifiedJsonToMap(colKey, newValuesJson);
-    assertEquals(expected, result);
-  }
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleInvalidStringifiedJson() {
-    String newValuesString = "{\"user\":{\"name\":\"John\", \"age\":30";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    handleStringifiedJsonToMap(colKey, newValuesJson);
-  }
+    assertNotNull(result);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testHandleNonStringValue() {
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", 12345);
-    String colKey = "data";
-    handleStringifiedJsonToMap(colKey, newValuesJson);
-  }
+    assertTrue(result instanceof PreparedStatementValueObject);
 
-  @Test
-  public void testHandleValidStringifiedJsonArray() {
-    String newValuesString = "[\"apple\", \"banana\", \"cherry\"]";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-
-    Set<Object> expected = new HashSet<>();
-    expected.add("apple");
-    expected.add("banana");
-    expected.add("cherry");
-    assertEquals(expected, handleStringifiedJsonToSet(colKey, newValuesJson));
-  }
+    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
 
-  @Test
-  public void testHandleEmptyStringifiedJsonArray() {
-    String newValuesString = "[]";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    Set<Object> expected = new HashSet<>();
-    assertEquals(expected, handleStringifiedJsonToSet(colKey, newValuesJson));
-  }
+    byte[] actualBytes = ((ByteBuffer) actualValue).array();
 
-  @Test
-  public void testHandleNonArrayValue() {
-    String newValuesString = "\"apple\"";
-    JSONObject newValuesJson = new JSONObject();
-    newValuesJson.put("data", newValuesString);
-    String colKey = "data";
-    assertThrows(
-        IllegalArgumentException.class, () -> handleStringifiedJsonToSet(colKey, newValuesJson));
+    assertArrayEquals(expectedBytes, actualBytes);
   }
 
   @Test
-  public void testConvertToSmallIntValidInput() {
-    Integer validValue = 100;
-    short result = convertToSmallInt(validValue);
-    assertEquals(100, result);
-  }
+  public void testCastToExpectedTypeForString() {
+    String cassandraType = "text";
+    String columnValue = "Test String";
 
-  @Test
-  public void testConvertToSmallIntBelowMinValue() {
-    Integer invalidValue = Short.MIN_VALUE - 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToSmallInt(invalidValue));
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToSmallIntAboveMaxValue() {
-    Integer invalidValue = Short.MAX_VALUE + 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToSmallInt(invalidValue));
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testConvertToTinyIntValidInput() {
-    Integer validValue = 100;
-    byte result = convertToTinyInt(validValue);
-    assertEquals(100, result);
-  }
+  public void testCastToExpectedTypeForBigInt() {
+    String cassandraType = "bigint";
+    Long columnValue = 123L;
 
-  @Test
-  public void testConvertToTinyIntBelowMinValue() {
-    Integer invalidValue = Byte.MIN_VALUE - 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToTinyInt(invalidValue));
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToTinyIntAboveMaxValue() {
-    Integer invalidValue = Byte.MAX_VALUE + 1;
-    assertThrows(IllegalArgumentException.class, () -> convertToTinyInt(invalidValue));
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testEscapeCassandraStringNoQuotes() {
-    String input = "Hello World";
-    String expected = "Hello World";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
-  }
+  public void testCastToExpectedTypeForBoolean() {
+    String cassandraType = "boolean";
+    Boolean columnValue = true;
 
-  @Test
-  public void testEscapeCassandraStringWithSingleQuote() {
-    String input = "O'Reilly";
-    String expected = "O''Reilly";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testEscapeCassandraStringEmpty() {
-    String input = "";
-    String expected = "";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testEscapeCassandraStringWithMultipleQuotes() {
-    String input = "It's John's book.";
-    String expected = "It''s John''s book.";
-    String result = escapeCassandraString(input);
-    assertEquals(expected, result);
-  }
+  public void testCastToExpectedTypeForDecimal() {
+    String cassandraType = "decimal";
+    BigDecimal columnValue = new BigDecimal("123.456");
 
-  @Test
-  public void testConvertToCassandraTimestampWithValidOffset() {
-    String value = "2024-12-12T10:15:30+02:00";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T08:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToCassandraTimestampWithNonZeroOffset() {
-    String value = "2024-12-12T10:15:30+02:00";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T08:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testConvertToCassandraTimestampWithNegativeOffset() {
-    String value = "2024-12-12T10:15:30-05:00";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T15:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
-  }
+  public void testCastToExpectedTypeForDouble() {
+    String cassandraType = "double";
+    Double columnValue = 123.456;
 
-  @Test(expected = RuntimeException.class)
-  public void testConvertToCassandraTimestampWithInvalidFormat() {
-    String value = "2024-12-12T25:15:30+02:00";
-    String timezoneOffset = "+00:00";
-    convertToCassandraTimestamp(value, timezoneOffset);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToCassandraTimestampWithoutTimezone() {
-    String value = "2024-12-12T10:15:30Z";
-    String timezoneOffset = "+00:00";
-    String expected = "'2024-12-12T10:15:30Z'";
-    String result = convertToCassandraTimestamp(value, timezoneOffset);
-    assertEquals(expected, result);
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testConvertToCassandraDateWithValidDate() {
-    String dateString = "2024-12-12T10:15:30Z";
-    LocalDate result = convertToCassandraDate(dateString);
-    LocalDate expected = LocalDate.of(2024, 12, 12);
-    assertEquals(expected, result);
-  }
+  public void testCastToExpectedTypeForFloat() {
+    String cassandraType = "float";
+    Float columnValue = 123.45f;
 
-  @Test
-  public void testConvertToCassandraDateLeapYear() {
-    String dateString = "2024-02-29T00:00:00Z";
-    LocalDate result = convertToCassandraDate(dateString);
-    LocalDate expected = LocalDate.of(2024, 2, 29);
-    assertEquals(expected, result);
+    Object result = castToExpectedType(cassandraType, columnValue);
+
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testConvertToCassandraDateWithDifferentTimeZone() {
-    String dateString = "2024-12-12T10:15:30+02:00";
-    LocalDate result = convertToCassandraDate(dateString);
-    LocalDate expected = LocalDate.of(2024, 12, 12);
-    assertEquals(expected, result);
-  }
+  public void testCastToExpectedTypeForInet() throws Exception {
+    String cassandraType = "inet";
+    InetAddress columnValue = InetAddress.getByName("127.0.0.1");
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testConvertToCassandraDateWithInvalidDate() {
-    String dateString = "2024-13-12T10:15:30Z";
-    convertToCassandraDate(dateString);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToCassandraTimestampWithValidDate() {
-    String dateString = "2024-12-12T10:15:30Z";
-    Instant result = convertToCassandraTimestamp(dateString);
-    Instant expected = Instant.parse(dateString);
-    assertEquals(expected, result);
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testConvertToCassandraTimestampWithTimezoneOffset() {
-    String dateString = "2024-12-12T10:15:30+02:00";
-    Instant result = convertToCassandraTimestamp(dateString);
-    Instant expected = Instant.parse("2024-12-12T08:15:30Z");
-    assertEquals(expected, result);
-  }
+  public void testCastToExpectedTypeForInt() {
+    String cassandraType = "int";
+    Integer columnValue = 123;
 
-  @Test
-  public void testConvertToCassandraTimestampLeapYear() {
-    String dateString = "2024-02-29T00:00:00Z";
-    Instant result = convertToCassandraTimestamp(dateString);
-    Instant expected = Instant.parse(dateString);
-    assertEquals(expected, result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testConvertToCassandraTimestampWithInvalidDate() {
-    String dateString = "2024-13-12T10:15:30Z";
-    convertToCassandraTimestamp(dateString);
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testIsValidUUIDWithValidUUID() {
-    String validUUID = "123e4567-e89b-12d3-a456-426614174000";
-    boolean result = isValidUUID(validUUID);
-    assertTrue(result);
-  }
+  public void testCastToExpectedTypeForSmallInt() {
+    String cassandraType = "smallint";
+    Integer columnValue = 123;
 
-  @Test
-  public void testIsValidUUIDWithInvalidUUID() {
-    String invalidUUID = "123e4567-e89b-12d3-a456-426614174000Z";
-    boolean result = isValidUUID(invalidUUID);
-    assertFalse(result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testIsValidUUIDWithEmptyString() {
-    String emptyString = "";
-    boolean result = isValidUUID(emptyString);
-    assertFalse(result);
+    assertEquals((short) 123, result);
   }
 
   @Test
-  public void testIsValidIPAddressWithValidIPv4() {
-    String validIPv4 = "192.168.1.1";
-    boolean result = isValidIPAddress(validIPv4);
-    assertTrue(result);
-  }
+  public void testCastToExpectedTypeForTimestamp() {
+    String cassandraType = "timestamp";
+    Instant columnValue = Instant.now();
 
-  @Test
-  public void testIsValidIPAddressWithValidIPv6() {
-    String validIPv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
-    boolean result = isValidIPAddress(validIPv6);
-    assertTrue(result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testIsValidIPAddressWithInvalidFormat() {
-    String invalidIP = "999.999.999.999";
-    boolean result = isValidIPAddress(invalidIP);
-    assertFalse(result);
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testIsValidJSONWithValidJSON() {
-    String validJson = "{\"name\":\"John\", \"age\":30}";
-    boolean result = isValidJSON(validJson);
-    assertTrue(result);
-  }
+  public void testCastToExpectedTypeForDate() {
+    String cassandraType = "date";
+    LocalDate columnValue = LocalDate.now();
 
-  @Test
-  public void testIsValidJSONWithInvalidJSON() {
-    String invalidJson = "{\"name\":\"John\", \"age\":30";
-    boolean result = isValidJSON(invalidJson);
-    assertFalse(result);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          castToExpectedType(cassandraType, columnValue);
+        });
   }
 
   @Test
-  public void testIsValidJSONWithEmptyString() {
-    String emptyString = "";
-    boolean result = isValidJSON(emptyString);
-    assertFalse(result);
-  }
+  public void testCastToExpectedTypeForUUID() {
+    String cassandraType = "uuid";
+    UUID columnValue = UUID.randomUUID();
 
-  @Test
-  public void testIsValidJSONWithNull() {
-    String nullString = null;
-    boolean result = isValidJSON(nullString);
-    assertFalse(result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToCassandraDate_validDateString() {
-    String dateString = "2024-12-16T14:30:00Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-12-16'", LocalDate.of(2024, 12, 16), result);
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testConvertToCassandraDate_leapYear() {
-    String dateString = "2024-02-29T00:00:00Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-02-29'", LocalDate.of(2024, 2, 29), result);
-  }
+  public void testCastToExpectedTypeForTinyInt() {
+    String cassandraType = "tinyint";
+    Integer columnValue = 100;
 
-  @Test
-  public void testConvertToCassandraDate_validDateWithMilliseconds() {
-    String dateString = "2024-12-16T14:30:00.123Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-12-16'", LocalDate.of(2024, 12, 16), result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToCassandraDate_timezoneOffsetImpact() {
-    String dateString = "2024-12-16T14:30:00+01:00";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals(
-        "The parsed LocalDate should be '2024-12-16' regardless of timezone.",
-        LocalDate.of(2024, 12, 16),
-        result);
+    assertEquals((byte) 100, result);
   }
 
   @Test
-  public void testConvertToCassandraDate_validDateWithOffset() {
-    String dateString = "2024-12-16T14:30:00+01:00";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(dateString);
-    assertEquals("The parsed LocalDate should be '2024-12-16'", LocalDate.of(2024, 12, 16), result);
-  }
+  public void testCastToExpectedTypeForVarint() {
+    String cassandraType = "varint";
+    ByteBuffer columnValue = ByteBuffer.wrap(new byte[] {1, 2, 3, 4});
 
-  @Test
-  public void testConvertToCassandraDate_withTimeZoneOffset() {
-    String validDateWithOffset = "2024-12-16T14:30:00+02:00";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(validDateWithOffset);
-    assertNotNull(String.valueOf(result), "The result should not be null");
-    assertEquals(
-        "The parsed LocalDate should match the expected value (timezone offset ignored).",
-        LocalDate.of(2024, 12, 16),
-        result);
-  }
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-  @Test
-  public void testConvertToCassandraDate_endOfMonth() {
-    String endOfMonthDate = "2024-01-31T12:00:00Z";
-    LocalDate result = CassandraTypeHandler.convertToCassandraDate(endOfMonthDate);
-    assertNotNull(String.valueOf(result), "The result should not be null");
-    assertEquals(
-        "The parsed LocalDate should be correct for end of month.",
-        LocalDate.of(2024, 1, 31),
-        result);
+    assertEquals(new BigInteger(columnValue.array()), result);
   }
 
   @Test
-  public void testParseDate_validStringWithCustomFormatter() {
-    String dateStr = "2024-12-16T14:30:00.000";
-    String formatter = "yyyy-MM-dd'T'HH:mm:ss.SSS";
-    String colName = "testDate";
-
-    LocalDate result = CassandraTypeHandler.parseDate(colName, dateStr, formatter);
-
-    assertNotNull(String.valueOf(result), "The parsed LocalDate should not be null.");
-    assertEquals(
-        "The parsed LocalDate should match the expected value.",
-        LocalDate.of(2024, 12, 16),
-        result);
-  }
+  public void testCastToExpectedTypeForDuration() {
+    String cassandraType = "duration";
+    Duration columnValue = Duration.ofHours(5);
 
-  @Test
-  public void testParseDate_validString() {
-    String validDateStr = "2024-12-16T14:30:00.000+0000";
-    String formatter = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-    String colName = "testDate";
-    LocalDate result = CassandraTypeHandler.parseDate(colName, validDateStr, formatter);
-    assertNotNull(result);
-    assertEquals(LocalDate.of(2024, 12, 16), result);
+    Object result = castToExpectedType(cassandraType, columnValue);
+
+    assertEquals(columnValue, result);
   }
 
   @Test
-  public void testParseDate_validDate() {
-    Date date = new Date(1700000000000L);
-    String colName = "testDate";
+  public void testCastToExpectedTypeForJSONArrayToList() {
+    String cassandraType = "list<int>";
+    JSONArray columnValue = new JSONArray(Arrays.asList(1, 2, 3));
 
-    LocalDate result = CassandraTypeHandler.parseDate(colName, date, "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+    Object result = castToExpectedType(cassandraType, columnValue);
 
-    assertNotNull(result);
-    assertNotEquals(LocalDate.of(2024, 12, 15), result);
+    assertTrue(result instanceof List);
   }
 
   @Test
-  public void testHandleCassandraGenericDateType_NullFormatter() {
-    String newValuesString = "{\"date\":\"2024-12-16T10:15:30.000+0000\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "date";
-    LocalDate result =
-        CassandraTypeHandler.handleCassandraGenericDateType(colKey, newValuesJson, null);
-    assertEquals(LocalDate.of(2024, 12, 16), result);
-  }
+  public void testCastToExpectedTypeForJSONArrayToSet() {
+    String cassandraType = "set<int>";
+    JSONArray columnValue = new JSONArray(Arrays.asList(1, 2, 3));
 
-  @Test
-  public void testHandleStringifiedJsonToList_InvalidFormat() {
-    String newValuesString = "{\"column\": \"{\\\"key\\\":\\\"value\\\"}\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "column";
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              CassandraTypeHandler.handleStringifiedJsonToList(colKey, newValuesJson);
-            });
-    assertTrue(thrown.getMessage().contains("Invalid stringified JSON array format"));
+    Object result = castToExpectedType(cassandraType, columnValue);
+
+    assertTrue(result instanceof Set);
   }
 
   @Test
-  public void testHandleStringifiedJsonToList_NullInput() {
-    JSONObject newValuesJson = null;
-    String colKey = "column";
+  public void testCastToExpectedTypeForJSONObjectToMap() {
+    String cassandraType = "map<int, text>";
+    JSONObject columnValue = new JSONObject();
+    columnValue.put(String.valueOf(1), "One");
+    columnValue.put(String.valueOf(2), "Two");
+
     assertThrows(
-        NullPointerException.class,
+        ClassCastException.class,
         () -> {
-          CassandraTypeHandler.handleStringifiedJsonToList(colKey, newValuesJson);
+          castToExpectedType(cassandraType, columnValue);
         });
   }
 
   @Test
-  public void testHandleStringifiedJsonToMap_EmptyString() {
-    // Test case with an empty string as input, which is also an invalid JSON format
-    String newValuesString = "{\"column\": \"\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "column";
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              CassandraTypeHandler.handleStringifiedJsonToMap(colKey, newValuesJson);
-            });
-    assertTrue(thrown.getMessage().contains("Invalid stringified JSON format for column"));
-  }
+  public void testCastToExpectedTypeForExceptionScenario() {
+    String cassandraType = "int";
+    String columnValue = "InvalidInt";
 
-  @Test
-  public void testHandleStringifiedJsonToMap_NonJsonString() {
-    String newValuesString = "{\"column\": \"just a plain string\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String colKey = "column";
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              CassandraTypeHandler.handleStringifiedJsonToMap(colKey, newValuesJson);
-            });
-    assertTrue(thrown.getMessage().contains("Invalid stringified JSON format for column"));
-  }
+    mockLogging(new ClassCastException("Invalid cast"));
 
-  @Test
-  public void testHandleCassandraVarintType_ValidByteArray() {
-    JSONObject valuesJson = new JSONObject();
-    byte[] byteArray = new BigInteger("12345678901234567890").toByteArray();
-    valuesJson.put("varint", byteArray);
-    BigInteger result = CassandraTypeHandler.handleCassandraVarintType("varint", valuesJson);
-    BigInteger expected = new BigInteger(byteArray);
-    assertEquals(expected, result);
-  }
-
-  @Test
-  public void testHandleCassandraVarintType_InvalidStringFormat() {
-    JSONObject valuesJson = new JSONObject();
-    valuesJson.put("col1", "invalid-number");
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              handleCassandraVarintType("col1", valuesJson);
-            });
-    assertTrue(exception.getMessage().contains("Invalid varint format (string) for column: col1"));
-  }
-
-  @Test
-  public void testParseDate_UnsupportedType() {
-    JSONObject valuesJson = new JSONObject();
-    valuesJson.put("col1", 12345);
-    String formatter = "yyyy-MM-dd";
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              CassandraTypeHandler.parseDate("col1", valuesJson.get("col1"), formatter);
-            });
-    assertTrue(exception.getMessage().contains("Unsupported type for column col1"));
+    assertThrows(
+        ClassCastException.class,
+        () -> {
+          castToExpectedType(cassandraType, columnValue);
+        });
   }
 
   @Test
-  public void testHandleCassandraUuidType_ValidUuidString() {
-    JSONObject valuesJson = new JSONObject();
-    String validUuidString = "123e4567-e89b-12d3-a456-426614174000";
-    valuesJson.put("col1", validUuidString);
-    UUID result = handleCassandraUuidType("col1", valuesJson);
-    UUID expectedUuid = UUID.fromString(validUuidString);
-    assertEquals(expectedUuid, result);
-  }
+  public void testGetColumnValueByTypeForNullBothColumnDefs() {
+    JSONObject valuesJson = mock(JSONObject.class);
+    String sourceDbTimezoneOffset = "UTC";
 
-  @Test
-  public void testHandleCassandraInetAddressType_Hostname() {
-    JSONObject valuesJson = new JSONObject();
-    valuesJson.put("col1", "www.google.com");
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> {
-              CassandraTypeHandler.handleCassandraInetAddressType("col1", valuesJson);
-            });
-    assertTrue(exception.getMessage().contains("Invalid IP address format for column: col1"));
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          getColumnValueByType(null, null, valuesJson, sourceDbTimezoneOffset);
+        });
   }
 }
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java
index eb29cd0d0a..a5e4f583ba 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/processor/SourceProcessorFactoryTest.java
@@ -25,6 +25,7 @@
 import com.google.cloud.teleport.v2.templates.dbutils.connection.JdbcConnectionHelper;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.CassandraDao;
 import com.google.cloud.teleport.v2.templates.dbutils.dao.source.JdbcDao;
+import com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraDMLGenerator;
 import com.google.cloud.teleport.v2.templates.dbutils.dml.MySQLDMLGenerator;
 import com.google.cloud.teleport.v2.templates.exceptions.UnsupportedSourceException;
 import java.util.Arrays;
@@ -104,8 +105,7 @@ public void testCreateSourceProcessor_cassandra_validSource() throws Exception {
             Constants.SOURCE_CASSANDRA, shards, maxConnections);
 
     Assert.assertNotNull(processor);
-    // ToDo this Particular line will get enable in DML PR
-    //    Assert.assertTrue(processor.getDmlGenerator() instanceof CassandraDMLGenerator);
+    Assert.assertTrue(processor.getDmlGenerator() instanceof CassandraDMLGenerator);
     Assert.assertEquals(1, processor.getSourceDaoMap().size());
     Assert.assertTrue(processor.getSourceDaoMap().get("shard1") instanceof CassandraDao);
   }
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json
new file mode 100644
index 0000000000..c356e73117
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json
@@ -0,0 +1,603 @@
+{
+  "SessionName": "NewSession",
+  "EditorName": "",
+  "DatabaseType": "cassandra",
+  "DatabaseName": "test",
+  "SpSchema": {
+    "sample_table": {
+      "Name": "sample_table",
+      "ColIds": [
+        "id",
+        "varchar_column",
+        "tinyint_column",
+        "text_column",
+        "date_column",
+        "smallint_column",
+        "mediumint_column",
+        "bigint_column",
+        "float_column",
+        "double_column",
+        "decimal_column",
+        "datetime_column",
+        "timestamp_column",
+        "time_column",
+        "year_column",
+        "char_column",
+        "tinyblob_column",
+        "tinytext_column",
+        "blob_column",
+        "mediumblob_column",
+        "mediumtext_column",
+        "longblob_column",
+        "longtext_column",
+        "enum_column",
+        "set_column",
+        "bool_column",
+        "binary_column",
+        "varbinary_column"
+      ],
+      "ColDefs": {
+        "bigint_column": {
+          "Name": "bigint_column",
+          "T": {
+            "Name": "INT64"
+          }
+        },
+        "binary_column": {
+          "Name": "binary_column",
+          "T": {
+            "Name": "BYTES"
+          }
+        },
+        "blob_column": {
+          "Name": "blob_column",
+          "T": {
+            "Name": "BYTES"
+          }
+        },
+        "bool_column": {
+          "Name": "bool_column",
+          "T": {
+            "Name": "BOOL"
+          }
+        },
+        "char_column": {
+          "Name": "char_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "date_column": {
+          "Name": "date_column",
+          "T": {
+            "Name": "DATE"
+          }
+        },
+        "datetime_column": {
+          "Name": "datetime_column",
+          "T": {
+            "Name": "TIMESTAMP"
+          }
+        },
+        "decimal_column": {
+          "Name": "decimal_column",
+          "T": {
+            "Name": "NUMERIC"
+          }
+        },
+        "double_column": {
+          "Name": "double_column",
+          "T": {
+            "Name": "FLOAT64"
+          }
+        },
+        "enum_column": {
+          "Name": "enum_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "float_column": {
+          "Name": "float_column",
+          "T": {
+            "Name": "FLOAT64"
+          }
+        },
+        "id": {
+          "Name": "id",
+          "T": {
+            "Name": "INT64"
+          }
+        },
+        "longblob_column": {
+          "Name": "longblob_column",
+          "T": {
+            "Name": "BYTES"
+          }
+        },
+        "longtext_column": {
+          "Name": "longtext_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "mediumblob_column": {
+          "Name": "mediumblob_column",
+          "T": {
+            "Name": "BYTES"
+          }
+        },
+        "mediumint_column": {
+          "Name": "mediumint_column",
+          "T": {
+            "Name": "INT64"
+          }
+        },
+        "mediumtext_column": {
+          "Name": "mediumtext_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "set_column": {
+          "Name": "set_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "smallint_column": {
+          "Name": "smallint_column",
+          "T": {
+            "Name": "INT64"
+          }
+        },
+        "text_column": {
+          "Name": "text_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "time_column": {
+          "Name": "time_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "timestamp_column": {
+          "Name": "timestamp_column",
+          "T": {
+            "Name": "TIMESTAMP"
+          }
+        },
+        "tinyblob_column": {
+          "Name": "tinyblob_column",
+          "T": {
+            "Name": "BYTES"
+          }
+        },
+        "tinyint_column": {
+          "Name": "tinyint_column",
+          "T": {
+            "Name": "INT64"
+          }
+        },
+        "tinytext_column": {
+          "Name": "tinytext_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "varbinary_column": {
+          "Name": "varbinary_column",
+          "T": {
+            "Name": "BYTES"
+          }
+        },
+        "varchar_column": {
+          "Name": "varchar_column",
+          "T": {
+            "Name": "STRING"
+          }
+        },
+        "year_column": {
+          "Name": "year_column",
+          "T": {
+            "Name": "STRING"
+          }
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "id"
+        }
+      ]
+    }
+  },
+  "SyntheticPKeys": {},
+  "SrcSchema": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Schema": "test",
+      "ColIds": [
+        "id",
+        "varchar_column",
+        "tinyint_column",
+        "text_column",
+        "date_column",
+        "smallint_column",
+        "mediumint_column",
+        "bigint_column",
+        "float_column",
+        "double_column",
+        "decimal_column",
+        "datetime_column",
+        "timestamp_column",
+        "time_column",
+        "year_column",
+        "char_column",
+        "tinyblob_column",
+        "tinytext_column",
+        "blob_column",
+        "mediumblob_column",
+        "mediumtext_column",
+        "longblob_column",
+        "longtext_column",
+        "enum_column",
+        "set_column",
+        "bool_column",
+        "binary_column",
+        "varbinary_column"
+      ],
+      "ColDefs": {
+        "bigint_column": {
+          "Name": "bigint_column",
+          "Type": {
+            "Name": "bigint"
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c9"
+        },
+        "binary_column": {
+          "Name": "binary_column",
+          "Type": {
+            "Name": "binary"
+          }
+        },
+        "blob_column": {
+          "Name": "blob_column",
+          "Type": {
+            "Name": "blob"
+          }
+        },
+        "bool_column": {
+          "Name": "bool_column",
+          "Type": {
+            "Name": "tinyint"
+          }
+        },
+        "char_column": {
+          "Name": "char_column",
+          "Type": {
+            "Name": "varchar"
+          }
+        },
+        "date_column": {
+          "Name": "date_column",
+          "Type": {
+            "Name": "timestamp"
+          }
+        },
+        "datetime_column": {
+          "Name": "datetime_column",
+          "Type": {
+            "Name": "timestamp"
+          }
+        },
+        "decimal_column": {
+          "Name": "decimal_column",
+          "Type": {
+            "Name": "float"
+          }
+        },
+        "double_column": {
+          "Name": "double_column",
+          "Type": {
+            "Name": "float"
+          }
+        },
+        "enum_column": {
+          "Name": "enum_column",
+          "Type": {
+            "Name": "enum"
+          }
+        },
+        "float_column": {
+          "Name": "float_column",
+          "Type": {
+            "Name": "float"
+          }
+        },
+        "id": {
+          "Name": "id",
+          "Type": {
+            "Name": "int"
+          }
+        },
+        "longblob_column": {
+          "Name": "longblob_column",
+          "Type": {
+            "Name": "blob"
+          }
+        },
+        "longtext_column": {
+          "Name": "longtext_column",
+          "Type": {
+            "Name": "varchar"
+          }
+        },
+        "mediumblob_column": {
+          "Name": "mediumblob_column",
+          "Type": {
+            "Name": "blob"
+          }
+        },
+        "mediumint_column": {
+          "Name": "mediumint_column",
+          "Type": {
+            "Name": "int"
+          }
+        },
+        "mediumtext_column": {
+          "Name": "mediumtext_column",
+          "Type": {
+            "Name": "varchar"
+          }
+        },
+        "set_column": {
+          "Name": "set_column",
+          "Type": {
+            "Name": "set"
+          }
+        },
+        "smallint_column": {
+          "Name": "smallint_column",
+          "Type": {
+            "Name": "int"
+          }
+        },
+        "text_column": {
+          "Name": "text_column",
+          "Type": {
+            "Name": "varchar"
+          }
+        },
+        "time_column": {
+          "Name": "time_column",
+          "Type": {
+            "Name": "time"
+          }
+        },
+        "timestamp_column": {
+          "Name": "timestamp_column",
+          "Type": {
+            "Name": "timestamp"
+          }
+        },
+        "tinyblob_column": {
+          "Name": "tinyblob_column",
+          "Type": {
+            "Name": "blob"
+          }
+        },
+        "tinyint_column": {
+          "Name": "tinyint_column",
+          "Type": {
+            "Name": "tinyint"
+          }
+        },
+        "tinytext_column": {
+          "Name": "tinytext_column",
+          "Type": {
+            "Name": "varchar"
+          }
+        },
+        "varbinary_column": {
+          "Name": "varbinary_column",
+          "Type": {
+            "Name": "varbinary"
+          }
+        },
+        "varchar_column": {
+          "Name": "varchar_column",
+          "Type": {
+            "Name": "varchar"
+          }
+        },
+        "year_column": {
+          "Name": "year_column",
+          "Type": {
+            "Name": "year"
+          }
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "id"
+        }
+      ]
+    }
+  },
+  "Issues": {
+    "sample_table": {
+      "bigint_column": [
+        0
+      ],
+      "binary_column": [
+        0
+      ],
+      "blob_column": [
+        0
+      ],
+      "bool_column": [
+        0
+      ],
+      "char_column": [
+        0
+      ],
+      "date_column": [
+        0
+      ],
+      "datetime_column": [
+        12,
+        0
+      ],
+      "decimal_column": [
+        0
+      ],
+      "double_column": [
+        0
+      ],
+      "enum_column": [
+        0
+      ],
+      "float_column": [
+        13,
+        0
+      ],
+      "id": [
+        13
+      ],
+      "longblob_column": [
+        0
+      ],
+      "longtext_column": [
+        0
+      ],
+      "mediumblob_column": [
+        0
+      ],
+      "mediumint_column": [
+        13,
+        0
+      ],
+      "mediumtext_column": [
+        0
+      ],
+      "set_column": [
+        0
+      ],
+      "smallint_column": [
+        13,
+        0
+      ],
+      "text_column": [
+        0
+      ],
+      "time_column": [
+        14,
+        0
+      ],
+      "timestamp_column": [
+        0
+      ],
+      "tinyblob_column": [
+        0
+      ],
+      "tinyint_column": [
+        13,
+        0
+      ],
+      "tinytext_column": [
+        0
+      ],
+      "varbinary_column": [
+        0
+      ],
+      "varchar_column": [
+        0
+      ],
+      "year_column": [
+        14,
+        0
+      ]
+    }
+  },
+  "ToSpanner": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Cols": {
+        "bigint_column": "bigint_column",
+        "binary_column": "binary_column",
+        "blob_column": "blob_column",
+        "bool_column": "bool_column",
+        "char_column": "char_column",
+        "date_column": "date_column",
+        "datetime_column": "datetime_column",
+        "decimal_column": "decimal_column",
+        "double_column": "double_column",
+        "enum_column": "enum_column",
+        "float_column": "float_column",
+        "id": "id",
+        "longblob_column": "longblob_column",
+        "longtext_column": "longtext_column",
+        "mediumblob_column": "mediumblob_column",
+        "mediumint_column": "mediumint_column",
+        "mediumtext_column": "mediumtext_column",
+        "set_column": "set_column",
+        "smallint_column": "smallint_column",
+        "text_column": "text_column",
+        "time_column": "time_column",
+        "timestamp_column": "timestamp_column",
+        "tinyblob_column": "tinyblob_column",
+        "tinyint_column": "tinyint_column",
+        "tinytext_column": "tinytext_column",
+        "varbinary_column": "varbinary_column",
+        "varchar_column": "varchar_column",
+        "year_column": "year_column"
+      }
+    }
+  },
+  "ToSource": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Cols": {
+        "bigint_column": "bigint_column",
+        "binary_column": "binary_column",
+        "blob_column": "blob_column",
+        "bool_column": "bool_column",
+        "char_column": "char_column",
+        "date_column": "date_column",
+        "datetime_column": "datetime_column",
+        "decimal_column": "decimal_column",
+        "double_column": "double_column",
+        "enum_column": "enum_column",
+        "float_column": "float_column",
+        "id": "id",
+        "longblob_column": "longblob_column",
+        "longtext_column": "longtext_column",
+        "mediumblob_column": "mediumblob_column",
+        "mediumint_column": "mediumint_column",
+        "mediumtext_column": "mediumtext_column",
+        "set_column": "set_column",
+        "smallint_column": "smallint_column",
+        "text_column": "text_column",
+        "time_column": "time_column",
+        "timestamp_column": "timestamp_column",
+        "tinyblob_column": "tinyblob_column",
+        "tinyint_column": "tinyint_column",
+        "tinytext_column": "tinytext_column",
+        "varbinary_column": "varbinary_column",
+        "varchar_column": "varchar_column",
+        "year_column": "year_column"
+      }
+    }
+  }
+  }

From a23bf6f1c15323d8115e68f3430faaf0ee7da1d4 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Thu, 9 Jan 2025 17:00:41 +0530
Subject: [PATCH 10/56] Added extensive UT

Added extensive UT
---
 .../dbutils/dml/CassandraDMLGenerator.java    |   4 +-
 .../dbutils/dml/CassandraTypeHandler.java     | 505 ++--------
 .../dml/CassandraDMLGeneratorTest.java        | 879 +++++++++++++++++-
 .../dbutils/dml/CassandraTypeHandlerTest.java | 189 +++-
 .../cassandraAllDatatypeSession.json          | 325 +++----
 .../cassandraAllMatchSession.json             | 716 ++++++++++++++
 .../CassandraJson/cassandraBitSession.json    | 170 ++++
 ...assandraCoulmnNameTypeMismatchSession.json | 716 ++++++++++++++
 .../cassandraErrorSchemaSession.json          | 716 ++++++++++++++
 .../cassandraMultiColmPKSession.json          | 122 +++
 .../cassandraPrimarykeyMismatchSession.json   | 716 ++++++++++++++
 .../CassandraJson/cassandraQuotesSession.json | 169 ++++
 ...draSourceColumnAbsentInSpannerSession.json | 732 +++++++++++++++
 .../cassandraSourceNoPkSession.json           | 492 ++++++++++
 ...draSpannerColumnAbsentInSourceSession.json | 534 +++++++++++
 .../cassandraTableNameMismatchSession.json    | 470 ++++++++++
 .../cassandraTimeZoneSession.json             | 475 ++++++++++
 17 files changed, 7269 insertions(+), 661 deletions(-)
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index 4b2fa8e1e6..192202f55e 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -227,7 +227,7 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
     for (Map.Entry<String, PreparedStatementValueObject<?>> entry : columnNameValues.entrySet()) {
       String colName = entry.getKey();
       PreparedStatementValueObject<?> colValue = entry.getValue();
-      if (colValue.value() != null) {
+      if (colValue.value() != CassandraTypeHandler.NullClass.INSTANCE) {
         allColumns.append(colName).append(", ");
         placeholders.append("?, ");
         values.add(colValue);
@@ -286,7 +286,7 @@ private static DMLGeneratorResponse getDeleteStatementCQL(
     for (Map.Entry<String, PreparedStatementValueObject<?>> entry : pkColumnNameValues.entrySet()) {
       String colName = entry.getKey();
       PreparedStatementValueObject<?> colValue = entry.getValue();
-      if (colValue.value() != null) {
+      if (colValue.value() != CassandraTypeHandler.NullClass.INSTANCE) {
         deleteConditions.append(colName).append(" = ? AND ");
         values.add(entry.getValue());
       }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index 1a1e6c72c6..b6ba7c0481 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -23,13 +23,11 @@
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -40,7 +38,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import org.eclipse.jetty.util.StringUtil;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -51,6 +48,43 @@
 public class CassandraTypeHandler {
   private static final Logger LOG = LoggerFactory.getLogger(CassandraTypeHandler.class);
 
+  /**
+   * A singleton class representing a null or empty state.
+   *
+   * <p>This class cannot be instantiated directly, and its single instance is accessed via the
+   * {@link #INSTANCE} field. It provides a custom {@link #toString()} implementation that returns
+   * the string representation "NULL_CLASS". This can be used to signify a special state where an
+   * object is not present or explicitly set to null.
+   */
+  public static final class NullClass {
+
+    /**
+     * Private constructor to prevent instantiation of the NULL_CLASS.
+     *
+     * <p>This ensures that only one instance of the NULL_CLASS exists, following the singleton
+     * pattern.
+     */
+    private NullClass() {}
+
+    /**
+     * The singleton instance of the NULL_CLASS.
+     *
+     * <p>This instance can be accessed statically via this field to represent a "null" or empty
+     * value in various contexts.
+     */
+    public static final NullClass INSTANCE = new NullClass();
+
+    /**
+     * Returns the string representation of the NULL_CLASS instance.
+     *
+     * @return the string "NULL_CLASS"
+     */
+    @Override
+    public String toString() {
+      return "NULL_CLASS";
+    }
+  }
+
   /**
    * Functional interface for parsing an object value to a specific type.
    *
@@ -146,38 +180,49 @@ private static String handleCassandraAsciiType(String colName, JSONObject values
   }
 
   /**
-   * Generates a {@link BigInteger} based on the provided {@link CassandraTypeHandler}.
+   * Converts the provided {@link Object} value to a {@link BigInteger} representing a Cassandra
+   * varint.
    *
-   * <p>This method fetches the value associated with the given column name ({@code colName}) from
-   * the {@code valuesJson} object, and converts it to a {@link BigInteger}. The value can either be
-   * a string representing a number or a binary representation of a large integer (varint).
+   * <p>This method checks the type of the provided {@code value}. If it is a string, it tries to
+   * convert it to a {@link BigInteger}. If it is a byte array, it interprets it as a varint and
+   * converts it to a {@link BigInteger}. If the value is a {@link ByteBuffer}, it converts the
+   * content of the buffer to a byte array and then to a {@link BigInteger}. If the value is neither
+   * a valid number string, byte array, nor a {@link ByteBuffer}, it throws an {@link
+   * IllegalArgumentException}.
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link BigInteger} object representing the varint value from the Cassandra data.
-   * @throws IllegalArgumentException If the value is not a valid format for varint (neither a valid
-   *     number string nor a byte array).
+   * @param value The value to be converted to a {@link BigInteger}. This could either be a string
+   *     representing a number, a byte array representing a varint, or a {@link ByteBuffer}.
+   * @return A {@link BigInteger} object representing the varint value.
+   * @throws IllegalArgumentException If the value is neither a valid number string, byte array, nor
+   *     a valid {@link ByteBuffer} for varint representation.
    */
-  private static BigInteger handleCassandraVarintType(String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-
+  private static BigInteger handleCassandraVarintType(Object value) {
     if (value instanceof String) {
       try {
         return new BigInteger((String) value);
       } catch (NumberFormatException e) {
-        throw new IllegalArgumentException(
-            "Invalid varint format (string) for column: " + colName, e);
+        throw new IllegalArgumentException("Invalid varint format (string) for value: " + value, e);
       }
     } else if (value instanceof byte[]) {
       try {
         return new BigInteger((byte[]) value);
       } catch (Exception e) {
         throw new IllegalArgumentException(
-            "Invalid varint format (byte array) for column: " + colName, e);
+            "Invalid varint format (byte array) for value: " + value, e);
+      }
+    } else if (value instanceof ByteBuffer) {
+      try {
+        ByteBuffer byteBuffer = (ByteBuffer) value;
+        byte[] byteArray = new byte[byteBuffer.remaining()];
+        byteBuffer.get(byteArray); // Read bytes from ByteBuffer
+        return new BigInteger(byteArray);
+      } catch (Exception e) {
+        throw new IllegalArgumentException(
+            "Invalid varint format (ByteBuffer) for value: " + value, e);
       }
     } else {
-      return null;
+      throw new IllegalArgumentException(
+          "Invalid value type for varint conversion: " + value.getClass());
     }
   }
 
@@ -333,24 +378,6 @@ private static byte[] convertHexStringToByteArray(String hex) {
     return data;
   }
 
-  /**
-   * Generates a {@link LocalDate} based on the provided {@link CassandraTypeHandler}.
-   *
-   * <p>This method processes the given JSON object to extract a date value using the specified
-   * column name and formatter. It specifically handles the "Cassandra Date" format (yyyy-MM-dd).
-   * The resulting {@link LocalDate} represents the date value associated with the column.
-   *
-   * @param colName - the key used to fetch the value from the provided {@link JSONObject}.
-   * @param valuesJson - the JSON object containing all key-value pairs for the current incoming
-   *     data stream.
-   * @return a {@link LocalDate} object containing the date value represented in Cassandra type
-   *     format. If the column is missing or contains an invalid value, this will return {@code
-   *     null}.
-   */
-  private static LocalDate handleCassandraDateType(String colName, JSONObject valuesJson) {
-    return handleCassandraGenericDateType(colName, valuesJson, "yyyy-MM-dd");
-  }
-
   /**
    * Parses a timestamp value from a JSON object and returns it as an {@link Instant} in UTC.
    *
@@ -381,75 +408,6 @@ private static Instant handleCassandraTimestampType(String colName, JSONObject v
     return convertToCassandraTimestamp(timestampValue);
   }
 
-  /**
-   * A helper method that handles the conversion of a given column value to a {@link LocalDate}
-   * based on the specified date format (formatter).
-   *
-   * <p>This method extracts the value for the given column name from the provided JSON object and
-   * parses it into a {@link LocalDate} based on the provided date format. If the value is in an
-   * unsupported type or format, an exception is thrown.
-   *
-   * @param colName - the key used to fetch the value from the provided {@link JSONObject}.
-   * @param valuesJson - the JSON object containing all key-value pairs for the current incoming
-   *     data stream.
-   * @param formatter - the date format pattern used to parse the value (e.g., "yyyy-MM-dd").
-   * @return a {@link LocalDate} object containing the parsed date value. If the column is missing
-   *     or invalid, this method returns {@code null}.
-   */
-  private static LocalDate handleCassandraGenericDateType(
-      String colName, JSONObject valuesJson, String formatter) {
-    Object colValue = valuesJson.opt(colName);
-    if (colValue == null) {
-      return null;
-    }
-
-    if (formatter == null) {
-      formatter = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-    }
-
-    return parseDate(colName, colValue, formatter);
-  }
-
-  /**
-   * Parses a column value (String, {@link java.util.Date}, or {@code Long}) into a {@link
-   * LocalDate} using the specified date format.
-   *
-   * <p>This method handles different data types (String, Date, Long) by converting them into a
-   * {@link LocalDate}. The provided formatter is used to parse date strings, while other types are
-   * converted based on their corresponding representations.
-   *
-   * @param colName - the key used to fetch the value from the provided {@link JSONObject}.
-   * @param colValue - the value to be parsed into a {@link LocalDate}.
-   * @param formatter - the date format pattern used to parse date strings.
-   * @return a {@link LocalDate} object parsed from the given value.
-   * @throws IllegalArgumentException if the value cannot be parsed or is of an unsupported type.
-   */
-  private static LocalDate parseDate(String colName, Object colValue, String formatter) {
-    LocalDate localDate;
-    if (colValue instanceof String) {
-      try {
-        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(formatter);
-        localDate = LocalDate.parse((String) colValue, dateFormatter);
-      } catch (DateTimeParseException e) {
-        throw new IllegalArgumentException("Invalid date format for column " + colName, e);
-      }
-    } else if (colValue instanceof java.util.Date) {
-      localDate =
-          ((java.util.Date) colValue)
-              .toInstant()
-              .atZone(java.time.ZoneId.systemDefault())
-              .toLocalDate();
-    } else if (colValue instanceof Long) {
-      localDate =
-          java.time.Instant.ofEpochMilli((Long) colValue)
-              .atZone(java.time.ZoneId.systemDefault())
-              .toLocalDate();
-    } else {
-      throw new IllegalArgumentException("Unsupported type for column " + colName);
-    }
-    return localDate;
-  }
-
   /**
    * Generates a Type based on the provided {@link CassandraTypeHandler}.
    *
@@ -511,286 +469,6 @@ private static Integer handleCassandraIntType(String colName, JSONObject valuesJ
     }
   }
 
-  /**
-   * Generates a {@link List} object containing a list of long values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of long values represented in Cassandra.
-   */
-  private static List<Long> handleInt64ArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName,
-        valuesJson,
-        obj -> {
-          if (obj instanceof Long) {
-            return (Long) obj;
-          } else if (obj instanceof Number) {
-            return ((Number) obj).longValue();
-          } else if (obj instanceof String) {
-            try {
-              return Long.getLong((String) obj);
-            } catch (NumberFormatException e) {
-              throw new IllegalArgumentException("Invalid number format for column " + colName, e);
-            }
-          } else {
-            throw new IllegalArgumentException("Unsupported type for column " + colName);
-          }
-        });
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of long values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of long values represented in Cassandra.
-   */
-  private static Set<Long> handleInt64SetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleInt64ArrayType(colName, valuesJson));
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of integer values from Cassandra by
-   * converting long values to int.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of integer values represented in Cassandra.
-   */
-  private static List<Integer> handleInt64ArrayAsInt32Array(String colName, JSONObject valuesJson) {
-    return handleInt64ArrayType(colName, valuesJson).stream()
-        .map(Long::intValue)
-        .collect(Collectors.toList());
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of integer values from Cassandra by converting
-   * long values to int.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of integer values represented in Cassandra.
-   */
-  private static Set<Integer> handleInt64ArrayAsInt32Set(String colName, JSONObject valuesJson) {
-    return handleInt64ArrayType(colName, valuesJson).stream()
-        .map(Long::intValue)
-        .collect(Collectors.toSet());
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of string values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of string values represented in Cassandra.
-   */
-  private static Set<String> handleStringSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleStringArrayType(colName, valuesJson));
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of string values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of string values represented in Cassandra.
-   */
-  private static List<String> handleStringArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(colName, valuesJson, String::valueOf);
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of boolean values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of boolean values represented in Cassandra.
-   */
-  private static List<Boolean> handleBoolArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName, valuesJson, obj -> obj instanceof String && Boolean.parseBoolean((String) obj));
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of boolean values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of boolean values represented in Cassandra.
-   */
-  private static Set<Boolean> handleBoolSetTypeString(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleBoolArrayType(colName, valuesJson));
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of double values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of double values represented in Cassandra.
-   */
-  private static List<Double> handleFloat64ArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName,
-        valuesJson,
-        obj -> {
-          if (obj instanceof Number) {
-            return ((Number) obj).doubleValue();
-          } else if (obj instanceof String) {
-            try {
-              return Double.valueOf((String) obj);
-            } catch (NumberFormatException e) {
-              throw new IllegalArgumentException("Invalid number format for column " + colName, e);
-            }
-          } else {
-            throw new IllegalArgumentException("Unsupported type for column " + colName);
-          }
-        });
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of double values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of double values represented in Cassandra.
-   */
-  private static Set<Double> handleFloat64SetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleFloat64ArrayType(colName, valuesJson));
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of float values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of float values represented in Cassandra.
-   */
-  private static List<Float> handleFloatArrayType(String colName, JSONObject valuesJson) {
-    return handleFloat64ArrayType(colName, valuesJson).stream()
-        .map(Double::floatValue)
-        .collect(Collectors.toList());
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of float values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of float values represented in Cassandra.
-   */
-  private static Set<Float> handleFloatSetType(String colName, JSONObject valuesJson) {
-    return handleFloat64SetType(colName, valuesJson).stream()
-        .map(Double::floatValue)
-        .collect(Collectors.toSet());
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of LocalDate values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of LocalDate values represented in Cassandra.
-   */
-  private static List<LocalDate> handleDateArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName, valuesJson, obj -> LocalDate.parse(obj.toString(), DateTimeFormatter.ISO_DATE));
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of LocalDate values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of LocalDate values represented in Cassandra.
-   */
-  private static Set<LocalDate> handleDateSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleDateArrayType(colName, valuesJson));
-  }
-
-  /**
-   * Generates a {@link List} object containing a list of Timestamp values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link List} object containing a list of Timestamp values represented in Cassandra.
-   */
-  private static List<Timestamp> handleTimestampArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(
-        colName,
-        valuesJson,
-        value ->
-            Timestamp.valueOf(
-                parseDate(colName, value, "yyyy-MM-dd'T'HH:mm:ss.SSSX").atStartOfDay()));
-  }
-
-  /**
-   * Generates a {@link Set} object containing a set of Timestamp values from Cassandra.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing key-value pairs for the current incoming
-   *     stream.
-   * @return a {@link Set} object containing a set of Timestamp values represented in Cassandra.
-   */
-  private static Set<Timestamp> handleTimestampSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleTimestampArrayType(colName, valuesJson));
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link List} object containing List of ByteBuffer as value represented in cassandra
-   *     type.
-   */
-  private static List<ByteBuffer> handleByteArrayType(String colName, JSONObject valuesJson) {
-    return handleArrayType(colName, valuesJson, CassandraTypeHandler::parseBlobType);
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link List} object containing List of Type T as value represented in cassandra type
-   *     which will be assigned runtime.
-   */
-  private static <T> List<T> handleArrayType(
-      String colName, JSONObject valuesJson, TypeParser<T> parser) {
-    return valuesJson.getJSONArray(colName).toList().stream()
-        .map(parser::parse)
-        .collect(Collectors.toList());
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Set} object containing Set of ByteBuffer as value represented in cassandra
-   *     type.
-   */
-  private static Set<ByteBuffer> handleByteSetType(String colName, JSONObject valuesJson) {
-    return new HashSet<>(handleByteArrayType(colName, valuesJson));
-  }
-
   /**
    * Converts an {@link Integer} to a {@code short} (SmallInt).
    *
@@ -829,35 +507,6 @@ private static byte convertToTinyInt(Integer integerValue) {
     return integerValue.byteValue();
   }
 
-  /**
-   * Escapes single quotes in a Cassandra string by replacing them with double single quotes.
-   *
-   * <p>This method is commonly used to sanitize strings before inserting them into Cassandra
-   * queries, where single quotes need to be escaped by doubling them (i.e., `'` becomes `''`).
-   *
-   * @param value The string to be escaped.
-   * @return The escaped string where single quotes are replaced with double single quotes.
-   */
-  private static String escapeCassandraString(String value) {
-    return value.replace("'", "''");
-  }
-
-  /**
-   * Converts a string representation of a date to a {@link LocalDate} compatible with Cassandra.
-   *
-   * <p>The method parses the {@code dateString} into an {@link Instant}, converts it to a {@link
-   * Date}, and then retrieves the corresponding {@link LocalDate} from the system's default time
-   * zone.
-   *
-   * @param dateString The date string in ISO-8601 format (e.g., "2024-12-05T00:00:00Z").
-   * @return The {@link LocalDate} representation of the date.
-   */
-  private static LocalDate convertToCassandraDate(String dateString) {
-    Instant instant = convertToCassandraTimestamp(dateString);
-    ZonedDateTime zonedDateTime = instant.atZone(ZoneId.systemDefault());
-    return zonedDateTime.toLocalDate();
-  }
-
   /**
    * Converts a string representation of a timestamp to an {@link Instant} compatible with
    * Cassandra.
@@ -921,25 +570,6 @@ private static boolean isValidIPAddress(String value) {
     }
   }
 
-  /**
-   * Validates if the given string is a valid JSON object.
-   *
-   * <p>This method attempts to parse the string using {@link JSONObject} to check if the value
-   * represents a valid JSON object. If the string is valid JSON, it returns {@code true}, otherwise
-   * {@code false}.
-   *
-   * @param value The string to check if it represents a valid JSON object.
-   * @return {@code true} if the string is a valid JSON object, {@code false} otherwise.
-   */
-  private static boolean isValidJSON(String value) {
-    try {
-      new JSONObject(value);
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
   /**
    * Validates if the given string is a valid JSONArray.
    *
@@ -1198,8 +828,7 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
             columnType, convertToTinyInt((Integer) colValue));
 
       case "varint":
-        return PreparedStatementValueObject.create(
-            columnType, new BigInteger(((ByteBuffer) colValue).array()));
+        return PreparedStatementValueObject.create(columnType, handleCassandraVarintType(colValue));
 
       case "duration":
         return PreparedStatementValueObject.create(columnType, (Duration) colValue);
@@ -1339,7 +968,7 @@ public static PreparedStatementValueObject<?> getColumnValueByType(
 
     if (columnValue == null) {
       LOG.warn("Column value is null for column: {}, type: {}", columnName, spannerType);
-      return PreparedStatementValueObject.create(cassandraType, null);
+      return PreparedStatementValueObject.create(cassandraType, NullClass.INSTANCE);
     }
     return PreparedStatementValueObject.create(cassandraType, columnValue);
   }
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
index 9aef70e36c..6b93bbc287 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
@@ -15,7 +15,12 @@
  */
 package com.google.cloud.teleport.v2.templates.dbutils.dml;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.NameAndCols;
@@ -26,19 +31,196 @@
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerTable;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SyntheticPKey;
 import com.google.cloud.teleport.v2.spanner.migrations.utils.SessionFileReader;
+import com.google.cloud.teleport.v2.templates.dbutils.processor.InputRecordProcessor;
 import com.google.cloud.teleport.v2.templates.models.DMLGeneratorRequest;
 import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
+import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
 import java.util.HashMap;
 import java.util.Map;
 import org.json.JSONObject;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class CassandraDMLGeneratorTest {
 
+  private CassandraDMLGenerator cassandraDMLGenerator;
+
+  @Mock private DMLGeneratorRequest mockRequest;
+
+  @Mock private Schema mockSchema;
+
+  @Before
+  public void setUp() {
+    cassandraDMLGenerator = new CassandraDMLGenerator();
+  }
+
+  @Test
+  public void testGetDMLStatement_NullRequest() {
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(null);
+    assertNotNull(response);
+    assertEquals("", response.getDmlStatement());
+  }
+
+  @Test
+  public void testGetDMLStatement_InvalidSchema() {
+    when(mockRequest.getSchema()).thenReturn(null);
+
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(mockRequest);
+    assertNotNull(response);
+    assertEquals("", response.getDmlStatement());
+
+    verify(mockRequest, times(1)).getSchema();
+  }
+
+  @Test
+  public void testGetDMLStatement_MissingTableMapping() {
+    when(mockRequest.getSchema()).thenReturn(mockSchema);
+    when(mockSchema.getSpannerToID()).thenReturn(null);
+
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(mockRequest);
+    assertNotNull(response);
+    assertEquals("", response.getDmlStatement());
+    verify(mockSchema, times(1)).getSpannerToID();
+  }
+
+  @Test
+  public void tableAndAllColumnNameTypesMatch() {
+    Schema schema =
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void tableNameMismatchAllColumnNameTypesMatch() {
+    Schema schema =
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json");
+    String tableName = "leChanteur";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void tableNameMatchColumnNameTypeMismatch() {
+    Schema schema =
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"John\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void tableNameMatchSourceColumnNotPresentInSpanner() {
+    Schema schema =
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void tableNameMatchSpannerColumnNotPresentInSource() {
+
+    Schema schema =
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"hb_shardId\":\"shardA\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
   @Test
   public void primaryKeyNotFoundInJson() {
     Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllDatatypeSession.json");
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -61,7 +243,7 @@ public void primaryKeyNotFoundInJson() {
   @Test
   public void primaryKeyNotPresentInSourceSchema() {
     Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllDatatypeSession.json");
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraSourceNoPkSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -82,11 +264,84 @@ public void primaryKeyNotPresentInSourceSchema() {
   }
 
   @Test
-  public void testSpannerTableNotInSchema() {
+  public void primaryKeyMismatch() {
     Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllDatatypeSession.json");
-    String tableName = "SomeRandomTableNotInSchema";
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"SingerId\":\"999\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"FirstName\":\"kk\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void updateToNull() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":null}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("FirstName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void deleteMultiplePKColumns() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraMultiColmPKSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"LastName\":null}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\",\"FirstName\":\"kk\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "DELETE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testSingleQuoteMatch() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"k\u0027k\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"SingerId\":\"999\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -101,6 +356,618 @@ public void testSpannerTableNotInSchema() {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void singleQuoteBytesDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"Jw\u003d\u003d\",\"varchar_column\":\"\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testParseBlobType_hexString() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"0102030405\",\"varchar_column\":\"\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testParseBlobType_base64String() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"AQIDBAU=\",\"varchar_column\":\"\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void twoSingleEscapedQuoteDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"Jyc\u003d\",\"varchar_column\":\"\u0027\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void threeEscapesAndSingleQuoteDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"XCc\u003d\",\"varchar_column\":\"\\\\\\\u0027\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void tabEscapeDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"CQ==\",\"varchar_column\":\"\\t\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void backSpaceEscapeDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"CA==\",\"varchar_column\":\"\\b\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void newLineEscapeDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"Cg==\",\"varchar_column\":\"\\n\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void carriageReturnEscapeDML() throws Exception {
+
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"DQ==\",\"varchar_column\":\"\\r\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void formFeedEscapeDML() throws Exception {
+
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"DA==\",\"varchar_column\":\"\\f\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void doubleQuoteEscapeDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"Ig==\",\"varchar_column\":\"\\\"\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void backSlashEscapeDML() throws Exception {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+
+    String tableName = "sample_table";
+    String newValuesString = "{\"blob_column\":\"XA==\",\"varchar_column\":\"\\\\\",}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"id\":\"12\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("sample_table"));
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void bitColumnSql() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraBitSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"YmlsX2NvbA\u003d\u003d\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testSpannerTableNotInSchema() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "SomeRandomTableNotInSchema";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSpannerKeyIsNull() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":null}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testKeyInNewValuesJson() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"SingerId\":null}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SmthingElse\":null}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testSourcePKNotInSpanner() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "customer";
+    String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"Dont\":\"care\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "DELETE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void primaryKeyMismatchSpannerNull() {
+    Schema schema =
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"SingerId\":\"999\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"FirstName\":null}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testUnsupportedModType() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "JUNK";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testUpdateModType() {
+    Schema schema =
+        SessionFileReader.read(
+            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"999\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "UPDATE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.contains("SingerId"));
+    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("LastName"));
+    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+  }
+
+  @Test
+  public void testSpannerTableIdMismatch() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraErrorSchemaSession.json");
+    String tableName = "Singers";
+    String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"Dont\":\"care\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "DELETE";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSourcePkNull() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraErrorSchemaSession.json");
+    String tableName = "Persons";
+    String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"Dont\":\"care\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSourceTableNotInSchema() {
+    Schema schema = getSchemaObject();
+    String tableName = "contacts";
+    String newValuesString = "{\"accountId\": \"Id1\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"Dont\":\"care\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSpannerTableNotInSchemaObject() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "Singers";
+    schema.getSpSchema().remove(schema.getSpannerToID().get(tableName).getName());
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"SingerId\":null}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SmthingElse\":null}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+
+    assertTrue(sql.isEmpty());
+  }
+
+  @Test
+  public void testSpannerColDefsNull() {
+    Schema schema =
+        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    String tableName = "Singers";
+
+    String spannerTableId = schema.getSpannerToID().get(tableName).getName();
+    SpannerTable spannerTable = schema.getSpSchema().get(spannerTableId);
+    spannerTable.getColDefs().remove("c5");
+    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    JSONObject newValuesJson = new JSONObject(newValuesString);
+    String keyValueString = "{\"SingerId\":\"23\"}";
+    JSONObject keyValuesJson = new JSONObject(keyValueString);
+    String modType = "INSERT";
+
+    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
+    DMLGeneratorResponse dmlGeneratorResponse =
+        cassandraDMLGenerator.getDMLStatement(
+            new DMLGeneratorRequest.Builder(
+                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
+                .setSchema(schema)
+                .build());
+    String sql = dmlGeneratorResponse.getDmlStatement();
+    CassandraDMLGenerator test = new CassandraDMLGenerator();
+    InputRecordProcessor test2 = new InputRecordProcessor();
     assertTrue(sql.isEmpty());
   }
 
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index 861c7ee38b..153e7c5565 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -37,8 +37,11 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import org.json.JSONArray;
@@ -244,25 +247,24 @@ public void testGetColumnValueByTypeForStringHex() {
     spannerColDef = mock(SpannerColumnDefinition.class);
     sourceColDef = mock(SourceColumnDefinition.class);
     valuesJson = mock(JSONObject.class);
+
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
     String columnName = "a3f5b7";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    when(valuesJson.optString(columnName, null))
+        .thenReturn(columnName); // Mock string value for column
+    when(valuesJson.get(columnName)).thenReturn(columnName); // Mock getting column value
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    when(spannerColDef.getType()).thenReturn(spannerType); // Spanner column type
+    when(spannerColDef.getName()).thenReturn(columnName); // Column name in Spanner
+    when(sourceColDef.getType())
+        .thenReturn(new SourceColumnType("sourceType", null, null)); // Source column type
 
-    assertThrows(
-        NullPointerException.class,
-        () -> {
-          getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
-        });
+    PreparedStatementValueObject preparedStatementValueObject =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    assertEquals(CassandraTypeHandler.NullClass.INSTANCE, preparedStatementValueObject.value());
   }
 
   @Test
@@ -688,4 +690,165 @@ public void testGetColumnValueByTypeForNullBothColumnDefs() {
           getColumnValueByType(null, null, valuesJson, sourceDbTimezoneOffset);
         });
   }
+
+  @Test
+  public void testCastToExpectedTypeForAscii() {
+    String expected = "test string";
+    Object result = CassandraTypeHandler.castToExpectedType("ascii", expected);
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testCastToExpectedTypeForVarchar() {
+    String expected = "test varchar";
+    Object result = CassandraTypeHandler.castToExpectedType("varchar", expected);
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testCastToExpectedTypeForList() {
+    JSONArray listValue = new JSONArray();
+    listValue.put("value1");
+    listValue.put("value2");
+    Object result = CassandraTypeHandler.castToExpectedType("list<text>", listValue);
+    assertTrue(result instanceof List);
+    assertEquals(2, ((List<?>) result).size());
+  }
+
+  @Test
+  public void testCastToExpectedTypeForSet() {
+    JSONArray setValue = new JSONArray();
+    setValue.put("value1");
+    setValue.put("value2");
+    Object result = CassandraTypeHandler.castToExpectedType("set<text>", setValue);
+    assertTrue(result instanceof Set);
+    assertEquals(2, ((Set<?>) result).size());
+  }
+
+  @Test
+  public void testCastToExpectedTypeForMap() {
+    JSONObject mapValue = new JSONObject();
+    mapValue.put("key1", "value1");
+    mapValue.put("key2", "value2");
+    Object result = CassandraTypeHandler.castToExpectedType("map<text, text>", mapValue);
+    assertTrue(result instanceof Map);
+    assertEquals(2, ((Map<?, ?>) result).size());
+  }
+
+  @Test
+  public void testCastToExpectedTypeForInvalidType() {
+    Object object = CassandraTypeHandler.castToExpectedType("unknownType", new Object());
+    assertNotNull(object);
+  }
+
+  @Test
+  public void testCastToExpectedTypeForNull() {
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          CassandraTypeHandler.castToExpectedType("text", null);
+        });
+  }
+
+  @Test
+  public void testCastToExpectedTypeForDate_String() {
+    String dateString = "2025-01-09"; // Format: yyyy-MM-dd
+    Object result = CassandraTypeHandler.castToExpectedType("date", dateString);
+    LocalDate expected = LocalDate.parse(dateString);
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testCastToExpectedTypeForDate_Instant() {
+    Instant now = Instant.now();
+    Object result = CassandraTypeHandler.castToExpectedType("date", now);
+    LocalDate expected = now.atZone(ZoneId.systemDefault()).toLocalDate();
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testCastToExpectedTypeForDate_JavaUtilDate() {
+    Date date = new Date();
+    Object result = CassandraTypeHandler.castToExpectedType("date", date);
+    LocalDate expected = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testCastToExpectedTypeForDate_InvalidString() {
+    String invalidDateString = "invalid-date";
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              CassandraTypeHandler.castToExpectedType("date", invalidDateString);
+            });
+    assertEquals(
+        "Error handling type: Text 'invalid-date' could not be parsed at index 0",
+        exception.getMessage());
+  }
+
+  @Test
+  public void testCastToExpectedTypeForDate_UnsupportedType() {
+    Integer unsupportedType = 123;
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              CassandraTypeHandler.castToExpectedType("date", unsupportedType);
+            });
+    assertEquals(
+        "Error handling type: Unsupported value for date conversion: 123", exception.getMessage());
+  }
+
+  @Test
+  public void testHandleCassandraVarintType_String() {
+    String validString = "12345678901234567890";
+    Object result = CassandraTypeHandler.castToExpectedType("varint", validString);
+    BigInteger expected = new BigInteger(validString);
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testHandleCassandraVarintType_InvalidString() {
+    String invalidString = "invalid-number";
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              CassandraTypeHandler.castToExpectedType("varint", invalidString);
+            });
+    assertEquals(
+        "Invalid varint format (string) for value: invalid-number", exception.getMessage());
+  }
+
+  @Test
+  public void testHandleCassandraVarintType_ByteArray() {
+    byte[] validByteArray = new byte[] {0, 0, 0, 0, 0, 0, 0, 10};
+    Object result = CassandraTypeHandler.castToExpectedType("varint", validByteArray);
+    BigInteger expected = new BigInteger(validByteArray);
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testHandleCassandraVarintType_ByteBuffer() {
+    ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[] {0, 0, 0, 0, 0, 0, 0, 20});
+    Object result = CassandraTypeHandler.castToExpectedType("varint", byteBuffer);
+    BigInteger expected = new BigInteger(new byte[] {0, 0, 0, 0, 0, 0, 0, 20});
+    assertEquals(expected, result);
+  }
+
+  @Test
+  public void testHandleCassandraVarintType_UnsupportedType() {
+    Integer unsupportedType = 123;
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              CassandraTypeHandler.castToExpectedType("varint", unsupportedType);
+            });
+    assertEquals(
+        "Invalid value type for varint conversion: class java.lang.Integer",
+        exception.getMessage());
+  }
 }
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json
index c356e73117..102a43661f 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json
@@ -1,8 +1,7 @@
 {
-  "SessionName": "NewSession",
-  "EditorName": "",
   "DatabaseType": "cassandra",
   "DatabaseName": "test",
+  "SyntheticPKeys": {},
   "SpSchema": {
     "sample_table": {
       "Name": "sample_table",
@@ -41,180 +40,211 @@
           "Name": "bigint_column",
           "T": {
             "Name": "INT64"
-          }
+          },
+          "Id": "c9"
         },
         "binary_column": {
           "Name": "binary_column",
           "T": {
             "Name": "BYTES"
-          }
+          },
+          "Id": "c25"
         },
         "blob_column": {
           "Name": "blob_column",
           "T": {
             "Name": "BYTES"
-          }
+          },
+          "Id": "c11"
         },
         "bool_column": {
           "Name": "bool_column",
           "T": {
             "Name": "BOOL"
-          }
+          },
+          "Id": "c19"
         },
         "char_column": {
           "Name": "char_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c10"
         },
         "date_column": {
           "Name": "date_column",
           "T": {
             "Name": "DATE"
-          }
+          },
+          "Id": "c13"
         },
         "datetime_column": {
           "Name": "datetime_column",
           "T": {
             "Name": "TIMESTAMP"
-          }
+          },
+          "Id": "c15"
         },
         "decimal_column": {
           "Name": "decimal_column",
           "T": {
             "Name": "NUMERIC"
-          }
+          },
+          "Id": "c28"
         },
         "double_column": {
           "Name": "double_column",
           "T": {
             "Name": "FLOAT64"
-          }
+          },
+          "Id": "c17"
         },
         "enum_column": {
           "Name": "enum_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c24"
         },
         "float_column": {
           "Name": "float_column",
           "T": {
             "Name": "FLOAT64"
-          }
+          },
+          "Id": "c14"
         },
         "id": {
           "Name": "id",
           "T": {
             "Name": "INT64"
-          }
+          },
+          "Id": "c2"
         },
         "longblob_column": {
           "Name": "longblob_column",
           "T": {
             "Name": "BYTES"
-          }
+          },
+          "Id": "c23"
         },
         "longtext_column": {
           "Name": "longtext_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c12"
         },
         "mediumblob_column": {
           "Name": "mediumblob_column",
           "T": {
             "Name": "BYTES"
-          }
+          },
+          "Id": "c18"
         },
         "mediumint_column": {
           "Name": "mediumint_column",
           "T": {
             "Name": "INT64"
-          }
+          },
+          "Id": "c8"
         },
         "mediumtext_column": {
           "Name": "mediumtext_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c22"
         },
         "set_column": {
           "Name": "set_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c5"
         },
         "smallint_column": {
           "Name": "smallint_column",
           "T": {
             "Name": "INT64"
-          }
+          },
+          "Id": "c3"
         },
         "text_column": {
           "Name": "text_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c27"
         },
         "time_column": {
           "Name": "time_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c29"
         },
         "timestamp_column": {
           "Name": "timestamp_column",
           "T": {
             "Name": "TIMESTAMP"
-          }
+          },
+          "Id": "c16"
         },
         "tinyblob_column": {
           "Name": "tinyblob_column",
           "T": {
             "Name": "BYTES"
-          }
+          },
+          "NotNull": false,
+          "Id": "c4"
         },
         "tinyint_column": {
           "Name": "tinyint_column",
           "T": {
             "Name": "INT64"
-          }
+          },
+          "Id": "c26"
         },
         "tinytext_column": {
           "Name": "tinytext_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c7"
         },
         "varbinary_column": {
           "Name": "varbinary_column",
           "T": {
             "Name": "BYTES"
-          }
+          },
+          "Id": "c20"
         },
         "varchar_column": {
           "Name": "varchar_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c21"
         },
         "year_column": {
           "Name": "year_column",
           "T": {
             "Name": "STRING"
-          }
+          },
+          "Id": "c6"
         }
       },
       "PrimaryKeys": [
         {
-          "ColId": "id"
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
         }
-      ]
+      ],
+      "Id": "t1"
     }
   },
-  "SyntheticPKeys": {},
-  "SrcSchema": {
+ "SrcSchema": {
     "sample_table": {
       "Name": "sample_table",
       "Schema": "test",
@@ -254,315 +284,206 @@
           "Type": {
             "Name": "bigint"
           },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": true,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
           "Id": "c9"
         },
         "binary_column": {
           "Name": "binary_column",
           "Type": {
             "Name": "binary"
-          }
+          },
+          "Id": "c25"
         },
         "blob_column": {
           "Name": "blob_column",
           "Type": {
             "Name": "blob"
-          }
+          },
+          "Id": "c11"
         },
         "bool_column": {
           "Name": "bool_column",
           "Type": {
             "Name": "tinyint"
-          }
+          },
+          "Id": "c19"
         },
         "char_column": {
           "Name": "char_column",
           "Type": {
             "Name": "varchar"
-          }
+          },
+          "Id": "c10"
         },
         "date_column": {
           "Name": "date_column",
           "Type": {
             "Name": "timestamp"
-          }
+          },
+          "Id": "c13"
         },
         "datetime_column": {
           "Name": "datetime_column",
           "Type": {
             "Name": "timestamp"
-          }
+          },
+          "Id": "c15"
         },
         "decimal_column": {
           "Name": "decimal_column",
           "Type": {
             "Name": "float"
-          }
+          },
+          "Id": "c28"
         },
         "double_column": {
           "Name": "double_column",
           "Type": {
             "Name": "float"
-          }
+          },
+          "Id": "c17"
         },
         "enum_column": {
           "Name": "enum_column",
           "Type": {
             "Name": "enum"
-          }
+          },
+          "Id": "c24"
         },
         "float_column": {
           "Name": "float_column",
           "Type": {
             "Name": "float"
-          }
+          },
+          "Id": "c14"
         },
         "id": {
           "Name": "id",
           "Type": {
             "Name": "int"
-          }
+          },
+          "Id": "c2"
         },
         "longblob_column": {
           "Name": "longblob_column",
           "Type": {
             "Name": "blob"
-          }
+          },
+          "Id": "c23"
         },
         "longtext_column": {
           "Name": "longtext_column",
           "Type": {
             "Name": "varchar"
-          }
+          },
+          "Id": "c12"
         },
         "mediumblob_column": {
           "Name": "mediumblob_column",
           "Type": {
             "Name": "blob"
-          }
+          },
+          "Id": "c18"
         },
         "mediumint_column": {
           "Name": "mediumint_column",
           "Type": {
             "Name": "int"
-          }
+          },
+          "Id": "c8"
         },
         "mediumtext_column": {
           "Name": "mediumtext_column",
           "Type": {
             "Name": "varchar"
-          }
+          },
+          "Id": "c22"
         },
         "set_column": {
           "Name": "set_column",
           "Type": {
             "Name": "set"
-          }
+          },
+          "Id": "c5"
         },
         "smallint_column": {
           "Name": "smallint_column",
           "Type": {
             "Name": "int"
-          }
+          },
+          "Id": "c3"
         },
         "text_column": {
           "Name": "text_column",
           "Type": {
             "Name": "varchar"
-          }
+          },
+          "Id": "c27"
         },
         "time_column": {
           "Name": "time_column",
           "Type": {
             "Name": "time"
-          }
+          },
+          "Id": "c29"
         },
         "timestamp_column": {
           "Name": "timestamp_column",
           "Type": {
             "Name": "timestamp"
-          }
+          },
+          "Id": "c16"
         },
         "tinyblob_column": {
           "Name": "tinyblob_column",
           "Type": {
             "Name": "blob"
-          }
+          },
+          "Id": "c4"
         },
         "tinyint_column": {
           "Name": "tinyint_column",
           "Type": {
             "Name": "tinyint"
-          }
+          },
+          "Id": "c26"
         },
         "tinytext_column": {
           "Name": "tinytext_column",
           "Type": {
             "Name": "varchar"
-          }
+          },
+          "Id": "c7"
         },
         "varbinary_column": {
           "Name": "varbinary_column",
           "Type": {
             "Name": "varbinary"
-          }
+          },
+          "Id": "c20"
         },
         "varchar_column": {
           "Name": "varchar_column",
           "Type": {
             "Name": "varchar"
-          }
+          },
+          "Id": "c21"
         },
         "year_column": {
           "Name": "year_column",
           "Type": {
             "Name": "year"
-          }
+          },
+          "Id": "c6"
         }
       },
       "PrimaryKeys": [
         {
-          "ColId": "id"
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
         }
-      ]
-    }
-  },
-  "Issues": {
-    "sample_table": {
-      "bigint_column": [
-        0
-      ],
-      "binary_column": [
-        0
-      ],
-      "blob_column": [
-        0
-      ],
-      "bool_column": [
-        0
-      ],
-      "char_column": [
-        0
-      ],
-      "date_column": [
-        0
-      ],
-      "datetime_column": [
-        12,
-        0
-      ],
-      "decimal_column": [
-        0
-      ],
-      "double_column": [
-        0
-      ],
-      "enum_column": [
-        0
-      ],
-      "float_column": [
-        13,
-        0
-      ],
-      "id": [
-        13
-      ],
-      "longblob_column": [
-        0
-      ],
-      "longtext_column": [
-        0
-      ],
-      "mediumblob_column": [
-        0
       ],
-      "mediumint_column": [
-        13,
-        0
-      ],
-      "mediumtext_column": [
-        0
-      ],
-      "set_column": [
-        0
-      ],
-      "smallint_column": [
-        13,
-        0
-      ],
-      "text_column": [
-        0
-      ],
-      "time_column": [
-        14,
-        0
-      ],
-      "timestamp_column": [
-        0
-      ],
-      "tinyblob_column": [
-        0
-      ],
-      "tinyint_column": [
-        13,
-        0
-      ],
-      "tinytext_column": [
-        0
-      ],
-      "varbinary_column": [
-        0
-      ],
-      "varchar_column": [
-        0
-      ],
-      "year_column": [
-        14,
-        0
-      ]
-    }
-  },
-  "ToSpanner": {
-    "sample_table": {
-      "Name": "sample_table",
-      "Cols": {
-        "bigint_column": "bigint_column",
-        "binary_column": "binary_column",
-        "blob_column": "blob_column",
-        "bool_column": "bool_column",
-        "char_column": "char_column",
-        "date_column": "date_column",
-        "datetime_column": "datetime_column",
-        "decimal_column": "decimal_column",
-        "double_column": "double_column",
-        "enum_column": "enum_column",
-        "float_column": "float_column",
-        "id": "id",
-        "longblob_column": "longblob_column",
-        "longtext_column": "longtext_column",
-        "mediumblob_column": "mediumblob_column",
-        "mediumint_column": "mediumint_column",
-        "mediumtext_column": "mediumtext_column",
-        "set_column": "set_column",
-        "smallint_column": "smallint_column",
-        "text_column": "text_column",
-        "time_column": "time_column",
-        "timestamp_column": "timestamp_column",
-        "tinyblob_column": "tinyblob_column",
-        "tinyint_column": "tinyint_column",
-        "tinytext_column": "tinytext_column",
-        "varbinary_column": "varbinary_column",
-        "varchar_column": "varchar_column",
-        "year_column": "year_column"
-      }
+      "Id": "t1"
     }
   },
   "ToSource": {
@@ -600,4 +521,4 @@
       }
     }
   }
-  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json
new file mode 100644
index 0000000000..59963be47c
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json
@@ -0,0 +1,716 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Id int",
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Info varchar(50)",
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Type varchar(50)",
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table contact",
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Name varchar(50)",
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: City varchar(50)",
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table customer",
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17",
+              "c22"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: PersonID int",
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(255)",
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(255)",
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: Address varchar(255)",
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: City varchar(255)",
+                  "Id": "c17"
+              },
+              "c22": {
+                  "Name": "synth_id",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "",
+                  "Id": "c22"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c22",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Persons",
+          "Id": "t4"
+      }
+  },
+  "SyntheticPKeys": {
+      "t4": {
+          "ColId": "c22",
+          "Sequence": 0
+      }
+  },
+  "SrcSchema": {
+      "t1": {
+          "Name": "Singers",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "Type": {
+                      "Name": "integer",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "String",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "String",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "OnDelete": "",
+                  "OnUpdate": "",
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c17"
+              }
+          },
+          "PrimaryKeys": null,
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t4"
+      }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json
new file mode 100644
index 0000000000..2c5fb13437
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json
@@ -0,0 +1,170 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "BYTES",
+                      "Len": 9223372036854775807,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      }
+  },
+  "SyntheticPKeys": {
+      
+  },
+  "SrcSchema": {
+      "t1": {
+          "Name": "Singers",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "Type": {
+                      "Name": "integer",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "String",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "String",
+                      "Mods":[7],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "Id": "t1"
+      }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json
new file mode 100644
index 0000000000..e1255873c5
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json
@@ -0,0 +1,716 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Id int",
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Info varchar(50)",
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Type varchar(50)",
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table contact",
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Name varchar(50)",
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: City varchar(50)",
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table customer",
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17",
+              "c22"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: PersonID int",
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(255)",
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(255)",
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: Address varchar(255)",
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: City varchar(255)",
+                  "Id": "c17"
+              },
+              "c22": {
+                  "Name": "synth_id",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "",
+                  "Id": "c22"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c22",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Persons",
+          "Id": "t4"
+      }
+  },
+  "SyntheticPKeys": {
+      "t4": {
+          "ColId": "c22",
+          "Sequence": 0
+      }
+  },
+  "SrcSchema": {
+      "t1": {
+          "Name": "Singers",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "Type": {
+                      "Name": "integer",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "STRING",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "String",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "OnDelete": "",
+                  "OnUpdate": "",
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c17"
+              }
+          },
+          "PrimaryKeys": null,
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t4"
+      }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json
new file mode 100644
index 0000000000..12729a1768
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json
@@ -0,0 +1,716 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "junk"
+      },
+      "t2": {
+          "Name": "contact",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Id int",
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Info varchar(50)",
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Type varchar(50)",
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table contact",
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Name varchar(50)",
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: City varchar(50)",
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c11",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table customer",
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17",
+              "c22"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: PersonID int",
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(255)",
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(255)",
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: Address varchar(255)",
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: City varchar(255)",
+                  "Id": "c17"
+              },
+              "c22": {
+                  "Name": "synth_id",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "",
+                  "Id": "c22"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c22",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Persons",
+          "Id": "t4"
+      }
+  },
+  "SyntheticPKeys": {
+      "t4": {
+          "ColId": "c22",
+          "Sequence": 0
+      }
+  },
+  "SrcSchema": {
+      "t1": {
+          "Name": "Singers",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "OnDelete": "",
+                  "OnUpdate": "",
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c17"
+              }
+          },
+          "PrimaryKeys": [],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t4"
+      }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json
new file mode 100644
index 0000000000..18d5ff9b23
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json
@@ -0,0 +1,122 @@
+{
+    "SyntheticPKeys": {},
+     "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "int64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "varchar",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "varchar",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      }
+  },
+    "SrcSchema": {
+        "t1": {
+            "Name": "Singers",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c5",
+                "c6",
+                "c7"
+            ],
+            "ColDefs": {
+                "c5": {
+                    "Name": "SingerId",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c5"
+                },
+                "c6": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c6"
+                },
+                "c7": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c7"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c5",
+                    "Desc": false,
+                    "Order": 1
+                },
+                {
+                    "ColId": "c6",
+                    "Desc": false,
+                    "Order": 2
+                }
+            ],
+            "Id": "t1"
+        }
+    }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json
new file mode 100644
index 0000000000..47daece7f3
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json
@@ -0,0 +1,716 @@
+{
+  "SpSchema": {
+    "t1": {
+      "Name": "Singers",
+      "ColIds": [
+        "c5",
+        "c6",
+        "c7"
+      ],
+      "ColDefs": {
+        "c5": {
+          "Name": "SingerId",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: SingerId int",
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "FirstName",
+          "T": {
+            "Name": "STRING",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: FirstName varchar(1024)",
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "LastName",
+          "T": {
+            "Name": "STRING",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: LastName varchar(1024)",
+          "Id": "c7"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c6",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": [
+        {
+          "Name": "ind1",
+          "TableId": "t1",
+          "Unique": false,
+          "Keys": [
+            {
+              "ColId": "c5",
+              "Desc": false,
+              "Order": 1
+            }
+          ],
+          "Id": "i9",
+          "StoredColumnIds": null
+        }
+      ],
+      "ParentId": "",
+      "Comment": "Spanner schema for source table Singers",
+      "Id": "t1"
+    },
+    "t2": {
+      "Name": "contact",
+      "ColIds": [
+        "c18",
+        "c19",
+        "c20",
+        "c21"
+      ],
+      "ColDefs": {
+        "c18": {
+          "Name": "ID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: ID int",
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "Customer_Id",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Customer_Id int",
+          "Id": "c19"
+        },
+        "c20": {
+          "Name": "Customer_Info",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Customer_Info varchar(50)",
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "Type",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Type varchar(50)",
+          "Id": "c21"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c18",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c19",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "ForeignKeys": [
+        {
+          "Name": "contact_ibfk_1",
+          "ColIds": [
+            "c18"
+          ],
+          "ReferTableId": "t3",
+          "ReferColumnIds": [
+            "c10"
+          ],
+          "Id": "f8"
+        }
+      ],
+      "Indexes": null,
+      "ParentId": "",
+      "Comment": "Spanner schema for source table contact",
+      "Id": "t2"
+    },
+    "t3": {
+      "Name": "customer",
+      "ColIds": [
+        "c10",
+        "c11",
+        "c12"
+      ],
+      "ColDefs": {
+        "c10": {
+          "Name": "ID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: ID int",
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "Name",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Name varchar(50)",
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "City",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: City varchar(50)",
+          "Id": "c12"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c10",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "ParentId": "",
+      "Comment": "Spanner schema for source table customer",
+      "Id": "t3"
+    },
+    "t4": {
+      "Name": "Persons",
+      "ColIds": [
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17",
+        "c22"
+      ],
+      "ColDefs": {
+        "c13": {
+          "Name": "PersonID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: PersonID int",
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "LastName",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: LastName varchar(255)",
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "FirstName",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: FirstName varchar(255)",
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "Address",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: Address varchar(255)",
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "City",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: City varchar(255)",
+          "Id": "c17"
+        },
+        "c22": {
+          "Name": "synth_id",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "",
+          "Id": "c22"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c22",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "ParentId": "",
+      "Comment": "Spanner schema for source table Persons",
+      "Id": "t4"
+    }
+  },
+  "SyntheticPKeys": {
+    "t4": {
+      "ColId": "c22",
+      "Sequence": 0
+    }
+  },
+  "SrcSchema": {
+    "t1": {
+      "Name": "Singers",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c5",
+        "c6",
+        "c7"
+      ],
+      "ColDefs": {
+        "c5": {
+          "Name": "SingerId",
+          "Type": {
+            "Name": "integer",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "FirstName",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              1024
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "LastName",
+          "Type": {
+            "Name": "String",
+            "Mods": [
+              1024
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c7"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c5",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": [
+        {
+          "Name": "ind1",
+          "Unique": false,
+          "Keys": [
+            {
+              "ColId": "c5",
+              "Desc": false,
+              "Order": 1
+            }
+          ],
+          "Id": "i9",
+          "StoredColumnIds": null
+        }
+      ],
+      "Id": "t1"
+    },
+    "t2": {
+      "Name": "contact",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c18",
+        "c19",
+        "c20",
+        "c21"
+      ],
+      "ColDefs": {
+        "c18": {
+          "Name": "ID",
+          "Type": {
+            "Name": "int",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "Customer_Id",
+          "Type": {
+            "Name": "int",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c19"
+        },
+        "c20": {
+          "Name": "Customer_Info",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              50
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "Type",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              50
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c21"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c18",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c19",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "ForeignKeys": [
+        {
+          "Name": "contact_ibfk_1",
+          "ColIds": [
+            "c18"
+          ],
+          "ReferTableId": "t3",
+          "ReferColumnIds": [
+            "c10"
+          ],
+          "OnDelete": "",
+          "OnUpdate": "",
+          "Id": "f8"
+        }
+      ],
+      "Indexes": null,
+      "Id": "t2"
+    },
+    "t3": {
+      "Name": "customer",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c10",
+        "c11",
+        "c12"
+      ],
+      "ColDefs": {
+        "c10": {
+          "Name": "ID",
+          "Type": {
+            "Name": "int",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "Name",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              50
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "City",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              50
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c12"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c10",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t3"
+    },
+    "t4": {
+      "Name": "Persons",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17"
+      ],
+      "ColDefs": {
+        "c13": {
+          "Name": "PersonID",
+          "Type": {
+            "Name": "int",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "LastName",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              255
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "FirstName",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              255
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "Address",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              255
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "City",
+          "Type": {
+            "Name": "varchar",
+            "Mods": [
+              255
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c17"
+        }
+      },
+      "PrimaryKeys": null,
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t4"
+    }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json
new file mode 100644
index 0000000000..50b021cbb8
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json
@@ -0,0 +1,169 @@
+{
+  "SpSchema": {
+    "sample_table": {
+      "Name": "sample_table",
+      "ColIds": [
+        "id",
+        "varchar_column",
+        "blob_column"  
+      ],
+      "ColDefs": {
+        
+        "blob_column": {
+          "Name": "blob_column",
+          "T": {
+            "Name": "blob",
+            "Len": 9223372036854776000,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: blob_column blob(65535)",
+          "Id": "c11"
+        },
+        "id": {
+          "Name": "id",
+          "T": {
+            "Name": "bigint",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: id int",
+          "Id": "c2"
+        },
+        "varchar_column": {
+          "Name": "varchar_column",
+          "T": {
+            "Name": "varchar",
+            "Len": 20,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: varchar_column varchar(20)",
+          "Id": "c21"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Parent": "",
+      "Comment": "Spanner schema for source table sample_table",
+      "Id": "t1"
+    }
+  },
+  "SyntheticPKeys": {},
+  "SrcSchema": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Schema": "test",
+      "ColIds": [
+        "id",
+        "varchar_column",       
+        "blob_column" 
+      ],
+      "ColDefs": {
+        
+        "blob_column": {
+          "Name": "blob_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              65535
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c11"
+        },
+       
+        "id": {
+          "Name": "id",
+          "Type": {
+            "Name": "integer",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c2"
+        },
+       
+        "varchar_column": {
+          "Name": "varchar_column",
+          "Type": {
+            "Name": "String",
+            "Mods": [
+              20
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c21"
+        
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t1"
+    }
+  },
+  "ToSpanner": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Cols": {        
+        "blob_column": "blob_column",      
+        "id": "id",      
+        "varchar_column": "varchar_column"
+      }
+    }
+  },
+  "ToSource": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Cols": {
+       
+        "blob_column": "blob_column",
+       
+        "id": "id",
+       
+        "varchar_column": "varchar_column"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json
new file mode 100644
index 0000000000..c6717b7ae6
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json
@@ -0,0 +1,732 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Id int",
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Info varchar(50)",
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Type varchar(50)",
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table contact",
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Name varchar(50)",
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: City varchar(50)",
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table customer",
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17",
+              "c22"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: PersonID int",
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(255)",
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(255)",
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: Address varchar(255)",
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: City varchar(255)",
+                  "Id": "c17"
+              },
+              "c22": {
+                  "Name": "synth_id",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "",
+                  "Id": "c22"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c22",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Persons",
+          "Id": "t4"
+      }
+  },
+    "SyntheticPKeys": {},
+  "SrcSchema": {
+      "t1": {
+          "Name": "Singers",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7",
+              "c8"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "Type": {
+                      "Name": "integer",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "String",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "String",
+                      "Mods": [
+                          1024
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c7"
+              },
+              "c8": {
+                "Name": "Age",
+                "Type": {
+                    "Name": "varchar",
+                    "Mods": [
+                        1024
+                    ],
+                    "ArrayBounds": null
+                },
+                "NotNull": false,
+                "Ignored": {
+                    "Check": false,
+                    "Identity": false,
+                    "Default": false,
+                    "Exclusion": false,
+                    "ForeignKey": false,
+                    "AutoIncrement": false
+                },
+                "Id": "c8"
+            }              
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "OnDelete": "",
+                  "OnUpdate": "",
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          50
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": true,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "Schema": "ui_demo",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "Type": {
+                      "Name": "int",
+                      "Mods": null,
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "Type": {
+                      "Name": "varchar",
+                      "Mods": [
+                          255
+                      ],
+                      "ArrayBounds": null
+                  },
+                  "NotNull": false,
+                  "Ignored": {
+                      "Check": false,
+                      "Identity": false,
+                      "Default": false,
+                      "Exclusion": false,
+                      "ForeignKey": false,
+                      "AutoIncrement": false
+                  },
+                  "Id": "c17"
+              }
+          },
+          "PrimaryKeys": null,
+          "ForeignKeys": null,
+          "Indexes": null,
+          "Id": "t4"
+      }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json
new file mode 100644
index 0000000000..6198e6ae74
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json
@@ -0,0 +1,492 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Id int",
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Info varchar(50)",
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Type varchar(50)",
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table contact",
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Name varchar(50)",
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: City varchar(50)",
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table customer",
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17",
+              "c22"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: PersonID int",
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(255)",
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(255)",
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: Address varchar(255)",
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: City varchar(255)",
+                  "Id": "c17"
+              },
+              "c22": {
+                  "Name": "synth_id",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "",
+                  "Id": "c22"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c22",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Persons",
+          "Id": "t4"
+      }
+  },
+    "SyntheticPKeys": {},
+    "SrcSchema": {
+        "t1": {
+            "Name": "Singers",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c5",
+                "c6",
+                "c7"
+            ],
+            "ColDefs": {
+                "c5": {
+                    "Name": "SingerId",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c5"
+                },
+                "c6": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c6"
+                },
+                "c7": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c7"
+                }
+            },
+            "PrimaryKeys": null,
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t1"
+        },
+        "t2": {
+            "Name": "contact",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c18",
+                "c19",
+                "c20",
+                "c21"
+            ],
+            "ColDefs": {
+                "c18": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c18"
+                },
+                "c19": {
+                    "Name": "Customer_Id",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c19"
+                },
+                "c20": {
+                    "Name": "Customer_Info",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c20"
+                },
+                "c21": {
+                    "Name": "Type",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c21"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c18",
+                    "Desc": false,
+                    "Order": 1
+                },
+                {
+                    "ColId": "c19",
+                    "Desc": false,
+                    "Order": 2
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t2"
+        },
+        "t3": {
+            "Name": "customer",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c10",
+                "c11",
+                "c12"
+            ],
+            "ColDefs": {
+                "c10": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c10"
+                },
+                "c11": {
+                    "Name": "Name",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c11"
+                },
+                "c12": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c12"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c10",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t3"
+        },
+        "t4": {
+            "Name": "Persons",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c13",
+                "c14",
+                "c15",
+                "c16",
+                "c17"
+            ],
+            "ColDefs": {
+                "c13": {
+                    "Name": "PersonID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c13"
+                },
+                "c14": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c14"
+                },
+                "c15": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c15"
+                },
+                "c16": {
+                    "Name": "Address",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c16"
+                },
+                "c17": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c17"
+                }
+            },
+            "PrimaryKeys": null,
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t4"
+        }
+    }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json
new file mode 100644
index 0000000000..6a4342b67e
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json
@@ -0,0 +1,534 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "Singers",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7",
+              "c8"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              },
+              "c8": {
+                "Name": "hb_shardId",
+                "T": {
+                    "Name": "STRING",
+                    "Len": 1024,
+                    "IsArray": false
+                },
+                "NotNull": false,
+                "Comment": "HB shard id",
+                "Id": "c8"
+            }              
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Id int",
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Info varchar(50)",
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Type varchar(50)",
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table contact",
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Name varchar(50)",
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: City varchar(50)",
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table customer",
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17",
+              "c22"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: PersonID int",
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(255)",
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(255)",
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: Address varchar(255)",
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: City varchar(255)",
+                  "Id": "c17"
+              },
+              "c22": {
+                  "Name": "synth_id",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "",
+                  "Id": "c22"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c22",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Persons",
+          "Id": "t4"
+      }
+  },
+    "SyntheticPKeys": {},
+    "SrcSchema": {
+        "t1": {
+            "Name": "Singers",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c5",
+                "c6",
+                "c7"
+            ],
+            "ColDefs": {
+                "c5": {
+                    "Name": "SingerId",
+                    "Type": {
+                        "Name": "integer"
+                    },
+                    "Id": "c5"
+                },
+                "c6": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "String"
+                    },
+                    "Id": "c6"
+                },
+                "c7": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "String"
+                    },
+                    "Id": "c7"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c5",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t1"
+        },
+        "t2": {
+            "Name": "contact",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c18",
+                "c19",
+                "c20",
+                "c21"
+            ],
+            "ColDefs": {
+                "c18": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c18"
+                },
+                "c19": {
+                    "Name": "Customer_Id",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c19"
+                },
+                "c20": {
+                    "Name": "Customer_Info",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            50
+                        ]
+                    },
+                    "Id": "c20"
+                },
+                "c21": {
+                    "Name": "Type",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            50
+                        ]
+                    },
+                    "Id": "c21"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c18",
+                    "Desc": false,
+                    "Order": 1
+                },
+                {
+                    "ColId": "c19",
+                    "Desc": false,
+                    "Order": 2
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t2"
+        },
+        "t3": {
+            "Name": "customer",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c10",
+                "c11",
+                "c12"
+            ],
+            "ColDefs": {
+                "c10": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c10"
+                },
+                "c11": {
+                    "Name": "Name",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            50
+                        ]
+                    },
+                    "Id": "c11"
+                },
+                "c12": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            50
+                        ]
+                    },
+                    "Id": "c12"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c10",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t3"
+        },
+        "t4": {
+            "Name": "Persons",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c13",
+                "c14",
+                "c15",
+                "c16",
+                "c17"
+            ],
+            "ColDefs": {
+                "c13": {
+                    "Name": "PersonID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c13"
+                },
+                "c14": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            255
+                        ]
+                    },
+                    "Id": "c14"
+                },
+                "c15": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            255
+                        ]
+                    },
+                    "Id": "c15"
+                },
+                "c16": {
+                    "Name": "Address",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            255
+                        ]
+                    },
+                    "Id": "c16"
+                },
+                "c17": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar",
+                        "Mods": [
+                            255
+                        ]
+                    },
+                    "Id": "c17"
+                }
+            },
+            "PrimaryKeys": null,
+            "ForeignKeys": null,
+            "Indexes": null,
+            "Id": "t4"
+        }
+    }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json
new file mode 100644
index 0000000000..c458dc293b
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json
@@ -0,0 +1,470 @@
+{
+  "SpSchema": {
+      "t1": {
+          "Name": "leChanteur",
+          "ColIds": [
+              "c5",
+              "c6",
+              "c7"
+          ],
+          "ColDefs": {
+              "c5": {
+                  "Name": "SingerId",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: SingerId int",
+                  "Id": "c5"
+              },
+              "c6": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(1024)",
+                  "Id": "c6"
+              },
+              "c7": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 1024,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(1024)",
+                  "Id": "c7"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c5",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": [
+              {
+                  "Name": "ind1",
+                  "TableId": "t1",
+                  "Unique": false,
+                  "Keys": [
+                      {
+                          "ColId": "c5",
+                          "Desc": false,
+                          "Order": 1
+                      }
+                  ],
+                  "Id": "i9",
+                  "StoredColumnIds": null
+              }
+          ],
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Singers",
+          "Id": "t1"
+      },
+      "t2": {
+          "Name": "contact",
+          "ColIds": [
+              "c18",
+              "c19",
+              "c20",
+              "c21"
+          ],
+          "ColDefs": {
+              "c18": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c18"
+              },
+              "c19": {
+                  "Name": "Customer_Id",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Id int",
+                  "Id": "c19"
+              },
+              "c20": {
+                  "Name": "Customer_Info",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Customer_Info varchar(50)",
+                  "Id": "c20"
+              },
+              "c21": {
+                  "Name": "Type",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Type varchar(50)",
+                  "Id": "c21"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c18",
+                  "Desc": false,
+                  "Order": 1
+              },
+              {
+                  "ColId": "c19",
+                  "Desc": false,
+                  "Order": 2
+              }
+          ],
+          "ForeignKeys": [
+              {
+                  "Name": "contact_ibfk_1",
+                  "ColIds": [
+                      "c18"
+                  ],
+                  "ReferTableId": "t3",
+                  "ReferColumnIds": [
+                      "c10"
+                  ],
+                  "Id": "f8"
+              }
+          ],
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table contact",
+          "Id": "t2"
+      },
+      "t3": {
+          "Name": "customer",
+          "ColIds": [
+              "c10",
+              "c11",
+              "c12"
+          ],
+          "ColDefs": {
+              "c10": {
+                  "Name": "ID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: ID int",
+                  "Id": "c10"
+              },
+              "c11": {
+                  "Name": "Name",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: Name varchar(50)",
+                  "Id": "c11"
+              },
+              "c12": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": true,
+                  "Comment": "From: City varchar(50)",
+                  "Id": "c12"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c10",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table customer",
+          "Id": "t3"
+      },
+      "t4": {
+          "Name": "Persons",
+          "ColIds": [
+              "c13",
+              "c14",
+              "c15",
+              "c16",
+              "c17",
+              "c22"
+          ],
+          "ColDefs": {
+              "c13": {
+                  "Name": "PersonID",
+                  "T": {
+                      "Name": "INT64",
+                      "Len": 0,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: PersonID int",
+                  "Id": "c13"
+              },
+              "c14": {
+                  "Name": "LastName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: LastName varchar(255)",
+                  "Id": "c14"
+              },
+              "c15": {
+                  "Name": "FirstName",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: FirstName varchar(255)",
+                  "Id": "c15"
+              },
+              "c16": {
+                  "Name": "Address",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: Address varchar(255)",
+                  "Id": "c16"
+              },
+              "c17": {
+                  "Name": "City",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 255,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "From: City varchar(255)",
+                  "Id": "c17"
+              },
+              "c22": {
+                  "Name": "synth_id",
+                  "T": {
+                      "Name": "STRING",
+                      "Len": 50,
+                      "IsArray": false
+                  },
+                  "NotNull": false,
+                  "Comment": "",
+                  "Id": "c22"
+              }
+          },
+          "PrimaryKeys": [
+              {
+                  "ColId": "c22",
+                  "Desc": false,
+                  "Order": 1
+              }
+          ],
+          "ForeignKeys": null,
+          "Indexes": null,
+          "ParentId": "",
+          "Comment": "Spanner schema for source table Persons",
+          "Id": "t4"
+      }
+  },
+    "SyntheticPKeys": {},
+    "SrcSchema": {
+        "t1": {
+            "Name": "Singers",
+            "Schema": "ui_demo",
+            "ColIds": ["c5", "c6", "c7"],
+            "ColDefs": {
+                "c5": {
+                    "Name": "SingerId",
+                    "Type": {
+                        "Name": "integer"
+                    },
+                    "Id": "c5"
+                },
+                "c6": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "String"
+                    },
+                    "Id": "c6"
+                },
+                "c7": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "String"
+                    },
+                    "Id": "c7"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c5",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "Id": "t1"
+        },
+        "t2": {
+            "Name": "contact",
+            "Schema": "ui_demo",
+            "ColIds": ["c18", "c19", "c20", "c21"],
+            "ColDefs": {
+                "c18": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c18"
+                },
+                "c19": {
+                    "Name": "Customer_Id",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c19"
+                },
+                "c20": {
+                    "Name": "Customer_Info",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c20"
+                },
+                "c21": {
+                    "Name": "Type",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c21"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c18",
+                    "Desc": false,
+                    "Order": 1
+                },
+                {
+                    "ColId": "c19",
+                    "Desc": false,
+                    "Order": 2
+                }
+            ],
+            "Id": "t2"
+        },
+        "t3": {
+            "Name": "customer",
+            "Schema": "ui_demo",
+            "ColIds": ["c10", "c11", "c12"],
+            "ColDefs": {
+                "c10": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c10"
+                },
+                "c11": {
+                    "Name": "Name",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c11"
+                },
+                "c12": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c12"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c10",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "Id": "t3"
+        },
+        "t4": {
+            "Name": "Persons",
+            "Schema": "ui_demo",
+            "ColIds": ["c13", "c14", "c15", "c16", "c17"],
+            "ColDefs": {
+                "c13": {
+                    "Name": "PersonID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c13"
+                },
+                "c14": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c14"
+                },
+                "c15": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c15"
+                },
+                "c16": {
+                    "Name": "Address",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c16"
+                },
+                "c17": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c17"
+                }
+            },
+            "Id": "t4"
+        }
+    }
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json
new file mode 100644
index 0000000000..aeb890d926
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json
@@ -0,0 +1,475 @@
+{
+    "SpSchema": {
+        "t1": {
+            "Name": "Singers",
+            "ColIds": [
+                "c5",
+                "c6"
+            ],
+            "ColDefs": {
+                "c5": {
+                    "Name": "SingerId",
+                    "T": {
+                        "Name": "INT64",
+                        "Len": 0,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: SingerId int",
+                    "Id": "c5"
+                },
+                "c6": {
+                    "Name": "Bday",
+                    "T": {
+                        "Name": "TIMESTAMP",
+                        "Len": 1024,
+                        "IsArray": false
+                    },
+                    "NotNull": false,
+                    "Comment": "From: FirstName varchar(1024)",
+                    "Id": "c6"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c5",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": [
+                {
+                    "Name": "ind1",
+                    "TableId": "t1",
+                    "Unique": false,
+                    "Keys": [
+                        {
+                            "ColId": "c5",
+                            "Desc": false,
+                            "Order": 1
+                        }
+                    ],
+                    "Id": "i9",
+                    "StoredColumnIds": null
+                }
+            ],
+            "ParentId": "",
+            "Comment": "Spanner schema for source table Singers",
+            "Id": "t1"
+        },
+        "t2": {
+            "Name": "contact",
+            "ColIds": [
+                "c18",
+                "c19",
+                "c20",
+                "c21"
+            ],
+            "ColDefs": {
+                "c18": {
+                    "Name": "ID",
+                    "T": {
+                        "Name": "INT64",
+                        "Len": 0,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: ID int",
+                    "Id": "c18"
+                },
+                "c19": {
+                    "Name": "Customer_Id",
+                    "T": {
+                        "Name": "INT64",
+                        "Len": 0,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: Customer_Id int",
+                    "Id": "c19"
+                },
+                "c20": {
+                    "Name": "Customer_Info",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 50,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: Customer_Info varchar(50)",
+                    "Id": "c20"
+                },
+                "c21": {
+                    "Name": "Type",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 50,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: Type varchar(50)",
+                    "Id": "c21"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c18",
+                    "Desc": false,
+                    "Order": 1
+                },
+                {
+                    "ColId": "c19",
+                    "Desc": false,
+                    "Order": 2
+                }
+            ],
+            "ForeignKeys": [
+                {
+                    "Name": "contact_ibfk_1",
+                    "ColIds": [
+                        "c18"
+                    ],
+                    "ReferTableId": "t3",
+                    "ReferColumnIds": [
+                        "c10"
+                    ],
+                    "Id": "f8"
+                }
+            ],
+            "Indexes": null,
+            "ParentId": "",
+            "Comment": "Spanner schema for source table contact",
+            "Id": "t2"
+        },
+        "t3": {
+            "Name": "customer",
+            "ColIds": [
+                "c10",
+                "c11",
+                "c12"
+            ],
+            "ColDefs": {
+                "c10": {
+                    "Name": "ID",
+                    "T": {
+                        "Name": "INT64",
+                        "Len": 0,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: ID int",
+                    "Id": "c10"
+                },
+                "c11": {
+                    "Name": "Name",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 50,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: Name varchar(50)",
+                    "Id": "c11"
+                },
+                "c12": {
+                    "Name": "City",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 50,
+                        "IsArray": false
+                    },
+                    "NotNull": true,
+                    "Comment": "From: City varchar(50)",
+                    "Id": "c12"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c10",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": null,
+            "ParentId": "",
+            "Comment": "Spanner schema for source table customer",
+            "Id": "t3"
+        },
+        "t4": {
+            "Name": "Persons",
+            "ColIds": [
+                "c13",
+                "c14",
+                "c15",
+                "c16",
+                "c17",
+                "c22"
+            ],
+            "ColDefs": {
+                "c13": {
+                    "Name": "PersonID",
+                    "T": {
+                        "Name": "INT64",
+                        "Len": 0,
+                        "IsArray": false
+                    },
+                    "NotNull": false,
+                    "Comment": "From: PersonID int",
+                    "Id": "c13"
+                },
+                "c14": {
+                    "Name": "LastName",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 255,
+                        "IsArray": false
+                    },
+                    "NotNull": false,
+                    "Comment": "From: LastName varchar(255)",
+                    "Id": "c14"
+                },
+                "c15": {
+                    "Name": "FirstName",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 255,
+                        "IsArray": false
+                    },
+                    "NotNull": false,
+                    "Comment": "From: FirstName varchar(255)",
+                    "Id": "c15"
+                },
+                "c16": {
+                    "Name": "Address",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 255,
+                        "IsArray": false
+                    },
+                    "NotNull": false,
+                    "Comment": "From: Address varchar(255)",
+                    "Id": "c16"
+                },
+                "c17": {
+                    "Name": "City",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 255,
+                        "IsArray": false
+                    },
+                    "NotNull": false,
+                    "Comment": "From: City varchar(255)",
+                    "Id": "c17"
+                },
+                "c22": {
+                    "Name": "synth_id",
+                    "T": {
+                        "Name": "STRING",
+                        "Len": 50,
+                        "IsArray": false
+                    },
+                    "NotNull": false,
+                    "Comment": "",
+                    "Id": "c22"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c22",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "ForeignKeys": null,
+            "Indexes": null,
+            "ParentId": "",
+            "Comment": "Spanner schema for source table Persons",
+            "Id": "t4"
+        }
+    },
+    "SyntheticPKeys": {
+        "t4": {
+            "ColId": "c22",
+            "Sequence": 0
+        }
+    },
+    "SrcSchema": {
+        "t1": {
+            "Name": "Singers",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c5",
+                "c6"
+            ],
+            "ColDefs": {
+                "c5": {
+                    "Name": "SingerId",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c5"
+                },
+                "c6": {
+                    "Name": "Bday",
+                    "Type": {
+                        "Name": "timestamp"
+                    },
+                    "Id": "c6"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c5",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "Id": "t1"
+        },
+        "t2": {
+            "Name": "contact",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c18",
+                "c19",
+                "c20",
+                "c21"
+            ],
+            "ColDefs": {
+                "c18": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c18"
+                },
+                "c19": {
+                    "Name": "Customer_Id",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c19"
+                },
+                "c20": {
+                    "Name": "Customer_Info",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c20"
+                },
+                "c21": {
+                    "Name": "Type",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c21"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c18",
+                    "Desc": false,
+                    "Order": 1
+                },
+                {
+                    "ColId": "c19",
+                    "Desc": false,
+                    "Order": 2
+                }
+            ],
+            "Id": "t2"
+        },
+        "t3": {
+            "Name": "customer",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c10",
+                "c11",
+                "c12"
+            ],
+            "ColDefs": {
+                "c10": {
+                    "Name": "ID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c10"
+                },
+                "c11": {
+                    "Name": "Name",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c11"
+                },
+                "c12": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c12"
+                }
+            },
+            "PrimaryKeys": [
+                {
+                    "ColId": "c10",
+                    "Desc": false,
+                    "Order": 1
+                }
+            ],
+            "Id": "t3"
+        },
+        "t4": {
+            "Name": "Persons",
+            "Schema": "ui_demo",
+            "ColIds": [
+                "c13",
+                "c14",
+                "c15",
+                "c16",
+                "c17"
+            ],
+            "ColDefs": {
+                "c13": {
+                    "Name": "PersonID",
+                    "Type": {
+                        "Name": "int"
+                    },
+                    "Id": "c13"
+                },
+                "c14": {
+                    "Name": "LastName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c14"
+                },
+                "c15": {
+                    "Name": "FirstName",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c15"
+                },
+                "c16": {
+                    "Name": "Address",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c16"
+                },
+                "c17": {
+                    "Name": "City",
+                    "Type": {
+                        "Name": "varchar"
+                    },
+                    "Id": "c17"
+                }
+            },
+            "PrimaryKeys": null,
+            "Id": "t4"
+        }
+    }
+}
\ No newline at end of file

From 93eff32287ada5862f1378cc97046fb910289d7a Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 13 Jan 2025 10:41:48 +0530
Subject: [PATCH 11/56] Cassandra pr bug fixes (#57)

---
 .../v2/spanner/migrations/schema/Schema.java  |  7 ---
 .../dbutils/dao/source/CassandraDao.java      |  4 +-
 .../dbutils/dml/CassandraTypeHandler.java     | 55 +------------------
 .../templates/transforms/AssignShardIdFn.java |  5 +-
 4 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
index 597280ed9d..55bd22b9aa 100644
--- a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
+++ b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
@@ -66,13 +66,6 @@ public Schema() {
     this.empty = true;
   }
 
-  public Schema(Map<String, SpannerTable> spSchema, Map<String, SourceTable> srcSchema) {
-    this.spSchema = spSchema;
-    this.srcSchema = srcSchema;
-    this.syntheticPKeys = new HashMap<String, SyntheticPKey>();
-    this.empty = (spSchema == null || srcSchema == null);
-  }
-
   public Schema(
       Map<String, SpannerTable> spSchema,
       Map<String, SyntheticPKey> syntheticPKeys,
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
index 5960a413c2..8ad0cfb972 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
@@ -19,10 +19,10 @@
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
 import com.google.cloud.teleport.v2.templates.dbutils.connection.IConnectionHelper;
+import com.google.cloud.teleport.v2.templates.dbutils.dml.CassandraTypeHandler;
 import com.google.cloud.teleport.v2.templates.exceptions.ConnectionException;
 import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
-import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
 
 public class CassandraDao implements IDao<DMLGeneratorResponse> {
   private final String cassandraUrl;
@@ -51,7 +51,7 @@ public void write(DMLGeneratorResponse dmlGeneratorResponse) throws Exception {
       BoundStatement boundStatement =
           preparedStatement.bind(
               preparedStatementGeneratedResponse.getValues().stream()
-                  .map(PreparedStatementValueObject::value)
+                  .map(v -> CassandraTypeHandler.castToExpectedType(v.dataType(), v.value()))
                   .toArray());
       session.execute(boundStatement);
     }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index b6ba7c0481..974f3670ae 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -85,59 +85,6 @@ public String toString() {
     }
   }
 
-  /**
-   * Functional interface for parsing an object value to a specific type.
-   *
-   * <p>This interface provides a contract to implement type conversion logic where an input object
-   * is parsed and transformed into the desired target type.
-   *
-   * <p>Example usage:
-   *
-   * <pre>{@code
-   * TypeParser<Integer> intParser = value -> Integer.parseInt(value.toString());
-   * Integer parsedValue = intParser.parse("123");
-   * }</pre>
-   *
-   * @param <T> The target type to which the value will be parsed.
-   */
-  @FunctionalInterface
-  public interface TypeParser<T> {
-
-    /**
-     * Parses the given value and converts it into the target type {@code T}.
-     *
-     * @param value The input value to be parsed.
-     * @return The parsed value of type {@code T}.
-     */
-    T parse(Object value);
-  }
-
-  /**
-   * Functional interface for supplying a value with exception handling.
-   *
-   * <p>This interface provides a mechanism to execute logic that may throw a checked exception,
-   * making it useful for methods where exception handling is required.
-   *
-   * <p>Example usage:
-   *
-   * <pre>{@code
-   * HandlerSupplier<String> supplier = () -> {
-   *     if (someCondition) {
-   *         throw new IOException("Error occurred");
-   *     }
-   *     return "Success";
-   * };
-   *
-   * try {
-   *     String result = supplier.get();
-   *     System.out.println(result);
-   * } catch (Exception e) {
-   *     e.printStackTrace();
-   * }
-   * }</pre>
-   *
-   * @param <T> The type of value supplied by the supplier.
-   */
   @FunctionalInterface
   private interface HandlerSupplier<T> {
 
@@ -702,7 +649,7 @@ private static Object handleSpannerColumnType(
 
       default:
         LOG.warn("Unsupported Spanner column type: {}", spannerType);
-        return null;
+        throw new IllegalArgumentException("Unsupported Spanner column type: " + spannerType);
     }
   }
 
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
index ca9bae3781..0afdf3bf8b 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
@@ -181,7 +181,6 @@ public void processElement(ProcessContext c) throws Exception {
     String qualifiedShard = "";
     String tableName = record.getTableName();
     String keysJsonStr = record.getMod().getKeysJson();
-    long finalKey;
 
     try {
       if (shardingMode.equals(Constants.SHARDING_MODE_SINGLE_SHARD)) {
@@ -232,7 +231,7 @@ public void processElement(ProcessContext c) throws Exception {
 
       record.setShard(qualifiedShard);
       String finalKeyString = tableName + "_" + keysJsonStr + "_" + qualifiedShard;
-      finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
+      Long finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
       c.output(KV.of(finalKey, record));
 
     } catch (Exception e) {
@@ -241,7 +240,7 @@ public void processElement(ProcessContext c) throws Exception {
       LOG.error("Error fetching shard Id column: " + e.getMessage() + ": " + errors.toString());
       // The record has no shard hence will be sent to DLQ in subsequent steps
       String finalKeyString = record.getTableName() + "_" + keysJsonStr + "_" + skipDirName;
-      finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
+      Long finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
       c.output(KV.of(finalKey, record));
     }
   }

From 58f33859417e846491b71602faae57af5f9f0867 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Tue, 14 Jan 2025 18:52:33 +0530
Subject: [PATCH 12/56] Cassandra Consolidate Unit Test case and Regression
 testing fixes (#58)

* Added Mapping fixes

* Added Spoltles fixes

* Added Consolidated fixes

* Added TODO

* Addess Data and Time
---
 .../v2/spanner/migrations/schema/Schema.java  |   2 +
 .../dbutils/dml/CassandraTypeHandler.java     | 277 ++++---
 .../processor/InputRecordProcessor.java       |   2 +
 .../dml/CassandraDMLGeneratorTest.java        | 296 ++-----
 .../dbutils/dml/CassandraTypeHandlerTest.java |   8 +-
 .../cassandraAllMatchSession.json             | 716 -----------------
 .../CassandraJson/cassandraBitSession.json    | 170 ----
 ...assandraCoulmnNameTypeMismatchSession.json | 716 -----------------
 .../cassandraErrorSchemaSession.json          | 716 -----------------
 .../cassandraMultiColmPKSession.json          | 122 ---
 .../cassandraPrimarykeyMismatchSession.json   | 716 -----------------
 .../CassandraJson/cassandraQuotesSession.json | 169 ----
 ...draSourceColumnAbsentInSpannerSession.json | 732 ------------------
 .../cassandraSourceNoPkSession.json           | 492 ------------
 ...draSpannerColumnAbsentInSourceSession.json | 534 -------------
 .../cassandraTableNameMismatchSession.json    | 470 -----------
 .../cassandraTimeZoneSession.json             | 475 ------------
 ...typeSession.json => cassandraSession.json} | 576 +++++++++++++-
 18 files changed, 792 insertions(+), 6397 deletions(-)
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json
 delete mode 100644 v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json
 rename v2/spanner-to-sourcedb/src/test/resources/{CassandraJson/cassandraAllDatatypeSession.json => cassandraSession.json} (50%)

diff --git a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
index 55bd22b9aa..c49fcba6a3 100644
--- a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
+++ b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/schema/Schema.java
@@ -77,6 +77,8 @@ public Schema(
     this.srcSchema = srcSchema;
     this.toSpanner = toSpanner;
     this.toSource = toSource;
+    this.srcToID = toSource;
+    this.spannerToID = toSpanner;
     this.empty = (spSchema == null || srcSchema == null);
   }
 
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index 974f3670ae..ac0711aa45 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -27,9 +27,14 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -416,44 +421,6 @@ private static Integer handleCassandraIntType(String colName, JSONObject valuesJ
     }
   }
 
-  /**
-   * Converts an {@link Integer} to a {@code short} (SmallInt).
-   *
-   * <p>This method checks if the {@code integerValue} is within the valid range for a {@code
-   * smallint} (i.e., between {@link Short#MIN_VALUE} and {@link Short#MAX_VALUE}). If the value is
-   * out of range, it throws an {@link IllegalArgumentException}.
-   *
-   * @param integerValue The integer value to be converted.
-   * @return The converted {@code short} value.
-   * @throws IllegalArgumentException If the {@code integerValue} is out of range for a {@code
-   *     smallint}.
-   */
-  private static short convertToSmallInt(Integer integerValue) {
-    if (integerValue < Short.MIN_VALUE || integerValue > Short.MAX_VALUE) {
-      throw new IllegalArgumentException("Value is out of range for smallint.");
-    }
-    return integerValue.shortValue();
-  }
-
-  /**
-   * Converts an {@link Integer} to a {@code byte} (TinyInt).
-   *
-   * <p>This method checks if the {@code integerValue} is within the valid range for a {@code
-   * tinyint} (i.e., between {@link Byte#MIN_VALUE} and {@link Byte#MAX_VALUE}). If the value is out
-   * of range, it throws an {@link IllegalArgumentException}.
-   *
-   * @param integerValue The integer value to be converted.
-   * @return The converted {@code byte} value.
-   * @throws IllegalArgumentException If the {@code integerValue} is out of range for a {@code
-   *     tinyint}.
-   */
-  private static byte convertToTinyInt(Integer integerValue) {
-    if (integerValue < Byte.MIN_VALUE || integerValue > Byte.MAX_VALUE) {
-      throw new IllegalArgumentException("Value is out of range for tinyint.");
-    }
-    return integerValue.byteValue();
-  }
-
   /**
    * Converts a string representation of a timestamp to an {@link Instant} compatible with
    * Cassandra.
@@ -465,18 +432,37 @@ private static byte convertToTinyInt(Integer integerValue) {
    * @return The {@link Instant} representation of the timestamp.
    */
   private static Instant convertToCassandraTimestamp(String timestampValue) {
-    try {
-      return Instant.parse(timestampValue);
-    } catch (DateTimeParseException e) {
+    if (timestampValue == null || timestampValue.trim().isEmpty()) {
+      throw new IllegalArgumentException("Timestamp value cannot be null or empty");
+    }
+
+    List<DateTimeFormatter> formatters =
+        Arrays.asList(
+            DateTimeFormatter.ISO_INSTANT,
+            DateTimeFormatter.ISO_DATE_TIME,
+            DateTimeFormatter.ISO_LOCAL_DATE,
+            DateTimeFormatter.ofPattern("MM/dd/yyyy"),
+            DateTimeFormatter.ofPattern("yyyy/MM/dd"),
+            DateTimeFormatter.ofPattern("dd-MM-yyyy"),
+            DateTimeFormatter.ofPattern("dd/MM/yyyy"),
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"),
+            DateTimeFormatter.ofPattern("MM-dd-yyyy"),
+            DateTimeFormatter.ofPattern("dd MMM yyyy"));
+
+    for (DateTimeFormatter formatter : formatters) {
       try {
-        return ZonedDateTime.parse(timestampValue)
-            .withZoneSameInstant(java.time.ZoneOffset.UTC)
-            .toInstant();
-      } catch (DateTimeParseException nestedException) {
+        TemporalAccessor temporal = formatter.parse(timestampValue);
+        if (temporal.isSupported(ChronoField.INSTANT_SECONDS)) {
+          return Instant.from(temporal);
+        } else if (temporal.isSupported(ChronoField.EPOCH_DAY)) {
+          return LocalDate.from(temporal).atStartOfDay(ZoneOffset.UTC).toInstant();
+        }
+      } catch (DateTimeParseException ignored) {
         throw new IllegalArgumentException(
-            "Failed to parse timestamp value" + timestampValue, nestedException);
+            "Failed to parse timestamp value" + timestampValue, ignored);
       }
     }
+    throw new IllegalArgumentException("Failed to parse timestamp value: " + timestampValue);
   }
 
   /**
@@ -617,39 +603,25 @@ private static <T> T safeHandle(HandlerSupplier<T> supplier) {
    */
   private static Object handleSpannerColumnType(
       String spannerType, String columnName, JSONObject valuesJson) {
-    switch (spannerType) {
-      case "bigint":
-      case "int64":
-        return CassandraTypeHandler.handleCassandraBigintType(columnName, valuesJson);
-
-      case "string":
-        return handleStringType(columnName, valuesJson);
-
-      case "timestamp":
-      case "date":
-      case "datetime":
-        return CassandraTypeHandler.handleCassandraTimestampType(columnName, valuesJson);
-
-      case "boolean":
-        return CassandraTypeHandler.handleCassandraBoolType(columnName, valuesJson);
-
-      case "float64":
-        return CassandraTypeHandler.handleCassandraDoubleType(columnName, valuesJson);
-
-      case "numeric":
-      case "float":
-        return CassandraTypeHandler.handleCassandraFloatType(columnName, valuesJson);
-
-      case "bytes":
-      case "bytes(max)":
-        return CassandraTypeHandler.handleCassandraBlobType(columnName, valuesJson);
-
-      case "integer":
-        return CassandraTypeHandler.handleCassandraIntType(columnName, valuesJson);
-
-      default:
-        LOG.warn("Unsupported Spanner column type: {}", spannerType);
-        throw new IllegalArgumentException("Unsupported Spanner column type: " + spannerType);
+    if (spannerType.contains("int")) {
+      return CassandraTypeHandler.handleCassandraBigintType(columnName, valuesJson);
+    } else if (spannerType.contains("string")) {
+      return handleStringType(columnName, valuesJson);
+    } else if (spannerType.matches("timestamp|date|datetime")) {
+      return CassandraTypeHandler.handleCassandraTimestampType(columnName, valuesJson);
+    } else if ("boolean".equals(spannerType)) {
+      return CassandraTypeHandler.handleCassandraBoolType(columnName, valuesJson);
+    } else if (spannerType.matches("numeric|float")) {
+      return CassandraTypeHandler.handleCassandraFloatType(columnName, valuesJson);
+    } else if (spannerType.contains("float")) {
+      return CassandraTypeHandler.handleCassandraDoubleType(columnName, valuesJson);
+    } else if (spannerType.contains("bytes") || spannerType.contains("blob")) {
+      return CassandraTypeHandler.handleCassandraBlobType(columnName, valuesJson);
+    } else if ("integer".equals(spannerType)) {
+      return CassandraTypeHandler.handleCassandraIntType(columnName, valuesJson);
+    } else {
+      LOG.warn("Unsupported Spanner column type: {}", spannerType);
+      throw new IllegalArgumentException("Unsupported Spanner column type: " + spannerType);
     }
   }
 
@@ -718,30 +690,28 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
         return PreparedStatementValueObject.create(columnType, (String) colValue);
 
       case "bigint":
-        return PreparedStatementValueObject.create(columnType, (Long) colValue);
+      case "int":
+      case "smallint":
+      case "tinyint":
+        return PreparedStatementValueObject.create(
+            columnType, parseNumericType(columnType, colValue));
 
       case "boolean":
-        return PreparedStatementValueObject.create(columnType, (Boolean) colValue);
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> parseBoolean(colValue)));
 
       case "decimal":
-        return PreparedStatementValueObject.create(columnType, (BigDecimal) colValue);
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> parseDecimal(colValue)));
 
       case "double":
-        return PreparedStatementValueObject.create(columnType, (Double) colValue);
-
       case "float":
-        return PreparedStatementValueObject.create(columnType, (Float) colValue);
+        return PreparedStatementValueObject.create(
+            columnType, safeHandle(() -> parseFloatingPoint(columnType, colValue)));
 
       case "inet":
         return PreparedStatementValueObject.create(columnType, (java.net.InetAddress) colValue);
 
-      case "int":
-        return PreparedStatementValueObject.create(columnType, (Integer) colValue);
-
-      case "smallint":
-        return PreparedStatementValueObject.create(
-            columnType, convertToSmallInt((Integer) colValue));
-
       case "time":
       case "timestamp":
       case "datetime":
@@ -749,31 +719,12 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
 
       case "date":
         return PreparedStatementValueObject.create(
-            columnType,
-            safeHandle(
-                () -> {
-                  if (colValue instanceof String) {
-                    return LocalDate.parse((String) colValue);
-                  } else if (colValue instanceof Instant) {
-                    return ((Instant) colValue).atZone(ZoneId.systemDefault()).toLocalDate();
-                  } else if (colValue instanceof Date) {
-                    return ((Date) colValue)
-                        .toInstant()
-                        .atZone(ZoneId.systemDefault())
-                        .toLocalDate();
-                  }
-                  throw new IllegalArgumentException(
-                      "Unsupported value for date conversion: " + colValue);
-                }));
+            columnType, safeHandle(() -> parseDate(colValue)));
 
       case "timeuuid":
       case "uuid":
         return PreparedStatementValueObject.create(columnType, (UUID) colValue);
 
-      case "tinyint":
-        return PreparedStatementValueObject.create(
-            columnType, convertToTinyInt((Integer) colValue));
-
       case "varint":
         return PreparedStatementValueObject.create(columnType, handleCassandraVarintType(colValue));
 
@@ -785,6 +736,108 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
     }
   }
 
+  /**
+   * Parses a numeric value to the corresponding type based on the given column type.
+   *
+   * @param columnType the type of the column (e.g., "bigint", "int", "smallint", "tinyint").
+   * @param colValue the value to parse, either as a {@code String} or a {@code Number}.
+   * @return the parsed numeric value as the appropriate type (e.g., {@code Long}, {@code Integer},
+   *     {@code Short}, {@code Byte}).
+   * @throws IllegalArgumentException if the {@code colValue} type is unsupported or does not match
+   *     the column type.
+   */
+  private static Object parseNumericType(String columnType, Object colValue) {
+    return safeHandle(
+        () -> {
+          if (colValue instanceof String) {
+            switch (columnType) {
+              case "bigint":
+                return Long.parseLong((String) colValue);
+              case "int":
+                return Integer.parseInt((String) colValue);
+              case "smallint":
+                return Short.parseShort((String) colValue);
+              case "tinyint":
+                return Byte.parseByte((String) colValue);
+            }
+          } else if (colValue instanceof Number) {
+            switch (columnType) {
+              case "bigint":
+                return ((Number) colValue).longValue();
+              case "int":
+                return ((Number) colValue).intValue();
+              case "smallint":
+                return ((Number) colValue).shortValue();
+              case "tinyint":
+                return ((Number) colValue).byteValue();
+            }
+          }
+          throw new IllegalArgumentException(
+              "Unsupported type for " + columnType + ": " + colValue.getClass());
+        });
+  }
+
+  /**
+   * Parses a boolean value from the provided input.
+   *
+   * @param colValue the value to parse, either as a {@code String} or a {@code Boolean}.
+   * @return the parsed boolean value.
+   * @throws ClassCastException if the {@code colValue} is not a {@code String} or {@code Boolean}.
+   */
+  private static Boolean parseBoolean(Object colValue) {
+    if (colValue instanceof String) {
+      return Boolean.parseBoolean((String) colValue);
+    }
+    return (Boolean) colValue;
+  }
+
+  /**
+   * Parses a decimal value from the provided input.
+   *
+   * @param colValue the value to parse, either as a {@code String} or a {@code Number}.
+   * @return the parsed decimal value as a {@code BigDecimal}.
+   * @throws NumberFormatException if the {@code colValue} is a {@code String} and cannot be
+   *     converted to {@code BigDecimal}.
+   * @throws ClassCastException if the {@code colValue} is not a {@code String}, {@code Number}, or
+   *     {@code BigDecimal}.
+   */
+  private static BigDecimal parseDecimal(Object colValue) {
+    if (colValue instanceof String) {
+      return new BigDecimal((String) colValue);
+    } else if (colValue instanceof Number) {
+      return BigDecimal.valueOf(((Number) colValue).doubleValue());
+    }
+    return (BigDecimal) colValue;
+  }
+
+  /**
+   * Parses a floating-point value to the corresponding type based on the given column type.
+   *
+   * @param columnType the type of the column (e.g., "double", "float").
+   * @param colValue the value to parse, either as a {@code String} or a {@code Number}.
+   * @return the parsed floating-point value as a {@code Double} or {@code Float}.
+   * @throws IllegalArgumentException if the column type is invalid or the value cannot be parsed.
+   */
+  private static Object parseFloatingPoint(String columnType, Object colValue) {
+    if (colValue instanceof String) {
+      return columnType.equals("double")
+          ? Double.parseDouble((String) colValue)
+          : Float.parseFloat((String) colValue);
+    }
+    return columnType.equals("double") ? (Double) colValue : (Float) colValue;
+  }
+
+  private static LocalDate parseDate(Object colValue) {
+    if (colValue instanceof String) {
+      return LocalDate.parse((String) colValue);
+    } else if (colValue instanceof Instant) {
+      return ((Instant) colValue).atZone(ZoneId.systemDefault()).toLocalDate();
+    } else if (colValue instanceof Date) {
+      return ((Date) colValue).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    }
+    throw new IllegalArgumentException("Unsupported value for date conversion: " + colValue);
+  }
+
   /**
    * Parses a Cassandra list from the given JSON array.
    *
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
index d94496f468..f61eec1c25 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
@@ -105,6 +105,8 @@ public static boolean processRecord(
         LOG.warn("DML statement is empty for table: " + tableName);
         return false;
       }
+      // TODO we need to handle it as proper Interface Level as of now we have handle Prepared
+      // Statement and Raw Statement Differently
       if (source.equals(SOURCE_CASSANDRA)) {
         dao.write(dmlGeneratorResponse);
       } else {
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
index 6b93bbc287..6dff8c230d 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
@@ -89,11 +89,9 @@ public void testGetDMLStatement_MissingTableMapping() {
 
   @Test
   public void tableAndAllColumnNameTypesMatch() {
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    String newValuesString = "{\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"SingerId\":\"999\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -109,16 +107,14 @@ public void tableAndAllColumnNameTypesMatch() {
     String sql = dmlGeneratorResponse.getDmlStatement();
 
     assertTrue(sql.contains("SingerId"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void tableNameMismatchAllColumnNameTypesMatch() {
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "leChanteur";
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
+    String newValuesString = "{\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"SingerId\":\"999\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -132,19 +128,14 @@ public void tableNameMismatchAllColumnNameTypesMatch() {
                 .setSchema(schema)
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
-
-    assertTrue(sql.contains("SingerId"));
-    assertTrue(sql.contains("LastName"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals("", sql);
   }
 
   @Test
   public void tableNameMatchColumnNameTypeMismatch() {
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
-    String newValuesString = "{\"FirstName\":\"John\",\"LastName\":\"ll\"}";
+    String newValuesString = "{\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"SingerId\":\"999\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -159,16 +150,14 @@ public void tableNameMatchColumnNameTypeMismatch() {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
-    assertTrue(sql.contains("FirstName"));
+    assertTrue(sql.contains("SingerId"));
     assertTrue(sql.contains("LastName"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void tableNameMatchSourceColumnNotPresentInSpanner() {
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -185,17 +174,14 @@ public void tableNameMatchSourceColumnNotPresentInSpanner() {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
-    assertTrue(sql.contains("FirstName"));
     assertTrue(sql.contains("LastName"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void tableNameMatchSpannerColumnNotPresentInSource() {
 
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"hb_shardId\":\"shardA\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -212,15 +198,13 @@ public void tableNameMatchSpannerColumnNotPresentInSource() {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
-    assertTrue(sql.contains("FirstName"));
     assertTrue(sql.contains("LastName"));
     assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void primaryKeyNotFoundInJson() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -242,12 +226,11 @@ public void primaryKeyNotFoundInJson() {
 
   @Test
   public void primaryKeyNotPresentInSourceSchema() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraSourceNoPkSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"SingerId\":\"999\"}";
+    String keyValueString = "{\"musicId\":\"999\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
     String modType = "INSERT";
 
@@ -265,9 +248,7 @@ public void primaryKeyNotPresentInSourceSchema() {
 
   @Test
   public void primaryKeyMismatch() {
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"SingerId\":\"999\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -286,13 +267,12 @@ public void primaryKeyMismatch() {
 
     assertTrue(sql.contains("SingerId"));
     assertTrue(sql.contains("LastName"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void updateToNull() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":null}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -310,14 +290,12 @@ public void updateToNull() {
     String sql = dmlGeneratorResponse.getDmlStatement();
 
     assertTrue(sql.contains("SingerId"));
-    assertTrue(sql.contains("FirstName"));
-    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void deleteMultiplePKColumns() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraMultiColmPKSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"LastName\":null}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -338,8 +316,7 @@ public void deleteMultiplePKColumns() {
 
   @Test
   public void testSingleQuoteMatch() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"k\u0027k\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -356,18 +333,16 @@ public void testSingleQuoteMatch() {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
-    assertTrue(sql.contains("FirstName"));
     assertTrue(sql.contains("LastName"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void singleQuoteBytesDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"Jw\u003d\u003d\",\"varchar_column\":\"\u0027\",}";
+    String newValuesString = "{\"blob_column\":\"Jw\u003d\u003d\",\"string_column\":\"\u0027\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -381,16 +356,15 @@ public void singleQuoteBytesDML() throws Exception {
                 .setSchema(schema)
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void testParseBlobType_hexString() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"0102030405\",\"varchar_column\":\"\u0027\",}";
+    String newValuesString = "{\"blob_column\":\"0102030405\",\"string_column\":\"\u0027\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -404,16 +378,15 @@ public void testParseBlobType_hexString() {
                 .setSchema(schema)
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void testParseBlobType_base64String() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"AQIDBAU=\",\"varchar_column\":\"\u0027\",}";
+    String newValuesString = "{\"blob_column\":\"AQIDBAU=\",\"string_column\":\"\u0027\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -427,16 +400,15 @@ public void testParseBlobType_base64String() {
                 .setSchema(schema)
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void twoSingleEscapedQuoteDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"Jyc\u003d\",\"varchar_column\":\"\u0027\u0027\",}";
+    String newValuesString = "{\"blob_column\":\"Jyc\u003d\",\"string_column\":\"\u0027\u0027\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -451,16 +423,15 @@ public void twoSingleEscapedQuoteDML() throws Exception {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
     assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void threeEscapesAndSingleQuoteDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"XCc\u003d\",\"varchar_column\":\"\\\\\\\u0027\",}";
+    String newValuesString = "{\"blob_column\":\"XCc\u003d\",\"string_column\":\"\\\\\\\u0027\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -476,16 +447,15 @@ public void threeEscapesAndSingleQuoteDML() throws Exception {
     String sql = dmlGeneratorResponse.getDmlStatement();
 
     assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void tabEscapeDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"CQ==\",\"varchar_column\":\"\\t\",}";
+    String newValuesString = "{\"blob_column\":\"CQ==\",\"string_column\":\"\\t\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -501,16 +471,15 @@ public void tabEscapeDML() throws Exception {
     String sql = dmlGeneratorResponse.getDmlStatement();
 
     assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void backSpaceEscapeDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"CA==\",\"varchar_column\":\"\\b\",}";
+    String newValuesString = "{\"blob_column\":\"CA==\",\"string_column\":\"\\b\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -526,117 +495,15 @@ public void backSpaceEscapeDML() throws Exception {
     String sql = dmlGeneratorResponse.getDmlStatement();
 
     assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void newLineEscapeDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
-
-    String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"Cg==\",\"varchar_column\":\"\\n\",}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"id\":\"12\"}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-
-    assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
-  }
-
-  @Test
-  public void carriageReturnEscapeDML() throws Exception {
-
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
-
-    String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"DQ==\",\"varchar_column\":\"\\r\",}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"id\":\"12\"}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-
-    assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
-  }
-
-  @Test
-  public void formFeedEscapeDML() throws Exception {
-
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
-
-    String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"DA==\",\"varchar_column\":\"\\f\",}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"id\":\"12\"}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-    assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
-  }
-
-  @Test
-  public void doubleQuoteEscapeDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
-
-    String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"Ig==\",\"varchar_column\":\"\\\"\",}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"id\":\"12\"}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-
-    assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
-  }
-
-  @Test
-  public void backSlashEscapeDML() throws Exception {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
 
     String tableName = "sample_table";
-    String newValuesString = "{\"blob_column\":\"XA==\",\"varchar_column\":\"\\\\\",}";
+    String newValuesString = "{\"blob_column\":\"Cg==\",\"string_column\":\"\\n\",}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
     String keyValueString = "{\"id\":\"12\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -652,13 +519,12 @@ public void backSlashEscapeDML() throws Exception {
     String sql = dmlGeneratorResponse.getDmlStatement();
 
     assertTrue(sql.contains("sample_table"));
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void bitColumnSql() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraBitSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"YmlsX2NvbA\u003d\u003d\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -675,15 +541,13 @@ public void bitColumnSql() {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
-    assertTrue(sql.contains("FirstName"));
     assertTrue(sql.contains("LastName"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void testSpannerTableNotInSchema() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "SomeRandomTableNotInSchema";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -705,8 +569,7 @@ public void testSpannerTableNotInSchema() {
 
   @Test
   public void testSpannerKeyIsNull() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -723,40 +586,13 @@ public void testSpannerKeyIsNull() {
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
-    assertTrue(sql.contains("FirstName"));
     assertTrue(sql.contains("LastName"));
-    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
-  }
-
-  @Test
-  public void testKeyInNewValuesJson() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
-    String tableName = "Singers";
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"SingerId\":null}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"SmthingElse\":null}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-
-    assertTrue(sql.contains("FirstName"));
-    assertTrue(sql.contains("LastName"));
-    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void testSourcePKNotInSpanner() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "customer";
     String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -778,9 +614,7 @@ public void testSourcePKNotInSpanner() {
 
   @Test
   public void primaryKeyMismatchSpannerNull() {
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"SingerId\":\"999\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -804,8 +638,7 @@ public void primaryKeyMismatchSpannerNull() {
 
   @Test
   public void testUnsupportedModType() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -827,9 +660,7 @@ public void testUnsupportedModType() {
 
   @Test
   public void testUpdateModType() {
-    Schema schema =
-        SessionFileReader.read(
-            "src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -847,15 +678,13 @@ public void testUpdateModType() {
     String sql = dmlGeneratorResponse.getDmlStatement();
 
     assertTrue(sql.contains("SingerId"));
-    assertTrue(sql.contains("FirstName"));
     assertTrue(sql.contains("LastName"));
-    assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
   public void testSpannerTableIdMismatch() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraErrorSchemaSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -876,8 +705,7 @@ public void testSpannerTableIdMismatch() {
 
   @Test
   public void testSourcePkNull() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraErrorSchemaSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Persons";
     String newValuesString = "{\"Does\":\"not\",\"matter\":\"junk\"}";
     JSONObject newValuesJson = new JSONObject(newValuesString);
@@ -921,8 +749,7 @@ public void testSourceTableNotInSchema() {
 
   @Test
   public void testSpannerTableNotInSchemaObject() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
     schema.getSpSchema().remove(schema.getSpannerToID().get(tableName).getName());
     String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\",\"SingerId\":null}";
@@ -945,8 +772,7 @@ public void testSpannerTableNotInSchemaObject() {
 
   @Test
   public void testSpannerColDefsNull() {
-    Schema schema =
-        SessionFileReader.read("src/test/resources/CassandraJson/cassandraAllMatchSession.json");
+    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
     String tableName = "Singers";
 
     String spannerTableId = schema.getSpannerToID().get(tableName).getName();
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index 153e7c5565..f1af3a6c67 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -536,7 +536,7 @@ public void testCastToExpectedTypeForFloat() {
 
     Object result = castToExpectedType(cassandraType, columnValue);
 
-    assertEquals(columnValue, result);
+    assertEquals(columnValue, ((Double) result).floatValue(), 0.00001);
   }
 
   @Test
@@ -655,11 +655,11 @@ public void testCastToExpectedTypeForJSONArrayToSet() {
   public void testCastToExpectedTypeForJSONObjectToMap() {
     String cassandraType = "map<int, text>";
     JSONObject columnValue = new JSONObject();
-    columnValue.put(String.valueOf(1), "One");
+    columnValue.put("2024-12-12", "One");
     columnValue.put(String.valueOf(2), "Two");
 
     assertThrows(
-        ClassCastException.class,
+        IllegalArgumentException.class,
         () -> {
           castToExpectedType(cassandraType, columnValue);
         });
@@ -673,7 +673,7 @@ public void testCastToExpectedTypeForExceptionScenario() {
     mockLogging(new ClassCastException("Invalid cast"));
 
     assertThrows(
-        ClassCastException.class,
+        IllegalArgumentException.class,
         () -> {
           castToExpectedType(cassandraType, columnValue);
         });
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json
deleted file mode 100644
index 59963be47c..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json
+++ /dev/null
@@ -1,716 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Id int",
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Info varchar(50)",
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Type varchar(50)",
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table contact",
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Name varchar(50)",
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: City varchar(50)",
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table customer",
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17",
-              "c22"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: PersonID int",
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(255)",
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(255)",
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: Address varchar(255)",
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: City varchar(255)",
-                  "Id": "c17"
-              },
-              "c22": {
-                  "Name": "synth_id",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "",
-                  "Id": "c22"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c22",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Persons",
-          "Id": "t4"
-      }
-  },
-  "SyntheticPKeys": {
-      "t4": {
-          "ColId": "c22",
-          "Sequence": 0
-      }
-  },
-  "SrcSchema": {
-      "t1": {
-          "Name": "Singers",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "Type": {
-                      "Name": "integer",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "String",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "String",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "OnDelete": "",
-                  "OnUpdate": "",
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c17"
-              }
-          },
-          "PrimaryKeys": null,
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t4"
-      }
-  }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json
deleted file mode 100644
index 2c5fb13437..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "BYTES",
-                      "Len": 9223372036854775807,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      }
-  },
-  "SyntheticPKeys": {
-      
-  },
-  "SrcSchema": {
-      "t1": {
-          "Name": "Singers",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "Type": {
-                      "Name": "integer",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "String",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "String",
-                      "Mods":[7],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "Id": "t1"
-      }
-  }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json
deleted file mode 100644
index e1255873c5..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json
+++ /dev/null
@@ -1,716 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Id int",
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Info varchar(50)",
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Type varchar(50)",
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table contact",
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Name varchar(50)",
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: City varchar(50)",
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table customer",
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17",
-              "c22"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: PersonID int",
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(255)",
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(255)",
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: Address varchar(255)",
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: City varchar(255)",
-                  "Id": "c17"
-              },
-              "c22": {
-                  "Name": "synth_id",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "",
-                  "Id": "c22"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c22",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Persons",
-          "Id": "t4"
-      }
-  },
-  "SyntheticPKeys": {
-      "t4": {
-          "ColId": "c22",
-          "Sequence": 0
-      }
-  },
-  "SrcSchema": {
-      "t1": {
-          "Name": "Singers",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "Type": {
-                      "Name": "integer",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "STRING",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "String",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "OnDelete": "",
-                  "OnUpdate": "",
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c17"
-              }
-          },
-          "PrimaryKeys": null,
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t4"
-      }
-  }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json
deleted file mode 100644
index 12729a1768..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraErrorSchemaSession.json
+++ /dev/null
@@ -1,716 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "junk"
-      },
-      "t2": {
-          "Name": "contact",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Id int",
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Info varchar(50)",
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Type varchar(50)",
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table contact",
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Name varchar(50)",
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: City varchar(50)",
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c11",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table customer",
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17",
-              "c22"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: PersonID int",
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(255)",
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(255)",
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: Address varchar(255)",
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: City varchar(255)",
-                  "Id": "c17"
-              },
-              "c22": {
-                  "Name": "synth_id",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "",
-                  "Id": "c22"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c22",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Persons",
-          "Id": "t4"
-      }
-  },
-  "SyntheticPKeys": {
-      "t4": {
-          "ColId": "c22",
-          "Sequence": 0
-      }
-  },
-  "SrcSchema": {
-      "t1": {
-          "Name": "Singers",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "OnDelete": "",
-                  "OnUpdate": "",
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c17"
-              }
-          },
-          "PrimaryKeys": [],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t4"
-      }
-  }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json
deleted file mode 100644
index 18d5ff9b23..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraMultiColmPKSession.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "SyntheticPKeys": {},
-     "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "int64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "varchar",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "varchar",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      }
-  },
-    "SrcSchema": {
-        "t1": {
-            "Name": "Singers",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c5",
-                "c6",
-                "c7"
-            ],
-            "ColDefs": {
-                "c5": {
-                    "Name": "SingerId",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c5"
-                },
-                "c6": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c6"
-                },
-                "c7": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c7"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c5",
-                    "Desc": false,
-                    "Order": 1
-                },
-                {
-                    "ColId": "c6",
-                    "Desc": false,
-                    "Order": 2
-                }
-            ],
-            "Id": "t1"
-        }
-    }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json
deleted file mode 100644
index 47daece7f3..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json
+++ /dev/null
@@ -1,716 +0,0 @@
-{
-  "SpSchema": {
-    "t1": {
-      "Name": "Singers",
-      "ColIds": [
-        "c5",
-        "c6",
-        "c7"
-      ],
-      "ColDefs": {
-        "c5": {
-          "Name": "SingerId",
-          "T": {
-            "Name": "INT64",
-            "Len": 0,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: SingerId int",
-          "Id": "c5"
-        },
-        "c6": {
-          "Name": "FirstName",
-          "T": {
-            "Name": "STRING",
-            "Len": 1024,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: FirstName varchar(1024)",
-          "Id": "c6"
-        },
-        "c7": {
-          "Name": "LastName",
-          "T": {
-            "Name": "STRING",
-            "Len": 1024,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: LastName varchar(1024)",
-          "Id": "c7"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "c6",
-          "Desc": false,
-          "Order": 1
-        }
-      ],
-      "ForeignKeys": null,
-      "Indexes": [
-        {
-          "Name": "ind1",
-          "TableId": "t1",
-          "Unique": false,
-          "Keys": [
-            {
-              "ColId": "c5",
-              "Desc": false,
-              "Order": 1
-            }
-          ],
-          "Id": "i9",
-          "StoredColumnIds": null
-        }
-      ],
-      "ParentId": "",
-      "Comment": "Spanner schema for source table Singers",
-      "Id": "t1"
-    },
-    "t2": {
-      "Name": "contact",
-      "ColIds": [
-        "c18",
-        "c19",
-        "c20",
-        "c21"
-      ],
-      "ColDefs": {
-        "c18": {
-          "Name": "ID",
-          "T": {
-            "Name": "INT64",
-            "Len": 0,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: ID int",
-          "Id": "c18"
-        },
-        "c19": {
-          "Name": "Customer_Id",
-          "T": {
-            "Name": "INT64",
-            "Len": 0,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: Customer_Id int",
-          "Id": "c19"
-        },
-        "c20": {
-          "Name": "Customer_Info",
-          "T": {
-            "Name": "STRING",
-            "Len": 50,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: Customer_Info varchar(50)",
-          "Id": "c20"
-        },
-        "c21": {
-          "Name": "Type",
-          "T": {
-            "Name": "STRING",
-            "Len": 50,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: Type varchar(50)",
-          "Id": "c21"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "c18",
-          "Desc": false,
-          "Order": 1
-        },
-        {
-          "ColId": "c19",
-          "Desc": false,
-          "Order": 2
-        }
-      ],
-      "ForeignKeys": [
-        {
-          "Name": "contact_ibfk_1",
-          "ColIds": [
-            "c18"
-          ],
-          "ReferTableId": "t3",
-          "ReferColumnIds": [
-            "c10"
-          ],
-          "Id": "f8"
-        }
-      ],
-      "Indexes": null,
-      "ParentId": "",
-      "Comment": "Spanner schema for source table contact",
-      "Id": "t2"
-    },
-    "t3": {
-      "Name": "customer",
-      "ColIds": [
-        "c10",
-        "c11",
-        "c12"
-      ],
-      "ColDefs": {
-        "c10": {
-          "Name": "ID",
-          "T": {
-            "Name": "INT64",
-            "Len": 0,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: ID int",
-          "Id": "c10"
-        },
-        "c11": {
-          "Name": "Name",
-          "T": {
-            "Name": "STRING",
-            "Len": 50,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: Name varchar(50)",
-          "Id": "c11"
-        },
-        "c12": {
-          "Name": "City",
-          "T": {
-            "Name": "STRING",
-            "Len": 50,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: City varchar(50)",
-          "Id": "c12"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "c10",
-          "Desc": false,
-          "Order": 1
-        }
-      ],
-      "ForeignKeys": null,
-      "Indexes": null,
-      "ParentId": "",
-      "Comment": "Spanner schema for source table customer",
-      "Id": "t3"
-    },
-    "t4": {
-      "Name": "Persons",
-      "ColIds": [
-        "c13",
-        "c14",
-        "c15",
-        "c16",
-        "c17",
-        "c22"
-      ],
-      "ColDefs": {
-        "c13": {
-          "Name": "PersonID",
-          "T": {
-            "Name": "INT64",
-            "Len": 0,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: PersonID int",
-          "Id": "c13"
-        },
-        "c14": {
-          "Name": "LastName",
-          "T": {
-            "Name": "STRING",
-            "Len": 255,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: LastName varchar(255)",
-          "Id": "c14"
-        },
-        "c15": {
-          "Name": "FirstName",
-          "T": {
-            "Name": "STRING",
-            "Len": 255,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: FirstName varchar(255)",
-          "Id": "c15"
-        },
-        "c16": {
-          "Name": "Address",
-          "T": {
-            "Name": "STRING",
-            "Len": 255,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: Address varchar(255)",
-          "Id": "c16"
-        },
-        "c17": {
-          "Name": "City",
-          "T": {
-            "Name": "STRING",
-            "Len": 255,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: City varchar(255)",
-          "Id": "c17"
-        },
-        "c22": {
-          "Name": "synth_id",
-          "T": {
-            "Name": "STRING",
-            "Len": 50,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "",
-          "Id": "c22"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "c22",
-          "Desc": false,
-          "Order": 1
-        }
-      ],
-      "ForeignKeys": null,
-      "Indexes": null,
-      "ParentId": "",
-      "Comment": "Spanner schema for source table Persons",
-      "Id": "t4"
-    }
-  },
-  "SyntheticPKeys": {
-    "t4": {
-      "ColId": "c22",
-      "Sequence": 0
-    }
-  },
-  "SrcSchema": {
-    "t1": {
-      "Name": "Singers",
-      "Schema": "ui_demo",
-      "ColIds": [
-        "c5",
-        "c6",
-        "c7"
-      ],
-      "ColDefs": {
-        "c5": {
-          "Name": "SingerId",
-          "Type": {
-            "Name": "integer",
-            "Mods": null,
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c5"
-        },
-        "c6": {
-          "Name": "FirstName",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              1024
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c6"
-        },
-        "c7": {
-          "Name": "LastName",
-          "Type": {
-            "Name": "String",
-            "Mods": [
-              1024
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c7"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "c5",
-          "Desc": false,
-          "Order": 1
-        }
-      ],
-      "ForeignKeys": null,
-      "Indexes": [
-        {
-          "Name": "ind1",
-          "Unique": false,
-          "Keys": [
-            {
-              "ColId": "c5",
-              "Desc": false,
-              "Order": 1
-            }
-          ],
-          "Id": "i9",
-          "StoredColumnIds": null
-        }
-      ],
-      "Id": "t1"
-    },
-    "t2": {
-      "Name": "contact",
-      "Schema": "ui_demo",
-      "ColIds": [
-        "c18",
-        "c19",
-        "c20",
-        "c21"
-      ],
-      "ColDefs": {
-        "c18": {
-          "Name": "ID",
-          "Type": {
-            "Name": "int",
-            "Mods": null,
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c18"
-        },
-        "c19": {
-          "Name": "Customer_Id",
-          "Type": {
-            "Name": "int",
-            "Mods": null,
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c19"
-        },
-        "c20": {
-          "Name": "Customer_Info",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              50
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c20"
-        },
-        "c21": {
-          "Name": "Type",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              50
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c21"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "c18",
-          "Desc": false,
-          "Order": 1
-        },
-        {
-          "ColId": "c19",
-          "Desc": false,
-          "Order": 2
-        }
-      ],
-      "ForeignKeys": [
-        {
-          "Name": "contact_ibfk_1",
-          "ColIds": [
-            "c18"
-          ],
-          "ReferTableId": "t3",
-          "ReferColumnIds": [
-            "c10"
-          ],
-          "OnDelete": "",
-          "OnUpdate": "",
-          "Id": "f8"
-        }
-      ],
-      "Indexes": null,
-      "Id": "t2"
-    },
-    "t3": {
-      "Name": "customer",
-      "Schema": "ui_demo",
-      "ColIds": [
-        "c10",
-        "c11",
-        "c12"
-      ],
-      "ColDefs": {
-        "c10": {
-          "Name": "ID",
-          "Type": {
-            "Name": "int",
-            "Mods": null,
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c10"
-        },
-        "c11": {
-          "Name": "Name",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              50
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c11"
-        },
-        "c12": {
-          "Name": "City",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              50
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c12"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "c10",
-          "Desc": false,
-          "Order": 1
-        }
-      ],
-      "ForeignKeys": null,
-      "Indexes": null,
-      "Id": "t3"
-    },
-    "t4": {
-      "Name": "Persons",
-      "Schema": "ui_demo",
-      "ColIds": [
-        "c13",
-        "c14",
-        "c15",
-        "c16",
-        "c17"
-      ],
-      "ColDefs": {
-        "c13": {
-          "Name": "PersonID",
-          "Type": {
-            "Name": "int",
-            "Mods": null,
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c13"
-        },
-        "c14": {
-          "Name": "LastName",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              255
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c14"
-        },
-        "c15": {
-          "Name": "FirstName",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              255
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c15"
-        },
-        "c16": {
-          "Name": "Address",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              255
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c16"
-        },
-        "c17": {
-          "Name": "City",
-          "Type": {
-            "Name": "varchar",
-            "Mods": [
-              255
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c17"
-        }
-      },
-      "PrimaryKeys": null,
-      "ForeignKeys": null,
-      "Indexes": null,
-      "Id": "t4"
-    }
-  }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json
deleted file mode 100644
index 50b021cbb8..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  "SpSchema": {
-    "sample_table": {
-      "Name": "sample_table",
-      "ColIds": [
-        "id",
-        "varchar_column",
-        "blob_column"  
-      ],
-      "ColDefs": {
-        
-        "blob_column": {
-          "Name": "blob_column",
-          "T": {
-            "Name": "blob",
-            "Len": 9223372036854776000,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: blob_column blob(65535)",
-          "Id": "c11"
-        },
-        "id": {
-          "Name": "id",
-          "T": {
-            "Name": "bigint",
-            "Len": 0,
-            "IsArray": false
-          },
-          "NotNull": true,
-          "Comment": "From: id int",
-          "Id": "c2"
-        },
-        "varchar_column": {
-          "Name": "varchar_column",
-          "T": {
-            "Name": "varchar",
-            "Len": 20,
-            "IsArray": false
-          },
-          "NotNull": false,
-          "Comment": "From: varchar_column varchar(20)",
-          "Id": "c21"
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "id",
-          "Desc": false,
-          "Order": 1
-        }
-      ],
-      "ForeignKeys": null,
-      "Indexes": null,
-      "Parent": "",
-      "Comment": "Spanner schema for source table sample_table",
-      "Id": "t1"
-    }
-  },
-  "SyntheticPKeys": {},
-  "SrcSchema": {
-    "sample_table": {
-      "Name": "sample_table",
-      "Schema": "test",
-      "ColIds": [
-        "id",
-        "varchar_column",       
-        "blob_column" 
-      ],
-      "ColDefs": {
-        
-        "blob_column": {
-          "Name": "blob_column",
-          "Type": {
-            "Name": "blob",
-            "Mods": [
-              65535
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": true,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c11"
-        },
-       
-        "id": {
-          "Name": "id",
-          "Type": {
-            "Name": "integer",
-            "Mods": null,
-            "ArrayBounds": null
-          },
-          "NotNull": true,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": false,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c2"
-        },
-       
-        "varchar_column": {
-          "Name": "varchar_column",
-          "Type": {
-            "Name": "String",
-            "Mods": [
-              20
-            ],
-            "ArrayBounds": null
-          },
-          "NotNull": false,
-          "Ignored": {
-            "Check": false,
-            "Identity": false,
-            "Default": true,
-            "Exclusion": false,
-            "ForeignKey": false,
-            "AutoIncrement": false
-          },
-          "Id": "c21"
-        
-        }
-      },
-      "PrimaryKeys": [
-        {
-          "ColId": "id",
-          "Desc": false,
-          "Order": 1
-        }
-      ],
-      "ForeignKeys": null,
-      "Indexes": null,
-      "Id": "t1"
-    }
-  },
-  "ToSpanner": {
-    "sample_table": {
-      "Name": "sample_table",
-      "Cols": {        
-        "blob_column": "blob_column",      
-        "id": "id",      
-        "varchar_column": "varchar_column"
-      }
-    }
-  },
-  "ToSource": {
-    "sample_table": {
-      "Name": "sample_table",
-      "Cols": {
-       
-        "blob_column": "blob_column",
-       
-        "id": "id",
-       
-        "varchar_column": "varchar_column"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json
deleted file mode 100644
index c6717b7ae6..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json
+++ /dev/null
@@ -1,732 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Id int",
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Info varchar(50)",
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Type varchar(50)",
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table contact",
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Name varchar(50)",
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: City varchar(50)",
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table customer",
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17",
-              "c22"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: PersonID int",
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(255)",
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(255)",
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: Address varchar(255)",
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: City varchar(255)",
-                  "Id": "c17"
-              },
-              "c22": {
-                  "Name": "synth_id",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "",
-                  "Id": "c22"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c22",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Persons",
-          "Id": "t4"
-      }
-  },
-    "SyntheticPKeys": {},
-  "SrcSchema": {
-      "t1": {
-          "Name": "Singers",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7",
-              "c8"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "Type": {
-                      "Name": "integer",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "String",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "String",
-                      "Mods": [
-                          1024
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c7"
-              },
-              "c8": {
-                "Name": "Age",
-                "Type": {
-                    "Name": "varchar",
-                    "Mods": [
-                        1024
-                    ],
-                    "ArrayBounds": null
-                },
-                "NotNull": false,
-                "Ignored": {
-                    "Check": false,
-                    "Identity": false,
-                    "Default": false,
-                    "Exclusion": false,
-                    "ForeignKey": false,
-                    "AutoIncrement": false
-                },
-                "Id": "c8"
-            }              
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "OnDelete": "",
-                  "OnUpdate": "",
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          50
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": true,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "Schema": "ui_demo",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "Type": {
-                      "Name": "int",
-                      "Mods": null,
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "Type": {
-                      "Name": "varchar",
-                      "Mods": [
-                          255
-                      ],
-                      "ArrayBounds": null
-                  },
-                  "NotNull": false,
-                  "Ignored": {
-                      "Check": false,
-                      "Identity": false,
-                      "Default": false,
-                      "Exclusion": false,
-                      "ForeignKey": false,
-                      "AutoIncrement": false
-                  },
-                  "Id": "c17"
-              }
-          },
-          "PrimaryKeys": null,
-          "ForeignKeys": null,
-          "Indexes": null,
-          "Id": "t4"
-      }
-  }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json
deleted file mode 100644
index 6198e6ae74..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceNoPkSession.json
+++ /dev/null
@@ -1,492 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Id int",
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Info varchar(50)",
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Type varchar(50)",
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table contact",
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Name varchar(50)",
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: City varchar(50)",
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table customer",
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17",
-              "c22"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: PersonID int",
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(255)",
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(255)",
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: Address varchar(255)",
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: City varchar(255)",
-                  "Id": "c17"
-              },
-              "c22": {
-                  "Name": "synth_id",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "",
-                  "Id": "c22"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c22",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Persons",
-          "Id": "t4"
-      }
-  },
-    "SyntheticPKeys": {},
-    "SrcSchema": {
-        "t1": {
-            "Name": "Singers",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c5",
-                "c6",
-                "c7"
-            ],
-            "ColDefs": {
-                "c5": {
-                    "Name": "SingerId",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c5"
-                },
-                "c6": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c6"
-                },
-                "c7": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c7"
-                }
-            },
-            "PrimaryKeys": null,
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t1"
-        },
-        "t2": {
-            "Name": "contact",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c18",
-                "c19",
-                "c20",
-                "c21"
-            ],
-            "ColDefs": {
-                "c18": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c18"
-                },
-                "c19": {
-                    "Name": "Customer_Id",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c19"
-                },
-                "c20": {
-                    "Name": "Customer_Info",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c20"
-                },
-                "c21": {
-                    "Name": "Type",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c21"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c18",
-                    "Desc": false,
-                    "Order": 1
-                },
-                {
-                    "ColId": "c19",
-                    "Desc": false,
-                    "Order": 2
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t2"
-        },
-        "t3": {
-            "Name": "customer",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c10",
-                "c11",
-                "c12"
-            ],
-            "ColDefs": {
-                "c10": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c10"
-                },
-                "c11": {
-                    "Name": "Name",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c11"
-                },
-                "c12": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c12"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c10",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t3"
-        },
-        "t4": {
-            "Name": "Persons",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c13",
-                "c14",
-                "c15",
-                "c16",
-                "c17"
-            ],
-            "ColDefs": {
-                "c13": {
-                    "Name": "PersonID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c13"
-                },
-                "c14": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c14"
-                },
-                "c15": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c15"
-                },
-                "c16": {
-                    "Name": "Address",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c16"
-                },
-                "c17": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c17"
-                }
-            },
-            "PrimaryKeys": null,
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t4"
-        }
-    }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json
deleted file mode 100644
index 6a4342b67e..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json
+++ /dev/null
@@ -1,534 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "Singers",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7",
-              "c8"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              },
-              "c8": {
-                "Name": "hb_shardId",
-                "T": {
-                    "Name": "STRING",
-                    "Len": 1024,
-                    "IsArray": false
-                },
-                "NotNull": false,
-                "Comment": "HB shard id",
-                "Id": "c8"
-            }              
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Id int",
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Info varchar(50)",
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Type varchar(50)",
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table contact",
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Name varchar(50)",
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: City varchar(50)",
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table customer",
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17",
-              "c22"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: PersonID int",
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(255)",
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(255)",
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: Address varchar(255)",
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: City varchar(255)",
-                  "Id": "c17"
-              },
-              "c22": {
-                  "Name": "synth_id",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "",
-                  "Id": "c22"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c22",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Persons",
-          "Id": "t4"
-      }
-  },
-    "SyntheticPKeys": {},
-    "SrcSchema": {
-        "t1": {
-            "Name": "Singers",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c5",
-                "c6",
-                "c7"
-            ],
-            "ColDefs": {
-                "c5": {
-                    "Name": "SingerId",
-                    "Type": {
-                        "Name": "integer"
-                    },
-                    "Id": "c5"
-                },
-                "c6": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "String"
-                    },
-                    "Id": "c6"
-                },
-                "c7": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "String"
-                    },
-                    "Id": "c7"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c5",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t1"
-        },
-        "t2": {
-            "Name": "contact",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c18",
-                "c19",
-                "c20",
-                "c21"
-            ],
-            "ColDefs": {
-                "c18": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c18"
-                },
-                "c19": {
-                    "Name": "Customer_Id",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c19"
-                },
-                "c20": {
-                    "Name": "Customer_Info",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            50
-                        ]
-                    },
-                    "Id": "c20"
-                },
-                "c21": {
-                    "Name": "Type",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            50
-                        ]
-                    },
-                    "Id": "c21"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c18",
-                    "Desc": false,
-                    "Order": 1
-                },
-                {
-                    "ColId": "c19",
-                    "Desc": false,
-                    "Order": 2
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t2"
-        },
-        "t3": {
-            "Name": "customer",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c10",
-                "c11",
-                "c12"
-            ],
-            "ColDefs": {
-                "c10": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c10"
-                },
-                "c11": {
-                    "Name": "Name",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            50
-                        ]
-                    },
-                    "Id": "c11"
-                },
-                "c12": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            50
-                        ]
-                    },
-                    "Id": "c12"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c10",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t3"
-        },
-        "t4": {
-            "Name": "Persons",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c13",
-                "c14",
-                "c15",
-                "c16",
-                "c17"
-            ],
-            "ColDefs": {
-                "c13": {
-                    "Name": "PersonID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c13"
-                },
-                "c14": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            255
-                        ]
-                    },
-                    "Id": "c14"
-                },
-                "c15": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            255
-                        ]
-                    },
-                    "Id": "c15"
-                },
-                "c16": {
-                    "Name": "Address",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            255
-                        ]
-                    },
-                    "Id": "c16"
-                },
-                "c17": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar",
-                        "Mods": [
-                            255
-                        ]
-                    },
-                    "Id": "c17"
-                }
-            },
-            "PrimaryKeys": null,
-            "ForeignKeys": null,
-            "Indexes": null,
-            "Id": "t4"
-        }
-    }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json
deleted file mode 100644
index c458dc293b..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json
+++ /dev/null
@@ -1,470 +0,0 @@
-{
-  "SpSchema": {
-      "t1": {
-          "Name": "leChanteur",
-          "ColIds": [
-              "c5",
-              "c6",
-              "c7"
-          ],
-          "ColDefs": {
-              "c5": {
-                  "Name": "SingerId",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: SingerId int",
-                  "Id": "c5"
-              },
-              "c6": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(1024)",
-                  "Id": "c6"
-              },
-              "c7": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 1024,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(1024)",
-                  "Id": "c7"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c5",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": [
-              {
-                  "Name": "ind1",
-                  "TableId": "t1",
-                  "Unique": false,
-                  "Keys": [
-                      {
-                          "ColId": "c5",
-                          "Desc": false,
-                          "Order": 1
-                      }
-                  ],
-                  "Id": "i9",
-                  "StoredColumnIds": null
-              }
-          ],
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Singers",
-          "Id": "t1"
-      },
-      "t2": {
-          "Name": "contact",
-          "ColIds": [
-              "c18",
-              "c19",
-              "c20",
-              "c21"
-          ],
-          "ColDefs": {
-              "c18": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c18"
-              },
-              "c19": {
-                  "Name": "Customer_Id",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Id int",
-                  "Id": "c19"
-              },
-              "c20": {
-                  "Name": "Customer_Info",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Customer_Info varchar(50)",
-                  "Id": "c20"
-              },
-              "c21": {
-                  "Name": "Type",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Type varchar(50)",
-                  "Id": "c21"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c18",
-                  "Desc": false,
-                  "Order": 1
-              },
-              {
-                  "ColId": "c19",
-                  "Desc": false,
-                  "Order": 2
-              }
-          ],
-          "ForeignKeys": [
-              {
-                  "Name": "contact_ibfk_1",
-                  "ColIds": [
-                      "c18"
-                  ],
-                  "ReferTableId": "t3",
-                  "ReferColumnIds": [
-                      "c10"
-                  ],
-                  "Id": "f8"
-              }
-          ],
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table contact",
-          "Id": "t2"
-      },
-      "t3": {
-          "Name": "customer",
-          "ColIds": [
-              "c10",
-              "c11",
-              "c12"
-          ],
-          "ColDefs": {
-              "c10": {
-                  "Name": "ID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: ID int",
-                  "Id": "c10"
-              },
-              "c11": {
-                  "Name": "Name",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: Name varchar(50)",
-                  "Id": "c11"
-              },
-              "c12": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": true,
-                  "Comment": "From: City varchar(50)",
-                  "Id": "c12"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c10",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table customer",
-          "Id": "t3"
-      },
-      "t4": {
-          "Name": "Persons",
-          "ColIds": [
-              "c13",
-              "c14",
-              "c15",
-              "c16",
-              "c17",
-              "c22"
-          ],
-          "ColDefs": {
-              "c13": {
-                  "Name": "PersonID",
-                  "T": {
-                      "Name": "INT64",
-                      "Len": 0,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: PersonID int",
-                  "Id": "c13"
-              },
-              "c14": {
-                  "Name": "LastName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: LastName varchar(255)",
-                  "Id": "c14"
-              },
-              "c15": {
-                  "Name": "FirstName",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: FirstName varchar(255)",
-                  "Id": "c15"
-              },
-              "c16": {
-                  "Name": "Address",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: Address varchar(255)",
-                  "Id": "c16"
-              },
-              "c17": {
-                  "Name": "City",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 255,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "From: City varchar(255)",
-                  "Id": "c17"
-              },
-              "c22": {
-                  "Name": "synth_id",
-                  "T": {
-                      "Name": "STRING",
-                      "Len": 50,
-                      "IsArray": false
-                  },
-                  "NotNull": false,
-                  "Comment": "",
-                  "Id": "c22"
-              }
-          },
-          "PrimaryKeys": [
-              {
-                  "ColId": "c22",
-                  "Desc": false,
-                  "Order": 1
-              }
-          ],
-          "ForeignKeys": null,
-          "Indexes": null,
-          "ParentId": "",
-          "Comment": "Spanner schema for source table Persons",
-          "Id": "t4"
-      }
-  },
-    "SyntheticPKeys": {},
-    "SrcSchema": {
-        "t1": {
-            "Name": "Singers",
-            "Schema": "ui_demo",
-            "ColIds": ["c5", "c6", "c7"],
-            "ColDefs": {
-                "c5": {
-                    "Name": "SingerId",
-                    "Type": {
-                        "Name": "integer"
-                    },
-                    "Id": "c5"
-                },
-                "c6": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "String"
-                    },
-                    "Id": "c6"
-                },
-                "c7": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "String"
-                    },
-                    "Id": "c7"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c5",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "Id": "t1"
-        },
-        "t2": {
-            "Name": "contact",
-            "Schema": "ui_demo",
-            "ColIds": ["c18", "c19", "c20", "c21"],
-            "ColDefs": {
-                "c18": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c18"
-                },
-                "c19": {
-                    "Name": "Customer_Id",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c19"
-                },
-                "c20": {
-                    "Name": "Customer_Info",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c20"
-                },
-                "c21": {
-                    "Name": "Type",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c21"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c18",
-                    "Desc": false,
-                    "Order": 1
-                },
-                {
-                    "ColId": "c19",
-                    "Desc": false,
-                    "Order": 2
-                }
-            ],
-            "Id": "t2"
-        },
-        "t3": {
-            "Name": "customer",
-            "Schema": "ui_demo",
-            "ColIds": ["c10", "c11", "c12"],
-            "ColDefs": {
-                "c10": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c10"
-                },
-                "c11": {
-                    "Name": "Name",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c11"
-                },
-                "c12": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c12"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c10",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "Id": "t3"
-        },
-        "t4": {
-            "Name": "Persons",
-            "Schema": "ui_demo",
-            "ColIds": ["c13", "c14", "c15", "c16", "c17"],
-            "ColDefs": {
-                "c13": {
-                    "Name": "PersonID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c13"
-                },
-                "c14": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c14"
-                },
-                "c15": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c15"
-                },
-                "c16": {
-                    "Name": "Address",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c16"
-                },
-                "c17": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c17"
-                }
-            },
-            "Id": "t4"
-        }
-    }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json b/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json
deleted file mode 100644
index aeb890d926..0000000000
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTimeZoneSession.json
+++ /dev/null
@@ -1,475 +0,0 @@
-{
-    "SpSchema": {
-        "t1": {
-            "Name": "Singers",
-            "ColIds": [
-                "c5",
-                "c6"
-            ],
-            "ColDefs": {
-                "c5": {
-                    "Name": "SingerId",
-                    "T": {
-                        "Name": "INT64",
-                        "Len": 0,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: SingerId int",
-                    "Id": "c5"
-                },
-                "c6": {
-                    "Name": "Bday",
-                    "T": {
-                        "Name": "TIMESTAMP",
-                        "Len": 1024,
-                        "IsArray": false
-                    },
-                    "NotNull": false,
-                    "Comment": "From: FirstName varchar(1024)",
-                    "Id": "c6"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c5",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": [
-                {
-                    "Name": "ind1",
-                    "TableId": "t1",
-                    "Unique": false,
-                    "Keys": [
-                        {
-                            "ColId": "c5",
-                            "Desc": false,
-                            "Order": 1
-                        }
-                    ],
-                    "Id": "i9",
-                    "StoredColumnIds": null
-                }
-            ],
-            "ParentId": "",
-            "Comment": "Spanner schema for source table Singers",
-            "Id": "t1"
-        },
-        "t2": {
-            "Name": "contact",
-            "ColIds": [
-                "c18",
-                "c19",
-                "c20",
-                "c21"
-            ],
-            "ColDefs": {
-                "c18": {
-                    "Name": "ID",
-                    "T": {
-                        "Name": "INT64",
-                        "Len": 0,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: ID int",
-                    "Id": "c18"
-                },
-                "c19": {
-                    "Name": "Customer_Id",
-                    "T": {
-                        "Name": "INT64",
-                        "Len": 0,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: Customer_Id int",
-                    "Id": "c19"
-                },
-                "c20": {
-                    "Name": "Customer_Info",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 50,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: Customer_Info varchar(50)",
-                    "Id": "c20"
-                },
-                "c21": {
-                    "Name": "Type",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 50,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: Type varchar(50)",
-                    "Id": "c21"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c18",
-                    "Desc": false,
-                    "Order": 1
-                },
-                {
-                    "ColId": "c19",
-                    "Desc": false,
-                    "Order": 2
-                }
-            ],
-            "ForeignKeys": [
-                {
-                    "Name": "contact_ibfk_1",
-                    "ColIds": [
-                        "c18"
-                    ],
-                    "ReferTableId": "t3",
-                    "ReferColumnIds": [
-                        "c10"
-                    ],
-                    "Id": "f8"
-                }
-            ],
-            "Indexes": null,
-            "ParentId": "",
-            "Comment": "Spanner schema for source table contact",
-            "Id": "t2"
-        },
-        "t3": {
-            "Name": "customer",
-            "ColIds": [
-                "c10",
-                "c11",
-                "c12"
-            ],
-            "ColDefs": {
-                "c10": {
-                    "Name": "ID",
-                    "T": {
-                        "Name": "INT64",
-                        "Len": 0,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: ID int",
-                    "Id": "c10"
-                },
-                "c11": {
-                    "Name": "Name",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 50,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: Name varchar(50)",
-                    "Id": "c11"
-                },
-                "c12": {
-                    "Name": "City",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 50,
-                        "IsArray": false
-                    },
-                    "NotNull": true,
-                    "Comment": "From: City varchar(50)",
-                    "Id": "c12"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c10",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": null,
-            "ParentId": "",
-            "Comment": "Spanner schema for source table customer",
-            "Id": "t3"
-        },
-        "t4": {
-            "Name": "Persons",
-            "ColIds": [
-                "c13",
-                "c14",
-                "c15",
-                "c16",
-                "c17",
-                "c22"
-            ],
-            "ColDefs": {
-                "c13": {
-                    "Name": "PersonID",
-                    "T": {
-                        "Name": "INT64",
-                        "Len": 0,
-                        "IsArray": false
-                    },
-                    "NotNull": false,
-                    "Comment": "From: PersonID int",
-                    "Id": "c13"
-                },
-                "c14": {
-                    "Name": "LastName",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 255,
-                        "IsArray": false
-                    },
-                    "NotNull": false,
-                    "Comment": "From: LastName varchar(255)",
-                    "Id": "c14"
-                },
-                "c15": {
-                    "Name": "FirstName",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 255,
-                        "IsArray": false
-                    },
-                    "NotNull": false,
-                    "Comment": "From: FirstName varchar(255)",
-                    "Id": "c15"
-                },
-                "c16": {
-                    "Name": "Address",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 255,
-                        "IsArray": false
-                    },
-                    "NotNull": false,
-                    "Comment": "From: Address varchar(255)",
-                    "Id": "c16"
-                },
-                "c17": {
-                    "Name": "City",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 255,
-                        "IsArray": false
-                    },
-                    "NotNull": false,
-                    "Comment": "From: City varchar(255)",
-                    "Id": "c17"
-                },
-                "c22": {
-                    "Name": "synth_id",
-                    "T": {
-                        "Name": "STRING",
-                        "Len": 50,
-                        "IsArray": false
-                    },
-                    "NotNull": false,
-                    "Comment": "",
-                    "Id": "c22"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c22",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "ForeignKeys": null,
-            "Indexes": null,
-            "ParentId": "",
-            "Comment": "Spanner schema for source table Persons",
-            "Id": "t4"
-        }
-    },
-    "SyntheticPKeys": {
-        "t4": {
-            "ColId": "c22",
-            "Sequence": 0
-        }
-    },
-    "SrcSchema": {
-        "t1": {
-            "Name": "Singers",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c5",
-                "c6"
-            ],
-            "ColDefs": {
-                "c5": {
-                    "Name": "SingerId",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c5"
-                },
-                "c6": {
-                    "Name": "Bday",
-                    "Type": {
-                        "Name": "timestamp"
-                    },
-                    "Id": "c6"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c5",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "Id": "t1"
-        },
-        "t2": {
-            "Name": "contact",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c18",
-                "c19",
-                "c20",
-                "c21"
-            ],
-            "ColDefs": {
-                "c18": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c18"
-                },
-                "c19": {
-                    "Name": "Customer_Id",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c19"
-                },
-                "c20": {
-                    "Name": "Customer_Info",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c20"
-                },
-                "c21": {
-                    "Name": "Type",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c21"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c18",
-                    "Desc": false,
-                    "Order": 1
-                },
-                {
-                    "ColId": "c19",
-                    "Desc": false,
-                    "Order": 2
-                }
-            ],
-            "Id": "t2"
-        },
-        "t3": {
-            "Name": "customer",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c10",
-                "c11",
-                "c12"
-            ],
-            "ColDefs": {
-                "c10": {
-                    "Name": "ID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c10"
-                },
-                "c11": {
-                    "Name": "Name",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c11"
-                },
-                "c12": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c12"
-                }
-            },
-            "PrimaryKeys": [
-                {
-                    "ColId": "c10",
-                    "Desc": false,
-                    "Order": 1
-                }
-            ],
-            "Id": "t3"
-        },
-        "t4": {
-            "Name": "Persons",
-            "Schema": "ui_demo",
-            "ColIds": [
-                "c13",
-                "c14",
-                "c15",
-                "c16",
-                "c17"
-            ],
-            "ColDefs": {
-                "c13": {
-                    "Name": "PersonID",
-                    "Type": {
-                        "Name": "int"
-                    },
-                    "Id": "c13"
-                },
-                "c14": {
-                    "Name": "LastName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c14"
-                },
-                "c15": {
-                    "Name": "FirstName",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c15"
-                },
-                "c16": {
-                    "Name": "Address",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c16"
-                },
-                "c17": {
-                    "Name": "City",
-                    "Type": {
-                        "Name": "varchar"
-                    },
-                    "Id": "c17"
-                }
-            },
-            "PrimaryKeys": null,
-            "Id": "t4"
-        }
-    }
-}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json b/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
similarity index 50%
rename from v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json
rename to v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
index 102a43661f..6178656340 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllDatatypeSession.json
+++ b/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
@@ -1,11 +1,14 @@
 {
-  "DatabaseType": "cassandra",
-  "DatabaseName": "test",
-  "SyntheticPKeys": {},
+  "SyntheticPKeys": {
+    "t4": {
+      "ColId": "c22",
+      "Sequence": 0
+    }
+  },
   "SpSchema": {
     "sample_table": {
       "Name": "sample_table",
-      "ColIds": [
+      "ColIds":  [
         "id",
         "varchar_column",
         "tinyint_column",
@@ -53,9 +56,13 @@
         "blob_column": {
           "Name": "blob_column",
           "T": {
-            "Name": "BYTES"
+            "Name": "blob",
+            "Len": 9223372036854776000,
+            "IsArray": false
           },
-          "Id": "c11"
+          "Id": "c11",
+          "NotNull": false,
+          "Comment": "From: blob_column blob(65535)"
         },
         "bool_column": {
           "Name": "bool_column",
@@ -116,9 +123,13 @@
         "id": {
           "Name": "id",
           "T": {
-            "Name": "INT64"
+            "Name": "bigint",
+            "Len": 0,
+            "IsArray": false
           },
-          "Id": "c2"
+          "Id": "c2",
+          "NotNull": true,
+          "Comment": "From: id int"
         },
         "longblob_column": {
           "Name": "longblob_column",
@@ -222,9 +233,13 @@
         "varchar_column": {
           "Name": "varchar_column",
           "T": {
-            "Name": "STRING"
+            "Name": "varchar",
+            "Len": 20,
+            "IsArray": false
           },
-          "Id": "c21"
+          "Id": "c21",
+          "NotNull": false,
+          "Comment": "From: varchar_column varchar(20)"
         },
         "year_column": {
           "Name": "year_column",
@@ -239,12 +254,292 @@
           "ColId": "id",
           "Desc": false,
           "Order": 1
+        },
+        {
+          "ColId": "id",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t1",
+      "Comment": "Spanner schema for source table sample_table"
+    },
+    "t1": {
+      "Name": "Singers",
+      "ColIds": [
+        "c5",
+        "c6",
+        "c7",
+        "c8"
+      ],
+      "ColDefs": {
+        "c5": {
+          "Name": "SingerId",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: SingerId int",
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "Bday",
+          "T": {
+            "Name": "TIMESTAMP",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: FirstName varchar(1024)",
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "LastName",
+          "T": {
+            "Name": "STRING",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: LastName varchar(1024)",
+          "Id": "c7"
+        },
+        "c8": {
+          "Name": "hb_shardId",
+          "T": {
+            "Name": "STRING",
+            "Len": 1024,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "HB shard id",
+          "Id": "c8"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c5",
+          "Desc": false,
+          "Order": 1
         }
       ],
       "Id": "t1"
+    },
+    "t2": {
+      "Name": "contact",
+      "ColIds": [
+        "c18",
+        "c19",
+        "c20",
+        "c21"
+      ],
+      "ColDefs": {
+        "c18": {
+          "Name": "ID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: ID int",
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "Customer_Id",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Customer_Id int",
+          "Id": "c19"
+        },
+        "c20": {
+          "Name": "Customer_Info",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Customer_Info varchar(50)",
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "Type",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Type varchar(50)",
+          "Id": "c21"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c18",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c19",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "Id": "t2"
+    },
+    "t3": {
+      "Name": "customer",
+      "ColIds": [
+        "c10",
+        "c11",
+        "c12"
+      ],
+      "ColDefs": {
+        "c10": {
+          "Name": "ID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: ID int",
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "Name",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: Name varchar(50)",
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "City",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: City varchar(50)",
+          "Id": "c12"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c10",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c11",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "Id": "t3"
+    },
+    "t4": {
+      "Name": "Persons",
+      "ColIds": [
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17",
+        "c22"
+      ],
+      "ColDefs": {
+        "c13": {
+          "Name": "PersonID",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: PersonID int",
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "LastName",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: LastName varchar(255)",
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "FirstName",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: FirstName varchar(255)",
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "Address",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: Address varchar(255)",
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "City",
+          "T": {
+            "Name": "STRING",
+            "Len": 255,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: City varchar(255)",
+          "Id": "c17"
+        },
+        "c22": {
+          "Name": "synth_id",
+          "T": {
+            "Name": "STRING",
+            "Len": 50,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "",
+          "Id": "c22"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c22",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t4"
     }
   },
- "SrcSchema": {
+  "SrcSchema": {
     "sample_table": {
       "Name": "sample_table",
       "Schema": "test",
@@ -276,7 +571,8 @@
         "set_column",
         "bool_column",
         "binary_column",
-        "varbinary_column"
+        "varbinary_column",
+        "blob_column"
       ],
       "ColDefs": {
         "bigint_column": {
@@ -296,9 +592,22 @@
         "blob_column": {
           "Name": "blob_column",
           "Type": {
-            "Name": "blob"
+            "Name": "blob",
+            "Mods": [
+              65535
+            ],
+            "ArrayBounds": null
           },
-          "Id": "c11"
+          "Id": "c11",
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          }
         },
         "bool_column": {
           "Name": "bool_column",
@@ -359,9 +668,20 @@
         "id": {
           "Name": "id",
           "Type": {
-            "Name": "int"
+            "Name": "integer",
+            "Mods": null,
+            "ArrayBounds": null
           },
-          "Id": "c2"
+          "Id": "c2",
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          }
         },
         "longblob_column": {
           "Name": "longblob_column",
@@ -464,9 +784,22 @@
         "varchar_column": {
           "Name": "varchar_column",
           "Type": {
-            "Name": "varchar"
+            "Name": "String",
+            "Mods": [
+              20
+            ],
+            "ArrayBounds": null
           },
-          "Id": "c21"
+          "Id": "c21",
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          }
         },
         "year_column": {
           "Name": "year_column",
@@ -484,6 +817,203 @@
         }
       ],
       "Id": "t1"
+    },
+    "t1": {
+      "Name": "Singers",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c5",
+        "c6",
+        "c7",
+        "c8"
+      ],
+      "ColDefs": {
+        "c5": {
+          "Name": "SingerId",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "Bday",
+          "Type": {
+            "Name": "timestamp"
+          },
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "LastName",
+          "Type": {
+            "Name": "String"
+          },
+          "Id": "c7"
+        },
+        "c8": {
+          "Name": "Age",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c8"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c5",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "Id": "t1"
+    },
+    "t2": {
+      "Name": "contact",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c18",
+        "c19",
+        "c20",
+        "c21"
+      ],
+      "ColDefs": {
+        "c18": {
+          "Name": "ID",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "Customer_Id",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c19"
+        },
+        "c20": {
+          "Name": "Customer_Info",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "Type",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c21"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c18",
+          "Desc": false,
+          "Order": 1
+        },
+        {
+          "ColId": "c19",
+          "Desc": false,
+          "Order": 2
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t2"
+    },
+    "t3": {
+      "Name": "customer",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c10",
+        "c11",
+        "c12"
+      ],
+      "ColDefs": {
+        "c10": {
+          "Name": "ID",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "Name",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "City",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c12"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c10",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t3"
+    },
+    "t4": {
+      "Name": "Persons",
+      "Schema": "ui_demo",
+      "ColIds": [
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17"
+      ],
+      "ColDefs": {
+        "c13": {
+          "Name": "PersonID",
+          "Type": {
+            "Name": "int"
+          },
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "LastName",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "FirstName",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "Address",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "City",
+          "Type": {
+            "Name": "varchar"
+          },
+          "Id": "c17"
+        }
+      },
+      "PrimaryKeys": null,
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t4"
     }
   },
   "ToSource": {
@@ -520,5 +1050,15 @@
         "year_column": "year_column"
       }
     }
+  },
+  "ToSpanner": {
+    "sample_table": {
+      "Name": "sample_table",
+      "Cols": {
+        "blob_column": "blob_column",
+        "id": "id",
+        "varchar_column": "varchar_column"
+      }
+    }
   }
 }
\ No newline at end of file

From d22084c59355056f1012349824e91fbd42453959 Mon Sep 17 00:00:00 2001
From: Florent Biville <445792+fbiville@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:16:56 +0100
Subject: [PATCH 13/56] Favor built-in transform over custom one (#2013)

This replaces our custom KV transform, since Beam already includes
one.
---
 .../neo4j/transforms/CreateKvTransform.java   | 84 -------------------
 .../transforms/Neo4jRowWriterTransform.java   | 24 +++++-
 2 files changed, 23 insertions(+), 85 deletions(-)
 delete mode 100644 v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/CreateKvTransform.java

diff --git a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/CreateKvTransform.java b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/CreateKvTransform.java
deleted file mode 100644
index 2fc255adaa..0000000000
--- a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/CreateKvTransform.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.cloud.teleport.v2.neo4j.transforms;
-
-import com.google.common.base.MoreObjects;
-import java.util.concurrent.ThreadLocalRandom;
-import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
-import org.apache.beam.sdk.coders.KvCoder;
-import org.apache.beam.sdk.transforms.DoFn;
-import org.apache.beam.sdk.transforms.PTransform;
-import org.apache.beam.sdk.transforms.ParDo;
-import org.apache.beam.sdk.values.KV;
-import org.apache.beam.sdk.values.PCollection;
-import org.apache.beam.sdk.values.Row;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/** Create KvTransform to control Beam parallelism. */
-public class CreateKvTransform extends PTransform<PCollection<Row>, PCollection<KV<Integer, Row>>> {
-
-  private static final Logger LOG = LoggerFactory.getLogger(CreateKvTransform.class);
-  private static final Integer DEFAULT_PARALLELISM = 1;
-  private final Integer requestedKeys;
-
-  private CreateKvTransform(Integer requestedKeys) {
-    this.requestedKeys = requestedKeys;
-  }
-
-  public static CreateKvTransform of(Integer requestedKeys) {
-    return new CreateKvTransform(requestedKeys);
-  }
-
-  @Override
-  public PCollection<KV<Integer, Row>> expand(PCollection<Row> input) {
-    return input
-        .apply("Inject Keys", ParDo.of(new CreateKeysFn(this.requestedKeys)))
-        .setCoder(KvCoder.of(BigEndianIntegerCoder.of(), input.getCoder()));
-  }
-
-  private static class CreateKeysFn extends DoFn<Row, KV<Integer, Row>> {
-
-    private final Integer specifiedParallelism;
-    private Integer calculatedParallelism;
-
-    CreateKeysFn(Integer specifiedParallelism) {
-      this.specifiedParallelism = specifiedParallelism;
-    }
-
-    @Setup
-    public void setup() {
-
-      if (calculatedParallelism == null) {
-
-        if (specifiedParallelism != null) {
-          calculatedParallelism = specifiedParallelism;
-        }
-
-        calculatedParallelism =
-            MoreObjects.firstNonNull(calculatedParallelism, DEFAULT_PARALLELISM);
-
-        LOG.info("Parallelism set to: {}", calculatedParallelism);
-      }
-    }
-
-    @ProcessElement
-    public void processElement(ProcessContext context) {
-      context.output(
-          KV.of(ThreadLocalRandom.current().nextInt(calculatedParallelism), context.element()));
-    }
-  }
-}
diff --git a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/Neo4jRowWriterTransform.java b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/Neo4jRowWriterTransform.java
index 681aad8432..d511f65b0e 100644
--- a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/Neo4jRowWriterTransform.java
+++ b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/transforms/Neo4jRowWriterTransform.java
@@ -26,10 +26,12 @@
 import com.google.common.annotations.VisibleForTesting;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
 import org.apache.beam.sdk.transforms.GroupIntoBatches;
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.transforms.SerializableFunction;
+import org.apache.beam.sdk.transforms.WithKeys;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.Row;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -119,7 +121,9 @@ public PCollection<Row> expand(@NonNull PCollection<Row> input) {
             connectionSupplier);
 
     return input
-        .apply("Create KV pairs", CreateKvTransform.of(parallelismFactor(targetType, config)))
+        .apply(
+            "Create KV pairs",
+            WithKeys.of(ThreadLocalRandomInt.of(parallelismFactor(targetType, config))))
         .apply("Group into batches", GroupIntoBatches.ofSize(batchSize(targetType, config)))
         .apply(
             targetSequence.getSequenceNumber(target) + ": Neo4j write " + target.getName(),
@@ -225,4 +229,22 @@ private static int parallelismFactor(TargetType targetType, Configuration config
         throw new IllegalStateException(String.format("Unsupported target type: %s", targetType));
     }
   }
+
+  private static class ThreadLocalRandomInt implements SerializableFunction<Row, Integer> {
+
+    private final int bound;
+
+    private ThreadLocalRandomInt(int bound) {
+      this.bound = bound;
+    }
+
+    public static SerializableFunction<Row, Integer> of(int bound) {
+      return new ThreadLocalRandomInt(bound);
+    }
+
+    @Override
+    public Integer apply(Row input) {
+      return ThreadLocalRandom.current().nextInt(bound);
+    }
+  }
 }

From 58093bed768a420d45f17a7ff0dcf12aae7681f4 Mon Sep 17 00:00:00 2001
From: Florent Biville <445792+fbiville@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:18:14 +0100
Subject: [PATCH 14/56] Simplify dependency manager: remove unused code (#2011)

---
 .../neo4j/templates/GoogleCloudToNeo4j.java   | 23 +++----
 .../teleport/v2/neo4j/utils/BeamBlock.java    | 62 ++++---------------
 2 files changed, 19 insertions(+), 66 deletions(-)

diff --git a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/templates/GoogleCloudToNeo4j.java b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/templates/GoogleCloudToNeo4j.java
index eea92cb9bb..27f59d27ec 100644
--- a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/templates/GoogleCloudToNeo4j.java
+++ b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/templates/GoogleCloudToNeo4j.java
@@ -303,8 +303,7 @@ public void run() {
               String.format("Metadata for source %s", sourceName), provider.queryMetadata());
       sourceRows.add(sourceMetadata);
       Schema sourceBeamSchema = sourceMetadata.getSchema();
-      processingQueue.addToQueue(
-          ArtifactType.source, false, sourceName, defaultActionContext, sourceMetadata);
+      processingQueue.addToQueue(ArtifactType.source, sourceName, defaultActionContext);
 
       ////////////////////////////
       // Optimization: if some of the current source's targets either
@@ -343,7 +342,7 @@ public void run() {
         List<PCollection<?>> dependencies =
             new ArrayList<>(preActionRows.getOrDefault(ActionStage.PRE_NODES, List.of()));
         dependencies.add(
-            processingQueue.waitOnCollections(target.getDependencies(), nodeStepDescription));
+            processingQueue.resolveOutputs(target.getDependencies(), nodeStepDescription));
 
         PCollection<Row> blockingReturn =
             preInsertBeamRows
@@ -369,8 +368,7 @@ public void run() {
             .computeIfAbsent(TargetType.NODE, (type) -> new ArrayList<>(nodeTargets.size()))
             .add(blockingReturn);
 
-        processingQueue.addToQueue(
-            ArtifactType.node, false, target.getName(), blockingReturn, preInsertBeamRows);
+        processingQueue.addToQueue(ArtifactType.node, target.getName(), blockingReturn);
       }
 
       ////////////////////////////
@@ -411,7 +409,7 @@ public void run() {
         dependencyNames.add(target.getStartNodeReference());
         dependencyNames.add(target.getEndNodeReference());
         dependencies.add(
-            processingQueue.waitOnCollections(dependencyNames, relationshipStepDescription));
+            processingQueue.resolveOutputs(dependencyNames, relationshipStepDescription));
 
         PCollection<Row> blockingReturn =
             preInsertBeamRows
@@ -438,8 +436,7 @@ public void run() {
                 TargetType.RELATIONSHIP, (type) -> new ArrayList<>(relationshipTargets.size()))
             .add(blockingReturn);
         // serialize relationships
-        processingQueue.addToQueue(
-            ArtifactType.edge, false, target.getName(), blockingReturn, preInsertBeamRows);
+        processingQueue.addToQueue(ArtifactType.edge, target.getName(), blockingReturn);
       }
       ////////////////////////////
       // Custom query targets
@@ -457,8 +454,7 @@ public void run() {
         List<PCollection<?>> dependencies =
             new ArrayList<>(preActionRows.getOrDefault(ActionStage.PRE_QUERIES, List.of()));
         dependencies.add(
-            processingQueue.waitOnCollections(
-                target.getDependencies(), customQueryStepDescription));
+            processingQueue.resolveOutputs(target.getDependencies(), customQueryStepDescription));
 
         // note: nullableSourceBeamRows is guaranteed to be non-null here since custom query targets
         // cannot define source transformations
@@ -485,12 +481,7 @@ public void run() {
         targetRows
             .computeIfAbsent(TargetType.QUERY, (type) -> new ArrayList<>(customQueryTargets.size()))
             .add(blockingReturn);
-        processingQueue.addToQueue(
-            ArtifactType.custom_query,
-            false,
-            target.getName(),
-            blockingReturn,
-            nullableSourceBeamRows);
+        processingQueue.addToQueue(ArtifactType.custom_query, target.getName(), blockingReturn);
       }
     }
 
diff --git a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/utils/BeamBlock.java b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/utils/BeamBlock.java
index e077a690f3..a48afda282 100644
--- a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/utils/BeamBlock.java
+++ b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/utils/BeamBlock.java
@@ -32,59 +32,20 @@
 public class BeamBlock {
 
   private static final Logger LOG = LoggerFactory.getLogger(BeamBlock.class);
-  private final List<PCollection<Row>> sourceQueue = new ArrayList<>();
-  private final List<PCollection<Row>> preloadActionQueue = new ArrayList<>();
-  private final List<PCollection<Row>> processActionQueue = new ArrayList<>();
-  private final List<PCollection<Row>> nodeQueue = new ArrayList<>();
-  private final List<PCollection<Row>> edgeQueue = new ArrayList<>();
-  private final List<PCollection<Row>> customQueue = new ArrayList<>();
-  private final Map<String, PCollection<Row>> executeAfterNamedQueue = new HashMap<>();
-  private final Map<String, PCollection<Row>> executionContexts = new HashMap<>();
-  private PCollection<Row> defaultCollection;
+  private final Map<String, PCollection<Row>> outputs = new HashMap<>();
+  private final PCollection<Row> defaultCollection;
 
   public BeamBlock(PCollection<Row> defaultCollection) {
     this.defaultCollection = defaultCollection;
   }
 
-  public void addToQueue(
-      ArtifactType artifactType, boolean preload, String name, PCollection<Row> blockingReturn) {
-    addToQueue(artifactType, preload, name, blockingReturn, defaultCollection);
+  public void addToQueue(ArtifactType artifactType, String name, PCollection<Row> output) {
+    outputs.put(artifactType.name() + ":" + name, output);
   }
 
-  public void addToQueue(
-      ArtifactType artifactType,
-      boolean preload,
-      String name,
-      PCollection<Row> blockingReturn,
-      PCollection<Row> executionContext) {
-    switch (artifactType) {
-      case action:
-        if (preload) {
-          preloadActionQueue.add(blockingReturn);
-        } else {
-          processActionQueue.add(blockingReturn);
-        }
-        break;
-      case source:
-        sourceQueue.add(blockingReturn);
-        break;
-      case node:
-        nodeQueue.add(blockingReturn);
-        break;
-      case edge:
-        edgeQueue.add(blockingReturn);
-        break;
-      case custom_query:
-        customQueue.add(blockingReturn);
-        break;
-    }
-    executeAfterNamedQueue.put(artifactType.name() + ":" + name, blockingReturn);
-    executionContexts.put(artifactType.name() + ":" + name, executionContext);
-  }
-
-  public PCollection<Row> waitOnCollections(
+  public PCollection<Row> resolveOutputs(
       Collection<String> dependencies, String queuingDescription) {
-    List<PCollection<Row>> waitOnQueues = populateQueueForTargets(dependencies);
+    List<PCollection<Row>> waitOnQueues = resolveOutputs(dependencies);
     if (waitOnQueues.isEmpty()) {
       waitOnQueues.add(defaultCollection);
     }
@@ -103,15 +64,16 @@ public PCollection<Row> waitOnCollections(
             Flatten.pCollections());
   }
 
-  private List<PCollection<Row>> populateQueueForTargets(Collection<String> dependencies) {
-    List<PCollection<Row>> waitOnQueues = new ArrayList<>();
+  private List<PCollection<Row>> resolveOutputs(Collection<String> dependencies) {
+    List<PCollection<Row>> outputs = new ArrayList<>();
     for (String dependency : dependencies) {
       for (ArtifactType type : ArtifactType.values()) {
-        if (executeAfterNamedQueue.containsKey(type + ":" + dependency)) {
-          waitOnQueues.add(executeAfterNamedQueue.get(type + ":" + dependency));
+        if (this.outputs.containsKey(type + ":" + dependency)) {
+          outputs.add(this.outputs.get(type + ":" + dependency));
+          break;
         }
       }
     }
-    return waitOnQueues;
+    return outputs;
   }
 }

From ab3ea4bba76798ecc6a1c0b0737bff155d2cae66 Mon Sep 17 00:00:00 2001
From: Florent Biville <445792+fbiville@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:19:22 +0100
Subject: [PATCH 15/56] feat: drop node target's key constraint requirement
 (#2068)

This blocks Community Edition (CE) users, as the only way to
emulate key constraints is to combine unique constraints
(available in CE) with existence constraints (available only in
Enterprise Edition).
---
 .../model/validation/NodeKeyValidator.java    | 53 -------------------
 ...orter.v1.validation.SpecificationValidator |  1 -
 2 files changed, 54 deletions(-)
 delete mode 100644 v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java

diff --git a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java
deleted file mode 100644
index ecc4372e44..0000000000
--- a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2024 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.cloud.teleport.v2.neo4j.model.validation;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.neo4j.importer.v1.targets.NodeTarget;
-import org.neo4j.importer.v1.validation.SpecificationValidationResult.Builder;
-import org.neo4j.importer.v1.validation.SpecificationValidator;
-
-public class NodeKeyValidator implements SpecificationValidator {
-
-  private static final String ERROR_CODE = "DFNK-001";
-  private final Set<String> paths;
-
-  public NodeKeyValidator() {
-    this.paths = new LinkedHashSet<>();
-  }
-
-  @Override
-  public void visitNodeTarget(int index, NodeTarget target) {
-    var schema = target.getSchema();
-    if (schema == null) {
-      paths.add(String.format("$.targets.nodes[%d].schema.key_constraints", index));
-      return;
-    }
-    if (schema.getKeyConstraints().isEmpty()) {
-      paths.add(String.format("$.targets.nodes[%d].schema.key_constraints", index));
-    }
-  }
-
-  @Override
-  public boolean report(Builder builder) {
-    paths.forEach(
-        path ->
-            builder.addError(
-                path, ERROR_CODE, String.format("%s must define at least 1 key constraint", path)));
-    return paths.isEmpty();
-  }
-}
diff --git a/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator b/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator
index 8ccfbd6008..59f2256ba3 100644
--- a/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator
+++ b/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator
@@ -3,7 +3,6 @@ com.google.cloud.teleport.v2.neo4j.model.validation.BigQuerySourceProjectDataset
 com.google.cloud.teleport.v2.neo4j.model.validation.DuplicateAggregateFieldNameValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.DuplicateTextHeaderValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.InlineSourceDataValidator
-com.google.cloud.teleport.v2.neo4j.model.validation.NodeKeyValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.TextColumnMappingValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.WriteModeValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.NodeMatchModeValidator

From 61d289d63a4741d2e4aa4d30ee73fecb62298e9e Mon Sep 17 00:00:00 2001
From: Vardhan Vinay Thigle <39047439+VardhanThigle@users.noreply.github.com>
Date: Thu, 9 Jan 2025 05:06:16 +0000
Subject: [PATCH 16/56] Fixing TypeMismatch in Cassandra Driver Config Loader
 (#2118)

---
 .../schema/CassandraSchemaDiscoveryTest.java  |   37 +
 .../test-cassandra-config-all-params.conf     | 1510 +++++++++++++++++
 .../utils/CassandraDriverConfigLoader.java    |   66 +-
 .../CassandraDriverConfigLoaderTest.java      |   68 +-
 4 files changed, 1645 insertions(+), 36 deletions(-)
 create mode 100644 v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config-all-params.conf

diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscoveryTest.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscoveryTest.java
index 6542688611..d263c3b252 100644
--- a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscoveryTest.java
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscoveryTest.java
@@ -22,6 +22,7 @@
 import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_TABLES;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.mockStatic;
 
 import com.datastax.oss.driver.api.core.config.OptionsMap;
 import com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper.CassandraDataSource;
@@ -33,14 +34,18 @@
 import com.google.cloud.teleport.v2.source.reader.io.jdbc.iowrapper.JdbcDataSource;
 import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnType;
+import com.google.cloud.teleport.v2.spanner.migrations.utils.JarFileReader;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.URL;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -87,6 +92,38 @@ public void testDiscoverTablesBasic() throws IOException, RetriableSchemaDiscove
     assertThat(tables).isEqualTo(TEST_TABLES);
   }
 
+  /**
+   * Tests loading the driver's sample config file and using the same to discover tables on Embedded
+   * Cassandra.
+   */
+  @Test
+  public void testDiscoverTablesConfigFile() throws IOException, RetriableSchemaDiscoveryException {
+
+    SourceSchemaReference cassandraSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder().setKeyspaceName(TEST_KEYSPACE).build());
+    try (MockedStatic<JarFileReader> mockFileReader = mockStatic(JarFileReader.class)) {
+      URL testUrl = Resources.getResource("CassandraUT/test-cassandra-config-all-params.conf");
+      String testGcsPath = "gs://smt-test-bucket/cassandraConfig.conf";
+      mockFileReader
+          .when(() -> JarFileReader.saveFilesLocally(testGcsPath))
+          .thenReturn(new URL[] {testUrl});
+
+      DataSource cassandraDataSource =
+          DataSource.ofCassandra(
+              CassandraDataSource.builder()
+                  .setOptionsMapFromGcsFile(testGcsPath)
+                  /* We need to override the contact points since the embedded cassandra ports are dynamic */
+                  .setContactPoints(sharedEmbeddedCassandra.getInstance().getContactPoints())
+                  .build());
+
+      CassandraSchemaDiscovery cassandraSchemaDiscovery = new CassandraSchemaDiscovery();
+      ImmutableList<String> tables =
+          cassandraSchemaDiscovery.discoverTables(cassandraDataSource, cassandraSchemaReference);
+      assertThat(tables).isEqualTo(TEST_TABLES);
+    }
+  }
+
   @Test
   public void testDiscoverTableSchemaBasic() throws IOException, RetriableSchemaDiscoveryException {
 
diff --git a/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config-all-params.conf b/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config-all-params.conf
new file mode 100644
index 0000000000..20e055a296
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config-all-params.conf
@@ -0,0 +1,1510 @@
+# Reference configuration for the DataStax Java driver for Apache Cassandra®.
+#
+  # Unless you use a custom mechanism to load your configuration (see
+  # SessionBuilder.withConfigLoader), all the values declared here will be used as defaults. You can
+  # place your own `application.conf` in the classpath to override them.
+  #
+  # Options are classified into two categories:
+  # - basic: what is most likely to be customized first when kickstarting a new application.
+  # - advanced: more elaborate tuning options, or "expert"-level customizations.
+  #
+  # This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md.
+  # DO NOT USE FOR PRODUCTION.
+  datastax-java-driver {
+
+  # BASIC OPTIONS ----------------------------------------------------------------------------------
+
+  # The contact points to use for the initial connection to the cluster.
+  #
+  # These are addresses of Cassandra nodes that the driver uses to discover the cluster topology.
+  # Only one contact point is required (the driver will retrieve the address of the other nodes
+  # automatically), but it is usually a good idea to provide more than one contact point, because if
+  # that single contact point is unavailable, the driver cannot initialize itself correctly.
+  #
+  # This must be a list of strings with each contact point specified as "host:port". If the host is
+  # a DNS name that resolves to multiple A-records, all the corresponding addresses will be used. Do
+  # not use "localhost" as the host name (since it resolves to both IPv4 and IPv6 addresses on some
+  # platforms).
+  #
+  # Note that Cassandra 3 and below requires all nodes in a cluster to share the same port (see
+  # CASSANDRA-7544).
+  #
+  # Contact points can also be provided programmatically when you build a cluster instance. If both
+  # are specified, they will be merged. If both are absent, the driver will default to
+  # 127.0.0.1:9042.
+  #
+  # Required: no
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  basic.contact-points = [ "127.0.0.1:9042", "127.0.0.2:9042" ]
+
+  # A name that uniquely identifies the driver instance created from this configuration. This is
+  # used as a prefix for log messages and metrics.
+  #
+  # If this option is absent, the driver will generate an identifier composed of the letter 's'
+  # followed by an incrementing counter. If you provide a different value, try to keep it short to
+  # keep the logs readable. Also, make sure it is unique: reusing the same value will not break the
+  # driver, but it will mix up the logs and metrics.
+  #
+  # Required: no
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  // basic.session-name = my_session
+
+  # The name of the keyspace that the session should initially be connected to.
+  #
+  # This expects the same format as in a CQL query: case-sensitive names must be quoted (note that
+  # the quotes must be escaped in HOCON format). For example:
+  #    session-keyspace = case_insensitive_name
+  #    session-keyspace = \"CaseSensitiveName\"
+  #
+  # If this option is absent, the session won't be connected to any keyspace, and you'll have to
+  # either qualify table names in your queries, or use the per-query keyspace feature available in
+  # Cassandra 4 and above (see Request.getKeyspace()).
+  #
+  # This can also be provided programatically in CqlSessionBuilder.
+  #
+  # Required: no
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+   basic.session-keyspace = my_keyspace
+
+  # How often the driver tries to reload the configuration.
+  #
+  # To disable periodic reloading, set this to 0.
+  #
+  # Required: yes (unless you pass a different ConfigLoader to the session builder).
+  # Modifiable at runtime: yes, the new value will be used after the next time the configuration
+  #   gets reloaded.
+  # Overridable in a profile: no
+  basic.config-reload-interval = 5 minutes
+
+  basic.request {
+  # How long the driver waits for a request to complete. This is a global limit on the duration of
+  # a session.execute() call, including any internal retries the driver might do.
+  #
+  # By default, this value is set pretty high to ensure that DDL queries don't time out, in order
+  # to provide the best experience for new users trying the driver with the out-of-the-box
+  # configuration.
+  # For any serious deployment, we recommend that you use separate configuration profiles for DDL
+  # and DML; you can then set the DML timeout much lower (down to a few milliseconds if needed).
+  #
+  # Note that, because timeouts are scheduled on the driver's timer thread, the duration specified
+  # here must be greater than the timer tick duration defined by the
+  # advanced.netty.timer.tick-duration setting (see below). If that is not the case, timeouts will
+  # not be triggered as timely as desired.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for requests issued after the change.
+  # Overridable in a profile: yes
+  timeout = 2 seconds
+  
+  # The consistency level.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for requests issued after the change.
+  # Overridable in a profile: yes
+  consistency = LOCAL_ONE
+  
+  # The page size. This controls how many rows will be retrieved simultaneously in a single
+  # network roundtrip (the goal being to avoid loading too many results in memory at the same
+  # time). If there are more results, additional requests will be used to retrieve them (either
+  # automatically if you iterate with the sync API, or explicitly with the async API's
+  # fetchNextPage method).
+  # If the value is 0 or negative, it will be ignored and the request will not be paged.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for requests issued after the change.
+  # Overridable in a profile: yes
+  page-size = 5000
+  
+  # The serial consistency level.
+  # The allowed values are SERIAL and LOCAL_SERIAL.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for requests issued after the change.
+  # Overridable in a profile: yes
+  serial-consistency = SERIAL
+  
+  # The default idempotence of a request, that will be used for all `Request` instances where
+  # `isIdempotent()` returns null.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for requests issued after the change.
+  # Overridable in a profile: yes
+  default-idempotence = false
+  }
+
+  # The policy that decides the "query plan" for each query; that is, which nodes to try as
+  # coordinators, and in which order.
+  #
+  # Required: yes
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: yes. Note that the driver creates as few instances as possible: if a
+  #   named profile inherits from the default profile, or if two sibling profiles have the exact
+  #   same configuration, they will share a single policy instance at runtime.
+  #   If there are multiple load balancing policies in a single driver instance, they work together
+  #   in the following way:
+  #   - each request gets a query plan from its profile's policy (or the default policy if the
+  #     request has no profile, or the profile does not override the policy).
+  #   - when the policies assign distances to nodes, the driver uses the closest assigned distance
+  #     for any given node.
+  basic.load-balancing-policy {
+  # The class of the policy. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.loadbalancing.
+  #
+  # The driver provides a single implementation out of the box: DefaultLoadBalancingPolicy.
+  #
+  # You can also specify a custom class that implements LoadBalancingPolicy and has a public
+  # constructor with two arguments: the DriverContext and a String representing the profile name.
+  class = DefaultLoadBalancingPolicy
+  
+  # The datacenter that is considered "local": the default policy will only include nodes from
+  # this datacenter in its query plans.
+  #
+  # When using the default policy, this option can only be absent if you specified no contact
+  # points: in that case, the driver defaults to 127.0.0.1:9042, and that node's datacenter is
+  # used as the local datacenter. As soon as you provide contact points (either through the
+  # configuration or through the session builder), you must define the local datacenter
+  # explicitly, and initialization will fail if this property is absent. In addition, all contact
+  # points should be from this datacenter; warnings will be logged for nodes that are from a
+  # different one.
+  #
+  # This can also be specified programmatically with SessionBuilder.withLocalDatacenter. If both
+  # are specified, the programmatic value takes precedence.
+  local-datacenter = datacenter1
+  
+  # A custom filter to include/exclude nodes.
+  #
+  # This option is not required; if present, it must be the fully-qualified name of a class that
+  # implements `java.util.function.Predicate<Node>`, and has a public constructor taking a single
+  # `DriverContext` argument.
+  #
+  # Alternatively, you can pass an instance of your filter to
+  # CqlSession.builder().withNodeFilter(). In that case, this option will be ignored.
+  #
+  # The predicate's `test(Node)` method will be invoked each time the policy processes a
+  # topology or state change: if it returns false, the node will be set at distance IGNORED
+  # (meaning the driver won't ever connect to it), and never included in any query plan.
+  // filter.class=
+  }
+  basic.cloud {
+  # The location of the cloud secure bundle used to connect to Datastax Apache Cassandra as a
+  # service.
+  # This setting must be a valid URL.
+  # If the protocol is not specified, it is implicitly assumed to be the `file://` protocol,
+  # in which case the value is expected to be a valid path on the local filesystem.
+  # For example, `/a/path/to/bundle` will be interpreted as `file:/a/path/to/bunde`.
+  # If the protocol is provided explicitly, then the value will be used as is.
+  #
+  # Required: no
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  // secure-connect-bundle = /location/of/secure/connect/bundle
+  }
+
+
+  # ADVANCED OPTIONS -------------------------------------------------------------------------------
+
+  advanced.connection {
+  # The timeout to use for internal queries that run as part of the initialization process, just
+  # after we open a connection. If this timeout fires, the initialization of the connection will
+  # fail. If this is the first connection ever, the driver will fail to initialize as well,
+  # otherwise it will retry the connection later.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  init-query-timeout = 500 milliseconds
+  
+  # The timeout to use when the driver changes the keyspace on a connection at runtime (this
+  # happens when the client issues a `USE ...` query, and all connections belonging to the current
+  # session need to be updated).
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  set-keyspace-timeout = ${datastax-java-driver.advanced.connection.init-query-timeout}
+  
+  # The driver maintains a connection pool to each node, according to the distance assigned to it
+  # by the load balancing policy. If the distance is IGNORED, no connections are maintained.
+  pool {
+  local {
+  # The number of connections in the pool.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes; when the change is detected, all active pools will be notified
+  #   and will adjust their size.
+  # Overridable in a profile: no
+  size = 1
+  }
+  remote {
+  size = 1
+  }
+  }
+  
+  # The maximum number of requests that can be executed concurrently on a connection. This must be
+  # between 1 and 32768.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  max-requests-per-connection = 1024
+  
+  # The maximum number of "orphaned" requests before a connection gets closed automatically.
+  #
+  # Sometimes the driver writes to a node but stops listening for a response (for example if the
+  # request timed out, or was completed by another node). But we can't safely reuse the stream id
+  # on this connection until we know for sure that the server is done with it. Therefore the id is
+  # marked as "orphaned" until we get a response from the node.
+  #
+  # If the response never comes (or is lost because of a network issue), orphaned ids can
+  # accumulate over time, eventually affecting the connection's throughput. So we monitor them
+  # and close the connection above a given threshold (the pool will replace it).
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  max-orphan-requests = 24576
+  
+  # Whether to log non-fatal errors when the driver tries to open a new connection.
+  #
+  # This error as recoverable, as the driver will try to reconnect according to the reconnection
+  # policy. Therefore some users see them as unnecessary clutter in the logs. On the other hand,
+  # those logs can be handy to debug a misbehaving node.
+  #
+  # Note that some type of errors are always logged, regardless of this option:
+  # - protocol version mismatches (the node gets forced down)
+  # - when the cluster name in system.local doesn't match the other nodes (the node gets forced
+  #   down)
+  # - authentication errors (will be retried)
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  warn-on-init-error = true
+  }
+
+  # Whether to schedule reconnection attempts if all contact points are unreachable on the first
+  # initialization attempt.
+  #
+  # If this is true, the driver will retry according to the reconnection policy. The
+  # `SessionBuilder.build()` call -- or the future returned by `SessionBuilder.buildAsync()` --
+  # won't complete until a contact point has been reached.
+  #
+  # If this is false and no contact points are available, the driver will fail with an
+  # AllNodesFailedException.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  advanced.reconnect-on-init = false
+
+  # The policy that controls how often the driver tries to re-establish connections to down nodes.
+  #
+  # Required: yes
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: no
+  advanced.reconnection-policy {
+  # The class of the policy. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.connection.
+  #
+  # The driver provides two implementations out of the box: ExponentialReconnectionPolicy and
+  # ConstantReconnectionPolicy.
+  #
+  # You can also specify a custom class that implements ReconnectionPolicy and has a public
+  # constructor with a DriverContext argument.
+  class = ExponentialReconnectionPolicy
+  
+  # ExponentialReconnectionPolicy starts with the base delay, and doubles it after each failed
+  # reconnection attempt, up to the maximum delay (after that it stays constant).
+  #
+  # ConstantReconnectionPolicy only uses the base-delay value, the interval never changes.
+  base-delay = 1 second
+  max-delay = 60 seconds
+  }
+
+  # The policy that controls if the driver retries requests that have failed on one node.
+  #
+  # Required: yes
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: yes. Note that the driver creates as few instances as possible: if a
+  #   named profile inherits from the default profile, or if two sibling profiles have the exact
+  #   same configuration, they will share a single policy instance at runtime.
+  advanced.retry-policy {
+  # The class of the policy. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.retry.
+  #
+  # The driver provides a single implementation out of the box: DefaultRetryPolicy.
+  #
+  # You can also specify a custom class that implements RetryPolicy and has a public constructor
+  # with two arguments: the DriverContext and a String representing the profile name.
+  class = DefaultRetryPolicy
+  }
+
+  # The policy that controls if the driver pre-emptively tries other nodes if a node takes too long
+  # to respond.
+  #
+  # Required: yes
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: yes. Note that the driver creates as few instances as possible: if a
+  #   named profile inherits from the default profile, or if two sibling profiles have the exact
+  #   same configuration, they will share a single policy instance at runtime.
+  advanced.speculative-execution-policy {
+  # The class of the policy. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.specex.
+  #
+  # The following implementations are available out of the box:
+  # - NoSpeculativeExecutionPolicy: never schedule any speculative execution
+  # - ConstantSpeculativeExecutionPolicy: schedule executions based on constant delays. This
+  #   requires the `max-executions` and `delay` options below.
+  #
+  # You can also specify a custom class that implements SpeculativeExecutionPolicy and has a
+  # public constructor with two arguments: the DriverContext and a String representing the
+  # profile name.
+  class = NoSpeculativeExecutionPolicy
+  
+  # The maximum number of executions (including the initial, non-speculative execution).
+  # This must be at least one.
+  // max-executions = 3
+  
+  # The delay between each execution. 0 is allowed, and will result in all executions being sent
+  # simultaneously when the request starts.
+  #
+  # Note that sub-millisecond precision is not supported, any excess precision information will be
+  # dropped; in particular, delays of less than 1 millisecond are equivalent to 0.
+  #
+  # Also note that, because speculative executions are scheduled on the driver's timer thread,
+  # the duration specified here must be greater than the timer tick duration defined by the
+  # advanced.netty.timer.tick-duration setting (see below). If that is not the case, speculative
+  # executions will not be triggered as timely as desired.
+  #
+  # This must be positive or 0.
+  // delay = 100 milliseconds
+  }
+
+  # The component that handles authentication on each new connection.
+  #
+  # Required: no. If the 'class' child option is absent, no authentication will occur.
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  #
+  # Note that the contents of this section can be overridden programmatically with
+  # SessionBuilder.withAuthProvider or SessionBuilder.withAuthCredentials.
+  advanced.auth-provider {
+  # The class of the provider. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.auth.
+  #
+  # The driver provides a single implementation out of the box: PlainTextAuthProvider, that uses
+  # plain-text credentials. It requires the `username` and `password` options below.
+  # If storing clear text credentials in the configuration is not acceptable for you, consider
+  # providing them programmatically with SessionBuilder#withAuthCredentials, or writing your own
+  # provider implementation.
+  #
+  # You can also specify a custom class that implements AuthProvider and has a public
+  # constructor with a DriverContext argument.
+   class = PlainTextAuthProvider
+  
+  # Sample configuration for the plain-text provider:
+   username = cassandra
+   password = cassandra
+  }
+
+  # The SSL engine factory that will initialize an SSL engine for each new connection to a server.
+  #
+  # Required: no. If the 'class' child option is absent, SSL won't be activated.
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  #
+  # Note that the contents of this section can be overridden programmatically with
+  # SessionBuilder.withSslEngineFactory or SessionBuilder#withSslContext.
+  advanced.ssl-engine-factory {
+  # The class of the factory. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.ssl.
+  #
+  # The driver provides a single implementation out of the box: DefaultSslEngineFactory, that uses
+  # the JDK's built-in SSL implementation.
+  #
+  # You can also specify a custom class that implements SslEngineFactory and has a public
+  # constructor with a DriverContext argument.
+  // class = DefaultSslEngineFactory
+  
+  # Sample configuration for the default SSL factory:
+  # The cipher suites to enable when creating an SSLEngine for a connection.
+  # This property is optional. If it is not present, the driver won't explicitly enable cipher
+  # suites on the engine, which according to the JDK documentations results in "a minimum quality
+  # of service".
+  // cipher-suites = [ "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA" ]
+  
+  # Whether or not to require validation that the hostname of the server certificate's common
+  # name matches the hostname of the server being connected to. If not set, defaults to true.
+  // hostname-validation = true
+  
+  # The locations and passwords used to access truststore and keystore contents.
+  # These properties are optional. If either truststore-path or keystore-path are specified,
+  # the driver builds an SSLContext from these files.  If neither option is specified, the
+  # default SSLContext is used, which is based on system property configuration.
+  // truststore-path = /path/to/client.truststore
+  // truststore-password = password123
+  // keystore-path = /path/to/client.keystore
+  // keystore-password = password123
+  }
+
+  # The generator that assigns a microsecond timestamp to each request.
+  #
+  # Required: yes
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: yes. Note that the driver creates as few instances as possible: if a
+  #   named profile inherits from the default profile, or if two sibling profiles have the exact
+  #   same configuration, they will share a single generator instance at runtime.
+  advanced.timestamp-generator {
+  # The class of the generator. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.time.
+  #
+  # The driver provides the following implementations out of the box:
+  # - AtomicTimestampGenerator: timestamps are guaranteed to be unique across all client threads.
+  # - ThreadLocalTimestampGenerator: timestamps that are guaranteed to be unique within each
+  #   thread only.
+  # - ServerSideTimestampGenerator: do not generate timestamps, let the server assign them.
+  #
+  # You can also specify a custom class that implements TimestampGenerator and has a public
+  # constructor with two arguments: the DriverContext and a String representing the profile name.
+  class = AtomicTimestampGenerator
+  
+  # To guarantee that queries are applied on the server in the same order as the client issued
+  # them, timestamps must be strictly increasing. But this means that, if the driver sends more
+  # than one query per microsecond, timestamps will drift in the future. While this could happen
+  # occasionally under high load, it should not be a regular occurrence. Therefore the built-in
+  # implementations log a warning to detect potential issues.
+  drift-warning {
+  # How far in the future timestamps are allowed to drift before the warning is logged.
+  # If it is undefined or set to 0, warnings are disabled.
+  threshold = 1 second
+  
+  # How often the warning will be logged if timestamps keep drifting above the threshold.
+  interval = 10 seconds
+  }
+  
+  # Whether to force the driver to use Java's millisecond-precision system clock.
+  # If this is false, the driver will try to access the microsecond-precision OS clock via native
+  # calls (and fallback to the Java one if the native calls fail).
+  # Unless you explicitly want to avoid native calls, there's no reason to change this.
+  force-java-clock = false
+  }
+
+  # A session-wide component that tracks the outcome of requests.
+  #
+  # Required: yes
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: no
+  advanced.request-tracker {
+  # The class of the tracker. If it is not qualified, the driver assumes that it resides in the
+  # package com.datastax.oss.driver.internal.core.tracker.
+  #
+  # The driver provides the following implementations out of the box:
+  # - NoopRequestTracker: does nothing.
+  # - RequestLogger: logs requests (see the parameters below).
+  #
+  # You can also specify a custom class that implements RequestTracker and has a public
+  # constructor with a DriverContext argument.
+  class = NoopRequestTracker
+  
+  # Parameters for RequestLogger. All of them can be overridden in a profile, and changed at
+  # runtime (the new values will be taken into account for requests logged after the change).
+  logs {
+  # Whether to log successful requests.
+  // success.enabled = true
+  
+  slow {
+  # The threshold to classify a successful request as "slow". If this is unset, all successful
+  # requests will be considered as normal.
+  // threshold = 1 second
+  
+  # Whether to log slow requests.
+  // enabled = true
+  }
+  
+  # Whether to log failed requests.
+  // error.enabled = true
+  
+  # The maximum length of the query string in the log message. If it is longer than that, it
+  # will be truncated.
+  // max-query-length = 500
+  
+  # Whether to log bound values in addition to the query string.
+  // show-values = true
+  
+  # The maximum length for bound values in the log message. If the formatted representation of a
+  # value is longer than that, it will be truncated.
+  // max-value-length = 50
+  
+  # The maximum number of bound values to log. If a request has more values, the list of values
+  # will be truncated.
+  // max-values = 50
+  
+  # Whether to log stack traces for failed queries. If this is disabled, the log will just
+  # include the exception's string representation (generally the class name and message).
+  // show-stack-traces = true
+  }
+  }
+
+  # A session-wide component that controls the rate at which requests are executed.
+  #
+  # Implementations vary, but throttlers generally track a metric that represents the level of
+  # utilization of the session, and prevent new requests from starting when that metric exceeds a
+  # threshold. Pending requests may be enqueued and retried later.
+  #
+  # From the public API's point of view, this process is mostly transparent: any time that the
+  # request is throttled is included in the session.execute() or session.executeAsync() call.
+  # Similarly, the request timeout encompasses throttling: the timeout starts ticking before the
+  # throttler has started processing the request; a request may time out while it is still in the
+  # throttler's queue, before the driver has even tried to send it to a node.
+  #
+  # The only visible effect is that a request may fail with a RequestThrottlingException, if the
+  # throttler has determined that it can neither allow the request to proceed now, nor enqueue it;
+  # this indicates that your session is overloaded.
+  #
+  # Required: yes
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: no
+  advanced.throttler {
+  # The class of the throttler. If it is not qualified, the driver assumes that it resides in
+  # the package com.datastax.oss.driver.internal.core.session.throttling.
+  #
+  # The driver provides the following implementations out of the box:
+  #
+  # - PassThroughRequestThrottler: does not perform any kind of throttling, all requests are
+  #   allowed to proceed immediately. Required options: none.
+  #
+  # - ConcurrencyLimitingRequestThrottler: limits the number of requests that can be executed in
+  #   parallel. Required options: max-concurrent-requests, max-queue-size.
+  #
+  # - RateLimitingRequestThrottler: limits the request rate per second. Required options:
+  #   max-requests-per-second, max-queue-size, drain-interval.
+  #
+  # You can also specify a custom class that implements RequestThrottler and has a public
+  # constructor with a DriverContext argument.
+  class = PassThroughRequestThrottler
+  
+  # The maximum number of requests that can be enqueued when the throttling threshold is exceeded.
+  # Beyond that size, requests will fail with a RequestThrottlingException.
+  // max-queue-size = 10000
+  
+  # The maximum number of requests that are allowed to execute in parallel.
+  # Only used by ConcurrencyLimitingRequestThrottler.
+  // max-concurrent-requests = 10000
+  
+  # The maximum allowed request rate.
+  # Only used by RateLimitingRequestThrottler.
+  // max-requests-per-second = 10000
+  
+  # How often the throttler attempts to dequeue requests. This is the only way for rate-based
+  # throttling, because the completion of an active request does not necessarily free a "slot" for
+  # a queued one (the rate might still be too high).
+  #
+  # You want to set this high enough that each attempt will process multiple entries in the queue,
+  # but not delay requests too much. A few milliseconds is probably a happy medium.
+  #
+  # Only used by RateLimitingRequestThrottler.
+  // drain-interval = 10 milliseconds
+  }
+
+  # A session-wide component that listens for node state changes. If it is not qualified, the driver
+  # assumes that it resides in the package com.datastax.oss.driver.internal.core.metadata.
+  #
+  # The driver provides a single no-op implementation out of the box: NoopNodeStateListener.
+  #
+  # You can also specify a custom class that implements NodeStateListener and has a public
+  # constructor with a DriverContext argument.
+  #
+  # Alternatively, you can pass an instance of your listener programmatically with
+  # CqlSession.builder().withNodeStateListener(). In that case, this option will be ignored.
+  #
+  # Required: unless a listener has been provided programmatically
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: no
+  advanced.node-state-listener.class = NoopNodeStateListener
+
+  # A session-wide component that listens for node state changes. If it is not qualified, the driver
+  # assumes that it resides in the package com.datastax.oss.driver.internal.core.metadata.schema.
+  #
+  # The driver provides a single no-op implementation out of the box: NoopSchemaChangeListener.
+  #
+  # You can also specify a custom class that implements SchemaChangeListener and has a public
+  # constructor with a DriverContext argument.
+  #
+  # Alternatively, you can pass an instance of your listener programmatically with
+  # CqlSession.builder().withSchemaChangeListener(). In that case, this option will be ignored.
+  #
+  # Required: unless a listener has been provided programmatically
+  # Modifiable at runtime: no (but custom implementations may elect to watch configuration changes
+  #   and allow child options to be changed at runtime).
+  # Overridable in a profile: no
+  advanced.schema-change-listener.class = NoopSchemaChangeListener
+
+  # The address translator to use to convert the addresses sent by Cassandra nodes into ones that
+  # the driver uses to connect.
+  # This is only needed if the nodes are not directly reachable from the driver (for example, the
+  # driver is in a different network region and needs to use a public IP, or it connects through a
+  # proxy).
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  advanced.address-translator {
+  # The class of the translator. If it is not qualified, the driver assumes that it resides in
+  # the package com.datastax.oss.driver.internal.core.addresstranslation.
+  #
+  # The driver provides the following implementations out of the box:
+  # - PassThroughAddressTranslator: returns all addresses unchanged
+  #
+  # You can also specify a custom class that implements AddressTranslator and has a public
+  # constructor with a DriverContext argument.
+  class = PassThroughAddressTranslator
+  }
+
+  # Whether to resolve the addresses passed to `basic.contact-points`.
+  #
+  # If this is true, addresses are created with `InetSocketAddress(String, int)`: the host name will
+  # be resolved the first time, and the driver will use the resolved IP address for all subsequent
+  # connection attempts.
+  #
+  # If this is false, addresses are created with `InetSocketAddress.createUnresolved()`: the host
+  # name will be resolved again every time the driver opens a new connection. This is useful for
+  # containerized environments where DNS records are more likely to change over time (note that the
+  # JVM and OS have their own DNS caching mechanisms, so you might need additional configuration
+  # beyond the driver).
+  #
+  # This option only applies to the contact points specified in the configuration. It has no effect
+  # on:
+  # - programmatic contact points passed to SessionBuilder.addContactPoints: these addresses are
+  #   built outside of the driver, so it is your responsibility to provide unresolved instances.
+  # - dynamically discovered peers: the driver relies on Cassandra system tables, which expose raw
+  #   IP addresses. Use a custom address translator to convert them to unresolved addresses (if
+  #   you're in a containerized environment, you probably already need address translation anyway).
+  #
+  # Required: no (defaults to true)
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  advanced.resolve-contact-points = true
+
+  advanced.protocol {
+  # The native protocol version to use.
+  #
+  # If this option is absent, the driver looks up the versions of the nodes at startup (by default
+  # in system.peers.release_version), and chooses the highest common protocol version.
+  # For example, if you have a mixed cluster with Apache Cassandra 2.1 nodes (protocol v3) and
+  # Apache Cassandra 3.0 nodes (protocol v3 and v4), then protocol v3 is chosen. If the nodes
+  # don't have a common protocol version, initialization fails.
+  #
+  # If this option is set, then the given version will be used for all connections, without any
+  # negotiation or downgrading. If any of the contact points doesn't support it, that contact
+  # point will be skipped.
+  #
+  # Once the protocol version is set, it can't change for the rest of the driver's lifetime; if
+  # an incompatible node joins the cluster later, connection will fail and the driver will force
+  # it down (i.e. never try to connect to it again).
+  #
+  # You can check the actual version at runtime with Cluster.getContext().getProtocolVersion().
+  #
+  # Required: no
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  // version = V4
+  
+  # The name of the algorithm used to compress protocol frames.
+  #
+  # The possible values are:
+  # - lz4: requires net.jpountz.lz4:lz4 in the classpath.
+  # - snappy: requires org.xerial.snappy:snappy-java in the classpath.
+  # - the string "none" to indicate no compression (this is functionally equivalent to omitting
+  #   the option).
+  #
+  # The driver depends on the compression libraries, but they are optional. Make sure you
+  # redeclare an explicit dependency in your project. Refer to the driver's POM or manual for the
+  # exact version.
+  #
+  # Required: no. If the option is absent, protocol frames are not compressed.
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  // compression = lz4
+  
+  # The maximum length of the frames supported by the driver. Beyond that limit, requests will
+  # fail with an exception
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  max-frame-length = 256 MB
+  }
+
+  advanced.request {
+  # Whether a warning is logged when a request (such as a CQL `USE ...`) changes the active
+  # keyspace.
+  # Switching keyspace at runtime is highly discouraged, because it is inherently unsafe (other
+  # requests expecting the old keyspace might be running concurrently), and may cause statements
+  # prepared before the change to fail.
+  # It should only be done in very specific use cases where there is only a single client thread
+  # executing synchronous queries (such as a cqlsh-like interpreter). In other cases, clients
+  # should prefix table names in their queries instead.
+  #
+  # Note that CASSANDRA-10145 (scheduled for C* 4.0) will introduce a per-request keyspace option
+  # as a workaround to this issue.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for keyspace switches occurring after
+  #   the change.
+  # Overridable in a profile: no
+  warn-if-set-keyspace = true
+  
+  # If tracing is enabled for a query, this controls how the trace is fetched.
+  trace {
+  # How many times the driver will attempt to fetch the query if it is not ready yet.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for traces fetched after the change.
+  # Overridable in a profile: yes
+  attempts = 5
+  
+  # The interval between each attempt.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for traces fetched after the change.
+  # Overridable in a profile: yes
+  interval = 3 milliseconds
+  
+  # The consistency level to use for trace queries.
+  # Note that the default replication strategy for the system_traces keyspace is SimpleStrategy
+  # with RF=2, therefore LOCAL_ONE might not work if the local DC has no replicas for a given
+  # trace id.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for traces fetched after the change.
+  # Overridable in a profile: yes
+  consistency = ONE
+  }
+  
+  # Whether logging of server warnings generated during query execution should be disabled by the
+  # driver. All server generated warnings will be available programmatically via the ExecutionInfo
+  # object on the executed statement's ResultSet. If set to "false", this will prevent the driver
+  # from logging these warnings.
+  #
+  # NOTE: The log formatting for these warning messages will reuse the options defined for
+  # advanced.request-tracker.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for query warnings received after the change.
+  # Overridable in a profile: yes
+  log-warnings = true
+  }
+
+  advanced.metrics {
+  # The session-level metrics (all disabled by default).
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  session {
+  enabled = [
+  # The number and rate of bytes sent for the entire session (exposed as a Meter).
+  // bytes-sent,
+  
+  # The number and rate of bytes received for the entire session (exposed as a Meter).
+  // bytes-received
+  
+  # The number of nodes to which the driver has at least one active connection (exposed as a
+  # Gauge<Integer>).
+  // connected-nodes,
+  
+  # The throughput and latency percentiles of CQL requests (exposed as a Timer).
+  #
+  # This corresponds to the overall duration of the session.execute() call, including any
+  # retry.
+  // cql-requests,
+  
+  # The number of CQL requests that timed out -- that is, the session.execute() call failed
+  # with a DriverTimeoutException (exposed as a Counter).
+  // cql-client-timeouts,
+  
+  # The size of the driver-side cache of CQL prepared statements.
+  #
+  # The cache uses weak values eviction, so this represents the number of PreparedStatement
+  # instances that your application has created, and is still holding a reference to. Note
+  # that the returned value is approximate.
+  // cql-prepared-cache-size,
+  
+  # How long requests are being throttled (exposed as a Timer).
+  #
+  # This is the time between the start of the session.execute() call, and the moment when
+  # the throttler allows the request to proceed.
+  // throttling.delay,
+  
+  # The size of the throttling queue (exposed as a Gauge<Integer>).
+  #
+  # This is the number of requests that the throttler is currently delaying in order to
+  # preserve its SLA. This metric only works with the built-in concurrency- and rate-based
+  # throttlers; in other cases, it will always be 0.
+  // throttling.queue-size,
+  
+  # The number of times a request was rejected with a RequestThrottlingException (exposed as
+  # a Counter)
+  // throttling.errors,
+  ]
+  
+  # Extra configuration (for the metrics that need it)
+  
+  # Required: if the 'cql-requests' metric is enabled
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  cql-requests {
+  # The largest latency that we expect to record.
+  #
+  # This should be slightly higher than request.timeout (in theory, readings can't be higher
+  # than the timeout, but there might be a small overhead due to internal scheduling).
+  #
+  # This is used to scale internal data structures. If a higher recording is encountered at
+  # runtime, it is discarded and a warning is logged.
+  highest-latency = 3 seconds
+  
+  # The number of significant decimal digits to which internal structures will maintain
+  # value resolution and separation (for example, 3 means that recordings up to 1 second
+  # will be recorded with a resolution of 1 millisecond or better).
+  #
+  # This must be between 0 and 5. If the value is out of range, it defaults to 3 and a
+  # warning is logged.
+  significant-digits = 3
+  
+  # The interval at which percentile data is refreshed.
+  #
+  # The driver records latency data in a "live" histogram, and serves results from a cached
+  # snapshot. Each time the snapshot gets older than the interval, the two are switched.
+  # Note that this switch happens upon fetching the metrics, so if you never fetch the
+  # recording interval might grow higher (that shouldn't be an issue in a production
+  # environment because you would typically have a metrics reporter that exports to a
+  # monitoring tool at a regular interval).
+  #
+  # In practice, this means that if you set this to 5 minutes, you're looking at data from a
+  # 5-minute interval in the past, that is at most 5 minutes old. If you fetch the metrics
+  # at a faster pace, you will observe the same data for 5 minutes until the interval
+  # expires.
+  #
+  # Note that this does not apply to the total count and rates (those are updated in real
+  # time).
+  refresh-interval = 5 minutes
+  }
+  
+  # Required: if the 'throttling.delay' metric is enabled
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  throttling.delay {
+  highest-latency = 3 seconds
+  significant-digits = 3
+  refresh-interval = 5 minutes
+  }
+  }
+  # The node-level metrics (all disabled by default).
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  node {
+  enabled = [
+  # The number of connections open to this node for regular requests (exposed as a
+  # Gauge<Integer>).
+  #
+  # This includes the control connection (which uses at most one extra connection to a
+  # random node in the cluster).
+  // pool.open-connections,
+  
+  # The number of stream ids available on the connections to this node (exposed as a
+  # Gauge<Integer>).
+  #
+  # Stream ids are used to multiplex requests on each connection, so this is an indication
+  # of how many more requests the node could handle concurrently before becoming saturated
+  # (note that this is a driver-side only consideration, there might be other limitations on
+  # the server that prevent reaching that theoretical limit).
+  // pool.available-streams,
+  
+  # The number of requests currently executing on the connections to this node (exposed as a
+  # Gauge<Integer>). This includes orphaned streams.
+  // pool.in-flight,
+  
+  # The number of "orphaned" stream ids on the connections to this node (exposed as a
+  # Gauge<Integer>).
+  #
+  # See the description of the connection.max-orphan-requests option for more details.
+  // pool.orphaned-streams,
+  
+  # The number and rate of bytes sent to this node (exposed as a Meter).
+  // bytes-sent,
+  
+  # The number and rate of bytes received from this node (exposed as a Meter).
+  // bytes-received,
+  
+  # The throughput and latency percentiles of individual CQL messages sent to this node as
+  # part of an overall request (exposed as a Timer).
+  #
+  # Note that this does not necessarily correspond to the overall duration of the
+  # session.execute() call, since the driver might query multiple nodes because of retries
+  # and speculative executions. Therefore a single "request" (as seen from a client of the
+  # driver) can be composed of more than one of the "messages" measured by this metric.
+  #
+  # Therefore this metric is intended as an insight into the performance of this particular
+  # node. For statistics on overall request completion, use the session-level cql-requests.
+  // cql-messages,
+  
+  # The number of times the driver failed to send a request to this node (exposed as a
+  # Counter).
+  #
+  # In those case we know the request didn't even reach the coordinator, so they are retried
+  # on the next node automatically (without going through the retry policy).
+  // errors.request.unsent,
+  
+  # The number of times a request was aborted before the driver even received a response
+  # from this node (exposed as a Counter).
+  #
+  # This can happen in two cases: if the connection was closed due to an external event
+  # (such as a network error or heartbeat failure); or if there was an unexpected error
+  # while decoding the response (this can only be a driver bug).
+  // errors.request.aborted,
+  
+  # The number of times this node replied with a WRITE_TIMEOUT error (exposed as a Counter).
+  #
+  # Whether this error is rethrown directly to the client, rethrown or ignored is determined
+  # by the RetryPolicy.
+  // errors.request.write-timeouts,
+  
+  # The number of times this node replied with a READ_TIMEOUT error (exposed as a Counter).
+  #
+  # Whether this error is rethrown directly to the client, rethrown or ignored is determined
+  # by the RetryPolicy.
+  // errors.request.read-timeouts,
+  
+  # The number of times this node replied with an UNAVAILABLE error (exposed as a Counter).
+  #
+  # Whether this error is rethrown directly to the client, rethrown or ignored is determined
+  # by the RetryPolicy.
+  // errors.request.unavailables,
+  
+  # The number of times this node replied with an error that doesn't fall under other
+  # 'errors.*' metrics (exposed as a Counter).
+  // errors.request.others,
+  
+  # The total number of errors on this node that caused the RetryPolicy to trigger a retry
+  # (exposed as a Counter).
+  #
+  # This is a sum of all the other retries.* metrics.
+  // retries.total,
+  
+  # The number of errors on this node that caused the RetryPolicy to trigger a retry, broken
+  # down by error type (exposed as Counters).
+  // retries.aborted,
+  // retries.read-timeout,
+  // retries.write-timeout,
+  // retries.unavailable,
+  // retries.other,
+  
+  # The total number of errors on this node that were ignored by the RetryPolicy (exposed as
+  # a Counter).
+  #
+  # This is a sum of all the other ignores.* metrics.
+  // ignores.total,
+  
+  # The number of errors on this node that were ignored by the RetryPolicy, broken down by
+  # error type (exposed as Counters).
+  // ignores.aborted,
+  // ignores.read-timeout,
+  // ignores.write-timeout,
+  // ignores.unavailable,
+  // ignores.other,
+  
+  # The number of speculative executions triggered by a slow response from this node
+  # (exposed as a Counter).
+  // speculative-executions,
+  
+  # The number of errors encountered while trying to establish a connection to this node
+  # (exposed as a Counter).
+  #
+  # Connection errors are not a fatal issue for the driver, failed connections will be
+  # retried periodically according to the reconnection policy. You can choose whether or not
+  # to log those errors at WARN level with the connection.warn-on-init-error option.
+  #
+  # Authentication errors are not included in this counter, they are tracked separately in
+  # errors.connection.auth.
+  // errors.connection.init,
+  
+  # The number of authentication errors encountered while trying to establish a connection
+  # to this node (exposed as a Counter).
+  # Authentication errors are also logged at WARN level.
+  // errors.connection.auth,
+  ]
+  
+  # See cql-requests in the `session` section
+  #
+  # Required: if the 'cql-messages' metric is enabled
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  cql-messages {
+  highest-latency = 3 seconds
+  significant-digits = 3
+  refresh-interval = 5 minutes
+  }
+  }
+  }
+
+  advanced.socket {
+  # Whether or not to disable the Nagle algorithm.
+  #
+  # By default, this option is set to true (Nagle disabled), because the driver has its own
+  # internal message coalescing algorithm.
+  #
+  # See java.net.StandardSocketOptions.TCP_NODELAY.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  tcp-no-delay = true
+  
+  # All other socket options are unset by default. The actual value depends on the underlying
+  # Netty transport:
+  # - NIO uses the defaults from java.net.Socket (refer to the javadocs of
+  #   java.net.StandardSocketOptions for each option).
+  # - Epoll delegates to the underlying file descriptor, which uses the O/S defaults.
+  
+  # Whether or not to enable TCP keep-alive probes.
+  #
+  # See java.net.StandardSocketOptions.SO_KEEPALIVE.
+  #
+  # Required: no
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  //keep-alive = false
+  
+  # Whether or not to allow address reuse.
+  #
+  # See java.net.StandardSocketOptions.SO_REUSEADDR.
+  #
+  # Required: no
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  //reuse-address = true
+  
+  # Sets the linger interval.
+  #
+  # If the value is zero or greater, then it represents a timeout value, in seconds;
+  # if the value is negative, it means that this option is disabled.
+  #
+  # See java.net.StandardSocketOptions.SO_LINGER.
+  #
+  # Required: no
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  //linger-interval = 0
+  
+  # Sets a hint to the size of the underlying buffers for incoming network I/O.
+  #
+  # See java.net.StandardSocketOptions.SO_RCVBUF.
+  #
+  # Required: no
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  //receive-buffer-size = 65535
+  
+  # Sets a hint to the size of the underlying buffers for outgoing network I/O.
+  #
+  # See java.net.StandardSocketOptions.SO_SNDBUF.
+  #
+  # Required: no
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  //send-buffer-size = 65535
+  }
+
+  advanced.heartbeat {
+  # The heartbeat interval. If a connection stays idle for that duration (no reads), the driver
+  # sends a dummy message on it to make sure it's still alive. If not, the connection is trashed
+  # and replaced.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  interval = 30 seconds
+  
+  # How long the driver waits for the response to a heartbeat. If this timeout fires, the
+  # heartbeat is considered failed.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for connections created after the
+  #   change.
+  # Overridable in a profile: no
+  timeout = ${datastax-java-driver.advanced.connection.init-query-timeout}
+  }
+
+  advanced.metadata {
+  # Topology events are external signals that inform the driver of the state of Cassandra nodes
+  # (by default, they correspond to gossip events received on the control connection).
+  # The debouncer helps smoothen out oscillations if conflicting events are sent out in short
+  # bursts.
+  # Debouncing may be disabled by setting the window to 0 or max-events to 1 (this is not
+  # recommended).
+  topology-event-debouncer {
+  # How long the driver waits to propagate an event. If another event is received within that
+  # time, the window is reset and a batch of accumulated events will be delivered.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  window = 1 second
+  
+  # The maximum number of events that can accumulate. If this count is reached, the events are
+  # delivered immediately and the time window is reset. This avoids holding events indefinitely
+  # if the window keeps getting reset.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  max-events = 20
+  }
+  
+  # Options relating to schema metadata (Cluster.getMetadata.getKeyspaces).
+  # This metadata is exposed by the driver for informational purposes, and is also necessary for
+  # token-aware routing.
+  schema {
+  # Whether schema metadata is enabled.
+  # If this is false, the schema will remain empty, or to the last known value.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for refreshes issued after the
+  #   change. It can also be overridden programmatically via Cluster.setSchemaMetadataEnabled.
+  # Overridable in a profile: no
+  enabled = true
+  
+  # The list of keyspaces for which schema and token metadata should be maintained. If this
+  # property is absent or empty, all existing keyspaces are processed.
+  #
+  # Required: no
+  # Modifiable at runtime: yes, the new value will be used for refreshes issued after the
+  #   change.
+  # Overridable in a profile: no
+  // refreshed-keyspaces = [ "ks1", "ks2" ]
+  
+  # The timeout for the requests to the schema tables.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for refreshes issued after the
+  #   change.
+  # Overridable in a profile: no
+  request-timeout = ${datastax-java-driver.basic.request.timeout}
+  
+  # The page size for the requests to the schema tables.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for refreshes issued after the
+  #   change.
+  # Overridable in a profile: no
+  request-page-size = ${datastax-java-driver.basic.request.page-size}
+  
+  # Protects against bursts of schema updates (for example when a client issues a sequence of
+  # DDL queries), by coalescing them into a single update.
+  # Debouncing may be disabled by setting the window to 0 or max-events to 1 (this is highly
+  # discouraged for schema refreshes).
+  debouncer {
+  # How long the driver waits to apply a refresh. If another refresh is requested within that
+  # time, the window is reset and a single refresh will be triggered when it ends.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  window = 1 second
+  
+  # The maximum number of refreshes that can accumulate. If this count is reached, a refresh
+  # is done immediately and the window is reset.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  max-events = 20
+  }
+  }
+  
+  # Whether token metadata (Cluster.getMetadata.getTokenMap) is enabled.
+  # This metadata is exposed by the driver for informational purposes, and is also necessary for
+  # token-aware routing.
+  # If this is false, it will remain empty, or to the last known value. Note that its computation
+  # requires information about the schema; therefore if schema metadata is disabled or filtered to
+  # a subset of keyspaces, the token map will be incomplete, regardless of the value of this
+  # property.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for refreshes issued after the change.
+  # Overridable in a profile: no
+  token-map.enabled = true
+  }
+
+  advanced.control-connection {
+  # How long the driver waits for responses to control queries (e.g. fetching the list of nodes,
+  # refreshing the schema).
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  timeout = ${datastax-java-driver.advanced.connection.init-query-timeout}
+  
+  # Due to the distributed nature of Cassandra, schema changes made on one node might not be
+  # immediately visible to others. Under certain circumstances, the driver waits until all nodes
+  # agree on a common schema version (namely: before a schema refresh, before repreparing all
+  # queries on a newly up node, and before completing a successful schema-altering query). To do
+  # so, it queries system tables to find out the schema version of all nodes that are currently
+  # UP. If all the versions match, the check succeeds, otherwise it is retried periodically, until
+  # a given timeout.
+  #
+  # A schema agreement failure is not fatal, but it might produce unexpected results (for example,
+  # getting an "unconfigured table" error for a table that you created right before, just because
+  # the two queries went to different coordinators).
+  #
+  # Note that schema agreement never succeeds in a mixed-version cluster (it would be challenging
+  # because the way the schema version is computed varies across server versions); the assumption
+  # is that schema updates are unlikely to happen during a rolling upgrade anyway.
+  schema-agreement {
+  # The interval between each attempt.
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for checks issued after the change.
+  # Overridable in a profile: no
+  interval = 200 milliseconds
+  
+  # The timeout after which schema agreement fails.
+  # If this is set to 0, schema agreement is skipped and will always fail.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for checks issued after the change.
+  # Overridable in a profile: no
+  timeout = 10 seconds
+  
+  # Whether to log a warning if schema agreement fails.
+  # You might want to change this if you've set the timeout to 0.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for checks issued after the change.
+  # Overridable in a profile: no
+  warn-on-failure = true
+  }
+  }
+
+  advanced.prepared-statements {
+  # Whether `Session.prepare` calls should be sent to all nodes in the cluster.
+  #
+  # A request to prepare is handled in two steps:
+  # 1) send to a single node first (to rule out simple errors like malformed queries).
+  # 2) if step 1 succeeds, re-send to all other active nodes (i.e. not ignored by the load
+  # balancing policy).
+  # This option controls whether step 2 is executed.
+  #
+  # The reason why you might want to disable it is to optimize network usage if you have a large
+  # number of clients preparing the same set of statements at startup. If your load balancing
+  # policy distributes queries randomly, each client will pick a different host to prepare its
+  # statements, and on the whole each host has a good chance of having been hit by at least one
+  # client for each statement.
+  # On the other hand, if that assumption turns out to be wrong and one host hasn't prepared a
+  # given statement, it needs to be re-prepared on the fly the first time it gets executed; this
+  # causes a performance penalty (one extra roundtrip to resend the query to prepare, and another
+  # to retry the execution).
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for prepares issued after the change.
+  # Overridable in a profile: yes
+  prepare-on-all-nodes = true
+  
+  # How the driver replicates prepared statements on a node that just came back up or joined the
+  # cluster.
+  reprepare-on-up {
+  # Whether the driver tries to prepare on new nodes at all.
+  #
+  # The reason why you might want to disable it is to optimize reconnection time when you
+  # believe nodes often get marked down because of temporary network issues, rather than the
+  # node really crashing. In that case, the node still has prepared statements in its cache when
+  # the driver reconnects, so re-preparing is redundant.
+  #
+  # On the other hand, if that assumption turns out to be wrong and the node had really
+  # restarted, its prepared statement cache is empty (before CASSANDRA-8831), and statements
+  # need to be re-prepared on the fly the first time they get executed; this causes a
+  # performance penalty (one extra roundtrip to resend the query to prepare, and another to
+  # retry the execution).
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for nodes that come back up after the
+  #   change.
+  # Overridable in a profile: no
+  enabled = true
+  
+  # Whether to check `system.prepared_statements` on the target node before repreparing.
+  #
+  # This table exists since CASSANDRA-8831 (merged in 3.10). It stores the statements already
+  # prepared on the node, and preserves them across restarts.
+  #
+  # Checking the table first avoids repreparing unnecessarily, but the cost of the query is not
+  # always worth the improvement, especially if the number of statements is low.
+  #
+  # If the table does not exist, or the query fails for any other reason, the error is ignored
+  # and the driver proceeds to reprepare statements according to the other parameters.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for nodes that come back up after the
+  #   change.
+  # Overridable in a profile: no
+  check-system-table = false
+  
+  # The maximum number of statements that should be reprepared. 0 or a negative value means no
+  # limit.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for nodes that come back up after the
+  #   change.
+  # Overridable in a profile: no
+  max-statements = 0
+  
+  # The maximum number of concurrent requests when repreparing.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for nodes that come back up after the
+  #   change.
+  # Overridable in a profile: no
+  max-parallelism = 100
+  
+  # The request timeout. This applies both to querying the system.prepared_statements table (if
+  # relevant), and the prepare requests themselves.
+  #
+  # Required: yes
+  # Modifiable at runtime: yes, the new value will be used for nodes that come back up after the
+  #   change.
+  # Overridable in a profile: no
+  timeout = ${datastax-java-driver.advanced.connection.init-query-timeout}
+  }
+  }
+
+  # Options related to the Netty event loop groups used internally by the driver.
+  advanced.netty {
+  
+  # Whether the threads created by the driver should be daemon threads.
+  # This will apply to the threads in io-group, admin-group, and the timer thread.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  daemon = false
+  
+  # The event loop group used for I/O operations (reading and writing to Cassandra nodes).
+  # By default, threads in this group are named after the session name, "-io-" and an incrementing
+  # counter, for example "s0-io-0".
+  io-group {
+  # The number of threads.
+  # If this is set to 0, the driver will use `Runtime.getRuntime().availableProcessors() * 2`.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  size = 0
+  
+  # The options to shut down the event loop group gracefully when the driver closes. If a task
+  # gets submitted during the quiet period, it is accepted and the quiet period starts over.
+  # The timeout limits the overall shutdown time.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  shutdown {quiet-period = 2, timeout = 15, unit = SECONDS}
+  }
+  # The event loop group used for admin tasks not related to request I/O (handle cluster events,
+  # refresh metadata, schedule reconnections, etc.)
+  # By default, threads in this group are named after the session name, "-admin-" and an
+  # incrementing counter, for example "s0-admin-0".
+  admin-group {
+  size = 2
+  
+  shutdown {quiet-period = 2, timeout = 15, unit = SECONDS}
+  }
+  # The timer used for scheduling request timeouts and speculative executions
+  # By default, this thread is named after the session name and "-timer-0", for example
+  # "s0-timer-0".
+  timer {
+  # The timer tick duration.
+  # This is how frequent the timer should wake up to check for timed-out tasks or speculative
+  # executions. Lower resolution (i.e. longer durations) will leave more CPU cycles for running
+  # I/O operations at the cost of precision of exactly when a request timeout will expire or a
+  # speculative execution will run. Higher resolution (i.e. shorter durations) will result in
+  # more precise request timeouts and speculative execution scheduling, but at the cost of CPU
+  # cycles taken from I/O operations, which could lead to lower overall I/O throughput.
+  #
+  # The default value is 100 milliseconds, which is a comfortable value for most use cases.
+  # However if you are using more agressive timeouts or speculative execution delays, then you
+  # should lower the timer tick duration as well, so that its value is always equal to or lesser
+  # than the timeout duration and/or speculative execution delay you intend to use.
+  #
+  # Note for Windows users: avoid setting this to aggressive values, that is, anything under 100
+  # milliseconds; doing so is known to cause extreme CPU usage. Also, the tick duration must be
+  # a multiple of 10 under Windows; if that is not the case, it will be automatically rounded
+  # down to the nearest multiple of 10 (e.g. 99 milliseconds will be rounded down to 90
+  # milliseconds).
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  tick-duration = 100 milliseconds
+  
+  # Number of ticks in a Timer wheel. The underlying implementation uses Netty's
+  # HashedWheelTimer, which uses hashes to arrange the timeouts. This effectively controls the
+  # size of the timer wheel.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  ticks-per-wheel = 2048
+  }
+  }
+
+  # The component that coalesces writes on the connections.
+  # This is exposed mainly to facilitate tuning during development. You shouldn't have to adjust
+  # this.
+  advanced.coalescer {
+  # How many times the coalescer is allowed to reschedule itself when it did no work.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  max-runs-with-no-work = 5
+  
+  # The reschedule interval.
+  #
+  # Required: yes
+  # Modifiable at runtime: no
+  # Overridable in a profile: no
+  reschedule-interval = 10 microseconds
+  }
+
+  profiles {
+  # This is where your custom profiles go, for example:
+  # olap {
+  #   basic.request.timeout = 5 seconds
+  # }
+  }
+}
\ No newline at end of file
diff --git a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoader.java b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoader.java
index 220afea4ea..8188f68583 100644
--- a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoader.java
+++ b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoader.java
@@ -16,15 +16,18 @@
 package com.google.cloud.teleport.v2.spanner.migrations.utils;
 
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
+import com.datastax.oss.driver.api.core.config.DriverOption;
 import com.datastax.oss.driver.api.core.config.OptionsMap;
 import com.datastax.oss.driver.api.core.config.TypedDriverOption;
+import com.datastax.oss.driver.api.core.type.reflect.GenericType;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableMap;
 import com.typesafe.config.ConfigException;
 import java.io.FileNotFoundException;
 import java.net.URL;
-import java.util.Map.Entry;
+import java.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -82,7 +85,12 @@ public static OptionsMap getOptionsMapFromFile(String path) throws FileNotFoundE
         .getProfiles()
         .forEach(
             (profileName, profile) ->
-                profile.entrySet().forEach(e -> putInOptionsMap(optionsMap, profileName, e)));
+                profile
+                    .entrySet()
+                    .forEach(
+                        e ->
+                            putInOptionsMap(
+                                optionsMap, profileName, e.getKey(), e.getValue(), profile)));
 
     return optionsMap;
   }
@@ -120,20 +128,43 @@ protected static URL loadSingleFile(String path) throws FileNotFoundException {
 
   @VisibleForTesting
   protected static void putInOptionsMap(
-      OptionsMap optionsMap, String profileName, Entry<String, Object> e) {
+      OptionsMap optionsMap,
+      String profileName,
+      String optionName,
+      Object untypedValue,
+      DriverExecutionProfile profile) {
 
-    TypedDriverOption option = OPTIONS_SUPPORTED_BY_DRIVER.get(e.getKey());
+    TypedDriverOption option = OPTIONS_SUPPORTED_BY_DRIVER.get(optionName);
     if (Objects.equal(option, null)) {
       LOG.error(
           "Unknown Cassandra Option {}, Options supported by driver = {}",
-          e.getKey(),
+          optionName,
           OPTIONS_SUPPORTED_BY_DRIVER);
       throw new IllegalArgumentException(
           String.format(
               "Unknown Cassandra Driver Option %s. Supported Options = %s",
-              e.getKey(), OPTIONS_SUPPORTED_BY_DRIVER));
+              optionName, OPTIONS_SUPPORTED_BY_DRIVER));
     }
-    optionsMap.put(profileName, option, e.getValue());
+    putOptionInOptionsMap(optionsMap, profileName, profile, untypedValue, option);
+  }
+
+  @VisibleForTesting
+  protected static void putOptionInOptionsMap(
+      OptionsMap optionsMap,
+      String profileName,
+      DriverExecutionProfile profile,
+      Object untypedValue,
+      TypedDriverOption option) {
+
+    ProfileExtractor profileExtractor =
+        TYPED_EXTRACTORS.getOrDefault(option.getExpectedType(), (p, o) -> untypedValue);
+    // For "protocol.max-frame-length" are defined as GenericType<Long> in TypedOptions.
+    // but the driver Config API needs getBytes for handling size units like MB.
+    if (option.equals(TypedDriverOption.PROTOCOL_MAX_FRAME_LENGTH)) {
+      profileExtractor = (p, o) -> p.getBytes(o);
+    }
+
+    optionsMap.put(profileName, option, profileExtractor.get(profile, option.getRawOption()));
   }
 
   private static ImmutableMap<String, TypedDriverOption> getOptionsSupportedByDriver() {
@@ -142,5 +173,26 @@ private static ImmutableMap<String, TypedDriverOption> getOptionsSupportedByDriv
     return mapBuilder.build();
   }
 
+  private interface ProfileExtractor<ValueT> {
+    ValueT get(DriverExecutionProfile profile, DriverOption driverOption);
+  }
+
+  private static final ImmutableMap<GenericType<?>, ProfileExtractor> TYPED_EXTRACTORS =
+      ImmutableMap.<GenericType<?>, ProfileExtractor>builder()
+          .put(GenericType.of(Boolean.class), DriverExecutionProfile::getBoolean)
+          .put(GenericType.listOf(Boolean.class), DriverExecutionProfile::getBooleanList)
+          .put(GenericType.of(Double.class), DriverExecutionProfile::getDouble)
+          .put(GenericType.listOf(Double.class), DriverExecutionProfile::getDoubleList)
+          .put(GenericType.of(Duration.class), DriverExecutionProfile::getDuration)
+          .put(GenericType.listOf(Duration.class), DriverExecutionProfile::getDurationList)
+          .put(GenericType.of(Integer.class), DriverExecutionProfile::getInt)
+          .put(GenericType.listOf(Integer.class), DriverExecutionProfile::getIntList)
+          .put(GenericType.of(Long.class), DriverExecutionProfile::getLong)
+          .put(GenericType.listOf(Long.class), DriverExecutionProfile::getLong)
+          .put(GenericType.of(String.class), DriverExecutionProfile::getString)
+          .put(GenericType.listOf(String.class), DriverExecutionProfile::getStringList)
+          .put(GenericType.mapOf(String.class, String.class), DriverExecutionProfile::getStringMap)
+          .build();
+
   private CassandraDriverConfigLoader() {}
 }
diff --git a/v2/spanner-common/src/test/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoaderTest.java b/v2/spanner-common/src/test/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoaderTest.java
index cd00f24cf4..26c2016b0b 100644
--- a/v2/spanner-common/src/test/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoaderTest.java
+++ b/v2/spanner-common/src/test/java/com/google/cloud/teleport/v2/spanner/migrations/utils/CassandraDriverConfigLoaderTest.java
@@ -22,15 +22,18 @@
 import static org.mockito.Mockito.mockStatic;
 
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
 import com.datastax.oss.driver.api.core.config.OptionsMap;
-import com.google.common.collect.ImmutableMap;
+import com.datastax.oss.driver.api.core.config.TypedDriverOption;
 import com.google.common.io.Resources;
 import com.typesafe.config.ConfigException;
 import java.io.FileNotFoundException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.AbstractMap.SimpleEntry;
+import java.time.Duration;
 import java.util.List;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -124,41 +127,48 @@ public void testOptionsMapConversion() throws FileNotFoundException {
     OptionsMap optionsMap = CassandraDriverConfigLoader.getOptionsMapFromFile(testGcsPath);
     DriverConfigLoader driverConfigLoaderFromOptionsMap =
         CassandraDriverConfigLoader.fromOptionsMap(optionsMap);
-    ImmutableMap<String, ImmutableMap<String, String>> directLoadMap =
-        driverConfigMap(driverConfigLoaderDirect);
-    ImmutableMap<String, ImmutableMap<String, String>> fromOptionsMap =
-        driverConfigMap(driverConfigLoaderFromOptionsMap);
-
-    assertThat(directLoadMap).isEqualTo(fromOptionsMap);
-
+    assertThat(driverConfigLoaderDirect.getInitialConfig().getProfiles().keySet())
+        .isEqualTo(driverConfigLoaderFromOptionsMap.getInitialConfig().getProfiles().keySet());
+    for (String profileName : driverConfigLoaderDirect.getInitialConfig().getProfiles().keySet()) {
+      DriverExecutionProfile directProfile =
+          driverConfigLoaderDirect.getInitialConfig().getProfile(profileName);
+      DriverExecutionProfile fromMapProfile =
+          driverConfigLoaderFromOptionsMap.getInitialConfig().getProfile(profileName);
+      assertThat(directProfile.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()))
+          .isEqualTo(
+              fromMapProfile.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()));
+      assertThat(
+              driverConfigLoaderDirect
+                  .getInitialConfig()
+                  .getDefaultProfile()
+                  .getDuration(TypedDriverOption.NETTY_TIMER_TICK_DURATION.getRawOption()))
+          .isEqualTo(Duration.ofMillis(100));
+    }
+    assertThat(
+            driverConfigLoaderFromOptionsMap
+                .getInitialConfig()
+                .getDefaultProfile()
+                .getDuration(TypedDriverOption.NETTY_TIMER_TICK_DURATION.getRawOption()))
+        .isEqualTo(Duration.ofMillis(100));
+    assertThat(
+            driverConfigLoaderFromOptionsMap
+                .getInitialConfig()
+                .getDefaultProfile()
+                .getBytes(TypedDriverOption.PROTOCOL_MAX_FRAME_LENGTH.getRawOption()))
+        .isEqualTo(256000000L);
     assertThrows(
         IllegalArgumentException.class,
         () -> {
           OptionsMap optionsMapToLoad = new OptionsMap();
           CassandraDriverConfigLoader.putInOptionsMap(
-              optionsMapToLoad, "default", new SimpleEntry<>("Unsupported", "Unsupported"));
+              optionsMapToLoad,
+              "default",
+              "Unsupported",
+              "Unsupported",
+              driverConfigLoaderDirect.getInitialConfig().getDefaultProfile());
         });
   }
 
-  private static ImmutableMap<String, ImmutableMap<String, String>> driverConfigMap(
-      DriverConfigLoader driverConfigLoaderDirect) {
-    ImmutableMap.Builder<String, ImmutableMap<String, String>> driverConfigMap =
-        ImmutableMap.builder();
-    driverConfigLoaderDirect
-        .getInitialConfig()
-        .getProfiles()
-        .forEach(
-            (profile, options) -> {
-              ImmutableMap.Builder<String, String> profileMapBuilder = ImmutableMap.builder();
-              options
-                  .entrySet()
-                  .forEach(
-                      e -> profileMapBuilder.put(e.getKey().toString(), e.getValue().toString()));
-              driverConfigMap.put(profile, profileMapBuilder.build());
-            });
-    return driverConfigMap.build();
-  }
-
   @After
   public void cleanup() {
     mockFileReader.close();

From 5934fa52151a4b42d4fb1260f4c536c7946f5802 Mon Sep 17 00:00:00 2001
From: darshan-sj <darshan-sj@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:54:46 +0530
Subject: [PATCH 17/56] Reverting integration test report in Spanner-PR
 gitaction (#2121)

---
 .github/workflows/spanner-pr.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/spanner-pr.yml b/.github/workflows/spanner-pr.yml
index 50f80d80ab..fe104d5764 100644
--- a/.github/workflows/spanner-pr.yml
+++ b/.github/workflows/spanner-pr.yml
@@ -48,7 +48,7 @@ concurrency:
 env:
   MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=error
 
-permissions: write-all
+permissions: read-all
 
 jobs:
   spotless_check:
@@ -183,16 +183,6 @@ jobs:
         name: surefire-test-results
         path: '**/surefire-reports/TEST-*.xml'
         retention-days: 10
-    - name: Integration Test report on GitHub
-      uses: dorny/test-reporter@v1
-      if: always()
-      with:
-        name: Integration Test report on GitHub
-        path: '**/surefire-reports/TEST-*.xml'
-        reporter: java-junit
-        only-summary: 'false'
-        token: ${{ secrets.GITHUB_TOKEN }}
-        fail-on-error: 'false'
     - name: Cleanup Java Environment
       uses: ./.github/actions/cleanup-java-env
   java_load_tests_templates:

From 763328633308e3984849e4a2f1831c366356d54d Mon Sep 17 00:00:00 2001
From: darshan-sj <darshan-sj@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:26:05 +0530
Subject: [PATCH 18/56] Parameterizing commit id and spanner host in
 spanner-staging-tests workflow (#2096)

* Parameterizing commit id in spanner-staging-tests workflow

* Parameterizing spanner host in spanner-staging-tests workflow

* creating spanner-staging-it-tests and invoking test with staging tests profile

* Correcting description

* Integration test report corrected
---
 .github/workflows/spanner-staging-tests.yml   | 33 +++++--
 cicd/cmd/run-spanner-staging-it-tests/main.go | 85 +++++++++++++++++++
 cicd/internal/workflows/maven-workflows.go    |  5 ++
 3 files changed, 118 insertions(+), 5 deletions(-)
 create mode 100644 cicd/cmd/run-spanner-staging-it-tests/main.go

diff --git a/.github/workflows/spanner-staging-tests.yml b/.github/workflows/spanner-staging-tests.yml
index 51c22a991e..5b24877a66 100644
--- a/.github/workflows/spanner-staging-tests.yml
+++ b/.github/workflows/spanner-staging-tests.yml
@@ -16,8 +16,19 @@ name: Spanner Staging integration tests
 
 on:
   workflow_dispatch:
+    inputs:
+      commitOrTag:
+        description: 'Commit hash or release tag to checkout. Leave blank to checkout the most recent commit on main branch.'
+        type: string
+        required: false
+        default: ''
+      spannerHost:
+        description: 'Spanner host URL.'
+        type: string
+        required: false
+        default: ''
 
-permissions: read-all
+permissions: write-all
 
 jobs:
   spanner_java_integration_tests_templates:
@@ -27,25 +38,37 @@ jobs:
     runs-on: [ self-hosted, it ]
     steps:
     - name: Checkout Code
-      uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+      uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
+      with:
+        ref: ${{ inputs.commitOrTag }}
     - name: Setup Environment
       id: setup-env
       uses: ./.github/actions/setup-env
     - name: Run Integration Tests
       run: |
-        ./cicd/run-it-tests \
+        ./cicd/run-spanner-staging-it-tests \
         --modules-to-build="ALL" \
         --it-region="us-central1" \
         --it-project="cloud-teleport-testing" \
         --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
         --it-private-connectivity="datastream-private-connect-us-central1" \
-        --it-spanner-host="https://staging-wrenchworks.sandbox.googleapis.com/"
+        --it-spanner-host=${{ inputs.spannerHost }}
     - name: Upload Integration Tests Report
       uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       if: always() # always run even if the previous step fails
       with:
         name: surefire-test-results
         path: '**/surefire-reports/TEST-*.xml'
-        retention-days: 1
+        retention-days: 20
+    - name: Integration Test report on GitHub
+      uses: dorny/test-reporter@v1
+      if: always()
+      with:
+        name: Integration Test report on GitHub
+        path: '**/surefire-reports/TEST-*.xml'
+        reporter: java-junit
+        only-summary: 'false'
+        token: ${{ secrets.GITHUB_TOKEN }}
+        fail-on-error: 'false'
     - name: Cleanup Java Environment
       uses: ./.github/actions/cleanup-java-env
\ No newline at end of file
diff --git a/cicd/cmd/run-spanner-staging-it-tests/main.go b/cicd/cmd/run-spanner-staging-it-tests/main.go
new file mode 100644
index 0000000000..9ba3c19ced
--- /dev/null
+++ b/cicd/cmd/run-spanner-staging-it-tests/main.go
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package main
+
+import (
+	"flag"
+	"log"
+
+	"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/flags"
+	"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/workflows"
+)
+
+func main() {
+	flags.RegisterCommonFlags()
+	flags.RegisterItFlags()
+	flag.Parse()
+
+	// Run mvn install before running integration tests
+	mvnFlags := workflows.NewMavenFlags()
+	err := workflows.MvnCleanInstall().Run(
+		mvnFlags.IncludeDependencies(),
+		mvnFlags.IncludeDependents(),
+		mvnFlags.SkipDependencyAnalysis(),
+		mvnFlags.SkipCheckstyle(),
+		mvnFlags.SkipJib(),
+		mvnFlags.SkipTests(),
+		mvnFlags.SkipJacoco(),
+		mvnFlags.SkipShade(),
+		mvnFlags.ThreadCount(8),
+		mvnFlags.InternalMaven())
+	if err != nil {
+		log.Fatalf("%v\n", err)
+	}
+
+	// Run spanner integration tests
+	mvnFlags = workflows.NewMavenFlags()
+	err = workflows.MvnVerify().Run(
+		mvnFlags.IncludeDependencies(),
+		mvnFlags.IncludeDependents(),
+		mvnFlags.SkipDependencyAnalysis(),
+		mvnFlags.SkipCheckstyle(),
+		mvnFlags.SkipJib(),
+		mvnFlags.SkipShade(),
+		mvnFlags.RunSpannerStagingIntegrationTests(),
+		mvnFlags.ThreadCount(4),
+		mvnFlags.IntegrationTestParallelism(3),
+		mvnFlags.StaticBigtableInstance("teleport"),
+		mvnFlags.StaticSpannerInstance("teleport"),
+		mvnFlags.InternalMaven(),
+		flags.Region(),
+		flags.Project(),
+		flags.ArtifactBucket(),
+		flags.StageBucket(),
+		flags.HostIp(),
+		flags.PrivateConnectivity(),
+		flags.SpannerHost(),
+		flags.FailureMode(),
+		flags.RetryFailures(),
+		flags.StaticOracleHost(),
+		flags.StaticOracleSysPassword(),
+		flags.CloudProxyHost(),
+		flags.CloudProxyMySqlPort(),
+		flags.CloudProxyPostgresPort(),
+		flags.CloudProxyPassword(),
+		flags.UnifiedWorkerHarnessContainerImage(),
+		flags.CloudProxyPassword())
+	if err != nil {
+		log.Fatalf("%v\n", err)
+	}
+	log.Println("Build Successful!")
+}
diff --git a/cicd/internal/workflows/maven-workflows.go b/cicd/internal/workflows/maven-workflows.go
index 7b04d039ed..b42783878e 100644
--- a/cicd/internal/workflows/maven-workflows.go
+++ b/cicd/internal/workflows/maven-workflows.go
@@ -51,6 +51,7 @@ type MavenFlags interface {
 	FailAtTheEnd() string
 	RunIntegrationTests(bool) string
 	RunIntegrationSmokeTests() string
+	RunSpannerStagingIntegrationTests() string
 	RunLoadTests() string
 	RunLoadTestObserver() string
 	ThreadCount(int) string
@@ -118,6 +119,10 @@ func (*mvnFlags) RunIntegrationSmokeTests() string {
 	return "-PtemplatesIntegrationSmokeTests"
 }
 
+func (*mvnFlags) RunSpannerStagingIntegrationTests() string {
+	return "-PspannerStagingIntegrationTests"
+}
+
 func (*mvnFlags) RunLoadTests() string {
 	return "-PtemplatesLoadTests"
 }

From 4024d51e83bc8c4bccac1f29ac5403ff781a56ee Mon Sep 17 00:00:00 2001
From: Florent Biville <445792+fbiville@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:09:48 +0100
Subject: [PATCH 19/56] Revert "feat: drop node target's key constraint
 requirement (#2068)" (#2131)

This reverts commit 6804d64deda0756dbc7fe1242c3895005a470ef0.
---
 .../model/validation/NodeKeyValidator.java    | 53 +++++++++++++++++++
 ...orter.v1.validation.SpecificationValidator |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java

diff --git a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java
new file mode 100644
index 0000000000..ecc4372e44
--- /dev/null
+++ b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.neo4j.model.validation;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.neo4j.importer.v1.targets.NodeTarget;
+import org.neo4j.importer.v1.validation.SpecificationValidationResult.Builder;
+import org.neo4j.importer.v1.validation.SpecificationValidator;
+
+public class NodeKeyValidator implements SpecificationValidator {
+
+  private static final String ERROR_CODE = "DFNK-001";
+  private final Set<String> paths;
+
+  public NodeKeyValidator() {
+    this.paths = new LinkedHashSet<>();
+  }
+
+  @Override
+  public void visitNodeTarget(int index, NodeTarget target) {
+    var schema = target.getSchema();
+    if (schema == null) {
+      paths.add(String.format("$.targets.nodes[%d].schema.key_constraints", index));
+      return;
+    }
+    if (schema.getKeyConstraints().isEmpty()) {
+      paths.add(String.format("$.targets.nodes[%d].schema.key_constraints", index));
+    }
+  }
+
+  @Override
+  public boolean report(Builder builder) {
+    paths.forEach(
+        path ->
+            builder.addError(
+                path, ERROR_CODE, String.format("%s must define at least 1 key constraint", path)));
+    return paths.isEmpty();
+  }
+}
diff --git a/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator b/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator
index 59f2256ba3..8ccfbd6008 100644
--- a/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator
+++ b/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator
@@ -3,6 +3,7 @@ com.google.cloud.teleport.v2.neo4j.model.validation.BigQuerySourceProjectDataset
 com.google.cloud.teleport.v2.neo4j.model.validation.DuplicateAggregateFieldNameValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.DuplicateTextHeaderValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.InlineSourceDataValidator
+com.google.cloud.teleport.v2.neo4j.model.validation.NodeKeyValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.TextColumnMappingValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.WriteModeValidator
 com.google.cloud.teleport.v2.neo4j.model.validation.NodeMatchModeValidator

From 929d18497dc079681df502d8e022be3ef09c49f1 Mon Sep 17 00:00:00 2001
From: Vardhan Vinay Thigle <39047439+VardhanThigle@users.noreply.github.com>
Date: Tue, 14 Jan 2025 16:20:31 +0000
Subject: [PATCH 20/56] Enable SSL mode in embedded Cassandra used by unit
 tests. (#2130)

---
 v2/sourcedb-to-spanner/pom.xml                |   6 +
 .../testutils/EmbeddedCassandra.java          | 167 +++++++++++++++++-
 .../testutils/SharedEmbeddedCassandra.java    |  24 ++-
 .../resources/CassandraUT/basicConfig.yaml    |   2 +-
 4 files changed, 188 insertions(+), 11 deletions(-)

diff --git a/v2/sourcedb-to-spanner/pom.xml b/v2/sourcedb-to-spanner/pom.xml
index 93ff91864a..575fd053df 100644
--- a/v2/sourcedb-to-spanner/pom.xml
+++ b/v2/sourcedb-to-spanner/pom.xml
@@ -158,5 +158,11 @@
       <version>4.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.60</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/EmbeddedCassandra.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/EmbeddedCassandra.java
index 244b6d4d93..6c2b12b174 100644
--- a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/EmbeddedCassandra.java
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/EmbeddedCassandra.java
@@ -22,16 +22,46 @@
 import com.github.nosan.embedded.cassandra.commons.ClassPathResource;
 import com.github.nosan.embedded.cassandra.cql.CqlScript;
 import com.google.common.collect.ImmutableList;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.net.InetSocketAddress;
+import java.nio.file.Path;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.cert.X509Certificate;
+import java.util.Date;
 import javax.annotation.Nullable;
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.X509v3CertificateBuilder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 
 /**
  * Utility Class to start and stop Embedded Cassandra. {@link Cassandra Embedded Cassandra} is
  * equivalent to real cassandra at the level of network protocol. So using this over mocks wherever
  * possible gives us much better test coverage. Note: Prefer using {@link SharedEmbeddedCassandra}
  * to share an instance of Embedded Cassandra.
+ *
+ * <p>Note on SSL Mode:
+ *
+ * <p>When the test Cassandra Server has to run with SSL enabled, it needs to present an SSL
+ * certificate to the client, which the client can verify. In a UT environment, we won't have a
+ * certificate authority that will sign the certificates. For this, We can either check in a private
+ * Key and Cert to the repo itself which is used in UT, which is less ideal, or, We can generate a
+ * temporary random key and certificate which would be used by the server and trusted by the client
+ * in a UT setting. We are taking the later route in order to avoid having to check in keys and
+ * certificates to the repo.
  */
 public class EmbeddedCassandra implements AutoCloseable {
   private Cassandra embeddedCassandra;
@@ -40,23 +70,48 @@ public class EmbeddedCassandra implements AutoCloseable {
   private final Settings settings;
   private static final String LOCAL_DATA_CENTER = "datacenter1";
 
-  public EmbeddedCassandra(String config, @Nullable String cqlResource) throws IOException {
+  /** Temporary file for storing the certificate key. */
+  private java.io.File keyStoreFile = null;
+
+  /** Temporary file for storing the certificate. */
+  private java.io.File trustStoreFile = null;
+
+  public EmbeddedCassandra(String config, @Nullable String cqlResource, boolean clientEncryption)
+      throws IOException {
     var builder =
         new CassandraBuilder()
             .addEnvironmentVariable("JAVA_HOME", System.getProperty("java.home"))
             .addEnvironmentVariable("JRE_HOME", System.getProperty("jre.home"))
             // Check [CASSANDRA-13396](https://issues.apache.org/jira/browse/CASSANDRA-13396)
             .addSystemProperty("cassandra.insecure.udf", "true")
-            .configFile(new ClassPathResource(config));
+            .configFile(new ClassPathResource(config))
+            // Choose from available ports on the test machine.
+            .addConfigProperty("native_transport_port", 0)
+            .addConfigProperty("storage_port", 0)
+            .addSystemProperty("cassandra.jmx.local.port", 0)
+            .registerShutdownHook(true);
+    if (clientEncryption) {
+
+      // Generate temporary keystore and truststore files
+      keyStoreFile = java.io.File.createTempFile("client", ".keystore");
+      trustStoreFile = java.io.File.createTempFile("client", ".truststore");
+      builder =
+          builder
+              .addConfigProperty("client_encryption_options.enabled", true)
+              .addConfigProperty("client_encryption_options.optional", true)
+              .addConfigProperty(
+                  "client_encryption_options.keystore", keyStoreFile.getAbsolutePath());
+      createTemporaryKeyStore(keyStoreFile, trustStoreFile);
+    }
     // Ref: https://stackoverflow.com/questions/78195798/embedded-cassandra-not-working-in-java-21
     if (Runtime.version().compareTo(Runtime.Version.parse("12")) >= 0) {
       builder = builder.addSystemProperty("java.security.manager", "allow");
     }
     /*
-    * TODO (vardhanvthigle): Get EmbeddedCassandea 4.0 working with our UT JVM.
+    * TODO (vardhanvthigle): Get EmbeddedCassandra 4.0 working with our UT JVM.
     // If we spawn Cassandra 4.0.0 for testing, it tries to set biased locking, which is not recognized by some JVMs.
     builder = builder.addJvmOptions("-XX:+IgnoreUnrecognizedVMOptions");
-    // This is needed as Cassnadra 4.0 goes for deep reflections for java pacakges.
+    // This is needed as Cassandra 4.0 goes for deep reflections for java packages.
     builder = builder.addEnvironmentVariable("JDK_JAVA_OPTIONS", "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
         + "--add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED");
     builder = builder.version("4.0.15");
@@ -78,6 +133,91 @@ public EmbeddedCassandra(String config, @Nullable String cqlResource) throws IOE
     }
   }
 
+  /** Generate a Random KeyPair for Signing the SSL certificate in UT environment. */
+  private static KeyPair generateTestKeyPair() throws NoSuchAlgorithmException {
+    KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+    keyPairGenerator.initialize(2048);
+    return keyPairGenerator.generateKeyPair();
+  }
+
+  /** Generate a random Key Pair and a Self Signed Certificate for the UT environment. */
+  private static void createTemporaryKeyStore(
+      java.io.File keyStoreFile, java.io.File trustStoreFile) {
+    Security.addProvider(new BouncyCastleProvider());
+
+    try {
+      // Generate KeyPair
+      KeyPair keyPair = generateTestKeyPair();
+
+      // Generate Certificate
+      X509Certificate certificate = generateTestCertificate(keyPair);
+
+      // Create and save keystore
+      createKeyStore(keyStoreFile, keyPair, certificate, "cassandra".toCharArray());
+
+      // Create and save truststore
+      createTrustStore(trustStoreFile, certificate, "cassandra".toCharArray());
+
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private static void createKeyStore(
+      java.io.File keyStoreFile, KeyPair keyPair, X509Certificate certificate, char[] password)
+      throws Exception {
+    KeyStore keyStore = KeyStore.getInstance("JKS");
+    keyStore.load(null, null);
+    keyStore.setKeyEntry(
+        "client",
+        keyPair.getPrivate(),
+        password,
+        new java.security.cert.Certificate[] {certificate});
+    try (FileOutputStream fos = new FileOutputStream(keyStoreFile)) {
+      keyStore.store(fos, password);
+    }
+  }
+
+  private static void createTrustStore(
+      java.io.File trustStoreFile, X509Certificate certificate, char[] password) throws Exception {
+    KeyStore trustStore = KeyStore.getInstance("JKS");
+    trustStore.load(null, null);
+    trustStore.setCertificateEntry("localhost", certificate);
+    try (FileOutputStream fos = new FileOutputStream(trustStoreFile)) {
+      trustStore.store(fos, password);
+    }
+  }
+
+  /** Generate a selfsigned test certificate. */
+  private static X509Certificate generateTestCertificate(KeyPair keyPair) throws Exception {
+    // Prepare necessary information
+    X500Name issuer = new X500Name("CN=localhost");
+    BigInteger serial = new BigInteger(160, new SecureRandom());
+    Date notBefore = new Date();
+    Date notAfter = new Date(notBefore.getTime() + 365 * 24 * 60 * 60 * 1000L); // 1 year validity
+    X500Name subject = issuer;
+    SubjectPublicKeyInfo publicKeyInfo =
+        SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded());
+
+    // Create certificate builder
+    X509v3CertificateBuilder certBuilder =
+        new X509v3CertificateBuilder(issuer, serial, notBefore, notAfter, subject, publicKeyInfo);
+
+    // Add Basic Constraints (optional, for CA certificates)
+    certBuilder.addExtension(
+        org.bouncycastle.asn1.x509.Extension.basicConstraints, true, new BasicConstraints(true));
+
+    // Create content signer
+    ContentSigner contentSigner =
+        new JcaContentSignerBuilder("SHA256WithRSAEncryption").build(keyPair.getPrivate());
+
+    // Build the certificate holder
+    X509CertificateHolder certHolder = certBuilder.build(contentSigner);
+
+    // Convert to X509Certificate
+    return new JcaX509CertificateConverter().getCertificate(certHolder);
+  }
+
   public Cassandra getEmbeddedCassandra() {
     return embeddedCassandra;
   }
@@ -98,10 +238,27 @@ public ImmutableList<InetSocketAddress> getContactPoints() {
     return this.contactPoints;
   }
 
+  public Path getKeyStorePath() {
+    return this.keyStoreFile.toPath();
+  }
+
+  public Path getTrustStorePath() {
+    return this.trustStoreFile.toPath();
+  }
+
   @Override
   public void close() throws Exception {
     if (embeddedCassandra != null) {
       embeddedCassandra.stop();
     }
+
+    if (keyStoreFile != null && keyStoreFile.exists()) {
+      keyStoreFile.delete();
+      keyStoreFile = null;
+    }
+    if (trustStoreFile != null && trustStoreFile.exists()) {
+      trustStoreFile.delete();
+      trustStoreFile = null;
+    }
   }
 }
diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/SharedEmbeddedCassandra.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/SharedEmbeddedCassandra.java
index 97386af89d..edc289f515 100644
--- a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/SharedEmbeddedCassandra.java
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/SharedEmbeddedCassandra.java
@@ -46,13 +46,19 @@ public class SharedEmbeddedCassandra implements AutoCloseable {
    *
    * @param config - config.yaml
    * @param cqlResource - cql script.
+   * @param clientEncryption - set to true if Client side SSL is needed.
    * @throws IOException
    */
-  public SharedEmbeddedCassandra(String config, @Nullable String cqlResource) throws IOException {
-    this.config = Configuration.create(config, cqlResource);
+  public SharedEmbeddedCassandra(
+      String config, @Nullable String cqlResource, Boolean clientEncryption) throws IOException {
+    this.config = Configuration.create(config, cqlResource, clientEncryption);
     this.embeddedCassandra = getEmbeddedCassandra(this.config);
   }
 
+  public SharedEmbeddedCassandra(String config, @Nullable String cqlResource) throws IOException {
+    this(config, cqlResource, Boolean.FALSE);
+  }
+
   /**
    * Get a reference to {@link com.github.nosan.embedded.cassandra.Cassandra Embedded Cassandra}
    * managed by {@link SharedEmbeddedCassandra}.
@@ -90,7 +96,10 @@ private static EmbeddedCassandra getEmbeddedCassandra(Configuration configuratio
       } else {
         Log.info("Starting Shared embedded Cassandra for configuration = {}", configuration);
         embeddedCassandra =
-            new EmbeddedCassandra(configuration.configYaml(), configuration.cqlScript());
+            new EmbeddedCassandra(
+                configuration.configYaml(),
+                configuration.cqlScript(),
+                configuration.clientEncryption());
         RefCountedEmbeddedCassandra refCountedEmbeddedCassandra =
             RefCountedEmbeddedCassandra.create(embeddedCassandra);
         refCountedEmbeddedCassandra.refIncrementAndGet();
@@ -123,8 +132,10 @@ private static void putEmbeddedCassandra(Configuration configuration) throws Exc
   abstract static class Configuration {
     public AtomicInteger refCount = new AtomicInteger();
 
-    public static Configuration create(String configYaml, String cqlScript) {
-      return new AutoValue_SharedEmbeddedCassandra_Configuration(configYaml, cqlScript);
+    public static Configuration create(
+        String configYaml, String cqlScript, Boolean clientEncryption) {
+      return new AutoValue_SharedEmbeddedCassandra_Configuration(
+          configYaml, cqlScript, clientEncryption);
     }
 
     @Nullable
@@ -132,6 +143,9 @@ public static Configuration create(String configYaml, String cqlScript) {
 
     @Nullable
     public abstract String cqlScript();
+
+    @Nullable
+    public abstract Boolean clientEncryption();
   }
 
   // This is a private class, and it must be ensured that refcounting is synchronized.
diff --git a/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/basicConfig.yaml b/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/basicConfig.yaml
index 1c150f178f..0d71466bf6 100644
--- a/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/basicConfig.yaml
+++ b/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/basicConfig.yaml
@@ -450,7 +450,7 @@ seed_provider:
   parameters:
   # seeds is actually a comma-delimited list of addresses.
   # Ex: "<ip1>,<ip2>,<ip3>"
-  - seeds: "127.0.0.1:7000"
+  - seeds: "127.0.0.1"
 
 # For workloads with more data than can fit in memory, Cassandra's
 # bottleneck will be reads that need to fetch data from

From 05cfd2e2118691930bc59749d7cb828c29d67ad1 Mon Sep 17 00:00:00 2001
From: Vardhan Vinay Thigle <39047439+VardhanThigle@users.noreply.github.com>
Date: Tue, 14 Jan 2025 16:20:55 +0000
Subject: [PATCH 21/56] Basic Changes to use Upstream Cassandra io for Bulk
 Cassandra Migration  (#2129)

* Cassandra Table Reader Factory

* Completing TODO for Cassandra IOWrapper
---
 v2/sourcedb-to-spanner/pom.xml                |   9 +
 .../iowrapper/CassandraDefaults.java          |  29 +++
 .../iowrapper/CassandraIOWrapperFactory.java  |   4 +-
 .../iowrapper/CassandraIOWrapperHelper.java   | 139 ++++++++++++
 .../iowrapper/CassandraIoWrapper.java         |  35 ++-
 .../CassandraTableReaderFactory.java          |  39 ++++
 ...ndraTableReaderFactoryCassandraIoImpl.java |  98 ++++++++
 .../CassandraSourceRowMapperFactoryFn.java    |  47 ++++
 .../CassandraIOWrapperFactoryTest.java        |  95 +++++++-
 .../CassandraIOWrapperHelperTest.java         | 209 ++++++++++++++++++
 .../iowrapper/CassandraIoWrapperTest.java     |  81 ++++++-
 ...TableReaderFactoryCassandraIoImplTest.java | 157 +++++++++++++
 .../cassandra/testutils/BasicTestSchema.java  |   1 +
 .../CassandraUT/test-cassandra-config.conf    |   4 +
 14 files changed, 934 insertions(+), 13 deletions(-)
 create mode 100644 v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraDefaults.java
 create mode 100644 v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelper.java
 create mode 100644 v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactory.java
 create mode 100644 v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImpl.java
 create mode 100644 v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/rowmapper/CassandraSourceRowMapperFactoryFn.java
 create mode 100644 v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelperTest.java
 create mode 100644 v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImplTest.java

diff --git a/v2/sourcedb-to-spanner/pom.xml b/v2/sourcedb-to-spanner/pom.xml
index 575fd053df..f392f7e278 100644
--- a/v2/sourcedb-to-spanner/pom.xml
+++ b/v2/sourcedb-to-spanner/pom.xml
@@ -78,6 +78,15 @@
       <version>4.17.0</version>
     </dependency>
 
+    <!-- Needed for Beam CassandraIO -->
+    <!-- https://mvnrepository.com/artifact/com.codahale.metrics/metrics-core -->
+    <dependency>
+      <groupId>com.codahale.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+      <version>3.0.2</version>
+    </dependency>
+
+
     <!-- Test Dependencies -->
     <dependency>
       <groupId>com.google.cloud.teleport</groupId>
diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraDefaults.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraDefaults.java
new file mode 100644
index 0000000000..7c8495da6c
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraDefaults.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
+
+import org.apache.beam.sdk.util.FluentBackoff;
+import org.joda.time.Duration;
+
+public class CassandraDefaults {
+
+  /** Fluent Backoff for Cassandra Schema Discovery. */
+  public static final FluentBackoff DEFAULT_CASSANDRA_SCHEMA_DISCOVERY_BACKOFF =
+      FluentBackoff.DEFAULT.withMaxCumulativeBackoff(Duration.standardMinutes(5L));
+
+  private CassandraDefaults() {}
+  ;
+}
diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactory.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactory.java
index 55150a73e3..22ad1050a0 100644
--- a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactory.java
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactory.java
@@ -49,7 +49,7 @@ public static CassandraIOWrapperFactory fromPipelineOptions(SourceDbToSpannerOpt
   /** Create an {@link IoWrapper} instance for a list of SourceTables. */
   @Override
   public IoWrapper getIOWrapper(List<String> sourceTables, OnSignal<?> waitOnSignal) {
-    /** TODO(vardhanvthigle@) */
-    return null;
+    /** TODO(vardhanvthigle@) incorporate waitOnSignal */
+    return new CassandraIoWrapper(gcsConfigPath(), sourceTables);
   }
 }
diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelper.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelper.java
new file mode 100644
index 0000000000..7c812c79d2
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelper.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
+
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper.CassandraDefaults.DEFAULT_CASSANDRA_SCHEMA_DISCOVERY_BACKOFF;
+
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaDiscovery;
+import com.google.cloud.teleport.v2.source.reader.io.datasource.DataSource;
+import com.google.cloud.teleport.v2.source.reader.io.exception.SchemaDiscoveryException;
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SchemaDiscovery;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SchemaDiscoveryImpl;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchema;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableSchema;
+import com.google.cloud.teleport.v2.source.reader.io.schema.typemapping.UnifiedTypeMapper.MapperType;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnType;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.io.FileNotFoundException;
+import java.util.List;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Static Utility Class to provide basic functionality to {@link CassandraIoWrapper}. */
+class CassandraIOWrapperHelper {
+
+  private static final Logger LOG = LoggerFactory.getLogger(CassandraIOWrapperHelper.class);
+
+  static DataSource buildDataSource(String gcsPath) {
+    DataSource dataSource;
+    try {
+      dataSource =
+          DataSource.ofCassandra(
+              CassandraDataSource.builder().setOptionsMapFromGcsFile(gcsPath).build());
+    } catch (FileNotFoundException e) {
+      LOG.error("Unable to find driver config file in {}. Cause ", gcsPath, e);
+      throw (new SchemaDiscoveryException(e));
+    }
+    return dataSource;
+  }
+
+  static SchemaDiscovery buildSchemaDiscovery() {
+    return new SchemaDiscoveryImpl(
+        new CassandraSchemaDiscovery(), DEFAULT_CASSANDRA_SCHEMA_DISCOVERY_BACKOFF);
+  }
+
+  static ImmutableList<String> getTablesToRead(
+      List<String> sourceTables,
+      DataSource dataSource,
+      SchemaDiscovery schemaDiscovery,
+      SourceSchemaReference sourceSchemaReference) {
+    ImmutableList<String> tablesToRead;
+    if (sourceTables.isEmpty()) {
+      tablesToRead = schemaDiscovery.discoverTables(dataSource, sourceSchemaReference);
+      LOG.info("Auto Discovered SourceTables = {}, Tables = {}", sourceTables, tablesToRead);
+    } else {
+      tablesToRead = ImmutableList.copyOf(sourceTables);
+      LOG.info("Using passed SourceTables = {}", sourceTables);
+    }
+    return tablesToRead;
+  }
+
+  static SourceSchema getSourceSchema(
+      SchemaDiscovery schemaDiscovery,
+      DataSource dataSource,
+      SourceSchemaReference sourceSchemaReference,
+      ImmutableList<String> tables) {
+
+    SourceSchema.Builder sourceSchemaBuilder =
+        SourceSchema.builder().setSchemaReference(sourceSchemaReference);
+    ImmutableMap<String, ImmutableMap<String, SourceColumnType>> tableSchemas =
+        schemaDiscovery.discoverTableSchema(dataSource, sourceSchemaReference, tables);
+    LOG.info("Found table schemas: {}", tableSchemas);
+    tableSchemas.entrySet().stream()
+        .map(
+            tableEntry -> {
+              SourceTableSchema.Builder sourceTableSchemaBuilder =
+                  SourceTableSchema.builder(MapperType.CASSANDRA).setTableName(tableEntry.getKey());
+              tableEntry
+                  .getValue()
+                  .entrySet()
+                  .forEach(
+                      colEntry ->
+                          sourceTableSchemaBuilder.addSourceColumnNameToSourceColumnType(
+                              colEntry.getKey(), colEntry.getValue()));
+              return sourceTableSchemaBuilder.build();
+            })
+        .forEach(sourceSchemaBuilder::addTableSchema);
+    return sourceSchemaBuilder.build();
+  }
+
+  static ImmutableMap<SourceTableReference, PTransform<PBegin, PCollection<SourceRow>>>
+      getTableReaders(DataSource dataSource, SourceSchema sourceSchema) {
+    /*
+     * TODO(vardhanvthigle): Plugin alternate implementation if needed.
+     */
+    CassandraTableReaderFactory cassandraTableReaderFactory =
+        new CassandraTableReaderFactoryCassandraIoImpl();
+    ImmutableMap.Builder<SourceTableReference, PTransform<PBegin, PCollection<SourceRow>>>
+        tableReadersBuilder = ImmutableMap.builder();
+    SourceSchemaReference sourceSchemaReference = sourceSchema.schemaReference();
+    sourceSchema
+        .tableSchemas()
+        .forEach(
+            tableSchema -> {
+              SourceTableReference sourceTableReference =
+                  SourceTableReference.builder()
+                      .setSourceSchemaReference(sourceSchemaReference)
+                      .setSourceTableSchemaUUID(tableSchema.tableSchemaUUID())
+                      .setSourceTableName(tableSchema.tableName())
+                      .build();
+              var tableReader =
+                  cassandraTableReaderFactory.getTableReader(
+                      dataSource.cassandra(), sourceSchemaReference, tableSchema);
+              tableReadersBuilder.put(sourceTableReference, tableReader);
+            });
+    return tableReadersBuilder.build();
+  }
+
+  private CassandraIOWrapperHelper() {}
+}
diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapper.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapper.java
index 852b8e415d..11ad0f6cd3 100644
--- a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapper.java
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapper.java
@@ -16,29 +16,54 @@
 package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
 
 import com.google.cloud.teleport.v2.source.reader.io.IoWrapper;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.datasource.DataSource;
 import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SchemaDiscovery;
 import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchema;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
 import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableReference;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.util.List;
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.values.PBegin;
 import org.apache.beam.sdk.values.PCollection;
 
 /** IOWrapper for Cassandra Source. */
-public class CassandraIoWrapper implements IoWrapper {
+public final class CassandraIoWrapper implements IoWrapper {
+  private SourceSchema sourceSchema;
+  private ImmutableMap<SourceTableReference, PTransform<PBegin, PCollection<SourceRow>>>
+      tableReaders;
+
+  public CassandraIoWrapper(String gcsPath, List<String> sourceTables) {
+    DataSource dataSource = CassandraIOWrapperHelper.buildDataSource(gcsPath);
+    SchemaDiscovery schemaDiscovery = CassandraIOWrapperHelper.buildSchemaDiscovery();
+    SourceSchemaReference sourceSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder()
+                .setKeyspaceName(dataSource.cassandra().loggedKeySpace())
+                .build());
+
+    ImmutableList<String> tablesToRead =
+        CassandraIOWrapperHelper.getTablesToRead(
+            sourceTables, dataSource, schemaDiscovery, sourceSchemaReference);
+    this.sourceSchema =
+        CassandraIOWrapperHelper.getSourceSchema(
+            schemaDiscovery, dataSource, sourceSchemaReference, tablesToRead);
+    this.tableReaders = CassandraIOWrapperHelper.getTableReaders(dataSource, sourceSchema);
+  }
 
   /** Get a list of reader transforms for Cassandra source. */
   @Override
   public ImmutableMap<SourceTableReference, PTransform<PBegin, PCollection<SourceRow>>>
       getTableReaders() {
-    // TODO(vardhanvthigle)
-    return null;
+    return tableReaders;
   }
 
   /** Discover source schema for Cassandra. */
   @Override
   public SourceSchema discoverTableSchema() {
-    // TODO(vardhanvthigle)
-    return null;
+    return sourceSchema;
   }
 }
diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactory.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactory.java
new file mode 100644
index 0000000000..10dff186ad
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
+
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableSchema;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
+
+public interface CassandraTableReaderFactory {
+
+  /**
+   * Returns a Table Reader for given Cassandra Source.
+   *
+   * @param cassandraDataSource
+   * @param sourceSchemaReference
+   * @param sourceTableSchema
+   * @return table reader for the source.
+   */
+  PTransform<PBegin, PCollection<SourceRow>> getTableReader(
+      CassandraDataSource cassandraDataSource,
+      SourceSchemaReference sourceSchemaReference,
+      SourceTableSchema sourceTableSchema);
+}
diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImpl.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImpl.java
new file mode 100644
index 0000000000..64113dcab2
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImpl.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
+
+import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
+import com.datastax.oss.driver.api.core.config.TypedDriverOption;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.rowmapper.CassandraSourceRowMapper;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.rowmapper.CassandraSourceRowMapperFactoryFn;
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableSchema;
+import com.google.common.annotations.VisibleForTesting;
+import java.util.stream.Collectors;
+import org.apache.beam.sdk.coders.SerializableCoder;
+import org.apache.beam.sdk.io.cassandra.CassandraIO;
+import org.apache.beam.sdk.io.cassandra.CassandraIO.Read;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
+
+/**
+ * Generate Table Reader For Cassandra using the upstream {@link CassandraIO.Read} implementation.
+ */
+public class CassandraTableReaderFactoryCassandraIoImpl implements CassandraTableReaderFactory {
+
+  /**
+   * Returns a Table Reader for given Cassandra Source using the upstream {@link CassandraIO.Read}.
+   *
+   * @param cassandraDataSource
+   * @param sourceSchemaReference
+   * @param sourceTableSchema
+   * @return table reader for the source.
+   */
+  @Override
+  public PTransform<PBegin, PCollection<SourceRow>> getTableReader(
+      CassandraDataSource cassandraDataSource,
+      SourceSchemaReference sourceSchemaReference,
+      SourceTableSchema sourceTableSchema) {
+    CassandraSourceRowMapper cassandraSourceRowMapper =
+        getSourceRowMapper(sourceSchemaReference, sourceTableSchema);
+    DriverExecutionProfile profile =
+        cassandraDataSource.driverConfigLoader().getInitialConfig().getDefaultProfile();
+    final Read<SourceRow> tableReader =
+        CassandraIO.<SourceRow>read()
+            .withTable(sourceTableSchema.tableName())
+            .withHosts(
+                cassandraDataSource.contactPoints().stream()
+                    .map(p -> p.getHostString())
+                    .collect(Collectors.toList()))
+            .withPort(cassandraDataSource.contactPoints().get(0).getPort())
+            .withKeyspace(cassandraDataSource.loggedKeySpace())
+            .withLocalDc(cassandraDataSource.localDataCenter())
+            .withConsistencyLevel(
+                profile.getString(TypedDriverOption.REQUEST_SERIAL_CONSISTENCY.getRawOption()))
+            .withEntity(SourceRow.class)
+            .withCoder(SerializableCoder.of(SourceRow.class))
+            .withMapperFactoryFn(
+                CassandraSourceRowMapperFactoryFn.create(cassandraSourceRowMapper));
+    return setCredentials(tableReader, profile);
+  }
+
+  @VisibleForTesting
+  protected CassandraIO.Read<SourceRow> setCredentials(
+      CassandraIO.Read<SourceRow> tableReader, DriverExecutionProfile profile) {
+    if (profile.isDefined(TypedDriverOption.AUTH_PROVIDER_USER_NAME.getRawOption())) {
+      tableReader =
+          tableReader.withUsername(
+              profile.getString(TypedDriverOption.AUTH_PROVIDER_USER_NAME.getRawOption()));
+    }
+    if (profile.isDefined(TypedDriverOption.AUTH_PROVIDER_PASSWORD.getRawOption())) {
+      tableReader =
+          tableReader.withPassword(
+              profile.getString(TypedDriverOption.AUTH_PROVIDER_PASSWORD.getRawOption()));
+    }
+    return tableReader;
+  }
+
+  private CassandraSourceRowMapper getSourceRowMapper(
+      SourceSchemaReference sourceSchemaReference, SourceTableSchema sourceTableSchema) {
+    return CassandraSourceRowMapper.builder()
+        .setSourceTableSchema(sourceTableSchema)
+        .setSourceSchemaReference(sourceSchemaReference)
+        .build();
+  }
+}
diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/rowmapper/CassandraSourceRowMapperFactoryFn.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/rowmapper/CassandraSourceRowMapperFactoryFn.java
new file mode 100644
index 0000000000..43c5a27113
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/rowmapper/CassandraSourceRowMapperFactoryFn.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.source.reader.io.cassandra.rowmapper;
+
+import com.datastax.driver.core.Session;
+import com.google.auto.value.AutoValue;
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import org.apache.beam.sdk.io.cassandra.CassandraIO;
+import org.apache.beam.sdk.io.cassandra.Mapper;
+import org.apache.beam.sdk.transforms.SerializableFunction;
+
+/**
+ * A simple utility to wrap {@link CassandraSourceRowMapper} into a mapperFactory. The {@link
+ * CassandraIO.Read} api takes in {@link CassandraIO.Read#withMapperFactoryFn(SerializableFunction)}
+ * which is a {@link SerializableFunction} that returns the actual {@link Mapper}.
+ *
+ * <p>{@link CassandraSourceRowMapper} maps the {@link com.datastax.driver.core.ResultSet Cassandra
+ * ResultSet} to {@link SourceRow}.
+ */
+@AutoValue
+public abstract class CassandraSourceRowMapperFactoryFn
+    implements SerializableFunction<Session, Mapper> {
+  public static CassandraSourceRowMapperFactoryFn create(
+      CassandraSourceRowMapper cassandraSourceRowMapper) {
+    return new AutoValue_CassandraSourceRowMapperFactoryFn(cassandraSourceRowMapper);
+  }
+
+  public abstract CassandraSourceRowMapper cassandraSourceRowMapper();
+
+  @Override
+  public Mapper<SourceRow> apply(Session input) {
+    return cassandraSourceRowMapper();
+  }
+}
diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactoryTest.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactoryTest.java
index c269ee32fe..fcdf875b4c 100644
--- a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactoryTest.java
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperFactoryTest.java
@@ -15,24 +15,112 @@
  */
 package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
 
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.BASIC_TEST_TABLE;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.PRIMITIVE_TYPES_TABLE;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_KEYSPACE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
+import com.datastax.oss.driver.api.core.config.OptionsMap;
+import com.datastax.oss.driver.api.core.config.TypedDriverOption;
 import com.google.cloud.teleport.v2.options.SourceDbToSpannerOptions;
-import java.util.List;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.datasource.DataSource;
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SchemaDiscovery;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchema;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableReference;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.net.InetSocketAddress;
+import org.apache.beam.sdk.io.cassandra.CassandraIO;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 /** Test class for {@link CassandraIOWrapperFactory}. */
 @RunWith(MockitoJUnitRunner.class)
 public class CassandraIOWrapperFactoryTest {
+  private MockedStatic<CassandraIOWrapperHelper> mockCassandraIoWrapperHelper;
+  private static final String TEST_BUCKET_CASSANDRA_CONFIG_CONF =
+      "gs://smt-test-bucket/cassandraConfig.conf";
+  private static final ImmutableList<String> TABLES_TO_READ =
+      ImmutableList.of(BASIC_TEST_TABLE, PRIMITIVE_TYPES_TABLE);
+  @Mock SourceSchema mockSourceSchema;
+
+  @Before
+  public void setup() {
+    mockCassandraIoWrapperHelper = mockStatic(CassandraIOWrapperHelper.class);
+
+    String testClusterName = "testCluster";
+    InetSocketAddress testHost = new InetSocketAddress("127.0.0.1", 9042);
+    String testLocalDC = "datacenter1";
+    DataSource dataSource =
+        DataSource.ofCassandra(
+            CassandraDataSource.builder()
+                .setOptionsMap(OptionsMap.driverDefaults())
+                .setClusterName(testClusterName)
+                .setContactPoints(ImmutableList.of(testHost))
+                .setLocalDataCenter(testLocalDC)
+                .overrideOptionInOptionsMap(TypedDriverOption.SESSION_KEYSPACE, TEST_KEYSPACE)
+                .build());
+
+    SourceSchemaReference sourceSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder()
+                .setKeyspaceName(dataSource.cassandra().loggedKeySpace())
+                .build());
+
+    SchemaDiscovery schemaDiscovery = CassandraIOWrapperHelper.buildSchemaDiscovery();
+    SourceTableReference mockSourceTableReference = Mockito.mock(SourceTableReference.class);
+    CassandraIO.Read<SourceRow> mockTableReader = Mockito.mock(CassandraIO.Read.class);
+    ImmutableMap<SourceTableReference, PTransform<PBegin, PCollection<SourceRow>>>
+        mockTableReaders = ImmutableMap.of(mockSourceTableReference, mockTableReader);
+
+    mockCassandraIoWrapperHelper
+        .when(() -> CassandraIOWrapperHelper.buildDataSource(TEST_BUCKET_CASSANDRA_CONFIG_CONF))
+        .thenReturn(dataSource);
+    mockCassandraIoWrapperHelper
+        .when(() -> CassandraIOWrapperHelper.buildSchemaDiscovery())
+        .thenReturn(schemaDiscovery);
+    mockCassandraIoWrapperHelper
+        .when(
+            () ->
+                CassandraIOWrapperHelper.getTablesToRead(
+                    TABLES_TO_READ, dataSource, schemaDiscovery, sourceSchemaReference))
+        .thenReturn(TABLES_TO_READ);
+    mockCassandraIoWrapperHelper
+        .when(
+            () ->
+                CassandraIOWrapperHelper.getSourceSchema(
+                    schemaDiscovery, dataSource, sourceSchemaReference, TABLES_TO_READ))
+        .thenReturn(mockSourceSchema);
+    mockCassandraIoWrapperHelper
+        .when(() -> CassandraIOWrapperHelper.getTableReaders(dataSource, mockSourceSchema))
+        .thenReturn(mockTableReaders);
+  }
+
+  @After
+  public void cleanup() {
+    mockCassandraIoWrapperHelper.close();
+    mockCassandraIoWrapperHelper = null;
+  }
+
   @Test
   public void testCassandraIoWrapperFactoryBasic() {
-    String testConfigPath = "gs://smt-test-bucket/test-conf.conf";
+    String testConfigPath = TEST_BUCKET_CASSANDRA_CONFIG_CONF;
     SourceDbToSpannerOptions mockOptions =
         mock(SourceDbToSpannerOptions.class, Mockito.withSettings().serializable());
     when(mockOptions.getSourceDbDialect()).thenReturn("CASSANDRA");
@@ -40,7 +128,8 @@ public void testCassandraIoWrapperFactoryBasic() {
     CassandraIOWrapperFactory cassandraIOWrapperFactory =
         CassandraIOWrapperFactory.fromPipelineOptions(mockOptions);
     assertThat(cassandraIOWrapperFactory.gcsConfigPath()).isEqualTo(testConfigPath);
-    assertThat(cassandraIOWrapperFactory.getIOWrapper(List.of(), null)).isEqualTo(null);
+    assertThat(cassandraIOWrapperFactory.getIOWrapper(TABLES_TO_READ, null).discoverTableSchema())
+        .isEqualTo(mockSourceSchema);
   }
 
   @Test
diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelperTest.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelperTest.java
new file mode 100644
index 0000000000..9153a083f0
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIOWrapperHelperTest.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
+
+/*
+ * Copyright (C) 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.BASIC_TEST_TABLE;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.PRIMITIVE_TYPES_TABLE;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_CONFIG;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_CQLSH;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_KEYSPACE;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+
+import com.datastax.oss.driver.api.core.config.OptionsMap;
+import com.datastax.oss.driver.api.core.config.TypedDriverOption;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaDiscovery;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.SharedEmbeddedCassandra;
+import com.google.cloud.teleport.v2.source.reader.io.datasource.DataSource;
+import com.google.cloud.teleport.v2.source.reader.io.exception.SchemaDiscoveryException;
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchema;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableReference;
+import com.google.cloud.teleport.v2.spanner.migrations.utils.JarFileReader;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.beam.sdk.io.cassandra.CassandraIO;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
+import org.mockito.junit.MockitoJUnitRunner;
+
+/** Test class for {@link CassandraIOWrapperHelper}. */
+@RunWith(MockitoJUnitRunner.class)
+public class CassandraIOWrapperHelperTest {
+
+  private static SharedEmbeddedCassandra sharedEmbeddedCassandra = null;
+
+  @BeforeClass
+  public static void startEmbeddedCassandra() throws IOException {
+    if (sharedEmbeddedCassandra == null) {
+      sharedEmbeddedCassandra = new SharedEmbeddedCassandra(TEST_CONFIG, TEST_CQLSH);
+    }
+  }
+
+  @AfterClass
+  public static void stopEmbeddedCassandra() throws Exception {
+    if (sharedEmbeddedCassandra != null) {
+      sharedEmbeddedCassandra.close();
+      sharedEmbeddedCassandra = null;
+    }
+  }
+
+  @Test
+  public void testBuildDataSource() {
+
+    String testGcsPath = "gs://smt-test-bucket/cassandraConfig.conf";
+    URL testUrl = Resources.getResource("CassandraUT/test-cassandra-config.conf");
+
+    CassandraIO.Read<SourceRow> mockCassandraIORead = mock(CassandraIO.Read.class);
+    try (MockedStatic mockFileReader = mockStatic(JarFileReader.class)) {
+
+      mockFileReader
+          .when(() -> JarFileReader.saveFilesLocally(testGcsPath))
+          .thenReturn(new URL[] {testUrl})
+          /* Empty URL List to test FileNotFoundException handling. */
+          .thenReturn(new URL[] {});
+
+      DataSource dataSource = CassandraIOWrapperHelper.buildDataSource(testGcsPath);
+      assertThat(dataSource.cassandra().loggedKeySpace()).isEqualTo("test-keyspace");
+      assertThat(dataSource.cassandra().localDataCenter()).isEqualTo("datacenter1");
+      assertThrows(
+          SchemaDiscoveryException.class,
+          () -> CassandraIOWrapperHelper.buildDataSource(testGcsPath));
+    }
+  }
+
+  @Test
+  public void testTablesToRead() {
+
+    SourceSchemaReference cassandraSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder().setKeyspaceName(TEST_KEYSPACE).build());
+
+    DataSource dataSource =
+        DataSource.ofCassandra(
+            CassandraDataSource.builder()
+                .setOptionsMap(OptionsMap.driverDefaults())
+                .setClusterName(sharedEmbeddedCassandra.getInstance().getClusterName())
+                .setContactPoints(sharedEmbeddedCassandra.getInstance().getContactPoints())
+                .setLocalDataCenter(sharedEmbeddedCassandra.getInstance().getLocalDataCenter())
+                .overrideOptionInOptionsMap(TypedDriverOption.SESSION_KEYSPACE, TEST_KEYSPACE)
+                .build());
+    CassandraSchemaDiscovery cassandraSchemaDiscovery = new CassandraSchemaDiscovery();
+    assertThat(
+            CassandraIOWrapperHelper.getTablesToRead(
+                List.of(),
+                dataSource,
+                CassandraIOWrapperHelper.buildSchemaDiscovery(),
+                cassandraSchemaReference))
+        .isEqualTo(List.of(BASIC_TEST_TABLE, PRIMITIVE_TYPES_TABLE));
+    assertThat(
+            CassandraIOWrapperHelper.getTablesToRead(
+                List.of(BASIC_TEST_TABLE),
+                dataSource,
+                CassandraIOWrapperHelper.buildSchemaDiscovery(),
+                cassandraSchemaReference))
+        .isEqualTo(List.of(BASIC_TEST_TABLE));
+  }
+
+  @Test
+  public void testSourceSchema() {
+
+    SourceSchemaReference cassandraSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder().setKeyspaceName(TEST_KEYSPACE).build());
+
+    DataSource dataSource =
+        DataSource.ofCassandra(
+            CassandraDataSource.builder()
+                .setOptionsMap(OptionsMap.driverDefaults())
+                .setClusterName(sharedEmbeddedCassandra.getInstance().getClusterName())
+                .setContactPoints(sharedEmbeddedCassandra.getInstance().getContactPoints())
+                .setLocalDataCenter(sharedEmbeddedCassandra.getInstance().getLocalDataCenter())
+                .overrideOptionInOptionsMap(TypedDriverOption.SESSION_KEYSPACE, TEST_KEYSPACE)
+                .build());
+    CassandraSchemaDiscovery cassandraSchemaDiscovery = new CassandraSchemaDiscovery();
+    SourceSchema sourceSchema =
+        CassandraIOWrapperHelper.getSourceSchema(
+            CassandraIOWrapperHelper.buildSchemaDiscovery(),
+            dataSource,
+            cassandraSchemaReference,
+            ImmutableList.of(BASIC_TEST_TABLE, PRIMITIVE_TYPES_TABLE));
+    assertThat(sourceSchema.schemaReference()).isEqualTo(cassandraSchemaReference);
+    assertThat(sourceSchema.tableSchemas().asList().stream().count()).isEqualTo(2);
+  }
+
+  @Test
+  public void testTableReaders() {
+
+    SourceSchemaReference cassandraSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder().setKeyspaceName(TEST_KEYSPACE).build());
+
+    DataSource dataSource =
+        DataSource.ofCassandra(
+            CassandraDataSource.builder()
+                .setOptionsMap(OptionsMap.driverDefaults())
+                .setClusterName(sharedEmbeddedCassandra.getInstance().getClusterName())
+                .setContactPoints(sharedEmbeddedCassandra.getInstance().getContactPoints())
+                .setLocalDataCenter(sharedEmbeddedCassandra.getInstance().getLocalDataCenter())
+                .overrideOptionInOptionsMap(TypedDriverOption.SESSION_KEYSPACE, TEST_KEYSPACE)
+                .build());
+    CassandraSchemaDiscovery cassandraSchemaDiscovery = new CassandraSchemaDiscovery();
+    SourceSchema sourceSchema =
+        CassandraIOWrapperHelper.getSourceSchema(
+            CassandraIOWrapperHelper.buildSchemaDiscovery(),
+            dataSource,
+            cassandraSchemaReference,
+            ImmutableList.of(BASIC_TEST_TABLE, PRIMITIVE_TYPES_TABLE));
+    ImmutableMap<SourceTableReference, PTransform<PBegin, PCollection<SourceRow>>> tableReraders =
+        CassandraIOWrapperHelper.getTableReaders(dataSource, sourceSchema);
+    assertThat(
+            tableReraders.keySet().stream()
+                .map(t -> t.sourceTableName())
+                .collect(Collectors.toList()))
+        .isEqualTo(List.of(BASIC_TEST_TABLE, PRIMITIVE_TYPES_TABLE));
+  }
+}
diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapperTest.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapperTest.java
index 972080419d..6933cf7470 100644
--- a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapperTest.java
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraIoWrapperTest.java
@@ -15,19 +15,94 @@
  */
 package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
 
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.BASIC_TEST_TABLE;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.PRIMITIVE_TYPES_TABLE;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_KEYSPACE;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mockStatic;
 
+import com.datastax.oss.driver.api.core.config.OptionsMap;
+import com.datastax.oss.driver.api.core.config.TypedDriverOption;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.datasource.DataSource;
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SchemaDiscovery;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchema;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableReference;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.net.InetSocketAddress;
+import org.apache.beam.sdk.io.cassandra.CassandraIO;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 /** Test class for {@link CassandraIoWrapper}. */
 @RunWith(MockitoJUnitRunner.class)
 public class CassandraIoWrapperTest {
+
   @Test
   public void testCassandraIoWrapperBasic() {
-    // Todo(vardhanvthigle)
-    assertThat((new CassandraIoWrapper()).getTableReaders()).isNull();
-    assertThat((new CassandraIoWrapper()).discoverTableSchema()).isNull();
+    String testClusterName = "testCluster";
+    InetSocketAddress testHost = new InetSocketAddress("127.0.0.1", 9042);
+    String testLocalDC = "datacenter1";
+    DataSource dataSource =
+        DataSource.ofCassandra(
+            CassandraDataSource.builder()
+                .setOptionsMap(OptionsMap.driverDefaults())
+                .setClusterName(testClusterName)
+                .setContactPoints(ImmutableList.of(testHost))
+                .setLocalDataCenter(testLocalDC)
+                .overrideOptionInOptionsMap(TypedDriverOption.SESSION_KEYSPACE, TEST_KEYSPACE)
+                .build());
+
+    SourceSchemaReference sourceSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder()
+                .setKeyspaceName(dataSource.cassandra().loggedKeySpace())
+                .build());
+
+    String testGcsPath = "gs://smt-test-bucket/cassandraConfig.conf";
+    SchemaDiscovery schemaDiscovery = CassandraIOWrapperHelper.buildSchemaDiscovery();
+    ImmutableList<String> tablesToRead = ImmutableList.of(BASIC_TEST_TABLE, PRIMITIVE_TYPES_TABLE);
+    SourceSchema mockSourceSchema = Mockito.mock(SourceSchema.class);
+    SourceTableReference mockSourceTableReference = Mockito.mock(SourceTableReference.class);
+    CassandraIO.Read<SourceRow> mockTableReader = Mockito.mock(CassandraIO.Read.class);
+    ImmutableMap<SourceTableReference, PTransform<PBegin, PCollection<SourceRow>>>
+        mockTableReaders = ImmutableMap.of(mockSourceTableReference, mockTableReader);
+
+    try (MockedStatic mockCassandraIoWrapperHelper = mockStatic(CassandraIOWrapperHelper.class)) {
+      mockCassandraIoWrapperHelper
+          .when(() -> CassandraIOWrapperHelper.buildDataSource(testGcsPath))
+          .thenReturn(dataSource);
+      mockCassandraIoWrapperHelper
+          .when(() -> CassandraIOWrapperHelper.buildSchemaDiscovery())
+          .thenReturn(schemaDiscovery);
+      mockCassandraIoWrapperHelper
+          .when(
+              () ->
+                  CassandraIOWrapperHelper.getTablesToRead(
+                      tablesToRead, dataSource, schemaDiscovery, sourceSchemaReference))
+          .thenReturn(tablesToRead);
+      mockCassandraIoWrapperHelper
+          .when(
+              () ->
+                  CassandraIOWrapperHelper.getSourceSchema(
+                      schemaDiscovery, dataSource, sourceSchemaReference, tablesToRead))
+          .thenReturn(mockSourceSchema);
+      mockCassandraIoWrapperHelper
+          .when(() -> CassandraIOWrapperHelper.getTableReaders(dataSource, mockSourceSchema))
+          .thenReturn(mockTableReaders);
+
+      CassandraIoWrapper cassandraIoWrapper = new CassandraIoWrapper(testGcsPath, tablesToRead);
+      assertThat(cassandraIoWrapper.discoverTableSchema()).isEqualTo(mockSourceSchema);
+      assertThat(cassandraIoWrapper.getTableReaders()).isEqualTo(mockTableReaders);
+    }
   }
 }
diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImplTest.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImplTest.java
new file mode 100644
index 0000000000..36e35711d5
--- /dev/null
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImplTest.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
+
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.PRIMITIVE_TYPES_TABLE;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.PRIMITIVE_TYPES_TABLE_ROW_COUNT;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_CONFIG;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_CQLSH;
+import static com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.BasicTestSchema.TEST_KEYSPACE;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.datastax.oss.driver.api.core.config.OptionsMap;
+import com.datastax.oss.driver.api.core.config.TypedDriverOption;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaDiscovery;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.SharedEmbeddedCassandra;
+import com.google.cloud.teleport.v2.source.reader.io.datasource.DataSource;
+import com.google.cloud.teleport.v2.source.reader.io.exception.RetriableSchemaDiscoveryException;
+import com.google.cloud.teleport.v2.source.reader.io.row.SourceRow;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceSchemaReference;
+import com.google.cloud.teleport.v2.source.reader.io.schema.SourceTableSchema;
+import com.google.cloud.teleport.v2.source.reader.io.schema.typemapping.UnifiedTypeMapper.MapperType;
+import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnType;
+import com.google.cloud.teleport.v2.spanner.migrations.utils.JarFileReader;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import org.apache.beam.sdk.io.cassandra.CassandraIO;
+import org.apache.beam.sdk.testing.PAssert;
+import org.apache.beam.sdk.testing.TestPipeline;
+import org.apache.beam.sdk.transforms.Count;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
+import org.mockito.junit.MockitoJUnitRunner;
+
+/** Test class for {@link CassandraTableReaderFactoryCassandraIoImpl}. */
+@RunWith(MockitoJUnitRunner.class)
+public class CassandraTableReaderFactoryCassandraIoImplTest {
+
+  private static SharedEmbeddedCassandra sharedEmbeddedCassandra = null;
+
+  @Rule public final transient TestPipeline testPipeline = TestPipeline.create();
+
+  @BeforeClass
+  public static void startEmbeddedCassandra() throws IOException {
+    if (sharedEmbeddedCassandra == null) {
+      sharedEmbeddedCassandra = new SharedEmbeddedCassandra(TEST_CONFIG, TEST_CQLSH);
+    }
+  }
+
+  @AfterClass
+  public static void stopEmbeddedCassandra() throws Exception {
+    if (sharedEmbeddedCassandra != null) {
+      sharedEmbeddedCassandra.close();
+      sharedEmbeddedCassandra = null;
+    }
+  }
+
+  @Test
+  public void testCassandraTableReaderFactoryBasic() throws RetriableSchemaDiscoveryException {
+
+    SourceSchemaReference cassandraSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder().setKeyspaceName(TEST_KEYSPACE).build());
+
+    DataSource dataSource =
+        DataSource.ofCassandra(
+            CassandraDataSource.builder()
+                .setOptionsMap(OptionsMap.driverDefaults())
+                .setClusterName(sharedEmbeddedCassandra.getInstance().getClusterName())
+                .setContactPoints(sharedEmbeddedCassandra.getInstance().getContactPoints())
+                .setLocalDataCenter(sharedEmbeddedCassandra.getInstance().getLocalDataCenter())
+                .overrideOptionInOptionsMap(TypedDriverOption.SESSION_KEYSPACE, TEST_KEYSPACE)
+                .build());
+    CassandraSchemaDiscovery cassandraSchemaDiscovery = new CassandraSchemaDiscovery();
+    ImmutableMap<String, ImmutableMap<String, SourceColumnType>> discoverTableSchema =
+        cassandraSchemaDiscovery.discoverTableSchema(
+            dataSource, cassandraSchemaReference, ImmutableList.of(PRIMITIVE_TYPES_TABLE));
+
+    SourceSchemaReference sourceSchemaReference =
+        SourceSchemaReference.ofCassandra(
+            CassandraSchemaReference.builder()
+                .setKeyspaceName(dataSource.cassandra().loggedKeySpace())
+                .build());
+    SourceTableSchema.Builder sourceTableSchemaBuilder =
+        SourceTableSchema.builder(MapperType.CASSANDRA).setTableName(PRIMITIVE_TYPES_TABLE);
+    discoverTableSchema
+        .get(PRIMITIVE_TYPES_TABLE)
+        .forEach(
+            (colName, colType) ->
+                sourceTableSchemaBuilder.addSourceColumnNameToSourceColumnType(colName, colType));
+    SourceTableSchema sourceTableSchema = sourceTableSchemaBuilder.build();
+
+    PTransform<PBegin, PCollection<SourceRow>> tableReader =
+        new CassandraTableReaderFactoryCassandraIoImpl()
+            .getTableReader(dataSource.cassandra(), sourceSchemaReference, sourceTableSchema);
+    PCollection<SourceRow> output = testPipeline.apply(tableReader);
+    PAssert.that(output.apply(Count.globally()))
+        .containsInAnyOrder(PRIMITIVE_TYPES_TABLE_ROW_COUNT);
+    testPipeline.run().waitUntilFinish();
+  }
+
+  @Test
+  public void testSetCredentials() throws FileNotFoundException {
+
+    String testGcsPath = "gs://smt-test-bucket/cassandraConfig.conf";
+    URL testUrl = Resources.getResource("CassandraUT/test-cassandra-config.conf");
+
+    CassandraIO.Read<SourceRow> mockCassandraIORead = mock(CassandraIO.Read.class);
+    try (MockedStatic mockFileReader = mockStatic(JarFileReader.class)) {
+      String testUserName = "testUserName";
+      String testPassword = "testPassword1234@";
+
+      mockFileReader
+          .when(() -> JarFileReader.saveFilesLocally(testGcsPath))
+          .thenReturn(new URL[] {testUrl});
+      when(mockCassandraIORead.withUsername(testUserName)).thenReturn(mockCassandraIORead);
+      when(mockCassandraIORead.withPassword(testPassword)).thenReturn(mockCassandraIORead);
+
+      CassandraDataSource cassandraDataSource =
+          CassandraDataSource.builder().setOptionsMapFromGcsFile(testGcsPath).build();
+      new CassandraTableReaderFactoryCassandraIoImpl()
+          .setCredentials(
+              mockCassandraIORead,
+              cassandraDataSource.driverConfigLoader().getInitialConfig().getDefaultProfile());
+      verify(mockCassandraIORead, times(1)).withUsername(testUserName);
+      verify(mockCassandraIORead, times(1)).withPassword(testPassword);
+    }
+  }
+}
diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/BasicTestSchema.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/BasicTestSchema.java
index 8bbb572b49..32d2b8aaef 100644
--- a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/BasicTestSchema.java
+++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/testutils/BasicTestSchema.java
@@ -31,6 +31,7 @@ public class BasicTestSchema {
   public static final String TEST_CQLSH = TEST_RESOURCE_ROOT + "basicTest.cql";
   public static final String BASIC_TEST_TABLE = "basic_test_table";
   public static final String PRIMITIVE_TYPES_TABLE = "primitive_types_table";
+  public static final Long PRIMITIVE_TYPES_TABLE_ROW_COUNT = 6L;
   public static final ImmutableMap<String, ImmutableMap<String, SourceColumnType>>
       BASIC_TEST_TABLE_SCHEMA =
           ImmutableMap.of(
diff --git a/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config.conf b/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config.conf
index 3ad4cdb5d6..d95aa6f707 100644
--- a/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config.conf
+++ b/v2/sourcedb-to-spanner/src/test/resources/CassandraUT/test-cassandra-config.conf
@@ -9,4 +9,8 @@
     basic.load-balancing-policy {
       local-datacenter = "datacenter1"
     }
+    advanced.auth-provider {
+      username = "testUserName"
+      password = "testPassword1234@"
+    }
   }

From 47b272c398bf648eb6b17d06c1c562002aa32b18 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Thu, 16 Jan 2025 09:59:32 +0530
Subject: [PATCH 22/56] Cassandra pr bug fixes (#64)

---
 .../dbutils/dao/source/CassandraDao.java      |   29 +-
 .../dbutils/dml/CassandraDMLGenerator.java    |    7 +-
 .../dbutils/dml/CassandraTypeHandler.java     |   50 +-
 .../templates/transforms/AssignShardIdFn.java |    4 +-
 .../dml/CassandraDMLGeneratorTest.java        |    2 +-
 .../dbutils/dml/CassandraTypeHandlerTest.java | 1054 +++++++++++------
 6 files changed, 737 insertions(+), 409 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
index 8ad0cfb972..74f81f5965 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
@@ -38,22 +38,19 @@ public CassandraDao(
 
   @Override
   public void write(DMLGeneratorResponse dmlGeneratorResponse) throws Exception {
-    try (CqlSession session =
-        (CqlSession)
-            connectionHelper.getConnection(this.cassandraUrl)) { // Ensure connection is obtained
-      if (session == null) {
-        throw new ConnectionException("Connection is null");
-      }
-      PreparedStatementGeneratedResponse preparedStatementGeneratedResponse =
-          (PreparedStatementGeneratedResponse) dmlGeneratorResponse;
-      String dmlStatement = preparedStatementGeneratedResponse.getDmlStatement();
-      PreparedStatement preparedStatement = session.prepare(dmlStatement);
-      BoundStatement boundStatement =
-          preparedStatement.bind(
-              preparedStatementGeneratedResponse.getValues().stream()
-                  .map(v -> CassandraTypeHandler.castToExpectedType(v.dataType(), v.value()))
-                  .toArray());
-      session.execute(boundStatement);
+    CqlSession session = (CqlSession) connectionHelper.getConnection(this.cassandraUrl);
+    if (session == null) {
+      throw new ConnectionException("Connection is null");
     }
+    PreparedStatementGeneratedResponse preparedStatementGeneratedResponse =
+        (PreparedStatementGeneratedResponse) dmlGeneratorResponse;
+    String dmlStatement = preparedStatementGeneratedResponse.getDmlStatement();
+    PreparedStatement preparedStatement = session.prepare(dmlStatement);
+    BoundStatement boundStatement =
+        preparedStatement.bind(
+            preparedStatementGeneratedResponse.getValues().stream()
+                .map(v -> CassandraTypeHandler.castToExpectedType(v.dataType(), v.value()))
+                .toArray());
+    session.execute(boundStatement);
   }
 }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index 192202f55e..a32e554f43 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -296,12 +296,7 @@ private static DMLGeneratorResponse getDeleteStatementCQL(
       deleteConditions.setLength(deleteConditions.length() - 5);
     }
 
-    String preparedStatement =
-        "DELETE FROM " + tableName + " WHERE " + deleteConditions + " USING TIMESTAMP ?;";
-
-    PreparedStatementValueObject<Long> timestampObj =
-        PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
-    values.add(timestampObj);
+    String preparedStatement = "DELETE FROM " + tableName + " WHERE " + deleteConditions + ";";
 
     return new PreparedStatementGeneratedResponse(preparedStatement, values);
   }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index ac0711aa45..73c4d8f8a6 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -43,9 +43,9 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import org.apache.commons.lang3.BooleanUtils;
 import org.eclipse.jetty.util.StringUtil;
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -242,11 +242,11 @@ private static Boolean handleCassandraBoolType(String colName, JSONObject values
    * @return a {@link Float} object containing the value represented in cassandra type.
    */
   private static Float handleCassandraFloatType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigDecimal(colName).floatValue();
-    } catch (JSONException e) {
+    BigDecimal colValue = valuesJson.optBigDecimal(colName, null);
+    if (colValue == null) {
       return null;
     }
+    return colValue.floatValue();
   }
 
   /**
@@ -257,11 +257,11 @@ private static Float handleCassandraFloatType(String colName, JSONObject valuesJ
    * @return a {@link Double} object containing the value represented in cassandra type.
    */
   private static Double handleCassandraDoubleType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigDecimal(colName).doubleValue();
-    } catch (JSONException e) {
+    BigDecimal colValue = valuesJson.optBigDecimal(colName, null);
+    if (colValue == null) {
       return null;
     }
+    return colValue.doubleValue();
   }
 
   /**
@@ -399,11 +399,11 @@ private static UUID handleCassandraUuidType(String colName, JSONObject valuesJso
    * @return a {@link Long} object containing Long as value represented in cassandra type.
    */
   private static Long handleCassandraBigintType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigInteger(colName).longValue();
-    } catch (JSONException e) {
+    BigInteger colValue = valuesJson.optBigInteger(colName, null);
+    if (colValue == null) {
       return null;
     }
+    return colValue.longValue();
   }
 
   /**
@@ -414,11 +414,11 @@ private static Long handleCassandraBigintType(String colName, JSONObject valuesJ
    * @return a {@link Integer} object containing Integer as value represented in cassandra type.
    */
   private static Integer handleCassandraIntType(String colName, JSONObject valuesJson) {
-    try {
-      return valuesJson.getBigInteger(colName).intValue();
-    } catch (JSONException e) {
+    BigInteger colValue = valuesJson.optBigInteger(colName, null);
+    if (colValue == null) {
       return null;
     }
+    return colValue.intValue();
   }
 
   /**
@@ -458,8 +458,7 @@ private static Instant convertToCassandraTimestamp(String timestampValue) {
           return LocalDate.from(temporal).atStartOfDay(ZoneOffset.UTC).toInstant();
         }
       } catch (DateTimeParseException ignored) {
-        throw new IllegalArgumentException(
-            "Failed to parse timestamp value" + timestampValue, ignored);
+        LOG.info("Exception found from different formatter " + ignored.getMessage());
       }
     }
     throw new IllegalArgumentException("Failed to parse timestamp value: " + timestampValue);
@@ -611,9 +610,9 @@ private static Object handleSpannerColumnType(
       return CassandraTypeHandler.handleCassandraTimestampType(columnName, valuesJson);
     } else if ("boolean".equals(spannerType)) {
       return CassandraTypeHandler.handleCassandraBoolType(columnName, valuesJson);
-    } else if (spannerType.matches("numeric|float")) {
+    } else if (spannerType.matches("float")) {
       return CassandraTypeHandler.handleCassandraFloatType(columnName, valuesJson);
-    } else if (spannerType.contains("float")) {
+    } else if (spannerType.contains("float") || spannerType.contains("numeric")) {
       return CassandraTypeHandler.handleCassandraDoubleType(columnName, valuesJson);
     } else if (spannerType.contains("bytes") || spannerType.contains("blob")) {
       return CassandraTypeHandler.handleCassandraBlobType(columnName, valuesJson);
@@ -647,7 +646,8 @@ private static Object handleStringType(String colName, JSONObject valuesJson) {
       return new JSONArray(inputValue);
     } else if (isValidJSONObject(inputValue)) {
       return new JSONObject(inputValue);
-    } else if (StringUtil.isHex(inputValue, 0, inputValue.length())) {
+    } else if (StringUtil.isHex(inputValue, 0, inputValue.length())
+        && inputValue.startsWith("0x")) {
       return CassandraTypeHandler.handleCassandraBlobType(colName, valuesJson);
     } else if (isAscii(inputValue)) {
       return CassandraTypeHandler.handleCassandraAsciiType(colName, valuesJson);
@@ -786,7 +786,10 @@ private static Object parseNumericType(String columnType, Object colValue) {
    */
   private static Boolean parseBoolean(Object colValue) {
     if (colValue instanceof String) {
-      return Boolean.parseBoolean((String) colValue);
+      if (Arrays.asList("0", "1").contains((String) colValue)) {
+        return colValue.equals("1");
+      }
+      return BooleanUtils.toBoolean((String) colValue);
     }
     return (Boolean) colValue;
   }
@@ -804,8 +807,10 @@ private static Boolean parseBoolean(Object colValue) {
   private static BigDecimal parseDecimal(Object colValue) {
     if (colValue instanceof String) {
       return new BigDecimal((String) colValue);
-    } else if (colValue instanceof Number) {
-      return BigDecimal.valueOf(((Number) colValue).doubleValue());
+    } else if (colValue instanceof Float) {
+      return BigDecimal.valueOf((Float) colValue);
+    } else if (colValue instanceof Double) {
+      return BigDecimal.valueOf((Double) colValue);
     }
     return (BigDecimal) colValue;
   }
@@ -992,7 +997,8 @@ public static Object castToExpectedType(String cassandraType, Object columnValue
       return parseAndCastToCassandraType(cassandraType, columnValue).value();
     } catch (ClassCastException | IllegalArgumentException e) {
       LOG.error("Error converting value for column: {}, type: {}", cassandraType, e.getMessage());
-      throw e;
+      throw new IllegalArgumentException(
+          "Error converting value for cassandraType: " + cassandraType);
     }
   }
 }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
index 0afdf3bf8b..76b78d4a4e 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/AssignShardIdFn.java
@@ -231,7 +231,9 @@ public void processElement(ProcessContext c) throws Exception {
 
       record.setShard(qualifiedShard);
       String finalKeyString = tableName + "_" + keysJsonStr + "_" + qualifiedShard;
-      Long finalKey = finalKeyString.hashCode() % maxConnectionsAcrossAllShards;
+      Long finalKey =
+          finalKeyString.hashCode() % maxConnectionsAcrossAllShards; // The total parallelism is
+      // maxConnectionsAcrossAllShards
       c.output(KV.of(finalKey, record));
 
     } catch (Exception e) {
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
index 6dff8c230d..d3a685824f 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
@@ -311,7 +311,7 @@ public void deleteMultiplePKColumns() {
                 .setSchema(schema)
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
-    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(1, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index f1af3a6c67..1e69954a05 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -23,7 +23,6 @@
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnType;
@@ -33,6 +32,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.time.Instant;
@@ -49,606 +49,949 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.mockito.Mockito;
-import org.slf4j.Logger;
 
 @RunWith(JUnit4.class)
 public class CassandraTypeHandlerTest {
 
-  private SpannerColumnDefinition spannerColDef;
-
-  private SourceColumnDefinition sourceColDef;
-
-  private JSONObject valuesJson;
-
-  private static final Logger LOG = mock(Logger.class);
-
-  private void mockLogging(ClassCastException e) {
-    Mockito.doNothing().when(LOG).error(Mockito.anyString(), Mockito.any(), Mockito.any());
-  }
-
   @Test
   public void testGetColumnValueByTypeForString() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColumnType = new SourceColumnType("varchar", null, null);
     String columnName = "test_column";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
-
-    Object result =
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "test_value");
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByType() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
-    SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "é";
+    String spannerColumnType = "string";
+    String sourceType = "varchar";
+    SpannerColumnType spannerType = new SpannerColumnType(spannerColumnType, true);
+    SourceColumnType sourceColumnType =
+        new SourceColumnType(sourceType, new Long[] {10L, 20L}, new Long[] {10L, 20L});
+    String columnValue = "é";
+    String columnName = "LastName";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForNonString() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
-    SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "DEL";
+    String spannerColumnName = "NUMERIC";
+    String sourceColumnName = "int";
+    SpannerColumnType spannerType = new SpannerColumnType(spannerColumnName, true);
+    SourceColumnType sourceColumnType =
+        new SourceColumnType(sourceColumnName, new Long[] {10L, 20L}, new Long[] {10L, 20L});
+    String columnName = "Salary";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
-
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    Object result =
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 12345);
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForStringUUID() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "123e4567-e89b-12d3-a456-426614174000";
+    SourceColumnType sourceColumnType = new SourceColumnType("uuid", null, null);
+    String columnName = "id";
+    String columnValue = "123e4567-e89b-12d3-a456-426614174000";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForStringIpAddress() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "192.168.1.1";
+    SourceColumnType sourceColumnType = new SourceColumnType("inet", null, null);
+    String columnValue = "192.168.1.1";
+    String columnName = "ipAddress";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForStringJsonArray() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "[\"apple\", \"banana\", \"cherry\"]";
+    SourceColumnType sourceColumnType = new SourceColumnType("set<text>", null, null);
+    String columnValue = "[\"apple\", \"banana\", \"cherry\"]";
+    String columnName = "fruits";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForStringJsonObject() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "{\"name\": \"John\", \"age\": 30}";
+    SourceColumnType sourceColumnType = new SourceColumnType("map<text, text>", null, null);
+    String columnName = "user";
+    String columnValue = "{\"name\": \"John\", \"age\": \"30\"}";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForStringHex() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
-
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "a3f5b7";
+    SourceColumnType sourceColumnType = new SourceColumnType("blob", null, null);
+    String columnName = "lastName";
+    String columnValue = "a3f5b7";
     String sourceDbTimezoneOffset = "UTC";
 
-    when(valuesJson.optString(columnName, null))
-        .thenReturn(columnName); // Mock string value for column
-    when(valuesJson.get(columnName)).thenReturn(columnName); // Mock getting column value
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType); // Spanner column type
-    when(spannerColDef.getName()).thenReturn(columnName); // Column name in Spanner
-    when(sourceColDef.getType())
-        .thenReturn(new SourceColumnType("sourceType", null, null)); // Source column type
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    PreparedStatementValueObject preparedStatementValueObject =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertEquals(CassandraTypeHandler.NullClass.INSTANCE, preparedStatementValueObject.value());
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForStringDuration() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("string", true);
-    String columnName = "P4DT1H";
+    SourceColumnType sourceColumnType = new SourceColumnType("varchar", null, null);
+    String columnValue = "P4DT1H";
+    String columnName = "total_time";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn(columnName);
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForDates() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("date", true);
-    String columnName = "timestampColumn";
+    SourceColumnType sourceColumnType = new SourceColumnType("timestamp", null, null);
+    String columnValue = "2025-01-01T00:00:00Z";
+    String columnName = "created_on";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.optString(columnName, null)).thenReturn("2025-01-01T00:00:00Z");
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, columnValue);
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
   public void testGetColumnValueByTypeForBigInt() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
     SpannerColumnType spannerType = new SpannerColumnType("bigint", true);
-    String columnName = "test_column";
+    SourceColumnType sourceColumnType = new SourceColumnType("bigint", null, null);
+    String columnName = "Salary";
     String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.getBigInteger(columnName)).thenReturn(BigInteger.valueOf(5));
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, BigInteger.valueOf(123456789L));
 
-    Object result =
+    PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
-  public void testGetColumnValueByTypeForInteger() {
-    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
-    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
-    JSONObject valuesJson = mock(JSONObject.class);
+  public void testGetColumnValueByTypeForBytesForHexString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", true);
+    SourceColumnType sourceColumnType = new SourceColumnType("bytes", null, null);
+    String columnName = "Name";
+    String sourceDbTimezoneOffset = "UTC";
 
-    String columnName = "test_column";
-    SpannerColumnType spannerType = new SpannerColumnType("integer", true);
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
-    when(valuesJson.getBigInteger(columnName)).thenReturn(BigInteger.valueOf(5));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "48656c6c6f20576f726c64");
 
-    when(valuesJson.getInt(columnName)).thenReturn(5);
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
-    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
-  public void testGetColumnValueByTypeForValidBigInteger() {
-    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
-    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
-    JSONObject valuesJson = mock(JSONObject.class);
+  public void testGetColumnValueByTypeForBigIntForString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", true);
+    SourceColumnType sourceColumnType = new SourceColumnType("bigint", null, null);
+    String columnName = "Salary";
+    String sourceDbTimezoneOffset = "UTC";
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "123456789");
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
+  }
+
+  @Test
+  public void testGetColumnValueByTypeForBoolentForString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", true);
+    SourceColumnType sourceColumnType = new SourceColumnType("boolean", null, null);
+    String columnName = "Male";
+    String sourceDbTimezoneOffset = "UTC";
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "1");
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
+  }
+
+  @Test
+  public void testGetColumnValueByTypeForBoolent() {
+    SpannerColumnType spannerType = new SpannerColumnType("Boolean", true);
+    SourceColumnType sourceColumnType = new SourceColumnType("boolean", null, null);
+    String columnName = "Male";
+    String sourceDbTimezoneOffset = "UTC";
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, true);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
+  }
+
+  @Test
+  public void testGetColumnValueByTypeForIntegerValue() {
+    SpannerColumnType spannerType = new SpannerColumnType("Integer", true);
+    SourceColumnType sourceColumnType = new SourceColumnType("bigint", null, null);
+    String columnName = "Salary";
+    String sourceDbTimezoneOffset = "UTC";
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
 
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 225000);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
+  }
+
+  @Test
+  public void testGetColumnValueByTypeForBoolentSamllCaseForString() {
+    SpannerColumnType spannerType = new SpannerColumnType("String", true);
+    SourceColumnType sourceColumnType = new SourceColumnType("boolean", null, null);
+    String columnName = "Male";
+    String sourceDbTimezoneOffset = "UTC";
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColumnType);
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "f");
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
+  }
+
+  // Revised and Improved Tests
+
+  @Test
+  public void testGetColumnValueByTypeForInteger() {
+    SpannerColumnType spannerType = new SpannerColumnType("NUMERIC", true);
+    SourceColumnType sourceColType = new SourceColumnType("integer", new Long[] {10L, 20L}, null);
     String columnName = "test_column";
-    SpannerColumnType spannerType = new SpannerColumnType("boolean", true);
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.getBigInteger(columnName)).thenReturn(BigInteger.valueOf(5));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, BigInteger.valueOf(5));
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
-  public void testGetColumnValueByTypeFor() {
-    spannerColDef = mock(SpannerColumnDefinition.class);
-    sourceColDef = mock(SourceColumnDefinition.class);
-    valuesJson = mock(JSONObject.class);
-    SpannerColumnType spannerType = new SpannerColumnType("float", true);
+  public void testGetColumnValueByTypeForValidBigInteger() {
+    SpannerColumnType spannerType = new SpannerColumnType("integer", true);
+    SourceColumnType sourceColType = new SourceColumnType("int64", new Long[] {10L, 20L}, null);
     String columnName = "test_column";
-    String sourceDbTimezoneOffset = "UTC";
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.getBigDecimal(columnName)).thenReturn(new BigDecimal("5.5"));
-    when(valuesJson.get(columnName)).thenReturn(columnName);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, BigInteger.valueOf(5));
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertTrue(result instanceof PreparedStatementValueObject);
+    assertNotNull(castResult);
+  }
 
-    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
+  @Test
+  public void testConvertToCassandraTimestampWithISOInstant() {
+    String timestamp = "2025-01-15T10:15:30Z";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    assertEquals(5.5f, actualValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
-  public void testGetColumnValueByTypeForFloat64() {
-    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
-    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
-    JSONObject valuesJson = mock(JSONObject.class);
+  public void testConvertToCassandraTimestampWithISODateTime() {
+    String timestamp = "2025-01-15T10:15:30";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("datetime", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
+    assertNotNull(castResult);
+  }
+
+  @Test
+  public void testConvertToCassandraTimestampWithISODate() {
+    String timestamp = "2025-01-15";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
     String columnName = "test_column";
-    SpannerColumnType spannerType = new SpannerColumnType("float64", true);
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    when(valuesJson.getBigDecimal(columnName)).thenReturn(new BigDecimal("5.5"));
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertTrue(result instanceof PreparedStatementValueObject);
+    assertNotNull(castResult);
+  }
 
-    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
+  @Test
+  public void testConvertToCassandraTimestampWithCustomFormat1() {
+    String timestamp = "01/15/2025";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertEquals(5.5, actualValue);
+    assertNotNull(castResult);
   }
 
   @Test
-  public void testGetColumnValueByTypeForBytes() {
-    SpannerColumnDefinition spannerColDef = mock(SpannerColumnDefinition.class);
-    SourceColumnDefinition sourceColDef = mock(SourceColumnDefinition.class);
-    JSONObject valuesJson = mock(JSONObject.class);
+  public void testConvertToCassandraTimestampWithCustomFormat2() {
+    String timestamp = "2025/01/15";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
+
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
+  }
+
+  @Test
+  public void testConvertToCassandraTimestampWithCustomFormat3() {
+    String timestamp = "15-01-2025";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
     String columnName = "test_column";
-    SpannerColumnType spannerType = new SpannerColumnType("bytes", true);
-    Long[] myArray = new Long[5];
-    myArray[0] = 10L;
-    myArray[1] = 20L;
 
-    byte[] expectedBytes = new byte[] {1, 2, 3, 4, 5};
-    when(valuesJson.opt(columnName)).thenReturn(expectedBytes);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
 
-    when(spannerColDef.getType()).thenReturn(spannerType);
-    when(spannerColDef.getName()).thenReturn(columnName);
-    when(sourceColDef.getType()).thenReturn(new SourceColumnType("sourceType", myArray, myArray));
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
 
-    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
 
-    assertNotNull(result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertTrue(result instanceof PreparedStatementValueObject);
+    assertNotNull(castResult);
+  }
 
-    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
+  @Test
+  public void testConvertToCassandraTimestampWithCustomFormat4() {
+    String timestamp = "15/01/2025";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    byte[] actualBytes = ((ByteBuffer) actualValue).array();
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
 
-    assertArrayEquals(expectedBytes, actualBytes);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForString() {
-    String cassandraType = "text";
-    String columnValue = "Test String";
+  public void testConvertToCassandraTimestampWithCustomFormat5() {
+    String timestamp = "2025-01-15 10:15:30";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
 
-    assertEquals(columnValue, result);
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertNotNull(castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForBigInt() {
-    String cassandraType = "bigint";
-    Long columnValue = 123L;
+  public void testConvertToCassandraTimestampWithInvalidFormat() {
+    String timestamp = "invalid-timestamp";
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, timestamp);
 
-    assertEquals(columnValue, result);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null));
+    assertTrue(exception.getMessage().contains("Failed to parse timestamp value"));
   }
 
   @Test
-  public void testCastToExpectedTypeForBoolean() {
-    String cassandraType = "boolean";
-    Boolean columnValue = true;
+  public void testConvertToCassandraTimestampWithNull() {
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, " ");
 
-    assertEquals(columnValue, result);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null));
+    assertEquals("Timestamp value cannot be null or empty", exception.getMessage());
   }
 
   @Test
-  public void testCastToExpectedTypeForDecimal() {
-    String cassandraType = "decimal";
-    BigDecimal columnValue = new BigDecimal("123.456");
+  public void testConvertToCassandraTimestampWithWhitespaceString() {
+    SpannerColumnType spannerType = new SpannerColumnType("timestamp", true);
+    SourceColumnType sourceColType = new SourceColumnType("date", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "   ");
 
-    assertEquals(columnValue, result);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null));
+    assertEquals("Timestamp value cannot be null or empty", exception.getMessage());
   }
 
   @Test
-  public void testCastToExpectedTypeForDouble() {
-    String cassandraType = "double";
-    Double columnValue = 123.456;
+  public void testGetColumnValueByTypeForFloat() {
+    SpannerColumnType spannerType = new SpannerColumnType("float", true);
+    SourceColumnType sourceColType = new SourceColumnType("float", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, new BigDecimal("5.5"));
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertEquals(columnValue, result);
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
+    assertEquals(5.5f, actualValue);
   }
 
   @Test
-  public void testCastToExpectedTypeForFloat() {
-    String cassandraType = "float";
-    Float columnValue = 123.45f;
+  public void testGetColumnValueByTypeForFloat64() {
+    SpannerColumnType spannerType = new SpannerColumnType("float64", true);
+    SourceColumnType sourceColType = new SourceColumnType("double", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, new BigDecimal("5.5"));
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertEquals(columnValue, ((Double) result).floatValue(), 0.00001);
+    assertEquals(5.5, castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForInet() throws Exception {
-    String cassandraType = "inet";
-    InetAddress columnValue = InetAddress.getByName("127.0.0.1");
+  public void testGetColumnValueByTypeForFloat64FromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColType = new SourceColumnType("double", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5.5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertEquals(columnValue, result);
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(5.5, castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForInt() {
-    String cassandraType = "int";
-    Integer columnValue = 123;
+  public void testGetColumnValueByTypeForDecimalFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColType = new SourceColumnType("decimal", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5.5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertEquals(columnValue, result);
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(BigDecimal.valueOf(5.5), castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForSmallInt() {
-    String cassandraType = "smallint";
-    Integer columnValue = 123;
+  public void testGetColumnValueByTypeForDecimalFromFloat() {
+    SpannerColumnType spannerType = new SpannerColumnType("float", true);
+    SourceColumnType sourceColType = new SourceColumnType("decimal", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 5.5);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertEquals((short) 123, result);
+    assertEquals(BigDecimal.valueOf(5.5), castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForTimestamp() {
-    String cassandraType = "timestamp";
-    Instant columnValue = Instant.now();
+  public void testGetColumnValueByTypeForDecimalFromFloat64() {
+    SpannerColumnType spannerType = new SpannerColumnType("float64", true);
+    SourceColumnType sourceColType = new SourceColumnType("decimal", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, 5.5);
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertEquals(columnValue, result);
+    assertEquals(BigDecimal.valueOf(5.5), castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForDate() {
-    String cassandraType = "date";
-    LocalDate columnValue = LocalDate.now();
+  public void testGetColumnValueByTypeForFloatFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColType = new SourceColumnType("float", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          castToExpectedType(cassandraType, columnValue);
-        });
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5.5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(5.5, castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForUUID() {
-    String cassandraType = "uuid";
-    UUID columnValue = UUID.randomUUID();
+  public void testGetColumnValueByTypeForBigIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColType = new SourceColumnType("bigint", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertEquals(columnValue, result);
+    assertEquals(Long.valueOf("5"), castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForTinyInt() {
-    String cassandraType = "tinyint";
-    Integer columnValue = 100;
+  public void testGetColumnValueByTypeForIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColType = new SourceColumnType("int", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertEquals((byte) 100, result);
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+
+    assertEquals(Integer.valueOf("5"), castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForVarint() {
-    String cassandraType = "varint";
-    ByteBuffer columnValue = ByteBuffer.wrap(new byte[] {1, 2, 3, 4});
+  public void testGetColumnValueByTypeForSmallIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColType = new SourceColumnType("smallint", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertEquals(new BigInteger(columnValue.array()), result);
+    assertEquals(Integer.valueOf("5").shortValue(), castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForDuration() {
-    String cassandraType = "duration";
-    Duration columnValue = Duration.ofHours(5);
+  public void testGetColumnValueByTypeForTinyIntFromString() {
+    SpannerColumnType spannerType = new SpannerColumnType("string", true);
+    SourceColumnType sourceColType = new SourceColumnType("tinyint", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, "5");
+
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    PreparedStatementValueObject result =
+        getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertEquals(columnValue, result);
+    assertEquals(Byte.valueOf("5"), castResult);
   }
 
   @Test
-  public void testCastToExpectedTypeForJSONArrayToList() {
-    String cassandraType = "list<int>";
-    JSONArray columnValue = new JSONArray(Arrays.asList(1, 2, 3));
+  public void testGetColumnValueByTypeForBytes() {
+    SpannerColumnType spannerType = new SpannerColumnType("bytes", true);
+    SourceColumnType sourceColType = new SourceColumnType("bytes", new Long[] {10L, 20L}, null);
+    String columnName = "test_column";
 
-    Object result = castToExpectedType(cassandraType, columnValue);
+    byte[] expectedBytes = new byte[] {1, 2, 3, 4, 5};
+    JSONObject valuesJson = new JSONObject();
+    valuesJson.put(columnName, expectedBytes);
 
-    assertTrue(result instanceof List);
+    SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
+    SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
+
+    Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
+
+    assertNotNull(result);
+    assertTrue(result instanceof PreparedStatementValueObject);
+
+    Object actualValue = ((PreparedStatementValueObject<?>) result).value();
+    byte[] actualBytes = ((ByteBuffer) actualValue).array();
+    assertArrayEquals(expectedBytes, actualBytes);
+  }
+
+  @Test
+  public void testCastToExpectedTypeForVariousTypes() throws UnknownHostException {
+    assertEquals("Test String", castToExpectedType("text", "Test String"));
+    assertEquals(123L, castToExpectedType("bigint", 123L));
+    assertEquals(true, castToExpectedType("boolean", true));
+    assertEquals(
+        new BigDecimal("123.456"), castToExpectedType("decimal", new BigDecimal("123.456")));
+    assertEquals(123.456, castToExpectedType("double", 123.456));
+    assertEquals(123.45f, ((Double) castToExpectedType("float", 123.45f)).floatValue(), 0.00001);
+    assertEquals(
+        InetAddress.getByName("127.0.0.1"),
+        castToExpectedType("inet", InetAddress.getByName("127.0.0.1")));
+    assertEquals(123, castToExpectedType("int", 123));
+    assertEquals((short) 123, castToExpectedType("smallint", 123));
+    assertEquals(
+        UUID.fromString("123e4567-e89b-12d3-a456-426614174000"),
+        castToExpectedType("uuid", UUID.fromString("123e4567-e89b-12d3-a456-426614174000")));
+    assertEquals((byte) 100, castToExpectedType("tinyint", 100));
+    assertEquals(
+        new BigInteger("12345"),
+        castToExpectedType("varint", ByteBuffer.wrap(new byte[] {0, 0, 48, 57})));
+    assertEquals(Duration.ofHours(5), castToExpectedType("duration", Duration.ofHours(5)));
   }
 
   @Test
   public void testCastToExpectedTypeForJSONArrayToSet() {
     String cassandraType = "set<int>";
     JSONArray columnValue = new JSONArray(Arrays.asList(1, 2, 3));
-
     Object result = castToExpectedType(cassandraType, columnValue);
-
     assertTrue(result instanceof Set);
+    assertEquals(3, ((Set<?>) result).size());
   }
 
   @Test
@@ -657,7 +1000,6 @@ public void testCastToExpectedTypeForJSONObjectToMap() {
     JSONObject columnValue = new JSONObject();
     columnValue.put("2024-12-12", "One");
     columnValue.put(String.valueOf(2), "Two");
-
     assertThrows(
         IllegalArgumentException.class,
         () -> {
@@ -669,9 +1011,6 @@ public void testCastToExpectedTypeForJSONObjectToMap() {
   public void testCastToExpectedTypeForExceptionScenario() {
     String cassandraType = "int";
     String columnValue = "InvalidInt";
-
-    mockLogging(new ClassCastException("Invalid cast"));
-
     assertThrows(
         IllegalArgumentException.class,
         () -> {
@@ -683,7 +1022,6 @@ public void testCastToExpectedTypeForExceptionScenario() {
   public void testGetColumnValueByTypeForNullBothColumnDefs() {
     JSONObject valuesJson = mock(JSONObject.class);
     String sourceDbTimezoneOffset = "UTC";
-
     assertThrows(
         IllegalArgumentException.class,
         () -> {
@@ -707,9 +1045,7 @@ public void testCastToExpectedTypeForVarchar() {
 
   @Test
   public void testCastToExpectedTypeForList() {
-    JSONArray listValue = new JSONArray();
-    listValue.put("value1");
-    listValue.put("value2");
+    JSONArray listValue = new JSONArray(Arrays.asList("value1", "value2"));
     Object result = CassandraTypeHandler.castToExpectedType("list<text>", listValue);
     assertTrue(result instanceof List);
     assertEquals(2, ((List<?>) result).size());
@@ -717,9 +1053,7 @@ public void testCastToExpectedTypeForList() {
 
   @Test
   public void testCastToExpectedTypeForSet() {
-    JSONArray setValue = new JSONArray();
-    setValue.put("value1");
-    setValue.put("value2");
+    JSONArray setValue = new JSONArray(Arrays.asList("value1", "value2"));
     Object result = CassandraTypeHandler.castToExpectedType("set<text>", setValue);
     assertTrue(result instanceof Set);
     assertEquals(2, ((Set<?>) result).size());
@@ -783,9 +1117,7 @@ public void testCastToExpectedTypeForDate_InvalidString() {
             () -> {
               CassandraTypeHandler.castToExpectedType("date", invalidDateString);
             });
-    assertEquals(
-        "Error handling type: Text 'invalid-date' could not be parsed at index 0",
-        exception.getMessage());
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
@@ -797,8 +1129,7 @@ public void testCastToExpectedTypeForDate_UnsupportedType() {
             () -> {
               CassandraTypeHandler.castToExpectedType("date", unsupportedType);
             });
-    assertEquals(
-        "Error handling type: Unsupported value for date conversion: 123", exception.getMessage());
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
@@ -818,8 +1149,7 @@ public void testHandleCassandraVarintType_InvalidString() {
             () -> {
               CassandraTypeHandler.castToExpectedType("varint", invalidString);
             });
-    assertEquals(
-        "Invalid varint format (string) for value: invalid-number", exception.getMessage());
+    assertEquals("Error converting value for cassandraType: varint", exception.getMessage());
   }
 
   @Test
@@ -847,8 +1177,6 @@ public void testHandleCassandraVarintType_UnsupportedType() {
             () -> {
               CassandraTypeHandler.castToExpectedType("varint", unsupportedType);
             });
-    assertEquals(
-        "Invalid value type for varint conversion: class java.lang.Integer",
-        exception.getMessage());
+    assertEquals("Error converting value for cassandraType: varint", exception.getMessage());
   }
 }

From 1ef722e341992bc1cedfaf3767ceff6562fb4538 Mon Sep 17 00:00:00 2001
From: Akash Thawait <aakash@ollion.com>
Date: Thu, 16 Jan 2025 15:00:48 +0530
Subject: [PATCH 23/56] Handle TypeHandler Parsing issue fixes (#65)

Co-authored-by: pawankashyapollion <v-pawan.kumar@ollion.com>
---
 .../dbutils/dml/CassandraTypeHandler.java     | 503 +++---------------
 .../dbutils/dml/CassandraTypeHandlerTest.java | 118 ++--
 2 files changed, 116 insertions(+), 505 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index 73c4d8f8a6..ebc96749f9 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -36,7 +36,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -102,35 +101,6 @@ private interface HandlerSupplier<T> {
     T get() throws Exception;
   }
 
-  /**
-   * Converts a {@link String} to an ASCII representation for Cassandra's {@link String} or other
-   * ASCII-based types.
-   *
-   * <p>This method ensures that the string contains only valid ASCII characters (0-127). If any
-   * non-ASCII characters are found, an exception is thrown.
-   *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
-   * @return A {@link String} representing the ASCII value for the column in Cassandra.
-   * @throws IllegalArgumentException If the string contains non-ASCII characters.
-   */
-  private static String handleCassandraAsciiType(String colName, JSONObject valuesJson) {
-    Object value = valuesJson.get(colName);
-    if (value instanceof String) {
-      String stringValue = (String) value;
-      if (isAscii(stringValue)) {
-        return stringValue;
-      } else {
-        throw new IllegalArgumentException(
-            "Invalid ASCII format for column: "
-                + colName
-                + ". String contains non-ASCII characters.");
-      }
-    }
-    return null;
-  }
-
   /**
    * Converts the provided {@link Object} value to a {@link BigInteger} representing a Cassandra
    * varint.
@@ -148,34 +118,8 @@ private static String handleCassandraAsciiType(String colName, JSONObject values
    * @throws IllegalArgumentException If the value is neither a valid number string, byte array, nor
    *     a valid {@link ByteBuffer} for varint representation.
    */
-  private static BigInteger handleCassandraVarintType(Object value) {
-    if (value instanceof String) {
-      try {
-        return new BigInteger((String) value);
-      } catch (NumberFormatException e) {
-        throw new IllegalArgumentException("Invalid varint format (string) for value: " + value, e);
-      }
-    } else if (value instanceof byte[]) {
-      try {
-        return new BigInteger((byte[]) value);
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            "Invalid varint format (byte array) for value: " + value, e);
-      }
-    } else if (value instanceof ByteBuffer) {
-      try {
-        ByteBuffer byteBuffer = (ByteBuffer) value;
-        byte[] byteArray = new byte[byteBuffer.remaining()];
-        byteBuffer.get(byteArray); // Read bytes from ByteBuffer
-        return new BigInteger(byteArray);
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            "Invalid varint format (ByteBuffer) for value: " + value, e);
-      }
-    } else {
-      throw new IllegalArgumentException(
-          "Invalid value type for varint conversion: " + value.getClass());
-    }
+  private static BigInteger handleCassandraVarintType(String value) {
+    return new BigInteger(value);
   }
 
   /**
@@ -185,98 +129,31 @@ private static BigInteger handleCassandraVarintType(Object value) {
    * column name {@code colName}, and converts it into a {@link Duration} object. The string value
    * should be in the ISO-8601 duration format (e.g., "PT20.345S").
    *
-   * @param colName - The column name used to fetch the key from {@code valuesJson}.
-   * @param valuesJson - The {@link JSONObject} containing all the key-value pairs for the current
-   *     incoming stream.
+   * @param durationString - The column value used to fetched from {@code valuesJson}.
    * @return A {@link Duration} object representing the duration value from the Cassandra data.
    * @throws IllegalArgumentException if the value is not a valid duration string.
    */
-  private static Duration handleCassandraDurationType(String colName, JSONObject valuesJson) {
-    String durationString = valuesJson.optString(colName, null);
-    if (durationString == null) {
-      return null;
-    }
+  private static Duration handleCassandraDurationType(String durationString) {
     try {
       return Duration.parse(durationString);
     } catch (Exception e) {
-      throw new IllegalArgumentException("Invalid duration format for column: " + colName, e);
+      throw new IllegalArgumentException("Invalid duration format for: " + durationString, e);
     }
   }
 
   /**
    * Generates a Type based on the provided {@link CassandraTypeHandler}.
    *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
+   * @param inetString - which is used to generate InetAddress.
    * @return a {@link InetAddress} object containing InetAddress as value represented in cassandra
    *     type.
    */
-  private static InetAddress handleCassandraInetAddressType(String colName, JSONObject valuesJson) {
-    String inetString = valuesJson.optString(colName, null);
-    if (inetString == null) {
-      return null;
-    }
+  private static InetAddress handleCassandraInetAddressType(String inetString) {
     try {
       return InetAddresses.forString(inetString);
     } catch (IllegalArgumentException e) {
-      throw new IllegalArgumentException("Invalid IP address format for column: " + colName, e);
-    }
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Boolean} object containing the value represented in cassandra type.
-   */
-  private static Boolean handleCassandraBoolType(String colName, JSONObject valuesJson) {
-    return valuesJson.optBoolean(colName, false);
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Float} object containing the value represented in cassandra type.
-   */
-  private static Float handleCassandraFloatType(String colName, JSONObject valuesJson) {
-    BigDecimal colValue = valuesJson.optBigDecimal(colName, null);
-    if (colValue == null) {
-      return null;
+      throw new IllegalArgumentException("Invalid IP address format for: " + inetString, e);
     }
-    return colValue.floatValue();
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Double} object containing the value represented in cassandra type.
-   */
-  private static Double handleCassandraDoubleType(String colName, JSONObject valuesJson) {
-    BigDecimal colValue = valuesJson.optBigDecimal(colName, null);
-    if (colValue == null) {
-      return null;
-    }
-    return colValue.doubleValue();
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link ByteBuffer} object containing the value represented in cassandra type.
-   */
-  private static ByteBuffer handleCassandraBlobType(String colName, JSONObject valuesJson) {
-    Object colValue = valuesJson.opt(colName);
-    if (colValue == null) {
-      return null;
-    }
-    return parseBlobType(colValue);
   }
 
   /**
@@ -345,17 +222,15 @@ private static byte[] convertHexStringToByteArray(String hex) {
    * <p>This method is particularly useful for processing timestamp data stored in Cassandra, where
    * timestamps are often stored as ISO-8601 strings.
    *
-   * @param colName the key used to fetch the value from the provided {@link JSONObject}.
-   * @param valuesJson the JSON object containing key-value pairs, including the timestamp value.
+   * @param timestampValue the used to parse the Instant.
    * @return an {@link Instant} representing the parsed timestamp value in UTC.
    * @throws IllegalArgumentException if the column value is missing, empty, or cannot be parsed as
    *     a valid timestamp.
    */
-  private static Instant handleCassandraTimestampType(String colName, JSONObject valuesJson) {
-    String timestampValue = valuesJson.optString(colName, null);
+  private static Instant handleCassandraTimestampType(String timestampValue) {
     if (timestampValue == null || timestampValue.isEmpty()) {
       throw new IllegalArgumentException(
-          "Timestamp value for column " + colName + " is null or empty.");
+          "Timestamp value for " + timestampValue + " is null or empty.");
     }
     return convertToCassandraTimestamp(timestampValue);
   }
@@ -363,74 +238,16 @@ private static Instant handleCassandraTimestampType(String colName, JSONObject v
   /**
    * Generates a Type based on the provided {@link CassandraTypeHandler}.
    *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link String} object containing String as value represented in cassandra type.
-   */
-  private static String handleCassandraTextType(String colName, JSONObject valuesJson) {
-    return valuesJson.optString(
-        colName, null); // Get the value or null if the key is not found or the value is null
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
+   * @param uuidString - which is used to parsed and return UUID.
    * @return a {@link UUID} object containing UUID as value represented in cassandra type.
    */
-  private static UUID handleCassandraUuidType(String colName, JSONObject valuesJson) {
-    String uuidString =
-        valuesJson.optString(
-            colName, null); // Get the value or null if the key is not found or the value is null
-
+  private static UUID handleCassandraUuidType(String uuidString) {
     if (uuidString == null) {
       return null;
     }
-
     return UUID.fromString(uuidString);
   }
 
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Long} object containing Long as value represented in cassandra type.
-   */
-  private static Long handleCassandraBigintType(String colName, JSONObject valuesJson) {
-    BigInteger colValue = valuesJson.optBigInteger(colName, null);
-    if (colValue == null) {
-      return null;
-    }
-    return colValue.longValue();
-  }
-
-  /**
-   * Generates a Type based on the provided {@link CassandraTypeHandler}.
-   *
-   * @param colName - which is used to fetch Key from valueJSON.
-   * @param valuesJson - contains all the key value for current incoming stream.
-   * @return a {@link Integer} object containing Integer as value represented in cassandra type.
-   */
-  private static Integer handleCassandraIntType(String colName, JSONObject valuesJson) {
-    BigInteger colValue = valuesJson.optBigInteger(colName, null);
-    if (colValue == null) {
-      return null;
-    }
-    return colValue.intValue();
-  }
-
-  /**
-   * Converts a string representation of a timestamp to an {@link Instant} compatible with
-   * Cassandra.
-   *
-   * <p>The method parses the {@code dateString} into an {@link Instant}, which represents an
-   * instantaneous point in time and is compatible with Cassandra timestamp types.
-   *
-   * @param timestampValue The timestamp string in ISO-8601 format (e.g., "2024-12-05T10:15:30Z").
-   * @return The {@link Instant} representation of the timestamp.
-   */
   private static Instant convertToCassandraTimestamp(String timestampValue) {
     if (timestampValue == null || timestampValue.trim().isEmpty()) {
       throw new IllegalArgumentException("Timestamp value cannot be null or empty");
@@ -464,112 +281,6 @@ private static Instant convertToCassandraTimestamp(String timestampValue) {
     throw new IllegalArgumentException("Failed to parse timestamp value: " + timestampValue);
   }
 
-  /**
-   * Validates if the given string represents a valid UUID.
-   *
-   * <p>This method attempts to parse the provided string as a UUID using {@link
-   * UUID#fromString(String)}. If parsing is successful, it returns {@code true}, indicating that
-   * the string is a valid UUID. Otherwise, it returns {@code false}.
-   *
-   * @param value The string to check if it represents a valid UUID.
-   * @return {@code true} if the string is a valid UUID, {@code false} otherwise.
-   */
-  private static boolean isValidUUID(String value) {
-    try {
-      UUID.fromString(value);
-      return true;
-    } catch (IllegalArgumentException e) {
-      return false;
-    }
-  }
-
-  /**
-   * Validates if the given string represents a valid IP address.
-   *
-   * <p>This method attempts to resolve the provided string as an {@link InetAddresses} using {@link
-   * InetAddresses#forString(String)}. If successful, it returns {@code true}, indicating that the
-   * string is a valid IP address. Otherwise, it returns {@code false}.
-   *
-   * @param value The string to check if it represents a valid IP address.
-   * @return {@code true} if the string is a valid IP address, {@code false} otherwise.
-   */
-  private static boolean isValidIPAddress(String value) {
-    try {
-      InetAddresses.forString(value);
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  /**
-   * Validates if the given string is a valid JSONArray.
-   *
-   * <p>This method attempts to parse the string using {@link JSONArray} to check if the value
-   * represents a valid JSON object. If the string is valid JSON, it returns {@code true}, otherwise
-   * {@code false}.
-   *
-   * @param value The string to check if it represents a valid JSON object.
-   * @return {@code true} if the string is a valid JSON object, {@code false} otherwise.
-   */
-  private static boolean isValidJSONArray(String value) {
-    try {
-      new JSONArray(value);
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  /**
-   * Validates if the given string is a valid JSONObject.
-   *
-   * <p>This method attempts to parse the string using {@link JSONObject} to check if the value
-   * represents a valid JSON object. If the string is valid JSON, it returns {@code true}, otherwise
-   * {@code false}.
-   *
-   * @param value The string to check if it represents a valid JSON object.
-   * @return {@code true} if the string is a valid JSON object, {@code false} otherwise.
-   */
-  private static boolean isValidJSONObject(String value) {
-    try {
-      new JSONObject(value);
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  /**
-   * Helper method to check if a string contains only ASCII characters (0-127).
-   *
-   * @param value - The string to check.
-   * @return true if the string contains only ASCII characters, false otherwise.
-   */
-  private static boolean isAscii(String value) {
-    for (int i = 0; i < value.length(); i++) {
-      if (value.charAt(i) > 127) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Helper method to check if a string contains Duration Character.
-   *
-   * @param value - The string to check.
-   * @return true if the string contains Duration Character, false otherwise.
-   */
-  private static boolean isDurationString(String value) {
-    try {
-      Duration.parse(value);
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
   /**
    * Safely executes a handler method, catching exceptions and rethrowing them as runtime
    * exceptions.
@@ -590,71 +301,29 @@ private static <T> T safeHandle(HandlerSupplier<T> supplier) {
   }
 
   /**
-   * Handles and extracts column values based on the Spanner column type.
+   * Handles the conversion of a Spanner column type to an appropriate value.
    *
-   * <p>This method processes Spanner column types (e.g., bigint, string, timestamp, etc.) and
-   * returns the parsed value for further handling.
+   * <p>This method attempts to retrieve the value for the specified column from the provided JSON
+   * object and return it as a string. If the value is not found or an error occurs, it handles the
+   * exception and returns null or throws an exception accordingly.
    *
-   * @param spannerType The Spanner column type (e.g., "string", "bigint").
-   * @param columnName The name of the column.
-   * @param valuesJson The JSON object containing the column value.
-   * @return The extracted value for the column, or {@code null} if the column type is unsupported.
+   * @param spannerType The type of the Spanner column (currently unused in the method, but might be
+   *     used for further expansion).
+   * @param columnName The name of the column whose value is to be retrieved.
+   * @param valuesJson The JSON object containing the values of the columns.
+   * @return The value of the column as a string, or null if the value is not found.
+   * @throws IllegalArgumentException If an error occurs during the processing of the value.
    */
   private static Object handleSpannerColumnType(
       String spannerType, String columnName, JSONObject valuesJson) {
-    if (spannerType.contains("int")) {
-      return CassandraTypeHandler.handleCassandraBigintType(columnName, valuesJson);
-    } else if (spannerType.contains("string")) {
-      return handleStringType(columnName, valuesJson);
-    } else if (spannerType.matches("timestamp|date|datetime")) {
-      return CassandraTypeHandler.handleCassandraTimestampType(columnName, valuesJson);
-    } else if ("boolean".equals(spannerType)) {
-      return CassandraTypeHandler.handleCassandraBoolType(columnName, valuesJson);
-    } else if (spannerType.matches("float")) {
-      return CassandraTypeHandler.handleCassandraFloatType(columnName, valuesJson);
-    } else if (spannerType.contains("float") || spannerType.contains("numeric")) {
-      return CassandraTypeHandler.handleCassandraDoubleType(columnName, valuesJson);
-    } else if (spannerType.contains("bytes") || spannerType.contains("blob")) {
-      return CassandraTypeHandler.handleCassandraBlobType(columnName, valuesJson);
-    } else if ("integer".equals(spannerType)) {
-      return CassandraTypeHandler.handleCassandraIntType(columnName, valuesJson);
-    } else {
-      LOG.warn("Unsupported Spanner column type: {}", spannerType);
-      throw new IllegalArgumentException("Unsupported Spanner column type: " + spannerType);
-    }
-  }
-
-  /**
-   * Handles and parses column values for string types, determining specific subtypes dynamically.
-   *
-   * <p>This method identifies if the string can be a UUID, IP address, JSON, blob, duration, or
-   * ASCII type. If none match, it treats the value as a simple text type.
-   *
-   * @param colName The name of the column.
-   * @param valuesJson The JSON object containing the column value.
-   * @return The parsed value as the appropriate type (e.g., UUID, JSON, etc.).
-   */
-  private static Object handleStringType(String colName, JSONObject valuesJson) {
-    String inputValue = CassandraTypeHandler.handleCassandraTextType(colName, valuesJson);
-
-    if (isValidUUID(inputValue)) {
-      return CassandraTypeHandler.handleCassandraUuidType(colName, valuesJson);
-    } else if (isValidIPAddress(inputValue)) {
-      return safeHandle(
-          () -> CassandraTypeHandler.handleCassandraInetAddressType(colName, valuesJson));
-    } else if (isValidJSONArray(inputValue)) {
-      return new JSONArray(inputValue);
-    } else if (isValidJSONObject(inputValue)) {
-      return new JSONObject(inputValue);
-    } else if (StringUtil.isHex(inputValue, 0, inputValue.length())
-        && inputValue.startsWith("0x")) {
-      return CassandraTypeHandler.handleCassandraBlobType(colName, valuesJson);
-    } else if (isAscii(inputValue)) {
-      return CassandraTypeHandler.handleCassandraAsciiType(colName, valuesJson);
-    } else if (isDurationString(inputValue)) {
-      return CassandraTypeHandler.handleCassandraDurationType(colName, valuesJson);
+    try {
+      return spannerType.contains("string")
+          ? valuesJson.optString(columnName)
+          : valuesJson.opt(columnName);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Exception Caught During parsing for Spanner column type: " + spannerType);
     }
-    return inputValue;
   }
 
   /**
@@ -672,15 +341,18 @@ private static Object handleStringType(String colName, JSONObject valuesJson) {
   private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
       String columnType, Object colValue) {
 
-    if (columnType.startsWith("list<") && colValue instanceof JSONArray) {
+    if (columnType.startsWith("list<")) {
+      JSONArray parsedJSONArray = new JSONArray((String) colValue);
       return PreparedStatementValueObject.create(
-          columnType, parseCassandraList(columnType, (JSONArray) colValue));
-    } else if (columnType.startsWith("set<") && colValue instanceof JSONArray) {
+          columnType, parseCassandraList(columnType, parsedJSONArray));
+    } else if (columnType.startsWith("set<")) {
+      JSONArray parsedJSONArray = new JSONArray((String) colValue);
       return PreparedStatementValueObject.create(
-          columnType, parseCassandraSet(columnType, (JSONArray) colValue));
-    } else if (columnType.startsWith("map<") && colValue instanceof JSONObject) {
+          columnType, parseCassandraSet(columnType, parsedJSONArray));
+    } else if (columnType.startsWith("map<")) {
+      JSONObject parsedJSON = new JSONObject((String) colValue);
       return PreparedStatementValueObject.create(
-          columnType, parseCassandraMap(columnType, (JSONObject) colValue));
+          columnType, parseCassandraMap(columnType, parsedJSON));
     }
 
     switch (columnType) {
@@ -694,42 +366,50 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
       case "smallint":
       case "tinyint":
         return PreparedStatementValueObject.create(
-            columnType, parseNumericType(columnType, colValue));
+            columnType, parseNumericType(columnType, colValue.toString()));
 
       case "boolean":
         return PreparedStatementValueObject.create(
-            columnType, safeHandle(() -> parseBoolean(colValue)));
+            columnType, safeHandle(() -> parseBoolean(colValue.toString())));
 
       case "decimal":
         return PreparedStatementValueObject.create(
-            columnType, safeHandle(() -> parseDecimal(colValue)));
+            columnType, safeHandle(() -> parseDecimal(colValue.toString())));
 
       case "double":
       case "float":
         return PreparedStatementValueObject.create(
-            columnType, safeHandle(() -> parseFloatingPoint(columnType, colValue)));
+            columnType, safeHandle(() -> parseFloatingPoint(columnType, colValue.toString())));
 
       case "inet":
-        return PreparedStatementValueObject.create(columnType, (java.net.InetAddress) colValue);
+        return PreparedStatementValueObject.create(
+            columnType, handleCassandraInetAddressType(colValue.toString()));
 
       case "time":
       case "timestamp":
       case "datetime":
-        return PreparedStatementValueObject.create(columnType, (Instant) colValue);
+        return PreparedStatementValueObject.create(
+            columnType, handleCassandraTimestampType(colValue.toString()));
 
       case "date":
         return PreparedStatementValueObject.create(
-            columnType, safeHandle(() -> parseDate(colValue)));
+            columnType, safeHandle(() -> parseDate(colValue.toString())));
 
       case "timeuuid":
       case "uuid":
-        return PreparedStatementValueObject.create(columnType, (UUID) colValue);
+        return PreparedStatementValueObject.create(
+            columnType, handleCassandraUuidType(colValue.toString()));
 
       case "varint":
-        return PreparedStatementValueObject.create(columnType, handleCassandraVarintType(colValue));
+        return PreparedStatementValueObject.create(
+            columnType, handleCassandraVarintType(colValue.toString()));
 
       case "duration":
-        return PreparedStatementValueObject.create(columnType, (Duration) colValue);
+        return PreparedStatementValueObject.create(
+            columnType, handleCassandraDurationType(colValue.toString()));
+
+      case "blob":
+        return PreparedStatementValueObject.create(columnType, parseBlobType(colValue));
 
       default:
         return PreparedStatementValueObject.create(columnType, colValue);
@@ -749,28 +429,15 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
   private static Object parseNumericType(String columnType, Object colValue) {
     return safeHandle(
         () -> {
-          if (colValue instanceof String) {
-            switch (columnType) {
-              case "bigint":
-                return Long.parseLong((String) colValue);
-              case "int":
-                return Integer.parseInt((String) colValue);
-              case "smallint":
-                return Short.parseShort((String) colValue);
-              case "tinyint":
-                return Byte.parseByte((String) colValue);
-            }
-          } else if (colValue instanceof Number) {
-            switch (columnType) {
-              case "bigint":
-                return ((Number) colValue).longValue();
-              case "int":
-                return ((Number) colValue).intValue();
-              case "smallint":
-                return ((Number) colValue).shortValue();
-              case "tinyint":
-                return ((Number) colValue).byteValue();
-            }
+          switch (columnType) {
+            case "bigint":
+              return Long.parseLong((String) colValue);
+            case "int":
+              return Integer.parseInt((String) colValue);
+            case "smallint":
+              return Short.parseShort((String) colValue);
+            case "tinyint":
+              return Byte.parseByte((String) colValue);
           }
           throw new IllegalArgumentException(
               "Unsupported type for " + columnType + ": " + colValue.getClass());
@@ -785,13 +452,10 @@ private static Object parseNumericType(String columnType, Object colValue) {
    * @throws ClassCastException if the {@code colValue} is not a {@code String} or {@code Boolean}.
    */
   private static Boolean parseBoolean(Object colValue) {
-    if (colValue instanceof String) {
-      if (Arrays.asList("0", "1").contains((String) colValue)) {
-        return colValue.equals("1");
-      }
-      return BooleanUtils.toBoolean((String) colValue);
+    if (Arrays.asList("0", "1").contains((String) colValue)) {
+      return colValue.equals("1");
     }
-    return (Boolean) colValue;
+    return BooleanUtils.toBoolean((String) colValue);
   }
 
   /**
@@ -805,14 +469,7 @@ private static Boolean parseBoolean(Object colValue) {
    *     {@code BigDecimal}.
    */
   private static BigDecimal parseDecimal(Object colValue) {
-    if (colValue instanceof String) {
-      return new BigDecimal((String) colValue);
-    } else if (colValue instanceof Float) {
-      return BigDecimal.valueOf((Float) colValue);
-    } else if (colValue instanceof Double) {
-      return BigDecimal.valueOf((Double) colValue);
-    }
-    return (BigDecimal) colValue;
+    return new BigDecimal((String) colValue);
   }
 
   /**
@@ -824,23 +481,15 @@ private static BigDecimal parseDecimal(Object colValue) {
    * @throws IllegalArgumentException if the column type is invalid or the value cannot be parsed.
    */
   private static Object parseFloatingPoint(String columnType, Object colValue) {
-    if (colValue instanceof String) {
-      return columnType.equals("double")
-          ? Double.parseDouble((String) colValue)
-          : Float.parseFloat((String) colValue);
-    }
-    return columnType.equals("double") ? (Double) colValue : (Float) colValue;
+    return columnType.equals("double")
+        ? Double.parseDouble((String) colValue)
+        : Float.parseFloat((String) colValue);
   }
 
   private static LocalDate parseDate(Object colValue) {
-    if (colValue instanceof String) {
-      return LocalDate.parse((String) colValue);
-    } else if (colValue instanceof Instant) {
-      return ((Instant) colValue).atZone(ZoneId.systemDefault()).toLocalDate();
-    } else if (colValue instanceof Date) {
-      return ((Date) colValue).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-    }
-    throw new IllegalArgumentException("Unsupported value for date conversion: " + colValue);
+    return handleCassandraTimestampType((String) colValue)
+        .atZone(ZoneId.systemDefault())
+        .toLocalDate();
   }
 
   /**
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index 1e69954a05..aedb268c7c 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -33,15 +33,10 @@
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
 import java.time.Duration;
-import java.time.Instant;
 import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import org.json.JSONArray;
@@ -644,11 +639,13 @@ public void testConvertToCassandraTimestampWithInvalidFormat() {
 
     SpannerColumnDefinition spannerColDef = new SpannerColumnDefinition(columnName, spannerType);
     SourceColumnDefinition sourceColDef = new SourceColumnDefinition(columnName, sourceColType);
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null));
-    assertTrue(exception.getMessage().contains("Failed to parse timestamp value"));
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          PreparedStatementValueObject result =
+              getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+          CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+        });
   }
 
   @Test
@@ -665,8 +662,12 @@ public void testConvertToCassandraTimestampWithNull() {
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
-            () -> getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null));
-    assertEquals("Timestamp value cannot be null or empty", exception.getMessage());
+            () -> {
+              PreparedStatementValueObject result =
+                  getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+              CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+            });
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
@@ -683,8 +684,12 @@ public void testConvertToCassandraTimestampWithWhitespaceString() {
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
-            () -> getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null));
-    assertEquals("Timestamp value cannot be null or empty", exception.getMessage());
+            () -> {
+              PreparedStatementValueObject result =
+                  getColumnValueByType(spannerColDef, sourceColDef, valuesJson, null);
+              CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
+            });
+    assertEquals("Error converting value for cassandraType: date", exception.getMessage());
   }
 
   @Test
@@ -705,7 +710,7 @@ public void testGetColumnValueByTypeForFloat() {
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object actualValue = ((PreparedStatementValueObject<?>) result).value();
-    assertEquals(5.5f, actualValue);
+    assertEquals(new BigDecimal(5.5), actualValue);
   }
 
   @Test
@@ -957,38 +962,37 @@ public void testGetColumnValueByTypeForBytes() {
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object actualValue = ((PreparedStatementValueObject<?>) result).value();
-    byte[] actualBytes = ((ByteBuffer) actualValue).array();
-    assertArrayEquals(expectedBytes, actualBytes);
+    assertArrayEquals(expectedBytes, (byte[]) actualValue);
   }
 
   @Test
   public void testCastToExpectedTypeForVariousTypes() throws UnknownHostException {
     assertEquals("Test String", castToExpectedType("text", "Test String"));
-    assertEquals(123L, castToExpectedType("bigint", 123L));
-    assertEquals(true, castToExpectedType("boolean", true));
-    assertEquals(
-        new BigDecimal("123.456"), castToExpectedType("decimal", new BigDecimal("123.456")));
-    assertEquals(123.456, castToExpectedType("double", 123.456));
-    assertEquals(123.45f, ((Double) castToExpectedType("float", 123.45f)).floatValue(), 0.00001);
+    assertEquals(123L, castToExpectedType("bigint", "123"));
+    assertEquals(true, castToExpectedType("boolean", "true"));
     assertEquals(
-        InetAddress.getByName("127.0.0.1"),
-        castToExpectedType("inet", InetAddress.getByName("127.0.0.1")));
-    assertEquals(123, castToExpectedType("int", 123));
-    assertEquals((short) 123, castToExpectedType("smallint", 123));
+        new BigDecimal("123.456"),
+        castToExpectedType("decimal", new BigDecimal("123.456").toString()));
+    assertEquals(123.456, castToExpectedType("double", "123.456"));
+    assertEquals(123.45f, ((Double) castToExpectedType("float", "123.45")).floatValue(), 0.00001);
+    assertEquals(InetAddress.getByName("127.0.0.1"), castToExpectedType("inet", "127.0.0.1"));
+    assertEquals(123, castToExpectedType("int", "123"));
+    assertEquals((short) 123, castToExpectedType("smallint", "123"));
     assertEquals(
         UUID.fromString("123e4567-e89b-12d3-a456-426614174000"),
-        castToExpectedType("uuid", UUID.fromString("123e4567-e89b-12d3-a456-426614174000")));
-    assertEquals((byte) 100, castToExpectedType("tinyint", 100));
+        castToExpectedType("uuid", "123e4567-e89b-12d3-a456-426614174000"));
+    assertEquals((byte) 100, castToExpectedType("tinyint", "100"));
     assertEquals(
-        new BigInteger("12345"),
-        castToExpectedType("varint", ByteBuffer.wrap(new byte[] {0, 0, 48, 57})));
-    assertEquals(Duration.ofHours(5), castToExpectedType("duration", Duration.ofHours(5)));
+        new BigInteger("123456789123456789123456789"),
+        castToExpectedType("varint", "123456789123456789123456789"));
+    assertEquals(
+        Duration.ofHours(5), castToExpectedType("duration", Duration.ofHours(5).toString()));
   }
 
   @Test
   public void testCastToExpectedTypeForJSONArrayToSet() {
     String cassandraType = "set<int>";
-    JSONArray columnValue = new JSONArray(Arrays.asList(1, 2, 3));
+    String columnValue = new JSONArray(Arrays.asList(1, 2, 3)).toString();
     Object result = castToExpectedType(cassandraType, columnValue);
     assertTrue(result instanceof Set);
     assertEquals(3, ((Set<?>) result).size());
@@ -1046,7 +1050,7 @@ public void testCastToExpectedTypeForVarchar() {
   @Test
   public void testCastToExpectedTypeForList() {
     JSONArray listValue = new JSONArray(Arrays.asList("value1", "value2"));
-    Object result = CassandraTypeHandler.castToExpectedType("list<text>", listValue);
+    Object result = CassandraTypeHandler.castToExpectedType("list<text>", listValue.toString());
     assertTrue(result instanceof List);
     assertEquals(2, ((List<?>) result).size());
   }
@@ -1054,21 +1058,11 @@ public void testCastToExpectedTypeForList() {
   @Test
   public void testCastToExpectedTypeForSet() {
     JSONArray setValue = new JSONArray(Arrays.asList("value1", "value2"));
-    Object result = CassandraTypeHandler.castToExpectedType("set<text>", setValue);
+    Object result = CassandraTypeHandler.castToExpectedType("set<text>", setValue.toString());
     assertTrue(result instanceof Set);
     assertEquals(2, ((Set<?>) result).size());
   }
 
-  @Test
-  public void testCastToExpectedTypeForMap() {
-    JSONObject mapValue = new JSONObject();
-    mapValue.put("key1", "value1");
-    mapValue.put("key2", "value2");
-    Object result = CassandraTypeHandler.castToExpectedType("map<text, text>", mapValue);
-    assertTrue(result instanceof Map);
-    assertEquals(2, ((Map<?, ?>) result).size());
-  }
-
   @Test
   public void testCastToExpectedTypeForInvalidType() {
     Object object = CassandraTypeHandler.castToExpectedType("unknownType", new Object());
@@ -1092,22 +1086,6 @@ public void testCastToExpectedTypeForDate_String() {
     assertEquals(expected, result);
   }
 
-  @Test
-  public void testCastToExpectedTypeForDate_Instant() {
-    Instant now = Instant.now();
-    Object result = CassandraTypeHandler.castToExpectedType("date", now);
-    LocalDate expected = now.atZone(ZoneId.systemDefault()).toLocalDate();
-    assertEquals(expected, result);
-  }
-
-  @Test
-  public void testCastToExpectedTypeForDate_JavaUtilDate() {
-    Date date = new Date();
-    Object result = CassandraTypeHandler.castToExpectedType("date", date);
-    LocalDate expected = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-    assertEquals(expected, result);
-  }
-
   @Test
   public void testCastToExpectedTypeForDate_InvalidString() {
     String invalidDateString = "invalid-date";
@@ -1152,25 +1130,9 @@ public void testHandleCassandraVarintType_InvalidString() {
     assertEquals("Error converting value for cassandraType: varint", exception.getMessage());
   }
 
-  @Test
-  public void testHandleCassandraVarintType_ByteArray() {
-    byte[] validByteArray = new byte[] {0, 0, 0, 0, 0, 0, 0, 10};
-    Object result = CassandraTypeHandler.castToExpectedType("varint", validByteArray);
-    BigInteger expected = new BigInteger(validByteArray);
-    assertEquals(expected, result);
-  }
-
-  @Test
-  public void testHandleCassandraVarintType_ByteBuffer() {
-    ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[] {0, 0, 0, 0, 0, 0, 0, 20});
-    Object result = CassandraTypeHandler.castToExpectedType("varint", byteBuffer);
-    BigInteger expected = new BigInteger(new byte[] {0, 0, 0, 0, 0, 0, 0, 20});
-    assertEquals(expected, result);
-  }
-
   @Test
   public void testHandleCassandraVarintType_UnsupportedType() {
-    Integer unsupportedType = 123;
+    String unsupportedType = "dsdsdd";
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,

From 31ee1d697088d46e74f88910722abbd672b460f0 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Thu, 16 Jan 2025 16:12:18 +0530
Subject: [PATCH 24/56] Added Safe handle (#68)

---
 .../dbutils/dml/CassandraTypeHandler.java     | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index ebc96749f9..be966c8f87 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -341,20 +341,31 @@ private static Object handleSpannerColumnType(
   private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
       String columnType, Object colValue) {
 
+    // Handle collection types
     if (columnType.startsWith("list<")) {
-      JSONArray parsedJSONArray = new JSONArray((String) colValue);
-      return PreparedStatementValueObject.create(
-          columnType, parseCassandraList(columnType, parsedJSONArray));
+      return safeHandle(
+          () -> {
+            JSONArray parsedJSONArray = new JSONArray((String) colValue);
+            return PreparedStatementValueObject.create(
+                columnType, parseCassandraList(columnType, parsedJSONArray));
+          });
     } else if (columnType.startsWith("set<")) {
-      JSONArray parsedJSONArray = new JSONArray((String) colValue);
-      return PreparedStatementValueObject.create(
-          columnType, parseCassandraSet(columnType, parsedJSONArray));
+      return safeHandle(
+          () -> {
+            JSONArray parsedJSONArray = new JSONArray((String) colValue);
+            return PreparedStatementValueObject.create(
+                columnType, parseCassandraSet(columnType, parsedJSONArray));
+          });
     } else if (columnType.startsWith("map<")) {
-      JSONObject parsedJSON = new JSONObject((String) colValue);
-      return PreparedStatementValueObject.create(
-          columnType, parseCassandraMap(columnType, parsedJSON));
+      return safeHandle(
+          () -> {
+            JSONObject parsedJSON = new JSONObject((String) colValue);
+            return PreparedStatementValueObject.create(
+                columnType, parseCassandraMap(columnType, parsedJSON));
+          });
     }
 
+    // Handle primitive and standard types
     switch (columnType) {
       case "ascii":
       case "text":
@@ -365,8 +376,10 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
       case "int":
       case "smallint":
       case "tinyint":
-        return PreparedStatementValueObject.create(
-            columnType, parseNumericType(columnType, colValue.toString()));
+        return safeHandle(
+            () ->
+                PreparedStatementValueObject.create(
+                    columnType, parseNumericType(columnType, colValue.toString())));
 
       case "boolean":
         return PreparedStatementValueObject.create(
@@ -383,13 +396,13 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
 
       case "inet":
         return PreparedStatementValueObject.create(
-            columnType, handleCassandraInetAddressType(colValue.toString()));
+            columnType, safeHandle(() -> handleCassandraInetAddressType(colValue.toString())));
 
       case "time":
       case "timestamp":
       case "datetime":
         return PreparedStatementValueObject.create(
-            columnType, handleCassandraTimestampType(colValue.toString()));
+            columnType, safeHandle(() -> handleCassandraTimestampType(colValue.toString())));
 
       case "date":
         return PreparedStatementValueObject.create(
@@ -398,18 +411,19 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
       case "timeuuid":
       case "uuid":
         return PreparedStatementValueObject.create(
-            columnType, handleCassandraUuidType(colValue.toString()));
+            columnType, safeHandle(() -> handleCassandraUuidType(colValue.toString())));
 
       case "varint":
         return PreparedStatementValueObject.create(
-            columnType, handleCassandraVarintType(colValue.toString()));
+            columnType, safeHandle(() -> handleCassandraVarintType(colValue.toString())));
 
       case "duration":
         return PreparedStatementValueObject.create(
-            columnType, handleCassandraDurationType(colValue.toString()));
+            columnType, safeHandle(() -> handleCassandraDurationType(colValue.toString())));
 
       case "blob":
-        return PreparedStatementValueObject.create(columnType, parseBlobType(colValue));
+        return safeHandle(
+            () -> PreparedStatementValueObject.create(columnType, parseBlobType(colValue)));
 
       default:
         return PreparedStatementValueObject.create(columnType, colValue);

From 2b421183001740472bc243d131f2304702e7bc31 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Fri, 17 Jan 2025 09:56:11 +0530
Subject: [PATCH 25/56] Handle LocalTime For Time Data Type In Cassandra (#69)

---
 .../dbutils/dml/CassandraTypeHandler.java     | 28 ++++++++++++++++---
 .../dbutils/dml/CassandraTypeHandlerTest.java |  7 +++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index be966c8f87..98697ca71d 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -26,6 +26,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
@@ -258,26 +259,38 @@ private static Instant convertToCassandraTimestamp(String timestampValue) {
             DateTimeFormatter.ISO_INSTANT,
             DateTimeFormatter.ISO_DATE_TIME,
             DateTimeFormatter.ISO_LOCAL_DATE,
+            DateTimeFormatter.ISO_TIME,
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"),
             DateTimeFormatter.ofPattern("MM/dd/yyyy"),
             DateTimeFormatter.ofPattern("yyyy/MM/dd"),
             DateTimeFormatter.ofPattern("dd-MM-yyyy"),
             DateTimeFormatter.ofPattern("dd/MM/yyyy"),
-            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"),
             DateTimeFormatter.ofPattern("MM-dd-yyyy"),
             DateTimeFormatter.ofPattern("dd MMM yyyy"));
 
     for (DateTimeFormatter formatter : formatters) {
       try {
         TemporalAccessor temporal = formatter.parse(timestampValue);
+
         if (temporal.isSupported(ChronoField.INSTANT_SECONDS)) {
           return Instant.from(temporal);
-        } else if (temporal.isSupported(ChronoField.EPOCH_DAY)) {
+        }
+
+        if (temporal.isSupported(ChronoField.EPOCH_DAY)) {
           return LocalDate.from(temporal).atStartOfDay(ZoneOffset.UTC).toInstant();
         }
-      } catch (DateTimeParseException ignored) {
-        LOG.info("Exception found from different formatter " + ignored.getMessage());
+
+        if (temporal.isSupported(ChronoField.SECOND_OF_DAY)) {
+          return LocalTime.from(temporal)
+              .atDate(LocalDate.now(ZoneOffset.UTC))
+              .atZone(ZoneOffset.UTC)
+              .toInstant();
+        }
+      } catch (DateTimeParseException ex) {
+        LOG.debug("Formatter failed: {}, Exception: {}", formatter, ex.getMessage());
       }
     }
+
     throw new IllegalArgumentException("Failed to parse timestamp value: " + timestampValue);
   }
 
@@ -399,6 +412,13 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
             columnType, safeHandle(() -> handleCassandraInetAddressType(colValue.toString())));
 
       case "time":
+        return PreparedStatementValueObject.create(
+            columnType,
+            safeHandle(
+                () ->
+                    handleCassandraTimestampType(colValue.toString())
+                        .atZone(ZoneId.systemDefault())
+                        .toLocalTime()));
       case "timestamp":
       case "datetime":
         return PreparedStatementValueObject.create(
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index aedb268c7c..a2d5fa0097 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -35,6 +35,8 @@
 import java.net.UnknownHostException;
 import java.time.Duration;
 import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -985,6 +987,11 @@ public void testCastToExpectedTypeForVariousTypes() throws UnknownHostException
     assertEquals(
         new BigInteger("123456789123456789123456789"),
         castToExpectedType("varint", "123456789123456789123456789"));
+    String timeString = "14:30:45";
+    // Parse the time
+    LocalTime localTime = LocalTime.parse(timeString, DateTimeFormatter.ISO_TIME);
+    Object localTime1 = castToExpectedType("time", "14:30:45");
+    assertTrue(localTime1 instanceof LocalTime);
     assertEquals(
         Duration.ofHours(5), castToExpectedType("duration", Duration.ofHours(5).toString()));
   }

From 5e000ba4349efdde448d0418a0dad29055f9a5ed Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Fri, 17 Jan 2025 11:18:12 +0530
Subject: [PATCH 26/56] Cassandra pr bug fixes (#70)

---
 .../dbutils/dml/CassandraDMLGenerator.java    | 87 ++++++++-----------
 .../dbutils/dml/CassandraTypeHandler.java     | 15 +++-
 2 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index a32e554f43..e155c2c562 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -27,11 +27,12 @@
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -210,50 +211,33 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
       Map<String, PreparedStatementValueObject<?>> columnNameValues,
       Map<String, PreparedStatementValueObject<?>> pkColumnNameValues) {
 
-    StringBuilder allColumns = new StringBuilder();
-    StringBuilder placeholders = new StringBuilder();
-    List<PreparedStatementValueObject<?>> values = new ArrayList<>();
-
-    for (Map.Entry<String, PreparedStatementValueObject<?>> entry : pkColumnNameValues.entrySet()) {
-      String colName = entry.getKey();
-      PreparedStatementValueObject<?> colValue = entry.getValue();
-      if (colValue.value() != null) {
-        allColumns.append(colName).append(", ");
-        placeholders.append("?, ");
-        values.add(colValue);
-      }
-    }
+    String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
+    List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries =
+        Stream.concat(pkColumnNameValues.entrySet().stream(), columnNameValues.entrySet().stream())
+            .filter(
+                entry ->
+                    entry.getValue().value() != null
+                        && entry.getValue().value() != CassandraTypeHandler.NullClass.INSTANCE)
+            .collect(Collectors.toList());
 
-    for (Map.Entry<String, PreparedStatementValueObject<?>> entry : columnNameValues.entrySet()) {
-      String colName = entry.getKey();
-      PreparedStatementValueObject<?> colValue = entry.getValue();
-      if (colValue.value() != CassandraTypeHandler.NullClass.INSTANCE) {
-        allColumns.append(colName).append(", ");
-        placeholders.append("?, ");
-        values.add(colValue);
-      }
-    }
-
-    if (allColumns.length() > 0) {
-      allColumns.setLength(allColumns.length() - 2);
-    }
-    if (placeholders.length() > 0) {
-      placeholders.setLength(placeholders.length() - 2);
-    }
+    String allColumns =
+        allEntries.stream()
+            .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\"")
+            .collect(Collectors.joining(", "));
+    String placeholders = allEntries.stream().map(entry -> "?").collect(Collectors.joining(", "));
 
-    String preparedStatement =
-        "INSERT INTO "
-            + tableName
-            + " ("
-            + allColumns
-            + ") VALUES ("
-            + placeholders
-            + ") USING TIMESTAMP ?;";
+    List<PreparedStatementValueObject<?>> values =
+        allEntries.stream().map(Map.Entry::getValue).collect(Collectors.toList());
 
     PreparedStatementValueObject<Long> timestampObj =
         PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
     values.add(timestampObj);
 
+    String preparedStatement =
+        String.format(
+            "INSERT INTO %s (%s) VALUES (%s) USING TIMESTAMP ?",
+            escapedTableName, allColumns, placeholders);
+
     return new PreparedStatementGeneratedResponse(preparedStatement, values);
   }
 
@@ -280,23 +264,22 @@ private static DMLGeneratorResponse getDeleteStatementCQL(
       Map<String, PreparedStatementValueObject<?>> pkColumnNameValues,
       long timestamp) {
 
-    StringBuilder deleteConditions = new StringBuilder();
-    List<PreparedStatementValueObject<?>> values = new ArrayList<>();
+    String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
 
-    for (Map.Entry<String, PreparedStatementValueObject<?>> entry : pkColumnNameValues.entrySet()) {
-      String colName = entry.getKey();
-      PreparedStatementValueObject<?> colValue = entry.getValue();
-      if (colValue.value() != CassandraTypeHandler.NullClass.INSTANCE) {
-        deleteConditions.append(colName).append(" = ? AND ");
-        values.add(entry.getValue());
-      }
-    }
+    String deleteConditions =
+        pkColumnNameValues.entrySet().stream()
+            .filter(entry -> entry.getValue().value() != CassandraTypeHandler.NullClass.INSTANCE)
+            .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\" = ?")
+            .collect(Collectors.joining(" AND "));
 
-    if (deleteConditions.length() > 0) {
-      deleteConditions.setLength(deleteConditions.length() - 5);
-    }
+    List<PreparedStatementValueObject<?>> values =
+        pkColumnNameValues.entrySet().stream()
+            .filter(entry -> entry.getValue().value() != CassandraTypeHandler.NullClass.INSTANCE)
+            .map(Map.Entry::getValue)
+            .collect(Collectors.toList());
 
-    String preparedStatement = "DELETE FROM " + tableName + " WHERE " + deleteConditions + ";";
+    String preparedStatement =
+        String.format("DELETE FROM %s WHERE %s", escapedTableName, deleteConditions);
 
     return new PreparedStatementGeneratedResponse(preparedStatement, values);
   }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index 98697ca71d..9f29749006 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -358,21 +358,30 @@ private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
     if (columnType.startsWith("list<")) {
       return safeHandle(
           () -> {
-            JSONArray parsedJSONArray = new JSONArray((String) colValue);
+            JSONArray parsedJSONArray =
+                colValue instanceof JSONArray
+                    ? (JSONArray) colValue
+                    : new JSONArray((String) colValue);
             return PreparedStatementValueObject.create(
                 columnType, parseCassandraList(columnType, parsedJSONArray));
           });
     } else if (columnType.startsWith("set<")) {
       return safeHandle(
           () -> {
-            JSONArray parsedJSONArray = new JSONArray((String) colValue);
+            JSONArray parsedJSONArray =
+                colValue instanceof JSONArray
+                    ? (JSONArray) colValue
+                    : new JSONArray((String) colValue);
             return PreparedStatementValueObject.create(
                 columnType, parseCassandraSet(columnType, parsedJSONArray));
           });
     } else if (columnType.startsWith("map<")) {
       return safeHandle(
           () -> {
-            JSONObject parsedJSON = new JSONObject((String) colValue);
+            JSONObject parsedJSON =
+                colValue instanceof JSONObject
+                    ? (JSONObject) colValue
+                    : new JSONObject((String) colValue);
             return PreparedStatementValueObject.create(
                 columnType, parseCassandraMap(columnType, parsedJSON));
           });

From 4dde5da116836304ded77a2d2659c7fcb67eac53 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Fri, 17 Jan 2025 13:49:44 +0530
Subject: [PATCH 27/56] Handle Timestamp Fixes (#72)

* Added Code Combined in a single way

* Address The Unwanted Hop
---
 .../dbutils/dao/source/CassandraDao.java      |   8 +-
 .../dbutils/dml/CassandraDMLGenerator.java    | 136 +++++++++---------
 .../processor/InputRecordProcessor.java       |   1 +
 .../templates/models/DMLGeneratorRequest.java |  13 ++
 .../dml/CassandraDMLGeneratorTest.java        |  97 ++++---------
 5 files changed, 115 insertions(+), 140 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
index 74f81f5965..7181741de0 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dao/source/CassandraDao.java
@@ -49,7 +49,13 @@ public void write(DMLGeneratorResponse dmlGeneratorResponse) throws Exception {
     BoundStatement boundStatement =
         preparedStatement.bind(
             preparedStatementGeneratedResponse.getValues().stream()
-                .map(v -> CassandraTypeHandler.castToExpectedType(v.dataType(), v.value()))
+                .map(
+                    v -> {
+                      if (v.value() == CassandraTypeHandler.NullClass.INSTANCE) {
+                        return null;
+                      }
+                      return CassandraTypeHandler.castToExpectedType(v.dataType(), v.value());
+                    })
                 .toArray());
     session.execute(boundStatement);
   }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index e155c2c562..a8f8015e9a 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -26,7 +26,6 @@
 import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
-import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -91,24 +90,19 @@ public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequ
     }
 
     NameAndCols tableMapping = schema.getSpannerToID().get(spannerTableName);
-    if (tableMapping == null) {
-      LOG.warn(
-          "Spanner table {} not found in session file. Dropping the record.", spannerTableName);
-      return new DMLGeneratorResponse("");
-    }
-
-    String spannerTableId = tableMapping.getName();
-    SpannerTable spannerTable = schema.getSpSchema().get(spannerTableId);
+    SpannerTable spannerTable = schema.getSpSchema().get(tableMapping.getName());
     if (spannerTable == null) {
       LOG.warn(
           "Spanner table {} not found in session file. Dropping the record.", spannerTableName);
       return new DMLGeneratorResponse("");
     }
 
-    SourceTable sourceTable = schema.getSrcSchema().get(spannerTableId);
+    SourceTable sourceTable = schema.getSrcSchema().get(tableMapping.getName());
     if (sourceTable == null) {
       LOG.warn(
-          "Source table {} not found for Spanner table ID: {}", spannerTableName, spannerTableId);
+          "Source table {} not found for Spanner table Name: {}",
+          spannerTableName,
+          tableMapping.getName());
       return new DMLGeneratorResponse("");
     }
 
@@ -132,45 +126,43 @@ public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequ
           sourceTable.getName());
       return new DMLGeneratorResponse("");
     }
-
+    java.sql.Timestamp timestamp = dmlGeneratorRequest.getCommitTimestamp().toSqlTimestamp();
     String modType = dmlGeneratorRequest.getModType();
-    switch (modType) {
-      case "INSERT":
-      case "UPDATE":
-        return generateUpsertStatement(
-            spannerTable, sourceTable, dmlGeneratorRequest, pkColumnNameValues);
-      case "DELETE":
-        long timestamp = Instant.now().toEpochMilli() * 1000;
-        return getDeleteStatementCQL(sourceTable.getName(), pkColumnNameValues, timestamp);
-      default:
-        LOG.error("Unsupported modType: {} for table {}", modType, spannerTableName);
-        return new DMLGeneratorResponse("");
-    }
+    return generatorDMLResponse(
+        spannerTable, sourceTable, dmlGeneratorRequest, pkColumnNameValues, timestamp, modType);
   }
 
   /**
-   * Generates an upsert (insert or update) DML statement for a given Spanner table based on the
-   * provided source table, request parameters, and primary key column values.
+   * Generates a DML response based on the given modification type (INSERT, UPDATE, or DELETE).
+   *
+   * <p>This method processes the data from SpannerTable, SourceTable, and DMLGeneratorRequest to
+   * construct a corresponding CQL statement (INSERT, UPDATE, or DELETE) for Cassandra. The
+   * statement is generated based on the modification type and includes the appropriate primary key
+   * and column values, along with an optional timestamp.
    *
-   * @param spannerTable the Spanner table metadata containing column definitions and constraints.
-   * @param sourceTable the source table metadata containing the table name and structure.
-   * @param dmlGeneratorRequest the request containing new values, key values, and timezone offset
-   *     for generating the DML.
-   * @param pkColumnNameValues a map of primary key column names and their corresponding prepared
-   *     statement value objects.
-   * @return a {@link DMLGeneratorResponse} containing the generated upsert statement and associated
-   *     data.
-   *     <p>This method: 1. Extracts column values from the provided request using the
-   *     `getColumnValues` method. 2. Combines the column values with the primary key column values.
-   *     3. Constructs the upsert statement using the `getUpsertStatementCQL` method.
-   *     <p>The upsert statement ensures that the record is inserted or updated in the Spanner table
-   *     based on the primary key.
+   * @param spannerTable the SpannerTable object containing schema information of the Spanner table
+   * @param sourceTable the SourceTable object containing details of the source table (e.g., name)
+   * @param dmlGeneratorRequest the request object containing new and key value data in JSON format
+   * @param pkColumnNameValues a map of primary key column names and their corresponding value
+   *     objects
+   * @param timestamp the optional timestamp to be included in the Cassandra statement (can be null)
+   * @param modType the type of modification to perform, either "INSERT", "UPDATE", or "DELETE"
+   * @return DMLGeneratorResponse the response containing the generated CQL statement and bound
+   *     values
+   * @throws IllegalArgumentException if the modType is unsupported or if any required data is
+   *     invalid
+   * @implNote The method uses the following logic: - Combines primary key values and column values
+   *     into a single list of entries. - Depending on the modType: - For "INSERT" or "UPDATE",
+   *     calls {@link #getUpsertStatementCQL}. - For "DELETE", calls {@link #getDeleteStatementCQL}.
+   *     - For unsupported modType values, logs an error and returns an empty response.
    */
-  private static DMLGeneratorResponse generateUpsertStatement(
+  private static DMLGeneratorResponse generatorDMLResponse(
       SpannerTable spannerTable,
       SourceTable sourceTable,
       DMLGeneratorRequest dmlGeneratorRequest,
-      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues) {
+      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues,
+      java.sql.Timestamp timestamp,
+      String modType) {
     Map<String, PreparedStatementValueObject<?>> columnNameValues =
         getColumnValues(
             spannerTable,
@@ -178,11 +170,19 @@ private static DMLGeneratorResponse generateUpsertStatement(
             dmlGeneratorRequest.getNewValuesJson(),
             dmlGeneratorRequest.getKeyValuesJson(),
             dmlGeneratorRequest.getSourceDbTimezoneOffset());
-    return getUpsertStatementCQL(
-        sourceTable.getName(),
-        Instant.now().toEpochMilli() * 1000,
-        columnNameValues,
-        pkColumnNameValues);
+    List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries =
+        Stream.concat(pkColumnNameValues.entrySet().stream(), columnNameValues.entrySet().stream())
+            .collect(Collectors.toList());
+    switch (modType) {
+      case "INSERT":
+      case "UPDATE":
+        return getUpsertStatementCQL(sourceTable.getName(), timestamp, allEntries);
+      case "DELETE":
+        return getDeleteStatementCQL(sourceTable.getName(), timestamp, allEntries);
+      default:
+        LOG.error("Unsupported modType: {} for table {}", modType, spannerTable.getName());
+        return new DMLGeneratorResponse("");
+    }
   }
 
   /**
@@ -190,11 +190,9 @@ private static DMLGeneratorResponse generateUpsertStatement(
    * the provided table name, timestamp, column values, and primary key values.
    *
    * @param tableName the name of the table to which the upsert statement applies.
-   * @param timestamp the timestamp (in microseconds) to use for the operation.
-   * @param columnNameValues a map of column names and their corresponding prepared statement value
+   * @param timestamp the timestamp (in java.sql.Timestamp) to use for the operation.
+   * @param allEntries a map of column names and their corresponding prepared statement value
    *     objects for non-primary key columns.
-   * @param pkColumnNameValues a map of primary key column names and their corresponding prepared
-   *     statement value objects.
    * @return a {@link DMLGeneratorResponse} containing the generated CQL statement and a list of
    *     values to be used with the prepared statement.
    *     <p>This method: 1. Iterates through the primary key and column values, appending column
@@ -207,19 +205,10 @@ private static DMLGeneratorResponse generateUpsertStatement(
    */
   private static DMLGeneratorResponse getUpsertStatementCQL(
       String tableName,
-      long timestamp,
-      Map<String, PreparedStatementValueObject<?>> columnNameValues,
-      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues) {
+      java.sql.Timestamp timestamp,
+      List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries) {
 
     String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
-    List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries =
-        Stream.concat(pkColumnNameValues.entrySet().stream(), columnNameValues.entrySet().stream())
-            .filter(
-                entry ->
-                    entry.getValue().value() != null
-                        && entry.getValue().value() != CassandraTypeHandler.NullClass.INSTANCE)
-            .collect(Collectors.toList());
-
     String allColumns =
         allEntries.stream()
             .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\"")
@@ -229,7 +218,7 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
     List<PreparedStatementValueObject<?>> values =
         allEntries.stream().map(Map.Entry::getValue).collect(Collectors.toList());
 
-    PreparedStatementValueObject<Long> timestampObj =
+    PreparedStatementValueObject<java.sql.Timestamp> timestampObj =
         PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
     values.add(timestampObj);
 
@@ -248,7 +237,7 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
    * @param tableName the name of the table from which records will be deleted.
    * @param pkColumnNameValues a map containing the primary key column names and their corresponding
    *     prepared statement value objects.
-   * @param timestamp the timestamp (in microseconds) to use for the delete operation.
+   * @param timestamp the timestamp (in java.sql.Timestamp) to use for the delete operation.
    * @return a {@link DMLGeneratorResponse} containing the generated CQL delete statement and a list
    *     of values to bind to the prepared statement.
    *     <p>This method: 1. Iterates through the provided primary key column values, appending
@@ -261,25 +250,28 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
    */
   private static DMLGeneratorResponse getDeleteStatementCQL(
       String tableName,
-      Map<String, PreparedStatementValueObject<?>> pkColumnNameValues,
-      long timestamp) {
+      java.sql.Timestamp timestamp,
+      List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries) {
 
     String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
 
     String deleteConditions =
-        pkColumnNameValues.entrySet().stream()
-            .filter(entry -> entry.getValue().value() != CassandraTypeHandler.NullClass.INSTANCE)
+        allEntries.stream()
             .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\" = ?")
             .collect(Collectors.joining(" AND "));
 
     List<PreparedStatementValueObject<?>> values =
-        pkColumnNameValues.entrySet().stream()
-            .filter(entry -> entry.getValue().value() != CassandraTypeHandler.NullClass.INSTANCE)
-            .map(Map.Entry::getValue)
-            .collect(Collectors.toList());
+        allEntries.stream().map(Map.Entry::getValue).collect(Collectors.toList());
 
     String preparedStatement =
-        String.format("DELETE FROM %s WHERE %s", escapedTableName, deleteConditions);
+        String.format(
+            "DELETE FROM %s USING TIMESTAMP ? WHERE %s", escapedTableName, deleteConditions);
+
+    if (timestamp != null) {
+      PreparedStatementValueObject<java.sql.Timestamp> timestampObj =
+          PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
+      values.add(0, timestampObj);
+    }
 
     return new PreparedStatementGeneratedResponse(preparedStatement, values);
   }
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
index f61eec1c25..8b51f11d29 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
@@ -98,6 +98,7 @@ public static boolean processRecord(
                   modType, tableName, newValuesJson, keysJson, sourceDbTimezoneOffset)
               .setSchema(schema)
               .setCustomTransformationResponse(customTransformationResponse)
+              .setCommitTimestamp(spannerRecord.getCommitTimestamp())
               .build();
 
       DMLGeneratorResponse dmlGeneratorResponse = dmlGenerator.getDMLStatement(dmlGeneratorRequest);
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java
index 3db153c51e..dcb0693ecf 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/models/DMLGeneratorRequest.java
@@ -15,6 +15,7 @@
  */
 package com.google.cloud.teleport.v2.templates.models;
 
+import com.google.cloud.Timestamp;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
 import java.util.Map;
 import org.json.JSONObject;
@@ -53,6 +54,7 @@ public class DMLGeneratorRequest {
   private final String sourceDbTimezoneOffset;
 
   private Map<String, Object> customTransformationResponse;
+  private final Timestamp commitTimestamp;
 
   public DMLGeneratorRequest(Builder builder) {
     this.modType = builder.modType;
@@ -62,6 +64,11 @@ public DMLGeneratorRequest(Builder builder) {
     this.keyValuesJson = builder.keyValuesJson;
     this.sourceDbTimezoneOffset = builder.sourceDbTimezoneOffset;
     this.customTransformationResponse = builder.customTransformationResponse;
+    this.commitTimestamp = builder.commitTimestamp;
+  }
+
+  public Timestamp getCommitTimestamp() {
+    return this.commitTimestamp;
   }
 
   public String getModType() {
@@ -100,6 +107,7 @@ public static class Builder {
     private final String sourceDbTimezoneOffset;
     private Schema schema;
     private Map<String, Object> customTransformationResponse;
+    private Timestamp commitTimestamp;
 
     public Builder(
         String modType,
@@ -119,6 +127,11 @@ public Builder setSchema(Schema schema) {
       return this;
     }
 
+    public Builder setCommitTimestamp(Timestamp commitTimestamp) {
+      this.commitTimestamp = commitTimestamp;
+      return this;
+    }
+
     public Builder setCustomTransformationResponse(
         Map<String, Object> customTransformationResponse) {
       this.customTransformationResponse = customTransformationResponse;
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
index d3a685824f..49d8ace091 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
@@ -22,6 +22,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.cloud.Timestamp;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.NameAndCols;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
@@ -96,13 +97,13 @@ public void tableAndAllColumnNameTypesMatch() {
     String keyValueString = "{\"SingerId\":\"999\"}";
     JSONObject keyValuesJson = new JSONObject(keyValueString);
     String modType = "INSERT";
-
     CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
     DMLGeneratorResponse dmlGeneratorResponse =
         cassandraDMLGenerator.getDMLStatement(
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -110,27 +111,6 @@ public void tableAndAllColumnNameTypesMatch() {
     assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
-  @Test
-  public void tableNameMismatchAllColumnNameTypesMatch() {
-    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
-    String tableName = "leChanteur";
-    String newValuesString = "{\"LastName\":\"ll\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"SingerId\":\"999\"}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-    assertEquals("", sql);
-  }
-
   @Test
   public void tableNameMatchColumnNameTypeMismatch() {
     Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
@@ -147,6 +127,7 @@ public void tableNameMatchColumnNameTypeMismatch() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -171,6 +152,7 @@ public void tableNameMatchSourceColumnNotPresentInSpanner() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -195,6 +177,7 @@ public void tableNameMatchSpannerColumnNotPresentInSource() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -218,6 +201,7 @@ public void primaryKeyNotFoundInJson() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -240,6 +224,7 @@ public void primaryKeyNotPresentInSourceSchema() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -262,6 +247,7 @@ public void primaryKeyMismatch() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -286,6 +272,7 @@ public void updateToNull() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -309,9 +296,10 @@ public void deleteMultiplePKColumns() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
-    assertEquals(1, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
+    assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
   @Test
@@ -330,6 +318,7 @@ public void testSingleQuoteMatch() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -354,6 +343,7 @@ public void singleQuoteBytesDML() throws Exception {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
     assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
@@ -376,6 +366,7 @@ public void testParseBlobType_hexString() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
     assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
@@ -398,6 +389,7 @@ public void testParseBlobType_base64String() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
     assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
@@ -420,6 +412,7 @@ public void twoSingleEscapedQuoteDML() throws Exception {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
     assertTrue(sql.contains("sample_table"));
@@ -443,6 +436,7 @@ public void threeEscapesAndSingleQuoteDML() throws Exception {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -467,6 +461,7 @@ public void tabEscapeDML() throws Exception {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -491,6 +486,7 @@ public void backSpaceEscapeDML() throws Exception {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -515,6 +511,7 @@ public void newLineEscapeDML() throws Exception {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -538,6 +535,7 @@ public void bitColumnSql() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -545,28 +543,6 @@ public void bitColumnSql() {
     assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
   }
 
-  @Test
-  public void testSpannerTableNotInSchema() {
-    Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
-    String tableName = "SomeRandomTableNotInSchema";
-    String newValuesString = "{\"FirstName\":\"kk\",\"LastName\":\"ll\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"SingerId\":\"999\"}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-
-    assertTrue(sql.isEmpty());
-  }
-
   @Test
   public void testSpannerKeyIsNull() {
     Schema schema = SessionFileReader.read("src/test/resources/cassandraSession.json");
@@ -583,6 +559,7 @@ public void testSpannerKeyIsNull() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -606,6 +583,7 @@ public void testSourcePKNotInSpanner() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -628,6 +606,7 @@ public void primaryKeyMismatchSpannerNull() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -652,6 +631,7 @@ public void testUnsupportedModType() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -674,6 +654,7 @@ public void testUpdateModType() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -698,6 +679,7 @@ public void testSpannerTableIdMismatch() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
     assertTrue(sql.isEmpty());
@@ -719,28 +701,7 @@ public void testSourcePkNull() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
-                .build());
-    String sql = dmlGeneratorResponse.getDmlStatement();
-
-    assertTrue(sql.isEmpty());
-  }
-
-  @Test
-  public void testSourceTableNotInSchema() {
-    Schema schema = getSchemaObject();
-    String tableName = "contacts";
-    String newValuesString = "{\"accountId\": \"Id1\"}";
-    JSONObject newValuesJson = new JSONObject(newValuesString);
-    String keyValueString = "{\"Dont\":\"care\"}";
-    JSONObject keyValuesJson = new JSONObject(keyValueString);
-    String modType = "INSERT";
-
-    CassandraDMLGenerator cassandraDMLGenerator = new CassandraDMLGenerator();
-    DMLGeneratorResponse dmlGeneratorResponse =
-        cassandraDMLGenerator.getDMLStatement(
-            new DMLGeneratorRequest.Builder(
-                    modType, tableName, newValuesJson, keyValuesJson, "+00:00")
-                .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -764,6 +725,7 @@ public void testSpannerTableNotInSchemaObject() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
 
@@ -790,6 +752,7 @@ public void testSpannerColDefsNull() {
             new DMLGeneratorRequest.Builder(
                     modType, tableName, newValuesJson, keyValuesJson, "+00:00")
                 .setSchema(schema)
+                .setCommitTimestamp(Timestamp.now())
                 .build());
     String sql = dmlGeneratorResponse.getDmlStatement();
     CassandraDMLGenerator test = new CassandraDMLGenerator();

From f7d88f813be6dd23b1a6f466e2ff8926c9451c6f Mon Sep 17 00:00:00 2001
From: Akash Thawait <aakash@ollion.com>
Date: Sat, 18 Jan 2025 17:05:01 +0530
Subject: [PATCH 28/56] Added load test for the Spanner to cassandra flow

---
 .../templates/SpannerToCassandraLTBase.java   | 255 ++++++++++++++++++
 .../templates/SpannerToCassandraSourceLT.java | 128 +++++++++
 .../cassandra-config-template.conf            |  12 +
 .../datagenerator-schema.json                 |   9 +
 .../SpannerToCassandraSourceLT/session.json   |   3 +
 .../spanner-schema.sql                        |  15 ++
 6 files changed, 422 insertions(+)
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/cassandra-config-template.conf
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/datagenerator-schema.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/session.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/spanner-schema.sql

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java
new file mode 100644
index 0000000000..6ebe73c3d0
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright (C) 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.io.Resources;
+import com.google.pubsub.v1.SubscriptionName;
+import com.google.pubsub.v1.TopicName;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.beam.it.cassandra.CassandraResourceManager;
+import org.apache.beam.it.common.PipelineLauncher;
+import org.apache.beam.it.common.PipelineLauncher.LaunchConfig;
+import org.apache.beam.it.common.PipelineLauncher.LaunchInfo;
+import org.apache.beam.it.common.TestProperties;
+import org.apache.beam.it.common.utils.ResourceManagerUtils;
+import org.apache.beam.it.gcp.TemplateLoadTestBase;
+import org.apache.beam.it.gcp.artifacts.utils.ArtifactUtils;
+import org.apache.beam.it.gcp.pubsub.PubsubResourceManager;
+import org.apache.beam.it.gcp.spanner.SpannerResourceManager;
+import org.apache.beam.it.gcp.storage.GcsResourceManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Base class for Spanner to sourcedb Load tests. It provides helper functions related to
+ * environment setup and assertConditions.
+ */
+public class SpannerToCassandraLTBase extends TemplateLoadTestBase {
+
+   private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraLTBase.class);
+
+   private static final String TEMPLATE_SPEC_PATH =
+       MoreObjects.firstNonNull(
+           TestProperties.specPath(), "gs://dataflow-templates/latest/flex/Spanner_to_SourceDb");
+   public SpannerResourceManager spannerResourceManager;
+   public SpannerResourceManager spannerMetadataResourceManager;
+   public CassandraResourceManager cassandraResourceManager;
+   public GcsResourceManager gcsResourceManager;
+   private static PubsubResourceManager pubsubResourceManager;
+   private SubscriptionName subscriptionName;
+
+   public void setupResourceManagers(
+       String spannerDdlResource, String sessionFileResource, String artifactBucket)
+       throws IOException {
+      spannerResourceManager = createSpannerDatabase(spannerDdlResource);
+      spannerMetadataResourceManager = createSpannerMetadataDatabase();
+
+      gcsResourceManager =
+          GcsResourceManager.builder(artifactBucket, getClass().getSimpleName(), CREDENTIALS).build();
+
+      gcsResourceManager.uploadArtifact(
+          "input/session.json", Resources.getResource(sessionFileResource).getPath());
+
+      pubsubResourceManager = setUpPubSubResourceManager();
+      subscriptionName =
+          createPubsubResources(
+              getClass().getSimpleName(),
+              pubsubResourceManager,
+              getGcsPath(artifactBucket, "dlq", gcsResourceManager)
+                  .replace("gs://" + artifactBucket, ""));
+   }
+
+   public void setupCassandraResourceManager() throws IOException {
+      cassandraResourceManager = CassandraResourceManager.builder(testName).build();
+      createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
+   }
+
+   public void cleanupResourceManagers() {
+      ResourceManagerUtils.cleanResources(
+          spannerResourceManager,
+          spannerMetadataResourceManager,
+          gcsResourceManager,
+          pubsubResourceManager, cassandraResourceManager);
+   }
+
+   public PubsubResourceManager setUpPubSubResourceManager() throws IOException {
+      return PubsubResourceManager.builder(testName, project, CREDENTIALS_PROVIDER)
+          .setMonitoringClient(monitoringClient)
+          .build();
+   }
+
+   public SubscriptionName createPubsubResources(
+       String identifierSuffix, PubsubResourceManager pubsubResourceManager, String gcsPrefix) {
+      String topicNameSuffix = "rr-load" + identifierSuffix;
+      String subscriptionNameSuffix = "rr-load-sub" + identifierSuffix;
+      TopicName topic = pubsubResourceManager.createTopic(topicNameSuffix);
+      SubscriptionName subscription =
+          pubsubResourceManager.createSubscription(topic, subscriptionNameSuffix);
+      String prefix = gcsPrefix;
+      if (prefix.startsWith("/")) {
+         prefix = prefix.substring(1);
+      }
+      prefix += "/retry/";
+      gcsResourceManager.createNotification(topic.toString(), prefix);
+      return subscription;
+   }
+
+   public SpannerResourceManager createSpannerDatabase(String spannerDdlResourceFile)
+       throws IOException {
+      SpannerResourceManager spannerResourceManager =
+          SpannerResourceManager.builder("rr-loadtest-" + testName, project, region)
+              .maybeUseStaticInstance()
+              .build();
+      String ddl =
+          String.join(
+              " ",
+              Resources.readLines(
+                  Resources.getResource(spannerDdlResourceFile), StandardCharsets.UTF_8));
+      ddl = ddl.trim();
+      String[] ddls = ddl.split(";");
+      for (String d : ddls) {
+         if (!d.isBlank()) {
+            spannerResourceManager.executeDdlStatement(d);
+         }
+      }
+      return spannerResourceManager;
+   }
+
+   public SpannerResourceManager createSpannerMetadataDatabase() throws IOException {
+      SpannerResourceManager spannerMetadataResourceManager =
+          SpannerResourceManager.builder("rr-meta-" + testName, project, region)
+              .maybeUseStaticInstance()
+              .build();
+      String dummy = "create table t1(id INT64 ) primary key(id)";
+      spannerMetadataResourceManager.executeDdlStatement(dummy);
+      return spannerMetadataResourceManager;
+   }
+
+   public void createAndUploadCassandraConfigToGcs(
+       GcsResourceManager gcsResourceManager,CassandraResourceManager cassandraResourceManagers)
+       throws IOException {
+      String host = cassandraResourceManagers.getHost();
+      int port = cassandraResourceManagers.getPort();
+      String keyspaceName = cassandraResourceManagers.getKeyspaceName();
+
+      String cassandraConfigContents = new String(Files.readAllBytes(Paths.get("SpannerToCassandraSourceLT/cassandra-config-template.conf")));
+      cassandraConfigContents = cassandraConfigContents.replace("##host##", host).replace("##port##", Integer.toString(port)).replace("##keyspace##", keyspaceName);
+
+      LOG.info("Cassandra file contents: {}", cassandraConfigContents);
+      gcsResourceManager.createArtifact("input/cassandra-config.conf", cassandraConfigContents);
+   }
+
+   public PipelineLauncher.LaunchInfo launchDataflowJob(
+       String artifactBucket, int numWorkers, int maxWorkers) throws IOException {
+      // default parameters
+
+      Map<String, String> params =
+          new HashMap<>() {
+             {
+                put(
+                    "sessionFilePath",
+                    getGcsPath(artifactBucket, "input/session.json", gcsResourceManager));
+                put("instanceId", spannerResourceManager.getInstanceId());
+                put("databaseId", spannerResourceManager.getDatabaseId());
+                put("spannerProjectId", project);
+                put("metadataDatabase", spannerMetadataResourceManager.getDatabaseId());
+                put("metadataInstance", spannerMetadataResourceManager.getInstanceId());
+                put(
+                    "sourceShardsFilePath",
+                    getGcsPath(artifactBucket, "input/cassandra-config.conf", gcsResourceManager));
+                put("changeStreamName", "allstream");
+                put("dlqGcsPubSubSubscription", subscriptionName.toString());
+                put("deadLetterQueueDirectory", getGcsPath(artifactBucket, "dlq", gcsResourceManager));
+                put("maxShardConnections", "100");
+                put("sourceType","cassandra");
+             }
+          };
+
+      LaunchConfig.Builder options =
+          LaunchConfig.builder(getClass().getSimpleName(), TEMPLATE_SPEC_PATH);
+      options
+          .addEnvironment("maxWorkers", maxWorkers)
+          .addEnvironment("numWorkers", numWorkers)
+          .addEnvironment("additionalExperiments", Collections.singletonList("use_runner_v2"));
+
+      options.setParameters(params);
+      PipelineLauncher.LaunchInfo jobInfo = pipelineLauncher.launch(project, region, options.build());
+      return jobInfo;
+   }
+
+   public String getGcsPath(
+       String bucket, String artifactId, GcsResourceManager gcsResourceManager) {
+      return ArtifactUtils.getFullGcsPath(
+          bucket, getClass().getSimpleName(), gcsResourceManager.runId(), artifactId);
+   }
+
+   public Map<String, Double> getCustomCounters(
+       LaunchInfo launchInfo, int numShards, Map<String, Double> metrics) throws IOException {
+      Double successfulEvents =
+          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "success_record_count");
+      metrics.put(
+          "Custom_Counter_SuccessRecordCount", successfulEvents != null ? successfulEvents : 0.0);
+      Double retryableErrors =
+          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "retryable_record_count");
+      metrics.put(
+          "Custom_Counter_RetryableRecordCount", retryableErrors != null ? retryableErrors : 0.0);
+
+      Double severeErrorCount =
+          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "severe_error_count");
+      metrics.put(
+          "Custom_Counter_SevereErrorCount", severeErrorCount != null ? severeErrorCount : 0.0);
+      Double skippedRecordCount =
+          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "skipped_record_count");
+      metrics.put(
+          "Custom_Counter_SkippedRecordCount", skippedRecordCount != null ? skippedRecordCount : 0.0);
+
+      for (int i = 1; i <= numShards; ++i) {
+         Double replicationLag =
+             pipelineLauncher.getMetric(
+                 project,
+                 region,
+                 launchInfo.jobId(),
+                 "replication_lag_in_seconds_Shard" + i + "_MEAN");
+         metrics.put(
+             "Custom_Counter_MeanReplicationLagShard" + i,
+             replicationLag != null ? replicationLag : 0.0);
+      }
+      return metrics;
+   }
+
+   public void exportMetrics(PipelineLauncher.LaunchInfo jobInfo, int numShards)
+       throws ParseException, IOException, InterruptedException {
+      Map<String, Double> metrics = getMetrics(jobInfo);
+      getCustomCounters(jobInfo, numShards, metrics);
+      getResourceManagerMetrics(metrics);
+
+      // export results
+      exportMetricsToBigQuery(jobInfo, metrics);
+   }
+
+   public void getResourceManagerMetrics(Map<String, Double> metrics) {
+      pubsubResourceManager.collectMetrics(metrics);
+   }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
new file mode 100644
index 0000000000..d18ac5b411
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
@@ -0,0 +1,128 @@
+package com.google.cloud.teleport.v2.templates;
+
+import com.google.cloud.teleport.metadata.TemplateLoadTest;
+import org.apache.beam.it.cassandra.CassandraResourceManager;
+import org.apache.beam.it.common.PipelineLauncher;
+import org.apache.beam.it.common.PipelineOperator;
+import org.apache.beam.it.common.TestProperties;
+import org.apache.beam.it.gcp.datagenerator.DataGenerator;
+import org.apache.beam.it.jdbc.conditions.JDBCRowsCheck;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.shaded.com.google.common.io.Resources;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.time.Duration;
+
+import static org.apache.beam.it.gcp.artifacts.utils.ArtifactUtils.getFullGcsPath;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
+
+@Category(TemplateLoadTest.class)
+@TemplateLoadTest(SpannerToSourceDb.class)
+@RunWith(JUnit4.class)
+
+public class SpannerToCassandraSourceLT extends SpannerToCassandraLTBase {
+  private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraSourceLT.class);
+
+  private String generatorSchemaPath;
+  private final String artifactBucket = TestProperties.artifactBucket();
+  private final String spannerDdlResource = "SpannerToCassandraSourceLT/spanner-schema.sql";
+  private final String sessionFileResource = "SpannerToCassandraSourceLT/session.json";
+  private final String dataGeneratorSchemaResource = "SpannerToCassandraSourceLT/datagenerator-schema.json";
+  private final String table = "Person";
+  private final int maxWorkers = 50;
+  private final int numWorkers = 20;
+  private PipelineLauncher.LaunchInfo jobInfo;
+  private PipelineLauncher.LaunchInfo readerJobInfo;
+  private final int numShards = 1;
+
+  @Before
+  public void setup() throws IOException {
+    setupResourceManagers(spannerDdlResource, sessionFileResource, artifactBucket);
+    setupCassandraResourceManager();
+    generatorSchemaPath =
+        getFullGcsPath(
+            artifactBucket,
+            gcsResourceManager
+                .uploadArtifact(
+                    "input/schema.json",
+                    Resources.getResource(dataGeneratorSchemaResource).getPath()
+                ).name()
+        );
+
+    createCassandraSchema(cassandraResourceManager);
+    jobInfo = launchDataflowJob(artifactBucket, numWorkers, maxWorkers);
+  }
+
+  @After
+  public void teardown(){
+    cleanupResourceManagers();
+  }
+
+  @Test
+  public void reverseReplication1KTpsLoadTest() throws IOException, ParseException, InterruptedException {
+    // Start data generator
+    DataGenerator dataGenerator =
+        DataGenerator.builderWithSchemaLocation(testName, generatorSchemaPath)
+            .setQPS("1000")
+            .setMessagesLimit(String.valueOf(300000))
+            .setSpannerInstanceName(spannerResourceManager.getInstanceId())
+            .setSpannerDatabaseName(spannerResourceManager.getDatabaseId())
+            .setSpannerTableName(table)
+            .setNumWorkers("50")
+            .setMaxNumWorkers("100")
+            .setSinkType("SPANNER")
+            .setProjectId(project)
+            .setBatchSizeBytes("0")
+            .build();
+
+    dataGenerator.execute(Duration.ofMinutes(90));
+    assertThatPipeline(jobInfo).isRunning();
+
+//    Todo Check for cassandra
+//    JDBCRowsCheck check =
+//        JDBCRowsCheck.builder(jdbcResourceManagers.get(0), table)
+//            .setMinRows(300000)
+//            .setMaxRows(300000)
+//            .build();
+
+    PipelineOperator.Result result =
+        pipelineOperator.waitForCondition(
+            createConfig(jobInfo, Duration.ofMinutes(10), Duration.ofSeconds(30)), check);
+
+    // Assert Conditions
+    assertThatResult(result).meetsConditions();
+
+    PipelineOperator.Result result1 =
+        pipelineOperator.cancelJobAndFinish(createConfig(jobInfo, Duration.ofMinutes(20)));
+
+    assertThatResult(result1).isLaunchFinished();
+
+    exportMetrics(jobInfo, numShards);
+  }
+
+  private void createCassandraSchema(CassandraResourceManager cassandraResourceManager){
+    String keyspace = cassandraResourceManager.getKeyspaceName();
+    String createTableStatement = String.format(
+        "CREATE TABLE IF NOT EXISTS %s.%s ("
+            + "ID uuid PRIMARY KEY, "
+            + "first_name1 text, "
+            + "last_name1 text, "
+            + "first_name2 text, "
+            + "last_name2 text, "
+            + "first_name3 text, "
+            + "last_name3 text);",
+        keyspace, table
+    );
+    cassandraResourceManager.executeStatement(createTableStatement);
+  }
+}
+
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/cassandra-config-template.conf b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/cassandra-config-template.conf
new file mode 100644
index 0000000000..a8ec8abffe
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/cassandra-config-template.conf
@@ -0,0 +1,12 @@
+  # Configuration for the DataStax Java driver for Apache Cassandra®.
+  # This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md.
+  # This file is meant to be used only in unit tests to test loading configuration from file.
+  # DO NOT USE FOR PRODUCTION.
+
+  datastax-java-driver {
+      basic.contact-points = ["##host##:##port##"]
+      basic.session-keyspace = "##keyspace##"
+    basic.load-balancing-policy {
+      local-datacenter = "datacenter1"
+    }
+  }
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/datagenerator-schema.json b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/datagenerator-schema.json
new file mode 100644
index 0000000000..fb8ec821bd
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/datagenerator-schema.json
@@ -0,0 +1,9 @@
+{
+  "ID": "{{uuid()}}",
+  "first_name1": "{{alphaNumeric(460,500)}}",
+  "last_name1": "{{alphaNumeric(460,500)}}",
+  "first_name2": "{{alphaNumeric(460,500)}}",
+  "last_name2": "{{alphaNumeric(460,500)}}",
+  "first_name3": "{{alphaNumeric(460,500)}}",
+  "last_name3": "{{alphaNumeric(460,500)}}"
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/session.json b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/session.json
new file mode 100644
index 0000000000..077404aaa4
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/session.json
@@ -0,0 +1,3 @@
+{
+  
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/spanner-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/spanner-schema.sql
new file mode 100644
index 0000000000..51daf346d3
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceLT/spanner-schema.sql
@@ -0,0 +1,15 @@
+CREATE TABLE `Person` (
+    `first_name1` STRING(500),
+    `last_name1` STRING(500),
+    `first_name2` STRING(500),
+    `last_name2` STRING(500),
+    `first_name3` STRING(500),
+    `last_name3` STRING(500),
+    `ID` STRING(100) NOT NULL,
+)  PRIMARY KEY(ID);
+
+CREATE CHANGE STREAM allstream
+  FOR ALL OPTIONS (
+  value_capture_type = 'NEW_ROW',
+  retention_period = '7d'
+);
\ No newline at end of file

From 244282223d7d5c7fd5874da4860278a4c66205cb Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 10:56:57 +0530
Subject: [PATCH 29/56] Added IT for Spanner to Cassandra SOurce DB

---
 v2/spanner-to-sourcedb/pom.xml                |   5 +
 .../v2/templates/CassandraRowsCheck.java      | 107 +++++
 .../templates/SpannerToCassandraDbITBase.java | 233 ++++++++++
 .../templates/SpannerToCassandraLTBase.java   | 411 +++++++++---------
 .../templates/SpannerToCassandraSourceLT.java |  81 ++--
 .../SpannerToSourceDbCassandraIT.java         | 219 ++++++++++
 .../cassandra-config-template.conf            |  12 +
 .../cassandra-schema.sql                      |   5 +
 .../SpannerToCassandraSourceIT/session.json   | 168 +++++++
 .../spanner-schema.sql                        |  16 +
 10 files changed, 1020 insertions(+), 237 deletions(-)
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraRowsCheck.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-config-template.conf
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/session.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql

diff --git a/v2/spanner-to-sourcedb/pom.xml b/v2/spanner-to-sourcedb/pom.xml
index 634998da7c..2b5b1adeb6 100644
--- a/v2/spanner-to-sourcedb/pom.xml
+++ b/v2/spanner-to-sourcedb/pom.xml
@@ -106,6 +106,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.beam</groupId>
+            <artifactId>beam-it-cassandra</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraRowsCheck.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraRowsCheck.java
new file mode 100644
index 0000000000..bc98a9c36e
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraRowsCheck.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates;
+
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.google.auto.value.AutoValue;
+import javax.annotation.Nullable;
+import org.apache.beam.it.cassandra.CassandraResourceManager;
+import org.apache.beam.it.conditions.ConditionCheck;
+
+@AutoValue
+public abstract class CassandraRowsCheck extends ConditionCheck {
+
+  abstract CassandraResourceManager resourceManager();
+
+  abstract String tableName();
+
+  abstract Integer minRows();
+
+  @Nullable
+  abstract Integer maxRows();
+
+  @Override
+  public String getDescription() {
+    if (maxRows() != null) {
+      return String.format(
+          "Cassandra table check if table %s has between %d and %d rows",
+          tableName(), minRows(), maxRows());
+    }
+    return String.format(
+        "Cassandra table check if table %s has at least %d rows", tableName(), minRows());
+  }
+
+  private long getRowCount(String tableName) {
+    String query = String.format("SELECT COUNT(*) FROM %s", tableName);
+    ResultSet resultSet = resourceManager().executeStatement(query);
+    Row row = resultSet.one();
+    if (row != null) {
+      return row.getLong(0);
+    } else {
+      throw new RuntimeException("Query did not return a result for table: " + tableName);
+    }
+  }
+
+  @Override
+  public CheckResult check() {
+    long totalRows = getRowCount(tableName());
+    if (totalRows < minRows()) {
+      return new CheckResult(
+          false,
+          String.format("Expected at least %d rows but found only %d", minRows(), totalRows));
+    }
+    if (maxRows() != null && totalRows > maxRows()) {
+      return new CheckResult(
+          false, String.format("Expected up to %d rows but found %d", maxRows(), totalRows));
+    }
+
+    if (maxRows() != null) {
+      return new CheckResult(
+          true,
+          String.format(
+              "Expected between %d and %d rows and found %d", minRows(), maxRows(), totalRows));
+    }
+
+    return new CheckResult(
+        true, String.format("Expected at least %d rows and found %d", minRows(), totalRows));
+  }
+
+  public static Builder builder(CassandraResourceManager resourceManager, String tableName) {
+    return new AutoValue_CassandraRowsCheck.Builder()
+        .setResourceManager(resourceManager)
+        .setTableName(tableName);
+  }
+
+  /** Builder for {@link CassandraRowsCheck}. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    public abstract Builder setResourceManager(CassandraResourceManager resourceManager);
+
+    public abstract Builder setTableName(String tableName);
+
+    public abstract Builder setMinRows(Integer minRows);
+
+    public abstract Builder setMaxRows(Integer maxRows);
+
+    abstract CassandraRowsCheck autoBuild();
+
+    public CassandraRowsCheck build() {
+      return autoBuild();
+    }
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
new file mode 100644
index 0000000000..0f5264400a
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates;
+
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
+
+import com.google.cloud.teleport.v2.spanner.migrations.transformation.CustomTransformation;
+import com.google.common.io.Resources;
+import com.google.pubsub.v1.SubscriptionName;
+import com.google.pubsub.v1.TopicName;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.beam.it.cassandra.CassandraResourceManager;
+import org.apache.beam.it.common.PipelineLauncher;
+import org.apache.beam.it.common.utils.PipelineUtils;
+import org.apache.beam.it.gcp.TemplateTestBase;
+import org.apache.beam.it.gcp.artifacts.utils.ArtifactUtils;
+import org.apache.beam.it.gcp.pubsub.PubsubResourceManager;
+import org.apache.beam.it.gcp.spanner.SpannerResourceManager;
+import org.apache.beam.it.gcp.storage.GcsResourceManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class SpannerToCassandraDbITBase extends TemplateTestBase {
+  private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraDbITBase.class);
+
+  protected SpannerResourceManager createSpannerDatabase(String spannerSchemaFile)
+      throws IOException {
+    SpannerResourceManager spannerResourceManager =
+        SpannerResourceManager.builder("rr-main-" + testName, PROJECT, REGION)
+            .maybeUseStaticInstance()
+            .build();
+    String ddl =
+        String.join(
+            " ",
+            Resources.readLines(Resources.getResource(spannerSchemaFile), StandardCharsets.UTF_8));
+    ddl = ddl.trim();
+    String[] ddls = ddl.split(";");
+    for (String d : ddls) {
+      if (!d.isBlank()) {
+        spannerResourceManager.executeDdlStatement(d);
+      }
+    }
+    return spannerResourceManager;
+  }
+
+  protected SpannerResourceManager createSpannerMetadataDatabase() throws IOException {
+    SpannerResourceManager spannerMetadataResourceManager =
+        SpannerResourceManager.builder("rr-meta-" + testName, PROJECT, REGION)
+            .maybeUseStaticInstance()
+            .build();
+    String dummy = "create table t1(id INT64 ) primary key(id)";
+    spannerMetadataResourceManager.executeDdlStatement(dummy);
+    return spannerMetadataResourceManager;
+  }
+
+  public PubsubResourceManager setUpPubSubResourceManager() throws IOException {
+    return PubsubResourceManager.builder(testName, PROJECT, credentialsProvider).build();
+  }
+
+  public SubscriptionName createPubsubResources(
+      String identifierSuffix, PubsubResourceManager pubsubResourceManager, String gcsPrefix) {
+    String topicNameSuffix = "rr-it" + identifierSuffix;
+    String subscriptionNameSuffix = "rr-it-sub" + identifierSuffix;
+    TopicName topic = pubsubResourceManager.createTopic(topicNameSuffix);
+    SubscriptionName subscription =
+        pubsubResourceManager.createSubscription(topic, subscriptionNameSuffix);
+    String prefix = gcsPrefix;
+    if (prefix.startsWith("/")) {
+      prefix = prefix.substring(1);
+    }
+    prefix += "/retry/";
+    gcsClient.createNotification(topic.toString(), prefix);
+    return subscription;
+  }
+
+  public void createAndUploadCassandraConfigToGcs(
+      GcsResourceManager gcsResourceManager, CassandraResourceManager cassandraResourceManagers)
+      throws IOException {
+    String host = cassandraResourceManagers.getHost();
+    int port = cassandraResourceManagers.getPort();
+    String keyspaceName = cassandraResourceManagers.getKeyspaceName();
+
+    String cassandraConfigContents =
+        new String(
+            Files.readAllBytes(
+                Paths.get("SpannerToCassandraSourceIT/cassandra-config-template.conf")));
+    cassandraConfigContents =
+        cassandraConfigContents
+            .replace("##host##", host)
+            .replace("##port##", Integer.toString(port))
+            .replace("##keyspace##", keyspaceName);
+
+    LOG.info("Cassandra file contents: {}", cassandraConfigContents);
+    gcsResourceManager.createArtifact("input/cassandra-config.conf", cassandraConfigContents);
+  }
+
+  public PipelineLauncher.LaunchInfo launchDataflowJob(
+      GcsResourceManager gcsResourceManager,
+      SpannerResourceManager spannerResourceManager,
+      SpannerResourceManager spannerMetadataResourceManager,
+      String subscriptionName,
+      String identifierSuffix,
+      String shardingCustomJarPath,
+      String shardingCustomClassName,
+      String sourceDbTimezoneOffset,
+      CustomTransformation customTransformation)
+      throws IOException {
+
+    Map<String, String> params =
+        new HashMap<>() {
+          {
+            put("sessionFilePath", getGcsPath("input/session.json", gcsResourceManager));
+            put("instanceId", spannerResourceManager.getInstanceId());
+            put("databaseId", spannerResourceManager.getDatabaseId());
+            put("spannerProjectId", PROJECT);
+            put("metadataDatabase", spannerMetadataResourceManager.getDatabaseId());
+            put("metadataInstance", spannerMetadataResourceManager.getInstanceId());
+            put(
+                "sourceShardsFilePath",
+                getGcsPath("input/cassandra-config.conf", gcsResourceManager));
+            put("changeStreamName", "allstream");
+            put("dlqGcsPubSubSubscription", subscriptionName);
+            put("deadLetterQueueDirectory", getGcsPath("dlq", gcsResourceManager));
+            put("maxShardConnections", "5");
+            put("maxNumWorkers", "1");
+            put("numWorkers", "1");
+          }
+        };
+
+    if (shardingCustomJarPath != null) {
+      params.put(
+          "shardingCustomJarPath",
+          getGcsFullPath(gcsResourceManager, shardingCustomJarPath, identifierSuffix));
+    }
+    if (shardingCustomClassName != null) {
+      params.put("shardingCustomClassName", shardingCustomClassName);
+    }
+
+    if (sourceDbTimezoneOffset != null) {
+      params.put("sourceDbTimezoneOffset", sourceDbTimezoneOffset);
+    }
+
+    if (customTransformation != null) {
+      params.put(
+          "transformationJarPath", getGcsPath(customTransformation.jarPath(), gcsResourceManager));
+      params.put("transformationClassName", customTransformation.classPath());
+    }
+
+    // Construct template
+    String jobName = PipelineUtils.createJobName("rrev-it" + testName);
+    // /-DunifiedWorker=true when using runner v2
+    PipelineLauncher.LaunchConfig.Builder options =
+        PipelineLauncher.LaunchConfig.builder(jobName, specPath);
+    options.setParameters(params);
+    options.addEnvironment("additionalExperiments", Collections.singletonList("use_runner_v2"));
+    // Run
+    PipelineLauncher.LaunchInfo jobInfo = launchTemplate(options, false);
+    assertThatPipeline(jobInfo).isRunning();
+    return jobInfo;
+  }
+
+  private String toCqlStatement(
+      String tableName, Map<String, String> columns, String primaryKeyColumn) {
+    StringBuilder cql = new StringBuilder("CREATE TABLE IF NOT EXISTS ");
+    cql.append(tableName).append(" (");
+
+    columns.forEach(
+        (columnName, columnType) -> {
+          cql.append(columnName).append(" ").append(columnType.toLowerCase());
+          if (columnName.equals(primaryKeyColumn)) {
+            cql.append(" PRIMARY KEY");
+          }
+          cql.append(", ");
+        });
+
+    if (cql.length() > 0) {
+      cql.setLength(cql.length() - 2);
+    }
+
+    cql.append(");");
+    return cql.toString();
+  }
+
+  protected void createCassandraSchema(
+      CassandraResourceManager cassandraResourceManager, String cassandraSchemaFile)
+      throws IOException {
+
+    Map<String, String> columns = new HashMap<>();
+    columns.put("id", "int");
+    columns.put("name", "text");
+    String idColumn = "id";
+    String createTableSql = toCqlStatement("test", columns, idColumn);
+    cassandraResourceManager.executeStatement(createTableSql);
+
+    String ddl =
+        String.join(
+            " ",
+            Resources.readLines(
+                Resources.getResource(cassandraSchemaFile), StandardCharsets.UTF_8));
+    ddl = ddl.trim();
+    String[] ddls = ddl.split(";");
+    for (String d : ddls) {
+      if (!d.isBlank()) {
+        cassandraResourceManager.executeStatement(d);
+      }
+    }
+  }
+
+  public String getGcsFullPath(
+      GcsResourceManager gcsResourceManager, String artifactId, String identifierSuffix) {
+    return ArtifactUtils.getFullGcsPath(
+        artifactBucketName, identifierSuffix, gcsResourceManager.runId(), artifactId);
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java
index 6ebe73c3d0..02504905f9 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraLTBase.java
@@ -27,7 +27,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.beam.it.cassandra.CassandraResourceManager;
 import org.apache.beam.it.common.PipelineLauncher;
 import org.apache.beam.it.common.PipelineLauncher.LaunchConfig;
@@ -48,208 +47,216 @@
  */
 public class SpannerToCassandraLTBase extends TemplateLoadTestBase {
 
-   private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraLTBase.class);
-
-   private static final String TEMPLATE_SPEC_PATH =
-       MoreObjects.firstNonNull(
-           TestProperties.specPath(), "gs://dataflow-templates/latest/flex/Spanner_to_SourceDb");
-   public SpannerResourceManager spannerResourceManager;
-   public SpannerResourceManager spannerMetadataResourceManager;
-   public CassandraResourceManager cassandraResourceManager;
-   public GcsResourceManager gcsResourceManager;
-   private static PubsubResourceManager pubsubResourceManager;
-   private SubscriptionName subscriptionName;
-
-   public void setupResourceManagers(
-       String spannerDdlResource, String sessionFileResource, String artifactBucket)
-       throws IOException {
-      spannerResourceManager = createSpannerDatabase(spannerDdlResource);
-      spannerMetadataResourceManager = createSpannerMetadataDatabase();
-
-      gcsResourceManager =
-          GcsResourceManager.builder(artifactBucket, getClass().getSimpleName(), CREDENTIALS).build();
-
-      gcsResourceManager.uploadArtifact(
-          "input/session.json", Resources.getResource(sessionFileResource).getPath());
-
-      pubsubResourceManager = setUpPubSubResourceManager();
-      subscriptionName =
-          createPubsubResources(
-              getClass().getSimpleName(),
-              pubsubResourceManager,
-              getGcsPath(artifactBucket, "dlq", gcsResourceManager)
-                  .replace("gs://" + artifactBucket, ""));
-   }
-
-   public void setupCassandraResourceManager() throws IOException {
-      cassandraResourceManager = CassandraResourceManager.builder(testName).build();
-      createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
-   }
-
-   public void cleanupResourceManagers() {
-      ResourceManagerUtils.cleanResources(
-          spannerResourceManager,
-          spannerMetadataResourceManager,
-          gcsResourceManager,
-          pubsubResourceManager, cassandraResourceManager);
-   }
-
-   public PubsubResourceManager setUpPubSubResourceManager() throws IOException {
-      return PubsubResourceManager.builder(testName, project, CREDENTIALS_PROVIDER)
-          .setMonitoringClient(monitoringClient)
-          .build();
-   }
-
-   public SubscriptionName createPubsubResources(
-       String identifierSuffix, PubsubResourceManager pubsubResourceManager, String gcsPrefix) {
-      String topicNameSuffix = "rr-load" + identifierSuffix;
-      String subscriptionNameSuffix = "rr-load-sub" + identifierSuffix;
-      TopicName topic = pubsubResourceManager.createTopic(topicNameSuffix);
-      SubscriptionName subscription =
-          pubsubResourceManager.createSubscription(topic, subscriptionNameSuffix);
-      String prefix = gcsPrefix;
-      if (prefix.startsWith("/")) {
-         prefix = prefix.substring(1);
-      }
-      prefix += "/retry/";
-      gcsResourceManager.createNotification(topic.toString(), prefix);
-      return subscription;
-   }
-
-   public SpannerResourceManager createSpannerDatabase(String spannerDdlResourceFile)
-       throws IOException {
-      SpannerResourceManager spannerResourceManager =
-          SpannerResourceManager.builder("rr-loadtest-" + testName, project, region)
-              .maybeUseStaticInstance()
-              .build();
-      String ddl =
-          String.join(
-              " ",
-              Resources.readLines(
-                  Resources.getResource(spannerDdlResourceFile), StandardCharsets.UTF_8));
-      ddl = ddl.trim();
-      String[] ddls = ddl.split(";");
-      for (String d : ddls) {
-         if (!d.isBlank()) {
-            spannerResourceManager.executeDdlStatement(d);
-         }
+  private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraLTBase.class);
+
+  private static final String TEMPLATE_SPEC_PATH =
+      MoreObjects.firstNonNull(
+          TestProperties.specPath(), "gs://dataflow-templates/latest/flex/Spanner_to_SourceDb");
+  public SpannerResourceManager spannerResourceManager;
+  public SpannerResourceManager spannerMetadataResourceManager;
+  public CassandraResourceManager cassandraResourceManager;
+  public GcsResourceManager gcsResourceManager;
+  private static PubsubResourceManager pubsubResourceManager;
+  private SubscriptionName subscriptionName;
+
+  public void setupResourceManagers(
+      String spannerDdlResource, String sessionFileResource, String artifactBucket)
+      throws IOException {
+    spannerResourceManager = createSpannerDatabase(spannerDdlResource);
+    spannerMetadataResourceManager = createSpannerMetadataDatabase();
+
+    gcsResourceManager =
+        GcsResourceManager.builder(artifactBucket, getClass().getSimpleName(), CREDENTIALS).build();
+
+    gcsResourceManager.uploadArtifact(
+        "input/session.json", Resources.getResource(sessionFileResource).getPath());
+
+    pubsubResourceManager = setUpPubSubResourceManager();
+    subscriptionName =
+        createPubsubResources(
+            getClass().getSimpleName(),
+            pubsubResourceManager,
+            getGcsPath(artifactBucket, "dlq", gcsResourceManager)
+                .replace("gs://" + artifactBucket, ""));
+  }
+
+  public void setupCassandraResourceManager() throws IOException {
+    cassandraResourceManager = CassandraResourceManager.builder(testName).build();
+    createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
+  }
+
+  public void cleanupResourceManagers() {
+    ResourceManagerUtils.cleanResources(
+        spannerResourceManager,
+        spannerMetadataResourceManager,
+        gcsResourceManager,
+        pubsubResourceManager,
+        cassandraResourceManager);
+  }
+
+  public PubsubResourceManager setUpPubSubResourceManager() throws IOException {
+    return PubsubResourceManager.builder(testName, project, CREDENTIALS_PROVIDER)
+        .setMonitoringClient(monitoringClient)
+        .build();
+  }
+
+  public SubscriptionName createPubsubResources(
+      String identifierSuffix, PubsubResourceManager pubsubResourceManager, String gcsPrefix) {
+    String topicNameSuffix = "rr-load" + identifierSuffix;
+    String subscriptionNameSuffix = "rr-load-sub" + identifierSuffix;
+    TopicName topic = pubsubResourceManager.createTopic(topicNameSuffix);
+    SubscriptionName subscription =
+        pubsubResourceManager.createSubscription(topic, subscriptionNameSuffix);
+    String prefix = gcsPrefix;
+    if (prefix.startsWith("/")) {
+      prefix = prefix.substring(1);
+    }
+    prefix += "/retry/";
+    gcsResourceManager.createNotification(topic.toString(), prefix);
+    return subscription;
+  }
+
+  public SpannerResourceManager createSpannerDatabase(String spannerDdlResourceFile)
+      throws IOException {
+    SpannerResourceManager spannerResourceManager =
+        SpannerResourceManager.builder("rr-loadtest-" + testName, project, region)
+            .maybeUseStaticInstance()
+            .build();
+    String ddl =
+        String.join(
+            " ",
+            Resources.readLines(
+                Resources.getResource(spannerDdlResourceFile), StandardCharsets.UTF_8));
+    ddl = ddl.trim();
+    String[] ddls = ddl.split(";");
+    for (String d : ddls) {
+      if (!d.isBlank()) {
+        spannerResourceManager.executeDdlStatement(d);
       }
-      return spannerResourceManager;
-   }
-
-   public SpannerResourceManager createSpannerMetadataDatabase() throws IOException {
-      SpannerResourceManager spannerMetadataResourceManager =
-          SpannerResourceManager.builder("rr-meta-" + testName, project, region)
-              .maybeUseStaticInstance()
-              .build();
-      String dummy = "create table t1(id INT64 ) primary key(id)";
-      spannerMetadataResourceManager.executeDdlStatement(dummy);
-      return spannerMetadataResourceManager;
-   }
-
-   public void createAndUploadCassandraConfigToGcs(
-       GcsResourceManager gcsResourceManager,CassandraResourceManager cassandraResourceManagers)
-       throws IOException {
-      String host = cassandraResourceManagers.getHost();
-      int port = cassandraResourceManagers.getPort();
-      String keyspaceName = cassandraResourceManagers.getKeyspaceName();
-
-      String cassandraConfigContents = new String(Files.readAllBytes(Paths.get("SpannerToCassandraSourceLT/cassandra-config-template.conf")));
-      cassandraConfigContents = cassandraConfigContents.replace("##host##", host).replace("##port##", Integer.toString(port)).replace("##keyspace##", keyspaceName);
-
-      LOG.info("Cassandra file contents: {}", cassandraConfigContents);
-      gcsResourceManager.createArtifact("input/cassandra-config.conf", cassandraConfigContents);
-   }
-
-   public PipelineLauncher.LaunchInfo launchDataflowJob(
-       String artifactBucket, int numWorkers, int maxWorkers) throws IOException {
-      // default parameters
-
-      Map<String, String> params =
-          new HashMap<>() {
-             {
-                put(
-                    "sessionFilePath",
-                    getGcsPath(artifactBucket, "input/session.json", gcsResourceManager));
-                put("instanceId", spannerResourceManager.getInstanceId());
-                put("databaseId", spannerResourceManager.getDatabaseId());
-                put("spannerProjectId", project);
-                put("metadataDatabase", spannerMetadataResourceManager.getDatabaseId());
-                put("metadataInstance", spannerMetadataResourceManager.getInstanceId());
-                put(
-                    "sourceShardsFilePath",
-                    getGcsPath(artifactBucket, "input/cassandra-config.conf", gcsResourceManager));
-                put("changeStreamName", "allstream");
-                put("dlqGcsPubSubSubscription", subscriptionName.toString());
-                put("deadLetterQueueDirectory", getGcsPath(artifactBucket, "dlq", gcsResourceManager));
-                put("maxShardConnections", "100");
-                put("sourceType","cassandra");
-             }
-          };
-
-      LaunchConfig.Builder options =
-          LaunchConfig.builder(getClass().getSimpleName(), TEMPLATE_SPEC_PATH);
-      options
-          .addEnvironment("maxWorkers", maxWorkers)
-          .addEnvironment("numWorkers", numWorkers)
-          .addEnvironment("additionalExperiments", Collections.singletonList("use_runner_v2"));
-
-      options.setParameters(params);
-      PipelineLauncher.LaunchInfo jobInfo = pipelineLauncher.launch(project, region, options.build());
-      return jobInfo;
-   }
-
-   public String getGcsPath(
-       String bucket, String artifactId, GcsResourceManager gcsResourceManager) {
-      return ArtifactUtils.getFullGcsPath(
-          bucket, getClass().getSimpleName(), gcsResourceManager.runId(), artifactId);
-   }
-
-   public Map<String, Double> getCustomCounters(
-       LaunchInfo launchInfo, int numShards, Map<String, Double> metrics) throws IOException {
-      Double successfulEvents =
-          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "success_record_count");
-      metrics.put(
-          "Custom_Counter_SuccessRecordCount", successfulEvents != null ? successfulEvents : 0.0);
-      Double retryableErrors =
-          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "retryable_record_count");
-      metrics.put(
-          "Custom_Counter_RetryableRecordCount", retryableErrors != null ? retryableErrors : 0.0);
+    }
+    return spannerResourceManager;
+  }
 
-      Double severeErrorCount =
-          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "severe_error_count");
-      metrics.put(
-          "Custom_Counter_SevereErrorCount", severeErrorCount != null ? severeErrorCount : 0.0);
-      Double skippedRecordCount =
-          pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "skipped_record_count");
+  public SpannerResourceManager createSpannerMetadataDatabase() throws IOException {
+    SpannerResourceManager spannerMetadataResourceManager =
+        SpannerResourceManager.builder("rr-meta-" + testName, project, region)
+            .maybeUseStaticInstance()
+            .build();
+    String dummy = "create table t1(id INT64 ) primary key(id)";
+    spannerMetadataResourceManager.executeDdlStatement(dummy);
+    return spannerMetadataResourceManager;
+  }
+
+  public void createAndUploadCassandraConfigToGcs(
+      GcsResourceManager gcsResourceManager, CassandraResourceManager cassandraResourceManagers)
+      throws IOException {
+    String host = cassandraResourceManagers.getHost();
+    int port = cassandraResourceManagers.getPort();
+    String keyspaceName = cassandraResourceManagers.getKeyspaceName();
+
+    String cassandraConfigContents =
+        new String(
+            Files.readAllBytes(
+                Paths.get("SpannerToCassandraSourceLT/cassandra-config-template.conf")));
+    cassandraConfigContents =
+        cassandraConfigContents
+            .replace("##host##", host)
+            .replace("##port##", Integer.toString(port))
+            .replace("##keyspace##", keyspaceName);
+
+    LOG.info("Cassandra file contents: {}", cassandraConfigContents);
+    gcsResourceManager.createArtifact("input/cassandra-config.conf", cassandraConfigContents);
+  }
+
+  public PipelineLauncher.LaunchInfo launchDataflowJob(
+      String artifactBucket, int numWorkers, int maxWorkers) throws IOException {
+    // default parameters
+
+    Map<String, String> params =
+        new HashMap<>() {
+          {
+            put(
+                "sessionFilePath",
+                getGcsPath(artifactBucket, "input/session.json", gcsResourceManager));
+            put("instanceId", spannerResourceManager.getInstanceId());
+            put("databaseId", spannerResourceManager.getDatabaseId());
+            put("spannerProjectId", project);
+            put("metadataDatabase", spannerMetadataResourceManager.getDatabaseId());
+            put("metadataInstance", spannerMetadataResourceManager.getInstanceId());
+            put(
+                "sourceShardsFilePath",
+                getGcsPath(artifactBucket, "input/cassandra-config.conf", gcsResourceManager));
+            put("changeStreamName", "allstream");
+            put("dlqGcsPubSubSubscription", subscriptionName.toString());
+            put("deadLetterQueueDirectory", getGcsPath(artifactBucket, "dlq", gcsResourceManager));
+            put("maxShardConnections", "100");
+            put("sourceType", "cassandra");
+          }
+        };
+
+    LaunchConfig.Builder options =
+        LaunchConfig.builder(getClass().getSimpleName(), TEMPLATE_SPEC_PATH);
+    options
+        .addEnvironment("maxWorkers", maxWorkers)
+        .addEnvironment("numWorkers", numWorkers)
+        .addEnvironment("additionalExperiments", Collections.singletonList("use_runner_v2"));
+
+    options.setParameters(params);
+    PipelineLauncher.LaunchInfo jobInfo = pipelineLauncher.launch(project, region, options.build());
+    return jobInfo;
+  }
+
+  public String getGcsPath(
+      String bucket, String artifactId, GcsResourceManager gcsResourceManager) {
+    return ArtifactUtils.getFullGcsPath(
+        bucket, getClass().getSimpleName(), gcsResourceManager.runId(), artifactId);
+  }
+
+  public Map<String, Double> getCustomCounters(
+      LaunchInfo launchInfo, int numShards, Map<String, Double> metrics) throws IOException {
+    Double successfulEvents =
+        pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "success_record_count");
+    metrics.put(
+        "Custom_Counter_SuccessRecordCount", successfulEvents != null ? successfulEvents : 0.0);
+    Double retryableErrors =
+        pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "retryable_record_count");
+    metrics.put(
+        "Custom_Counter_RetryableRecordCount", retryableErrors != null ? retryableErrors : 0.0);
+
+    Double severeErrorCount =
+        pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "severe_error_count");
+    metrics.put(
+        "Custom_Counter_SevereErrorCount", severeErrorCount != null ? severeErrorCount : 0.0);
+    Double skippedRecordCount =
+        pipelineLauncher.getMetric(project, region, launchInfo.jobId(), "skipped_record_count");
+    metrics.put(
+        "Custom_Counter_SkippedRecordCount", skippedRecordCount != null ? skippedRecordCount : 0.0);
+
+    for (int i = 1; i <= numShards; ++i) {
+      Double replicationLag =
+          pipelineLauncher.getMetric(
+              project,
+              region,
+              launchInfo.jobId(),
+              "replication_lag_in_seconds_Shard" + i + "_MEAN");
       metrics.put(
-          "Custom_Counter_SkippedRecordCount", skippedRecordCount != null ? skippedRecordCount : 0.0);
-
-      for (int i = 1; i <= numShards; ++i) {
-         Double replicationLag =
-             pipelineLauncher.getMetric(
-                 project,
-                 region,
-                 launchInfo.jobId(),
-                 "replication_lag_in_seconds_Shard" + i + "_MEAN");
-         metrics.put(
-             "Custom_Counter_MeanReplicationLagShard" + i,
-             replicationLag != null ? replicationLag : 0.0);
-      }
-      return metrics;
-   }
-
-   public void exportMetrics(PipelineLauncher.LaunchInfo jobInfo, int numShards)
-       throws ParseException, IOException, InterruptedException {
-      Map<String, Double> metrics = getMetrics(jobInfo);
-      getCustomCounters(jobInfo, numShards, metrics);
-      getResourceManagerMetrics(metrics);
-
-      // export results
-      exportMetricsToBigQuery(jobInfo, metrics);
-   }
-
-   public void getResourceManagerMetrics(Map<String, Double> metrics) {
-      pubsubResourceManager.collectMetrics(metrics);
-   }
+          "Custom_Counter_MeanReplicationLagShard" + i,
+          replicationLag != null ? replicationLag : 0.0);
+    }
+    return metrics;
+  }
+
+  public void exportMetrics(PipelineLauncher.LaunchInfo jobInfo, int numShards)
+      throws ParseException, IOException, InterruptedException {
+    Map<String, Double> metrics = getMetrics(jobInfo);
+    getCustomCounters(jobInfo, numShards, metrics);
+    getResourceManagerMetrics(metrics);
+
+    // export results
+    exportMetricsToBigQuery(jobInfo, metrics);
+  }
+
+  public void getResourceManagerMetrics(Map<String, Double> metrics) {
+    pubsubResourceManager.collectMetrics(metrics);
+  }
 }
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
index d18ac5b411..1f90f32e4a 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
@@ -1,12 +1,33 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.google.cloud.teleport.v2.templates;
 
+import static org.apache.beam.it.gcp.artifacts.utils.ArtifactUtils.getFullGcsPath;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
+
 import com.google.cloud.teleport.metadata.TemplateLoadTest;
+import java.io.IOException;
+import java.text.ParseException;
+import java.time.Duration;
 import org.apache.beam.it.cassandra.CassandraResourceManager;
 import org.apache.beam.it.common.PipelineLauncher;
 import org.apache.beam.it.common.PipelineOperator;
 import org.apache.beam.it.common.TestProperties;
 import org.apache.beam.it.gcp.datagenerator.DataGenerator;
-import org.apache.beam.it.jdbc.conditions.JDBCRowsCheck;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,18 +38,9 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.shaded.com.google.common.io.Resources;
 
-import java.io.IOException;
-import java.text.ParseException;
-import java.time.Duration;
-
-import static org.apache.beam.it.gcp.artifacts.utils.ArtifactUtils.getFullGcsPath;
-import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
-import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
-
 @Category(TemplateLoadTest.class)
 @TemplateLoadTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
-
 public class SpannerToCassandraSourceLT extends SpannerToCassandraLTBase {
   private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraSourceLT.class);
 
@@ -36,7 +48,8 @@ public class SpannerToCassandraSourceLT extends SpannerToCassandraLTBase {
   private final String artifactBucket = TestProperties.artifactBucket();
   private final String spannerDdlResource = "SpannerToCassandraSourceLT/spanner-schema.sql";
   private final String sessionFileResource = "SpannerToCassandraSourceLT/session.json";
-  private final String dataGeneratorSchemaResource = "SpannerToCassandraSourceLT/datagenerator-schema.json";
+  private final String dataGeneratorSchemaResource =
+      "SpannerToCassandraSourceLT/datagenerator-schema.json";
   private final String table = "Person";
   private final int maxWorkers = 50;
   private final int numWorkers = 20;
@@ -54,21 +67,21 @@ public void setup() throws IOException {
             gcsResourceManager
                 .uploadArtifact(
                     "input/schema.json",
-                    Resources.getResource(dataGeneratorSchemaResource).getPath()
-                ).name()
-        );
+                    Resources.getResource(dataGeneratorSchemaResource).getPath())
+                .name());
 
     createCassandraSchema(cassandraResourceManager);
     jobInfo = launchDataflowJob(artifactBucket, numWorkers, maxWorkers);
   }
 
   @After
-  public void teardown(){
+  public void teardown() {
     cleanupResourceManagers();
   }
 
   @Test
-  public void reverseReplication1KTpsLoadTest() throws IOException, ParseException, InterruptedException {
+  public void reverseReplication1KTpsLoadTest()
+      throws IOException, ParseException, InterruptedException {
     // Start data generator
     DataGenerator dataGenerator =
         DataGenerator.builderWithSchemaLocation(testName, generatorSchemaPath)
@@ -87,12 +100,11 @@ public void reverseReplication1KTpsLoadTest() throws IOException, ParseException
     dataGenerator.execute(Duration.ofMinutes(90));
     assertThatPipeline(jobInfo).isRunning();
 
-//    Todo Check for cassandra
-//    JDBCRowsCheck check =
-//        JDBCRowsCheck.builder(jdbcResourceManagers.get(0), table)
-//            .setMinRows(300000)
-//            .setMaxRows(300000)
-//            .build();
+    CassandraRowsCheck check =
+        CassandraRowsCheck.builder(cassandraResourceManager, table)
+            .setMinRows(300000)
+            .setMaxRows(300000)
+            .build();
 
     PipelineOperator.Result result =
         pipelineOperator.waitForCondition(
@@ -109,20 +121,19 @@ public void reverseReplication1KTpsLoadTest() throws IOException, ParseException
     exportMetrics(jobInfo, numShards);
   }
 
-  private void createCassandraSchema(CassandraResourceManager cassandraResourceManager){
+  private void createCassandraSchema(CassandraResourceManager cassandraResourceManager) {
     String keyspace = cassandraResourceManager.getKeyspaceName();
-    String createTableStatement = String.format(
-        "CREATE TABLE IF NOT EXISTS %s.%s ("
-            + "ID uuid PRIMARY KEY, "
-            + "first_name1 text, "
-            + "last_name1 text, "
-            + "first_name2 text, "
-            + "last_name2 text, "
-            + "first_name3 text, "
-            + "last_name3 text);",
-        keyspace, table
-    );
+    String createTableStatement =
+        String.format(
+            "CREATE TABLE IF NOT EXISTS %s.%s ("
+                + "ID uuid PRIMARY KEY, "
+                + "first_name1 text, "
+                + "last_name1 text, "
+                + "first_name2 text, "
+                + "last_name2 text, "
+                + "first_name3 text, "
+                + "last_name3 text);",
+            keyspace, table);
     cassandraResourceManager.executeStatement(createTableStatement);
   }
 }
-
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
new file mode 100644
index 0000000000..039091ac87
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
+
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.Options;
+import com.google.cloud.spanner.TransactionRunner;
+import com.google.cloud.teleport.metadata.SkipDirectRunnerTest;
+import com.google.cloud.teleport.metadata.TemplateIntegrationTest;
+import com.google.common.io.Resources;
+import com.google.pubsub.v1.SubscriptionName;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.HashSet;
+import org.apache.beam.it.cassandra.CassandraResourceManager;
+import org.apache.beam.it.common.PipelineLauncher;
+import org.apache.beam.it.common.PipelineOperator;
+import org.apache.beam.it.common.utils.ResourceManagerUtils;
+import org.apache.beam.it.gcp.pubsub.PubsubResourceManager;
+import org.apache.beam.it.gcp.spanner.SpannerResourceManager;
+import org.apache.beam.it.gcp.storage.GcsResourceManager;
+import org.apache.beam.sdk.io.gcp.spanner.SpannerAccessor;
+import org.apache.beam.sdk.io.gcp.spanner.SpannerConfig;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
+@TemplateIntegrationTest(SpannerToSourceDbCassandraIT.class)
+@RunWith(JUnit4.class)
+public class SpannerToSourceDbCassandraIT extends SpannerToCassandraDbITBase {
+  private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbCassandraIT.class);
+
+  private static final String SPANNER_DDL_RESOURCE =
+      "SpannerToCassandraSourceIT/spanner-schema.sql";
+  private static final String SESSION_FILE_RESOURCE = "SpannerToCassandraSourceIT/session.json";
+  private static final String CASSANDRA_SCHEMA_FILE_RESOURCE =
+      "SpannerToCassandraSourceIT/cassandra-schema.sql";
+
+  private static final String TABLE = "Users";
+  private static final HashSet<SpannerToSourceDbCassandraIT> testInstances = new HashSet<>();
+  private static PipelineLauncher.LaunchInfo jobInfo;
+  public static SpannerResourceManager spannerResourceManager;
+  private static SpannerResourceManager spannerMetadataResourceManager;
+  public static CassandraResourceManager cassandraResourceManager;
+  private static GcsResourceManager gcsResourceManager;
+  private static PubsubResourceManager pubsubResourceManager;
+  private SubscriptionName subscriptionName;
+
+  /**
+   * Setup resource managers and Launch dataflow job once during the execution of this test class.
+   *
+   * @throws IOException
+   */
+  @Before
+  public void setUp() throws IOException {
+    skipBaseCleanup = true;
+    synchronized (SpannerToSourceDbCassandraIT.class) {
+      testInstances.add(this);
+      if (jobInfo == null) {
+        spannerResourceManager = createSpannerDatabase(SPANNER_DDL_RESOURCE);
+        spannerMetadataResourceManager = createSpannerMetadataDatabase();
+
+        cassandraResourceManager = CassandraResourceManager.builder(testName).build();
+
+        createCassandraSchema(cassandraResourceManager, CASSANDRA_SCHEMA_FILE_RESOURCE);
+
+        gcsResourceManager =
+            GcsResourceManager.builder(artifactBucketName, getClass().getSimpleName(), credentials)
+                .build();
+        createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
+        gcsResourceManager.uploadArtifact(
+            "input/session.json", Resources.getResource(SESSION_FILE_RESOURCE).getPath());
+        pubsubResourceManager = setUpPubSubResourceManager();
+        subscriptionName =
+            createPubsubResources(
+                getClass().getSimpleName(),
+                pubsubResourceManager,
+                getGcsPath("dlq", gcsResourceManager).replace("gs://" + artifactBucketName, ""));
+        jobInfo =
+            launchDataflowJob(
+                gcsResourceManager,
+                spannerResourceManager,
+                spannerMetadataResourceManager,
+                subscriptionName.toString(),
+                null,
+                null,
+                null,
+                null,
+                null);
+      }
+    }
+  }
+
+  /**
+   * Cleanup dataflow job and all the resources and resource managers.
+   *
+   * @throws IOException
+   */
+  @AfterClass
+  public static void cleanUp() throws IOException {
+    for (SpannerToSourceDbCassandraIT instance : testInstances) {
+      instance.tearDownBase();
+    }
+    ResourceManagerUtils.cleanResources(
+        spannerResourceManager,
+        cassandraResourceManager,
+        spannerMetadataResourceManager,
+        gcsResourceManager,
+        pubsubResourceManager);
+  }
+
+  @Test
+  public void spannerToSourceDbBasic() throws InterruptedException, IOException {
+    assertThatPipeline(jobInfo).isRunning();
+    writeRowInSpanner();
+    assertRowInCassandraDB();
+  }
+
+  private long getRowCount() {
+    String query = String.format("SELECT COUNT(*) FROM %s", TABLE);
+    ResultSet resultSet = cassandraResourceManager.executeStatement(query);
+    Row row = resultSet.one();
+    if (row != null) {
+      return row.getLong(0);
+    } else {
+      throw new RuntimeException("Query did not return a result for table: " + TABLE);
+    }
+  }
+
+  private void writeRowInSpanner() {
+    Mutation m1 =
+        Mutation.newInsertOrUpdateBuilder("Users")
+            .set("id")
+            .to(1)
+            .set("full_name")
+            .to("FF")
+            .set("from")
+            .to("AA")
+            .build();
+    spannerResourceManager.write(m1);
+
+    Mutation m2 =
+        Mutation.newInsertOrUpdateBuilder("Users2").set("id").to(2).set("name").to("B").build();
+    spannerResourceManager.write(m2);
+
+    // Write a single record to Spanner for the given logical shard
+    // Add the record with the transaction tag as txBy=
+    SpannerConfig spannerConfig =
+        SpannerConfig.create()
+            .withProjectId(PROJECT)
+            .withInstanceId(spannerResourceManager.getInstanceId())
+            .withDatabaseId(spannerResourceManager.getDatabaseId());
+    SpannerAccessor spannerAccessor = SpannerAccessor.getOrCreate(spannerConfig);
+    spannerAccessor
+        .getDatabaseClient()
+        .readWriteTransaction(
+            Options.tag("txBy=forwardMigration"),
+            Options.priority(spannerConfig.getRpcPriority().get()))
+        .run(
+            (TransactionRunner.TransactionCallable<Void>)
+                transaction -> {
+                  Mutation m3 =
+                      Mutation.newInsertOrUpdateBuilder("Users")
+                          .set("id")
+                          .to(2)
+                          .set("full_name")
+                          .to("GG")
+                          .build();
+                  transaction.buffer(m3);
+                  return null;
+                });
+  }
+
+  private void assertRowInCassandraDB() throws InterruptedException {
+    PipelineOperator.Result result =
+        pipelineOperator()
+            .waitForCondition(
+                createConfig(jobInfo, Duration.ofMinutes(10)), () -> getRowCount() == 1);
+    assertThatResult(result).meetsConditions();
+    Iterable<Row> rows;
+    try {
+      rows = cassandraResourceManager.readTable(TABLE);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to read from Cassandra table: " + TABLE, e);
+    }
+
+    assertThat(rows).hasSize(1);
+
+    Row row = rows.iterator().next();
+    assertThat(row.getInt("id")).isEqualTo(1);
+    assertThat(row.getString("name")).isEqualTo("FF");
+    assertThat(row.getString("from")).isEqualTo("AA");
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-config-template.conf b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-config-template.conf
new file mode 100644
index 0000000000..a8ec8abffe
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-config-template.conf
@@ -0,0 +1,12 @@
+  # Configuration for the DataStax Java driver for Apache Cassandra®.
+  # This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md.
+  # This file is meant to be used only in unit tests to test loading configuration from file.
+  # DO NOT USE FOR PRODUCTION.
+
+  datastax-java-driver {
+      basic.contact-points = ["##host##:##port##"]
+      basic.session-keyspace = "##keyspace##"
+    basic.load-balancing-policy {
+      local-datacenter = "datacenter1"
+    }
+  }
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql
new file mode 100644
index 0000000000..46f2f3c47c
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql
@@ -0,0 +1,5 @@
+CREATE TABLE users (
+    id int PRIMARY KEY,
+    name text,
+    "from" text
+);
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/session.json b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/session.json
new file mode 100644
index 0000000000..c044be2038
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/session.json
@@ -0,0 +1,168 @@
+{
+  "SessionName": "NewSession",
+  "EditorName": "",
+  "DatabaseType": "mysql",
+  "DatabaseName": "session_it",
+  "Dialect": "google_standard_sql",
+  "Notes": null,
+  "Tags": null,
+  "SpSchema": {
+    "t136": {
+      "Name": "Users",
+      "ColIds": [
+        "c142",
+        "c143",
+        "c200"
+      ],
+      "ShardIdColumn": "",
+      "ColDefs": {
+        "c142": {
+          "Name": "id",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: id int",
+          "Id": "c142"
+        },
+        "c143": {
+          "Name": "full_name",
+          "T": {
+            "Name": "STRING",
+            "Len": 25,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: name varchar(25)",
+          "Id": "c143"
+        },
+        "c200": {
+          "Name": "from",
+          "T": {
+            "Name": "STRING",
+            "Len": 25,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: from varchar(25)",
+          "Id": "c200"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c142",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "ParentId": "",
+      "Comment": "Spanner schema for source table Category",
+      "Id": "t136"
+    }
+  },
+  "SyntheticPKeys": {},
+  "SrcSchema": {
+    "t136": {
+      "Name": "Users",
+      "Schema": "eventsit",
+      "ColIds": [
+        "c142",
+        "c143"
+      ],
+      "ColDefs": {
+        "c142": {
+          "Name": "id",
+          "Type": {
+            "Name": "int",
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c142"
+        },
+        "c143": {
+          "Name": "name",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              25
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c143"
+        },
+        "c200": {
+          "Name": "from",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              25
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c200"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c142",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t136"
+    }
+  },
+  "SchemaIssues": {
+    "t136": {
+      "ColumnLevelIssues": {
+        "c142": [
+          14
+        ],
+        "c143": [],
+        "c200": []
+      },
+      "TableLevelIssues": null
+    }
+  },
+  "Location": {},
+  "TimezoneOffset": "+00:00",
+  "SpDialect": "google_standard_sql",
+  "UniquePKey": {},
+  "Rules": [],
+  "IsSharded": false,
+  "SpRegion": "",
+  "ResourceValidation": false,
+  "UI": false
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
new file mode 100644
index 0000000000..d0bb0aebec
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS Users (
+    id INT64 NOT NULL,
+    full_name STRING(25),
+    `from` STRING(25)
+) PRIMARY KEY(id);
+
+CREATE TABLE IF NOT EXISTS Users2 (
+    id INT64 NOT NULL,
+    name STRING(25),
+    ) PRIMARY KEY(id);
+
+CREATE CHANGE STREAM allstream
+  FOR ALL OPTIONS (
+  value_capture_type = 'NEW_ROW',
+  retention_period = '7d'
+);
\ No newline at end of file

From f751f5780804839fa38825f4ef91101ccd8d05b8 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 11:41:46 +0530
Subject: [PATCH 30/56] Added All Premitive datatypes

---
 .../SpannerToCassandraSourceDbDatatypeIT.java |  317 +++++
 .../cassandra-config-template.conf            |   12 +
 .../cassandra-schema.sql                      |   31 +
 .../session.json                              | 1044 +++++++++++++++++
 .../spanner-schema.sql                        |   37 +
 .../mysql-schema.sql                          |   56 +-
 6 files changed, 1469 insertions(+), 28 deletions(-)
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-config-template.conf
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-schema.sql
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/session.json
 create mode 100644 v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
new file mode 100644
index 0000000000..d758520c35
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
+import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
+
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.google.cloud.ByteArray;
+import com.google.cloud.Date;
+import com.google.cloud.Timestamp;
+import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.Value;
+import com.google.cloud.teleport.metadata.SkipDirectRunnerTest;
+import com.google.cloud.teleport.metadata.TemplateIntegrationTest;
+import com.google.common.io.Resources;
+import com.google.pubsub.v1.SubscriptionName;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import org.apache.beam.it.cassandra.CassandraResourceManager;
+import org.apache.beam.it.common.PipelineLauncher;
+import org.apache.beam.it.common.PipelineOperator;
+import org.apache.beam.it.common.utils.ResourceManagerUtils;
+import org.apache.beam.it.gcp.pubsub.PubsubResourceManager;
+import org.apache.beam.it.gcp.spanner.SpannerResourceManager;
+import org.apache.beam.it.gcp.storage.GcsResourceManager;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.junit.runners.model.MultipleFailureException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
+@TemplateIntegrationTest(SpannerToSourceDbCassandraIT.class)
+@RunWith(JUnit4.class)
+public class SpannerToCassandraSourceDbDatatypeIT extends SpannerToCassandraDbITBase {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SpannerToCassandraSourceDbDatatypeIT.class);
+
+  private static final String SPANNER_DDL_RESOURCE =
+      "SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql";
+  private static final String SESSION_FILE_RESOURCE =
+      "SpannerToCassandraSourceDbDatatypeIT/session.json";
+  private static final String CASSANDRA_SCHEMA_FILE_RESOURCE =
+      "SpannerToCassandraSourceDbDatatypeIT/cassandra-schema.sql";
+
+  private static final String TABLE = "AllDatatypeColumns";
+  private static final HashSet<SpannerToCassandraSourceDbDatatypeIT> testInstances =
+      new HashSet<>();
+  private static PipelineLauncher.LaunchInfo jobInfo;
+  public static SpannerResourceManager spannerResourceManager;
+  private static SpannerResourceManager spannerMetadataResourceManager;
+  public static CassandraResourceManager cassandraResourceManager;
+  private static GcsResourceManager gcsResourceManager;
+  private static PubsubResourceManager pubsubResourceManager;
+  private SubscriptionName subscriptionName;
+  private final List<Throwable> assertionErrors = new ArrayList<>();
+
+  /**
+   * Setup resource managers and Launch dataflow job once during the execution of this test class.
+   *
+   * @throws IOException
+   */
+  @Before
+  public void setUp() throws IOException {
+    skipBaseCleanup = true;
+    synchronized (SpannerToCassandraSourceDbDatatypeIT.class) {
+      testInstances.add(this);
+      if (jobInfo == null) {
+        spannerResourceManager = createSpannerDatabase(SPANNER_DDL_RESOURCE);
+        spannerMetadataResourceManager = createSpannerMetadataDatabase();
+
+        cassandraResourceManager = CassandraResourceManager.builder(testName).build();
+
+        createCassandraSchema(cassandraResourceManager, CASSANDRA_SCHEMA_FILE_RESOURCE);
+
+        gcsResourceManager =
+            GcsResourceManager.builder(artifactBucketName, getClass().getSimpleName(), credentials)
+                .build();
+        createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
+        gcsResourceManager.uploadArtifact(
+            "input/session.json", Resources.getResource(SESSION_FILE_RESOURCE).getPath());
+        pubsubResourceManager = setUpPubSubResourceManager();
+        subscriptionName =
+            createPubsubResources(
+                getClass().getSimpleName(),
+                pubsubResourceManager,
+                getGcsPath("dlq", gcsResourceManager).replace("gs://" + artifactBucketName, ""));
+        jobInfo =
+            launchDataflowJob(
+                gcsResourceManager,
+                spannerResourceManager,
+                spannerMetadataResourceManager,
+                subscriptionName.toString(),
+                null,
+                null,
+                null,
+                null,
+                null);
+      }
+    }
+  }
+
+  /**
+   * Cleanup dataflow job and all the resources and resource managers.
+   *
+   * @throws IOException
+   */
+  @AfterClass
+  public static void cleanUp() throws IOException {
+    for (SpannerToCassandraSourceDbDatatypeIT instance : testInstances) {
+      instance.tearDownBase();
+    }
+    ResourceManagerUtils.cleanResources(
+        spannerResourceManager,
+        cassandraResourceManager,
+        spannerMetadataResourceManager,
+        gcsResourceManager,
+        pubsubResourceManager);
+  }
+
+  @Test
+  public void spannerToCassandraSourceDataTypeConversionTest()
+      throws InterruptedException, IOException, MultipleFailureException {
+    assertThatPipeline(jobInfo).isRunning();
+    writeRowInSpanner();
+    assertRowInCassandraDB();
+  }
+
+  private long getRowCount() {
+    String query = String.format("SELECT COUNT(*) FROM %s", TABLE);
+    ResultSet resultSet = cassandraResourceManager.executeStatement(query);
+    Row row = resultSet.one();
+    if (row != null) {
+      return row.getLong(0);
+    } else {
+      throw new RuntimeException("Query did not return a result for table: " + TABLE);
+    }
+  }
+
+  private void writeRowInSpanner() {
+    Mutation m =
+        Mutation.newInsertOrUpdateBuilder(TABLE)
+            .set("varchar_column")
+            .to("value1")
+            .set("tinyint_column")
+            .to(10)
+            .set("text_column")
+            .to("text_column_value")
+            .set("date_column")
+            .to(Value.date(Date.fromYearMonthDay(2024, 05, 24)))
+            .set("smallint_column")
+            .to(50)
+            .set("mediumint_column")
+            .to(1000)
+            .set("int_column")
+            .to(50000)
+            .set("bigint_column")
+            .to(987654321)
+            .set("float_column")
+            .to(45.67)
+            .set("double_column")
+            .to(123.789)
+            .set("decimal_column")
+            .to(new BigDecimal("1234.56"))
+            .set("datetime_column")
+            .to(Value.timestamp(Timestamp.parseTimestamp("2024-02-08T08:15:30Z")))
+            .set("timestamp_column")
+            .to(Value.timestamp(Timestamp.parseTimestamp("2024-02-08T08:15:30Z")))
+            .set("time_column")
+            .to("14:30:00")
+            .set("year_column")
+            .to("2022")
+            .set("char_column")
+            .to("char_col")
+            .set("tinytext_column")
+            .to("tinytext_column_value")
+            .set("mediumtext_column")
+            .to("mediumtext_column_value")
+            .set("longtext_column")
+            .to("longtext_column_value")
+            .set("tinyblob_column")
+            .to(Value.bytes(ByteArray.copyFrom("tinyblob_column_value")))
+            .set("blob_column")
+            .to(Value.bytes(ByteArray.copyFrom("blob_column_value")))
+            .set("mediumblob_column")
+            .to(Value.bytes(ByteArray.copyFrom("mediumblob_column_value")))
+            .set("longblob_column")
+            .to(Value.bytes(ByteArray.copyFrom("longblob_column_value")))
+            .set("enum_column")
+            .to("2")
+            .set("bool_column")
+            .to(Value.bool(Boolean.FALSE))
+            .set("other_bool_column")
+            .to(Value.bool(Boolean.TRUE))
+            .set("binary_column")
+            .to(Value.bytes(ByteArray.copyFrom("binary_col")))
+            .set("varbinary_column")
+            .to(Value.bytes(ByteArray.copyFrom("varbinary")))
+            .set("bit_column")
+            .to(Value.bytes(ByteArray.copyFrom("a")))
+            .build();
+    spannerResourceManager.write(m);
+  }
+
+  private void assertAll(Runnable... assertions) throws MultipleFailureException {
+    for (Runnable assertion : assertions) {
+      try {
+        assertion.run();
+      } catch (AssertionError e) {
+        assertionErrors.add(e);
+      }
+    }
+    if (!assertionErrors.isEmpty()) {
+      throw new MultipleFailureException(assertionErrors);
+    }
+  }
+
+  private void assertRowInCassandraDB() throws InterruptedException, MultipleFailureException {
+    PipelineOperator.Result result =
+        pipelineOperator()
+            .waitForCondition(
+                createConfig(jobInfo, Duration.ofMinutes(10)), () -> getRowCount() == 1);
+    assertThatResult(result).meetsConditions();
+    Iterable<Row> rows;
+    try {
+      rows = cassandraResourceManager.readTable(TABLE);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to read from Cassandra table: " + TABLE, e);
+    }
+
+    assertThat(rows).hasSize(1);
+
+    Row row = rows.iterator().next();
+    assertThat(rows).hasSize(1);
+    assertAll(
+        () -> assertThat(row.getString("varchar_column")).isEqualTo("value1"),
+        () -> assertThat(row.getByte("tinyint_column")).isEqualTo((byte) 10),
+        () -> assertThat(row.getString("text_column")).isEqualTo("text_column_value"),
+        () ->
+            assertThat(row.getLocalDate("date_column"))
+                .isEqualTo(java.time.LocalDate.of(2024, 5, 24)),
+        () -> assertThat(row.getShort("smallint_column")).isEqualTo((short) 50),
+        () -> assertThat(row.getInt("mediumint_column")).isEqualTo(1000),
+        () -> assertThat(row.getInt("int_column")).isEqualTo(50000),
+        () -> assertThat(row.getLong("bigint_column")).isEqualTo(987654321L),
+        () -> assertThat(row.getFloat("float_column")).isEqualTo(45.67f),
+        () -> assertThat(row.getDouble("double_column")).isEqualTo(123.789),
+        () -> assertThat(row.getBigDecimal("decimal_column")).isEqualTo(new BigDecimal("1234.56")),
+        () ->
+            assertThat(row.getInstant("datetime_column"))
+                .isEqualTo(
+                    java.time.LocalDateTime.of(2024, 2, 8, 8, 15, 30).toInstant(ZoneOffset.UTC)),
+        () ->
+            assertThat(row.getInstant("timestamp_column"))
+                .isEqualTo(java.sql.Timestamp.valueOf("2024-02-08 08:15:30").toInstant()),
+        () ->
+            assertThat(row.getLocalTime("time_column"))
+                .isEqualTo(java.time.LocalTime.of(14, 30, 0)),
+        () -> assertThat(row.getString("year_column")).isEqualTo("2022"),
+        () -> assertThat(row.getString("char_column")).isEqualTo("char_col"),
+        () -> assertThat(row.getString("tinytext_column")).isEqualTo("tinytext_column_value"),
+        () -> assertThat(row.getString("mediumtext_column")).isEqualTo("mediumtext_column_value"),
+        () -> assertThat(row.getString("longtext_column")).isEqualTo("longtext_column_value"),
+        () ->
+            assertThat(row.getByte("tinyblob_column"))
+                .isEqualTo("tinyblob_column_value".getBytes(StandardCharsets.UTF_8)),
+        () ->
+            assertThat(row.getByte("blob_column"))
+                .isEqualTo("blob_column_value".getBytes(StandardCharsets.UTF_8)),
+        () ->
+            assertThat(row.getByte("mediumblob_column"))
+                .isEqualTo("mediumblob_column_value".getBytes(StandardCharsets.UTF_8)),
+        () ->
+            assertThat(row.getByte("longblob_column"))
+                .isEqualTo("longblob_column_value".getBytes(StandardCharsets.UTF_8)),
+        () -> assertThat(row.getString("enum_column")).isEqualTo("2"),
+        () -> assertThat(row.getBoolean("bool_column")).isEqualTo(false),
+        () -> assertThat(row.getBoolean("other_bool_column")).isEqualTo(true),
+        () ->
+            assertThat(row.getByte("binary_column"))
+                .isEqualTo("binary_col".getBytes(StandardCharsets.UTF_8)),
+        () ->
+            assertThat(row.getByte("varbinary_column"))
+                .isEqualTo("varbinary".getBytes(StandardCharsets.UTF_8)),
+        () ->
+            assertThat(row.getBigInteger("bit_column"))
+                .isEqualTo(new BigInteger("a".getBytes(StandardCharsets.UTF_8))));
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-config-template.conf b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-config-template.conf
new file mode 100644
index 0000000000..a8ec8abffe
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-config-template.conf
@@ -0,0 +1,12 @@
+  # Configuration for the DataStax Java driver for Apache Cassandra®.
+  # This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md.
+  # This file is meant to be used only in unit tests to test loading configuration from file.
+  # DO NOT USE FOR PRODUCTION.
+
+  datastax-java-driver {
+      basic.contact-points = ["##host##:##port##"]
+      basic.session-keyspace = "##keyspace##"
+    basic.load-balancing-policy {
+      local-datacenter = "datacenter1"
+    }
+  }
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-schema.sql
new file mode 100644
index 0000000000..9c8ce6eda8
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/cassandra-schema.sql
@@ -0,0 +1,31 @@
+CREATE TABLE AllDatatypeColumns (
+    varchar_column text PRIMARY KEY,
+    tinyint_column tinyint,
+    text_column text,
+    date_column date,
+    smallint_column smallint,
+    mediumint_column int,
+    int_column int,
+    bigint_column bigint,
+    float_column float,
+    double_column double,
+    decimal_column decimal,
+    datetime_column timestamp,
+    timestamp_column timestamp,
+    time_column time,
+    year_column text,
+    char_column text,
+    tinyblob_column blob,
+    tinytext_column text,
+    blob_column blob,
+    mediumblob_column blob,
+    mediumtext_column text,
+    longblob_column blob,
+    longtext_column text,
+    enum_column text,
+    bool_column boolean,
+    other_bool_column boolean,
+    binary_column blob,
+    varbinary_column blob,
+    bit_column varint
+);
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/session.json b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/session.json
new file mode 100644
index 0000000000..0adc38fa82
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/session.json
@@ -0,0 +1,1044 @@
+{
+  "SessionName": "NewSession",
+  "EditorName": "",
+  "DatabaseType": "cassandra",
+  "DatabaseName": "Shard1",
+  "Dialect": "google_standard_sql",
+  "Notes": null,
+  "Tags": null,
+  "SpSchema": {
+    "t1": {
+      "Name": "AllDatatypeColumns",
+      "ColIds": [
+        "c2",
+        "c3",
+        "c4",
+        "c5",
+        "c6",
+        "c7",
+        "c8",
+        "c9",
+        "c10",
+        "c11",
+        "c12",
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17",
+        "c18",
+        "c19",
+        "c20",
+        "c21",
+        "c22",
+        "c23",
+        "c24",
+        "c25",
+        "c26",
+        "c27",
+        "c28",
+        "c29",
+        "c30"
+      ],
+      "ShardIdColumn": "",
+      "ColDefs": {
+        "c10": {
+          "Name": "float_column",
+          "T": {
+            "Name": "FLOAT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: float_column float(10,2)",
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "double_column",
+          "T": {
+            "Name": "FLOAT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: double_column double(22)",
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "decimal_column",
+          "T": {
+            "Name": "NUMERIC",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: decimal_column decimal(10,2)",
+          "Id": "c12"
+        },
+        "c13": {
+          "Name": "datetime_column",
+          "T": {
+            "Name": "TIMESTAMP",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: datetime_column datetime",
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "timestamp_column",
+          "T": {
+            "Name": "TIMESTAMP",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: timestamp_column timestamp",
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "time_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: time_column time",
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "year_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: year_column year",
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "char_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 10,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: char_column char(10)",
+          "Id": "c17"
+        },
+        "c18": {
+          "Name": "tinyblob_column",
+          "T": {
+            "Name": "BYTES",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: tinyblob_column tinyblob(255)",
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "tinytext_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: tinytext_column tinytext(255)",
+          "Id": "c19"
+        },
+        "c2": {
+          "Name": "varchar_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 20,
+            "IsArray": false
+          },
+          "NotNull": true,
+          "Comment": "From: varchar_column varchar(20)",
+          "Id": "c2"
+        },
+        "c20": {
+          "Name": "blob_column",
+          "T": {
+            "Name": "BYTES",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: blob_column blob(65535)",
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "mediumblob_column",
+          "T": {
+            "Name": "BYTES",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: mediumblob_column mediumblob(16777215)",
+          "Id": "c21"
+        },
+        "c22": {
+          "Name": "mediumtext_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: mediumtext_column mediumtext(16777215)",
+          "Id": "c22"
+        },
+        "c23": {
+          "Name": "longblob_column",
+          "T": {
+            "Name": "BYTES",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: longblob_column longblob(4294967295)",
+          "Id": "c23"
+        },
+        "c24": {
+          "Name": "longtext_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: longtext_column longtext(4294967295)",
+          "Id": "c24"
+        },
+        "c25": {
+          "Name": "enum_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: enum_column enum(1)",
+          "Id": "c25"
+        },
+        "c26": {
+          "Name": "bool_column",
+          "T": {
+            "Name": "BOOL",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: bool_column tinyint(1)",
+          "Id": "c26"
+        },
+        "c27": {
+          "Name": "other_bool_column",
+          "T": {
+            "Name": "BOOL",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: other_bool_column tinyint(1)",
+          "Id": "c27"
+        },
+        "c28": {
+          "Name": "binary_column",
+          "T": {
+            "Name": "BYTES",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: binary_column binary(20)",
+          "Id": "c28"
+        },
+        "c29": {
+          "Name": "varbinary_column",
+          "T": {
+            "Name": "BYTES",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: varbinary_column varbinary(20)",
+          "Id": "c29"
+        },
+        "c3": {
+          "Name": "tinyint_column",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: tinyint_column tinyint(4)",
+          "Id": "c3"
+        },
+        "c30": {
+          "Name": "bit_column",
+          "T": {
+            "Name": "BYTES",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: bit_column bit(7)",
+          "Id": "c30"
+        },
+        "c4": {
+          "Name": "text_column",
+          "T": {
+            "Name": "STRING",
+            "Len": 9223372036854775807,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: text_column text(65535)",
+          "Id": "c4"
+        },
+        "c5": {
+          "Name": "date_column",
+          "T": {
+            "Name": "DATE",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: date_column date",
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "smallint_column",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: smallint_column smallint(5)",
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "mediumint_column",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: mediumint_column mediumint(7)",
+          "Id": "c7"
+        },
+        "c8": {
+          "Name": "int_column",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: int_column int(10)",
+          "Id": "c8"
+        },
+        "c9": {
+          "Name": "bigint_column",
+          "T": {
+            "Name": "INT64",
+            "Len": 0,
+            "IsArray": false
+          },
+          "NotNull": false,
+          "Comment": "From: bigint_column bigint(19)",
+          "Id": "c9"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c2",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "ParentId": "",
+      "Comment": "Spanner schema for source table AllDatatypeColumns",
+      "Id": "t1"
+    }
+  },
+  "SyntheticPKeys": {},
+  "SrcSchema": {
+    "t1": {
+      "Name": "AllDatatypeColumns",
+      "Schema": "Shard1",
+      "ColIds": [
+        "c2",
+        "c3",
+        "c4",
+        "c5",
+        "c6",
+        "c7",
+        "c8",
+        "c9",
+        "c10",
+        "c11",
+        "c12",
+        "c13",
+        "c14",
+        "c15",
+        "c16",
+        "c17",
+        "c18",
+        "c19",
+        "c20",
+        "c21",
+        "c22",
+        "c23",
+        "c24",
+        "c25",
+        "c26",
+        "c27",
+        "c28",
+        "c29",
+        "c30"
+      ],
+      "ColDefs": {
+        "c10": {
+          "Name": "float_column",
+          "Type": {
+            "Name": "float",
+            "Mods": [
+              10,
+              2
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c10"
+        },
+        "c11": {
+          "Name": "double_column",
+          "Type": {
+            "Name": "double",
+            "Mods": [
+              22
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c11"
+        },
+        "c12": {
+          "Name": "decimal_column",
+          "Type": {
+            "Name": "decimal",
+            "Mods": [
+              10,
+              2
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c12"
+        },
+        "c13": {
+          "Name": "datetime_column",
+          "Type": {
+            "Name": "datetime",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c13"
+        },
+        "c14": {
+          "Name": "timestamp_column",
+          "Type": {
+            "Name": "timestamp",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": true,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c14"
+        },
+        "c15": {
+          "Name": "time_column",
+          "Type": {
+            "Name": "time",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c15"
+        },
+        "c16": {
+          "Name": "year_column",
+          "Type": {
+            "Name": "text",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c16"
+        },
+        "c17": {
+          "Name": "char_column",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              10
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c17"
+        },
+        "c18": {
+          "Name": "tinyblob_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              255
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c18"
+        },
+        "c19": {
+          "Name": "tinytext_column",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              255
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c19"
+        },
+        "c2": {
+          "Name": "varchar_column",
+          "Type": {
+            "Name": "String",
+            "Mods": [
+              20
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": true,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c2"
+        },
+        "c20": {
+          "Name": "blob_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              65535
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c20"
+        },
+        "c21": {
+          "Name": "mediumblob_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              16777215
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c21"
+        },
+        "c22": {
+          "Name": "mediumtext_column",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              16777215
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c22"
+        },
+        "c23": {
+          "Name": "longblob_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              4294967295
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c23"
+        },
+        "c24": {
+          "Name": "longtext_column",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              4294967295
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c24"
+        },
+        "c25": {
+          "Name": "enum_column",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              1
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c25"
+        },
+        "c26": {
+          "Name": "bool_column",
+          "Type": {
+            "Name": "boolean",
+            "Mods": [
+              1
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c26"
+        },
+        "c27": {
+          "Name": "other_bool_column",
+          "Type": {
+            "Name": "boolean",
+            "Mods": [
+              1
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c27"
+        },
+        "c28": {
+          "Name": "binary_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              20
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c28"
+        },
+        "c29": {
+          "Name": "varbinary_column",
+          "Type": {
+            "Name": "blob",
+            "Mods": [
+              20
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c29"
+        },
+        "c3": {
+          "Name": "tinyint_column",
+          "Type": {
+            "Name": "tinyint",
+            "Mods": [
+              4
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c3"
+        },
+        "c30": {
+          "Name": "bit_column",
+          "Type": {
+            "Name": "varint",
+            "Mods": [
+              7
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c30"
+        },
+        "c4": {
+          "Name": "text_column",
+          "Type": {
+            "Name": "text",
+            "Mods": [
+              65535
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c4"
+        },
+        "c5": {
+          "Name": "date_column",
+          "Type": {
+            "Name": "date",
+            "Mods": null,
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c5"
+        },
+        "c6": {
+          "Name": "smallint_column",
+          "Type": {
+            "Name": "smallint",
+            "Mods": [
+              5
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c6"
+        },
+        "c7": {
+          "Name": "mediumint_column",
+          "Type": {
+            "Name": "int",
+            "Mods": [
+              7
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c7"
+        },
+        "c8": {
+          "Name": "int_column",
+          "Type": {
+            "Name": "int",
+            "Mods": [
+              10
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c8"
+        },
+        "c9": {
+          "Name": "bigint_column",
+          "Type": {
+            "Name": "bigint",
+            "Mods": [
+              19
+            ],
+            "ArrayBounds": null
+          },
+          "NotNull": false,
+          "Ignored": {
+            "Check": false,
+            "Identity": false,
+            "Default": false,
+            "Exclusion": false,
+            "ForeignKey": false,
+            "AutoIncrement": false
+          },
+          "Id": "c9"
+        }
+      },
+      "PrimaryKeys": [
+        {
+          "ColId": "c2",
+          "Desc": false,
+          "Order": 1
+        }
+      ],
+      "ForeignKeys": null,
+      "Indexes": null,
+      "Id": "t1"
+    }
+  },
+  "SchemaIssues": {
+    "t1": {
+      "ColumnLevelIssues": {
+        "c10": [
+          14
+        ],
+        "c13": [
+          13
+        ],
+        "c14": [
+          0
+        ],
+        "c15": [
+          15
+        ],
+        "c16": [
+          15
+        ],
+        "c3": [
+          14
+        ],
+        "c6": [
+          14
+        ],
+        "c7": [
+          14
+        ],
+        "c8": [
+          14
+        ]
+      },
+      "TableLevelIssues": null
+    }
+  },
+  "Location": {},
+  "TimezoneOffset": "+00:00",
+  "SpDialect": "google_standard_sql",
+  "UniquePKey": {},
+  "Rules": [],
+  "IsSharded": false,
+  "SpRegion": "",
+  "ResourceValidation": false,
+  "UI": false
+}
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql
new file mode 100644
index 0000000000..e7f3fbf0be
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql
@@ -0,0 +1,37 @@
+CREATE TABLE IF NOT EXISTS AllDatatypeColumns (
+    varchar_column STRING(20) NOT NULL,
+    tinyint_column INT64,
+    text_column STRING(MAX),
+    date_column DATE,
+    smallint_column INT64,
+    mediumint_column INT64,
+    int_column INT64,
+    bigint_column INT64,
+    float_column FLOAT64,
+    double_column FLOAT64,
+    decimal_column NUMERIC,
+    datetime_column TIMESTAMP,
+    timestamp_column TIMESTAMP,
+    time_column STRING(MAX),
+    year_column STRING(MAX),
+    char_column STRING(10),
+    tinyblob_column BYTES(MAX),
+    tinytext_column STRING(MAX),
+    blob_column BYTES(MAX),
+    mediumblob_column BYTES(MAX),
+    mediumtext_column STRING(MAX),
+    longblob_column BYTES(MAX),
+    longtext_column STRING(MAX),
+    enum_column STRING(MAX),
+    bool_column BOOL,
+    other_bool_column BOOL,
+    binary_column BYTES(MAX),
+    varbinary_column BYTES(20),
+    bit_column BYTES(MAX),
+) PRIMARY KEY(varchar_column);
+
+CREATE CHANGE STREAM allstream
+  FOR ALL OPTIONS (
+  value_capture_type = 'NEW_ROW',
+  retention_period = '7d'
+);
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToSourceDbDatatypeIT/mysql-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToSourceDbDatatypeIT/mysql-schema.sql
index ff8752d40d..048dda2e59 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/SpannerToSourceDbDatatypeIT/mysql-schema.sql
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToSourceDbDatatypeIT/mysql-schema.sql
@@ -1,32 +1,32 @@
 CREATE TABLE `AllDatatypeColumns` (
     `varchar_column` varchar(20) NOT NULL,
-    `tinyint_column` tinyint,              
-    `text_column` text,                    
-    `date_column` date,                    
-    `smallint_column` smallint,            
-    `mediumint_column` mediumint,          
-    `int_column` int,                     
-    `bigint_column` bigint,                
-    `float_column` float(10,2),            
-    `double_column` double,                
-    `decimal_column` decimal(10,2),        
-    `datetime_column` datetime,           
-    `timestamp_column` timestamp,          
-    `time_column` time,                    
-    `year_column` year,                    
-    `char_column` char(10),                
-    `tinyblob_column` tinyblob,            
-    `tinytext_column` tinytext,            
-    `blob_column` blob,                    
-    `mediumblob_column` mediumblob,       
-    `mediumtext_column` mediumtext,        
-    `longblob_column` longblob,            
-    `longtext_column` longtext,            
-    `enum_column` enum('1','2','3'),       
-    `bool_column` tinyint(1),              
-    `other_bool_column` tinyint(1),        
-    `binary_column` binary(10),            
-    `varbinary_column` varbinary(20),      
-    `bit_column` bit(7),                   
+    `tinyint_column` tinyint,
+    `text_column` text,
+    `date_column` date,
+    `smallint_column` smallint,
+    `mediumint_column` mediumint,
+    `int_column` int,
+    `bigint_column` bigint,
+    `float_column` float(10,2),
+    `double_column` double,
+    `decimal_column` decimal(10,2),
+    `datetime_column` datetime,
+    `timestamp_column` timestamp,
+    `time_column` time,
+    `year_column` year,
+    `char_column` char(10),
+    `tinyblob_column` tinyblob,
+    `tinytext_column` tinytext,
+    `blob_column` blob,
+    `mediumblob_column` mediumblob,
+    `mediumtext_column` mediumtext,
+    `longblob_column` longblob,
+    `longtext_column` longtext,
+    `enum_column` enum('1','2','3'),
+    `bool_column` tinyint(1),
+    `other_bool_column` tinyint(1),
+    `binary_column` binary(10),
+    `varbinary_column` varbinary(20),
+    `bit_column` bit(7),
     PRIMARY KEY (`varchar_column`)
 );
\ No newline at end of file

From 3149601fc7e10b8fa8d5f66304284f2e1c0b8030 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 13:08:19 +0530
Subject: [PATCH 31/56] Squashed commit of the following:

commit b2abbf0947e1765f87f5e7a119f39d447820e6e8
Author: pawankashyapollion <v-pawan.kumar@ollion.com>
Date:   Mon Jan 20 13:05:55 2025 +0530

    Added PR Review Comments

commit 3d3fb66189b3642e3874bc22a34d7ce72e1c404f
Author: pawankashyapollion <v-pawan.kumar@ollion.com>
Date:   Mon Jan 20 12:24:14 2025 +0530

    Cassandra pr bug fixes (#75)
---
 .../dbutils/dml/CassandraDMLGenerator.java    | 30 ++++---
 .../dbutils/dml/CassandraTypeHandler.java     |  8 +-
 .../processor/InputRecordProcessor.java       | 13 +--
 .../dml/CassandraDMLGeneratorTest.java        | 27 +++---
 .../dbutils/dml/CassandraTypeHandlerTest.java | 82 ++++++++++++++++---
 5 files changed, 107 insertions(+), 53 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index a8f8015e9a..eefc856487 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -92,8 +92,7 @@ public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequ
     NameAndCols tableMapping = schema.getSpannerToID().get(spannerTableName);
     SpannerTable spannerTable = schema.getSpSchema().get(tableMapping.getName());
     if (spannerTable == null) {
-      LOG.warn(
-          "Spanner table {} not found in session file. Dropping the record.", spannerTableName);
+      LOG.warn("Spanner table {} not found. Dropping the record.", spannerTableName);
       return new DMLGeneratorResponse("");
     }
 
@@ -170,15 +169,15 @@ private static DMLGeneratorResponse generatorDMLResponse(
             dmlGeneratorRequest.getNewValuesJson(),
             dmlGeneratorRequest.getKeyValuesJson(),
             dmlGeneratorRequest.getSourceDbTimezoneOffset());
-    List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries =
+    List<Map.Entry<String, PreparedStatementValueObject<?>>> allColumnNamesAndValues =
         Stream.concat(pkColumnNameValues.entrySet().stream(), columnNameValues.entrySet().stream())
             .collect(Collectors.toList());
     switch (modType) {
       case "INSERT":
       case "UPDATE":
-        return getUpsertStatementCQL(sourceTable.getName(), timestamp, allEntries);
+        return getUpsertStatementCQL(sourceTable.getName(), timestamp, allColumnNamesAndValues);
       case "DELETE":
-        return getDeleteStatementCQL(sourceTable.getName(), timestamp, allEntries);
+        return getDeleteStatementCQL(sourceTable.getName(), timestamp, allColumnNamesAndValues);
       default:
         LOG.error("Unsupported modType: {} for table {}", modType, spannerTable.getName());
         return new DMLGeneratorResponse("");
@@ -191,8 +190,8 @@ private static DMLGeneratorResponse generatorDMLResponse(
    *
    * @param tableName the name of the table to which the upsert statement applies.
    * @param timestamp the timestamp (in java.sql.Timestamp) to use for the operation.
-   * @param allEntries a map of column names and their corresponding prepared statement value
-   *     objects for non-primary key columns.
+   * @param allColumnNamesAndValues a map of column names and their corresponding prepared statement
+   *     value objects for non-primary key columns.
    * @return a {@link DMLGeneratorResponse} containing the generated CQL statement and a list of
    *     values to be used with the prepared statement.
    *     <p>This method: 1. Iterates through the primary key and column values, appending column
@@ -206,17 +205,18 @@ private static DMLGeneratorResponse generatorDMLResponse(
   private static DMLGeneratorResponse getUpsertStatementCQL(
       String tableName,
       java.sql.Timestamp timestamp,
-      List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries) {
+      List<Map.Entry<String, PreparedStatementValueObject<?>>> allColumnNamesAndValues) {
 
     String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
     String allColumns =
-        allEntries.stream()
+        allColumnNamesAndValues.stream()
             .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\"")
             .collect(Collectors.joining(", "));
-    String placeholders = allEntries.stream().map(entry -> "?").collect(Collectors.joining(", "));
+    String placeholders =
+        allColumnNamesAndValues.stream().map(entry -> "?").collect(Collectors.joining(", "));
 
     List<PreparedStatementValueObject<?>> values =
-        allEntries.stream().map(Map.Entry::getValue).collect(Collectors.toList());
+        allColumnNamesAndValues.stream().map(Map.Entry::getValue).collect(Collectors.toList());
 
     PreparedStatementValueObject<java.sql.Timestamp> timestampObj =
         PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
@@ -235,8 +235,6 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
    * primary key values, and timestamp.
    *
    * @param tableName the name of the table from which records will be deleted.
-   * @param pkColumnNameValues a map containing the primary key column names and their corresponding
-   *     prepared statement value objects.
    * @param timestamp the timestamp (in java.sql.Timestamp) to use for the delete operation.
    * @return a {@link DMLGeneratorResponse} containing the generated CQL delete statement and a list
    *     of values to bind to the prepared statement.
@@ -251,17 +249,17 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
   private static DMLGeneratorResponse getDeleteStatementCQL(
       String tableName,
       java.sql.Timestamp timestamp,
-      List<Map.Entry<String, PreparedStatementValueObject<?>>> allEntries) {
+      List<Map.Entry<String, PreparedStatementValueObject<?>>> allColumnNamesAndValues) {
 
     String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
 
     String deleteConditions =
-        allEntries.stream()
+        allColumnNamesAndValues.stream()
             .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\" = ?")
             .collect(Collectors.joining(" AND "));
 
     List<PreparedStatementValueObject<?>> values =
-        allEntries.stream().map(Map.Entry::getValue).collect(Collectors.toList());
+        allColumnNamesAndValues.stream().map(Map.Entry::getValue).collect(Collectors.toList());
 
     String preparedStatement =
         String.format(
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
index 9f29749006..05a1a4bd04 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -295,8 +295,8 @@ private static Instant convertToCassandraTimestamp(String timestampValue) {
   }
 
   /**
-   * Safely executes a handler method, catching exceptions and rethrowing them as runtime
-   * exceptions.
+   * Safely executes a handler method, catching exceptions and rethrowing them as
+   * IllegalArgumentException exceptions.
    *
    * <p>This method provides exception safety by wrapping the execution of a supplier function.
    *
@@ -309,6 +309,7 @@ private static <T> T safeHandle(HandlerSupplier<T> supplier) {
     try {
       return supplier.get();
     } catch (Exception e) {
+      LOG.error(e.getMessage());
       throw new IllegalArgumentException("Error handling type: " + e.getMessage(), e);
     }
   }
@@ -681,13 +682,12 @@ public static PreparedStatementValueObject<?> getColumnValueByType(
    *     text")
    * @param columnValue the value of the column to be cast
    * @return the column value cast to the expected type
-   * @throws ClassCastException if the value cannot be cast to the expected type
    * @throws IllegalArgumentException if the Cassandra type is unsupported or the value is invalid
    */
   public static Object castToExpectedType(String cassandraType, Object columnValue) {
     try {
       return parseAndCastToCassandraType(cassandraType, columnValue).value();
-    } catch (ClassCastException | IllegalArgumentException e) {
+    } catch (IllegalArgumentException e) {
       LOG.error("Error converting value for column: {}, type: {}", cassandraType, e.getMessage());
       throw new IllegalArgumentException(
           "Error converting value for cassandraType: " + cassandraType);
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
index 8b51f11d29..5be32bf681 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
@@ -107,11 +107,14 @@ public static boolean processRecord(
         return false;
       }
       // TODO we need to handle it as proper Interface Level as of now we have handle Prepared
-      // Statement and Raw Statement Differently
-      if (source.equals(SOURCE_CASSANDRA)) {
-        dao.write(dmlGeneratorResponse);
-      } else {
-        dao.write(dmlGeneratorResponse.getDmlStatement());
+      // TODO Statement and Raw Statement Differently
+      switch (source) {
+        case SOURCE_CASSANDRA:
+          dao.write(dmlGeneratorResponse);
+          break;
+        default:
+          dao.write(dmlGeneratorResponse.getDmlStatement());
+          break;
       }
 
       Counter numRecProcessedMetric =
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
index 49d8ace091..d5dfd5b0d5 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java
@@ -18,9 +18,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import com.google.cloud.Timestamp;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
@@ -42,7 +39,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -50,10 +46,6 @@ public class CassandraDMLGeneratorTest {
 
   private CassandraDMLGenerator cassandraDMLGenerator;
 
-  @Mock private DMLGeneratorRequest mockRequest;
-
-  @Mock private Schema mockSchema;
-
   @Before
   public void setUp() {
     cassandraDMLGenerator = new CassandraDMLGenerator();
@@ -68,24 +60,25 @@ public void testGetDMLStatement_NullRequest() {
 
   @Test
   public void testGetDMLStatement_InvalidSchema() {
-    when(mockRequest.getSchema()).thenReturn(null);
+    DMLGeneratorRequest dmlGeneratorRequest =
+        new DMLGeneratorRequest.Builder("insert", "text", null, null, null).setSchema(null).build();
 
-    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(mockRequest);
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(dmlGeneratorRequest);
     assertNotNull(response);
     assertEquals("", response.getDmlStatement());
-
-    verify(mockRequest, times(1)).getSchema();
   }
 
   @Test
   public void testGetDMLStatement_MissingTableMapping() {
-    when(mockRequest.getSchema()).thenReturn(mockSchema);
-    when(mockSchema.getSpannerToID()).thenReturn(null);
-
-    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(mockRequest);
+    Schema schema = new Schema();
+    schema.setSpannerToID(null);
+    DMLGeneratorRequest dmlGeneratorRequest =
+        new DMLGeneratorRequest.Builder("insert", "text", null, null, null)
+            .setSchema(schema)
+            .build();
+    DMLGeneratorResponse response = cassandraDMLGenerator.getDMLStatement(dmlGeneratorRequest);
     assertNotNull(response);
     assertEquals("", response.getDmlStatement());
-    verify(mockSchema, times(1)).getSpannerToID();
   }
 
   @Test
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index a2d5fa0097..c3e4aff6cb 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -29,16 +29,24 @@
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnDefinition;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SpannerColumnType;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
+import com.google.common.net.InetAddresses;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
 import java.time.Duration;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import org.json.JSONArray;
@@ -66,8 +74,8 @@ public void testGetColumnValueByTypeForString() {
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
-
     assertNotNull(castResult);
+    assertEquals("test_value", castResult);
   }
 
   @Test
@@ -93,6 +101,7 @@ public void testGetColumnValueByType() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("é", castResult);
   }
 
   @Test
@@ -116,6 +125,7 @@ public void testGetColumnValueByTypeForNonString() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(12345, castResult);
   }
 
   @Test
@@ -138,6 +148,7 @@ public void testGetColumnValueByTypeForStringUUID() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(UUID.fromString(columnValue), castResult);
   }
 
   @Test
@@ -160,6 +171,7 @@ public void testGetColumnValueByTypeForStringIpAddress() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(InetAddresses.forString(columnValue), castResult);
   }
 
   @Test
@@ -180,8 +192,9 @@ public void testGetColumnValueByTypeForStringJsonArray() {
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
-
+    Set<String> expectedSet = new HashSet<>(Arrays.asList("apple", "banana", "cherry"));
     assertNotNull(castResult);
+    assertEquals(expectedSet, castResult);
   }
 
   @Test
@@ -204,6 +217,11 @@ public void testGetColumnValueByTypeForStringJsonObject() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+
+    Map<String, String> expectedMap = new HashMap<>();
+    expectedMap.put("name", "John");
+    expectedMap.put("age", "30");
+    assertEquals(expectedMap, castResult);
   }
 
   @Test
@@ -226,6 +244,25 @@ public void testGetColumnValueByTypeForStringHex() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+
+    byte[] actualBytes;
+    if (castResult instanceof ByteBuffer) {
+      ByteBuffer byteBuffer = (ByteBuffer) castResult;
+      actualBytes = new byte[byteBuffer.remaining()];
+      byteBuffer.get(actualBytes);
+    } else if (castResult instanceof byte[]) {
+      actualBytes = (byte[]) castResult;
+    } else {
+      throw new AssertionError("Unexpected type for castResult");
+    }
+
+    byte[] expectedBytes = new BigInteger(valuesJson.getString(columnName), 16).toByteArray();
+
+    if (expectedBytes.length > 1 && expectedBytes[0] == 0) {
+      expectedBytes = Arrays.copyOfRange(expectedBytes, 1, expectedBytes.length);
+    }
+
+    assertArrayEquals(expectedBytes, actualBytes);
   }
 
   @Test
@@ -248,6 +285,7 @@ public void testGetColumnValueByTypeForStringDuration() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("P4DT1H", castResult.toString());
   }
 
   @Test
@@ -270,6 +308,10 @@ public void testGetColumnValueByTypeForDates() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    ZonedDateTime expectedDate = ZonedDateTime.parse(columnValue).withSecond(0).withNano(0);
+    Instant instant = (Instant) castResult;
+    ZonedDateTime actualDate = instant.atZone(ZoneOffset.UTC).withSecond(0).withNano(0);
+    assertEquals(expectedDate, actualDate);
   }
 
   @Test
@@ -291,6 +333,9 @@ public void testGetColumnValueByTypeForBigInt() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    Long expectedBigInt = 123456789L;
+
+    assertEquals(expectedBigInt, castResult);
   }
 
   @Test
@@ -312,6 +357,7 @@ public void testGetColumnValueByTypeForBytesForHexString() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("48656c6c6f20576f726c64", castResult);
   }
 
   @Test
@@ -333,6 +379,8 @@ public void testGetColumnValueByTypeForBigIntForString() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    long expectedValue = 123456789L;
+    assertEquals(expectedValue, castResult);
   }
 
   @Test
@@ -354,6 +402,7 @@ public void testGetColumnValueByTypeForBoolentForString() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(true, castResult);
   }
 
   @Test
@@ -375,6 +424,7 @@ public void testGetColumnValueByTypeForBoolent() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(true, castResult);
   }
 
   @Test
@@ -396,6 +446,8 @@ public void testGetColumnValueByTypeForIntegerValue() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    long expectedValue = 225000L;
+    assertEquals(expectedValue, castResult);
   }
 
   @Test
@@ -417,6 +469,7 @@ public void testGetColumnValueByTypeForBoolentSamllCaseForString() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(false, castResult);
   }
 
   // Revised and Improved Tests
@@ -439,6 +492,7 @@ public void testGetColumnValueByTypeForInteger() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(BigInteger.valueOf(5), castResult);
   }
 
   @Test
@@ -459,6 +513,7 @@ public void testGetColumnValueByTypeForValidBigInteger() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(BigInteger.valueOf(5), castResult);
   }
 
   @Test
@@ -480,6 +535,8 @@ public void testConvertToCassandraTimestampWithISOInstant() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    LocalDate expectedValue = Instant.parse(timestamp).atZone(ZoneId.systemDefault()).toLocalDate();
+    assertEquals(expectedValue, castResult);
   }
 
   @Test
@@ -501,6 +558,7 @@ public void testConvertToCassandraTimestampWithISODateTime() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("2025-01-15T00:00:00Z", castResult.toString());
   }
 
   @Test
@@ -522,6 +580,7 @@ public void testConvertToCassandraTimestampWithISODate() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals(timestamp, castResult.toString());
   }
 
   @Test
@@ -543,6 +602,7 @@ public void testConvertToCassandraTimestampWithCustomFormat1() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
@@ -564,6 +624,7 @@ public void testConvertToCassandraTimestampWithCustomFormat2() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
@@ -585,6 +646,7 @@ public void testConvertToCassandraTimestampWithCustomFormat3() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
@@ -606,6 +668,7 @@ public void testConvertToCassandraTimestampWithCustomFormat4() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
@@ -627,6 +690,7 @@ public void testConvertToCassandraTimestampWithCustomFormat5() {
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
     assertNotNull(castResult);
+    assertEquals("2025-01-15", castResult.toString());
   }
 
   @Test
@@ -988,8 +1052,6 @@ public void testCastToExpectedTypeForVariousTypes() throws UnknownHostException
         new BigInteger("123456789123456789123456789"),
         castToExpectedType("varint", "123456789123456789123456789"));
     String timeString = "14:30:45";
-    // Parse the time
-    LocalTime localTime = LocalTime.parse(timeString, DateTimeFormatter.ISO_TIME);
     Object localTime1 = castToExpectedType("time", "14:30:45");
     assertTrue(localTime1 instanceof LocalTime);
     assertEquals(
@@ -997,20 +1059,18 @@ public void testCastToExpectedTypeForVariousTypes() throws UnknownHostException
   }
 
   @Test
-  public void testCastToExpectedTypeForJSONArrayToSet() {
+  public void testCastToExpectedTypeForJSONArrayStringifyToSet() {
     String cassandraType = "set<int>";
-    String columnValue = new JSONArray(Arrays.asList(1, 2, 3)).toString();
+    String columnValue = "[1, 2, 3]";
     Object result = castToExpectedType(cassandraType, columnValue);
     assertTrue(result instanceof Set);
     assertEquals(3, ((Set<?>) result).size());
   }
 
   @Test
-  public void testCastToExpectedTypeForJSONObjectToMap() {
+  public void testCastToExpectedTypeForJSONObjectStringifyToMap() {
     String cassandraType = "map<int, text>";
-    JSONObject columnValue = new JSONObject();
-    columnValue.put("2024-12-12", "One");
-    columnValue.put(String.valueOf(2), "Two");
+    String columnValue = "{\"2024-12-12\": \"One\", \"2\": \"Two\"}";
     assertThrows(
         IllegalArgumentException.class,
         () -> {

From 13a0eee2942873cf8b7cd8db2613cdec22110579 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 13:34:56 +0530
Subject: [PATCH 32/56] Squashed commit of the following:

commit 9eec62300f0378bc3e245c7546fe447abbf9bb6c
Author: pawankashyapollion <v-pawan.kumar@ollion.com>
Date:   Mon Jan 20 13:34:29 2025 +0530

    Removed SpannerToID and also Updated Session file with proper structure

commit 7b13e94f6a755636bd70f103353eb3d936932f22
Author: pawankashyapollion <v-pawan.kumar@ollion.com>
Date:   Mon Jan 20 13:20:54 2025 +0530

    Added spannerTableId for fetching Mapping

commit 913909eb1a9b0304d91f8c60c0f0a2ea275c9ca0
Author: pawankashyapollion <v-pawan.kumar@ollion.com>
Date:   Mon Jan 20 13:13:09 2025 +0530

    Remove NamesCol Dependecy as spannerTableName is same as In Given Mapping

commit b2abbf0947e1765f87f5e7a119f39d447820e6e8
Author: pawankashyapollion <v-pawan.kumar@ollion.com>
Date:   Mon Jan 20 13:05:55 2025 +0530

    Added PR Review Comments

commit 3d3fb66189b3642e3874bc22a34d7ce72e1c404f
Author: pawankashyapollion <v-pawan.kumar@ollion.com>
Date:   Mon Jan 20 12:24:14 2025 +0530

    Cassandra pr bug fixes (#75)
---
 .../dbutils/dml/CassandraDMLGenerator.java       |  9 +++------
 .../src/test/resources/cassandraSession.json     | 16 ++++++++--------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index eefc856487..330e06885a 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -16,7 +16,6 @@
 package com.google.cloud.teleport.v2.templates.dbutils.dml;
 
 import com.google.cloud.teleport.v2.spanner.migrations.schema.ColumnPK;
-import com.google.cloud.teleport.v2.spanner.migrations.schema.NameAndCols;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.Schema;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceColumnDefinition;
 import com.google.cloud.teleport.v2.spanner.migrations.schema.SourceTable;
@@ -88,20 +87,18 @@ public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequ
       LOG.warn("Schema is invalid or incomplete for table: {}", spannerTableName);
       return new DMLGeneratorResponse("");
     }
-
-    NameAndCols tableMapping = schema.getSpannerToID().get(spannerTableName);
-    SpannerTable spannerTable = schema.getSpSchema().get(tableMapping.getName());
+    SpannerTable spannerTable = schema.getSpSchema().get(spannerTableName);
     if (spannerTable == null) {
       LOG.warn("Spanner table {} not found. Dropping the record.", spannerTableName);
       return new DMLGeneratorResponse("");
     }
 
-    SourceTable sourceTable = schema.getSrcSchema().get(tableMapping.getName());
+    SourceTable sourceTable = schema.getSrcSchema().get(spannerTableName);
     if (sourceTable == null) {
       LOG.warn(
           "Source table {} not found for Spanner table Name: {}",
           spannerTableName,
-          tableMapping.getName());
+          spannerTableName);
       return new DMLGeneratorResponse("");
     }
 
diff --git a/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json b/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
index 6178656340..3bb4bd8942 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
+++ b/v2/spanner-to-sourcedb/src/test/resources/cassandraSession.json
@@ -264,7 +264,7 @@
       "Id": "t1",
       "Comment": "Spanner schema for source table sample_table"
     },
-    "t1": {
+    "Singers": {
       "Name": "Singers",
       "ColIds": [
         "c5",
@@ -327,7 +327,7 @@
       ],
       "Id": "t1"
     },
-    "t2": {
+    "contact": {
       "Name": "contact",
       "ColIds": [
         "c18",
@@ -395,7 +395,7 @@
       ],
       "Id": "t2"
     },
-    "t3": {
+    "customer": {
       "Name": "customer",
       "ColIds": [
         "c10",
@@ -451,7 +451,7 @@
       ],
       "Id": "t3"
     },
-    "t4": {
+    "Persons": {
       "Name": "Persons",
       "ColIds": [
         "c13",
@@ -818,7 +818,7 @@
       ],
       "Id": "t1"
     },
-    "t1": {
+    "Singers": {
       "Name": "Singers",
       "Schema": "ui_demo",
       "ColIds": [
@@ -866,7 +866,7 @@
       ],
       "Id": "t1"
     },
-    "t2": {
+    "contact": {
       "Name": "contact",
       "Schema": "ui_demo",
       "ColIds": [
@@ -921,7 +921,7 @@
       "Indexes": null,
       "Id": "t2"
     },
-    "t3": {
+    "customer": {
       "Name": "customer",
       "Schema": "ui_demo",
       "ColIds": [
@@ -963,7 +963,7 @@
       "Indexes": null,
       "Id": "t3"
     },
-    "t4": {
+    "Persons": {
       "Name": "Persons",
       "Schema": "ui_demo",
       "ColIds": [

From 9cc0d551e1c5c4dd9333e93abd8bf81d7134785c Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 13:49:13 +0530
Subject: [PATCH 33/56] Added Error Category

---
 .../teleport/v2/templates/transforms/SourceWriterFn.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
index bb1a2bc715..96a5670a7d 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/transforms/SourceWriterFn.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.teleport.v2.templates.transforms;
 
+import com.datastax.oss.driver.api.core.servererrors.QueryExecutionException;
+import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -240,6 +242,8 @@ public void processElement(ProcessContext c) {
           | com.mysql.cj.jdbc.exceptions.CommunicationsException
           | java.sql.SQLIntegrityConstraintViolationException
           | java.sql.SQLTransientConnectionException
+          | CodecNotFoundException
+          | QueryExecutionException
           | ConnectionException ex) {
         outputWithTag(c, Constants.RETRYABLE_ERROR_TAG, ex.getMessage(), spannerRec);
       } catch (java.sql.SQLNonTransientConnectionException ex) {

From 61a9d6f72d63f92bb42dfe3415e416b163835831 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 16:53:02 +0530
Subject: [PATCH 34/56] Squashed commit of the following:

commit b7747f9886a5fcf3b2843565407c5a12661e920f
Author: nasir19noor <nasir@nasir.id>
Date:   Sun Jan 19 16:20:37 2025 +0700

    revert back java-pr.yml

commit a4d4184a3000a91f407503574fa6e3c7802dc70a
Author: nasir19noor <nasir@nasir.id>
Date:   Sun Jan 19 00:34:02 2025 +0700

    test all

commit 6397cb73ff6fcea74479db8ed9d85536b4636b4a
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 23:50:54 2025 +0700

    build & Unit testing add -pl v2/spanner-to-sourcedb

commit 9fd29c423f1e6de67ac25ffaab5038b014659fe3
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 23:18:53 2025 +0700

    build & Unit testing

commit 08a4bedfe81e1ab113db09ca1d7211d8b9cad4bc
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 23:06:23 2025 +0700

    build test

commit 1444644bc23778605e2ad2380ef15fa8e7fba8aa
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 17:03:18 2025 +0700

    IT and LT

commit c65882cef6b4bd3a7880589887e26a6ce094f1c2
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 16:25:21 2025 +0700

    test Integration Testing revert to initial code

commit 4485e9cf9aeba04d5605c3ec3d477e89d8e9a24d
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 14:53:41 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbIT

commit 6f0241df473c9064b7673830f61a24346c8f024b
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 14:43:02 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbInterleaveMultiShardIT change hotsIP

commit ed8a496e9932c80591979e647732836023f2db6d
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 14:05:53 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbInterleaveMultiShardIT increase timeout

commit e0f613da3aa84d05e462c6a2a9fa481ba617e73e
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 13:32:31 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbInterleaveMultiShardIT

commit ae7a17d93f333cdbde663d2233e680e6c65069ba
Author: nasir19noor <nasir@nasir.id>
Date:   Sat Jan 18 12:24:00 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbDatatypeIT

commit 5f474a2199f49dccc6aff0bc64ac6c3486d1810c
Author: nasir19noor <nasir@nasir.id>
Date:   Fri Jan 17 21:59:31 2025 +0700

    test Integration Testing -Dtest=SpannerToSourceDbCustomShardIT

commit 80d258a7670b2511fe50966ec38cd21597bdb807
Author: nasir19noor <nasir@nasir.id>
Date:   Fri Jan 17 14:18:33 2025 +0700

    test Integration Testing

commit 8b062299090367497c51dc48dac03422870db8e6
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 23:27:36 2025 +0700

    update bigquery value

commit 8ac600ba23f7c3bd96d5e5a7dd6c6dd15f7ba8dd
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 23:21:41 2025 +0700

    update bigquery value

commit e900037b9681b2959840237a28545465ce7d3d5e
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 22:16:48 2025 +0700

    revert back BigQuery conf

commit 543c73a7058b492c6dfc6a998c9fa5aaf11098e4
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 22:05:56 2025 +0700

    modify export bigquery

commit f89e3de1e8907015f28932c03be5efe3453c6ff6
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 21:23:19 2025 +0700

    solve bigquery tabl

commit 3551c5968b2ef86e59a26ef458ba927b2cbe9e91
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 20:28:11 2025 +0700

    solve bigquery issue

commit eac6ccaed0b2df00ce6b4a7e8ee3b01624c3c264
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 19:39:35 2025 +0700

    decrease streaming data

commit 51a4e2e02b1ef0ccda4c11dc653c17b9ff5d28ac
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 17:03:36 2025 +0700

    load test: add specific module:spanner-to-cassandra 2

commit dfcb9de0c602cce0891026d26d58c7939c2645da
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 16:46:27 2025 +0700

    load test: add specific module:spanner-to-cassandra

commit 222923356f61c9b4b2a98f46690e3fdf595bc74c
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 16:07:38 2025 +0700

    Load Test: revert back SpannerToSourceDbCustomShardLT.java

commit 5eab9b69840d099ae73d49f5b6fabe6759865828
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 16:03:07 2025 +0700

    Load Test: reduce dataflow jobs and workder node 2 modify format

commit 29a071f44e12b49cc2d0de06efd39e5776cc5de2
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 15:39:59 2025 +0700

    Load Test: reduce dataflow jobs and workder node

commit 964cc52f750721a5fe48227c2829f9d4fc4a03aa
Author: taherkl <taher.lakdawala@ollion.com>
Date:   Thu Jan 16 11:41:07 2025 +0530

    update load test with lower config

commit dfc315bb2041744dd73bdb1fb02a927178aa6ab8
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 12:35:32 2025 +0700

    modify load test

commit cedd70385e2092c2b56a86d7a1b1d4bf5c4250a6
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 08:55:51 2025 +0700

    IT use command form google(modified)

commit 7ba3c38228b5ff2bd3136997ed93dad66f229630
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 08:10:38 2025 +0700

    IT use command form google(modified)

commit a1dcae7ffdfffbd7f74feb104cb00fa1f2a15f90
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 16 00:08:45 2025 +0700

    use IT command from Google

commit 3c8b3756e3bc1df2d39d2095431ad4ea61de7ce3
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 23:45:16 2025 +0700

    modify run it test main.go

commit 93e3d21aa1f6178b13fb6f6be7cf24ade95bfd11
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 23:41:32 2025 +0700

    modify host IP

commit 70481f2ddd5f81fc09aed284e43400f34825db66
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 23:32:05 2025 +0700

    modify IT to initial

commit bbb61cd8d4e81a97c168f57bcd14743020fd1472
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 23:27:47 2025 +0700

    modify IT to initial

commit 40d23bfbf2ae90b22b5cb342baee69f22bf8e755
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 23:24:47 2025 +0700

    modify IT to initial

commit c6334dbb915b67c52bdcad815803298ec23fca1f
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 22:47:45 2025 +0700

    modify IT command 4

commit a0b6ded1babddc22c33b45c919d934dd12abcf81
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 22:33:49 2025 +0700

    modify IT command 3

commit dbfec41f9df9a0597e026da112f8fc5e71400704
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 22:00:12 2025 +0700

    modify IT command 2

commit b6f5761702b2b27f1d350100a641fe3cc43a780d
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 21:43:30 2025 +0700

    modify IT command

commit 409200b50c2a46f88ba5598c5d28a270c307ad46
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 21:16:55 2025 +0700

    exclude build and unit test

commit c19e1a070d52b7a6ba27ba8ef653ca987245db1a
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 20:46:29 2025 +0700

    exclude tags perf on load test

commit 1e0bf316ec1d10c0cbc43834e9aa5fe3f630eb66
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 19:36:13 2025 +0700

    exclude build dependency

commit bf1c3d74b058474087f9353ef9a13ee422df71f5
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 18:01:33 2025 +0700

    modify the format

commit 783f00f9e8ff658af838fe0b3860531948498724
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 15 17:08:30 2025 +0700

    modify it test main.go

commit b019935957ac44cf7d88e21debfe71148367b4ac
Author: Nasir Noor <nasir@nasir.id>
Date:   Wed Jan 15 16:50:27 2025 +0700

    revert back it-flags.go

commit f10b6ce0f42120aa5dab0120d9114cc9c5d5c758
Author: Nasir Noor <nasir@nasir.id>
Date:   Wed Jan 15 16:28:59 2025 +0700

    add spanner-demo instance id

commit 49942e746648b335c3dd6249a477c5c04fb9a1e9
Author: Nasir Noor <nasir@nasir.id>
Date:   Wed Jan 15 16:20:08 2025 +0700

    temp - exclude unit test dependency

commit c6278b533470b6944ca931499eab1f45faaae0b2
Author: Nasir Noor <nasir@nasir.id>
Date:   Wed Jan 15 14:58:49 2025 +0700

    include mysql cred

commit c5b81033479659fa0d7105417de11761e2d76b25
Author: Nasir Noor <nasir@nasir.id>
Date:   Wed Jan 15 08:21:35 2025 +0700

    exclude unnecessary parameter, only spanner is requird

commit ca1ea25f463158e451a1f33fbf7611450ceb103e
Author: Nasir Noor <nasir@nasir.id>
Date:   Wed Jan 15 00:30:30 2025 +0700

    change spanner instance id spanner-demo

commit 1db2c824a46628948cfe974bd7765c03f445c368
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 22:27:26 2025 +0700

    change spanner instance id

commit bea942275243ad9feeafb7a3b66b63b98b1f6a20
Author: nasir19noor <nasir@nasir.id>
Date:   Tue Jan 14 21:02:47 2025 +0700

    remove comment

commit 362443f6496850d18de910407db31faf9c7dd1b1
Author: nasir19noor <nasir@nasir.id>
Date:   Tue Jan 14 19:01:45 2025 +0700

    test codecov

commit 54907b055e5718d0be9aff8bee7b8591248735e4
Author: nasir19noor <nasir@nasir.id>
Date:   Tue Jan 14 18:54:17 2025 +0700

    remove backup file

commit b1543cf62cdf9d33c7d0476fce92bcdf70423942
Author: nasir19noor <nasir@nasir.id>
Date:   Tue Jan 14 18:50:59 2025 +0700

    remove backup file

commit 09dd1e12c98f705338d0336b91c6503573b72980
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 17:53:45 2025 +0700

    modify project, bucket in IT

commit 8ec0f2a44ec8c44968e35171705cbc05f0570112
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 15:48:13 2025 +0700

    v2/spanner-to-sourcedb project for IT

commit 63449d9dd171ce3eb0f2e7f41b3bfeefd320dde1
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 14:29:43 2025 +0700

    v2/spanner-to-sourcedb project

commit 603d28f8940e4614aa56d112e9c70db7f5396b74
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 12:37:48 2025 +0700

    spanner-to-sourcedb project

commit f7862507b3807b0ae7f2cdff963f78a22717f2be
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 12:23:05 2025 +0700

    handle only spanner-to-sourcedb project

commit 220d8fb69c59843c4360960fa278aa65cf3d6fb4
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 11:30:33 2025 +0700

    update Run IT Smoke tests ./cicd/run-it-smoke-tests \

commit 4bb4028f27c054c72fb7d2368b3ce4d01e0930a1
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 10:40:49 2025 +0700

    add v2/spanner-to-sourcedb/.mvn

commit 69463e66e649a5503a3c3379a8bf0d4626776248
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 10:08:14 2025 +0700

    update integration test work only spanner-to-sourcedb

commit 6cedb8a058da3c38a7a63be9e2793884a434b088
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 08:02:22 2025 +0700

    remove modules googlecloud-to-googleclou

commit 552a1717e61d4981d073f46d809fc17350a0a2c5
Author: Nasir Noor <nasir@nasir.id>
Date:   Tue Jan 14 07:50:47 2025 +0700

    remove modules keep spanner-to-sourcedb

commit f8a7f5b025eb00f90dec32c68667a35c7f504e31
Author: nasir19noor <nasir@nasir.id>
Date:   Fri Jan 10 17:06:33 2025 +0700

    exclude v1

commit 0e35d9ea0e6374ac9e46668004045492253c22d8
Author: nasir19noor <nasir@nasir.id>
Date:   Fri Jan 10 15:52:05 2025 +0700

    revert back UT and IT

commit 20371fb1519536ed4c9c1a2038e1f0f2c97ca1ca
Author: nasir19noor <nasir@nasir.id>
Date:   Fri Jan 10 14:14:33 2025 +0700

    modify integration smoke test steps to use own bucket, project

commit 47ae923591bf094d7d92e58656862d66e53db405
Author: nasir19noor <nasir@nasir.id>
Date:   Fri Jan 10 08:53:57 2025 +0700

    revert back surefire version

commit 954d5ece807de2026b3a5848b1ee93b10e4db490
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 9 20:33:31 2025 +0700

    remove execution block v1/pom.xml

commit 38747bf2b022b68b787f8d2da684444a6c9c4557
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 9 16:33:52 2025 +0700

    modify surefire version

commit d38a5911ab396183e36de59f29bdd16233d91b0f
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 9 13:46:15 2025 +0700

    remove java-pr copy.yml

commit bf2ec2b2b66496a5d9209294f7f1cda2ad62ca59
Author: nasir19noor <nasir@nasir.id>
Date:   Thu Jan 9 13:06:50 2025 +0700

    update workflow to work only for spanner-to-sourcedb

commit b0d77245087f6ae34961128150f7fdc41cc6d845
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 23:08:27 2025 +0700

    revert back

commit 0ff10d60af04e23de0f7fb06cede9e8e947d505d
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 16:19:26 2025 +0700

    surefire plugin testing

commit 6232d2782f4cbc76a77e49a71316a439619aaf83
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 16:12:21 2025 +0700

    surefire plugin testing

commit 6ed8195e9ec26e192a30d6a7c71e1d1b16c13abf
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 15:14:15 2025 +0700

    revert back main.go

commit 9a0c4a2c4329274a19f610bbc7f1940052e89ad5
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 15:10:42 2025 +0700

    modify cicd/cmd/run-unit-test/main.go for testing

commit db75fa5fb7cd7e217c1115a0f7381a10703adcdf
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 12:27:39 2025 +0700

    revert back

commit b85f4ce132b1bab800c1da01990dda8dd65e7a79
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 09:30:59 2025 +0700

    increase memory for run unit test stage

commit f5a65992ad3c0a12ea77920a0ad5a02d8ddddde7
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 08:23:30 2025 +0700

    revert back

commit 07089020d7eb5639f5a516705266620f3e25838a
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 08:15:31 2025 +0700

    revert back run-unit-test

commit 62965d2a5cf8a65f5395713b8bf5e6b51824d29b
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 08:12:20 2025 +0700

    modify run-unit-test line 45

commit 8d6e777ef1a449206cc31480707ff4dd9d5b85d2
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 08:10:14 2025 +0700

    modify run-unit-test line 43

commit 284603cc17a82de97e5ca0bcc7e0d10f7bacb2fd
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 08:06:29 2025 +0700

    modify run-unit-test

commit 394c477b4bbe5b1c78be85b66b9e6a45d2746195
Author: nasir19noor <nasir@nasir.id>
Date:   Wed Jan 8 07:49:29 2025 +0700

    modify maven surefire plugin

commit d87ccfcda4c4b73719467d055b17ec27b6ede83b
Author: nasir19noor <nasir@nasir.id>
Date:   Tue Jan 7 23:27:38 2025 +0700

    modify maven registry

commit 70761725594fa2df3b2ac0e51b9470cd008495bb
Author: taherkl <taher.lakdawala@ollion.com>
Date:   Tue Jan 7 18:34:18 2025 +0530

    actions change

commit ef5ae8dc4e824698680212612e246c277b178f68
Merge: ae3037a84 23be7bc44
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Tue Jan 7 11:23:23 2025 +0530

    Merge pull request #48 from GoogleCloudPlatform/main

    Metadata config and pipeline options (#2081)

commit ae3037a84925d1b361d3de1f94f2cc8314298397
Merge: 0d140e657 0a9fcec45
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Tue Jan 7 11:05:26 2025 +0530

    Merge pull request #46 from GoogleCloudPlatform/main

    Sync main branch

commit 0d140e6576b2a4599effe51cc24b5c36339fc72e
Merge: 407a59397 5b0c2cdb0
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Thu Jan 2 15:19:25 2025 +0530

    Merge pull request #40 from GoogleCloudPlatform/main

    Sync main branch

commit 407a5939714a6e5b31c8b0cf7b312da3ffdfec47
Merge: e53e8e4ba 587fc05b8
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Mon Dec 30 10:54:16 2024 +0530

    Merge pull request #36 from GoogleCloudPlatform/main

    Sync main branch

commit e53e8e4ba80aeb0708534d8186a13f5f6aa628ea
Merge: f6181286b 177a21877
Author: Akash Thawait <aakash@ollion.com>
Date:   Thu Dec 26 10:54:05 2024 +0530

    Merge pull request #32 from GoogleCloudPlatform/main

    Sync main branch

commit f6181286bc1e0a998cace18e9e2378c9cf8c04bd
Merge: 04bac39ce 8e7ae4f91
Author: Akash Thawait <aakash@ollion.com>
Date:   Mon Dec 23 16:38:26 2024 +0530

    Merge pull request #29 from GoogleCloudPlatform/main

    Use [self-hosted, it] for prepare java cache workflow (#2080)

commit 04bac39ce84a98b0b3c90bd7633556aa3d671aae
Merge: 5aa21dc92 edee6a738
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Fri Dec 20 17:51:12 2024 +0530

    Merge pull request #28 from GoogleCloudPlatform/main

    Sync main branch

commit 5aa21dc921cd63d69115eb8af1a11d05b0427145
Merge: 7512825c0 1bae9ad09
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Wed Dec 18 18:18:41 2024 +0530

    Merge pull request #26 from GoogleCloudPlatform/main

    tests: Adding Forward Migration Tests (#2001)

commit 7512825c027575e8fad1583ac2e2703428099d32
Merge: 71a647741 8479c8a69
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Tue Dec 17 17:59:51 2024 +0530

    Merge pull request #24 from GoogleCloudPlatform/main

    Sync main branch

commit 71a647741039af81c8a3fd26edcc629d3177bab0
Merge: d314c70c6 cd28d010b
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Mon Dec 16 18:33:54 2024 +0530

    Merge pull request #20 from GoogleCloudPlatform/main

    Sync main branch

commit d314c70c62fb1ee680e13dcc7bc4ecca32fc90f0
Merge: 15b621d89 91b5be3b3
Author: Taher Lakdawala <78196491+taherkl@users.noreply.github.com>
Date:   Mon Dec 9 12:02:07 2024 +0530

    Merge pull request #9 from GoogleCloudPlatform/main

    Sync master

commit 15b621d89eb32568805d538185f27cf7bd56a570
Merge: 1bef5ff9e b68fe2173
Author: taherkl <taher.lakdawala@ollion.com>
Date:   Wed Nov 27 20:19:54 2024 +0530

    Merge remote-tracking branch 'upstream/main'
---
 .github/codecov.yml                           |  20 +-
 .github/workflows/java-pr.yml                 |  57 ++--
 cicd/cmd/run-it-tests/main.go                 | 170 +++++-----
 cicd/cmd/run-unit-tests/main.go               |   2 +-
 cicd/internal/flags/it-flags.go               | 313 +++++++++---------
 cicd/internal/flags/lt-flags.go               |   6 +-
 v1/pom.xml                                    |   4 +-
 v2/pom.xml                                    |   2 +-
 .../v2/templates/SpannerToMySqlSourceLT.java  |  21 +-
 .../v2/templates/SpannerToSourceDbLTBase.java |   1 +
 10 files changed, 298 insertions(+), 298 deletions(-)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index f833cc78b7..5656482795 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -16,16 +16,16 @@ component_management:
   - component_id: spanner-templates
     name: spanner-templates
     paths:
-    - "v1/src/main/java/com/google/cloud/teleport/spanner/**"
-    - "v1/src/main/java/com/google/cloud/teleport/templates/SpannerToText.java"
-    - "v1/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java"
-    - "v2/datastream-to-spanner/**"
-    - "v2/spanner-common/**"
-    - "v2/spanner-change-streams-to-sharded-file-sink/**"
-    - "v2/gcs-to-sourcedb/**"
-    - "v2/spanner-migrations-sdk/**"
-    - "v2/spanner-custom-shard/**"
-    - "v2/sourcedb-to-spanner/**"
+    # - "v1/src/main/java/com/google/cloud/teleport/spanner/**"
+    # - "v1/src/main/java/com/google/cloud/teleport/templates/SpannerToText.java"
+    # - "v1/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java"
+    # - "v2/datastream-to-spanner/**"
+    # - "v2/spanner-common/**"
+    # - "v2/spanner-change-streams-to-sharded-file-sink/**"
+    # - "v2/gcs-to-sourcedb/**"
+    # - "v2/spanner-migrations-sdk/**"
+    # - "v2/spanner-custom-shard/**"
+    # - "v2/sourcedb-to-spanner/**"
     - "v2/spanner-to-sourcedb/**"
     statuses:
     - type: project
diff --git a/.github/workflows/java-pr.yml b/.github/workflows/java-pr.yml
index a777e95712..8568eca5db 100644
--- a/.github/workflows/java-pr.yml
+++ b/.github/workflows/java-pr.yml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 # Checks that are intended to run on PRs containing Java code.
 
 name: Java PR
@@ -21,23 +20,12 @@ on:
     branches:
       - 'main'
     paths:
-      - '**.java'
-      - '**.xml'
-      # Include python files and Dockerfiles used for YAML and xlang templates.
-      - '**.py'
-      - 'plugins/core-plugin/src/main/resources/**'
-      # Include relevant GitHub Action files for running these checks.
-      # This will make it easier to verify action changes don't break anything.
+      - 'v2/spanner-to-sourcedb/**.java'
+      - 'v2/spanner-to-sourcedb/**.xml'
+      - 'v2/spanner-to-sourcedb/**.py'
       - '.github/actions/setup-env/*'
       - '.github/workflows/java-pr.yml'
-      # Exclude spanner paths from global run (covered in https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/.github/workflows/spanner-pr.yml)
-      - '!v2/datastream-to-spanner/**'
-      - '!v2/spanner-common/**'
-      - '!v2/spanner-change-streams-to-sharded-file-sink/**'
-      - '!v2/gcs-to-sourcedb/**'
-      - '!v2/spanner-migrations-sdk/**'
-      - '!v2/spanner-custom-shard/**'
-      - '!v2/sourcedb-to-spanner/**'
+      - '!v1/**'      
   schedule:
     - cron: "0 */12 * * *"
   workflow_dispatch:
@@ -47,7 +35,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=error
+  MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=error  
 
 permissions: read-all
 
@@ -103,6 +91,7 @@ jobs:
         uses: ./.github/actions/setup-env
       - name: Run Unit Tests
         run: ./cicd/run-unit-tests
+        # run: mvn -B clean verify -f pom.xml -e -Dcheckstyle.skip -Djib.skip -DskipShade -Dspotless.check.skip -DskipIntegrationTests -fae -T8 --settings=.mvn/settings.xml -pl v2/spanner-to-sourcedb
       - name: Upload Unit Tests Report
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         if: always() # always run even if the previous step fails
@@ -114,7 +103,7 @@ jobs:
         uses: codecov/codecov-action@v4.0.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          slug: GoogleCloudPlatform/DataflowTemplates
+          slug: ollionorg/DataflowTemplates-fork
           files: 'target/site/jacoco-aggregate/jacoco.xml'
           # Temp fix for https://github.com/codecov/codecov-action/issues/1487
           version: v0.6.0
@@ -134,9 +123,9 @@ jobs:
         id: setup-env
         uses: ./.github/actions/setup-env
       - name: Run Integration Smoke Tests
-        run: | 
+        run: |     
           ./cicd/run-it-smoke-tests \
-          --modules-to-build="DEFAULT" \
+          --modules-to-build="v2/spanner-to-sourcedb" \
           --it-region="us-central1" \
           --it-project="cloud-teleport-testing" \
           --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
@@ -164,13 +153,13 @@ jobs:
         id: setup-env
         uses: ./.github/actions/setup-env
       - name: Run Integration Tests
-        run: | 
+        run: |
           ./cicd/run-it-tests \
-          --modules-to-build="DEFAULT" \
-          --it-region="us-central1" \
-          --it-project="cloud-teleport-testing" \
-          --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
-          --it-private-connectivity="datastream-private-connect-us-central1"
+          --modules-to-build="v2/spanner-to-sourcedb" \
+          --it-region="asia-south1" \
+          --it-project="daring-fiber-439305-v4" \
+          --it-artifact-bucket="ollion-teleport-testing" \
+          --it-private-connectivity="datastream-private-connect-asia-south1"
       - name: Upload Integration Tests Report
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         if: always() # always run even if the previous step fails
@@ -182,12 +171,13 @@ jobs:
         uses: ./.github/actions/cleanup-java-env
         if: always()
   java_load_tests_templates:
-    if: contains(github.event.pull_request.labels.*.name, 'run-load-tests')
+    # if: contains(github.event.pull_request.labels.*.name, 'run-load-tests')
     name: Dataflow Templates Load Tests
-    needs: [spotless_check, checkstyle_check, java_build, java_unit_tests, java_integration_tests_templates]
+    needs: [spotless_check, checkstyle_check, java_integration_tests_templates]
+    # needs: [spotless_check, checkstyle_check]    
     timeout-minutes: 600
     # Run on any runner that matches all the specified runs-on values.
-    runs-on: [self-hosted, perf]
+    runs-on: [self-hosted]
     steps:
     - name: Checkout Code
       uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
@@ -197,10 +187,11 @@ jobs:
     - name: Run Load Tests
       run: |
         ./cicd/run-load-tests \
-        --it-region="us-central1" \
-        --it-project="cloud-teleport-testing" \
-        --it-artifact-bucket="cloud-teleport-testing-it-gitactions" \
-        --it-private-connectivity="datastream-private-connect-us-central1"
+        --it-region="asia-south1" \
+        --it-project="daring-fiber-439305-v4" \
+        --it-artifact-bucket="ollion-teleport-testing" \
+        --it-private-connectivity="datastream-private-connect-asia-south1" \
+        --modules-to-build="v2/spanner-to-sourcedb"
     - name: Cleanup Java Environment
       uses: ./.github/actions/cleanup-java-env
       if: always()
diff --git a/cicd/cmd/run-it-tests/main.go b/cicd/cmd/run-it-tests/main.go
index c9f534f528..28b6e4e546 100644
--- a/cicd/cmd/run-it-tests/main.go
+++ b/cicd/cmd/run-it-tests/main.go
@@ -1,85 +1,85 @@
-/*
- * Copyright (C) 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package main
-
-import (
-	"flag"
-	"log"
-
-	"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/flags"
-	"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/workflows"
-)
-
-func main() {
-	flags.RegisterCommonFlags()
-	flags.RegisterItFlags()
-	flag.Parse()
-
-	// Run mvn install before running integration tests
-	mvnFlags := workflows.NewMavenFlags()
-	err := workflows.MvnCleanInstall().Run(
-		mvnFlags.IncludeDependencies(),
-		mvnFlags.IncludeDependents(),
-		mvnFlags.SkipDependencyAnalysis(),
-		mvnFlags.SkipCheckstyle(),
-		mvnFlags.SkipJib(),
-		mvnFlags.SkipTests(),
-		mvnFlags.SkipJacoco(),
-		mvnFlags.SkipShade(),
-		mvnFlags.ThreadCount(8),
-		mvnFlags.InternalMaven())
-	if err != nil {
-		log.Fatalf("%v\n", err)
-	}
-
-	// Run integration tests
-	mvnFlags = workflows.NewMavenFlags()
-	err = workflows.MvnVerify().Run(
-		mvnFlags.IncludeDependencies(),
-		mvnFlags.IncludeDependents(),
-		mvnFlags.SkipDependencyAnalysis(),
-		mvnFlags.SkipCheckstyle(),
-		mvnFlags.SkipJib(),
-		mvnFlags.SkipShade(),
-		mvnFlags.RunIntegrationTests(flags.UnifiedWorkerHarnessContainerImage() != ""),
-		mvnFlags.ThreadCount(4),
-		mvnFlags.IntegrationTestParallelism(3),
-		mvnFlags.StaticBigtableInstance("teleport"),
-		mvnFlags.StaticSpannerInstance("teleport"),
-		mvnFlags.InternalMaven(),
-		flags.Region(),
-		flags.Project(),
-		flags.ArtifactBucket(),
-		flags.StageBucket(),
-		flags.HostIp(),
-		flags.PrivateConnectivity(),
-		flags.SpannerHost(),
-		flags.FailureMode(),
-		flags.RetryFailures(),
-		flags.StaticOracleHost(),
-		flags.StaticOracleSysPassword(),
-		flags.CloudProxyHost(),
-		flags.CloudProxyMySqlPort(),
-		flags.CloudProxyPostgresPort(),
-		flags.CloudProxyPassword(),
-		flags.UnifiedWorkerHarnessContainerImage(),
-		flags.CloudProxyPassword())
-	if err != nil {
-		log.Fatalf("%v\n", err)
-	}
-	log.Println("Build Successful!")
-}
+/*
+ * Copyright (C) 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package main
+
+import (
+	"flag"
+	"log"
+
+	"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/flags"
+	"github.com/GoogleCloudPlatform/DataflowTemplates/cicd/internal/workflows"
+)
+
+func main() {
+	flags.RegisterCommonFlags()
+	flags.RegisterItFlags()
+	flag.Parse()
+
+	// Run mvn install before running integration tests
+	mvnFlags := workflows.NewMavenFlags()
+	err := workflows.MvnCleanInstall().Run(
+		mvnFlags.IncludeDependencies(),
+		mvnFlags.IncludeDependents(),
+		mvnFlags.SkipDependencyAnalysis(),
+		mvnFlags.SkipCheckstyle(),
+		mvnFlags.SkipJib(),
+		mvnFlags.SkipTests(),
+		mvnFlags.SkipJacoco(),
+		mvnFlags.SkipShade(),
+		mvnFlags.ThreadCount(8),
+		mvnFlags.InternalMaven())
+	if err != nil {
+		log.Fatalf("%v\n", err)
+	}
+
+	// Run integration tests
+	mvnFlags = workflows.NewMavenFlags()
+	err = workflows.MvnVerify().Run(
+		mvnFlags.IncludeDependencies(),
+		mvnFlags.IncludeDependents(),
+		mvnFlags.SkipDependencyAnalysis(),
+		mvnFlags.SkipCheckstyle(),
+		mvnFlags.SkipJib(),
+		mvnFlags.SkipShade(),
+		mvnFlags.RunIntegrationTests(flags.UnifiedWorkerHarnessContainerImage() != ""),
+		mvnFlags.ThreadCount(4),
+		mvnFlags.IntegrationTestParallelism(3),
+		// mvnFlags.StaticBigtableInstance("teleport"),
+		mvnFlags.StaticSpannerInstance("spanner-demo"),
+		mvnFlags.InternalMaven(),
+		flags.Region(),
+		flags.Project(),
+		flags.ArtifactBucket(),
+		flags.StageBucket(),
+		flags.HostIp(),
+		flags.PrivateConnectivity(),
+		flags.SpannerHost(),
+		flags.FailureMode(),
+		flags.RetryFailures(),
+		// flags.StaticOracleHost(),
+		// flags.StaticOracleSysPassword(),
+		// flags.CloudProxyHost(),
+		// flags.CloudProxyMySqlPort(),
+		// flags.CloudProxyPostgresPort(),
+		// flags.CloudProxyPassword(),
+		flags.UnifiedWorkerHarnessContainerImage())
+		// flags.CloudProxyPassword())
+	if err != nil {
+		log.Fatalf("%v\n", err)
+	}
+	log.Println("Build Successful!")
+}
diff --git a/cicd/cmd/run-unit-tests/main.go b/cicd/cmd/run-unit-tests/main.go
index cf6b20c3e2..9afdf961ee 100644
--- a/cicd/cmd/run-unit-tests/main.go
+++ b/cicd/cmd/run-unit-tests/main.go
@@ -44,4 +44,4 @@ func main() {
 		log.Fatalf("%v\n", err)
 	}
 	log.Println("Verification Successful!")
-}
+}
\ No newline at end of file
diff --git a/cicd/internal/flags/it-flags.go b/cicd/internal/flags/it-flags.go
index 6937353983..46a0ed2656 100644
--- a/cicd/internal/flags/it-flags.go
+++ b/cicd/internal/flags/it-flags.go
@@ -1,153 +1,160 @@
-/*
- * Copyright (C) 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package flags
-
-import (
-	"flag"
-	"fmt"
-	"os/exec"
-)
-
-// Avoid making these vars public.
-var (
-	dRegion                             string
-	dProject                            string
-	dArtifactBucket                     string
-	dStageBucket                        string
-	dHostIp                             string
-	dPrivateConnectivity                string
-	dSpannerHost                        string
-	dReleaseMode                        bool
-	dRetryFailures                      string
-	dCloudProxyHost                     string
-	dCloudProxyMySqlPort                string
-	dCloudProxyPostgresPort             string
-	dCloudProxyPassword                 string
-	dOracleHost                         string
-	dCloudOracleSysPassword             string
-	dUnifiedWorkerHarnessContainerImage string
-)
-
-// Registers all it flags. Must be called before flag.Parse().
-func RegisterItFlags() {
-	flag.StringVar(&dRegion, "it-region", "", "The GCP region to use for storing test artifacts")
-	flag.StringVar(&dProject, "it-project", "", "The GCP project to run the integration tests in")
-	flag.StringVar(&dArtifactBucket, "it-artifact-bucket", "", "A GCP bucket to store test artifacts")
-	flag.StringVar(&dStageBucket, "it-stage-bucket", "", "(optional) A GCP bucket to stage templates")
-	flag.StringVar(&dHostIp, "it-host-ip", "", "(optional) The ip that the gitactions runner is listening on")
-	flag.StringVar(&dPrivateConnectivity, "it-private-connectivity", "", "(optional) A GCP private connectivity endpoint")
-	flag.StringVar(&dSpannerHost, "it-spanner-host", "", "(optional) A custom endpoint to override Spanner API requests")
-	flag.BoolVar(&dReleaseMode, "it-release", false, "(optional) Set if tests are being executed for a release")
-	flag.StringVar(&dRetryFailures, "it-retry-failures", "0", "Number of retries attempts for failing tests")
-	flag.StringVar(&dCloudProxyHost, "it-cloud-proxy-host", "10.128.0.34", "Hostname or IP address of static Cloud Auth Proxy")
-	flag.StringVar(&dCloudProxyMySqlPort, "it-cloud-proxy-mysql-port", "33134", "MySql port number on static Cloud Auth Proxy")
-	flag.StringVar(&dCloudProxyPostgresPort, "it-cloud-proxy-postgres-port", "33136", "Postgres port number on static Cloud Auth Proxy")
-	flag.StringVar(&dCloudProxyPassword, "it-cloud-proxy-password", "t>5xl%J(&qTK6?FaZ", "Password of static Cloud Auth Proxy")
-	flag.StringVar(&dOracleHost, "it-oracle-host", "10.128.0.90", "Hostname or IP address of static Oracle DB")
-	flag.StringVar(&dCloudOracleSysPassword, "it-oracle-sys-password", "oracle", "sys password of static Oracle DB")
-	flag.StringVar(&dUnifiedWorkerHarnessContainerImage, "it-unified-worker-harness-container-image", "", "Runner harness image to run tests against")
-}
-
-func Region() string {
-	return "-Dregion=" + dRegion
-}
-
-func Project() string {
-	return "-Dproject=" + dProject
-}
-
-func ArtifactBucket() string {
-	return "-DartifactBucket=" + dArtifactBucket
-}
-
-func StageBucket() string {
-	if dStageBucket == "" {
-		return "-DstageBucket=" + dArtifactBucket
-	}
-	return "-DstageBucket=" + dStageBucket
-}
-
-func HostIp() string {
-	if len(dHostIp) == 0 {
-		gcloudCmd := "gcloud compute instances list | grep $(hostname) | awk '{print $4}'"
-		if hostIP, err := exec.Command("bash", "-c", gcloudCmd).Output(); err != nil || len(hostIP) == 0 {
-			panic(fmt.Errorf("failed to get gitactions runner host ip: %v", err))
-		} else {
-			return "-DhostIp=" + string(hostIP)[:len(hostIP)-1]
-		}
-	}
-	return "-DhostIp=" + dHostIp
-}
-
-func PrivateConnectivity() string {
-	if dPrivateConnectivity != "" {
-		return "-DprivateConnectivity=" + dPrivateConnectivity
-	}
-	return ""
-}
-
-func SpannerHost() string {
-	if dSpannerHost != "" {
-		return "-DspannerHost=" + dSpannerHost
-	}
-	return ""
-}
-
-func FailureMode() string {
-	// Fail releases fast
-	if dReleaseMode {
-		return "-ff"
-	}
-
-	// Fail PRs at the end
-	return "-fae"
-}
-
-func RetryFailures() string {
-	return "-Dsurefire.rerunFailingTestsCount=" + dRetryFailures
-}
-
-func CloudProxyHost() string {
-	return "-DcloudProxyHost=" + dCloudProxyHost
-}
-
-func CloudProxyMySqlPort() string {
-	return "-DcloudProxyMySqlPort=" + dCloudProxyMySqlPort
-}
-
-func CloudProxyPostgresPort() string {
-	return "-DcloudProxyPostgresPort=" + dCloudProxyPostgresPort
-}
-
-func CloudProxyPassword() string {
-	return "-DcloudProxyPassword=" + dCloudProxyPassword
-}
-
-func StaticOracleHost() string {
-	return "-DcloudOracleHost=" + dOracleHost
-}
-
-func StaticOracleSysPassword() string {
-	return "-DcloudOracleSysPassword=" + dCloudOracleSysPassword
-}
-
-func UnifiedWorkerHarnessContainerImage() string {
-	if dUnifiedWorkerHarnessContainerImage != "" {
-		return "-DunifiedWorkerHarnessContainerImage=" + dUnifiedWorkerHarnessContainerImage
-	}
-	return ""
-}
+/*
+ * Copyright (C) 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package flags
+
+import (
+	"flag"
+	"fmt"
+	"os/exec"
+)
+
+// Avoid making these vars public.
+var (
+	dRegion                             string
+	dProject                            string
+	dArtifactBucket                     string
+	dStageBucket                        string
+	dHostIp                             string
+	dPrivateConnectivity                string
+	dSpannerHost                        string
+	dReleaseMode                        bool
+	dRetryFailures                      string
+	dCloudProxyHost                     string
+	dCloudProxyMySqlPort                string
+	dCloudProxyPostgresPort             string
+	dCloudProxyPassword                 string
+	dOracleHost                         string
+	dCloudOracleSysPassword             string
+	dUnifiedWorkerHarnessContainerImage string
+)
+
+// Registers all it flags. Must be called before flag.Parse().
+func RegisterItFlags() {
+	flag.StringVar(&dRegion, "it-region", "", "The GCP region to use for storing test artifacts")
+	flag.StringVar(&dProject, "it-project", "", "The GCP project to run the integration tests in")
+	flag.StringVar(&dArtifactBucket, "it-artifact-bucket", "", "A GCP bucket to store test artifacts")
+	flag.StringVar(&dStageBucket, "it-stage-bucket", "", "(optional) A GCP bucket to stage templates")
+	flag.StringVar(&dHostIp, "it-host-ip", "", "(optional) The ip that the gitactions runner is listening on")
+	flag.StringVar(&dPrivateConnectivity, "it-private-connectivity", "", "(optional) A GCP private connectivity endpoint")
+	flag.StringVar(&dSpannerHost, "it-spanner-host", "", "(optional) A custom endpoint to override Spanner API requests")
+	flag.BoolVar(&dReleaseMode, "it-release", false, "(optional) Set if tests are being executed for a release")
+	flag.StringVar(&dRetryFailures, "it-retry-failures", "0", "Number of retries attempts for failing tests")
+	flag.StringVar(&dCloudProxyHost, "it-cloud-proxy-host", "10.128.0.34", "Hostname or IP address of static Cloud Auth Proxy")
+	flag.StringVar(&dCloudProxyMySqlPort, "it-cloud-proxy-mysql-port", "33134", "MySql port number on static Cloud Auth Proxy")
+	flag.StringVar(&dCloudProxyPostgresPort, "it-cloud-proxy-postgres-port", "33136", "Postgres port number on static Cloud Auth Proxy")
+	flag.StringVar(&dCloudProxyPassword, "it-cloud-proxy-password", "t>5xl%J(&qTK6?FaZ", "Password of static Cloud Auth Proxy")
+	flag.StringVar(&dOracleHost, "it-oracle-host", "10.128.0.90", "Hostname or IP address of static Oracle DB")
+	flag.StringVar(&dCloudOracleSysPassword, "it-oracle-sys-password", "oracle", "sys password of static Oracle DB")
+	flag.StringVar(&dUnifiedWorkerHarnessContainerImage, "it-unified-worker-harness-container-image", "", "Runner harness image to run tests against")
+}
+
+func Region() string {
+	return "-Dregion=" + dRegion
+}
+
+func Project() string {
+	return "-Dproject=" + dProject
+}
+
+func ArtifactBucket() string {
+	return "-DartifactBucket=" + dArtifactBucket
+}
+
+func StageBucket() string {
+	if dStageBucket == "" {
+		return "-DstageBucket=" + dArtifactBucket
+	}
+	return "-DstageBucket=" + dStageBucket
+}
+
+func HostIp() string {
+	if len(dHostIp) == 0 {
+		gcloudCmd := "gcloud compute instances list | grep $(hostname) | awk '{print $4}'"
+		if hostIP, err := exec.Command("bash", "-c", gcloudCmd).Output(); err != nil || len(hostIP) == 0 {
+			panic(fmt.Errorf("failed to get gitactions runner host ip: %v", err))
+		} else {
+			return "-DhostIp=" + string(hostIP)[:len(hostIP)-1]
+		}
+	}
+	return "-DhostIp=" + dHostIp
+}
+
+// func HostIp() string {
+// 	if len(dHostIp) == 0 {
+// 		return "-DhostIp=34.47.164.248"
+// 	}
+// 	return "-DhostIp=" + dHostIp
+// }
+
+func PrivateConnectivity() string {
+	if dPrivateConnectivity != "" {
+		return "-DprivateConnectivity=" + dPrivateConnectivity
+	}
+	return ""
+}
+
+func SpannerHost() string {
+	if dSpannerHost != "" {
+		return "-DspannerHost=" + dSpannerHost
+	}
+	return ""
+}
+
+func FailureMode() string {
+	// Fail releases fast
+	if dReleaseMode {
+		return "-ff"
+	}
+
+	// Fail PRs at the end
+	return "-fae"
+}
+
+func RetryFailures() string {
+	return "-Dsurefire.rerunFailingTestsCount=" + dRetryFailures
+}
+
+func CloudProxyHost() string {
+	return "-DcloudProxyHost=" + dCloudProxyHost
+}
+
+func CloudProxyMySqlPort() string {
+	return "-DcloudProxyMySqlPort=" + dCloudProxyMySqlPort
+}
+
+func CloudProxyPostgresPort() string {
+	return "-DcloudProxyPostgresPort=" + dCloudProxyPostgresPort
+}
+
+func CloudProxyPassword() string {
+	return "-DcloudProxyPassword=" + dCloudProxyPassword
+}
+
+func StaticOracleHost() string {
+	return "-DcloudOracleHost=" + dOracleHost
+}
+
+func StaticOracleSysPassword() string {
+	return "-DcloudOracleSysPassword=" + dCloudOracleSysPassword
+}
+
+func UnifiedWorkerHarnessContainerImage() string {
+	if dUnifiedWorkerHarnessContainerImage != "" {
+		return "-DunifiedWorkerHarnessContainerImage=" + dUnifiedWorkerHarnessContainerImage
+	}
+	return ""
+}
diff --git a/cicd/internal/flags/lt-flags.go b/cicd/internal/flags/lt-flags.go
index b8c73b98cb..d94a715567 100644
--- a/cicd/internal/flags/lt-flags.go
+++ b/cicd/internal/flags/lt-flags.go
@@ -29,9 +29,9 @@ var (
 
 // Registers all common flags. Must be called before flag.Parse().
 func RegisterLtFlags() {
-	flag.StringVar(&dexportProject, "lt-export-project", "", "The GCP project to export load test metrics")
-	flag.StringVar(&dexportDataset, "lt-export-dataset", "", "The GCP BigQuery dataset to export metrics")
-	flag.StringVar(&dexportTable, "lt-export-table", "", "A GCP BigQuery table to store metrics")
+	flag.StringVar(&dexportProject, "lt-export-project", "daring-fiber-439305-v4", "The GCP project to export load test metrics")
+	flag.StringVar(&dexportDataset, "lt-export-dataset", "rr", "The GCP BigQuery dataset to export metrics")
+	flag.StringVar(&dexportTable, "lt-export-table", "rr", "A GCP BigQuery table to store metrics")
 }
 
 func ExportProject() string {
diff --git a/v1/pom.xml b/v1/pom.xml
index f329ac49ef..695c793d94 100644
--- a/v1/pom.xml
+++ b/v1/pom.xml
@@ -928,7 +928,7 @@
               <goal>report</goal>
             </goals>
           </execution>
-          <execution>
+          <!-- <execution>
             <id>default-check</id>
             <goals>
               <goal>check</goal>
@@ -951,7 +951,7 @@
                 </rule>
               </rules>
             </configuration>
-          </execution>
+          </execution> -->
         </executions>
       </plugin>
     </plugins>
diff --git a/v2/pom.xml b/v2/pom.xml
index ae9308ea27..a28c6fdd89 100644
--- a/v2/pom.xml
+++ b/v2/pom.xml
@@ -720,7 +720,7 @@
         <module>spanner-change-streams-to-sharded-file-sink</module>
         <module>spanner-common</module>
         <module>spanner-custom-shard</module>
-        <module>spanner-migrations-sdk</module>
+        <module>spanner-migrations-sdk</module> 
         <module>spanner-to-sourcedb</module>
         <module>sqlserver-to-googlecloud</module>
         <module>streaming-data-generator</module>
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToMySqlSourceLT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToMySqlSourceLT.java
index 9557e6d3ba..3499fab942 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToMySqlSourceLT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToMySqlSourceLT.java
@@ -56,8 +56,8 @@ public class SpannerToMySqlSourceLT extends SpannerToSourceDbLTBase {
   private final String dataGeneratorSchemaResource =
       "SpannerToMySqlSourceLT/datagenerator-schema.json";
   private final String table = "Person";
-  private final int maxWorkers = 50;
-  private final int numWorkers = 20;
+  private final int maxWorkers = 3;
+  private final int numWorkers = 2;
   private PipelineLauncher.LaunchInfo jobInfo;
   private PipelineLauncher.LaunchInfo readerJobInfo;
   private final int numShards = 1;
@@ -90,30 +90,30 @@ public void reverseReplication1KTpsLoadTest()
     // Start data generator
     DataGenerator dataGenerator =
         DataGenerator.builderWithSchemaLocation(testName, generatorSchemaPath)
-            .setQPS("1000")
-            .setMessagesLimit(String.valueOf(300000))
+            .setQPS("10")
+            .setMessagesLimit(String.valueOf(100))
             .setSpannerInstanceName(spannerResourceManager.getInstanceId())
             .setSpannerDatabaseName(spannerResourceManager.getDatabaseId())
             .setSpannerTableName(table)
-            .setNumWorkers("50")
-            .setMaxNumWorkers("100")
+            .setNumWorkers("2")
+            .setMaxNumWorkers("3")
             .setSinkType("SPANNER")
             .setProjectId(project)
             .setBatchSizeBytes("0")
             .build();
 
-    dataGenerator.execute(Duration.ofMinutes(90));
+    dataGenerator.execute(Duration.ofMinutes(10));
     assertThatPipeline(jobInfo).isRunning();
 
     JDBCRowsCheck check =
         JDBCRowsCheck.builder(jdbcResourceManagers.get(0), table)
-            .setMinRows(300000)
-            .setMaxRows(300000)
+            .setMinRows(100)
+            .setMaxRows(100)
             .build();
 
     PipelineOperator.Result result =
         pipelineOperator.waitForCondition(
-            createConfig(jobInfo, Duration.ofMinutes(10), Duration.ofSeconds(30)), check);
+            createConfig(jobInfo, Duration.ofMinutes(5), Duration.ofSeconds(30)), check);
 
     // Assert Conditions
     assertThatResult(result).meetsConditions();
@@ -124,6 +124,7 @@ public void reverseReplication1KTpsLoadTest()
     assertThatResult(result1).isLaunchFinished();
 
     exportMetrics(jobInfo, numShards);
+    // exportMetrics(jobInfo, numShards, "daring-fiber-439305-v4", "rr");
   }
 
   private void createMySQLSchema(List<JDBCResourceManager> jdbcResourceManagers) {
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java
index 43c0453adf..5e6989ba0e 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java
@@ -270,6 +270,7 @@ public void exportMetrics(PipelineLauncher.LaunchInfo jobInfo, int numShards)
 
     // export results
     exportMetricsToBigQuery(jobInfo, metrics);
+    // exportMetrics(jobInfo, numShards, "daring-fiber-439305-v4", "rr");
   }
 
   public void getResourceManagerMetrics(Map<String, Double> metrics) {

From eeed2409c453104012f4ecbd33afd82c25eb0b66 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 17:30:31 +0530
Subject: [PATCH 35/56] Added Dependecy Fixes

---
 v2/spanner-to-sourcedb/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/v2/spanner-to-sourcedb/pom.xml b/v2/spanner-to-sourcedb/pom.xml
index 2b5b1adeb6..3f2ac2da1d 100644
--- a/v2/spanner-to-sourcedb/pom.xml
+++ b/v2/spanner-to-sourcedb/pom.xml
@@ -106,10 +106,21 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-core</artifactId>
+            <version>LATEST</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.beam</groupId>
             <artifactId>beam-it-cassandra</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.datastax.cassandra</groupId>
+                    <artifactId>cassandra-driver-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

From 28721df1cc74e7b19c0d09258925e263b84df7b9 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 18:19:12 +0530
Subject: [PATCH 36/56] Added Depedency

---
 v2/spanner-to-sourcedb/pom.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/v2/spanner-to-sourcedb/pom.xml b/v2/spanner-to-sourcedb/pom.xml
index 3f2ac2da1d..360d6f7d59 100644
--- a/v2/spanner-to-sourcedb/pom.xml
+++ b/v2/spanner-to-sourcedb/pom.xml
@@ -106,21 +106,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.datastax.cassandra</groupId>
-            <artifactId>cassandra-driver-core</artifactId>
-            <version>LATEST</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.beam</groupId>
             <artifactId>beam-it-cassandra</artifactId>
+            <version>2.60.0</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.datastax.cassandra</groupId>
-                    <artifactId>cassandra-driver-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 

From bd8b2acd436e957ee4f6469472bd1981ab98f296 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Mon, 20 Jan 2025 18:24:39 +0530
Subject: [PATCH 37/56] exclude driver

---
 v2/spanner-to-sourcedb/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/v2/spanner-to-sourcedb/pom.xml b/v2/spanner-to-sourcedb/pom.xml
index 360d6f7d59..6e790693cb 100644
--- a/v2/spanner-to-sourcedb/pom.xml
+++ b/v2/spanner-to-sourcedb/pom.xml
@@ -109,8 +109,13 @@
         <dependency>
             <groupId>org.apache.beam</groupId>
             <artifactId>beam-it-cassandra</artifactId>
-            <version>2.60.0</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.datastax.cassandra</groupId>
+                    <artifactId>cassandra-driver-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

From 87caa518185224c0318b3dbb1f598a937224d127 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Tue, 21 Jan 2025 11:18:15 +0530
Subject: [PATCH 38/56] Removed Unwanted LOG Integration

---
 .../v2/templates/SpannerToCassandraSourceDbDatatypeIT.java   | 5 -----
 .../teleport/v2/templates/SpannerToCassandraSourceLT.java    | 3 ---
 .../teleport/v2/templates/SpannerToSourceDbCassandraIT.java  | 3 ---
 3 files changed, 11 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
index d758520c35..e81a407913 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
@@ -53,17 +53,12 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.junit.runners.model.MultipleFailureException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDbCassandraIT.class)
 @RunWith(JUnit4.class)
 public class SpannerToCassandraSourceDbDatatypeIT extends SpannerToCassandraDbITBase {
 
-  private static final Logger LOG =
-      LoggerFactory.getLogger(SpannerToCassandraSourceDbDatatypeIT.class);
-
   private static final String SPANNER_DDL_RESOURCE =
       "SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql";
   private static final String SESSION_FILE_RESOURCE =
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
index 1f90f32e4a..900edbc656 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java
@@ -34,15 +34,12 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.shaded.com.google.common.io.Resources;
 
 @Category(TemplateLoadTest.class)
 @TemplateLoadTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
 public class SpannerToCassandraSourceLT extends SpannerToCassandraLTBase {
-  private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraSourceLT.class);
 
   private String generatorSchemaPath;
   private final String artifactBucket = TestProperties.artifactBucket();
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 039091ac87..e1cf9c2a13 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -46,14 +46,11 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDbCassandraIT.class)
 @RunWith(JUnit4.class)
 public class SpannerToSourceDbCassandraIT extends SpannerToCassandraDbITBase {
-  private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbCassandraIT.class);
 
   private static final String SPANNER_DDL_RESOURCE =
       "SpannerToCassandraSourceIT/spanner-schema.sql";

From 671eecb986cb6cafc21a6051af0c319b605cb805 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Tue, 21 Jan 2025 11:27:06 +0530
Subject: [PATCH 39/56] Added Template Class Fixes

---
 .../v2/templates/SpannerToCassandraSourceDbDatatypeIT.java      | 2 +-
 .../teleport/v2/templates/SpannerToSourceDbCassandraIT.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
index e81a407913..b7fade478d 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
@@ -55,7 +55,7 @@
 import org.junit.runners.model.MultipleFailureException;
 
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
-@TemplateIntegrationTest(SpannerToSourceDbCassandraIT.class)
+@TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
 public class SpannerToCassandraSourceDbDatatypeIT extends SpannerToCassandraDbITBase {
 
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index e1cf9c2a13..419570ff80 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -48,7 +48,7 @@
 import org.junit.runners.JUnit4;
 
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
-@TemplateIntegrationTest(SpannerToSourceDbCassandraIT.class)
+@TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
 public class SpannerToSourceDbCassandraIT extends SpannerToCassandraDbITBase {
 

From a40ba6d8827844837601281056f4b2b8c181cfac Mon Sep 17 00:00:00 2001
From: Akash Thawait <aakash@ollion.com>
Date: Tue, 21 Jan 2025 13:18:18 +0530
Subject: [PATCH 40/56] Updated command on  java-pr.yml

---
 .github/workflows/java-pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/java-pr.yml b/.github/workflows/java-pr.yml
index 8568eca5db..03bf0869c9 100644
--- a/.github/workflows/java-pr.yml
+++ b/.github/workflows/java-pr.yml
@@ -90,8 +90,8 @@ jobs:
         id: setup-env
         uses: ./.github/actions/setup-env
       - name: Run Unit Tests
-        run: ./cicd/run-unit-tests
-        # run: mvn -B clean verify -f pom.xml -e -Dcheckstyle.skip -Djib.skip -DskipShade -Dspotless.check.skip -DskipIntegrationTests -fae -T8 --settings=.mvn/settings.xml -pl v2/spanner-to-sourcedb
+        # run: ./cicd/run-unit-tests
+        run: mvn -B clean verify -f pom.xml -e -Dcheckstyle.skip -Djib.skip -DskipShade -Dspotless.check.skip -DskipIntegrationTests -fae -T8 --settings=.mvn/settings.xml -pl v2/spanner-to-sourcedb -am
       - name: Upload Unit Tests Report
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         if: always() # always run even if the previous step fails

From e1165cd8948e553a1a829c3c39bbf929f018394b Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Tue, 21 Jan 2025 15:01:22 +0530
Subject: [PATCH 41/56] reverse merge with main and load Resourfce

---
 .../dbutils/dml/CassandraDMLGenerator.java    | 49 +++++++++++--------
 .../processor/InputRecordProcessor.java       |  8 +++
 .../templates/SpannerToCassandraDbITBase.java | 22 ++++++---
 .../SpannerToSourceDbCassandraIT.java         |  2 +-
 .../dbutils/dml/CassandraTypeHandlerTest.java | 41 ----------------
 5 files changed, 53 insertions(+), 69 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index 330e06885a..f9e13af237 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -25,12 +25,13 @@
 import com.google.cloud.teleport.v2.templates.models.DMLGeneratorResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementGeneratedResponse;
 import com.google.cloud.teleport.v2.templates.models.PreparedStatementValueObject;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -166,9 +167,11 @@ private static DMLGeneratorResponse generatorDMLResponse(
             dmlGeneratorRequest.getNewValuesJson(),
             dmlGeneratorRequest.getKeyValuesJson(),
             dmlGeneratorRequest.getSourceDbTimezoneOffset());
-    List<Map.Entry<String, PreparedStatementValueObject<?>>> allColumnNamesAndValues =
-        Stream.concat(pkColumnNameValues.entrySet().stream(), columnNameValues.entrySet().stream())
-            .collect(Collectors.toList());
+    Map<String, PreparedStatementValueObject<?>> allColumnNamesAndValues =
+        ImmutableMap.<String, PreparedStatementValueObject<?>>builder()
+            .putAll(pkColumnNameValues)
+            .putAll(columnNameValues)
+            .build();
     switch (modType) {
       case "INSERT":
       case "UPDATE":
@@ -202,21 +205,25 @@ private static DMLGeneratorResponse generatorDMLResponse(
   private static DMLGeneratorResponse getUpsertStatementCQL(
       String tableName,
       java.sql.Timestamp timestamp,
-      List<Map.Entry<String, PreparedStatementValueObject<?>>> allColumnNamesAndValues) {
+      Map<String, PreparedStatementValueObject<?>> allColumnNamesAndValues) {
 
     String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
+
     String allColumns =
-        allColumnNamesAndValues.stream()
-            .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\"")
+        allColumnNamesAndValues.keySet().stream()
+            .map(columnName -> "\"" + columnName.replace("\"", "\"\"") + "\"")
             .collect(Collectors.joining(", "));
+
     String placeholders =
-        allColumnNamesAndValues.stream().map(entry -> "?").collect(Collectors.joining(", "));
+        allColumnNamesAndValues.keySet().stream()
+            .map(columnName -> "?")
+            .collect(Collectors.joining(", "));
 
     List<PreparedStatementValueObject<?>> values =
-        allColumnNamesAndValues.stream().map(Map.Entry::getValue).collect(Collectors.toList());
+        new ArrayList<>(allColumnNamesAndValues.values());
 
-    PreparedStatementValueObject<java.sql.Timestamp> timestampObj =
-        PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
+    PreparedStatementValueObject<Long> timestampObj =
+        PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp.getTime());
     values.add(timestampObj);
 
     String preparedStatement =
@@ -246,28 +253,28 @@ private static DMLGeneratorResponse getUpsertStatementCQL(
   private static DMLGeneratorResponse getDeleteStatementCQL(
       String tableName,
       java.sql.Timestamp timestamp,
-      List<Map.Entry<String, PreparedStatementValueObject<?>>> allColumnNamesAndValues) {
+      Map<String, PreparedStatementValueObject<?>> allColumnNamesAndValues) {
 
     String escapedTableName = "\"" + tableName.replace("\"", "\"\"") + "\"";
 
     String deleteConditions =
-        allColumnNamesAndValues.stream()
-            .map(entry -> "\"" + entry.getKey().replace("\"", "\"\"") + "\" = ?")
+        allColumnNamesAndValues.keySet().stream()
+            .map(columnName -> "\"" + columnName.replace("\"", "\"\"") + "\" = ?")
             .collect(Collectors.joining(" AND "));
 
     List<PreparedStatementValueObject<?>> values =
-        allColumnNamesAndValues.stream().map(Map.Entry::getValue).collect(Collectors.toList());
-
-    String preparedStatement =
-        String.format(
-            "DELETE FROM %s USING TIMESTAMP ? WHERE %s", escapedTableName, deleteConditions);
+        new ArrayList<>(allColumnNamesAndValues.values());
 
     if (timestamp != null) {
-      PreparedStatementValueObject<java.sql.Timestamp> timestampObj =
-          PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp);
+      PreparedStatementValueObject<Long> timestampObj =
+          PreparedStatementValueObject.create("USING_TIMESTAMP", timestamp.getTime());
       values.add(0, timestampObj);
     }
 
+    String preparedStatement =
+        String.format(
+            "DELETE FROM %s USING TIMESTAMP ? WHERE %s", escapedTableName, deleteConditions);
+
     return new PreparedStatementGeneratedResponse(preparedStatement, values);
   }
 
diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
index 5be32bf681..6ea5047c6a 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/processor/InputRecordProcessor.java
@@ -108,6 +108,14 @@ public static boolean processRecord(
       }
       // TODO we need to handle it as proper Interface Level as of now we have handle Prepared
       // TODO Statement and Raw Statement Differently
+      /*
+       * TODO:
+       * Note: The `SOURCE_CASSANDRA` case not covered in the unit tests.
+       * Answer: Currently, we have implemented unit tests for the Input Record Processor under the SourceWrittenFn.
+       *         These tests cover the majority of scenarios, but they are tightly coupled with the existing code.
+       *         Adding unit tests for SOURCE_CASSANDRA would require a significant refactoring of the entire unit test file.
+       *         Given the current implementation, such refactoring is deemed unnecessary as it would not provide substantial value or impact.
+       */
       switch (source) {
         case SOURCE_CASSANDRA:
           dao.write(dmlGeneratorResponse);
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
index 0f5264400a..3b3b2d6949 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -21,10 +21,10 @@
 import com.google.common.io.Resources;
 import com.google.pubsub.v1.SubscriptionName;
 import com.google.pubsub.v1.TopicName;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -95,14 +95,23 @@ public SubscriptionName createPubsubResources(
   public void createAndUploadCassandraConfigToGcs(
       GcsResourceManager gcsResourceManager, CassandraResourceManager cassandraResourceManagers)
       throws IOException {
+
     String host = cassandraResourceManagers.getHost();
     int port = cassandraResourceManagers.getPort();
     String keyspaceName = cassandraResourceManagers.getKeyspaceName();
 
-    String cassandraConfigContents =
-        new String(
-            Files.readAllBytes(
-                Paths.get("SpannerToCassandraSourceIT/cassandra-config-template.conf")));
+    String cassandraConfigContents;
+    try (InputStream inputStream =
+        Thread.currentThread()
+            .getContextClassLoader()
+            .getResourceAsStream("SpannerToCassandraSourceIT/cassandra-config-template.conf")) {
+      if (inputStream == null) {
+        throw new FileNotFoundException(
+            "Resource file not found: SpannerToCassandraSourceIT/cassandra-config-template.conf");
+      }
+      cassandraConfigContents = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
+    }
+
     cassandraConfigContents =
         cassandraConfigContents
             .replace("##host##", host)
@@ -110,6 +119,7 @@ public void createAndUploadCassandraConfigToGcs(
             .replace("##keyspace##", keyspaceName);
 
     LOG.info("Cassandra file contents: {}", cassandraConfigContents);
+
     gcsResourceManager.createArtifact("input/cassandra-config.conf", cassandraConfigContents);
   }
 
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 419570ff80..7409868999 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -83,13 +83,13 @@ public void setUp() throws IOException {
         spannerMetadataResourceManager = createSpannerMetadataDatabase();
 
         cassandraResourceManager = CassandraResourceManager.builder(testName).build();
+        createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
 
         createCassandraSchema(cassandraResourceManager, CASSANDRA_SCHEMA_FILE_RESOURCE);
 
         gcsResourceManager =
             GcsResourceManager.builder(artifactBucketName, getClass().getSimpleName(), credentials)
                 .build();
-        createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
         gcsResourceManager.uploadArtifact(
             "input/session.json", Resources.getResource(SESSION_FILE_RESOURCE).getPath());
         pubsubResourceManager = setUpPubSubResourceManager();
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
index c3e4aff6cb..c19319a5b3 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandlerTest.java
@@ -74,7 +74,6 @@ public void testGetColumnValueByTypeForString() {
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, sourceDbTimezoneOffset);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
-    assertNotNull(castResult);
     assertEquals("test_value", castResult);
   }
 
@@ -100,7 +99,6 @@ public void testGetColumnValueByType() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("é", castResult);
   }
 
@@ -124,7 +122,6 @@ public void testGetColumnValueByTypeForNonString() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(12345, castResult);
   }
 
@@ -147,7 +144,6 @@ public void testGetColumnValueByTypeForStringUUID() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(UUID.fromString(columnValue), castResult);
   }
 
@@ -170,7 +166,6 @@ public void testGetColumnValueByTypeForStringIpAddress() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(InetAddresses.forString(columnValue), castResult);
   }
 
@@ -193,7 +188,6 @@ public void testGetColumnValueByTypeForStringJsonArray() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
     Set<String> expectedSet = new HashSet<>(Arrays.asList("apple", "banana", "cherry"));
-    assertNotNull(castResult);
     assertEquals(expectedSet, castResult);
   }
 
@@ -216,8 +210,6 @@ public void testGetColumnValueByTypeForStringJsonObject() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
-
     Map<String, String> expectedMap = new HashMap<>();
     expectedMap.put("name", "John");
     expectedMap.put("age", "30");
@@ -243,8 +235,6 @@ public void testGetColumnValueByTypeForStringHex() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
-
     byte[] actualBytes;
     if (castResult instanceof ByteBuffer) {
       ByteBuffer byteBuffer = (ByteBuffer) castResult;
@@ -284,7 +274,6 @@ public void testGetColumnValueByTypeForStringDuration() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("P4DT1H", castResult.toString());
   }
 
@@ -307,7 +296,6 @@ public void testGetColumnValueByTypeForDates() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     ZonedDateTime expectedDate = ZonedDateTime.parse(columnValue).withSecond(0).withNano(0);
     Instant instant = (Instant) castResult;
     ZonedDateTime actualDate = instant.atZone(ZoneOffset.UTC).withSecond(0).withNano(0);
@@ -332,7 +320,6 @@ public void testGetColumnValueByTypeForBigInt() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     Long expectedBigInt = 123456789L;
 
     assertEquals(expectedBigInt, castResult);
@@ -356,7 +343,6 @@ public void testGetColumnValueByTypeForBytesForHexString() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("48656c6c6f20576f726c64", castResult);
   }
 
@@ -378,7 +364,6 @@ public void testGetColumnValueByTypeForBigIntForString() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     long expectedValue = 123456789L;
     assertEquals(expectedValue, castResult);
   }
@@ -401,7 +386,6 @@ public void testGetColumnValueByTypeForBoolentForString() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(true, castResult);
   }
 
@@ -423,7 +407,6 @@ public void testGetColumnValueByTypeForBoolent() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(true, castResult);
   }
 
@@ -445,7 +428,6 @@ public void testGetColumnValueByTypeForIntegerValue() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     long expectedValue = 225000L;
     assertEquals(expectedValue, castResult);
   }
@@ -468,7 +450,6 @@ public void testGetColumnValueByTypeForBoolentSamllCaseForString() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(false, castResult);
   }
 
@@ -491,7 +472,6 @@ public void testGetColumnValueByTypeForInteger() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(BigInteger.valueOf(5), castResult);
   }
 
@@ -512,7 +492,6 @@ public void testGetColumnValueByTypeForValidBigInteger() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(BigInteger.valueOf(5), castResult);
   }
 
@@ -534,7 +513,6 @@ public void testConvertToCassandraTimestampWithISOInstant() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     LocalDate expectedValue = Instant.parse(timestamp).atZone(ZoneId.systemDefault()).toLocalDate();
     assertEquals(expectedValue, castResult);
   }
@@ -557,7 +535,6 @@ public void testConvertToCassandraTimestampWithISODateTime() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("2025-01-15T00:00:00Z", castResult.toString());
   }
 
@@ -579,7 +556,6 @@ public void testConvertToCassandraTimestampWithISODate() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals(timestamp, castResult.toString());
   }
 
@@ -601,7 +577,6 @@ public void testConvertToCassandraTimestampWithCustomFormat1() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("2025-01-15", castResult.toString());
   }
 
@@ -623,7 +598,6 @@ public void testConvertToCassandraTimestampWithCustomFormat2() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("2025-01-15", castResult.toString());
   }
 
@@ -645,7 +619,6 @@ public void testConvertToCassandraTimestampWithCustomFormat3() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("2025-01-15", castResult.toString());
   }
 
@@ -667,7 +640,6 @@ public void testConvertToCassandraTimestampWithCustomFormat4() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("2025-01-15", castResult.toString());
   }
 
@@ -689,7 +661,6 @@ public void testConvertToCassandraTimestampWithCustomFormat5() {
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
 
-    assertNotNull(castResult);
     assertEquals("2025-01-15", castResult.toString());
   }
 
@@ -772,7 +743,6 @@ public void testGetColumnValueByTypeForFloat() {
 
     Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object actualValue = ((PreparedStatementValueObject<?>) result).value();
@@ -794,7 +764,6 @@ public void testGetColumnValueByTypeForFloat64() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -817,7 +786,6 @@ public void testGetColumnValueByTypeForFloat64FromString() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -840,7 +808,6 @@ public void testGetColumnValueByTypeForDecimalFromString() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -863,7 +830,6 @@ public void testGetColumnValueByTypeForDecimalFromFloat() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -886,7 +852,6 @@ public void testGetColumnValueByTypeForDecimalFromFloat64() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -909,7 +874,6 @@ public void testGetColumnValueByTypeForFloatFromString() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -932,7 +896,6 @@ public void testGetColumnValueByTypeForBigIntFromString() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -955,7 +918,6 @@ public void testGetColumnValueByTypeForIntFromString() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -978,7 +940,6 @@ public void testGetColumnValueByTypeForSmallIntFromString() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -1001,7 +962,6 @@ public void testGetColumnValueByTypeForTinyIntFromString() {
     PreparedStatementValueObject result =
         getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object castResult = CassandraTypeHandler.castToExpectedType(result.dataType(), result.value());
@@ -1024,7 +984,6 @@ public void testGetColumnValueByTypeForBytes() {
 
     Object result = getColumnValueByType(spannerColDef, sourceColDef, valuesJson, "UTC");
 
-    assertNotNull(result);
     assertTrue(result instanceof PreparedStatementValueObject);
 
     Object actualValue = ((PreparedStatementValueObject<?>) result).value();

From 7d00043dba1632d6f5f0ac78c8d70a5d73f0b76d Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Tue, 21 Jan 2025 16:05:37 +0530
Subject: [PATCH 42/56] Added Logger

---
 .../teleport/v2/templates/SpannerToCassandraDbITBase.java   | 4 +++-
 .../v2/templates/SpannerToCassandraSourceDbDatatypeIT.java  | 4 +---
 .../teleport/v2/templates/SpannerToSourceDbCassandraIT.java | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
index 3b3b2d6949..f11fd5c856 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -99,7 +99,9 @@ public void createAndUploadCassandraConfigToGcs(
     String host = cassandraResourceManagers.getHost();
     int port = cassandraResourceManagers.getPort();
     String keyspaceName = cassandraResourceManagers.getKeyspaceName();
-
+    LOG.info("Cassandra keyspaceName :: {}", keyspaceName);
+    LOG.info("Cassandra host :: {}", host);
+    LOG.info("Cassandra port :: {}", port);
     String cassandraConfigContents;
     try (InputStream inputStream =
         Thread.currentThread()
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
index b7fade478d..cb980d9061 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
@@ -93,12 +93,10 @@ public void setUp() throws IOException {
         spannerMetadataResourceManager = createSpannerMetadataDatabase();
 
         cassandraResourceManager = CassandraResourceManager.builder(testName).build();
-
-        createCassandraSchema(cassandraResourceManager, CASSANDRA_SCHEMA_FILE_RESOURCE);
-
         gcsResourceManager =
             GcsResourceManager.builder(artifactBucketName, getClass().getSimpleName(), credentials)
                 .build();
+        createCassandraSchema(cassandraResourceManager, CASSANDRA_SCHEMA_FILE_RESOURCE);
         createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
         gcsResourceManager.uploadArtifact(
             "input/session.json", Resources.getResource(SESSION_FILE_RESOURCE).getPath());
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 7409868999..625a7026a7 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -83,13 +83,11 @@ public void setUp() throws IOException {
         spannerMetadataResourceManager = createSpannerMetadataDatabase();
 
         cassandraResourceManager = CassandraResourceManager.builder(testName).build();
-        createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
-
-        createCassandraSchema(cassandraResourceManager, CASSANDRA_SCHEMA_FILE_RESOURCE);
-
         gcsResourceManager =
             GcsResourceManager.builder(artifactBucketName, getClass().getSimpleName(), credentials)
                 .build();
+        createAndUploadCassandraConfigToGcs(gcsResourceManager, cassandraResourceManager);
+        createCassandraSchema(cassandraResourceManager, CASSANDRA_SCHEMA_FILE_RESOURCE);
         gcsResourceManager.uploadArtifact(
             "input/session.json", Resources.getResource(SESSION_FILE_RESOURCE).getPath());
         pubsubResourceManager = setUpPubSubResourceManager();

From c78e575887435639cbf49db0b01648e6b413cf90 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Tue, 21 Jan 2025 17:02:49 +0530
Subject: [PATCH 43/56] Added keyspace Name issue fixex

---
 .../templates/SpannerToCassandraDbITBase.java | 25 +++++++++++++++++++
 .../SpannerToCassandraSourceDbDatatypeIT.java |  2 +-
 .../SpannerToSourceDbCassandraIT.java         |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
index f11fd5c856..2c01b05490 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -25,12 +25,15 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
 import org.apache.beam.it.cassandra.CassandraResourceManager;
 import org.apache.beam.it.common.PipelineLauncher;
 import org.apache.beam.it.common.utils.PipelineUtils;
+import org.apache.beam.it.common.utils.ResourceManagerUtils;
 import org.apache.beam.it.gcp.TemplateTestBase;
 import org.apache.beam.it.gcp.artifacts.utils.ArtifactUtils;
 import org.apache.beam.it.gcp.pubsub.PubsubResourceManager;
@@ -76,6 +79,28 @@ public PubsubResourceManager setUpPubSubResourceManager() throws IOException {
     return PubsubResourceManager.builder(testName, PROJECT, credentialsProvider).build();
   }
 
+  public CassandraResourceManager generateKeyspaceAndBuildCassandraResource() {
+    String keyspaceName =
+        ResourceManagerUtils.generateResourceId(
+                testName,
+                Pattern.compile("[/\\\\. \"\u0000$]"),
+                "-",
+                27,
+                DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss-SSSSSS"))
+            .replace('-', '_');
+    if (keyspaceName.length() > 48) {
+      keyspaceName = keyspaceName.substring(0, 48);
+    }
+    CassandraResourceManager cassandraResourceManager =
+        CassandraResourceManager.builder(testName).useStaticContainer().build();
+    String sql =
+        String.format(
+            "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}",
+            keyspaceName);
+    cassandraResourceManager.executeStatement(sql);
+    return cassandraResourceManager;
+  }
+
   public SubscriptionName createPubsubResources(
       String identifierSuffix, PubsubResourceManager pubsubResourceManager, String gcsPrefix) {
     String topicNameSuffix = "rr-it" + identifierSuffix;
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
index cb980d9061..a932dac9fe 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
@@ -92,7 +92,7 @@ public void setUp() throws IOException {
         spannerResourceManager = createSpannerDatabase(SPANNER_DDL_RESOURCE);
         spannerMetadataResourceManager = createSpannerMetadataDatabase();
 
-        cassandraResourceManager = CassandraResourceManager.builder(testName).build();
+        cassandraResourceManager = generateKeyspaceAndBuildCassandraResource();
         gcsResourceManager =
             GcsResourceManager.builder(artifactBucketName, getClass().getSimpleName(), credentials)
                 .build();
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 625a7026a7..13e919fcd3 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -82,7 +82,7 @@ public void setUp() throws IOException {
         spannerResourceManager = createSpannerDatabase(SPANNER_DDL_RESOURCE);
         spannerMetadataResourceManager = createSpannerMetadataDatabase();
 
-        cassandraResourceManager = CassandraResourceManager.builder(testName).build();
+        cassandraResourceManager = generateKeyspaceAndBuildCassandraResource();
         gcsResourceManager =
             GcsResourceManager.builder(artifactBucketName, getClass().getSimpleName(), credentials)
                 .build();

From 0bac3fce847ddaefcf16b29e4ff336852a2c234d Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Tue, 21 Jan 2025 18:33:26 +0530
Subject: [PATCH 44/56] Removed Static Conatiner Code

---
 .../cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
index 2c01b05490..0e78ba9813 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -92,7 +92,7 @@ public CassandraResourceManager generateKeyspaceAndBuildCassandraResource() {
       keyspaceName = keyspaceName.substring(0, 48);
     }
     CassandraResourceManager cassandraResourceManager =
-        CassandraResourceManager.builder(testName).useStaticContainer().build();
+        CassandraResourceManager.builder(testName).setKeyspaceName(keyspaceName).build();
     String sql =
         String.format(
             "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}",

From eb883e7c002500958b1f5198ebe69c6c92e64b19 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 11:10:54 +0530
Subject: [PATCH 45/56] Added Custom Class

---
 .../CassandraSharedResourceManager.java       | 348 ++++++++++++++++++
 .../templates/SpannerToCassandraDbITBase.java |  20 +-
 .../SpannerToCassandraSourceDbDatatypeIT.java |   3 +-
 .../SpannerToSourceDbCassandraIT.java         |   3 +-
 4 files changed, 358 insertions(+), 16 deletions(-)
 create mode 100644 v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
new file mode 100644
index 0000000000..786952a825
--- /dev/null
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright (C) 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.cloud.teleport.v2.templates;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.DriverTimeoutException;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.beam.it.common.ResourceManager;
+import org.apache.beam.it.common.utils.ExceptionUtils;
+import org.apache.beam.it.common.utils.ResourceManagerUtils;
+import org.apache.beam.it.testcontainers.TestContainerResourceManager;
+import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
+import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Client for managing Cassandra resources.
+ *
+ * <p>The class supports one database and multiple collections per database object. A database is
+ * created when the first collection is created if one has not been created already.
+ *
+ * <p>The database name is formed using testId. The database name will be "{testId}-{ISO8601 time,
+ * microsecond precision}", with additional formatting.
+ *
+ * <p>The class is thread-safe.
+ */
+public class CassandraSharedResourceManager
+    extends TestContainerResourceManager<GenericContainer<?>> implements ResourceManager {
+
+  private static final Logger LOG = LoggerFactory.getLogger(CassandraSharedResourceManager.class);
+
+  private static final String DEFAULT_CASSANDRA_CONTAINER_NAME = "cassandra";
+
+  // A list of available Cassandra Docker image tags can be found at
+  // https://hub.docker.com/_/cassandra/tags
+  private static final String DEFAULT_CASSANDRA_CONTAINER_TAG = "4.1.0";
+
+  // 9042 is the default port that Cassandra is configured to listen on
+  private static final int CASSANDRA_INTERNAL_PORT = 9042;
+
+  private final CqlSession cassandraClient;
+  private final String keyspaceName;
+  private final boolean usingStaticDatabase;
+
+  private CassandraSharedResourceManager(Builder builder) {
+    this(
+        /* cassandraClient= */ null,
+        new CassandraContainer<>(
+            DockerImageName.parse(builder.containerImageName).withTag(builder.containerImageTag)),
+        builder);
+  }
+
+  @VisibleForTesting
+  @SuppressWarnings("nullness")
+  CassandraSharedResourceManager(
+      @Nullable CqlSession cassandraClient, CassandraContainer<?> container, Builder builder) {
+    super(container, builder);
+
+    this.usingStaticDatabase = builder.keyspaceName != null && !builder.preGeneratedKeyspaceName;
+    this.keyspaceName =
+        usingStaticDatabase || builder.preGeneratedKeyspaceName
+            ? builder.keyspaceName
+            : generateKeyspaceName(builder.testId);
+    this.cassandraClient =
+        cassandraClient == null
+            ? CqlSession.builder()
+                .addContactPoint(
+                    new InetSocketAddress(this.getHost(), this.getPort(CASSANDRA_INTERNAL_PORT)))
+                .withLocalDatacenter("datacenter1")
+                .build()
+            : cassandraClient;
+
+    if (usingStaticDatabase) {
+      // Keyspace request may timeout on a few environments, if Cassandra is warming up
+      Failsafe.with(buildRetryPolicy())
+          .run(
+              () ->
+                  this.cassandraClient.execute(
+                      String.format(
+                          "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}",
+                          this.keyspaceName)));
+    }
+  }
+
+  private String generateKeyspaceName(String testName) {
+    return ResourceManagerUtils.generateResourceId(
+            testName,
+            Pattern.compile("[/\\\\. \"\u0000$]"),
+            "-",
+            27,
+            DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss-SSSSSS"))
+        .replace('-', '_');
+  }
+
+  public static Builder builder(String testId) {
+    return new Builder(testId);
+  }
+
+  /** Returns the port to connect to the Cassandra Database. */
+  public int getPort() {
+    return super.getPort(CASSANDRA_INTERNAL_PORT);
+  }
+
+  /**
+   * Returns the name of the Database that this Cassandra manager will operate in.
+   *
+   * @return the name of the Cassandra Database.
+   */
+  public synchronized String getKeyspaceName() {
+    return keyspaceName;
+  }
+
+  /**
+   * Execute the given statement on the managed keyspace.
+   *
+   * @param statement The statement to execute.
+   * @return ResultSet from Cassandra.
+   */
+  public synchronized ResultSet executeStatement(String statement) {
+    LOG.info("Executing statement: {}", statement);
+
+    try {
+      return Failsafe.with(buildRetryPolicy())
+          .get(
+              () ->
+                  cassandraClient.execute(
+                      SimpleStatement.newInstance(statement).setKeyspace(this.keyspaceName)));
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Error reading collection.", e);
+    }
+  }
+
+  /**
+   * Inserts the given Document into a table.
+   *
+   * <p>A database will be created here, if one does not already exist.
+   *
+   * @param tableName The name of the table to insert the document into.
+   * @param document The document to insert into the table.
+   * @return A boolean indicating whether the Document was inserted successfully.
+   */
+  public synchronized boolean insertDocument(String tableName, Map<String, Object> document) {
+    return insertDocuments(tableName, ImmutableList.of(document));
+  }
+
+  /**
+   * Inserts the given Documents into a collection.
+   *
+   * <p>Note: Implementations may do collection creation here, if one does not already exist.
+   *
+   * @param tableName The name of the collection to insert the documents into.
+   * @param documents A list of documents to insert into the collection.
+   * @return A boolean indicating whether the Documents were inserted successfully.
+   * @throws IllegalArgumentException if there is an error inserting the documents.
+   */
+  public synchronized boolean insertDocuments(String tableName, List<Map<String, Object>> documents)
+      throws IllegalArgumentException {
+    LOG.info(
+        "Attempting to write {} documents to {}.{}.", documents.size(), keyspaceName, tableName);
+
+    try {
+      for (Map<String, Object> document : documents) {
+        executeStatement(createInsertStatement(tableName, document));
+      }
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Error inserting documents.", e);
+    }
+
+    LOG.info("Successfully wrote {} documents to {}.{}", documents.size(), keyspaceName, tableName);
+
+    return true;
+  }
+
+  /**
+   * Reads all the Documents in a collection.
+   *
+   * @param tableName The name of the collection to read from.
+   * @return An iterable of all the Documents in the collection.
+   * @throws IllegalArgumentException if there is an error reading the collection.
+   */
+  public synchronized Iterable<Row> readTable(String tableName) throws IllegalArgumentException {
+    LOG.info("Reading all documents from {}.{}", keyspaceName, tableName);
+
+    Iterable<Row> documents;
+    try {
+      ResultSet resultSet = executeStatement(String.format("SELECT * FROM %s", tableName));
+      documents = resultSet.all();
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Error reading table.", e);
+    }
+
+    LOG.info("Successfully loaded documents from {}.{}", keyspaceName, tableName);
+
+    return documents;
+  }
+
+  @Override
+  public synchronized void cleanupAll() {
+    LOG.info("Attempting to cleanup Cassandra manager.");
+
+    boolean producedError = false;
+
+    // First, delete the database if it was not given as a static argument
+    if (!usingStaticDatabase) {
+      try {
+        executeStatement(String.format("DROP KEYSPACE IF EXISTS %s", this.keyspaceName));
+      } catch (Exception e) {
+        LOG.error("Failed to drop Cassandra keyspace {}.", keyspaceName, e);
+
+        // Only bubble exception if the cause is not timeout or does not exist
+        if (!ExceptionUtils.containsType(e, DriverTimeoutException.class)
+            && !ExceptionUtils.containsMessage(e, "does not exist")) {
+          producedError = true;
+        }
+      }
+    }
+
+    // Next, try to close the Cassandra client connection
+    try {
+      cassandraClient.close();
+    } catch (Exception e) {
+      LOG.error("Failed to delete Cassandra client.", e);
+      producedError = true;
+    }
+
+    // Throw Exception at the end if there were any errors
+    if (producedError) {
+      throw new IllegalArgumentException("Failed to delete resources. Check above for errors.");
+    }
+
+    super.cleanupAll();
+
+    LOG.info("Cassandra manager successfully cleaned up.");
+  }
+
+  private String createInsertStatement(String tableName, Map<String, Object> map) {
+    StringBuilder columns = new StringBuilder();
+    StringBuilder values = new StringBuilder();
+
+    for (Map.Entry<String, Object> entry : map.entrySet()) {
+      columns.append(entry.getKey()).append(", ");
+
+      // add quotes around strings
+      if (entry.getValue() instanceof String) {
+        values.append("'").append(entry.getValue()).append("'");
+      } else {
+        values.append(entry.getValue());
+      }
+      values.append(", ");
+    }
+
+    // Remove trailing comma and space
+    if (!map.isEmpty()) {
+      columns.delete(columns.length() - 2, columns.length());
+      values.delete(values.length() - 2, values.length());
+    }
+
+    return String.format("INSERT INTO %s (%s) VALUES (%s)", tableName, columns, values);
+  }
+
+  private static RetryPolicy<Object> buildRetryPolicy() {
+    return RetryPolicy.builder()
+        .withMaxRetries(5)
+        .withDelay(Duration.ofSeconds(1))
+        .handle(DriverTimeoutException.class)
+        .build();
+  }
+
+  /** Builder for {@link CassandraSharedResourceManager}. */
+  public static final class Builder
+      extends TestContainerResourceManager.Builder<CassandraSharedResourceManager> {
+
+    private @Nullable String keyspaceName;
+
+    private @Nullable boolean preGeneratedKeyspaceName;
+
+    private Builder(String testId) {
+      super(testId, DEFAULT_CASSANDRA_CONTAINER_NAME, DEFAULT_CASSANDRA_CONTAINER_TAG);
+      this.keyspaceName = null;
+    }
+
+    /**
+     * Sets the keyspace name to that of a preGeneratedKeyspaceName database instance.
+     *
+     * <p>Note: if a database name is set, and a static Cassandra server is being used
+     * (useStaticContainer() is also called on the builder), then a database will be created on the
+     * static server if it does not exist, and it will not be removed when cleanupAll() is called on
+     * the CassandraResourceManager.
+     *
+     * @param keyspaceName The database name.
+     * @return this builder object with the database name set.
+     */
+    public Builder setKeyspaceName(String keyspaceName) {
+      this.keyspaceName = keyspaceName;
+      return this;
+    }
+
+    /**
+     * Sets the preGeneratedKeyspaceName to that of a static database instance. Use this method only
+     * when attempting to operate on a pre-existing Cassandra database.
+     *
+     * <p>Note: if a database name is set, and a static Cassandra server is being used
+     * (useStaticContainer() is also called on the builder), then a database will be created on the
+     * static server if it does not exist, and it will not be removed when cleanupAll() is called on
+     * the CassandraResourceManager.
+     *
+     * @param preGeneratedKeyspaceName The database name.
+     * @return this builder object with the database is need to create.
+     */
+    public Builder sePreGeneratedKeyspaceName(boolean preGeneratedKeyspaceName) {
+      this.preGeneratedKeyspaceName = preGeneratedKeyspaceName;
+      return this;
+    }
+
+    @Override
+    public CassandraSharedResourceManager build() {
+      return new CassandraSharedResourceManager(this);
+    }
+  }
+}
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
index 0e78ba9813..cb070319eb 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -30,7 +30,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
-import org.apache.beam.it.cassandra.CassandraResourceManager;
 import org.apache.beam.it.common.PipelineLauncher;
 import org.apache.beam.it.common.utils.PipelineUtils;
 import org.apache.beam.it.common.utils.ResourceManagerUtils;
@@ -79,7 +78,7 @@ public PubsubResourceManager setUpPubSubResourceManager() throws IOException {
     return PubsubResourceManager.builder(testName, PROJECT, credentialsProvider).build();
   }
 
-  public CassandraResourceManager generateKeyspaceAndBuildCassandraResource() {
+  public CassandraSharedResourceManager generateKeyspaceAndBuildCassandraResource() {
     String keyspaceName =
         ResourceManagerUtils.generateResourceId(
                 testName,
@@ -91,14 +90,10 @@ public CassandraResourceManager generateKeyspaceAndBuildCassandraResource() {
     if (keyspaceName.length() > 48) {
       keyspaceName = keyspaceName.substring(0, 48);
     }
-    CassandraResourceManager cassandraResourceManager =
-        CassandraResourceManager.builder(testName).setKeyspaceName(keyspaceName).build();
-    String sql =
-        String.format(
-            "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}",
-            keyspaceName);
-    cassandraResourceManager.executeStatement(sql);
-    return cassandraResourceManager;
+    return CassandraSharedResourceManager.builder(testName)
+        .setKeyspaceName(keyspaceName)
+        .sePreGeneratedKeyspaceName(true)
+        .build();
   }
 
   public SubscriptionName createPubsubResources(
@@ -118,7 +113,8 @@ public SubscriptionName createPubsubResources(
   }
 
   public void createAndUploadCassandraConfigToGcs(
-      GcsResourceManager gcsResourceManager, CassandraResourceManager cassandraResourceManagers)
+      GcsResourceManager gcsResourceManager,
+      CassandraSharedResourceManager cassandraResourceManagers)
       throws IOException {
 
     String host = cassandraResourceManagers.getHost();
@@ -238,7 +234,7 @@ private String toCqlStatement(
   }
 
   protected void createCassandraSchema(
-      CassandraResourceManager cassandraResourceManager, String cassandraSchemaFile)
+      CassandraSharedResourceManager cassandraResourceManager, String cassandraSchemaFile)
       throws IOException {
 
     Map<String, String> columns = new HashMap<>();
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
index a932dac9fe..8bd24f5743 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbDatatypeIT.java
@@ -39,7 +39,6 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import org.apache.beam.it.cassandra.CassandraResourceManager;
 import org.apache.beam.it.common.PipelineLauncher;
 import org.apache.beam.it.common.PipelineOperator;
 import org.apache.beam.it.common.utils.ResourceManagerUtils;
@@ -72,7 +71,7 @@ public class SpannerToCassandraSourceDbDatatypeIT extends SpannerToCassandraDbIT
   private static PipelineLauncher.LaunchInfo jobInfo;
   public static SpannerResourceManager spannerResourceManager;
   private static SpannerResourceManager spannerMetadataResourceManager;
-  public static CassandraResourceManager cassandraResourceManager;
+  public static CassandraSharedResourceManager cassandraResourceManager;
   private static GcsResourceManager gcsResourceManager;
   private static PubsubResourceManager pubsubResourceManager;
   private SubscriptionName subscriptionName;
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 13e919fcd3..47331fa85d 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -31,7 +31,6 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.util.HashSet;
-import org.apache.beam.it.cassandra.CassandraResourceManager;
 import org.apache.beam.it.common.PipelineLauncher;
 import org.apache.beam.it.common.PipelineOperator;
 import org.apache.beam.it.common.utils.ResourceManagerUtils;
@@ -63,7 +62,7 @@ public class SpannerToSourceDbCassandraIT extends SpannerToCassandraDbITBase {
   private static PipelineLauncher.LaunchInfo jobInfo;
   public static SpannerResourceManager spannerResourceManager;
   private static SpannerResourceManager spannerMetadataResourceManager;
-  public static CassandraResourceManager cassandraResourceManager;
+  public static CassandraSharedResourceManager cassandraResourceManager;
   private static GcsResourceManager gcsResourceManager;
   private static PubsubResourceManager pubsubResourceManager;
   private SubscriptionName subscriptionName;

From 302797caec142e88a297c5501a1c2c393fab177d Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 11:12:40 +0530
Subject: [PATCH 46/56] Added Missing Code

---
 .../teleport/v2/templates/CassandraSharedResourceManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
index 786952a825..18399cadb5 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
@@ -98,7 +98,7 @@ private CassandraSharedResourceManager(Builder builder) {
                 .build()
             : cassandraClient;
 
-    if (usingStaticDatabase) {
+    if (!usingStaticDatabase) {
       // Keyspace request may timeout on a few environments, if Cassandra is warming up
       Failsafe.with(buildRetryPolicy())
           .run(

From 931179e0038d83062a16687638c8e854dbb591bc Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 11:16:40 +0530
Subject: [PATCH 47/56] Added Dummy commit

---
 .../teleport/v2/templates/CassandraSharedResourceManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
index 18399cadb5..e26f92d03c 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/CassandraSharedResourceManager.java
@@ -83,7 +83,7 @@ private CassandraSharedResourceManager(Builder builder) {
   CassandraSharedResourceManager(
       @Nullable CqlSession cassandraClient, CassandraContainer<?> container, Builder builder) {
     super(container, builder);
-
+    // we are trying to handle userDefined KeyspaceName name without usingStatic Container
     this.usingStaticDatabase = builder.keyspaceName != null && !builder.preGeneratedKeyspaceName;
     this.keyspaceName =
         usingStaticDatabase || builder.preGeneratedKeyspaceName

From 99f6d124fc0597c8ef39778c161e560c134f229e Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 12:02:54 +0530
Subject: [PATCH 48/56] Added Source type

---
 .../cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
index cb070319eb..9c5dab2190 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -176,6 +176,7 @@ public PipelineLauncher.LaunchInfo launchDataflowJob(
             put("maxShardConnections", "5");
             put("maxNumWorkers", "1");
             put("numWorkers", "1");
+            put("sourceType", "cassandra");
           }
         };
 

From 4b909a0924f20d081802b5921620c80dfb9dfc02 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 13:10:04 +0530
Subject: [PATCH 49/56] Added Logger

---
 .../google/cloud/teleport/v2/templates/SpannerToSourceDb.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDb.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDb.java
index a1effa9852..f77071ee4a 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDb.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDb.java
@@ -547,7 +547,7 @@ public static PipelineResult run(Options options) {
             "Logical shard id was not found, hence setting it to : " + Constants.DEFAULT_SHARD_ID);
       }
     }
-
+    LOG.info("Parsing Schema Object for: " + options.getSourceType());
     if (options.getSourceType().equals(CASSANDRA_SOURCE_TYPE)) {
       Map<String, SpannerTable> spannerTableMap =
           SpannerSchema.convertDDLTableToSpannerTable(ddl.allTables());
@@ -572,6 +572,8 @@ public static PipelineResult run(Options options) {
       }
     }
 
+    LOG.info("Schema Object: " + schema);
+
     boolean isRegularMode = "regular".equals(options.getRunMode());
     PCollectionTuple reconsumedElements = null;
     DeadLetterQueueManager dlqManager = buildDlqManager(options);

From 0a4dd4612e6ba64174e7cb7275159a5b432ebb5c Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 17:04:58 +0530
Subject: [PATCH 50/56] Added Logger

---
 .../v2/templates/dbutils/dml/CassandraDMLGenerator.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
index f9e13af237..322e6de117 100644
--- a/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
+++ b/v2/spanner-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGenerator.java
@@ -80,7 +80,8 @@ public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequ
 
     String spannerTableName = dmlGeneratorRequest.getSpannerTableName();
     Schema schema = dmlGeneratorRequest.getSchema();
-
+    LOG.warn("dmlGeneratorRequest {} ", dmlGeneratorRequest);
+    LOG.warn("schema {}", schema);
     if (schema == null
         || schema.getSpannerToID() == null
         || schema.getSpSchema() == null

From f993757df691ebf03b74fb62a113792029d6bb71 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 17:08:38 +0530
Subject: [PATCH 51/56] Added More Logs

---
 .../teleport/v2/templates/SpannerToCassandraDbITBase.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
index 9c5dab2190..5b50cf3124 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraDbITBase.java
@@ -251,8 +251,11 @@ protected void createCassandraSchema(
             Resources.readLines(
                 Resources.getResource(cassandraSchemaFile), StandardCharsets.UTF_8));
     ddl = ddl.trim();
+    LOG.info("DDL {}", ddl);
     String[] ddls = ddl.split(";");
+    LOG.info("DDLs statement {}", ddls);
     for (String d : ddls) {
+      LOG.info("DDL statement {}", d);
       if (!d.isBlank()) {
         cassandraResourceManager.executeStatement(d);
       }

From 65df0e9c2c55e0b722da666f43f4300f0ebd89d4 Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 18:52:31 +0530
Subject: [PATCH 52/56] Ignore MYSQL IT

---
 .../teleport/v2/templates/SpannerToSourceDbCustomShardIT.java   | 2 ++
 .../v2/templates/SpannerToSourceDbCustomTransformationIT.java   | 1 +
 .../teleport/v2/templates/SpannerToSourceDbDatatypeIT.java      | 2 ++
 .../google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java | 2 ++
 .../v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java   | 2 ++
 .../teleport/v2/templates/SpannerToSourceDbTimezoneIT.java      | 2 ++
 6 files changed, 11 insertions(+)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java
index e58488283d..96440df750 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java
@@ -42,6 +42,7 @@
 import org.apache.beam.it.jdbc.MySQLResourceManager;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -53,6 +54,7 @@
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
+@Ignore("Disabling this test class")
 public class SpannerToSourceDbCustomShardIT extends SpannerToSourceDbITBase {
 
   private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbCustomShardIT.class);
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomTransformationIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomTransformationIT.java
index 22b0d38c9b..fa9a428996 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomTransformationIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomTransformationIT.java
@@ -61,6 +61,7 @@
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
+@Ignore("Disabling this test class")
 public class SpannerToSourceDbCustomTransformationIT extends SpannerToSourceDbITBase {
   private static final Logger LOG =
       LoggerFactory.getLogger(SpannerToSourceDbCustomTransformationIT.class);
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java
index dbd023cdef..230c62a6bb 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java
@@ -45,6 +45,7 @@
 import org.apache.beam.it.jdbc.MySQLResourceManager;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -57,6 +58,7 @@
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
+@Ignore("Disabling this test class")
 public class SpannerToSourceDbDatatypeIT extends SpannerToSourceDbITBase {
 
   private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbDatatypeIT.class);
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java
index 7c3ad39760..3ebdd480be 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java
@@ -42,6 +42,7 @@
 import org.apache.beam.sdk.io.gcp.spanner.SpannerConfig;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -56,6 +57,7 @@
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
+@Ignore("Disabling this test class")
 public class SpannerToSourceDbIT extends SpannerToSourceDbITBase {
 
   private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbIT.class);
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java
index 1f5acdc952..f5f0d49632 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java
@@ -45,6 +45,7 @@
 import org.apache.beam.it.jdbc.MySQLResourceManager;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -56,6 +57,7 @@
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
+@Ignore("Disabling this test class")
 public class SpannerToSourceDbInterleaveMultiShardIT extends SpannerToSourceDbITBase {
 
   private static final Logger LOG =
diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java
index 1ab2d78b49..40c1c7e05b 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java
@@ -39,6 +39,7 @@
 import org.apache.beam.it.jdbc.MySQLResourceManager;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -50,6 +51,7 @@
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
+@Ignore("Disabling this test class")
 public class SpannerToSourceDbTimezoneIT extends SpannerToSourceDbITBase {
 
   private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbTimezoneIT.class);

From f1c570a2fafce6270358920c9533b92e940d23aa Mon Sep 17 00:00:00 2001
From: pawankashyapollion <v-pawan.kumar@ollion.com>
Date: Wed, 22 Jan 2025 19:38:52 +0530
Subject: [PATCH 53/56] Added Table name fixes

---
 .../SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql   | 2 +-
 .../resources/SpannerToCassandraSourceIT/spanner-schema.sql   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql
index e7f3fbf0be..43baf6811d 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceDbDatatypeIT/spanner-schema.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS AllDatatypeColumns (
+CREATE TABLE IF NOT EXISTS alldatatypecolumns (
     varchar_column STRING(20) NOT NULL,
     tinyint_column INT64,
     text_column STRING(MAX),
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
index d0bb0aebec..d718739ca3 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
@@ -1,10 +1,10 @@
-CREATE TABLE IF NOT EXISTS Users (
+CREATE TABLE IF NOT EXISTS users (
     id INT64 NOT NULL,
     full_name STRING(25),
     `from` STRING(25)
 ) PRIMARY KEY(id);
 
-CREATE TABLE IF NOT EXISTS Users2 (
+CREATE TABLE IF NOT EXISTS users2 (
     id INT64 NOT NULL,
     name STRING(25),
     ) PRIMARY KEY(id);

From 80ef528d6cfa174d1fcaf7283fac99b716a2c7c5 Mon Sep 17 00:00:00 2001
From: Akash Thawait <aakash@ollion.com>
Date: Thu, 23 Jan 2025 10:19:01 +0530
Subject: [PATCH 54/56] fixed query

---
 .../v2/templates/SpannerToSourceDbCassandraIT.java     | 10 ++++++----
 .../SpannerToCassandraSourceIT/cassandra-schema.sql    |  2 +-
 .../SpannerToCassandraSourceIT/spanner-schema.sql      |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 47331fa85d..9fefa9bca4 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -179,11 +179,13 @@ private void writeRowInSpanner() {
             (TransactionRunner.TransactionCallable<Void>)
                 transaction -> {
                   Mutation m3 =
-                      Mutation.newInsertOrUpdateBuilder("Users")
+                      Mutation.newInsertOrUpdateBuilder("users")
                           .set("id")
-                          .to(2)
+                          .to(1)
                           .set("full_name")
                           .to("GG")
+                          .set("from")
+                          .to("BB")
                           .build();
                   transaction.buffer(m3);
                   return null;
@@ -207,7 +209,7 @@ private void assertRowInCassandraDB() throws InterruptedException {
 
     Row row = rows.iterator().next();
     assertThat(row.getInt("id")).isEqualTo(1);
-    assertThat(row.getString("name")).isEqualTo("FF");
-    assertThat(row.getString("from")).isEqualTo("AA");
+    assertThat(row.getString("full_name")).isEqualTo("GG");
+    assertThat(row.getString("from")).isEqualTo("BB");
   }
 }
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql
index 46f2f3c47c..e220267733 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/cassandra-schema.sql
@@ -1,5 +1,5 @@
 CREATE TABLE users (
     id int PRIMARY KEY,
-    name text,
+    full_name text,
     "from" text
 );
\ No newline at end of file
diff --git a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
index d718739ca3..5cedd597e1 100644
--- a/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
+++ b/v2/spanner-to-sourcedb/src/test/resources/SpannerToCassandraSourceIT/spanner-schema.sql
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS users (
 
 CREATE TABLE IF NOT EXISTS users2 (
     id INT64 NOT NULL,
-    name STRING(25),
+    full_name STRING(25),
     ) PRIMARY KEY(id);
 
 CREATE CHANGE STREAM allstream

From 2fa18c3321bd71dd823200ae43051ede52ead9b4 Mon Sep 17 00:00:00 2001
From: Akash Thawait <aakash@ollion.com>
Date: Thu, 23 Jan 2025 11:17:56 +0530
Subject: [PATCH 55/56] added log

---
 .../SpannerToSourceDbCassandraIT.java         | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 9fefa9bca4..3e1f7a9c4f 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -45,12 +45,16 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Category({TemplateIntegrationTest.class, SkipDirectRunnerTest.class})
 @TemplateIntegrationTest(SpannerToSourceDb.class)
 @RunWith(JUnit4.class)
 public class SpannerToSourceDbCassandraIT extends SpannerToCassandraDbITBase {
 
+  private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbCassandraIT.class);
+
   private static final String SPANNER_DDL_RESOURCE =
       "SpannerToCassandraSourceIT/spanner-schema.sql";
   private static final String SESSION_FILE_RESOURCE = "SpannerToCassandraSourceIT/session.json";
@@ -148,18 +152,23 @@ private long getRowCount() {
 
   private void writeRowInSpanner() {
     Mutation m1 =
-        Mutation.newInsertOrUpdateBuilder("Users")
+        Mutation.newInsertOrUpdateBuilder("users")
             .set("id")
             .to(1)
             .set("full_name")
-            .to("FF")
+            .to("A")
             .set("from")
-            .to("AA")
+            .to("B")
             .build();
     spannerResourceManager.write(m1);
 
     Mutation m2 =
-        Mutation.newInsertOrUpdateBuilder("Users2").set("id").to(2).set("name").to("B").build();
+        Mutation.newInsertOrUpdateBuilder("users2")
+            .set("id")
+            .to(2)
+            .set("full_name")
+            .to("BB")
+            .build();
     spannerResourceManager.write(m2);
 
     // Write a single record to Spanner for the given logical shard
@@ -181,7 +190,7 @@ private void writeRowInSpanner() {
                   Mutation m3 =
                       Mutation.newInsertOrUpdateBuilder("users")
                           .set("id")
-                          .to(1)
+                          .to(3)
                           .set("full_name")
                           .to("GG")
                           .set("from")
@@ -200,7 +209,9 @@ private void assertRowInCassandraDB() throws InterruptedException {
     assertThatResult(result).meetsConditions();
     Iterable<Row> rows;
     try {
+      LOG.info("Reading from Cassandra table: {}", TABLE);
       rows = cassandraResourceManager.readTable(TABLE);
+      LOG.info("Cassandra Rows: {}", rows.toString());
     } catch (Exception e) {
       throw new RuntimeException("Failed to read from Cassandra table: " + TABLE, e);
     }
@@ -208,8 +219,10 @@ private void assertRowInCassandraDB() throws InterruptedException {
     assertThat(rows).hasSize(1);
 
     Row row = rows.iterator().next();
+    LOG.info("Cassandra Row to Assert: {}", row.toString());
+
     assertThat(row.getInt("id")).isEqualTo(1);
-    assertThat(row.getString("full_name")).isEqualTo("GG");
-    assertThat(row.getString("from")).isEqualTo("BB");
+    assertThat(row.getString("full_name")).isEqualTo("A");
+    assertThat(row.getString("from")).isEqualTo("B");
   }
 }

From ca81dbcd38690164be4da07d1ec45f05c95882a2 Mon Sep 17 00:00:00 2001
From: Akash Thawait <aakash@ollion.com>
Date: Thu, 23 Jan 2025 11:21:20 +0530
Subject: [PATCH 56/56] added log

---
 .../teleport/v2/templates/SpannerToSourceDbCassandraIT.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
index 3e1f7a9c4f..e73d4d476b 100644
--- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
+++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCassandraIT.java
@@ -220,7 +220,6 @@ private void assertRowInCassandraDB() throws InterruptedException {
 
     Row row = rows.iterator().next();
     LOG.info("Cassandra Row to Assert: {}", row.toString());
-
     assertThat(row.getInt("id")).isEqualTo(1);
     assertThat(row.getString("full_name")).isEqualTo("A");
     assertThat(row.getString("from")).isEqualTo("B");