Adding a table to the dump command's arguments retrieves only that table.
One or more columns after the table retrieve only those columns.
Default behavior is unchanged.
Signed-off-by: Bert Vermeulen <b...@biot.com>
---
ovsdb/ovsdb-client.1.in | 7 +++--
ovsdb/ovsdb-client.c | 74 ++++++++++++++++++++++++++++++++-----------------
2 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/ovsdb/ovsdb-client.1.in b/ovsdb/ovsdb-client.1.in
index fbb7148..909a739 100644
--- a/ovsdb/ovsdb-client.1.in
+++ b/ovsdb/ovsdb-client.1.in
@@ -25,7 +25,8 @@ ovsdb\-client \- command-line interface to
\fBovsdb-server\fR(1)
.br
\fBovsdb\-client \fR[\fIoptions\fR] \fBtransact\fI \fR[\fIserver\fR]
\fItransaction\fR
.br
-\fBovsdb\-client \fR[\fIoptions\fR] \fBdump\fI \fR[\fIserver\fR]
\fR[\fIdatabase\fR]\fR
+\fBovsdb\-client \fR[\fIoptions\fR] \fBdump\fI \fR[\fIserver\fR]
\fR[\fIdatabase\fR]\fR [\fItable\fR]
+[\fIcolumn\fR[\fB,\fIcolumn\fR]...]...
.br
\fBovsdb\-client \fR[\fIoptions\fR] \fBmonitor\fI \fR[\fIserver\fR]
\fR[\fIdatabase\fR] \fItable\fR
[\fIcolumn\fR[\fB,\fIcolumn\fR]...]...
@@ -102,7 +103,9 @@ operations, and prints the received reply on stdout.
.
.IP "\fBdump\fI \fR[\fIserver\fR] \fR[\fIdatabase\fR]\fR"
Connects to \fIserver\fR, retrieves all of the data in \fIdatabase\fR,
-and prints it on stdout as a series of tables.
+and prints it on stdout as a series of tables. If a table is specified, only
+that table is retrieved. If at least one \fIcolumn\fR is specified, only those
+columns are retrieved.
.
.IP "\fBmonitor\fI \fR[\fIserver\fR] \fR[\fIdatabase\fR] \fItable\fR
[\fIcolumn\fR[\fB,\fIcolumn\fR]...]..."
Connects to \fIserver\fR and monitors the contents of \fItable\fR in
diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
index b59388f..327ebf1 100644
--- a/ovsdb/ovsdb-client.c
+++ b/ovsdb/ovsdb-client.c
@@ -963,7 +963,8 @@ compare_columns(const void *a_, const void *b_)
}
static void
-dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows)
+dump_table(const char *table_name, const struct shash *cols,
+ struct json_array *rows)
{
const struct ovsdb_column **columns;
size_t n_columns;
@@ -976,13 +977,10 @@ dump_table(const struct ovsdb_table_schema *ts, struct
json_array *rows)
size_t x, y;
/* Sort columns by name, for reproducibility. */
- columns = xmalloc(shash_count(&ts->columns) * sizeof *columns);
+ columns = xmalloc(shash_count(cols) * sizeof *columns);
n_columns = 0;
- SHASH_FOR_EACH (node, &ts->columns) {
- struct ovsdb_column *column = node->data;
- if (strcmp(column->name, "_version")) {
- columns[n_columns++] = column;
- }
+ SHASH_FOR_EACH (node, cols) {
+ columns[n_columns++] = node->data;
}
qsort(columns, n_columns, sizeof *columns, compare_columns);
@@ -993,7 +991,7 @@ dump_table(const struct ovsdb_table_schema *ts, struct
json_array *rows)
if (rows->elems[y]->type != JSON_OBJECT) {
ovs_fatal(0, "row %"PRIuSIZE" in table %s response is not a JSON
object: "
- "%s", y, ts->name, json_to_string(rows->elems[y], 0));
+ "%s", y, table_name, json_to_string(rows->elems[y], 0));
}
row = json_object(rows->elems[y]);
@@ -1002,7 +1000,7 @@ dump_table(const struct ovsdb_table_schema *ts, struct
json_array *rows)
const struct json *json = shash_find_data(row, columns[x]->name);
if (!json) {
ovs_fatal(0, "row %"PRIuSIZE" in table %s response lacks %s
column",
- y, ts->name, columns[x]->name);
+ y, table_name, columns[x]->name);
}
check_ovsdb_error(ovsdb_datum_from_json(&data[y][x],
@@ -1019,7 +1017,7 @@ dump_table(const struct ovsdb_table_schema *ts, struct
json_array *rows)
/* Add column headings. */
table_init(&t);
- table_set_caption(&t, xasprintf("%s table", ts->name));
+ table_set_caption(&t, xasprintf("%s table", table_name));
for (x = 0; x < n_columns; x++) {
table_add_column(&t, "%s", columns[x]->name);
}
@@ -1044,42 +1042,63 @@ dump_table(const struct ovsdb_table_schema *ts, struct
json_array *rows)
static void
do_dump(struct jsonrpc *rpc, const char *database,
- int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+ int argc, char *argv[])
{
struct jsonrpc_msg *request, *reply;
struct ovsdb_schema *schema;
struct json *transaction;
- const struct shash_node **tables;
+ const struct shash_node *node, **tables;
size_t n_tables;
+ struct ovsdb_table_schema *tschema;
+ const struct shash *columns;
+ struct shash custom_columns;
size_t i;
+ shash_init(&custom_columns);
schema = fetch_schema(rpc, database);
- tables = shash_sort(&schema->tables);
- n_tables = shash_count(&schema->tables);
+ if (argc) {
+ node = shash_find(&schema->tables, argv[0]);
+ if (!node)
+ ovs_fatal(0, "No table \"%s\" found.", argv[0]);
+ tables = xmemdup(&node, sizeof(&node));
+ n_tables = 1;
+ tschema = tables[0]->data;
+ for (i = 1; i < argc; i++) {
+ node = shash_find(&tschema->columns, argv[i]);
+ if (!node)
+ ovs_fatal(0, "Table \"%s\" has no column %s.", argv[0],
argv[1]);
+ shash_add(&custom_columns, argv[1], node->data);
+ }
+ } else {
+ tables = shash_sort(&schema->tables);
+ n_tables = shash_count(&schema->tables);
+ }
/* Construct transaction to retrieve entire database. */
transaction = json_array_create_1(json_string_create(database));
for (i = 0; i < n_tables; i++) {
const struct ovsdb_table_schema *ts = tables[i]->data;
- struct json *op, *columns;
- struct shash_node *node;
-
- columns = json_array_create_empty();
- SHASH_FOR_EACH (node, &ts->columns) {
+ struct json *op, *jcolumns;
+
+ if (argc > 1)
+ columns = &custom_columns;
+ else
+ columns = &ts->columns;
+ jcolumns = json_array_create_empty();
+ SHASH_FOR_EACH (node, columns) {
const struct ovsdb_column *column = node->data;
- if (strcmp(column->name, "_version")) {
- json_array_add(columns, json_string_create(column->name));
- }
+ if (strcmp(column->name, "_version"))
+ json_array_add(jcolumns, json_string_create(column->name));
}
op = json_object_create();
json_object_put_string(op, "op", "select");
json_object_put_string(op, "table", tables[i]->name);
json_object_put(op, "where", json_array_create_empty());
- json_object_put(op, "columns", columns);
+ json_object_put(op, "columns", jcolumns);
json_array_add(transaction, op);
}
@@ -1106,10 +1125,15 @@ do_dump(struct jsonrpc *rpc, const char *database,
ts->name, json_to_string(op_result, 0));
}
- dump_table(ts, &rows->u.array);
+ if (argc > 1) {
+ dump_table(tables[i]->name, &custom_columns, &rows->u.array);
+ } else {
+ dump_table(tables[i]->name, &ts->columns, &rows->u.array);
+ }
}
jsonrpc_msg_destroy(reply);
+ shash_destroy(&custom_columns);
free(tables);
ovsdb_schema_destroy(schema);
}
@@ -1136,7 +1160,7 @@ static const struct ovsdb_client_command all_commands[] =
{
{ "list-columns", NEED_DATABASE, 0, 1, do_list_columns },
{ "transact", NEED_RPC, 1, 1, do_transact },
{ "monitor", NEED_DATABASE, 1, INT_MAX, do_monitor },
- { "dump", NEED_DATABASE, 0, 0, do_dump },
+ { "dump", NEED_DATABASE, 0, INT_MAX, do_dump },
{ "help", NEED_NONE, 0, INT_MAX, do_help },
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
