JAVA-1347: Add support for duration type (apache#776)

Author: adutra

changelog/README.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+### 3.2.0 (in progress)
+
+- [new feature] JAVA-1347: Add support for duration type.
+
+
 ### 3.1.3
 
 Merged from 3.0.x branch:

driver-core/src/main/java/com/datastax/driver/core/CodecRegistry.java

@@ -161,7 +161,8 @@ public final class CodecRegistry {
             TypeCodec.time(),
             TypeCodec.uuid(), // must be declared before TimeUUIDCodec so it gets chosen when CQL type not available
             TypeCodec.timeUUID(),
-            TypeCodec.inet()
+            TypeCodec.inet(),
+            TypeCodec.duration()
     );
 
     /**

driver-core/src/main/java/com/datastax/driver/core/DataType.java

@@ -488,7 +488,7 @@ public static CollectionType frozenMap(DataType keyType, DataType valueType) {
      * Returns a Custom type.
      * <p/>
      * A custom type is defined by the name of the class used on the Cassandra
-     * side to implement it. Note that the support for custom type by the
+     * side to implement it. Note that the support for custom types by the
      * driver is limited.
      * <p/>
      * The use of custom types is rarely useful and is thus not encouraged.
@@ -499,7 +499,22 @@ public static CollectionType frozenMap(DataType keyType, DataType valueType) {
     public static DataType.CustomType custom(String typeClassName) {
         if (typeClassName == null)
             throw new NullPointerException();
-        return new DataType.CustomType(Name.CUSTOM, typeClassName);
+        return DataTypeClassNameParser.isDuration(typeClassName)
+                ? DataType.duration()
+                : new DataType.CustomType(Name.CUSTOM, typeClassName);
+    }
+
+    /**
+     * Returns the Duration type, introduced in Cassandra 3.10.
+     * <p/>
+     * Note that a Duration type does not have a native representation in CQL, and
+     * technically, is merely a special {@link DataType#custom(String) custom type}
+     * from the driver's point of view.
+     *
+     * @return the Duration type. The returned instance is a singleton.
+     */
+    public static DurationType duration() {
+        return DurationType.instance;
     }
 
     /**
@@ -759,4 +774,25 @@ public String toString() {
             return String.format("'%s'", customClassName);
         }
     }
+
+    /**
+     * The Duration type, introduced in Cassandra 3.10.
+     * <p/>
+     * This class is a singleton; to obtain its unique instance,
+     * call {@link #duration()}.
+     */
+    public static class DurationType extends CustomType {
+
+        private static final DurationType instance = new DurationType();
+
+        private DurationType() {
+            super(Name.CUSTOM, "org.apache.cassandra.db.marshal.DurationType");
+        }
+
+        @Override
+        public String toString() {
+            return "duration";
+        }
+    }
+
 }

driver-core/src/main/java/com/datastax/driver/core/DataTypeClassNameParser.java

@@ -48,6 +48,7 @@ class DataTypeClassNameParser {
     private static final String MAP_TYPE = "org.apache.cassandra.db.marshal.MapType";
     private static final String UDT_TYPE = "org.apache.cassandra.db.marshal.UserType";
     private static final String TUPLE_TYPE = "org.apache.cassandra.db.marshal.TupleType";
+    private static final String DURATION_TYPE = "org.apache.cassandra.db.marshal.DurationType";
 
     private static ImmutableMap<String, DataType> cassTypeToDataType =
             new ImmutableMap.Builder<String, DataType>()
@@ -70,6 +71,7 @@ class DataTypeClassNameParser {
                     .put("org.apache.cassandra.db.marshal.TimeUUIDType", DataType.timeuuid())
                     .put("org.apache.cassandra.db.marshal.ByteType", DataType.tinyint())
                     .put("org.apache.cassandra.db.marshal.ShortType", DataType.smallint())
+                    .put(DURATION_TYPE, DataType.duration())
                     .build();
 
     static DataType parseOne(String className, ProtocolVersion protocolVersion, CodecRegistry codecRegistry) {
@@ -161,6 +163,10 @@ private static boolean isCollection(String className) {
         return className.startsWith(COLLECTION_TYPE);
     }
 
+    public static boolean isDuration(String className) {
+        return className.equals(DURATION_TYPE);
+    }
+
     static ParseResult parseWithComposite(String className, ProtocolVersion protocolVersion, CodecRegistry codecRegistry) {
         Parser parser = new Parser(className, 0);
 
@@ -285,9 +291,7 @@ public List<String> getTypeParameters() {
                 try {
                     list.add(readOne());
                 } catch (DriverInternalError e) {
-                    DriverInternalError ex = new DriverInternalError(String.format("Exception while parsing '%s' around char %d", str, idx));
-                    ex.initCause(e);
-                    throw ex;
+                    throw new DriverInternalError(String.format("Exception while parsing '%s' around char %d", str, idx), e);
                 }
             }
             throw new DriverInternalError(String.format("Syntax error parsing '%s' at char %d: unexpected end of string", str, idx));
@@ -333,9 +337,7 @@ public Map<String, String> getNameAndTypeParameters() {
                 try {
                     map.put(name, readOne());
                 } catch (DriverInternalError e) {
-                    DriverInternalError ex = new DriverInternalError(String.format("Exception while parsing '%s' around char %d", str, idx));
-                    ex.initCause(e);
-                    throw ex;
+                    throw new DriverInternalError(String.format("Exception while parsing '%s' around char %d", str, idx), e);
                 }
             }
             throw new DriverInternalError(String.format("Syntax error parsing '%s' at char %d: unexpected end of string", str, idx));
@@ -391,11 +393,6 @@ public String readNextIdentifier() {
             return str.substring(i, idx);
         }
 
-        public char readNextChar() {
-            skipBlank();
-            return str.charAt(idx++);
-        }
-
         @Override
         public String toString() {
             return str.substring(0, idx) + "[" + (idx == str.length() ? "" : str.charAt(idx)) + "]" + str.substring(idx + 1);

driver-core/src/main/java/com/datastax/driver/core/DataTypeCqlNameParser.java

@@ -65,6 +65,8 @@ class DataTypeCqlNameParser {
                     .put("timeuuid", timeuuid())
                     .put("tinyint", tinyint())
                     .put("smallint", smallint())
+                    // duration is not really a native CQL type, but appears as so in system tables
+                    .put("duration", duration())
                     .build();
 
     /**