Skip to content

tag: option unit #2722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengzeroz merged 1 commit into from
Mar 27, 2026
+152 −34
Merged

tag: option unit #2722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/neuron/define.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#define NEU_TAG_META_LENGTH 20
#define NEU_TAG_META_SIZE 32
#define NEU_TAG_FORMAT_LENGTH 16
#define NEU_TAG_UNIT_LENGTH 16

#define NEU_LOG_LEVEL_DEBUG "debug"
#define NEU_LOG_LEVEL_INFO "info"
Expand Down
5 changes: 5 additions & 0 deletions include/neuron/msg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,11 @@ neu_tag_value_to_json_paginate(neu_resp_tag_value_meta_paginate_t *tag_value,
tag_json->datatag.bias = tag_value->datatag.bias;
tag_json->datatag.description = strdup(tag_value->datatag.description);
tag_json->datatag.option = tag_value->datatag.option;
if (tag_value->datatag.unit) {
tag_json->datatag.unit = strdup(tag_value->datatag.unit);
} else {
tag_json->datatag.unit = strdup("");
}
memcpy(tag_json->datatag.meta, tag_value->datatag.meta,
NEU_TAG_META_LENGTH);

Expand Down
1 change: 1 addition & 0 deletions include/neuron/tag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ typedef struct {
double decimal;
double bias;
char * description;
char * unit;
neu_datatag_addr_option_u option;
uint8_t meta[NEU_TAG_META_LENGTH];
uint8_t format[NEU_TAG_FORMAT_LENGTH];
Expand Down
5 changes: 5 additions & 0 deletions persistence/0120_2.15.0_tag.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
BEGIN TRANSACTION;

alter TABLE tags add column unit TEXT NULL check(length(unit) <= 128);

COMMIT;
17 changes: 17 additions & 0 deletions plugins/restful/datatag_handle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ void handle_add_tags(nng_aio *aio)
} else {
cmd.tags[i].description = strdup("");
}
if (req->tags[i].unit == NULL) {
cmd.tags[i].unit = strdup("");
} else {
cmd.tags[i].unit = strdup(req->tags[i].unit);
}
}

int ret = neu_plugin_op(plugin, header, &cmd);
Expand Down Expand Up @@ -216,6 +221,12 @@ void handle_add_gtags(nng_aio *aio)
} else {
cmd.groups[i].tags[j].description = strdup("");
}
if (req->groups[i].tags[j].unit == NULL) {
cmd.groups[i].tags[j].unit = strdup("");
} else {
cmd.groups[i].tags[j].unit =
strdup(req->groups[i].tags[j].unit);
}
}
}

Expand Down Expand Up @@ -382,6 +393,11 @@ void handle_update_tags(nng_aio *aio)
} else {
cmd.tags[i].description = strdup("");
}
if (req->tags[i].unit == NULL) {
cmd.tags[i].unit = strdup("");
} else {
cmd.tags[i].unit = strdup(req->tags[i].unit);
}
}

ret = neu_plugin_op(plugin, header, &cmd);
Expand Down Expand Up @@ -529,6 +545,7 @@ void handle_get_tags_resp(nng_aio *aio, neu_resp_get_tag_t *tags)
tags_res.tags[index].decimal = tag->decimal;
tags_res.tags[index].bias = tag->bias;
tags_res.tags[index].t = NEU_JSON_UNDEFINE;
tags_res.tags[index].unit = tag->unit;
}

neu_json_encode_by_fn(&tags_res, neu_json_encode_get_tags_resp, &result);
Expand Down
8 changes: 8 additions & 0 deletions plugins/restful/rw_handle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,12 @@ void handle_read_paginate_resp(nng_aio * aio,
strdup(tag_value->datatag.address);
new_tag_value.datatag.description =
strdup(tag_value->datatag.description);
if (tag_value->datatag.unit) {
new_tag_value.datatag.unit =
strdup(tag_value->datatag.unit);
} else {
new_tag_value.datatag.unit = strdup("");
}

utarray_push_back(filtered_tags, &new_tag_value);
}
Expand All @@ -908,6 +914,7 @@ void handle_read_paginate_resp(nng_aio * aio,
free(orig_tag_value->datatag.name);
free(orig_tag_value->datatag.address);
free(orig_tag_value->datatag.description);
free(orig_tag_value->datatag.unit);
}
}

Expand Down Expand Up @@ -997,6 +1004,7 @@ void handle_read_paginate_resp(nng_aio * aio,
free(final_tag_value->datatag.name);
free(final_tag_value->datatag.address);
free(final_tag_value->datatag.description);
free(final_tag_value->datatag.unit);
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/base/tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ static void tag_array_copy(void *_dst, const void *_src)
dst->address = strdup(src->address);
dst->name = strdup(src->name);
dst->description = strdup(src->description);
if (src->unit == NULL) {
dst->unit = strdup("");
} else {
dst->unit = strdup(src->unit);
}

memcpy(dst->format, src->format, sizeof(src->format));
dst->n_format = src->n_format;
Expand All @@ -53,6 +58,9 @@ static void tag_array_free(void *_elt)
free(elt->name);
free(elt->address);
free(elt->description);
if (elt->unit) {
free(elt->unit);
}
}

void neu_tag_format_str(const neu_datatag_t *tag, char *buf, int len)
Expand Down
37 changes: 21 additions & 16 deletions src/parser/neu_json_rw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,26 @@ int neu_json_encode_read_paginate_resp(void *json_object, void *param)
tag_elems[7].t = NEU_JSON_DOUBLE;
tag_elems[7].v.val_double = p_tag->datatag.bias;

tag_elems[8].name = "unit";
tag_elems[8].t = NEU_JSON_STR;
tag_elems[8].v.val_str = p_tag->datatag.unit;

if (p_tag->error != 0) {
tag_elems[8].name = "error";
tag_elems[8].t = NEU_JSON_INT;
tag_elems[8].v.val_int = p_tag->error;
tag_elems[9].name = "error";
tag_elems[9].t = NEU_JSON_INT;
tag_elems[9].v.val_int = p_tag->error;
} else {
tag_elems[8].name = "value";
tag_elems[8].t = p_tag->t;
tag_elems[8].v = p_tag->value;
tag_elems[8].precision = p_tag->precision;
tag_elems[8].bias = p_tag->datatag.bias;
tag_elems[9].name = "value";
tag_elems[9].t = p_tag->t;
tag_elems[9].v = p_tag->value;
tag_elems[9].precision = p_tag->precision;
tag_elems[9].bias = p_tag->datatag.bias;

if (p_tag->t == NEU_JSON_FLOAT || p_tag->t == NEU_JSON_DOUBLE) {
if_precision = 1;
tag_elems[9].name = "transferPrecision";
tag_elems[9].t = NEU_JSON_INT;
tag_elems[9].v.val_int =
if_precision = 1;
tag_elems[10].name = "transferPrecision";
tag_elems[10].t = NEU_JSON_INT;
tag_elems[10].v.val_int =
p_tag->precision > 0 ? p_tag->precision : 1;
}
}
Expand All @@ -166,16 +170,17 @@ int neu_json_encode_read_paginate_resp(void *json_object, void *param)
neu_json_encode_field(attributes_object, &meta_elem, 1);
}

tag_elems[if_precision + 9].name = "attributes";
tag_elems[if_precision + 9].t = NEU_JSON_OBJECT;
tag_elems[if_precision + 9].v.val_object = attributes_object;
tag_elems[if_precision + 10].name = "attributes";
tag_elems[if_precision + 10].t = NEU_JSON_OBJECT;
tag_elems[if_precision + 10].v.val_object = attributes_object;

tag_array =
neu_json_encode_array(tag_array, tag_elems, 10 + if_precision);
neu_json_encode_array(tag_array, tag_elems, 11 + if_precision);

free(p_tag->datatag.name);
free(p_tag->datatag.address);
free(p_tag->datatag.description);
free(p_tag->datatag.unit);

p_tag++;
}
Expand Down
12 changes: 12 additions & 0 deletions src/parser/neu_json_tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ int neu_json_encode_tag(void *json_obj, void *param)
.t = tag->t,
.v = tag->value,
},
{
.name = "unit",
.t = NEU_JSON_STR,
.v.val_str = tag->unit,
},
};

ret = neu_json_encode_field(json_obj, tag_elems,
Expand Down Expand Up @@ -140,6 +145,11 @@ int neu_json_decode_tag_json(void *json_obj, neu_json_tag_t *tag_p)
.t = NEU_JSON_DOUBLE,
.attribute = NEU_JSON_ATTRIBUTE_OPTIONAL,
},
{
.name = "unit",
.t = NEU_JSON_STR,
.attribute = NEU_JSON_ATTRIBUTE_OPTIONAL,
},
};

int ret = neu_json_decode_by_json(json_obj, NEU_JSON_ELEM_SIZE(tag_elems),
Expand All @@ -157,6 +167,7 @@ int neu_json_decode_tag_json(void *json_obj, neu_json_tag_t *tag_p)
.t = tag_elems[7].t,
.value = tag_elems[7].v,
.bias = tag_elems[8].v.val_double,
.unit = tag_elems[9].v.val_str,
};

if (0 != ret) {
Expand All @@ -180,6 +191,7 @@ void neu_json_decode_tag_fini(neu_json_tag_t *tag)
free(tag->name);
free(tag->address);
free(tag->description);
free(tag->unit);
if (NEU_JSON_STR == tag->t) {
free(tag->value.val_str);
}
Expand Down
1 change: 1 addition & 0 deletions src/parser/neu_json_tag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ typedef struct {
double bias;
neu_json_type_e t;
neu_json_value_u value;
char * unit;
} neu_json_tag_t;

int neu_json_encode_tag(void *json_obj, void *param);
Expand Down
36 changes: 22 additions & 14 deletions src/persist/sqlite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,11 +623,11 @@ int neu_sqlite_persister_store_tag(neu_persister_t * self,
((neu_sqlite_persister_t *) self)->db,
"INSERT INTO tags ("
" driver_name, group_name, name, address, attribute,"
" precision, type, decimal, bias, description, value, format"
") VALUES (%Q, %Q, %Q, %Q, %i, %i, %i, %lf, %lf, %Q, %Q, %Q)",
" precision, type, decimal, bias, description, value, format, unit"
") VALUES (%Q, %Q, %Q, %Q, %i, %i, %i, %lf, %lf, %Q, %Q, %Q, %Q)",
driver_name, group_name, tag->name, tag->address, tag->attribute,
tag->precision, tag->type, tag->decimal, tag->bias, tag->description,
"", format_buf);
"", format_buf, tag->unit);

return rv;
}
Expand Down Expand Up @@ -706,6 +706,12 @@ static int put_tags(sqlite3 *db, const char *query, sqlite3_stmt *stmt,
return -1;
}

if (SQLITE_OK != sqlite3_bind_text(stmt, 13, tag->unit, -1, NULL)) {
nlog_error("bind `%s` with unit=`%s` fail: %s", query, tag->unit,
sqlite3_errmsg(db));
return -1;
}

if (SQLITE_DONE != sqlite3_step(stmt)) {
nlog_error("sqlite3_step fail: %s", sqlite3_errmsg(db));
return -1;
Expand All @@ -726,8 +732,8 @@ int neu_sqlite_persister_store_tags(neu_persister_t * self,
const char * query =
"INSERT INTO tags ("
" driver_name, group_name, name, address, attribute,"
" precision, type, decimal, bias, description, value, format"
") VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)";
" precision, type, decimal, bias, description, value, format, unit"
") VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)";

if (SQLITE_OK != sqlite3_exec(persister->db, "BEGIN", NULL, NULL, NULL)) {
nlog_error("begin transaction fail: %s", sqlite3_errmsg(persister->db));
Expand Down Expand Up @@ -788,6 +794,7 @@ static int collect_tag_info(sqlite3_stmt *stmt, UT_array **tags)
.decimal = sqlite3_column_double(stmt, 5),
.bias = sqlite3_column_double(stmt, 6),
.description = (char *) sqlite3_column_text(stmt, 7),
.unit = (char *) sqlite3_column_text(stmt, 10),
};

tag.n_format = neu_format_from_str(format, tag.format);
Expand All @@ -812,7 +819,7 @@ int neu_sqlite_persister_load_tags(neu_persister_t *self,

sqlite3_stmt *stmt = NULL;
const char * query = "SELECT name, address, attribute, precision, type, "
"decimal, bias, description, value, format "
"decimal, bias, description, value, format, unit "
"FROM tags WHERE driver_name=? AND group_name=? "
"ORDER BY rowid ASC";

Expand Down Expand Up @@ -856,14 +863,15 @@ int neu_sqlite_persister_update_tag(neu_persister_t * self,
const char * group_name,
const neu_datatag_t *tag)
{
int rv = execute_sql(((neu_sqlite_persister_t *) self)->db,
"UPDATE tags SET"
" address=%Q, attribute=%i, precision=%i, type=%i,"
" decimal=%lf, bias=%lf, description=%Q, value=%Q "
"WHERE driver_name=%Q AND group_name=%Q AND name=%Q",
tag->address, tag->attribute, tag->precision,
tag->type, tag->decimal, tag->bias, tag->description,
"", driver_name, group_name, tag->name);
int rv =
execute_sql(((neu_sqlite_persister_t *) self)->db,
"UPDATE tags SET"
" address=%Q, attribute=%i, precision=%i, type=%i,"
" decimal=%lf, bias=%lf, description=%Q, value=%Q, unit=%Q "
"WHERE driver_name=%Q AND group_name=%Q AND name=%Q",
tag->address, tag->attribute, tag->precision, tag->type,
tag->decimal, tag->bias, tag->description, "", tag->unit,
driver_name, group_name, tag->name);
return rv;
}

Expand Down
12 changes: 8 additions & 4 deletions tests/ft/http_api/test_http_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@
"decimal": 0.0,
"bias": 1.0,
"address": "1!400001",
"description": ""
"description": "",
"unit": ""
},
{
"type": 3,
Expand All @@ -166,7 +167,8 @@
"decimal": 0.0,
"bias": 1.0,
"address": "1!400002",
"description": ""
"description": "",
"unit": ""
}
],
},
Expand Down Expand Up @@ -204,7 +206,8 @@
"decimal": 0.0,
"bias": 1.0,
"address": "1!400001",
"description": ""
"description": "",
"unit": ""
},
{
"type": 3,
Expand All @@ -214,7 +217,8 @@
"decimal": 0.0,
"bias": 1.0,
"address": "1!400002",
"description": ""
"description": "",
"unit": ""
}
],
}
Expand Down
Loading
Loading