Bug fixes of handling null values and added missing IT #2268

akashthawaitcc · 2025-03-22T10:56:25Z

Handled null values on custom transformation.
Fix: empty values are migrated as null.
Added IT of the above scenarios.

google-cla · 2025-03-22T10:56:42Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

...b/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java

...rcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbIT.java

...m-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerIT.java

codecov · 2025-04-02T05:47:54Z

Codecov Report

Attention: Patch coverage is 90.47619% with 2 lines in your changes missing coverage. Please review.

Project coverage is 49.22%. Comparing base (44bb53f) to head (8dedb69).
Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
...2/templates/dbutils/dml/CassandraDMLGenerator.java	80.00%	0 Missing and 2 partials ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #2268      +/-   ##
============================================
+ Coverage     49.20%   49.22%   +0.01%     
- Complexity     4605     4942     +337     
============================================
  Files           918      918              
  Lines         55794    55799       +5     
  Branches       5993     5995       +2     
============================================
+ Hits          27453    27466      +13     
+ Misses        26358    26351       -7     
+ Partials       1983     1982       -1

Components	Coverage Δ
spanner-templates	`70.23% <90.47%> (+0.03%)`	⬆️
spanner-import-export	`68.04% <ø> (+0.01%)`	⬆️
spanner-live-forward-migration	`78.42% <ø> (ø)`
spanner-live-reverse-replication	`80.40% <90.47%> (+0.09%)`	⬆️
spanner-bulk-migration	`87.77% <ø> (ø)`

Files with missing lines	Coverage Δ
...v2/templates/dbutils/dml/CassandraTypeHandler.java	`84.73% <100.00%> (+3.25%)`	⬆️
...2/templates/dbutils/dml/CassandraDMLGenerator.java	`90.13% <80.00%> (-1.09%)`	⬇️

... and 4 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

VardhanThigle · 2025-04-02T06:38:33Z

@taherkl
The delta after fixing the review comments is not covered in UT,
Please cover the lines in the UT.

* sync upstream/main (#98) * Enhanced Retry Logic (GoogleCloudPlatform#2196) Co-authored-by: pawankashyapollion <v-pawan.kumar@ollion.com> * Adding support for Cassandra map (GoogleCloudPlatform#2209) * Adding test table for Map types * Adding support for cassandra map * changes (GoogleCloudPlatform#2212) * Fix inf issues in Datastream reader (GoogleCloudPlatform#2213) * add inf fix to ts fixing bug on timestamp type * Update FormatDatastreamRecordToJson.java use equals not == * Upgrade Beam version to 2.63.0 (GoogleCloudPlatform#2206) * Upgrade Beam version to 2.63.0 * add cache factory to local spanner io * remove cache pass to ReadChangeStreamPartitionDoFn * Add unimplemented/unused stubs to TestChangeStreamMutation * Use java Instant instead of threeten Instant * Fix low watermark setter call * fix testchangestreammutation * Recreate validation PR * fix import order * linux-env requirements files * fix v1 pom * SkipShade for Spanner common module (GoogleCloudPlatform#2194) * Add load test for cross db txn (GoogleCloudPlatform#2199) * Add load test for cross db txn * Change test timeout to 2 days * Revert spanner-pr.yml changes * Report Lineage for CsvToBigQuery template (GoogleCloudPlatform#2205) * Report Lineage for CsvToBigQuery template * Reply beampr-32662 to CsvConverters * Spanner Import/Export INTERLEAVE IN (GoogleCloudPlatform#2128) * Changes to write read interleave type from information schema, and write/read the type to/from avro. No change to tests yet. * Fix warnings, bug in InformationSchemaScanner, and bug in AvroSchemaToDdlConverter. Also properly default to IN PARENT when emitting ddl, in case the interleave type is not set (really only necessary for tests, since otherwise it will always be set. * Set interleaveType in InfoSchemaScanner * Style fixes, and only generate INTERLEAVE IN ddl for gsql. * another style fix - remove unused import * Make conditions more readable and add comments * Tests * Fix condition * Add interleave in table to ExportPipelineIT * Add SCRAM-SHA-512 authentication support to Kafka templates (GoogleCloudPlatform#2181) Added SCRAM-SHA-512 authentication support to Kafka to Kafka, Kafka to GCS, and Kafka to BigQuery templates. * Update the required Java version in the base doc, then regenerate docs (GoogleCloudPlatform#2218) * Update java requirement * Generate docs * Post 2.63.0 fixes (GoogleCloudPlatform#2216) * Uncomment kinesis * bump protoc to 4 in v2 * bug-fix: Use jdbc connection properties for reverse migration (GoogleCloudPlatform#2198) * changes * Changes * changes * changes * docs * Support partitioned reads for DateTime column type in JDBC to BigQuery template (GoogleCloudPlatform#2084) * Support partitioned reads for DateTime column type * minor changes * Support backward compatibility and timezone in lower/upper bounds * removed test cases for bounds in unit tests as derby does not support timezone * Fixed typo's in JdbcToBigQuery.java Corrected testcases expected output * Corrected unit test cases expected output. Removed DateTime integration test cases. * Corrected a typo * Added default value for partitionColumnType * spotless apply * Disabling flaky test to unblock dataflow release (GoogleCloudPlatform#2220) * disabling flaky test to unblock dataflow release * minor change * Add logic to skip runnerV2 for the ITs (GoogleCloudPlatform#2219) * skip runnerv2 tests in TemplateTestBase * add logic to skip use_runner_v2 experiment in the launchTemplate * Remove redundant property skipRunnerV2Test in pom and update logic in launchTemplate * Fix format violations using mvn spotless:apply * Add warning about caching with plugin (GoogleCloudPlatform#2221) * [DatastreamToSpanner] Spanner Exception handling (GoogleCloudPlatform#2185) * SpannerExceptionClassifier class and IT * Unit tests and Integration tests * Formatting changes * Correcting UT * Unit test for SpannerResourceManager * Creating Spanner Migration Exception * Formatting changes * Correcting tests * Addressing comments * Correcting a UT * Addressing comments * Changing SpannerMigrationException to extend RuntimeException * Remove Python version from `pom.xml` (GoogleCloudPlatform#2234) * Update pom.xml * Update pom.xml * Add SkipRunnerV2Test category to JmsToPubsubIT and PubSubCdcToBigQueryIT (GoogleCloudPlatform#2235) * Fix a bug in CSVToBigQuery where commas in fields are not handled correctly. (GoogleCloudPlatform#2229) * Attempt to fix csv bug where commas in fields are not handled correctly. * Replace ImmutableList with Iterable * Add tests to cover the scenario of commas within quotes. * Polish tests and add a test case to cover csv without headers. * Update Dockerfile-template-yaml (GoogleCloudPlatform#2222) * Update Dockerfile-template-yaml * Update Dockerfile-template-yaml * Update Dockerfile-template-yaml * Update Dockerfile-template-yaml * Adding All Datatypes IT for Cassandra Migration (GoogleCloudPlatform#2230) * Add IF NOT EXISTS clause for spanner ddls used in ITs (GoogleCloudPlatform#2237) * Enable DatastreamToSpannerIT with if not exists clause * Update Datastream to Spanner IT spanner schemas with if not exists * Update BULK IT spanner schemas with if not exists * Update reverse replications ITs spanner schemas with if not exists * Add space after if not exists * Using set of random buckets for spanner ITs (GoogleCloudPlatform#2223) * Using set of random buckets for spanner ITs * reverse replication test * checkstyle fix * adding more buckets * removed ignore for testing * spotless fix * fixing UT * skip the flaky test again * addressing comments * spotless fix * Add promote artifact method in release plugin (GoogleCloudPlatform#2227) * Add promote artifact method * address comments; also fixed stagingArtifactRegistry support us.gcr.io * Consolidate method * fixed default DLQ path (GoogleCloudPlatform#2241) * Fix stagingArtifactRegistry support raw us.gcr.io artifact registry (GoogleCloudPlatform#2243) * Print error response on wget call (GoogleCloudPlatform#2245) * This helps debugging e.g. permission issues * Moving local spanner io to a different namespace (GoogleCloudPlatform#2231) * Removed LocalSpannerIO * Moving all of SpannerIO into Teleport * Copying tests also * Updated tests and excluded SpannerIO changestream from coverage checks * spotless apply * Excluding coverage check * Adding retry settings which were overwritten in LocalSpannerAccessor * Changing deprecated retrysettings function calls * Added warning and TODO comments to remove the local copy * spotless * Adding Cassandra Type Options to IT test (GoogleCloudPlatform#2242) * Bump timeouts for tests involving FKs/interleaved dependenceis (GoogleCloudPlatform#2239) * Bump timeouts for datastream to spanner test * Update FK timeout for reverse template * Bump timeouts for old reverse repl template * Enable SpannerToSourceDbInterleaveMultiShardIT * Revert loadtest timeout * Load Tests - Cassandra Reverse Replication (GoogleCloudPlatform#2163) * * Addition of Load Tests in SpannerToSourceDB For Cassandra (#89) * Addition of Load Tests in SpannerToSourceDB For Cassandra * Address Merge conflict * Added LT Refectored (#92) * Added POM Dependecies * sync upstream/main (#98) * RR LOAD TEST FIXES (#101) * Resolved PR comments (#115) * Added Module Dependency Fixes * Added Copyrigh * Added missing commit * Enhanced Retry Logic (GoogleCloudPlatform#2196) Co-authored-by: pawankashyapollion <v-pawan.kumar@ollion.com> * Adding support for Cassandra map (GoogleCloudPlatform#2209) * Adding test table for Map types * Adding support for cassandra map * changes (GoogleCloudPlatform#2212) * Fix inf issues in Datastream reader (GoogleCloudPlatform#2213) * add inf fix to ts fixing bug on timestamp type * Update FormatDatastreamRecordToJson.java use equals not == * Upgrade Beam version to 2.63.0 (GoogleCloudPlatform#2206) * Upgrade Beam version to 2.63.0 * add cache factory to local spanner io * remove cache pass to ReadChangeStreamPartitionDoFn * Add unimplemented/unused stubs to TestChangeStreamMutation * Use java Instant instead of threeten Instant * Fix low watermark setter call * fix testchangestreammutation * Recreate validation PR * fix import order * linux-env requirements files * fix v1 pom * SkipShade for Spanner common module (GoogleCloudPlatform#2194) * Add load test for cross db txn (GoogleCloudPlatform#2199) * Add load test for cross db txn * Change test timeout to 2 days * Revert spanner-pr.yml changes * Report Lineage for CsvToBigQuery template (GoogleCloudPlatform#2205) * Report Lineage for CsvToBigQuery template * Reply beampr-32662 to CsvConverters * Spanner Import/Export INTERLEAVE IN (GoogleCloudPlatform#2128) * Changes to write read interleave type from information schema, and write/read the type to/from avro. No change to tests yet. * Fix warnings, bug in InformationSchemaScanner, and bug in AvroSchemaToDdlConverter. Also properly default to IN PARENT when emitting ddl, in case the interleave type is not set (really only necessary for tests, since otherwise it will always be set. * Set interleaveType in InfoSchemaScanner * Style fixes, and only generate INTERLEAVE IN ddl for gsql. * another style fix - remove unused import * Make conditions more readable and add comments * Tests * Fix condition * Add interleave in table to ExportPipelineIT * Add SCRAM-SHA-512 authentication support to Kafka templates (GoogleCloudPlatform#2181) Added SCRAM-SHA-512 authentication support to Kafka to Kafka, Kafka to GCS, and Kafka to BigQuery templates. * Update the required Java version in the base doc, then regenerate docs (GoogleCloudPlatform#2218) * Update java requirement * Generate docs * Post 2.63.0 fixes (GoogleCloudPlatform#2216) * Uncomment kinesis * bump protoc to 4 in v2 * bug-fix: Use jdbc connection properties for reverse migration (GoogleCloudPlatform#2198) * changes * Changes * changes * changes * docs * Support partitioned reads for DateTime column type in JDBC to BigQuery template (GoogleCloudPlatform#2084) * Support partitioned reads for DateTime column type * minor changes * Support backward compatibility and timezone in lower/upper bounds * removed test cases for bounds in unit tests as derby does not support timezone * Fixed typo's in JdbcToBigQuery.java Corrected testcases expected output * Corrected unit test cases expected output. Removed DateTime integration test cases. * Corrected a typo * Added default value for partitionColumnType * spotless apply * Disabling flaky test to unblock dataflow release (GoogleCloudPlatform#2220) * disabling flaky test to unblock dataflow release * minor change * Add logic to skip runnerV2 for the ITs (GoogleCloudPlatform#2219) * skip runnerv2 tests in TemplateTestBase * add logic to skip use_runner_v2 experiment in the launchTemplate * Remove redundant property skipRunnerV2Test in pom and update logic in launchTemplate * Fix format violations using mvn spotless:apply * Add warning about caching with plugin (GoogleCloudPlatform#2221) * [DatastreamToSpanner] Spanner Exception handling (GoogleCloudPlatform#2185) * SpannerExceptionClassifier class and IT * Unit tests and Integration tests * Formatting changes * Correcting UT * Unit test for SpannerResourceManager * Creating Spanner Migration Exception * Formatting changes * Correcting tests * Addressing comments * Correcting a UT * Addressing comments * Changing SpannerMigrationException to extend RuntimeException * Added Cassandra Resource Manager Refectoring and removed Generics * Added Keyspace Voilation fixes * minor changes * Create session for row check --------- Co-authored-by: taherkl <taher.lakdawala@ollion.com> Co-authored-by: Akash Thawait <aakash@ollion.com> Co-authored-by: pawankashyapollion <v-pawan.kumar@ollion.com> Co-authored-by: Vardhan Vinay Thigle <39047439+VardhanThigle@users.noreply.github.com> Co-authored-by: Astha Mohta <35952883+asthamohta@users.noreply.github.com> Co-authored-by: Jack McCluskey <34928439+jrmccluskey@users.noreply.github.com> Co-authored-by: Yi Hu <yathu@google.com> Co-authored-by: jjfox15 <seanfox@google.com> Co-authored-by: vgnanasekaran <venku123@gmail.com> Co-authored-by: Danny McCormick <dannymccormick@google.com> Co-authored-by: shreyakhajanchi <92910380+shreyakhajanchi@users.noreply.github.com> Co-authored-by: Rudra-Gujarathi <rudragujarathi@google.com> Co-authored-by: Derrick Williams <derrickaw@google.com> Co-authored-by: darshan-sj <darshan-sj@users.noreply.github.com> * Added Missing Case * Added IT for Delete * Added For testing * Added IT for Emty and Custom handling * fixed cassandra schema * Added And removed unwanted Table * Added And removed unwanted * Added Missing case and removed Delete case * Spoltless fixes * Handle Null in custom Transformation * revert delete changes * Handle Checkstyle fixes * removed unwanted toSting --------- Co-authored-by: taherkl <taher.lakdawala@ollion.com> Co-authored-by: Taher Lakdawala <78196491+taherkl@users.noreply.github.com> Co-authored-by: pawankashyapollion <v-pawan.kumar@ollion.com> Co-authored-by: Vardhan Vinay Thigle <39047439+VardhanThigle@users.noreply.github.com> Co-authored-by: Astha Mohta <35952883+asthamohta@users.noreply.github.com> Co-authored-by: Jack McCluskey <34928439+jrmccluskey@users.noreply.github.com> Co-authored-by: Yi Hu <yathu@google.com> Co-authored-by: jjfox15 <seanfox@google.com> Co-authored-by: vgnanasekaran <venku123@gmail.com> Co-authored-by: Danny McCormick <dannymccormick@google.com> Co-authored-by: shreyakhajanchi <92910380+shreyakhajanchi@users.noreply.github.com> Co-authored-by: Rudra-Gujarathi <rudragujarathi@google.com> Co-authored-by: Derrick Williams <derrickaw@google.com> Co-authored-by: darshan-sj <darshan-sj@users.noreply.github.com> Co-authored-by: Svetak Sundhar <svetaksundhar@google.com> Co-authored-by: Shunping Huang <shunping@google.com> Co-authored-by: Andrej Galad <dedo.cibula@gmail.com>

* ADDED Missing Combination * Address the assert the same * Schema Fixes * Schema FIxes * Added SCHEMA FIXES * Schema Correction * Added Fixes * Added Schema Fixes

akashthawaitcc requested a review from a team as a code owner March 22, 2025 10:56

akashthawaitcc requested review from asthamohta and bharadwaj-aditya March 22, 2025 10:56

pull-request-size bot added the size/L label Mar 22, 2025

akashthawaitcc changed the title ~~Bug fixes on handling null values and added missing IT~~ Bug fixes of handling null values and added missing IT Mar 22, 2025

VardhanThigle reviewed Mar 25, 2025

View reviewed changes

...b/src/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java Outdated Show resolved Hide resolved

VardhanThigle reviewed Mar 25, 2025

View reviewed changes

...rcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceDbIT.java Show resolved Hide resolved

VardhanThigle added the ignore-for-release label Mar 28, 2025

taherkl force-pushed the acceptance_test_fix branch from 86ae5a8 to 9555b3e Compare April 1, 2025 12:38

taherkl requested review from a team as code owners April 1, 2025 12:38

pull-request-size bot added size/XXL size/L and removed size/L size/XXL labels Apr 1, 2025

akashthawaitcc closed this Apr 1, 2025

akashthawaitcc reopened this Apr 1, 2025

taherkl force-pushed the acceptance_test_fix branch from 2a84373 to 4908234 Compare April 1, 2025 13:23

VardhanThigle previously approved these changes Apr 1, 2025

View reviewed changes

VardhanThigle reviewed Apr 2, 2025

View reviewed changes

...m-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerIT.java Show resolved Hide resolved

taherkl dismissed VardhanThigle’s stale review via bae1942 April 2, 2025 05:36

taherkl force-pushed the acceptance_test_fix branch from 1f7c863 to 9071586 Compare April 2, 2025 09:21

akashthawaitcc and others added 5 commits April 2, 2025 14:52

ADDED Missing Combination (#160)

580f25c

Adding missing col combination assert for empty (#161)

157f085

* ADDED Missing Combination * Address the assert the same * Schema Fixes * Schema FIxes * Added SCHEMA FIXES * Schema Correction * Added Fixes * Added Schema Fixes

Adding InsertOnly Mode for Bulk job (GoogleCloudPlatform#2260)

488b0da

Adding Lgs

34723e2

pawankashyapollion and others added 3 commits April 2, 2025 14:53

Handle Null Explicit

67d4d0f

removed logs

12f9584

revert ignore change

51d7167

taherkl force-pushed the acceptance_test_fix branch from 9071586 to 51d7167 Compare April 2, 2025 09:23

taherkl and others added 2 commits April 2, 2025 14:56

revert additional changes

1dd8d44

Added UT for Null and Empty Case (#171)

8dedb69

pull-request-size bot added size/XL and removed size/L labels Apr 2, 2025

VardhanThigle approved these changes Apr 2, 2025

View reviewed changes

VardhanThigle merged commit 4f920fb into GoogleCloudPlatform:main Apr 3, 2025
23 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug fixes of handling null values and added missing IT #2268

Bug fixes of handling null values and added missing IT #2268

Uh oh!

akashthawaitcc commented Mar 22, 2025

Uh oh!

google-cla bot commented Mar 22, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Apr 2, 2025 •

edited

Loading

Uh oh!

VardhanThigle commented Apr 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Bug fixes of handling null values and added missing IT #2268

Bug fixes of handling null values and added missing IT #2268

Uh oh!

Conversation

akashthawaitcc commented Mar 22, 2025

Uh oh!

google-cla bot commented Mar 22, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

VardhanThigle commented Apr 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Apr 2, 2025 •

edited

Loading