store: Add sdb_store_query_prepare_matcher().

[sysdb.git] / t / unit / core / store_expr_test.c

diff --git a/t/unit/core/store_expr_test.c b/t/unit/core/store_expr_test.c
index 5de5fdd0b4e877b1501de2662eb0e22fc91d4d5f..679fb548418092fbe1377cd9232dadf07e1af928 100644 (file)
--- a/t/unit/core/store_expr_test.c
+++ b/t/unit/core/store_expr_test.c
@@ -31,7 +31,7 @@
 
 #include "core/store.h"
 #include "core/store-private.h"
-#include "frontend/parser.h"
+#include "parser/parser.h"
 #include "testutils.h"
 
 #include <check.h>
@@ -309,23 +309,23 @@ struct {
                { SDB_OBJECT_INIT, TYPED_EXPR, -1, &namer, NULL, ATTRS }, true,
                "a", SDB_SERVICE, "s1", NULL,
                {
+                       { SDB_TYPE_STRING, { .string = "hostname" } },
                        { SDB_TYPE_STRING, { .string = "k1" } },
                        { 0 },
                        { 0 },
                        { 0 },
-                       { 0 },
-               }, 1,
+               }, 2,
        },
        {
                { SDB_OBJECT_INIT, TYPED_EXPR, -1, &namer, NULL, ATTRS }, true,
                "a", SDB_SERVICE, "s1", "age >= 0s",
                {
+                       { SDB_TYPE_STRING, { .string = "hostname" } },
                        { SDB_TYPE_STRING, { .string = "k1" } },
                        { 0 },
                        { 0 },
                        { 0 },
-                       { 0 },
-               }, 1,
+               }, 2,
        },
        {
                { SDB_OBJECT_INIT, TYPED_EXPR, -1, &namer, NULL, ATTRS }, true,
@@ -378,23 +378,23 @@ struct {
                { SDB_OBJECT_INIT, TYPED_EXPR, -1, &namer, NULL, ATTRS }, true,
                "b", SDB_METRIC, "m2", NULL,
                {
+                       { SDB_TYPE_STRING, { .string = "hostname" } },
                        { SDB_TYPE_STRING, { .string = "k1" } },
                        { SDB_TYPE_STRING, { .string = "k2" } },
                        { 0 },
                        { 0 },
-                       { 0 },
-               }, 2,
+               }, 3,
        },
        {
                { SDB_OBJECT_INIT, TYPED_EXPR, -1, &namer, NULL, ATTRS }, true,
                "b", SDB_METRIC, "m2", "age >= 0s",
                {
+                       { SDB_TYPE_STRING, { .string = "hostname" } },
                        { SDB_TYPE_STRING, { .string = "k1" } },
                        { SDB_TYPE_STRING, { .string = "k2" } },
                        { 0 },
                        { 0 },
-                       { 0 },
-               }, 2,
+               }, 3,
        },
        {
                { SDB_OBJECT_INIT, TYPED_EXPR, -1, &namer, NULL, ATTRS }, true,
@@ -567,7 +567,10 @@ START_TEST(test_expr_iter)
        }
 
        if (expr_iter_data[_i].filter) {
-               filter = sdb_fe_parse_matcher(expr_iter_data[_i].filter, -1, NULL);
+               sdb_ast_node_t *ast;
+               ast = sdb_parser_parse_conditional(expr_iter_data[_i].filter, -1, NULL);
+               filter = sdb_store_query_prepare_matcher(ast);
+               sdb_object_deref(SDB_OBJ(ast));
                ck_assert(filter != NULL);
        }