-/* 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 <fcntl.h>
-
-#include "log.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"
-#define THIS_MODULE VLM_ovsdb
-#include "vlog.h"
-
struct ovsdb_schema *
ovsdb_schema_create(const char *name, const char *comment)
{
}
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;
+ }
+}
+
struct ovsdb_error *
ovsdb_schema_from_json(struct json *json, struct ovsdb_schema **schemap)
{
if (node->name[0] == '_') {
error = ovsdb_syntax_error(json, NULL, "names beginning with "
"\"_\" are reserved");
+ } else if (!ovsdb_parser_is_id(node->name)) {
+ error = ovsdb_syntax_error(json, NULL, "name must be a valid id");
} else {
error = ovsdb_table_schema_from_json(node->data, node->name,
&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;
}
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_log *log, struct ovsdb_schema *schema)
+ovsdb_create(struct ovsdb_schema *schema)
{
struct shash_node *node;
struct ovsdb *db;
db = xmalloc(sizeof *db);
db->schema = schema;
- db->log = log;
+ list_init(&db->replicas);
list_init(&db->triggers);
db->run_triggers = false;
shash_add(&db->tables, node->name, ovsdb_table_create(ts));
}
- return db;
-}
-
-struct ovsdb_error *
-ovsdb_open(const char *file_name, bool read_only, struct ovsdb **dbp)
-{
- struct ovsdb_schema *schema;
- struct ovsdb_error *error;
- struct ovsdb_log *log;
- struct json *json;
- struct ovsdb *db;
-
- error = ovsdb_log_open(file_name, read_only ? O_RDONLY : O_RDWR, &log);
- if (error) {
- return error;
- }
-
- error = ovsdb_log_read(log, &json);
- if (error) {
- return error;
- } else if (!json) {
- return ovsdb_io_error(EOF, "%s: database file contains no schema",
- file_name);
- }
-
- error = ovsdb_schema_from_json(json, &schema);
- if (error) {
- json_destroy(json);
- return ovsdb_wrap_error(error,
- "failed to parse \"%s\" as ovsdb schema",
- file_name);
- }
- json_destroy(json);
+ /* Set all the refTables. */
+ SHASH_FOR_EACH (node, &schema->tables) {
+ struct ovsdb_table_schema *table = node->data;
+ struct shash_node *node2;
- db = ovsdb_create(read_only ? NULL : log, schema);
- while ((error = ovsdb_log_read(log, &json)) == NULL && json) {
- struct ovsdb_txn *txn;
+ SHASH_FOR_EACH (node2, &table->columns) {
+ struct ovsdb_column *column = node2->data;
- error = ovsdb_txn_from_json(db, json, &txn);
- json_destroy(json);
- if (error) {
- break;
+ ovsdb_set_ref_table(&db->tables, &column->type.key);
+ ovsdb_set_ref_table(&db->tables, &column->type.value);
}
-
- ovsdb_txn_commit(txn);
- }
- if (error) {
- char *msg = ovsdb_error_to_string(error);
- VLOG_WARN("%s", msg);
- free(msg);
-
- ovsdb_error_destroy(error);
}
- if (read_only) {
- ovsdb_log_close(log);
- }
-
- *dbp = db;
- return NULL;
+ return db;
}
void
if (db) {
struct shash_node *node;
+ /* Remove all the replicas. */
+ while (!list_is_empty(&db->replicas)) {
+ struct ovsdb_replica *r
+ = CONTAINER_OF(list_pop_back(&db->replicas),
+ struct ovsdb_replica, node);
+ ovsdb_remove_replica(db, r);
+ }
+
/* Delete all the tables. This also deletes their schemas. */
SHASH_FOR_EACH (node, &db->tables) {
struct ovsdb_table *table = node->data;
shash_clear(&db->schema->tables);
ovsdb_schema_destroy(db->schema);
- ovsdb_log_close(db->log);
free(db);
}
}
{
return shash_find_data(&db->tables, name);
}
+\f
+void
+ovsdb_replica_init(struct ovsdb_replica *r,
+ const struct ovsdb_replica_class *class)
+{
+ r->class = class;
+}
+
+void
+ovsdb_add_replica(struct ovsdb *db, struct ovsdb_replica *r)
+{
+ list_push_back(&db->replicas, &r->node);
+}
+
+void
+ovsdb_remove_replica(struct ovsdb *db OVS_UNUSED, struct ovsdb_replica *r)
+{
+ list_remove(&r->node);
+ (r->class->destroy)(r);
+}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff