mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

db-ctl-base: Add support for identifying a row based on a value in a map.

Browse Source 
This will be used in an upcoming commit to allow Datapath_Binding records
in the OVN southbound database to be identified based on external-ids:name
and other map values.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Andy Zhou <azhou@ovn.org>
This commit is contained in:
Ben Pfaff
2017-04-27 15:47:59 -07:00
parent a0b02897cf
commit 15931827ee
6 changed files with 79 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/db-ctl-base.c
View File

@@ -251,15 +251,26 @@ get_row_by_id(struct ctl_context *ctx,
}
const struct ovsdb_idl_row *referrer = NULL;
ovs_assert(id->name_column->type.value.type == OVSDB_TYPE_VOID);
enum ovsdb_atomic_type key = id->name_column->type.key.type;
if (key == OVSDB_TYPE_INTEGER) {
/* Figure out the 'key' and 'value' types for the column that we're going
* to look at. One of these ('name_type') is the type of the name we're
* going to compare against 'record_id'. */
enum ovsdb_atomic_type key, value, name_type;
if (!id->key) {
name_type = key = id->name_column->type.key.type;
value = OVSDB_TYPE_VOID;
} else {
key = OVSDB_TYPE_STRING;
name_type = value = id->name_column->type.value.type;
}
/* We only support integer and string names (so far). */
if (name_type == OVSDB_TYPE_INTEGER) {
if (!record_id[0] || record_id[strspn(record_id, "0123456789")]) {
return NULL;
}
} else {
ovs_assert(key == OVSDB_TYPE_STRING);
ovs_assert(name_type == OVSDB_TYPE_STRING);
}
const struct ovsdb_idl_class *class = ovsdb_idl_get_class(ctx->idl);
@@ -269,19 +280,34 @@ get_row_by_id(struct ctl_context *ctx,
id_table);
row != NULL;
row = ovsdb_idl_next_row(row)) {
const struct ovsdb_datum *name = ovsdb_idl_get(
row, id->name_column, key, OVSDB_TYPE_VOID);
if (name->n == 1) {
const union ovsdb_atom *atom = &name->keys[0];
if (key == OVSDB_TYPE_STRING
? !strcmp(atom->string, record_id)
: atom->integer == strtoll(record_id, NULL, 10)) {
if (referrer) {
ctl_fatal("multiple rows in %s match \"%s\"",
id_table->name, record_id);
}
referrer = row;
/* Pick out the name column's data. */
const struct ovsdb_datum *datum = ovsdb_idl_get(
row, id->name_column, key, value);
/* Extract the name from the column. */
const union ovsdb_atom *name;
if (!id->key) {
name = datum->n == 1 ? &datum->keys[0] : NULL;
} else {
const union ovsdb_atom key
= { .string = CONST_CAST(char *, id->key) };
unsigned int i = ovsdb_datum_find_key(datum, &key,
OVSDB_TYPE_STRING);
name = i == UINT_MAX ? NULL : &datum->values[i];
}
if (!name) {
continue;
}
/* If the name equals 'record_id', take it. */
if (name_type == OVSDB_TYPE_STRING
? !strcmp(name->string, record_id)
: name->integer == strtoll(record_id, NULL, 10)) {
if (referrer) {
ctl_fatal("multiple rows in %s match \"%s\"",
id_table->name, record_id);
}
referrer = row;
}
}
if (!referrer) {