-/* 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 "table.h"
#include <assert.h>
+#include <limits.h>
#include "json.h"
#include "column.h"
}
struct ovsdb_table_schema *
-ovsdb_table_schema_create(const char *name, const char *comment, bool mutable)
+ovsdb_table_schema_create(const char *name, bool mutable,
+ unsigned int max_rows)
{
struct ovsdb_column *uuid, *version;
struct ovsdb_table_schema *ts;
ts = xzalloc(sizeof *ts);
ts->name = xstrdup(name);
- ts->comment = comment ? xstrdup(comment) : NULL;
ts->mutable = mutable;
shash_init(&ts->columns);
+ ts->max_rows = max_rows;
- uuid = ovsdb_column_create(
- "_uuid", "Unique identifier for this row.",
- false, true, &ovsdb_type_uuid);
+ uuid = ovsdb_column_create("_uuid", false, true, &ovsdb_type_uuid);
add_column(ts, uuid);
assert(uuid->index == OVSDB_COL_UUID);
- version = ovsdb_column_create(
- "_version", "Unique identifier for this version of this row.",
- false, false, &ovsdb_type_uuid);
+ version = ovsdb_column_create("_version", false, false, &ovsdb_type_uuid);
add_column(ts, version);
assert(version->index == OVSDB_COL_VERSION);
return ts;
}
+struct ovsdb_table_schema *
+ovsdb_table_schema_clone(const struct ovsdb_table_schema *old)
+{
+ struct ovsdb_table_schema *new;
+ struct shash_node *node;
+
+ new = ovsdb_table_schema_create(old->name, old->mutable, old->max_rows);
+ SHASH_FOR_EACH (node, &old->columns) {
+ const struct ovsdb_column *column = node->data;
+
+ if (column->name[0] == '_') {
+ /* Added automatically by ovsdb_table_schema_create(). */
+ continue;
+ }
+
+ add_column(new, ovsdb_column_clone(column));
+ }
+ return new;
+}
+
void
ovsdb_table_schema_destroy(struct ovsdb_table_schema *ts)
{
ovsdb_column_destroy(node->data);
}
shash_destroy(&ts->columns);
- free(ts->comment);
free(ts->name);
free(ts);
}
struct ovsdb_table_schema **tsp)
{
struct ovsdb_table_schema *ts;
- const struct json *comment, *columns, *mutable;
+ const struct json *columns, *mutable, *max_rows;
struct shash_node *node;
struct ovsdb_parser parser;
struct ovsdb_error *error;
+ long long int n_max_rows;
*tsp = NULL;
ovsdb_parser_init(&parser, json, "table schema for table %s", name);
- comment = ovsdb_parser_member(&parser, "comment", OP_STRING | OP_OPTIONAL);
columns = ovsdb_parser_member(&parser, "columns", OP_OBJECT);
mutable = ovsdb_parser_member(&parser, "mutable",
OP_TRUE | OP_FALSE | OP_OPTIONAL);
+ max_rows = ovsdb_parser_member(&parser, "maxRows",
+ OP_INTEGER | OP_OPTIONAL);
error = ovsdb_parser_finish(&parser);
if (error) {
return error;
}
+ if (max_rows) {
+ if (json_integer(max_rows) <= 0) {
+ return ovsdb_syntax_error(json, NULL,
+ "maxRows must be at least 1");
+ }
+ n_max_rows = max_rows->u.integer;
+ } else {
+ n_max_rows = UINT_MAX;
+ }
+
if (shash_is_empty(json_object(columns))) {
return ovsdb_syntax_error(json, NULL,
"table must have at least one column");
}
ts = ovsdb_table_schema_create(name,
- comment ? json_string(comment) : NULL,
- mutable ? json_boolean(mutable) : true);
+ mutable ? json_boolean(mutable) : true,
+ MIN(n_max_rows, UINT_MAX));
SHASH_FOR_EACH (node, json_object(columns)) {
struct ovsdb_column *column;
struct shash_node *node;
json = json_object_create();
- if (ts->comment) {
- json_object_put_string(json, "comment", ts->comment);
- }
if (!ts->mutable) {
json_object_put(json, "mutable", json_boolean_create(false));
}
columns = json_object_create();
SHASH_FOR_EACH (node, &ts->columns) {
- struct ovsdb_column *column = node->data;
+ const struct ovsdb_column *column = node->data;
if (node->name[0] != '_') {
json_object_put(columns, column->name,
ovsdb_column_to_json(column));
}
}
json_object_put(json, "columns", columns);
+ if (ts->max_rows != UINT_MAX) {
+ json_object_put(json, "maxRows", json_integer_create(ts->max_rows));
+ }
return json;
}
table = xmalloc(sizeof *table);
table->schema = ts;
+ table->txn_table = NULL;
hmap_init(&table->rows);
return table;
}
}
-static const struct ovsdb_row *
-ovsdb_table_get_row__(const struct ovsdb_table *table, const struct uuid *uuid,
- size_t hash)
+const struct ovsdb_row *
+ovsdb_table_get_row(const struct ovsdb_table *table, const struct uuid *uuid)
{
struct ovsdb_row *row;
- HMAP_FOR_EACH_WITH_HASH (row, struct ovsdb_row, hmap_node, hash,
+ HMAP_FOR_EACH_WITH_HASH (row, struct ovsdb_row, hmap_node, uuid_hash(uuid),
&table->rows) {
if (uuid_equals(ovsdb_row_get_uuid(row), uuid)) {
return row;
return NULL;
}
-const struct ovsdb_row *
-ovsdb_table_get_row(const struct ovsdb_table *table, const struct uuid *uuid)
-{
- return ovsdb_table_get_row__(table, uuid, uuid_hash(uuid));
-}
-
/* This is probably not the function you want. Use ovsdb_txn_row_modify()
* instead. */
bool
ovsdb_table_put_row(struct ovsdb_table *table, struct ovsdb_row *row)
{
const struct uuid *uuid = ovsdb_row_get_uuid(row);
- size_t hash = uuid_hash(uuid);
-
- if (!ovsdb_table_get_row__(table, uuid, hash)) {
- hmap_insert(&table->rows, &row->hmap_node, hash);
+ if (!ovsdb_table_get_row(table, uuid)) {
+ hmap_insert(&table->rows, &row->hmap_node, uuid_hash(uuid));
return true;
} else {
return false;
git://git.onelab.eu / sliver-openvswitch.git / blobdiff