agoo 2.5.5 → 2.5.6

data/ext/agoo/gqlvalue.h

@@ -18,19 +18,19 @@ typedef struct _gqlLink {
 } *gqlLink;
 
 typedef struct _gqlValue {
-    struct _gqlType	*type;
+    struct _gqlType		*type;
     union {
-	char		*url;
-	int32_t		i;
-	int64_t		i64;
-	double		f;
-	bool		b;
-	int64_t		time;
-	char		*str;
-	char		str16[16];
+	char			*url;
+	int32_t			i;
+	int64_t			i64;
+	double			f;
+	bool			b;
+	int64_t			time;
+	char			*str;
+	char			str16[16];
 	struct {
-	    uint64_t	hi;
-	    uint64_t	lo;
+	    uint64_t		hi;
+	    uint64_t		lo;
 	} uuid;
 	struct {
 	    struct _gqlLink	*members; // linked list for List and Object types
@@ -39,41 +39,41 @@ typedef struct _gqlValue {
     };
 } *gqlValue;
 
-extern int	gql_value_init(Err err);
+extern int	gql_value_init(agooErr err);
 
 extern void	gql_value_destroy(gqlValue value);
 
-extern gqlValue	gql_int_create(Err err, int32_t i);
-extern gqlValue	gql_i64_create(Err err, int64_t i);
-extern gqlValue	gql_string_create(Err err, const char *str, int len);
-extern gqlValue	gql_url_create(Err err, const char *url, int len);
-extern gqlValue	gql_bool_create(Err err, bool b);
-extern gqlValue	gql_float_create(Err err, double f);
-extern gqlValue	gql_time_create(Err err, int64_t t);
-extern gqlValue	gql_time_str_create(Err err, const char *str, int len);
-extern gqlValue	gql_uuid_create(Err err, uint64_t hi, uint64_t lo);
-extern gqlValue	gql_uuid_str_create(Err err, const char *str, int len);
-extern gqlValue	gql_null_create(Err err);
-extern gqlValue	gql_list_create(Err err, struct _gqlType *itemType);
-extern gqlValue	gql_object_create(Err err);
+extern gqlValue	gql_int_create(agooErr err, int32_t i);
+extern gqlValue	gql_i64_create(agooErr err, int64_t i);
+extern gqlValue	gql_string_create(agooErr err, const char *str, int len);
+extern gqlValue	gql_url_create(agooErr err, const char *url, int len);
+extern gqlValue	gql_bool_create(agooErr err, bool b);
+extern gqlValue	gql_float_create(agooErr err, double f);
+extern gqlValue	gql_time_create(agooErr err, int64_t t);
+extern gqlValue	gql_time_str_create(agooErr err, const char *str, int len);
+extern gqlValue	gql_uuid_create(agooErr err, uint64_t hi, uint64_t lo);
+extern gqlValue	gql_uuid_str_create(agooErr err, const char *str, int len);
+extern gqlValue	gql_null_create(agooErr err);
+extern gqlValue	gql_list_create(agooErr err, struct _gqlType *itemType);
+extern gqlValue	gql_object_create(agooErr err);
 
-extern int	gql_list_append(Err err, gqlValue list, gqlValue item);
-extern int	gql_list_preend(Err err, gqlValue list, gqlValue item);
-extern int	gql_object_set(Err err, gqlValue obj, const char *key, gqlValue item);
+extern int	gql_list_append(agooErr err, gqlValue list, gqlValue item);
+extern int	gql_list_preend(agooErr err, gqlValue list, gqlValue item);
+extern int	gql_object_set(agooErr err, gqlValue obj, const char *key, gqlValue item);
 
 extern void	gql_int_set(gqlValue value, int32_t i);
 extern void	gql_i64_set(gqlValue value, int64_t i);
 extern void	gql_string_set(gqlValue value, const char *str, int len);
-extern int	gql_url_set(Err err, gqlValue value, const char *url, int len);
+extern int	gql_url_set(agooErr err, gqlValue value, const char *url, int len);
 extern void	gql_bool_set(gqlValue value, bool b);
 extern void	gql_float_set(gqlValue value, double f);
 extern void	gql_time_set(gqlValue value, int64_t t);
-extern int	gql_time_str_set(Err err, gqlValue value, const char *str, int len);
+extern int	gql_time_str_set(agooErr err, gqlValue value, const char *str, int len);
 extern void	gql_uuid_set(gqlValue value, uint64_t hi, uint64_t lo);
-extern int	gql_uuid_str_set(Err err, gqlValue value, const char *str, int len);
+extern int	gql_uuid_str_set(agooErr err, gqlValue value, const char *str, int len);
 extern void	gql_null_set(gqlValue value);
 
-extern Text	gql_value_json(Text text, gqlValue value, int indent, int depth);
+extern agooText	gql_value_json(agooText text, gqlValue value, int indent, int depth);
 
 extern struct _gqlType	gql_null_type;
 extern struct _gqlType	gql_int_type;

data/ext/agoo/graphql.c

@@ -15,8 +15,8 @@
 #define BUCKET_MASK	63
 #define BAD_NAME	(uint64_t)-1
 
-typedef struct _Slot {
-    struct _Slot	*next;
+typedef struct _slot {
+    struct _slot	*next;
     gqlType		type;
     uint64_t		hash;
 } *Slot;
@@ -187,11 +187,11 @@ gql_directive_get(const char *name) {
 }
 
 int
-gql_type_set(Err err, gqlType type) {
+gql_type_set(agooErr err, gqlType type) {
     uint64_t	h = calc_hash(type->name);
 
     if (h <= 0) {
-	return err_set(err, ERR_ARG, "%s is not a valid GraphQL type name.", type->name);
+	return agoo_err_set(err, AGOO_ERR_ARG, "%s is not a valid GraphQL type name.", type->name);
     } else {
 	Slot	*bucket = get_bucketp(h);
 	Slot	s;
@@ -200,11 +200,11 @@ gql_type_set(Err err, gqlType type) {
 	    if (h == s->hash && 0 == strcmp(s->type->name, type->name)) {
 		type_destroy(s->type);
 		s->type = type;
-		return ERR_OK;
+		return AGOO_ERR_OK;
 	    }
 	}
-	if (NULL == (s = (Slot)malloc(sizeof(struct _Slot)))) {
-	    return err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL type.");
+	if (NULL == (s = (Slot)malloc(sizeof(struct _slot)))) {
+	    return agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL type.");
 	}
 	DEBUG_ALLOC(mem_graphql_slot, s);
 	s->hash = h;
@@ -212,7 +212,7 @@ gql_type_set(Err err, gqlType type) {
 	s->next = *bucket;
 	*bucket = s;
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 static void
@@ -242,11 +242,11 @@ type_remove(gqlType type) {
 }
 
 int
-gql_init(Err err) {
+gql_init(agooErr err) {
     memset(buckets, 0, sizeof(buckets));
 
-    if (ERR_OK != gql_value_init(err) ||
-	ERR_OK != gql_intro_init(err)) {
+    if (AGOO_ERR_OK != gql_value_init(err) ||
+	AGOO_ERR_OK != gql_intro_init(err)) {
 
 	return err->code;
     }
@@ -261,7 +261,7 @@ gql_init(Err err) {
 
 	return err->code;
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 void
@@ -291,11 +291,11 @@ gql_destroy() {
 }
 
 static gqlType
-type_create(Err err, const char *name, const char *desc, int dlen, bool locked) {
+type_create(agooErr err, const char *name, const char *desc, int dlen, bool locked) {
     gqlType	type = (gqlType)malloc(sizeof(struct _gqlType));
 
     if (NULL == type) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL Type.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL Type.");
     } else {
 	DEBUG_ALLOC(mem_graphql_type, type);
 	type->name = strdup(name);
@@ -312,7 +312,7 @@ type_create(Err err, const char *name, const char *desc, int dlen, bool locked)
 	type->core = false;
 	type->dir = NULL;
 
-	if (ERR_OK != gql_type_set(err, type)) {
+	if (AGOO_ERR_OK != gql_type_set(err, type)) {
 	    gql_type_destroy(type);
 	    type = NULL;
 	}
@@ -320,20 +320,20 @@ type_create(Err err, const char *name, const char *desc, int dlen, bool locked)
     return type;
 }
 
-Text
-gql_object_to_json(Text text, gqlValue value, int indent, int depth) {
+agooText
+gql_object_to_json(agooText text, gqlValue value, int indent, int depth) {
     // TBD
     return text;
 }
 
-Text
-gql_object_to_graphql(Text text, gqlValue value, int indent, int depth) {
+agooText
+gql_object_to_graphql(agooText text, gqlValue value, int indent, int depth) {
     // TBD
     return text;
 }
 
 gqlType
-gql_type_create(Err err, const char *name, const char *desc, int dlen, bool locked, gqlType *interfaces) {
+gql_type_create(agooErr err, const char *name, const char *desc, int dlen, bool locked, gqlType *interfaces) {
     gqlType	type = type_create(err, name, desc, dlen, locked);
 
     if (NULL != type) {
@@ -351,7 +351,7 @@ gql_type_create(Err err, const char *name, const char *desc, int dlen, bool lock
 	    }
 	    if (0 < cnt) {
 		if (NULL == (type->interfaces = (gqlType*)malloc(sizeof(gqlType) * (cnt + 1)))) {
-		    err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL type interfaces.");
+		    agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL type interfaces.");
 		    free(type);
 		    return NULL;
 		}
@@ -366,7 +366,7 @@ gql_type_create(Err err, const char *name, const char *desc, int dlen, bool lock
 }
 
 gqlField
-gql_type_field(Err err,
+gql_type_field(agooErr err,
 	       gqlType type,
 	       const char *name,
 	       gqlType return_type,
@@ -378,7 +378,7 @@ gql_type_field(Err err,
     gqlField	f = (gqlField)malloc(sizeof(struct _gqlField));
     
     if (NULL == f) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL field.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL field.");
     } else {
 	DEBUG_ALLOC(mem_graphql_field, f);
 	f->next = NULL;
@@ -411,7 +411,7 @@ gql_type_field(Err err,
 }
 
 gqlArg
-gql_field_arg(Err		err,
+gql_field_arg(agooErr		err,
 	      gqlField		field,
 	      const char	*name,
 	      gqlType		type,
@@ -421,7 +421,7 @@ gql_field_arg(Err		err,
     gqlArg	a = (gqlArg)malloc(sizeof(struct _gqlArg));
     
     if (NULL == a) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL field argument.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL field argument.");
     } else {
 	DEBUG_ALLOC(mem_graphql_arg, a);
 	a->next = NULL;
@@ -448,14 +448,14 @@ gql_field_arg(Err		err,
     return a;
 }
 
-Text
-gql_union_to_json(Text text, gqlValue value, int indent, int depth) {
+agooText
+gql_union_to_json(agooText text, gqlValue value, int indent, int depth) {
     // TBD
     return text;
 }
 
 gqlType
-gql_union_create(Err err, const char *name, const char *desc, int dlen, bool locked) {
+gql_union_create(agooErr err, const char *name, const char *desc, int dlen, bool locked) {
     gqlType	type = type_create(err, name, desc, dlen, locked);
 
     if (NULL != type) {
@@ -467,11 +467,11 @@ gql_union_create(Err err, const char *name, const char *desc, int dlen, bool loc
 }
 
 int
-gql_union_add(Err err, gqlType type, const char *name, int len) {
+gql_union_add(agooErr err, gqlType type, const char *name, int len) {
     gqlTypeLink	link = (gqlTypeLink)malloc(sizeof(gqlTypeLink));
 
     if (NULL == link) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL Union value.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL Union value.");
     }
     if (0 >= len) {
 	len = (int)strlen(name);
@@ -488,17 +488,17 @@ gql_union_add(Err err, gqlType type, const char *name, int len) {
 	link->next = NULL;
 	last->next = link;
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
-Text
-gql_enum_to_json(Text text, gqlValue value, int indent, int depth) {
+agooText
+gql_enum_to_json(agooText text, gqlValue value, int indent, int depth) {
     // TBD
     return text;
 }
 
 gqlType
-gql_enum_create(Err err, const char *name, const char *desc, int dlen, bool locked) {
+gql_enum_create(agooErr err, const char *name, const char *desc, int dlen, bool locked) {
     gqlType	type = type_create(err, name, desc, dlen, locked);
 
     if (NULL != type) {
@@ -510,11 +510,11 @@ gql_enum_create(Err err, const char *name, const char *desc, int dlen, bool lock
 }
 
 int
-gql_enum_add(Err err, gqlType type, const char *value, int len) {
+gql_enum_add(agooErr err, gqlType type, const char *value, int len) {
     gqlStrLink	link = (gqlStrLink)malloc(sizeof(gqlStrLink));
 
     if (NULL == link) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL Enum value.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL Enum value.");
     }
     if (0 >= len) {
 	len = (int)strlen(value);
@@ -523,15 +523,15 @@ gql_enum_add(Err err, gqlType type, const char *value, int len) {
     type->choices = link;
     link->str = strndup(value, len);
     
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 int
-gql_enum_append(Err err, gqlType type, const char *value, int len) {
+gql_enum_append(agooErr err, gqlType type, const char *value, int len) {
     gqlStrLink	link = (gqlStrLink)malloc(sizeof(gqlStrLink));
 
     if (NULL == link) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL Enum value.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL Enum value.");
     }
     if (0 >= len) {
 	len = (int)strlen(value);
@@ -548,17 +548,17 @@ gql_enum_append(Err err, gqlType type, const char *value, int len) {
 	link->next = NULL;
 	last->next = link;
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
-static Text
-fragment_to_json(Text text, gqlValue value, int indent, int depth) {
+static agooText
+fragment_to_json(agooText text, gqlValue value, int indent, int depth) {
     // TBD
     return text;
 }
 
 gqlType
-gql_fragment_create(Err err, const char *name, const char *desc, int dlen, bool locked, gqlType on) {
+gql_fragment_create(agooErr err, const char *name, const char *desc, int dlen, bool locked, gqlType on) {
     gqlType	type = type_create(err, name, desc, dlen, locked);
 
     if (NULL != type) {
@@ -570,14 +570,14 @@ gql_fragment_create(Err err, const char *name, const char *desc, int dlen, bool
     return type;
 }
 
-static Text
-input_to_json(Text text, gqlValue value, int indent, int depth) {
+static agooText
+input_to_json(agooText text, gqlValue value, int indent, int depth) {
     // TBD
     return text;
 }
 
 gqlType
-gql_input_create(Err err, const char *name, const char *desc, int dlen, bool locked) {
+gql_input_create(agooErr err, const char *name, const char *desc, int dlen, bool locked) {
     gqlType	type = type_create(err, name, desc, dlen, locked);
 
     if (NULL != type) {
@@ -588,14 +588,14 @@ gql_input_create(Err err, const char *name, const char *desc, int dlen, bool loc
     return type;
 }
 
-static Text
-interface_to_json(Text text, gqlValue value, int indent, int depth) {
+static agooText
+interface_to_json(agooText text, gqlValue value, int indent, int depth) {
     // TBD
     return text;
 }
 
 gqlType
-gql_interface_create(Err err, const char *name, const char *desc, int dlen, bool locked) {
+gql_interface_create(agooErr err, const char *name, const char *desc, int dlen, bool locked) {
     gqlType	type = type_create(err, name, desc, dlen, locked);
 
     if (NULL != type) {
@@ -606,21 +606,21 @@ gql_interface_create(Err err, const char *name, const char *desc, int dlen, bool
     return type;
 }
 
-static Text
-scalar_to_json(Text text, gqlValue value, int indent, int depth) {
+static agooText
+scalar_to_json(agooText text, gqlValue value, int indent, int depth) {
     if (NULL == value->str) {
-	text = text_append(text, "null", 4);
+	text = agoo_text_append(text, "null", 4);
     } else {
-	text = text_append(text, "\"", 1);
-	text = text_append(text, value->str, -1);
-	text = text_append(text, "\"", 1);
+	text = agoo_text_append(text, "\"", 1);
+	text = agoo_text_append(text, value->str, -1);
+	text = agoo_text_append(text, "\"", 1);
     }
     return text;
 }
 
 // Create a scalar type that will be represented as a string.
 gqlType
-gql_scalar_create(Err err, const char *name, const char *desc, int dlen, bool locked) {
+gql_scalar_create(agooErr err, const char *name, const char *desc, int dlen, bool locked) {
     gqlType	type = type_create(err, name, desc, dlen, locked);
 
     if (NULL != type) {
@@ -633,11 +633,11 @@ gql_scalar_create(Err err, const char *name, const char *desc, int dlen, bool lo
 }
 
 gqlDir
-gql_directive_create(Err err, const char *name, const char *desc, int dlen, bool locked) {
+gql_directive_create(agooErr err, const char *name, const char *desc, int dlen, bool locked) {
     gqlDir	dir;
     
     if (NULL == (dir = (gqlDir)malloc(sizeof(struct _gqlDir)))) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL directive.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL directive.");
 	return NULL;
     }
     DEBUG_ALLOC(mem_graphql_directive, dir);
@@ -660,7 +660,7 @@ gql_directive_create(Err err, const char *name, const char *desc, int dlen, bool
 }
 
 gqlArg
-gql_dir_arg(Err 		err,
+gql_dir_arg(agooErr 		err,
 	    gqlDir 		dir,
 	    const char 		*name,
 	    const char 		*type_name,
@@ -672,7 +672,7 @@ gql_dir_arg(Err 		err,
     gqlArg	a = (gqlArg)malloc(sizeof(struct _gqlArg));
     
     if (NULL == a) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL directive argument.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL directive argument.");
     } else {
 	DEBUG_ALLOC(mem_graphql_arg, a);
 	a->next = NULL;
@@ -703,12 +703,12 @@ gql_dir_arg(Err 		err,
 }
 
 int
-gql_directive_on(Err err, gqlDir d, const char *on, int len) {
+gql_directive_on(agooErr err, gqlDir d, const char *on, int len) {
     gqlStrLink	link = (gqlStrLink)malloc(sizeof(gqlStrLink));
     gqlStrLink	loc;
 
     if (NULL == link) {
-	err_set(err, ERR_MEMORY, "Failed to allocation memory for a GraphQL directive location.");
+	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL directive location.");
     }
     if (0 >= len) {
 	len = (int)strlen(on);
@@ -724,7 +724,7 @@ gql_directive_on(Err err, gqlDir d, const char *on, int len) {
     }
     link->str = strndup(on, len);
     
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 void
@@ -747,20 +747,20 @@ desc_len(const char *desc) {
     return (int)(d - desc) * special;
 }
 
-static Text
-desc_sdl(Text text, const char *desc, int indent) {
+static agooText
+desc_sdl(agooText text, const char *desc, int indent) {
     if (NULL != desc) {
 	int	cnt = desc_len(desc);
 
 	if (0 < indent) {
-	    text = text_append(text, spaces, indent);
+	    text = agoo_text_append(text, spaces, indent);
 	}
 	if (0 <= cnt) {
-	    text = text_append(text, "\"", 1);
-	    text = text_append(text, desc, cnt);
-	    text = text_append(text, "\"\n", 2);
+	    text = agoo_text_append(text, "\"", 1);
+	    text = agoo_text_append(text, desc, cnt);
+	    text = agoo_text_append(text, "\"\n", 2);
 	} else {
-	    text = text_append(text, "\"\"\"\n", 4);
+	    text = agoo_text_append(text, "\"\"\"\n", 4);
 	    if (0 < indent) {
 		const char	*start = desc;
 		const char	*d = desc;
@@ -772,94 +772,94 @@ desc_sdl(Text text, const char *desc, int indent) {
 			if ('\n' == *d) {
 			    d++;
 			}
-			text = text_append(text, spaces, indent);
-			text = text_append(text, start, len);
-			text = text_append(text, "\n", 1);
+			text = agoo_text_append(text, spaces, indent);
+			text = agoo_text_append(text, start, len);
+			text = agoo_text_append(text, "\n", 1);
 			start = d;
 		    } else if ('\n' == *d) {
-			text = text_append(text, spaces, indent);
-			text = text_append(text, start, (int)(d - start));
-			text = text_append(text, "\n", 1);
+			text = agoo_text_append(text, spaces, indent);
+			text = agoo_text_append(text, start, (int)(d - start));
+			text = agoo_text_append(text, "\n", 1);
 			d++;
 			start = d;
 		    }
 		}
-		text = text_append(text, spaces, indent);
-		text = text_append(text, start, (int)(d - start));
+		text = agoo_text_append(text, spaces, indent);
+		text = agoo_text_append(text, start, (int)(d - start));
 	    } else {
-		text = text_append(text, desc, -1);
+		text = agoo_text_append(text, desc, -1);
 	    }
 	    if (0 < indent) {
-		text = text_append(text, "\n", 1);
-		text = text_append(text, spaces, indent);
-		text = text_append(text, "\"\"\"\n", 4);
+		text = agoo_text_append(text, "\n", 1);
+		text = agoo_text_append(text, spaces, indent);
+		text = agoo_text_append(text, "\"\"\"\n", 4);
 	    } else {
-		text = text_append(text, "\n\"\"\"\n", 5);
+		text = agoo_text_append(text, "\n\"\"\"\n", 5);
 	    }
 	}
     }
     return text;
 }
 
-static Text
-arg_sdl(Text text, gqlArg a, bool with_desc, bool last) {
+static agooText
+arg_sdl(agooText text, gqlArg a, bool with_desc, bool last) {
     if (with_desc) {
 	text = desc_sdl(text, a->desc, 4);
     }
-    text = text_append(text, a->name, -1);
+    text = agoo_text_append(text, a->name, -1);
     if (a->required) {
-	text = text_append(text, "!: ", 3);
+	text = agoo_text_append(text, "!: ", 3);
     } else {
-	text = text_append(text, ": ", 2);
+	text = agoo_text_append(text, ": ", 2);
     }
-    text = text_append(text, a->type_name, -1);
+    text = agoo_text_append(text, a->type_name, -1);
     if (NULL != a->default_value) {
-	text = text_append(text, " = ", 3);
+	text = agoo_text_append(text, " = ", 3);
 	text = gql_value_json(text, a->default_value, 0, 0);
     }
     if (!last) {
-	text = text_append(text, ", ", 2);
+	text = agoo_text_append(text, ", ", 2);
     }
     return text;
 }
 
-static Text
-field_sdl(Text text, gqlField f, bool with_desc) {
+static agooText
+field_sdl(agooText text, gqlField f, bool with_desc) {
     if (with_desc) {
 	text = desc_sdl(text, f->desc, 2);
     }
-    text = text_append(text, "  ", 2);
-    text = text_append(text, f->name, -1);
+    text = agoo_text_append(text, "  ", 2);
+    text = agoo_text_append(text, f->name, -1);
     if (NULL != f->args) {
 	gqlArg	a;
 
-	text = text_append(text, "(", 1);
+	text = agoo_text_append(text, "(", 1);
 	for (a = f->args; NULL != a; a = a->next) {
 	    text = arg_sdl(text, a, with_desc, NULL == a->next);
 	}
-	text = text_append(text, ")", 1);
+	text = agoo_text_append(text, ")", 1);
     }
-    text = text_append(text, ": ", 2);
+    text = agoo_text_append(text, ": ", 2);
     if (f->list) {
-	text = text_append(text, "[", 1);
-	text = text_append(text, f->type->name, -1);
+	text = agoo_text_append(text, "[", 1);
+	text = agoo_text_append(text, f->type->name, -1);
 	if (f->not_empty) {
-	    text = text_append(text, "!", 1);
+	    text = agoo_text_append(text, "!", 1);
 	}
-	text = text_append(text, "]", 1);
+	text = agoo_text_append(text, "]", 1);
     } else {
-	text = text_append(text, f->type->name, -1);
+	text = agoo_text_append(text, f->type->name, -1);
     }
     if (f->required) {
-	text = text_append(text, "!", 1);
+	text = agoo_text_append(text, "!", 1);
     }
-    text = text_append(text, "\n", 1);
+    text = agoo_text_append(text, "\n", 1);
 
     return text;
 }
 
-Text
-gql_type_sdl(Text text, gqlType type, bool with_desc) {
+agooText
+gql_type_sdl(agooText text, gqlType type, bool with_desc) {
     if (with_desc) {
 	desc_sdl(text, type->desc, 0);
     }
@@ -868,36 +868,36 @@ gql_type_sdl(Text text, gqlType type, bool with_desc) {
     case GQL_FRAG: {
 	gqlField	f;
 
-	text = text_append(text, "type ", 5);
-	text = text_append(text, type->name, -1);
+	text = agoo_text_append(text, "type ", 5);
+	text = agoo_text_append(text, type->name, -1);
 	if (NULL != type->interfaces) {
 	    gqlType	*tp = type->interfaces;
 
-	    text = text_append(text, " implements ", 12);
+	    text = agoo_text_append(text, " implements ", 12);
 	    for (; NULL != *tp; tp++) {
-		text = text_append(text, (*tp)->name, -1);
+		text = agoo_text_append(text, (*tp)->name, -1);
 		if (NULL != *(tp + 1)) {
-		    text = text_append(text, ", ", 2);
+		    text = agoo_text_append(text, ", ", 2);
 		}
 	    }
 	}
-	text = text_append(text, " {\n", 3);
+	text = agoo_text_append(text, " {\n", 3);
 	for (f = type->fields; NULL != f; f = f->next) {
 	    text = field_sdl(text, f, with_desc);
 	}
-	text = text_append(text, "}\n", 2);
+	text = agoo_text_append(text, "}\n", 2);
 	break;
     }
     case GQL_UNION: {
 	gqlTypeLink	link;
 
-	text = text_append(text, "union ", 6);
-	text = text_append(text, type->name, -1);
-	text = text_append(text, " = ", 3);
+	text = agoo_text_append(text, "union ", 6);
+	text = agoo_text_append(text, type->name, -1);
+	text = agoo_text_append(text, " = ", 3);
 	for (link = type->types; NULL != link; link = link->next) {
-	    text = text_append(text, link->name, -1);
+	    text = agoo_text_append(text, link->name, -1);
 	    if (NULL != link->next) {
-		text = text_append(text, " | ", 3);
+		text = agoo_text_append(text, " | ", 3);
 	    }
 	}
 	break;
@@ -905,45 +905,45 @@ gql_type_sdl(Text text, gqlType type, bool with_desc) {
     case GQL_ENUM: {
 	gqlStrLink	link;;
 	
-	text = text_append(text, "enum ", 5);
-	text = text_append(text, type->name, -1);
-	text = text_append(text, " {\n", 3);
+	text = agoo_text_append(text, "enum ", 5);
+	text = agoo_text_append(text, type->name, -1);
+	text = agoo_text_append(text, " {\n", 3);
 	for (link = type->choices; NULL != link; link = link->next) {
-	    text = text_append(text, "  ", 2);
-	    text = text_append(text, link->str, -1);
-	    text = text_append(text, "\n", 1);
+	    text = agoo_text_append(text, "  ", 2);
+	    text = agoo_text_append(text, link->str, -1);
+	    text = agoo_text_append(text, "\n", 1);
 	}
-	text = text_append(text, "}\n", 2);
+	text = agoo_text_append(text, "}\n", 2);
 	break;
     }
     case GQL_SCALAR:
-	text = text_append(text, "scalar ", 7);
-	text = text_append(text, type->name, -1);
-	text = text_append(text, "\n", 1);
+	text = agoo_text_append(text, "scalar ", 7);
+	text = agoo_text_append(text, type->name, -1);
+	text = agoo_text_append(text, "\n", 1);
 	break;
     case GQL_INTERFACE: {
 	gqlField	f;
 
-	text = text_append(text, "interface ", 10);
-	text = text_append(text, type->name, -1);
-	text = text_append(text, " {\n", 3);
+	text = agoo_text_append(text, "interface ", 10);
+	text = agoo_text_append(text, type->name, -1);
+	text = agoo_text_append(text, " {\n", 3);
 
 	for (f = type->fields; NULL != f; f = f->next) {
 	    text = field_sdl(text, f, with_desc);
 	}
-	text = text_append(text, "}\n", 2);
+	text = agoo_text_append(text, "}\n", 2);
 	break;
     }
     case GQL_INPUT: {
 	gqlField	f;
 
-	text = text_append(text, "input ", 6);
-	text = text_append(text, type->name, -1);
-	text = text_append(text, " {\n", 3);
+	text = agoo_text_append(text, "input ", 6);
+	text = agoo_text_append(text, type->name, -1);
+	text = agoo_text_append(text, " {\n", 3);
 	for (f = type->fields; NULL != f; f = f->next) {
 	    text = field_sdl(text, f, with_desc);
 	}
-	text = text_append(text, "}\n", 2);
+	text = agoo_text_append(text, "}\n", 2);
 	break;
     }
     default:
@@ -952,29 +952,29 @@ gql_type_sdl(Text text, gqlType type, bool with_desc) {
     return text;
 }
 
-Text
-gql_directive_sdl(Text text, gqlDir d, bool with_desc) {
+agooText
+gql_directive_sdl(agooText text, gqlDir d, bool with_desc) {
     gqlStrLink	link;
     
     if (with_desc) {
 	text = desc_sdl(text, d->desc, 0);
     }
-    text = text_append(text, "directive @", 11);
-    text = text_append(text, d->name, -1);
+    text = agoo_text_append(text, "directive @", 11);
+    text = agoo_text_append(text, d->name, -1);
     if (NULL != d->args) {
 	gqlArg	a;
 
-	text = text_append(text, "(", 1);
+	text = agoo_text_append(text, "(", 1);
 	for (a = d->args; NULL != a; a = a->next) {
 	    text = arg_sdl(text, a, with_desc, NULL == a->next);
 	}
-	text = text_append(text, ")", 1);
+	text = agoo_text_append(text, ")", 1);
     }
-    text = text_append(text, " on ", 4);
+    text = agoo_text_append(text, " on ", 4);
     for (link = d->locs; NULL != link; link = link->next) {
-	text = text_append(text, link->str, -1);
+	text = agoo_text_append(text, link->str, -1);
 	if (NULL != link->next) {
-	    text = text_append(text, " | ", 3);
+	    text = agoo_text_append(text, " | ", 3);
 	}
     }
     return text;
@@ -997,8 +997,8 @@ type_cmp(const void *v0, const void *v1) {
     return t0->kind - t1->kind;
 }
 
-Text
-gql_schema_sdl(Text text, bool with_desc, bool all) {
+agooText
+gql_schema_sdl(agooText text, bool with_desc, bool all) {
     Slot	*bucket;
     Slot	s;
     gqlType	type;
@@ -1032,44 +1032,44 @@ gql_schema_sdl(Text text, bool with_desc, bool all) {
 	for (i = 0, tp = types; i < cnt; i++, tp++) {
 	    text = gql_type_sdl(text, *tp, with_desc);
 	    if (i < cnt - 1) {
-		text = text_append(text, "\n", 1);
+		text = agoo_text_append(text, "\n", 1);
 	    }
 	}
     }
     for (d = directives; NULL != d; d = d->next) {
-	text = text_append(text, "\n", 1);
+	text = agoo_text_append(text, "\n", 1);
 	text = gql_directive_sdl(text, d, with_desc);
-	text = text_append(text, "\n", 1);
+	text = agoo_text_append(text, "\n", 1);
     }
     return text;
 }
 
 void
-gql_dump_hook(Req req) {
+gql_dump_hook(agooReq req) {
     char	buf[256];
     int		cnt;
-    Text	text = text_allocate(4094);
+    agooText	text = agoo_text_allocate(4094);
     bool	all = false;
     bool	with_desc = true;
     int		vlen;
-    const char	*s = req_query_value(req, "all", 3, &vlen);
+    const char	*s = agoo_req_query_value(req, "all", 3, &vlen);
 
     if (NULL != s && 4 == vlen && 0 == strncasecmp("true", s, 4)) {
 	all = true;
     }
-    s = req_query_value(req, "with_desc", 9, &vlen);
+    s = agoo_req_query_value(req, "with_desc", 9, &vlen);
 
     if (NULL != s && 5 == vlen && 0 == strncasecmp("false", s, 5)) {
 	with_desc = false;
     }
     text = gql_schema_sdl(text, with_desc, all);
     cnt = snprintf(buf, sizeof(buf), "HTTP/1.1 200 Okay\r\nContent-Type: application/graphql\r\nContent-Length: %ld\r\n\r\n", text->len);
-    text = text_prepend(text, buf, cnt);
-    res_set_message(req->res, text);
+    text = agoo_text_prepend(text, buf, cnt);
+    agoo_res_set_message(req->res, text);
 }
 
 void
-gql_eval_hook(Req req) {
+gql_eval_hook(agooReq req) {
     // TBD detect introspection
     //  start resolving by callout to some global handler as needed
     //   pass target, field, args