Skip to content
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

[b4.4] Fix "fill" handling in static decomposition #1500

Merged
merged 4 commits into from
Nov 12, 2024
Merged

[b4.4] Fix "fill" handling in static decomposition #1500

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ded203
Fix "fill" detection logic in decomp_static
Nov 5, 2024
3cf1f1a
Fix "fill" string value handling
Nov 5, 2024
a3ce894
Fix incorrect assertions in static decomposition
Nov 7, 2024
9a1214e
Fix the handling of lists of primitive types in static decomposition
Nov 8, 2024
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
69 changes: 50 additions & 19 deletions ldms/src/decomp/static/decomp_static.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ mval_from_json(ldms_mval_t *v,
dst.type = mtype;
jtype = json_typeof(jent);

if ((jtype == JSON_STRING && mtype != LDMS_V_CHAR_ARRAY) ||
(mtype == LDMS_V_CHAR_ARRAY && jtype != JSON_STRING)) {
if ((mtype == LDMS_V_CHAR_ARRAY && jtype != JSON_STRING)) {
snprintf(err_buf, err_sz, "string type must have string value");
return EINVAL;
}
Expand All @@ -132,6 +131,13 @@ mval_from_json(ldms_mval_t *v,
return EINVAL;
}
break;
case JSON_STRING:
if (mtype != LDMS_V_CHAR && mtype != LDMS_V_CHAR_ARRAY) {
snprintf(err_buf, err_sz,
"string value must have 'char' or 'char_array' type");
return EINVAL;
}
break;
default:
snprintf(err_buf, err_sz, "Unsupported JSON value");
return EINVAL;
Expand Down Expand Up @@ -289,6 +295,7 @@ typedef struct decomp_static_mid_rbn_s {
enum ldms_value_type mtype;
size_t array_len;
enum ldms_value_type rec_mtype;
enum ldms_value_type le_mtype;
#if 0
size_t mval_size; /* Size of this mval */
off_t mval_offset; /* Offset into mval memory for this column */
Expand Down Expand Up @@ -874,6 +881,7 @@ static int resolve_col(struct resolve_ctxt_s *ctxt,
col_mid->array_len = -1;
col_mid->rec_mid = -EINVAL;
col_mid->rec_mtype = LDMS_V_NONE;
col_mid->le_mtype = LDMS_V_NONE;

src = cfg_col->src;

Expand Down Expand Up @@ -915,11 +923,12 @@ static int resolve_col(struct resolve_ctxt_s *ctxt,
if (mid < 0) {
/* This is a fill candidate, must have a type and if
* an array a length */
if (cfg_col->type == LDMS_V_NONE) {
if (!cfg_col->fill) {
ldmsd_log(LDMSD_LERROR,
"strgp '%s': col[src] '%s' does not exist in "
"the set and the 'type' is not specified.\n",
ctxt->strgp->obj.name, cfg_col->src);
"the set '%s' and the 'fill' is not specified.\n",
ctxt->strgp->obj.name, cfg_col->src,
ldms_set_name_get(ctxt->set));
rc = EINVAL;
goto err;
}
Expand All @@ -940,7 +949,7 @@ static int resolve_col(struct resolve_ctxt_s *ctxt,

mtype = ldms_metric_type_get(ctxt->set, mid);
mlen = ldms_metric_array_get_len(ctxt->set, mid);
assert(mlen >= 0);
ASSERT_RETURN((!ldms_type_is_array(mtype)) || mlen);

if (LDMS_V_NONE < mtype && mtype <= LDMS_V_D64_ARRAY) {
/* Primitives & array of primitives. We have mlen, mtype and
Expand All @@ -966,7 +975,7 @@ static int resolve_col(struct resolve_ctxt_s *ctxt,
/* handling LIST */
lh = ldms_metric_get(ctxt->set, mid);
le = ldms_list_first(ctxt->set, lh, &le_mtype, &mlen);
assert(mlen);
ASSERT_RETURN((!ldms_type_is_array(le_mtype)) || mlen);
if (!le) {
/* list empty. can't init yet */
ldmsd_log(LDMSD_LERROR,
Expand Down Expand Up @@ -1004,7 +1013,7 @@ static int resolve_col(struct resolve_ctxt_s *ctxt,
goto err;
}
rec_mtype = ldms_record_metric_type_get(le, rec_mid, &mlen);
assert(mlen);
ASSERT_RETURN((!ldms_type_is_array(rec_mtype)) || mlen);
goto commit;

rec_array_routine:
Expand All @@ -1028,29 +1037,37 @@ static int resolve_col(struct resolve_ctxt_s *ctxt,
goto err;
}
rec_mtype = ldms_record_metric_type_get(rec, rec_mid, &mlen);
assert(mlen);
ASSERT_RETURN((!ldms_type_is_array(rec_mtype)) || mlen);
/* fall through to commit */

commit:
/* commit to col_mid */
col_mid->mid = mid;
col_mid->mtype = mtype;
col_mid->array_len = mlen;
assert(mlen);
col_mid->le_mtype = le_mtype;
if (rec_mid >= 0) {
col_mid->rec_mid = rec_mid;
col_mid->rec_mtype = rec_mtype;
ASSERT_RETURN((!ldms_type_is_array(rec_mtype)) || mlen);
} else {
}

/* commit to cfg_col */

assert(mtype != LDMS_V_NONE);
ASSERT_RETURN(mtype != LDMS_V_NONE);
if (cfg_col->type == LDMS_V_NONE) {
cfg_col->type = rec_mid>=0?rec_mtype:mtype;
if (rec_mid >= 0)
cfg_col->type = rec_mtype;
else if (mtype == LDMS_V_LIST)
cfg_col->type = le_mtype;
else
cfg_col->type = mtype;
}
if (0 == cfg_col->array_len) {
assert(mlen >= 0);
cfg_col->array_len = mlen;
ASSERT_RETURN((!ldms_type_is_array(cfg_col->type)) ||
cfg_col->array_len);
}
if (0 == cfg_col->mval_size) {
cfg_col->mval_offset = ctxt->mval_offset;
Expand All @@ -1065,7 +1082,7 @@ static int resolve_col(struct resolve_ctxt_s *ctxt,

next:

assert(special || cfg_col->mval_size);
ASSERT_RETURN(special || cfg_col->mval_size);
/* update row schema digest */
EVP_DigestUpdate(ctxt->evp_ctx, cfg_col->dst, strlen(cfg_col->dst));
EVP_DigestUpdate(ctxt->evp_ctx, &cfg_col->type, sizeof(cfg_col->type));
Expand Down Expand Up @@ -1193,7 +1210,7 @@ static void assign_value(ldmsd_col_t dst, ldmsd_col_t src)
}
switch (dst->type) {
case LDMS_V_CHAR:
dst->mval->v_char = ldms_mval_as_s8(src->mval, src->type, 0);
dst->mval->v_char = ldms_mval_as_char(src->mval, src->type, 0);
break;
case LDMS_V_U8:
dst->mval->v_u8 = ldms_mval_as_u8(src->mval, src->type, 0);
Expand Down Expand Up @@ -1750,6 +1767,7 @@ static int decomp_static_decompose(ldmsd_strgp_t strgp, ldms_set_t set,
const char *producer;
const char *instance;
int producer_len, instance_len;
union ldms_value zfill = {0}; /* zero value as default "fill" */

if (!TAILQ_EMPTY(row_list))
return EINVAL;
Expand Down Expand Up @@ -1922,8 +1940,15 @@ static int decomp_static_decompose(ldmsd_strgp_t strgp, ldms_set_t set,
col_mvals_fill:
mcol->le = NULL;
mcol->mval = cfg_row->cols[j].fill;
mcol->mtype = cfg_row->cols[j].type;
mcol->array_len = cfg_row->cols[j].fill_len;
if (mcol->mval) {
mcol->mtype = cfg_row->cols[j].type;
mcol->array_len = cfg_row->cols[j].fill_len;
} else {
/* no "fill" specified, use default "fill" */
mcol->mval = &zfill;
mcol->array_len = 1;
mcol->mtype = cfg_row->cols[j].type;
}
}

make_row: /* make/expand rows according to col_mvals */
Expand Down Expand Up @@ -2037,8 +2062,14 @@ static int decomp_static_decompose(ldmsd_strgp_t strgp, ldms_set_t set,

col_fill:
mcol->mval = cfg_row->cols[j].fill;
mcol->array_len = row->cols[j].array_len;
mcol->mtype = cfg_row->cols[j].type;
if (mcol->mval) {
mcol->array_len = row->cols[j].array_len;
mcol->mtype = cfg_row->cols[j].type;
} else {
mcol->mval = &zfill;
mcol->array_len = 1;
mcol->mtype = cfg_row->cols[j].type;
}
}

if (cfg_row->op_present) {
Expand Down
Loading