X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Fovsdb-tool.c;h=015ee12582894f619308d6b54cff1ed449634455;hb=aea1732ac1810d1b130ad838388f13110bb5b3f5;hp=a68e0f987ffc83e80e45bb1ae703526fa01643a7;hpb=7a6ec19d4df284f5553cd21acbb7887c744d53d3;p=openvswitch diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index a68e0f98..015ee125 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,21 +22,24 @@ #include #include +#include "column.h" #include "command-line.h" #include "compiler.h" +#include "dynamic-string.h" #include "file.h" #include "lockfile.h" #include "log.h" #include "json.h" #include "ovsdb.h" +#include "ovsdb-data.h" #include "ovsdb-error.h" #include "socket-util.h" #include "table.h" #include "timeval.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_ovsdb_tool + +VLOG_DEFINE_THIS_MODULE(ovsdb_tool); /* -m, --more: Verbosity level for "show-log" command output. */ static int show_log_verbosity; @@ -50,8 +53,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - time_init(); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); @@ -62,11 +63,11 @@ static void parse_options(int argc, char *argv[]) { static struct option long_options[] = { - {"more", no_argument, 0, 'm'}, - {"verbose", optional_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {0, 0, 0, 0}, + {"more", no_argument, NULL, 'm'}, + {"verbose", optional_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -87,7 +88,7 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); exit(EXIT_SUCCESS); case 'v': @@ -112,7 +113,10 @@ usage(void) " create DB SCHEMA create DB with the given SCHEMA\n" " compact DB [DST] compact DB in-place (or to DST)\n" " convert DB SCHEMA [DST] convert DB to SCHEMA (to DST)\n" - " extract-schema DB print DB's schema on stdout\n" + " db-version DB report version of schema used by DB\n" + " db-cksum DB report checksum of schema used by DB\n" + " schema-version SCHEMA report SCHEMA's schema version\n" + " schema-cksum SCHEMA report SCHEMA's checksum\n" " query DB TRNS execute read-only transaction on DB\n" " transact DB TRNS execute read/write transaction on DB\n" " show-log DB prints information about DB's log entries\n", @@ -227,7 +231,8 @@ compact_or_convert(const char *src_name, const char *dst_name, static void do_compact(int argc OVS_UNUSED, char *argv[]) { - compact_or_convert(argv[1], argv[2], NULL, "compacted by ovsdb-tool"); + compact_or_convert(argv[1], argv[2], NULL, + "compacted by ovsdb-tool "VERSION BUILDNR); } static void @@ -238,10 +243,68 @@ do_convert(int argc OVS_UNUSED, char *argv[]) check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &new_schema)); compact_or_convert(argv[1], argv[3], new_schema, - "converted by ovsdb-tool"); + "converted by ovsdb-tool "VERSION BUILDNR); ovsdb_schema_destroy(new_schema); } +static void +do_needs_conversion(int argc OVS_UNUSED, char *argv[]) +{ + const char *db_file_name = argv[1]; + const char *schema_file_name = argv[2]; + struct ovsdb_schema *schema1, *schema2; + + check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema1)); + check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema2)); + puts(ovsdb_schema_equal(schema1, schema2) ? "no" : "yes"); + ovsdb_schema_destroy(schema1); + ovsdb_schema_destroy(schema2); +} + +static void +do_db_version(int argc OVS_UNUSED, char *argv[]) +{ + const char *db_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); + puts(schema->version); + ovsdb_schema_destroy(schema); +} + +static void +do_db_cksum(int argc OVS_UNUSED, char *argv[]) +{ + const char *db_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); + puts(schema->cksum); + ovsdb_schema_destroy(schema); +} + +static void +do_schema_version(int argc OVS_UNUSED, char *argv[]) +{ + const char *schema_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); + puts(schema->version); + ovsdb_schema_destroy(schema); +} + +static void +do_schema_cksum(int argc OVS_UNUSED, char *argv[]) +{ + const char *schema_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); + puts(schema->cksum); + ovsdb_schema_destroy(schema); +} + static void transact(bool read_only, const char *db_file_name, const char *transaction) { @@ -251,7 +314,7 @@ transact(bool read_only, const char *db_file_name, const char *transaction) check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db, NULL)); request = parse_json(transaction); - result = ovsdb_execute(db, request, 0, NULL); + result = ovsdb_execute(db, NULL, request, 0, NULL); json_destroy(request); print_and_free_json(result); @@ -271,12 +334,14 @@ do_transact(int argc OVS_UNUSED, char *argv[]) } static void -print_db_changes(struct shash *tables, struct shash *names) +print_db_changes(struct shash *tables, struct shash *names, + const struct ovsdb_schema *schema) { struct shash_node *n1; SHASH_FOR_EACH (n1, tables) { const char *table = n1->name; + struct ovsdb_table_schema *table_schema; struct json *rows = n1->data; struct shash_node *n2; @@ -284,6 +349,7 @@ print_db_changes(struct shash *tables, struct shash *names) continue; } + table_schema = shash_find_data(&schema->tables, table); SHASH_FOR_EACH (n2, json_object(rows)) { const char *row_uuid = n2->name; struct json *columns = n2->data; @@ -306,22 +372,45 @@ print_db_changes(struct shash *tables, struct shash *names) if (!old_name) { if (new_name) { - printf(" insert row %s:\n", new_name); + printf(" insert row %s (%.8s):\n", new_name, row_uuid); } else { printf(" insert row %.8s:\n", row_uuid); } } else { - printf(" row %s:\n", old_name); + printf(" row %s (%.8s):\n", old_name, row_uuid); } if (columns->type == JSON_OBJECT) { if (show_log_verbosity > 1) { SHASH_FOR_EACH (n3, json_object(columns)) { const char *column = n3->name; + const struct ovsdb_column *column_schema; struct json *value = n3->data; - char *value_string; - - value_string = json_to_string(value, JSSF_SORT); + char *value_string = NULL; + + column_schema = + (table_schema + ? shash_find_data(&table_schema->columns, column) + : NULL); + if (column_schema) { + const struct ovsdb_error *error; + const struct ovsdb_type *type; + struct ovsdb_datum datum; + + type = &column_schema->type; + error = ovsdb_datum_from_json(&datum, type, + value, NULL); + if (!error) { + struct ds s; + + ds_init(&s); + ovsdb_datum_to_string(&datum, type, &s); + value_string = ds_steal_cstr(&s); + } + } + if (!value_string) { + value_string = json_to_string(value, JSSF_SORT); + } printf("\t\t%s=%s\n", column, value_string); free(value_string); } @@ -360,11 +449,13 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) const char *db_file_name = argv[1]; struct shash names; struct ovsdb_log *log; + struct ovsdb_schema *schema; unsigned int i; check_ovsdb_error(ovsdb_log_open(db_file_name, OVSDB_LOG_READ_ONLY, -1, &log)); shash_init(&names); + schema = NULL; for (i = 0; ; i++) { struct json *json; @@ -374,7 +465,11 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) } printf("record %u:", i); - if (json->type == JSON_OBJECT) { + if (i == 0) { + check_ovsdb_error(ovsdb_schema_from_json(json, &schema)); + printf(" \"%s\" schema, version=\"%s\", cksum=\"%s\"\n", + schema->name, schema->version, schema->cksum); + } else if (json->type == JSON_OBJECT) { struct json *date, *comment; date = shash_find_data(json_object(json), "_date"); @@ -393,13 +488,15 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) if (i > 0 && show_log_verbosity > 0) { putchar('\n'); - print_db_changes(json_object(json), &names); + print_db_changes(json_object(json), &names, schema); } } json_destroy(json); putchar('\n'); } + ovsdb_log_close(log); + ovsdb_schema_destroy(schema); /* XXX free 'names'. */ } @@ -413,6 +510,11 @@ static const struct command all_commands[] = { { "create", 2, 2, do_create }, { "compact", 1, 2, do_compact }, { "convert", 2, 3, do_convert }, + { "needs-conversion", 2, 2, do_needs_conversion }, + { "db-version", 1, 1, do_db_version }, + { "db-cksum", 1, 1, do_db_cksum }, + { "schema-version", 1, 1, do_schema_version }, + { "schema-cksum", 1, 1, do_schema_cksum }, { "query", 2, 2, do_query }, { "transact", 2, 2, do_transact }, { "show-log", 1, 1, do_show_log },