X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ovsdb%2Fexecution.c;h=de25a8797770f2ddf4cf54cfa63cb52b44b287bb;hb=968eec593cc61690c9e0ed97450c4889258381af;hp=9e3a8d07b5d04252531d5fe6196f5ff66ce88fab;hpb=da897f41cd795e325ec5ce773a70a819100bd26e;p=cascardo%2Fovs.git diff --git a/ovsdb/execution.c b/ovsdb/execution.c index 9e3a8d07b..de25a8797 100644 --- a/ovsdb/execution.c +++ b/ovsdb/execution.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011 Nicira Networks +/* Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ #include -#include #include #include "column.h" @@ -141,7 +140,7 @@ ovsdb_execute(struct ovsdb *db, const struct ovsdb_session *session, /* Parse and execute operation. */ ovsdb_parser_init(&parser, operation, - "ovsdb operation %zu of %zu", i, n_operations); + "ovsdb operation %"PRIuSIZE" of %"PRIuSIZE, i, n_operations); op = ovsdb_parser_member(&parser, "op", OP_ID); result = json_object_create(); if (op) { @@ -154,7 +153,7 @@ ovsdb_execute(struct ovsdb *db, const struct ovsdb_session *session, op_name); } } else { - assert(ovsdb_parser_has_error(&parser)); + ovs_assert(ovsdb_parser_has_error(&parser)); } /* A parse error overrides any other error. @@ -248,7 +247,7 @@ parse_table(struct ovsdb_execution *x, return table; } -static WARN_UNUSED_RESULT struct ovsdb_error * +static OVS_WARN_UNUSED_RESULT struct ovsdb_error * parse_row(const struct json *json, const struct ovsdb_table *table, struct ovsdb_symbol_table *symtab, struct ovsdb_row **rowp, struct ovsdb_column_set *columns) @@ -434,6 +433,22 @@ ovsdb_execute_update(struct ovsdb_execution *x, struct ovsdb_parser *parser, if (!error) { error = parse_row(row_json, table, x->symtab, &row, &columns); } + if (!error) { + size_t i; + + for (i = 0; i < columns.n_columns; i++) { + const struct ovsdb_column *column = columns.columns[i]; + + if (!column->mutable) { + error = ovsdb_syntax_error(parser->json, + "constraint violation", + "Cannot update immutable column %s " + "in table %s.", + column->name, table->schema->name); + break; + } + } + } if (!error) { error = ovsdb_condition_from_json(table->schema, where, x->symtab, &condition); @@ -628,6 +643,8 @@ ovsdb_execute_wait(struct ovsdb_execution *x, struct ovsdb_parser *parser, } else { timeout_msec = LLONG_MAX; } + } + if (!error) { if (strcmp(json_string(until), "==") && strcmp(json_string(until), "!=")) { error = ovsdb_syntax_error(until, NULL, @@ -644,6 +661,7 @@ ovsdb_execute_wait(struct ovsdb_execution *x, struct ovsdb_parser *parser, error = ovsdb_row_from_json(row, rows->u.array.elems[i], x->symtab, NULL); if (error) { + ovsdb_row_destroy(row); break; } @@ -719,7 +737,7 @@ ovsdb_execute_assert(struct ovsdb_execution *x, struct ovsdb_parser *parser, { const struct json *lock_name; - lock_name = ovsdb_parser_member(parser, "lock", OP_STRING); + lock_name = ovsdb_parser_member(parser, "lock", OP_ID); if (!lock_name) { return NULL; }