Fix #339: box.update unusual operations fail

src/box/tuple_update.cc

@@ -294,9 +294,9 @@ do_op_arith(struct tuple_update *update, struct update_op *op,
 	case '+': arg->val += val; break;
 	case '&': arg->val &= val; break;
 	case '^': arg->val ^= val; break;
-	case '|': arg->val |= val;
-	case '-':
-	default:  arg->val = val - arg->val; break;
+	case '|': arg->val |= val; break;
+	case '-': arg->val = val - arg->val; break;
+	default: assert(false); /* checked by update_read_ops */
 	}
 	op->new_field_len = mp_sizeof_uint(arg->val);
 }

test/box/update.result

@@ -32,6 +32,54 @@ s:update({1000005}, {{'#', 0, 1}})
 s:truncate()
 ---
 ...
+-- test arithmetic
+s:insert{1, 0}
+---
+- [1, 0]
+...
+s:update(1, {{'+', 1, 10}})
+---
+- [1, 10]
+...
+s:update(1, {{'+', 1, 15}})
+---
+- [1, 25]
+...
+s:update(1, {{'-', 1, 5}})
+---
+- [1, 20]
+...
+s:update(1, {{'-', 1, 20}})
+---
+- [1, 0]
+...
+s:update(1, {{'|', 1, 0x9}})
+---
+- [1, 9]
+...
+s:update(1, {{'|', 1, 0x6}})
+---
+- [1, 15]
+...
+s:update(1, {{'&', 1, 0xabcde}})
+---
+- [1, 14]
+...
+s:update(1, {{'&', 1, 0x2}})
+---
+- [1, 2]
+...
+s:update(1, {{'^', 1, 0xa2}})
+---
+- [1, 160]
+...
+s:update(1, {{'^', 1, 0xa2}})
+---
+- [1, 2]
+...
+s:truncate()
+---
+...
 -- test delete multiple fields
 s:insert{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
 ---

test/box/update.test.lua

@@ -10,6 +10,20 @@ s:update({1000004}, {{'#', 0, 1}})
 s:update({1000005}, {{'#', 0, 1}})
 s:truncate()
 
+-- test arithmetic
+s:insert{1, 0}
+s:update(1, {{'+', 1, 10}})
+s:update(1, {{'+', 1, 15}})
+s:update(1, {{'-', 1, 5}})
+s:update(1, {{'-', 1, 20}})
+s:update(1, {{'|', 1, 0x9}})
+s:update(1, {{'|', 1, 0x6}})
+s:update(1, {{'&', 1, 0xabcde}})
+s:update(1, {{'&', 1, 0x2}})
+s:update(1, {{'^', 1, 0xa2}})
+s:update(1, {{'^', 1, 0xa2}})
+s:truncate()
+
 -- test delete multiple fields
 s:insert{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
 s:update({0}, {{'#', 42, 1}})