nested vector passed

Author: SiyaoIsHiding

core/src/main/java/com/datastax/oss/driver/api/core/type/DataTypes.java

@@ -69,12 +69,20 @@ public static DataType custom(@NonNull String className) {
 
     /* Vector support is currently implemented as a custom type but is also parameterized */
     if (className.startsWith(DefaultVectorType.VECTOR_CLASS_NAME)) {
-      List<String> params =
-          paramSplitter.splitToList(
-              className.substring(
-                  DefaultVectorType.VECTOR_CLASS_NAME.length() + 1, className.length() - 1));
-      DataType subType = classNameParser.parse(params.get(0), AttachmentPoint.NONE);
-      int dimensions = Integer.parseInt(params.get(1));
+      String paramsString = className.substring(
+              DefaultVectorType.VECTOR_CLASS_NAME.length() + 1, className.length() - 1);
+      int lastCommaIndex = paramsString.lastIndexOf(',');
+      if (lastCommaIndex == -1) {
+        throw new IllegalArgumentException(
+            String.format(
+                "Invalid vector type %s, expected format is %s<subtype, dimensions>",
+                className, DefaultVectorType.VECTOR_CLASS_NAME));
+      }
+      String subTypeString = paramsString.substring(0, lastCommaIndex).trim();
+      String dimensionsString = paramsString.substring(lastCommaIndex + 1).trim();
+
+      DataType subType = classNameParser.parse(subTypeString, AttachmentPoint.NONE);
+      int dimensions = Integer.parseInt(dimensionsString);
       if (dimensions <= 0) {
         throw new IllegalArgumentException(
             String.format(

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VectorCodec.java

@@ -25,6 +25,7 @@
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
 import com.datastax.oss.driver.internal.core.type.DefaultVectorType;
 import com.datastax.oss.driver.internal.core.type.util.VIntCoding;
+import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import com.datastax.oss.driver.shaded.guava.common.collect.Iterables;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -69,6 +70,11 @@ public GenericType<CqlVector<SubtypeT>> getJavaType() {
     return this.javaType;
   }
 
+  @NonNull
+  public Optional<Integer> serializedSize(){
+    return subtypeCodec.serializedSize().isPresent() ? Optional.of(subtypeCodec.serializedSize().get() * cqlType.getDimensions()) : Optional.absent();
+  }
+
   @NonNull
   @Override
   public DataType getCqlType() {

core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistryTestDataProviders.java

@@ -337,6 +337,11 @@ public static Object[][] collectionsWithCqlAndJavaTypes()
         GenericType.vectorOf(BigInteger.class),
         CqlVector.newInstance(BigInteger.ONE)
       },
+//      // vector with arbitrary types
+//      {
+//        DataTypes.vectorOf(DataTypes.listOf(DataTypes.INT), 1),
+//
+//      }
     };
   }
 

integration-tests/src/test/java/com/datastax/oss/driver/core/data/DataTypeIT.java

@@ -271,6 +271,11 @@ public static Object[][] typeSamples() {
                 samples.add(new Object[] {DataTypes.vectorOf(dataType, 1), vector});
               }
 
+              if (o[1].equals("ascii")){
+                // once
+                CqlVector<?> vector = CqlVector.newInstance(CqlVector.newInstance(1, 2));
+                samples.add(new Object[] {DataTypes.vectorOf(DataTypes.vectorOf(DataTypes.INT, 2), 1), vector});
+              }
               return samples.stream();
             })
         .toArray(Object[][]::new);