Add separate php_properties attr

Author: danog

php_phongo.h

@@ -62,14 +62,17 @@ zend_object_handlers* phongo_get_std_object_handlers(void);
 
 #define PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size) \
 	do {                                                                  \
-		if (is_temp) {                                                    \
+		if (!(intern)->php_properties) {                                  \
 			ALLOC_HASHTABLE(props);                                       \
 			zend_hash_init((props), (size), NULL, ZVAL_PTR_DTOR, 0);      \
-		} else if ((intern)->properties) {                                \
-			(props) = (intern)->properties;                               \
+		}                                                                 \
+		if (is_temp) {                                                    \
+			(props) = zend_array_dup((intern)->php_properties);           \
 		} else {                                                          \
-			ALLOC_HASHTABLE(props);                                       \
-			zend_hash_init((props), (size), NULL, ZVAL_PTR_DTOR, 0);      \
+			if ((intern)->properties) {                                   \
+				zend_hash_release(intern->properties);                    \
+			}                                                             \
+			(props) = zend_array_dup((intern)->php_properties);           \
 			(intern)->properties = (props);                               \
 		}                                                                 \
 	} while (0)

src/phongo_structs.h

@@ -122,12 +122,14 @@ typedef struct {
 typedef struct {
 	mongoc_read_concern_t* read_concern;
 	HashTable*             properties;
+	HashTable*             php_properties;
 	zend_object            std;
 } php_phongo_readconcern_t;
 
 typedef struct {
 	mongoc_read_prefs_t* read_preference;
 	HashTable*           properties;
+	HashTable*           php_properties;
 	zend_object          std;
 } php_phongo_readpreference_t;
 
@@ -141,12 +143,14 @@ typedef struct {
 typedef struct {
 	mongoc_server_api_t* server_api;
 	HashTable*           properties;
+	HashTable*           php_properties;
 	zend_object          std;
 } php_phongo_serverapi_t;
 
 typedef struct {
 	mongoc_server_description_t* server_description;
 	HashTable*                   properties;
+	HashTable*                   php_properties;
 	zend_object                  std;
 } php_phongo_serverdescription_t;
 
@@ -160,11 +164,13 @@ typedef struct {
 typedef struct {
 	mongoc_topology_description_t* topology_description;
 	HashTable*                     properties;
+	HashTable*                     php_properties;
 	zend_object                    std;
 } php_phongo_topologydescription_t;
 
 typedef struct {
 	HashTable*              properties;
+	HashTable*              php_properties;
 	mongoc_write_concern_t* write_concern;
 	zend_object             std;
 } php_phongo_writeconcern_t;
@@ -197,18 +203,21 @@ typedef struct {
 	int         data_len;
 	uint8_t     type;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_binary_t;
 
 typedef struct {
 	bson_t*     bson;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_packedarray_t;
 
 typedef struct {
 	bson_t*     bson;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_document_t;
 
@@ -220,6 +229,7 @@ typedef struct {
 	size_t      key;
 	zval        current;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_iterator_t;
 
@@ -228,20 +238,23 @@ typedef struct {
 	size_t      ref_len;
 	char        id[25];
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_dbpointer_t;
 
 typedef struct {
 	bool              initialized;
 	bson_decimal128_t decimal;
 	HashTable*        properties;
+	HashTable*        php_properties;
 	zend_object       std;
 } php_phongo_decimal128_t;
 
 typedef struct {
 	bool        initialized;
 	int64_t     integer;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_int64_t;
 
@@ -250,6 +263,7 @@ typedef struct {
 	size_t      code_len;
 	bson_t*     scope;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_javascript_t;
 
@@ -265,6 +279,7 @@ typedef struct {
 	bool        initialized;
 	char        oid[25];
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_objectid_t;
 
@@ -274,13 +289,15 @@ typedef struct {
 	char*       flags;
 	int         flags_len;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_regex_t;
 
 typedef struct {
 	char*       symbol;
 	size_t      symbol_len;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_symbol_t;
 
@@ -289,6 +306,7 @@ typedef struct {
 	uint32_t    increment;
 	uint32_t    timestamp;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_timestamp_t;
 
@@ -300,6 +318,7 @@ typedef struct {
 	bool        initialized;
 	int64_t     milliseconds;
 	HashTable*  properties;
+	HashTable*  php_properties;
 	zend_object std;
 } php_phongo_utcdatetime_t;