\n", stdout);
for (x = 0; x < table->n_columns; x++) {
- table_print_html_cell__("td", *table_cell__(table, y, x));
+ const char *content = *table_cell__(table, y, x);
+
+ if (!strcmp(table->columns[x].heading, "_uuid")) {
+ fputs(" | ", stdout);
+ table_escape_html_text__(content, 8);
+ fputs(" | \n", stdout);
+ } else {
+ table_print_html_cell__("td", content);
+ }
}
fputs("
\n", stdout);
}
@@ -533,8 +595,17 @@ table_print_csv_cell__(const char *content)
static void
table_print_csv__(const struct table *table)
{
+ static int n = 0;
size_t x, y;
+ if (n++ > 0) {
+ putchar('\n');
+ }
+
+ if (table->caption) {
+ puts(table->caption);
+ }
+
if (output_headings) {
for (x = 0; x < table->n_columns; x++) {
const struct column *column = &table->columns[x];
@@ -576,7 +647,7 @@ table_print(const struct table *table)
}
static void
-do_list_dbs(int argc UNUSED, char *argv[])
+do_list_dbs(int argc OVS_UNUSED, char *argv[])
{
struct jsonrpc_msg *request, *reply;
struct jsonrpc *rpc;
@@ -607,7 +678,7 @@ do_list_dbs(int argc UNUSED, char *argv[])
}
static void
-do_get_schema(int argc UNUSED, char *argv[])
+do_get_schema(int argc OVS_UNUSED, char *argv[])
{
struct ovsdb_schema *schema = fetch_schema(argv[1], argv[2]);
print_and_free_json(ovsdb_schema_to_json(schema));
@@ -615,7 +686,7 @@ do_get_schema(int argc UNUSED, char *argv[])
}
static void
-do_list_tables(int argc UNUSED, char *argv[])
+do_list_tables(int argc OVS_UNUSED, char *argv[])
{
struct ovsdb_schema *schema;
struct shash_node *node;
@@ -624,22 +695,18 @@ do_list_tables(int argc UNUSED, char *argv[])
schema = fetch_schema(argv[1], argv[2]);
table_init(&t);
table_add_column(&t, "Table");
- table_add_column(&t, "Comment");
SHASH_FOR_EACH (node, &schema->tables) {
struct ovsdb_table_schema *ts = node->data;
table_add_row(&t);
table_add_cell(&t, ts->name);
- if (ts->comment) {
- table_add_cell(&t, ts->comment);
- }
}
ovsdb_schema_destroy(schema);
table_print(&t);
}
static void
-do_list_columns(int argc UNUSED, char *argv[])
+do_list_columns(int argc OVS_UNUSED, char *argv[])
{
const char *table_name = argv[3];
struct ovsdb_schema *schema;
@@ -653,7 +720,6 @@ do_list_columns(int argc UNUSED, char *argv[])
}
table_add_column(&t, "Column");
table_add_column(&t, "Type");
- table_add_column(&t, "Comment");
SHASH_FOR_EACH (table_node, &schema->tables) {
struct ovsdb_table_schema *ts = table_node->data;
@@ -670,9 +736,6 @@ do_list_columns(int argc UNUSED, char *argv[])
}
table_add_cell(&t, column->name);
table_add_cell_nocopy(&t, json_to_string(type, JSSF_SORT));
- if (column->comment) {
- table_add_cell(&t, column->comment);
- }
json_destroy(type);
}
@@ -683,7 +746,7 @@ do_list_columns(int argc UNUSED, char *argv[])
}
static void
-do_transact(int argc UNUSED, char *argv[])
+do_transact(int argc OVS_UNUSED, char *argv[])
{
struct jsonrpc_msg *request, *reply;
struct json *transaction;
@@ -708,6 +771,30 @@ do_transact(int argc UNUSED, char *argv[])
jsonrpc_close(rpc);
}
+static char *
+format_json(const struct json *json, const struct ovsdb_type *type)
+{
+ if (data_format == DF_JSON) {
+ return json_to_string(json, JSSF_SORT);
+ } else if (data_format == DF_STRING) {
+ struct ovsdb_datum datum;
+ struct ovsdb_error *error;
+ struct ds s;
+
+ error = ovsdb_datum_from_json(&datum, type, json, NULL);
+ if (error) {
+ return json_to_string(json, JSSF_SORT);
+ }
+
+ ds_init(&s);
+ ovsdb_datum_to_string(&datum, type, &s);
+ ovsdb_datum_destroy(&datum, type);
+ return ds_steal_cstr(&s);
+ } else {
+ NOT_REACHED();
+ }
+}
+
static void
monitor_print_row(struct json *row, const char *type, const char *uuid,
const struct ovsdb_column_set *columns, struct table *t)
@@ -729,7 +816,7 @@ monitor_print_row(struct json *row, const char *type, const char *uuid,
const struct ovsdb_column *column = columns->columns[i];
struct json *value = shash_find_data(json_object(row), column->name);
if (value) {
- table_add_cell_nocopy(t, json_to_string(value, JSSF_SORT));
+ table_add_cell_nocopy(t, format_json(value, &column->type));
} else {
table_add_cell(t, "");
}
@@ -830,14 +917,22 @@ do_monitor(int argc, char *argv[])
ovsdb_column_set_add(&columns, column);
}
} else {
- struct shash_node *node;
-
- SHASH_FOR_EACH (node, &table->columns) {
- const struct ovsdb_column *column = node->data;
- if (column->index != OVSDB_COL_UUID) {
+ const struct shash_node **nodes;
+ size_t i, n;
+
+ n = shash_count(&table->columns);
+ nodes = shash_sort(&table->columns);
+ for (i = 0; i < n; i++) {
+ const struct ovsdb_column *column = nodes[i]->data;
+ if (column->index != OVSDB_COL_UUID
+ && column->index != OVSDB_COL_VERSION) {
ovsdb_column_set_add(&columns, column);
}
}
+ free(nodes);
+
+ ovsdb_column_set_add(&columns,
+ ovsdb_table_schema_get_column(table, "_version"));
}
if (argc >= 6 && *argv[5] != '\0') {
@@ -908,8 +1003,243 @@ do_monitor(int argc, char *argv[])
}
}
+struct dump_table_aux {
+ struct ovsdb_datum **data;
+ const struct ovsdb_column **columns;
+ size_t n_columns;
+};
+
+static int
+compare_data(size_t a_y, size_t b_y, size_t x,
+ const struct dump_table_aux *aux)
+{
+ return ovsdb_datum_compare_3way(&aux->data[a_y][x],
+ &aux->data[b_y][x],
+ &aux->columns[x]->type);
+}
+
+static int
+compare_rows(size_t a_y, size_t b_y, void *aux_)
+{
+ struct dump_table_aux *aux = aux_;
+ size_t x;
+
+ /* Skip UUID columns on the first pass, since their values tend to be
+ * random and make our results less reproducible. */
+ for (x = 0; x < aux->n_columns; x++) {
+ if (aux->columns[x]->type.key.type != OVSDB_TYPE_UUID) {
+ int cmp = compare_data(a_y, b_y, x, aux);
+ if (cmp) {
+ return cmp;
+ }
+ }
+ }
+
+ /* Use UUID columns as tie-breakers. */
+ for (x = 0; x < aux->n_columns; x++) {
+ if (aux->columns[x]->type.key.type == OVSDB_TYPE_UUID) {
+ int cmp = compare_data(a_y, b_y, x, aux);
+ if (cmp) {
+ return cmp;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static void
+swap_rows(size_t a_y, size_t b_y, void *aux_)
+{
+ struct dump_table_aux *aux = aux_;
+ struct ovsdb_datum *tmp = aux->data[a_y];
+ aux->data[a_y] = aux->data[b_y];
+ aux->data[b_y] = tmp;
+}
+
+static char *
+format_data(const struct ovsdb_datum *datum, const struct ovsdb_type *type)
+{
+ if (data_format == DF_JSON) {
+ struct json *json = ovsdb_datum_to_json(datum, type);
+ char *s = json_to_string(json, JSSF_SORT);
+ json_destroy(json);
+ return s;
+ } else if (data_format == DF_STRING) {
+ struct ds s;
+
+ ds_init(&s);
+ ovsdb_datum_to_string(datum, type, &s);
+ return ds_steal_cstr(&s);
+ } else {
+ NOT_REACHED();
+ }
+}
+
+static int
+compare_columns(const void *a_, const void *b_)
+{
+ const struct ovsdb_column *const *ap = a_;
+ const struct ovsdb_column *const *bp = b_;
+ const struct ovsdb_column *a = *ap;
+ const struct ovsdb_column *b = *bp;
+
+ return strcmp(a->name, b->name);
+}
+
+static void
+dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows)
+{
+ const struct ovsdb_column **columns;
+ size_t n_columns;
+
+ struct ovsdb_datum **data;
+
+ struct dump_table_aux aux;
+ struct shash_node *node;
+ struct table t;
+ size_t x, y;
+
+ /* Sort columns by name, for reproducibility. */
+ columns = xmalloc(shash_count(&ts->columns) * 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;
+ }
+ }
+ qsort(columns, n_columns, sizeof *columns, compare_columns);
+
+ /* Extract data from table. */
+ data = xmalloc(rows->n * sizeof *data);
+ for (y = 0; y < rows->n; y++) {
+ struct shash *row;
+
+ if (rows->elems[y]->type != JSON_OBJECT) {
+ ovs_fatal(0, "row %zu in table %s response is not a JSON object: "
+ "%s", y, ts->name, json_to_string(rows->elems[y], 0));
+ }
+ row = json_object(rows->elems[y]);
+
+ data[y] = xmalloc(n_columns * sizeof **data);
+ for (x = 0; x < n_columns; x++) {
+ const struct json *json = shash_find_data(row, columns[x]->name);
+ if (!json) {
+ ovs_fatal(0, "row %zu in table %s response lacks %s column",
+ y, ts->name, columns[x]->name);
+ }
+
+ check_ovsdb_error(ovsdb_datum_from_json(&data[y][x],
+ &columns[x]->type,
+ json, NULL));
+ }
+ }
+
+ /* Sort rows by column values, for reproducibility. */
+ aux.data = data;
+ aux.columns = columns;
+ aux.n_columns = n_columns;
+ sort(rows->n, compare_rows, swap_rows, &aux);
+
+ /* Add column headings. */
+ table_init(&t);
+ table_set_caption(&t, xasprintf("%s table", ts->name));
+ for (x = 0; x < n_columns; x++) {
+ table_add_column(&t, "%s", columns[x]->name);
+ }
+
+ /* Print rows. */
+ for (y = 0; y < rows->n; y++) {
+ table_add_row(&t);
+ for (x = 0; x < n_columns; x++) {
+ table_add_cell_nocopy(&t, format_data(&data[y][x],
+ &columns[x]->type));
+ }
+ }
+ table_print(&t);
+ table_destroy(&t);
+}
+
+static void
+do_dump(int argc OVS_UNUSED, char *argv[])
+{
+ const char *server = argv[1];
+ const char *database = argv[2];
+
+ struct jsonrpc_msg *request, *reply;
+ struct ovsdb_schema *schema;
+ struct json *transaction;
+ struct jsonrpc *rpc;
+ int error;
+
+ const struct shash_node **tables;
+ size_t n_tables;
+
+ size_t i;
+
+ rpc = open_jsonrpc(server);
+
+ schema = fetch_schema_from_rpc(rpc, database);
+ 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) {
+ const struct ovsdb_column *column = node->data;
+
+ if (strcmp(column->name, "_version")) {
+ json_array_add(columns, 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_array_add(transaction, op);
+ }
+
+ /* Send request, get reply. */
+ request = jsonrpc_create_request("transact", transaction, NULL);
+ error = jsonrpc_transact_block(rpc, request, &reply);
+ if (error) {
+ ovs_fatal(error, "transaction failed");
+ }
+
+ /* Print database contents. */
+ if (reply->result->type != JSON_ARRAY
+ || reply->result->u.array.n != n_tables) {
+ ovs_fatal(0, "reply is not array of %zu elements: %s",
+ n_tables, json_to_string(reply->result, 0));
+ }
+ for (i = 0; i < n_tables; i++) {
+ const struct ovsdb_table_schema *ts = tables[i]->data;
+ const struct json *op_result = reply->result->u.array.elems[i];
+ struct json *rows;
+
+ if (op_result->type != JSON_OBJECT
+ || !(rows = shash_find_data(json_object(op_result), "rows"))
+ || rows->type != JSON_ARRAY) {
+ ovs_fatal(0, "%s table reply is not an object with a \"rows\" "
+ "member array: %s",
+ ts->name, json_to_string(op_result, 0));
+ }
+
+ dump_table(ts, &rows->u.array);
+ }
+}
+
static void
-do_help(int argc UNUSED, char *argv[] UNUSED)
+do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
usage();
}
@@ -921,6 +1251,7 @@ static const struct command all_commands[] = {
{ "list-columns", 2, 3, do_list_columns },
{ "transact", 2, 2, do_transact },
{ "monitor", 3, 5, do_monitor },
+ { "dump", 2, 2, do_dump },
{ "help", 0, INT_MAX, do_help },
{ NULL, 0, 0, NULL },
};