Added UDT support

Author: pravinbhat

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>com.datastax.spark.example</groupId>
   <artifactId>migrate</artifactId>
-  <version>0.10</version>
+  <version>0.11</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -189,4 +189,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>

src/main/java/datastax/astra/migrate/AbstractJobSession.java

@@ -4,7 +4,6 @@
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
 import com.datastax.oss.driver.api.core.cql.Row;
-import com.datastax.oss.driver.api.core.data.TupleValue;
 import com.datastax.oss.driver.shaded.guava.common.util.concurrent.RateLimiter;
 import org.apache.log4j.Logger;
 import org.apache.spark.SparkConf;
@@ -190,10 +189,6 @@ public Object getData(MigrateDataType dataType, int index, Row sourceRow) {
             if (data == null) {
                 return new Long(0);
             }
-        } else if (dataType.typeClass == TupleValue.class) {
-            return sourceRow.getTupleValue(index);
-        } else if (dataType.typeClass == Object.class) {
-            return sourceRow.getObject(index);
         }
 
         return sourceRow.get(index, dataType.typeClass);

src/main/java/datastax/astra/migrate/CopyJobSession.java

@@ -2,8 +2,6 @@
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.*;
-import com.datastax.oss.driver.internal.core.metadata.token.Murmur3Token;
-import com.datastax.oss.driver.internal.core.metadata.token.RandomToken;
 import org.apache.log4j.Logger;
 import org.apache.spark.SparkConf;
 

src/main/java/datastax/astra/migrate/MigrateDataType.java

@@ -1,6 +1,7 @@
 package datastax.astra.migrate;
 
 import com.datastax.oss.driver.api.core.data.TupleValue;
+import com.datastax.oss.driver.api.core.data.UdtValue;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -75,6 +76,8 @@ private Class getType(int type) {
                 return BigDecimal.class;
             case 15:
                 return LocalDate.class;
+            case 16:
+                return UdtValue.class;
         }
 
         return Object.class;

src/main/java/datastax/astra/migrate/SplitPartitions.java

@@ -1,9 +1,6 @@
 package datastax.astra.migrate;
 
-import com.datastax.oss.driver.internal.core.metadata.token.RandomToken;
-import com.datastax.spark.connector.rdd.partitioner.dht.TokenFactory;
 import org.apache.log4j.Logger;
-import scala.math.BigInt;
 
 import java.io.Serializable;
 import java.math.BigInteger;

src/resources/sparkConf.properties

@@ -48,21 +48,23 @@ spark.migrate.astra.data.keyspaceTable                          test.grid_test2
 
 ########################################################################################################################
 # Following are the supported data types and their corresponding [Cassandra data-types]
-#  0: String
-#  1: Integer
-#  2: Long
-#  3: Double
-#  4: Instant (datetime)
-#  5: Map (separate type by %) - Example: 5%1%0 for map<int, text>
-#  6: List (separate type by %) - Example: 6%0 for list<text>
-#  7: ByteBuffer (Blob)
-#  8: Set (seperate type by %) - Example: 8%0 for set<text>
-#  9: UUID
-# 10: Boolean
-# 11: TupleValue
-# 12: Float
-# 13: TinyInt
+# 0: String [ascii, text, varchar]
+# 1: Integer [int, smallint]
+# 2: Long [bigint, counter]
+# 3: Double [double]
+# 4: Instant [time, timestamp]
+# 5: Map (separate type by %) [map] - Example: 5%1%0 for map<int, text>
+# 6: List (separate type by %) [list] - Example: 6%0 for list<text>
+# 7: ByteBuffer [blob]
+# 8: Set (seperate type by %) [set] - Example: 8%0 for set<text>
+# 9: UUID [uuid, timeuuid]
+# 10: Boolean [boolean]
+# 11: TupleValue [tuple]
+# 12: Float (float)
+# 13: TinyInt [tinyint]
 # 14: BigDecimal (decimal)
+# 15: LocalDate (date)
+# 16: UDT [any user-defined-type created using 'CREATE TYPE']
 #
 # Note:
 # Enable "spark.migrate.preserveTTLWriteTime" only if you want to migrate writetimes and TTLs