Added support for 'map' type

Author: igorcoding

temp/demo.pl

@@ -57,13 +57,13 @@
 $c->connect;
 EV::loop;
 
-say "DISCONNECT";
-$c->disconnect;
-EV::loop;
+# say "DISCONNECT";
+# $c->disconnect;
+# EV::loop;
 
-say "CONNECT 2";
-$c->connect;
-EV::loop;
+# say "CONNECT 2";
+# $c->connect;
+# EV::loop;
 
 # $c->update('tester', ['a1', 'a2', 12], [ [2 => '=', 18] ], sub {
 # 	say Dumper \@_;
@@ -83,12 +83,31 @@
 # });
 # EV::loop;
 
-$c->select('_space', ['_space'], {index => 'name'}, sub {
+my $data = {
+	id => 2,
+	d => {
+		a => 2
+	},
+};
+
+$c->insert('test', $data, sub {
+	say Dumper \@_;
+	EV::unloop;
+});
+EV::loop;
+
+$c->select('test', [], sub {
 	say Dumper \@_;
 	EV::unloop;
 });
 EV::loop;
 
+# $c->select('_vspace', ['_vspace'], {index => 'name'}, sub {
+# 	say Dumper \@_;
+# 	EV::unloop;
+# });
+# EV::loop;
+
 # $c->insert('memier', [7, {a => 1, b => 2}], { in => 's*' }, sub {
 # 	say Dumper \@_;
 # 	EV::unloop;

xstnt/encdec.h

@@ -140,6 +140,22 @@ static SV *types_true, *types_false;
 } STMT_END
 
 
+#define encode_HV(src, rv, dest, sz) STMT_START { \
+	HV *hv = (HV *) src; \
+	HE *he; \
+	\
+	uint32_t keys_size = hv_iterinit(hv); \
+	\
+	encode_map(dest, sz, rv, keys_size); \
+	STRLEN nlen; \
+	while ((he = hv_iternext(hv))) { \
+		char *name = HePV(he, nlen); \
+		encode_str(dest, sz, rv, name, nlen); \
+		dest = encode_obj(HeVAL(he), dest, rv, sz, FMT_UNKNOWN); \
+	} \
+} STMT_END
+
+
 
 static char *encode_obj(SV *initial_src, char *dest, SV *rv, size_t *sz, char fmt) {
 	// cwarn("fmt = %d", fmt);
@@ -217,6 +233,15 @@ static char *encode_obj(SV *initial_src, char *dest, SV *rv, size_t *sz, char fm
 			croak("Incompatible types. Format expects: %c", fmt);
 		}
 
+	} else if (fmt == FMT_MAP) {
+
+		if (SvTYPE(src) == SVt_PVHV) {
+			encode_HV(src, rv, dest, sz);
+			return dest;
+		} else {
+			croak("Incompatible types. Format expects: %c", fmt);
+		}
+
 	} else if (fmt == FMT_UNKNOWN || fmt == FMT_SCALAR) {
 
 		HV *boolean_stash = types_boolean_stash ? types_boolean_stash : gv_stashpv ("Types::Serialiser::Boolean", 1);
@@ -236,19 +261,7 @@ static char *encode_obj(SV *initial_src, char *dest, SV *rv, size_t *sz, char fm
 				return dest;
 
 			} else if (fmt != FMT_SCALAR && SvTYPE(src) == SVt_PVHV) {  // hash
-
-				HV *hv = (HV *) src;
-				HE *he;
-
-				uint32_t keys_size = hv_iterinit(hv);
-
-				encode_map(dest, sz, rv, keys_size);
-				STRLEN nlen;
-				while ((he = hv_iternext(hv))) {
-					char *name = HePV(he, nlen);
-					encode_str(dest, sz, rv, name, nlen);
-					dest = encode_obj(HeVAL(he), dest, rv, sz, FMT_UNKNOWN);
-				}
+				encode_HV(src, rv, dest, sz);
 				return dest;
 
 			} else if (SvNOK(src)) {  // double

xstnt/types.h

@@ -127,7 +127,8 @@ typedef enum {
 	FMT_NUMBER = 'n',
 	FMT_INTEGER = 'i',
 	FMT_ARRAY = 'a',
-	FMT_SCALAR = 'r'
+	FMT_SCALAR = 'r',
+	FMT_MAP = 'm'
 } tnt_format_t;
 
 typedef enum {

xstnt/xstnt16.h

@@ -1281,6 +1281,10 @@ static inline tnt_format_t parse_format_string(const char *str, uint32_t str_len
 		return FMT_ARRAY;
 	}
 	else
+	if (str_len == 3 && strncasecmp(str, "map", 3) == 0) {
+		return FMT_MAP;
+	}
+	else
 	if (str_len == 6 && strncasecmp(str, "scalar", 6) == 0) {
 		return FMT_SCALAR;
 	}