X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fmutation.c;h=967ad157d0cdbc819753f9b6aa0289538e1cc747;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=bd6986da60874aa7d31e3aabebb332ab286ea58e;hpb=fbf925e45da7100e5018bd3ad49532e407666f77;p=sliver-openvswitch.git

diff --git a/ovsdb/mutation.c b/ovsdb/mutation.c
index bd6986da6..967ad157d 100644
--- a/ovsdb/mutation.c
+++ b/ovsdb/mutation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,6 +95,12 @@ ovsdb_mutation_from_json(const struct ovsdb_table_schema *ts,
                                   "No column %s in table %s.",
                                   column_name, ts->name);
     }
+    if (!m->column->mutable) {
+        return ovsdb_syntax_error(json, "constraint violation",
+                                  "Cannot mutate immutable column %s in "
+                                  "table %s.", column_name, ts->name);
+    }
+
     ovsdb_type_clone(&m->type, &m->column->type);
 
     mutator_name = json_string(array->elems[1]);
@@ -144,7 +150,7 @@ ovsdb_mutation_from_json(const struct ovsdb_table_schema *ts,
         break;
 
     default:
-        NOT_REACHED();
+        OVS_NOT_REACHED();
     }
 
 exit:
@@ -300,7 +306,7 @@ mutate_scalar(const struct ovsdb_type *dst_type, struct ovsdb_datum *dst,
             }
         }
     } else {
-        NOT_REACHED();
+        OVS_NOT_REACHED();
     }
 
     for (i = 0; i < dst->n; i++) {
@@ -310,7 +316,7 @@ mutate_scalar(const struct ovsdb_type *dst_type, struct ovsdb_datum *dst,
         }
     }
 
-    error = ovsdb_datum_sort(dst, dst_type);
+    error = ovsdb_datum_sort(dst, dst_type->key.type);
     if (error) {
         ovsdb_error_destroy(error);
         return ovsdb_error("constraint violation",
@@ -327,7 +333,7 @@ ovsdb_mutation_check_count(struct ovsdb_datum *dst,
     if (!ovsdb_datum_conforms_to_type(dst, dst_type)) {
         char *s = ovsdb_type_to_english(dst_type);
         struct ovsdb_error *e = ovsdb_error(
-            "constaint violation",
+            "constraint violation",
             "Attempted to store %u elements in %s.", dst->n, s);
         free(s);
         return e;
@@ -379,6 +385,9 @@ ovsdb_mutation_set_execute(struct ovsdb_row *row,
             ovsdb_datum_subtract(dst, dst_type, arg, arg_type);
             error = ovsdb_mutation_check_count(dst, dst_type);
             break;
+
+        default:
+            OVS_NOT_REACHED();
         }
         if (error) {
             return error;