This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
The following commit(s) were added to refs/heads/4.x by this push:
new 348dce6bb Fix TableMetadata.describe() when containing a vector column
348dce6bb is described below
commit 348dce6bbc7c4914ce808f28a44f04901a8b5750
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Wed Oct 23 22:23:39 2024 +0200
Fix TableMetadata.describe() when containing a vector column
patch by Stefan Miklosovic; reviewed by TBD for CASSJAVA-2
---
.../internal/core/type/DefaultVectorType.java | 2 +-
.../core/metadata/schema/TableMetadataTest.java | 67 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java
b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java
index 5915adc2f..c9180d44e 100644
---
a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java
+++
b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java
@@ -60,7 +60,7 @@ public class DefaultVectorType implements VectorType {
@NonNull
@Override
public String asCql(boolean includeFrozen, boolean pretty) {
- return String.format("'%s(%d)'", getClassName(), getDimensions());
+ return String.format("vector<%s, %d>", getElementType().asCql(true,
false), getDimensions());
}
/* ============== General class implementation ============== */
diff --git
a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/TableMetadataTest.java
b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/TableMetadataTest.java
new file mode 100644
index 000000000..03d632309
--- /dev/null
+++
b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/TableMetadataTest.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.datastax.oss.driver.internal.core.metadata.schema;
+
+import static com.datastax.oss.driver.api.core.CqlIdentifier.fromCql;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata;
+import com.datastax.oss.driver.internal.core.type.DefaultVectorType;
+import com.datastax.oss.driver.internal.core.type.PrimitiveType;
+import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
+import com.datastax.oss.protocol.internal.ProtocolConstants.DataType;
+import com.google.common.collect.ImmutableList;
+import java.util.UUID;
+import org.junit.Test;
+
+public class TableMetadataTest {
+
+ /** Tests CASSJAVA-2 */
+ @Test
+ public void should_describe_table_with_vector_correctly() {
+ TableMetadata tableMetadata =
+ new DefaultTableMetadata(
+ fromCql("ks"),
+ fromCql("tb"),
+ UUID.randomUUID(),
+ false,
+ false,
+ ImmutableList.of(
+ new DefaultColumnMetadata(
+ fromCql("ks"),
+ fromCql("ks"),
+ fromCql("tb"),
+ new PrimitiveType(DataType.ASCII),
+ false)),
+ ImmutableMap.of(),
+ ImmutableMap.of(
+ fromCql("a"),
+ new DefaultColumnMetadata(
+ fromCql("ks"),
+ fromCql("ks"),
+ fromCql("tb"),
+ new DefaultVectorType(new PrimitiveType(DataType.INT), 3),
+ false)),
+ ImmutableMap.of(),
+ ImmutableMap.of());
+
+ String describe1 = tableMetadata.describe(true);
+
+ assertThat(describe1).contains("vector<int, 3>,");
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
