-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2010 Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "ovsdb.h"
+#include "column.h"
#include "json.h"
#include "ovsdb-error.h"
#include "ovsdb-parser.h"
+#include "ovsdb-types.h"
#include "table.h"
#include "transaction.h"
struct ovsdb_schema *
-ovsdb_schema_create(const char *name, const char *comment)
+ovsdb_schema_create(const char *name, const char *version)
{
struct ovsdb_schema *schema;
schema = xzalloc(sizeof *schema);
schema->name = xstrdup(name);
- schema->comment = comment ? xstrdup(comment) : NULL;
+ schema->version = xstrdup(version);
shash_init(&schema->tables);
return schema;
}
+struct ovsdb_schema *
+ovsdb_schema_clone(const struct ovsdb_schema *old)
+{
+ struct ovsdb_schema *new;
+ struct shash_node *node;
+
+ new = ovsdb_schema_create(old->name, old->version);
+ SHASH_FOR_EACH (node, &old->tables) {
+ const struct ovsdb_table_schema *ts = node->data;
+
+ shash_add(&new->tables, node->name, ovsdb_table_schema_clone(ts));
+ }
+ return new;
+}
+
void
ovsdb_schema_destroy(struct ovsdb_schema *schema)
{
struct shash_node *node;
+ if (!schema) {
+ return;
+ }
+
SHASH_FOR_EACH (node, &schema->tables) {
ovsdb_table_schema_destroy(node->data);
}
shash_destroy(&schema->tables);
- free(schema->comment);
free(schema->name);
+ free(schema->version);
free(schema);
}
}
error = ovsdb_schema_from_json(json, &schema);
+ json_destroy(json);
if (error) {
- json_destroy(json);
return ovsdb_wrap_error(error,
"failed to parse \"%s\" as ovsdb schema",
file_name);
return NULL;
}
+static struct ovsdb_error * WARN_UNUSED_RESULT
+ovsdb_schema_check_ref_table(const struct ovsdb_column *column,
+ const struct shash *tables,
+ const struct ovsdb_base_type *base,
+ const char *base_name)
+{
+ if (base->type == OVSDB_TYPE_UUID && base->u.uuid.refTableName
+ && !shash_find(tables, base->u.uuid.refTableName)) {
+ return ovsdb_syntax_error(NULL, NULL,
+ "column %s %s refers to undefined table %s",
+ column->name, base_name,
+ base->u.uuid.refTableName);
+ } else {
+ return NULL;
+ }
+}
+
+static bool
+is_valid_version(const char *s)
+{
+ int n = -1;
+ sscanf(s, "%*[0-9].%*[0-9].%*[0-9]%n", &n);
+ return n != -1 && s[n] == '\0';
+}
+
struct ovsdb_error *
ovsdb_schema_from_json(struct json *json, struct ovsdb_schema **schemap)
{
struct ovsdb_schema *schema;
- const struct json *name, *comment, *tables;
+ const struct json *name, *tables, *version_json;
struct ovsdb_error *error;
struct shash_node *node;
struct ovsdb_parser parser;
+ const char *version;
*schemap = NULL;
ovsdb_parser_init(&parser, json, "database schema");
name = ovsdb_parser_member(&parser, "name", OP_ID);
- comment = ovsdb_parser_member(&parser, "comment", OP_STRING | OP_OPTIONAL);
+ version_json = ovsdb_parser_member(&parser, "version",
+ OP_STRING | OP_OPTIONAL);
+ ovsdb_parser_member(&parser, "cksum", OP_STRING | OP_OPTIONAL);
tables = ovsdb_parser_member(&parser, "tables", OP_OBJECT);
error = ovsdb_parser_finish(&parser);
if (error) {
return error;
}
- schema = ovsdb_schema_create(json_string(name),
- comment ? json_string(comment) : NULL);
+ if (version_json) {
+ version = json_string(version_json);
+ if (!is_valid_version(version)) {
+ return ovsdb_syntax_error(json, NULL, "schema version \"%s\" not "
+ "in format x.y.z", version);
+ }
+ } else {
+ /* Backward compatibility with old databases. */
+ version = "";
+ }
+
+ schema = ovsdb_schema_create(json_string(name), version);
SHASH_FOR_EACH (node, json_object(tables)) {
struct ovsdb_table_schema *table;
shash_add(&schema->tables, table->name, table);
}
+
+ /* Validate that all refTables refer to the names of tables that exist. */
+ SHASH_FOR_EACH (node, &schema->tables) {
+ struct ovsdb_table_schema *table = node->data;
+ struct shash_node *node2;
+
+ SHASH_FOR_EACH (node2, &table->columns) {
+ struct ovsdb_column *column = node2->data;
+
+ error = ovsdb_schema_check_ref_table(column, &schema->tables,
+ &column->type.key, "key");
+ if (!error) {
+ error = ovsdb_schema_check_ref_table(column, &schema->tables,
+ &column->type.value,
+ "value");
+ }
+ if (error) {
+ ovsdb_schema_destroy(schema);
+ return error;
+ }
+ }
+ }
+
*schemap = schema;
return 0;
}
json = json_object_create();
json_object_put_string(json, "name", schema->name);
- if (schema->comment) {
- json_object_put_string(json, "comment", schema->comment);
+ if (schema->version[0]) {
+ json_object_put_string(json, "version", schema->version);
}
tables = json_object_create();
return json;
}
\f
+static void
+ovsdb_set_ref_table(const struct shash *tables,
+ struct ovsdb_base_type *base)
+{
+ if (base->type == OVSDB_TYPE_UUID && base->u.uuid.refTableName) {
+ struct ovsdb_table *table;
+
+ table = shash_find_data(tables, base->u.uuid.refTableName);
+ base->u.uuid.refTable = table;
+ }
+}
+
struct ovsdb *
ovsdb_create(struct ovsdb_schema *schema)
{
shash_add(&db->tables, node->name, ovsdb_table_create(ts));
}
+ /* Set all the refTables. */
+ SHASH_FOR_EACH (node, &schema->tables) {
+ struct ovsdb_table_schema *table = node->data;
+ struct shash_node *node2;
+
+ SHASH_FOR_EACH (node2, &table->columns) {
+ struct ovsdb_column *column = node2->data;
+
+ ovsdb_set_ref_table(&db->tables, &column->type.key);
+ ovsdb_set_ref_table(&db->tables, &column->type.value);
+ }
+ }
+
return db;
}
}
void
-ovsdb_remove_replica(struct ovsdb *db UNUSED, struct ovsdb_replica *r)
+ovsdb_remove_replica(struct ovsdb *db OVS_UNUSED, struct ovsdb_replica *r)
{
list_remove(&r->node);
(r->class->destroy)(r);