parser: Let the TIMESERIES command accept optional data-source names.

[sysdb.git] / src / include / parser / ast.h

diff --git a/src/include/parser/ast.h b/src/include/parser/ast.h
index 01446abbd84b86e4b0395e2715f700fbad04a9dd..110ee082a93402d11319ac3b8a63145e8a145b88 100644 (file)
--- a/src/include/parser/ast.h
+++ b/src/include/parser/ast.h
@@ -309,6 +309,7 @@ typedef struct {
        /* metric specific */
        char *store_type;
        char *store_id;
+       sdb_time_t store_last_update;
 
        /* attribute specific */
        sdb_data_t value;
@@ -316,7 +317,7 @@ typedef struct {
 #define SDB_AST_STORE(obj) ((sdb_ast_store_t *)(obj))
 #define SDB_AST_STORE_INIT \
        { { SDB_OBJECT_INIT, SDB_AST_TYPE_STORE, -1 }, \
-               -1, NULL, -1, NULL, NULL, 0, NULL, NULL, SDB_DATA_INIT }
+               -1, NULL, -1, NULL, NULL, 0, NULL, NULL, 0, SDB_DATA_INIT }
 
 /*
  * sdb_ast_timeseries_t represents a TIMESERIES command.
@@ -325,12 +326,14 @@ typedef struct {
        sdb_ast_node_t super;
        char *hostname;
        char *metric;
+       char **data_names;
+       size_t data_names_len;
        sdb_time_t start;
        sdb_time_t end;
 } sdb_ast_timeseries_t;
 #define SDB_AST_TIMESERIES(obj) ((sdb_ast_timeseries_t *)(obj))
 #define SDB_AST_TIMESERIES_INIT \
-       { { SDB_OBJECT_INIT, SDB_AST_TYPE_TIMESERIES, -1 }, NULL, NULL, 0, 0 }
+       { { SDB_OBJECT_INIT, SDB_AST_TYPE_TIMESERIES, -1 }, NULL, NULL, NULL, 0, 0, 0 }
 
 /*
  * AST constructors:
@@ -418,15 +421,17 @@ sdb_ast_lookup_create(int obj_type, sdb_ast_node_t *matcher,
 sdb_ast_node_t *
 sdb_ast_store_create(int obj_type, char *hostname,
                int parent_type, char *parent, char *name, sdb_time_t last_update,
-               char *store_type, char *store_id, sdb_data_t value);
+               char *store_type, char *store_id, sdb_time_t store_last_update,
+               sdb_data_t value);
 
 /*
  * sdb_ast_timeseries_create:
  * Creates an AST node representing a TIMESERIES command. The newly created
- * node takes ownership of the strings.
+ * node takes ownership of the strings and string vectors.
  */
 sdb_ast_node_t *
 sdb_ast_timeseries_create(char *hostname, char *metric,
+               char **data_names, size_t data_names_len,
                sdb_time_t start, sdb_time_t end);
 
 #ifdef __cplusplus