-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdlib.h>
#include "column.h"
+#include "dynamic-string.h"
#include "json.h"
#include "ovsdb-error.h"
#include "ovsdb-parser.h"
#include "util.h"
struct ovsdb_column *
-ovsdb_column_create(const char *name, const char *comment,
+ovsdb_column_create(const char *name,
bool mutable, bool persistent,
const struct ovsdb_type *type)
{
+ /* Doesn't set the new column's 'index': the caller must do that. */
struct ovsdb_column *column;
column = xzalloc(sizeof *column);
column->name = xstrdup(name);
- column->comment = comment ? xstrdup(comment) : NULL;
column->mutable = mutable;
column->persistent = persistent;
- column->type = *type;
+ ovsdb_type_clone(&column->type, type);
return column;
}
+struct ovsdb_column *
+ovsdb_column_clone(const struct ovsdb_column *old)
+{
+ /* Doesn't copy the column's 'index': the caller must do that. */
+ return ovsdb_column_create(old->name,
+ old->mutable, old->persistent,
+ &old->type);
+}
+
void
ovsdb_column_destroy(struct ovsdb_column *column)
{
+ ovsdb_type_destroy(&column->type);
free(column->name);
- free(column->comment);
free(column);
}
ovsdb_column_from_json(const struct json *json, const char *name,
struct ovsdb_column **columnp)
{
- const struct json *comment, *mutable, *ephemeral, *type_json;
+ const struct json *mutable, *ephemeral, *type_json;
struct ovsdb_error *error;
struct ovsdb_type type;
struct ovsdb_parser parser;
*columnp = NULL;
ovsdb_parser_init(&parser, json, "schema for column %s", name);
- comment = ovsdb_parser_member(&parser, "comment", OP_STRING | OP_OPTIONAL);
mutable = ovsdb_parser_member(&parser, "mutable",
OP_TRUE | OP_FALSE | OP_OPTIONAL);
ephemeral = ovsdb_parser_member(&parser, "ephemeral",
persistent = ephemeral ? !json_boolean(ephemeral) : true;
*columnp = ovsdb_column_create(name,
- comment ? json_string(comment) : NULL,
mutable ? json_boolean(mutable) : true,
persistent, &type);
+
+ ovsdb_type_destroy(&type);
+
return NULL;
}
ovsdb_column_to_json(const struct ovsdb_column *column)
{
struct json *json = json_object_create();
- if (column->comment) {
- json_object_put_string(json, "comment", column->comment);
- }
if (!column->mutable) {
json_object_put(json, "mutable", json_boolean_create(false));
}
struct ovsdb_error *
ovsdb_column_set_from_json(const struct json *json,
- const struct ovsdb_table *table,
+ const struct ovsdb_table_schema *schema,
struct ovsdb_column_set *set)
{
ovsdb_column_set_init(set);
if (!json) {
struct shash_node *node;
- SHASH_FOR_EACH (node, &table->schema->columns) {
+ SHASH_FOR_EACH (node, &schema->columns) {
const struct ovsdb_column *column = node->data;
ovsdb_column_set_add(set, column);
}
/* XXX this is O(n**2) */
for (i = 0; i < json->u.array.n; i++) {
- struct ovsdb_column *column;
+ const struct ovsdb_column *column;
const char *s;
if (json->u.array.elems[i]->type != JSON_STRING) {
}
s = json->u.array.elems[i]->u.string;
- column = shash_find_data(&table->schema->columns, s);
+ column = shash_find_data(&schema->columns, s);
if (!column) {
error = ovsdb_syntax_error(json, NULL, "%s is not a valid "
"column name", s);
return json;
}
+/* Returns an English string listing the contents of 'set', e.g. "columns
+ * \"a\", \"b\", and \"c\"". The caller must free the string. */
+char *
+ovsdb_column_set_to_string(const struct ovsdb_column_set *set)
+{
+ if (!set->n_columns) {
+ return xstrdup("no columns");
+ } else {
+ struct ds s;
+ size_t i;
+
+ ds_init(&s);
+ ds_put_format(&s, "column%s ", set->n_columns > 1 ? "s" : "");
+ for (i = 0; i < set->n_columns; i++) {
+ const char *delimiter = english_list_delimiter(i, set->n_columns);
+ ds_put_format(&s, "%s\"%s\"", delimiter, set->columns[i]->name);
+ }
+ return ds_steal_cstr(&s);
+ }
+}
+
void
ovsdb_column_set_add(struct ovsdb_column_set *set,
const struct ovsdb_column *column)