#include "table.h"
#include "timeval.h"
#include "util.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_ovsdb_client
+
+VLOG_DEFINE_THIS_MODULE(ovsdb_client);
/* --format: Output formatting. */
static enum {
FMT_TABLE, /* Textual table. */
FMT_HTML, /* HTML table. */
- FMT_CSV /* Comma-separated lines. */
+ FMT_CSV, /* Comma-separated lines. */
+ FMT_JSON /* JSON. */
} output_format;
/* --no-headings: Whether table output should include headings. */
output_format = FMT_HTML;
} else if (!strcmp(optarg, "csv")) {
output_format = FMT_CSV;
+ } else if (!strcmp(optarg, "json")) {
+ output_format = FMT_JSON;
} else {
ovs_fatal(0, "unknown output format \"%s\"", optarg);
}
" list databases available on SERVER\n"
"\n get-schema SERVER DATABASE\n"
" retrieve schema for DATABASE from SERVER\n"
+ "\n get-schema-version SERVER DATABASE\n"
+ " retrieve schema for DATABASE from SERVER and report only its\n"
+ " version number on stdout\n"
"\n list-tables SERVER DATABASE\n"
" list tables for DATABASE on SERVER\n"
"\n list-columns SERVER DATABASE [TABLE]\n"
stream_usage("SERVER", true, true, true);
printf("\nOutput formatting options:\n"
" -f, --format=FORMAT set output formatting to FORMAT\n"
- " (\"table\", \"html\", or \"csv\"\n"
+ " (\"table\", \"html\", \"csv\", "
+ "or \"json\")\n"
" --no-headings omit table heading row\n"
" --pretty pretty-print JSON in output");
daemon_usage();
\f
struct column {
char *heading;
- int width;
};
+struct cell {
+ /* Literal text. */
+ char *text;
+
+ /* JSON. */
+ struct json *json;
+ const struct ovsdb_type *type;
+};
+
+static const char *
+cell_to_text(const struct cell *cell_)
+{
+ struct cell *cell = (struct cell *) cell_;
+ if (!cell->text) {
+ if (cell->json) {
+ if (data_format == DF_JSON || !cell->type) {
+ cell->text = json_to_string(cell->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, cell->type, cell->json,
+ NULL);
+ if (!error) {
+ ds_init(&s);
+ ovsdb_datum_to_string(&datum, cell->type, &s);
+ ovsdb_datum_destroy(&datum, cell->type);
+ cell->text = ds_steal_cstr(&s);
+ } else {
+ cell->text = json_to_string(cell->json, JSSF_SORT);
+ }
+ } else {
+ NOT_REACHED();
+ }
+ } else {
+ cell->text = xstrdup("");
+ }
+ }
+
+ return cell->text;
+}
+
+static void
+cell_destroy(struct cell *cell)
+{
+ free(cell->text);
+ json_destroy(cell->json);
+}
+
struct table {
- char **cells;
+ struct cell *cells;
struct column *columns;
size_t n_columns, allocated_columns;
size_t n_rows, allocated_rows;
free(table->columns);
for (i = 0; i < table->n_columns * table->n_rows; i++) {
- free(table->cells[i]);
+ cell_destroy(&table->cells[i]);
}
free(table->cells);
va_start(args, heading);
column->heading = xvasprintf(heading, args);
- column->width = strlen(column->heading);
va_end(args);
}
-static char **
+static struct cell *
table_cell__(const struct table *table, size_t row, size_t column)
{
return &table->cells[column + row * table->n_columns];
y = table->n_rows++;
table->current_column = 0;
for (x = 0; x < table->n_columns; x++) {
- *table_cell__(table, y, x) = NULL;
+ struct cell *cell = table_cell__(table, y, x);
+ memset(cell, 0, sizeof *cell);
}
}
-static void
-table_add_cell_nocopy(struct table *table, char *s)
+static struct cell *
+table_add_cell(struct table *table)
{
size_t x, y;
- int length;
assert(table->n_rows > 0);
assert(table->current_column < table->n_columns);
x = table->current_column++;
y = table->n_rows - 1;
- *table_cell__(table, y, x) = s;
- length = strlen(s);
- if (length > table->columns[x].width) {
- table->columns[x].width = length;
- }
-}
-
-static void
-table_add_cell(struct table *table, const char *format, ...)
-{
- va_list args;
-
- va_start(args, format);
- table_add_cell_nocopy(table, xvasprintf(format, args));
- va_end(args);
+ return table_cell__(table, y, x);
}
static void
{
static int n = 0;
struct ds line = DS_EMPTY_INITIALIZER;
+ int *widths;
size_t x, y;
if (n++ > 0) {
putchar('\n');
}
+ if (table->caption) {
+ puts(table->caption);
+ }
+
+ widths = xmalloc(table->n_columns * sizeof *widths);
+ for (x = 0; x < table->n_columns; x++) {
+ const struct column *column = &table->columns[x];
+
+ widths[x] = strlen(column->heading);
+ for (y = 0; y < table->n_rows; y++) {
+ const char *text = cell_to_text(table_cell__(table, y, x));
+ size_t length = strlen(text);
+
+ if (length > widths[x])
+ widths[x] = length;
+ }
+ }
+
if (output_headings) {
for (x = 0; x < table->n_columns; x++) {
const struct column *column = &table->columns[x];
if (x) {
ds_put_char(&line, ' ');
}
- ds_put_format(&line, "%-*s", column->width, column->heading);
+ ds_put_format(&line, "%-*s", widths[x], column->heading);
}
table_print_table_line__(&line);
for (x = 0; x < table->n_columns; x++) {
- const struct column *column = &table->columns[x];
- int i;
-
if (x) {
ds_put_char(&line, ' ');
}
- for (i = 0; i < column->width; i++) {
- ds_put_char(&line, '-');
- }
+ ds_put_char_multiple(&line, '-', widths[x]);
}
table_print_table_line__(&line);
}
for (y = 0; y < table->n_rows; y++) {
for (x = 0; x < table->n_columns; x++) {
- const char *cell = *table_cell__(table, y, x);
+ const char *text = cell_to_text(table_cell__(table, y, x));
if (x) {
ds_put_char(&line, ' ');
}
- ds_put_format(&line, "%-*s", table->columns[x].width, cell);
+ ds_put_format(&line, "%-*s", widths[x], text);
}
table_print_table_line__(&line);
}
ds_destroy(&line);
+ free(widths);
}
static void
for (y = 0; y < table->n_rows; y++) {
fputs(" <tr>\n", stdout);
for (x = 0; x < table->n_columns; x++) {
- const char *content = *table_cell__(table, y, x);
+ const char *content = cell_to_text(table_cell__(table, y, x));
if (!strcmp(table->columns[x].heading, "_uuid")) {
fputs(" <td><a name=\"", stdout);
if (x) {
putchar(',');
}
- table_print_csv_cell__(*table_cell__(table, y, x));
+ table_print_csv_cell__(cell_to_text(table_cell__(table, y, x)));
}
putchar('\n');
}
}
+static void
+table_print_json__(const struct table *table)
+{
+ struct json *json, *headings, *data;
+ size_t x, y;
+ char *s;
+
+ json = json_object_create();
+ if (table->caption) {
+ json_object_put_string(json, "caption", table->caption);
+ }
+
+ headings = json_array_create_empty();
+ for (x = 0; x < table->n_columns; x++) {
+ const struct column *column = &table->columns[x];
+ json_array_add(headings, json_string_create(column->heading));
+ }
+ json_object_put(json, "headings", headings);
+
+ data = json_array_create_empty();
+ for (y = 0; y < table->n_rows; y++) {
+ struct json *row = json_array_create_empty();
+ for (x = 0; x < table->n_columns; x++) {
+ const struct cell *cell = table_cell__(table, y, x);
+ if (cell->text) {
+ json_array_add(row, json_string_create(cell->text));
+ } else {
+ json_array_add(row, json_clone(cell->json));
+ }
+ }
+ json_array_add(data, row);
+ }
+ json_object_put(json, "data", data);
+
+ s = json_to_string(json, json_flags);
+ json_destroy(json);
+ puts(s);
+ free(s);
+}
+
static void
table_print(const struct table *table)
{
case FMT_CSV:
table_print_csv__(table);
break;
+
+ case FMT_JSON:
+ table_print_json__(table);
+ break;
}
}
\f
ovsdb_schema_destroy(schema);
}
+static void
+do_get_schema_version(int argc OVS_UNUSED, char *argv[])
+{
+ struct ovsdb_schema *schema = fetch_schema(argv[1], argv[2]);
+ puts(schema->version);
+ ovsdb_schema_destroy(schema);
+}
+
static void
do_list_tables(int argc OVS_UNUSED, char *argv[])
{
struct ovsdb_table_schema *ts = node->data;
table_add_row(&t);
- table_add_cell(&t, ts->name);
+ table_add_cell(&t)->text = xstrdup(ts->name);
}
ovsdb_schema_destroy(schema);
table_print(&t);
SHASH_FOR_EACH (column_node, &ts->columns) {
const struct ovsdb_column *column = column_node->data;
- struct json *type = ovsdb_type_to_json(&column->type);
table_add_row(&t);
if (!table_name) {
- table_add_cell(&t, ts->name);
+ table_add_cell(&t)->text = xstrdup(ts->name);
}
- table_add_cell(&t, column->name);
- table_add_cell_nocopy(&t, json_to_string(type, JSSF_SORT));
-
- json_destroy(type);
+ table_add_cell(&t)->text = xstrdup(column->name);
+ table_add_cell(&t)->json = ovsdb_type_to_json(&column->type);
}
}
}
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)
}
table_add_row(t);
- table_add_cell(t, uuid);
- table_add_cell(t, type);
+ table_add_cell(t)->text = xstrdup(uuid);
+ table_add_cell(t)->text = xstrdup(type);
for (i = 0; i < columns->n_columns; i++) {
const struct ovsdb_column *column = columns->columns[i];
struct json *value = shash_find_data(json_object(row), column->name);
+ struct cell *cell = table_add_cell(t);
if (value) {
- table_add_cell_nocopy(t, format_json(value, &column->type));
- } else {
- table_add_cell(t, "");
+ cell->json = json_clone(value);
+ cell->type = &column->type;
}
}
}
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_)
{
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));
+ struct cell *cell = table_add_cell(&t);
+ cell->json = ovsdb_datum_to_json(&data[y][x], &columns[x]->type);
+ cell->type = &columns[x]->type;
}
}
table_print(&t);
static const struct command all_commands[] = {
{ "list-dbs", 1, 1, do_list_dbs },
{ "get-schema", 2, 2, do_get_schema },
+ { "get-schema-version", 2, 2, do_get_schema_version },
{ "list-tables", 2, 2, do_list_tables },
{ "list-columns", 2, 3, do_list_columns },
{ "transact", 2, 2, do_transact },