Skip to content

Commit

Permalink
Merge pull request #2341 from ZhouBox/main
Browse files Browse the repository at this point in the history 
support array string
  • Loading branch information
@fengzeroz
fengzeroz authored Dec 19, 2024
2 parents cab2f92 + bb9d5a7 commit 38c44c4
Show file tree
Hide file tree
Showing 8 changed files with 184 additions and 6 deletions.
17 changes: 17 additions & 0 deletions include/neuron/msg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,11 @@ static inline void neu_trans_data_free(neu_reqresp_trans_data_t *data)
{
if (tag_value->value.type == NEU_TYPE_PTR) {
free(tag_value->value.value.ptr.ptr);
} else if (tag_value->value.type == NEU_TYPE_ARRAY_STRING) {
for (size_t i = 0; i < tag_value->value.value.strs.length;
++i) {
free(tag_value->value.value.strs.strs[i]);
}
}
}
utarray_free(data->tags);
Expand Down Expand Up @@ -1087,6 +1092,12 @@ static inline void neu_tag_value_to_json(neu_resp_tag_value_meta_t *tag_value,
tag_json->value.val_array_double.f64s =
tag_value->value.value.f64s.f64s;
break;
case NEU_TYPE_ARRAY_STRING:
tag_json->t = NEU_JSON_ARRAY_STR;
tag_json->value.val_array_str.length =
tag_value->value.value.strs.length;
tag_json->value.val_array_str.p_strs = tag_value->value.value.strs.strs;
break;
case NEU_TYPE_CUSTOM:
tag_json->t = NEU_JSON_OBJECT;
tag_json->value.val_object = tag_value->value.value.json;
Expand Down Expand Up @@ -1289,6 +1300,12 @@ neu_tag_value_to_json_paginate(neu_resp_tag_value_meta_paginate_t *tag_value,
tag_json->value.val_array_double.f64s =
tag_value->value.value.f64s.f64s;
break;
case NEU_TYPE_ARRAY_STRING:
tag_json->t = NEU_JSON_ARRAY_STR;
tag_json->value.val_array_str.length =
tag_value->value.value.strs.length;
tag_json->value.val_array_str.p_strs = tag_value->value.value.strs.strs;
break;
case NEU_TYPE_CUSTOM:
tag_json->t = NEU_JSON_OBJECT;
tag_json->value.val_object = tag_value->value.value.json;
Expand Down
9 changes: 9 additions & 0 deletions include/neuron/type.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ typedef enum {
NEU_TYPE_ARRAY_FLOAT = 31,
NEU_TYPE_ARRAY_DOUBLE = 32,
NEU_TYPE_ARRAY_BOOL = 33,
NEU_TYPE_ARRAY_STRING = 34,
NEU_TYPE_CUSTOM = 40,
} neu_type_e;

Expand Down Expand Up @@ -139,6 +140,8 @@ inline static const char *neu_type_string(neu_type_e type)
return "NEU_TYPE_ARRAY_FLOAT";
case NEU_TYPE_ARRAY_BOOL:
return "NEU_TYPE_ARRAY_BOOL";
case NEU_TYPE_ARRAY_STRING:
return "NEU_TYPE_ARRAY_STRING";
case NEU_TYPE_CUSTOM:
return "NEU_TYPE_CUSTOM";
}
Expand Down Expand Up @@ -214,6 +217,11 @@ typedef struct {
uint8_t length;
} neu_value_array_bool_t;

typedef struct {
char * strs[NEU_VALUE_SIZE];
uint8_t length;
} neu_value_array_string_t;

typedef union {
bool boolean;
int8_t i8;
Expand Down Expand Up @@ -241,6 +249,7 @@ typedef union {
neu_value_array_float_t f32s;
neu_value_array_double_t f64s;
neu_value_array_bool_t bools;
neu_value_array_string_t strs;
} neu_value_u;

static inline char *neu_value_str(neu_type_e type, neu_value_u value)
Expand Down
7 changes: 7 additions & 0 deletions plugins/mqtt/mqtt_handle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,13 @@ static int json_value_to_tag_value(union neu_json_value *req,
value->value.i64s.i64s[i] = req->val_array_int64.i64s[i];
}
break;
case NEU_JSON_ARRAY_STR:
value->type = NEU_TYPE_ARRAY_STRING;
value->value.strs.length = req->val_array_str.length;
for (int i = 0; i < req->val_array_str.length; i++) {
value->value.strs.strs[i] = req->val_array_str.p_strs[i];
}
break;
case NEU_JSON_OBJECT:
value->type = NEU_TYPE_CUSTOM;
value->value.json = req->val_object;
Expand Down
32 changes: 32 additions & 0 deletions plugins/restful/rw_handle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,14 @@ void handle_write(nng_aio *aio)
req->value.val_array_bool.bools[i];
}
break;
case NEU_JSON_ARRAY_STR:
cmd.value.type = NEU_TYPE_ARRAY_STRING;
cmd.value.value.strs.length = req->value.val_array_str.length;
for (int i = 0; i < req->value.val_array_str.length; i++) {
cmd.value.value.strs.strs[i] =
req->value.val_array_str.p_strs[i];
}
break;
case NEU_JSON_OBJECT:
cmd.value.type = NEU_TYPE_CUSTOM;
cmd.value.value.json = req->value.val_object;
Expand Down Expand Up @@ -564,6 +572,16 @@ void handle_write_tags(nng_aio *aio)
req->tags[i].value.val_array_bool.bools[k];
}
break;
case NEU_JSON_ARRAY_STR:
cmd.tags[i].value.type = NEU_TYPE_ARRAY_STRING;
cmd.tags[i].value.value.strs.length =
req->tags[i].value.val_array_str.length;
for (int k = 0; k < req->tags[i].value.val_array_str.length;
k++) {
cmd.tags[i].value.value.strs.strs[k] =
req->tags[i].value.val_array_str.p_strs[k];
}
break;
case NEU_JSON_OBJECT:
cmd.tags[i].value.type = NEU_TYPE_CUSTOM;
cmd.tags[i].value.value.json =
Expand Down Expand Up @@ -802,6 +820,13 @@ void handle_read_resp(nng_aio *aio, neu_resp_read_group_t *resp)
if (api_res.tags[i].n_meta > 0) {
free(api_res.tags[i].metas);
}

if (api_res.tags[i].t == NEU_JSON_ARRAY_STR) {
for (int j = 0; j < api_res.tags[i].value.val_array_str.length;
j++) {
free(api_res.tags[i].value.val_array_str.p_strs[j]);
}
}
}
neu_http_ok(aio, result);
free(api_res.tags);
Expand Down Expand Up @@ -942,6 +967,13 @@ void handle_read_paginate_resp(nng_aio * aio,
if (api_res.tags[i].n_meta > 0) {
free(api_res.tags[i].metas);
}

if (api_res.tags[i].t == NEU_JSON_ARRAY_STR) {
for (int j = 0; j < api_res.tags[i].value.val_array_str.length;
j++) {
free(api_res.tags[i].value.val_array_str.p_strs[j]);
}
}
}
neu_http_ok(aio, result);
free(api_res.tags);
Expand Down
88 changes: 82 additions & 6 deletions src/adapter/driver/cache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ void neu_driver_cache_destroy(neu_driver_cache_t *cache)
json_decref(elem->value.value.json);
elem->value.value.json = NULL;
}
} else if (elem->value.type == NEU_TYPE_ARRAY_STRING) {
for (int i = 0; i < elem->value.value.strs.length; i++) {
free(elem->value.value.strs.strs[i]);
elem->value.value.strs.strs[i] = NULL;
}
}

free(elem);
Expand Down Expand Up @@ -399,6 +404,18 @@ void neu_driver_cache_update_change(neu_driver_cache_t *cache,
}
}
break;
case NEU_TYPE_ARRAY_STRING:
if (elem->value_old.value.strs.length !=
value.value.strs.length) {
elem->changed = true;
} else {
if (memcmp(elem->value_old.value.strs.strs,
value.value.strs.strs,
value.value.strs.length * sizeof(char *)) != 0) {
elem->changed = true;
}
}
break;
case NEU_TYPE_CUSTOM: {
if (json_equal(elem->value_old.value.json, value.value.json) !=
0) {
Expand Down Expand Up @@ -602,6 +619,17 @@ void neu_driver_cache_update_change(neu_driver_cache_t *cache,
}
}
break;
case NEU_TYPE_ARRAY_STRING:
if (elem->value.value.strs.length != value.value.strs.length) {
elem->changed = true;
} else {
if (memcmp(elem->value.value.strs.strs,
value.value.strs.strs,
value.value.strs.length * sizeof(char *)) != 0) {
elem->changed = true;
}
}
break;
case NEU_TYPE_PTR: {
if (elem->value.value.ptr.length != value.value.ptr.length) {
elem->changed = true;
Expand Down Expand Up @@ -668,14 +696,43 @@ void neu_driver_cache_update_change(neu_driver_cache_t *cache,
elem->value.value.ptr.ptr = calloc(1, value.value.ptr.length);
memcpy(elem->value.value.ptr.ptr, value.value.ptr.ptr,
value.value.ptr.length);
} else if (value.type == NEU_TYPE_CUSTOM ||
value.type == NEU_TYPE_ERROR) {
if (elem->value.type == NEU_TYPE_CUSTOM &&
elem->value.value.json != NULL) {
json_decref(elem->value.value.json);
elem->value.value.json = NULL;
} else if (value.type == NEU_TYPE_CUSTOM) {
if (elem->value.type == NEU_TYPE_CUSTOM) {
if (elem->value.value.json != NULL) {
json_decref(elem->value.value.json);
elem->value.value.json = NULL;
}
}

elem->value.value.json = value.value.json;

} else if (value.type == NEU_TYPE_ARRAY_STRING) {
if (elem->value.type == NEU_TYPE_ARRAY_STRING) {
for (int i = 0; i < elem->value.value.strs.length; i++) {
free(elem->value.value.strs.strs[i]);
elem->value.value.strs.strs[i] = NULL;
}
}
elem->value.value.strs.length = value.value.strs.length;
for (int i = 0; i < value.value.strs.length; i++) {
elem->value.value.strs.strs[i] = value.value.strs.strs[i];
}

} else if (value.type == NEU_TYPE_ERROR) {
if (elem->value.type == NEU_TYPE_CUSTOM) {
if (elem->value.value.json != NULL) {
json_decref(elem->value.value.json);
elem->value.value.json = NULL;
}
}

if (elem->value.type == NEU_TYPE_ARRAY_STRING) {
for (int i = 0; i < elem->value.value.strs.length; i++) {
free(elem->value.value.strs.strs[i]);
elem->value.value.strs.strs[i] = NULL;
}
}
elem->value.value = value.value;
} else {
elem->value.value = value.value;
}
Expand Down Expand Up @@ -814,6 +871,13 @@ int neu_driver_cache_meta_get(neu_driver_cache_t *cache, const char *group,
memcpy(value->value.value.f64s.f64s, elem->value.value.f64s.f64s,
elem->value.value.f64s.length * sizeof(double));
break;
case NEU_TYPE_ARRAY_STRING:
value->value.value.strs.length = elem->value.value.strs.length;
for (int i = 0; i < elem->value.value.strs.length; i++) {
value->value.value.strs.strs[i] =
strdup(elem->value.value.strs.strs[i]);
}
break;
case NEU_TYPE_PTR:
value->value.value.ptr.length = elem->value.value.ptr.length;
value->value.value.ptr.type = elem->value.value.ptr.type;
Expand Down Expand Up @@ -958,6 +1022,13 @@ int neu_driver_cache_meta_get_changed(neu_driver_cache_t *cache,
memcpy(value->value.value.f64s.f64s, elem->value.value.f64s.f64s,
elem->value.value.f64s.length * sizeof(double));
break;
case NEU_TYPE_ARRAY_STRING:
value->value.value.strs.length = elem->value.value.strs.length;
for (int i = 0; i < elem->value.value.strs.length; i++) {
value->value.value.strs.strs[i] =
strdup(elem->value.value.strs.strs[i]);
}
break;
case NEU_TYPE_PTR:
value->value.value.ptr.length = elem->value.value.ptr.length;
value->value.value.ptr.type = elem->value.value.ptr.type;
Expand Down Expand Up @@ -1010,6 +1081,11 @@ void neu_driver_cache_del(neu_driver_cache_t *cache, const char *group,
json_decref(elem->value.value.json);
elem->value.value.json = NULL;
}
} else if (elem->value.type == NEU_TYPE_ARRAY_STRING) {
for (int i = 0; i < elem->value.value.strs.length; i++) {
free(elem->value.value.strs.strs[i]);
elem->value.value.strs.strs[i] = NULL;
}
}
free(elem);
}
Expand Down
22 changes: 22 additions & 0 deletions src/adapter/driver/driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,7 @@ static void fix_value(neu_datatag_t *tag, neu_type_e value_type,
case NEU_TYPE_ARRAY_INT64:
case NEU_TYPE_ARRAY_CHAR:
case NEU_TYPE_ARRAY_BOOL:
case NEU_TYPE_ARRAY_STRING:
case NEU_TYPE_CUSTOM:
break;
case NEU_TYPE_BIT:
Expand Down Expand Up @@ -2184,6 +2185,11 @@ static int report_callback(void *usr_data)
free(tag_value->value.value.ptr.ptr);
} else if (tag_value->value.type == NEU_TYPE_CUSTOM) {
json_decref(tag_value->value.value.json);
} else if (tag_value->value.type == NEU_TYPE_ARRAY_STRING) {
for (size_t i = 0; i < tag_value->value.value.strs.length;
++i) {
free(tag_value->value.value.strs.strs[i]);
}
}
}
utarray_free(data->tags);
Expand Down Expand Up @@ -2487,6 +2493,10 @@ static void read_report_group(int64_t timestamp, int64_t timeout,
free(value.value.value.ptr.ptr);
} else if (value.value.type == NEU_TYPE_CUSTOM) {
json_decref(value.value.value.json);
} else if (value.value.type == NEU_TYPE_ARRAY_STRING) {
for (size_t i = 0; i < value.value.value.strs.length; ++i) {
free(value.value.value.strs.strs[i]);
}
}
tag_value.value.type = NEU_TYPE_ERROR;
tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_VALUE_EXPIRED;
Expand Down Expand Up @@ -2651,6 +2661,12 @@ static void read_group(int64_t timestamp, int64_t timeout,
(timestamp - value.timestamp) > timeout) {
if (value.value.type == NEU_TYPE_PTR) {
free(value.value.value.ptr.ptr);
} else if (value.value.type == NEU_TYPE_CUSTOM) {
json_decref(value.value.value.json);
} else if (value.value.type == NEU_TYPE_ARRAY_STRING) {
for (size_t i = 0; i < value.value.value.strs.length; ++i) {
free(value.value.value.strs.strs[i]);
}
}
tag_value.value.type = NEU_TYPE_ERROR;
tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_VALUE_EXPIRED;
Expand Down Expand Up @@ -2829,6 +2845,12 @@ static void read_group_paginate(int64_t timestamp, int64_t timeout,
(timestamp - value.timestamp) > timeout) {
if (value.value.type == NEU_TYPE_PTR) {
free(value.value.value.ptr.ptr);
} else if (value.value.type == NEU_TYPE_CUSTOM) {
json_decref(value.value.value.json);
} else if (value.value.type == NEU_TYPE_ARRAY_STRING) {
for (size_t i = 0; i < value.value.value.strs.length; ++i) {
free(value.value.value.strs.strs[i]);
}
}
tag_value.value.type = NEU_TYPE_ERROR;
tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_VALUE_EXPIRED;
Expand Down
14 changes: 14 additions & 0 deletions src/utils/json.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,17 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele)
json_object_set_new(ob, ele.name, array);
break;
}
case NEU_JSON_ARRAY_STR: {
void *array = json_array();

for (int i = 0; i < ele.v.val_array_str.length; i++) {
json_array_append_new(array,
json_string(ele.v.val_array_str.p_strs[i]));
}

json_object_set_new(ob, ele.name, array);
break;
}
case NEU_JSON_OBJECT:
json_object_set_new(ob, ele.name, ele.v.val_object);
break;
Expand Down Expand Up @@ -688,6 +699,9 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
}
case NEU_JSON_OBJECT:
ele->v.val_object = ob;
if (ele->name == NULL) {
json_incref(ele->v.val_object);
}
break;
default:
ele->ok = false;
Expand Down
1 change: 1 addition & 0 deletions tests/ft/neuron/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
NEU_TYPE_ARRAY_FLOAT = 31
NEU_TYPE_ARRAY_DOUBLE = 32
NEU_TYPE_ARRAY_BOOL = 33
NEU_TYPE_ARRAY_STRING = 34
NEU_TYPE_CUSTOM = 40

NEU_BAUD_115200 = 0
Expand Down

0 comments on commit 38c44c4

Please sign in to comment.