PHP-152 - Add duration support to composite types

Author: mpenick

ext/src/Duration.c

@@ -2,6 +2,7 @@
 #include "php_driver_globals.h"
 #include "php_driver_types.h"
 
+#include "util/hash.h"
 #include "util/math.h"
 #include "util/types.h"
 
@@ -215,7 +216,7 @@ static zend_function_entry php_driver_duration_methods[] = {
   PHP_FE_END
 };
 
-static zend_object_handlers php_driver_duration_handlers;
+static php_driver_value_handlers php_driver_duration_handlers;
 
 static HashTable *
 php_driver_duration_properties(zval *object TSRMLS_DC)
@@ -270,6 +271,19 @@ php_driver_duration_compare(zval *obj1, zval *obj2 TSRMLS_DC)
   return (left->nanos == right->nanos) ? 0 : 1;
 }
 
+static unsigned
+php_driver_duration_hash_value(zval *obj TSRMLS_DC)
+{
+  php_driver_duration *self = PHP_DRIVER_GET_DURATION(obj);
+  unsigned hashv = 0;
+
+  hashv = php_driver_combine_hash(hashv, (unsigned) self->months);
+  hashv = php_driver_combine_hash(hashv, (unsigned) self->days);
+  hashv = php_driver_combine_hash(hashv, (unsigned) self->nanos);
+
+  return hashv;
+}
+
 static void
 php_driver_duration_free(php5to7_zend_object_free *object TSRMLS_DC)
 {
@@ -300,7 +314,9 @@ void php_driver_define_Duration(TSRMLS_D)
   php_driver_duration_ce->create_object = php_driver_duration_new;
 
   memcpy(&php_driver_duration_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-  php_driver_duration_handlers.get_properties  = php_driver_duration_properties;
-  php_driver_duration_handlers.compare_objects = php_driver_duration_compare;
-  php_driver_duration_handlers.clone_obj = NULL;
+  php_driver_duration_handlers.std.get_properties  = php_driver_duration_properties;
+  php_driver_duration_handlers.std.compare_objects = php_driver_duration_compare;
+
+  php_driver_duration_handlers.hash_value = php_driver_duration_hash_value;
+  php_driver_duration_handlers.std.clone_obj = NULL;
 }

ext/util/collections.c

@@ -108,6 +108,12 @@ php_driver_validate_object(zval *object, zval *ztype TSRMLS_DC)
       EXPECTING_VALUE("an instance of " PHP_DRIVER_NAMESPACE "\\Decimal");
     }
 
+    return 1;
+  case CASS_VALUE_TYPE_DURATION:
+    if (!INSTANCE_OF(php_driver_duration_ce)) {
+      EXPECTING_VALUE("an instance of " PHP_DRIVER_NAMESPACE "\\Duration");
+    }
+
     return 1;
   case CASS_VALUE_TYPE_TIMESTAMP:
     if (!INSTANCE_OF(php_driver_timestamp_ce)) {
@@ -237,6 +243,8 @@ php_driver_value_type(char *type, CassValueType *value_type TSRMLS_DC)
     *value_type = CASS_VALUE_TYPE_COUNTER;
   } else if (strcmp("decimal", type) == 0) {
     *value_type = CASS_VALUE_TYPE_DECIMAL;
+  } else if (strcmp("duration", type) == 0) {
+    *value_type = CASS_VALUE_TYPE_DURATION;
   } else if (strcmp("double", type) == 0) {
     *value_type = CASS_VALUE_TYPE_DOUBLE;
   } else if (strcmp("float", type) == 0) {
@@ -281,6 +289,7 @@ php_driver_collection_append(CassCollection *collection, zval *value, CassValueT
   php_driver_time       *time;
   php_driver_uuid       *uuid;
   php_driver_inet       *inet;
+  php_driver_duration   *duration;
   size_t                size;
   cass_byte_t          *data;
   php_driver_collection *coll;
@@ -361,6 +370,10 @@ php_driver_collection_append(CassCollection *collection, zval *value, CassValueT
     CHECK_ERROR(cass_collection_append_decimal(collection, data, size, numeric->data.decimal.scale));
     free(data);
     break;
+  case CASS_VALUE_TYPE_DURATION:
+    duration = PHP_DRIVER_GET_DURATION(value);
+    CHECK_ERROR(cass_collection_append_duration(collection, duration->months, duration->days, duration->nanos));
+    break;
   case CASS_VALUE_TYPE_INET:
     inet = PHP_DRIVER_GET_INET(value);
     CHECK_ERROR(cass_collection_append_inet(collection, inet->inet));
@@ -414,6 +427,7 @@ php_driver_tuple_set(CassTuple *tuple, php5to7_ulong index, zval *value, CassVal
   php_driver_time       *time;
   php_driver_uuid       *uuid;
   php_driver_inet       *inet;
+  php_driver_duration   *duration;
   size_t                size;
   cass_byte_t          *data;
   php_driver_collection *coll;
@@ -499,6 +513,10 @@ php_driver_tuple_set(CassTuple *tuple, php5to7_ulong index, zval *value, CassVal
     CHECK_ERROR(cass_tuple_set_decimal(tuple, index, data, size, numeric->data.decimal.scale));
     free(data);
     break;
+  case CASS_VALUE_TYPE_DURATION:
+    duration = PHP_DRIVER_GET_DURATION(value);
+    CHECK_ERROR(cass_tuple_set_duration(tuple, index, duration->months, duration->days, duration->nanos));
+    break;
   case CASS_VALUE_TYPE_INET:
     inet = PHP_DRIVER_GET_INET(value);
     CHECK_ERROR(cass_tuple_set_inet(tuple, index, inet->inet));
@@ -554,6 +572,7 @@ php_driver_user_type_set(CassUserType *ut,
   php_driver_time       *time;
   php_driver_uuid       *uuid;
   php_driver_inet       *inet;
+  php_driver_duration   *duration;
   size_t                size;
   cass_byte_t          *data;
   php_driver_collection *coll;
@@ -639,6 +658,10 @@ php_driver_user_type_set(CassUserType *ut,
     CHECK_ERROR(cass_user_type_set_decimal_by_name(ut, name, data, size, numeric->data.decimal.scale));
     free(data);
     break;
+  case CASS_VALUE_TYPE_DURATION:
+    duration = PHP_DRIVER_GET_DURATION(value);
+    CHECK_ERROR(cass_user_type_set_duration_by_name(ut, name, duration->months, duration->days, duration->nanos));
+    break;
   case CASS_VALUE_TYPE_INET:
     inet = PHP_DRIVER_GET_INET(value);
     CHECK_ERROR(cass_user_type_set_inet_by_name(ut, name, inet->inet));