From f43908509b7d56d0a37035dd52e091a81b0dd9be Mon Sep 17 00:00:00 2001 From: Madhavan Date: Fri, 19 Dec 2025 13:28:08 -0500 Subject: [PATCH 1/2] Update dependencies C* 3.x,4.x,DSE,Java Driver --- agent-c3/build.gradle | 4 ++-- agent-c4/build.gradle | 4 ++-- agent-dse4/build.gradle | 4 ++-- connector/build.gradle | 6 +++--- gradle.properties | 4 ++-- testcontainers/build.gradle | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/agent-c3/build.gradle b/agent-c3/build.gradle index 279f4d04..922f99cd 100644 --- a/agent-c3/build.gradle +++ b/agent-c3/build.gradle @@ -47,8 +47,8 @@ dependencies { exclude group: 'io.netty' } - testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}" - testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}" + testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}" + testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}" testImplementation "org.testcontainers:testcontainers:${testContainersVersion}" testImplementation project(':testcontainers') diff --git a/agent-c4/build.gradle b/agent-c4/build.gradle index b8956460..1ed8bbfa 100644 --- a/agent-c4/build.gradle +++ b/agent-c4/build.gradle @@ -54,8 +54,8 @@ dependencies { exclude group: 'io.netty' } - testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}" - testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}" + testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}" + testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}" testImplementation "org.testcontainers:testcontainers:${testContainersVersion}" testImplementation project(':testcontainers') diff --git a/agent-dse4/build.gradle b/agent-dse4/build.gradle index 1b91f0b1..e9ba19c9 100644 --- a/agent-dse4/build.gradle +++ b/agent-dse4/build.gradle @@ -53,8 +53,8 @@ dependencies { exclude group: 'io.netty' } - testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}" - testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}" + testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}" + testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}" testImplementation "org.testcontainers:testcontainers:${testContainersVersion}" testImplementation project(':testcontainers') diff --git a/connector/build.gradle b/connector/build.gradle index 3b57fe8a..e8bf1ae1 100644 --- a/connector/build.gradle +++ b/connector/build.gradle @@ -33,8 +33,8 @@ dependencies { implementation project(':commons') implementation("com.github.ben-manes.caffeine:caffeine:${caffeineVersion}") implementation("io.vavr:vavr:${vavrVersion}") - implementation "com.datastax.oss:java-driver-core:${ossDriverVersion}" - implementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}" + implementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}" + implementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}" implementation("org.apache.kafka:connect-api:${kafkaVersion}") implementation("com.google.guava:guava:${guavaVersion}") implementation("com.datastax.oss:messaging-connectors-commons-core:${messagingConnectorsCommonsVersion}") @@ -62,7 +62,7 @@ dependencies { testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}" - testImplementation("com.datastax.oss:dsbulk-tests:1.6.0") + testImplementation("com.datastax.oss:dsbulk-tests:${dsbulkVersion}") testImplementation("org.reactivestreams:reactive-streams:1.0.3") testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.2") testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2") diff --git a/gradle.properties b/gradle.properties index 8762d9d6..4d041e90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ releasesRepoUrl=https://repo.datastax.com/artifactory/datastax-public-releases-l # deps version avroVersion=1.11.4 lombokVersion=1.18.20 -ossDriverVersion=4.16.0 +ossDriverVersion=4.19.2 cassandra3Version=3.11.10 cassandra4Version=4.0.4 dse4Version=6.8.23 @@ -45,4 +45,4 @@ cdc_total_space_in_mb=70 dockerRepo=myrepo/ # CDC backfilling Client -dsbulkVersion=1.10.0 +dsbulkVersion=1.11.0 diff --git a/testcontainers/build.gradle b/testcontainers/build.gradle index 2a574281..aca55b7b 100644 --- a/testcontainers/build.gradle +++ b/testcontainers/build.gradle @@ -38,7 +38,7 @@ dependencies { implementation("org.apache.avro:avro:${avroVersion}") implementation("commons-io:commons-io:2.8.0") - implementation("com.datastax.oss:java-driver-core:${ossDriverVersion}") { + implementation("org.apache.cassandra:java-driver-core:${ossDriverVersion}") { // fasterxml 2.12 not compatible for com.github.docker-java exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core' exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind' From 1222909fbfaf6239f9bcf5e3b1f3c60dbc167684 Mon Sep 17 00:00:00 2001 From: Madhavan Date: Fri, 19 Dec 2025 17:59:09 -0500 Subject: [PATCH 2/2] Update with CqlVector enhancements --- .../converters/AbstractNativeConverter.java | 10 ++++----- .../converters/NativeAvroConverter.java | 21 +++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/connector/src/main/java/com/datastax/oss/pulsar/source/converters/AbstractNativeConverter.java b/connector/src/main/java/com/datastax/oss/pulsar/source/converters/AbstractNativeConverter.java index ab948117..2a3fea9a 100644 --- a/connector/src/main/java/com/datastax/oss/pulsar/source/converters/AbstractNativeConverter.java +++ b/connector/src/main/java/com/datastax/oss/pulsar/source/converters/AbstractNativeConverter.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata; import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata; import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; -import com.datastax.oss.driver.api.core.type.CqlVectorType; +import com.datastax.oss.driver.api.core.type.VectorType; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.ListType; import com.datastax.oss.driver.api.core.type.MapType; @@ -77,7 +77,7 @@ public AbstractNativeConverter(KeyspaceMetadata ksm, TableMetadata tm, List vector = row.getCqlVector(fieldName); + CqlVector vector = row.getVector(fieldName); log.debug("field={} vectorSchema={} vectorValue={}", fieldName, vectorSchema, vector); List vectorValue = new ArrayList<>(); - vector.getValues().forEach(vectorValue::add); + vector.forEach(vectorValue::add); genericRecordBuilder.put(fieldName, buildArrayValue(vectorSchema, vectorValue)); } } @@ -301,6 +301,19 @@ GenericRecord buildUDTValue(Schema udtSchema, UdtValue udtValue) { genericRecord.put(field.toString(), mapValue); } break; + case ProtocolConstants.DataType.CUSTOM: { + if (udtValue.getType(field) instanceof VectorType) { + VectorType vectorType = (VectorType) udtValue.getType(field); + CqlVector vector = udtValue.getVector(field); + String path = typeName + "." + field.toString(); + Schema elementSchema = subSchemas.get(path); + List vectorValue = new ArrayList<>(); + vector.forEach(vectorValue::add); + log.debug("path={} elementSchema={} vectorType={} vectorValue={}", path, elementSchema, vectorType, vectorValue); + genericRecord.put(field.toString(), buildArrayValue(elementSchema, vectorValue)); + } + } + break; default: log.debug("Ignoring unsupported type field name={} type={}", field, dataType.asCql(false, true)); }