diff --git a/src/core/store_query.c b/src/core/store_query.c
index 90d45bf521c9d093b2dc34a153f465ef4e24712e..ff7089c42e51b0294eae53b4780e4d517bfcd6cb 100644 (file)
--- a/src/core/store_query.c
+++ b/src/core/store_query.c
/*
/*
- * SysDB - src/core/store_lookup.c
+ * SysDB - src/core/store_query.c
* Copyright (C) 2014-2015 Sebastian 'tokkee' Harl <sh@tokkee.org>
* All rights reserved.
*
* Copyright (C) 2014-2015 Sebastian 'tokkee' Harl <sh@tokkee.org>
* All rights reserved.
*
case SDB_AST_ISNULL:
m = sdb_store_isnull_matcher(right);
break;
case SDB_AST_ISNULL:
m = sdb_store_isnull_matcher(right);
break;
+ case SDB_AST_ISTRUE:
+ m = sdb_store_istrue_matcher(right);
+ break;
+ case SDB_AST_ISFALSE:
+ m = sdb_store_isfalse_matcher(right);
+ break;
case SDB_AST_IN:
m = sdb_store_in_matcher(left, right);
break;
case SDB_AST_IN:
m = sdb_store_in_matcher(left, right);
break;
} /* node_to_matcher */
/*
} /* node_to_matcher */
/*
- * matcher type
+ * query type
*/
static int
*/
static int
-query_matcher_init(sdb_object_t *obj, va_list ap)
+query_init(sdb_object_t *obj, va_list ap)
{
sdb_ast_node_t *ast = va_arg(ap, sdb_ast_node_t *);
sdb_ast_node_t *matcher = NULL, *filter = NULL;
{
sdb_ast_node_t *ast = va_arg(ap, sdb_ast_node_t *);
sdb_ast_node_t *matcher = NULL, *filter = NULL;
- M(obj)->type = MATCHER_QUERY;
-
- QUERY_M(obj)->ast = ast;
+ QUERY(obj)->ast = ast;
sdb_object_ref(SDB_OBJ(ast));
switch (ast->type) {
sdb_object_ref(SDB_OBJ(ast));
switch (ast->type) {
}
if (matcher) {
}
if (matcher) {
- QUERY_M(obj)->matcher = node_to_matcher(matcher);
- if (! QUERY_M(obj)->matcher)
+ QUERY(obj)->matcher = node_to_matcher(matcher);
+ if (! QUERY(obj)->matcher)
return -1;
}
if (filter) {
return -1;
}
if (filter) {
- QUERY_M(obj)->filter = node_to_matcher(filter);
- if (! QUERY_M(obj)->filter)
+ QUERY(obj)->filter = node_to_matcher(filter);
+ if (! QUERY(obj)->filter)
return -1;
}
return 0;
return -1;
}
return 0;
-} /* query_matcher_init */
+} /* query_init */
static void
static void
-query_matcher_destroy(sdb_object_t *obj)
+query_destroy(sdb_object_t *obj)
{
{
- sdb_object_deref(SDB_OBJ(QUERY_M(obj)->ast));
- sdb_object_deref(SDB_OBJ(QUERY_M(obj)->matcher));
- sdb_object_deref(SDB_OBJ(QUERY_M(obj)->filter));
-} /* query_matcher_destroy */
+ sdb_object_deref(SDB_OBJ(QUERY(obj)->ast));
+ sdb_object_deref(SDB_OBJ(QUERY(obj)->matcher));
+ sdb_object_deref(SDB_OBJ(QUERY(obj)->filter));
+} /* query_destroy */
static sdb_type_t query_type = {
static sdb_type_t query_type = {
- /* size = */ sizeof(query_matcher_t),
- /* init = */ query_matcher_init,
- /* destroy = */ query_matcher_destroy,
+ /* size = */ sizeof(sdb_store_query_t),
+ /* init = */ query_init,
+ /* destroy = */ query_destroy,
};
/*
* public API
*/
};
/*
* public API
*/
-sdb_store_matcher_t *
+sdb_store_query_t *
sdb_store_query_prepare(sdb_ast_node_t *ast)
{
if (! ast)
return NULL;
sdb_store_query_prepare(sdb_ast_node_t *ast)
{
if (! ast)
return NULL;
- return M(sdb_object_create(SDB_AST_TYPE_TO_STRING(ast), query_type, ast));
+ return QUERY(sdb_object_create(SDB_AST_TYPE_TO_STRING(ast), query_type, ast));
} /* sdb_store_query_prepare */
} /* sdb_store_query_prepare */
+sdb_store_matcher_t *
+sdb_store_query_prepare_matcher(sdb_ast_node_t *ast)
+{
+ return node_to_matcher(ast);
+} /* sdb_store_query_prepare_matcher */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */