#110 - fixed

Author: dedok

examples/simple_rest_client.py

@@ -93,21 +93,21 @@ def delete(url, data):
 # ===
 # upsert (insert in this case) into the 'tester'
 upserted = upsert(req_url, { 'key': 'my_key_1', 'new_value': 100,
-    "updated_value": "+,1,10"})
+    "updated_value": "+,2,10"})
 
 # should be {"result": []}, if okay
 print ('upserted = ', upserted)
 
 # ===
 # add 10 to the value into the 'tester'
 upserted = upsert(req_url, { 'key': 'my_key_1', 'new_value': 1000,
-    "updated_value": "+,1,10"})
+    "updated_value": "+,2,10"})
 # should be {"result": []}, if okay
 print ('upserted = ', upserted)
 
 # ===
 # - 10 to the value into the 'tester'
-updated = update(req_url, { 'key': 'my_key', 'value': "-,1,10"})
+updated = update(req_url, { 'key': 'my_key', 'value': "-,2,10"})
 # should be {"result": [[{list of updated values}]]}, if okay
 print ('updated = ', updated)
 

examples/simple_rest_client.sh

@@ -50,12 +50,12 @@ echo inserted = `curl -s -X POST $req_url?"key=my_key_6&value=2"`
 # Update values into the tester
 
 # %23 is urencode('#'). Delete field from the tuple
-echo Updated = `curl -s -X PUT $req_url?"key=my_key_5&value=%23,1,10"`
+echo Updated = `curl -s -X PUT $req_url?"key=my_key_5&value=%23,2,10"`
 # %2B is urencode('+')
-echo Updated = `curl -s -X PUT -d 'key=my_key_6' -d "value=%2B,1,999" $req_url`
+echo Updated = `curl -s -X PUT -d 'key=my_key_6' -d "value=%2B,2,999" $req_url`
 
 # %3D is urencode('=').
-echo Upserted = `curl -s -X PATCH $req_url?"key=my_key_5&new_value=10&updated_value=%3D,1,10"`
+echo Upserted = `curl -s -X PATCH $req_url?"key=my_key_5&new_value=10&updated_value=%3D,2,10"`
 
 # Select values from the tester
 echo Selected = `curl -s $req_url?key=my_key_5`

src/ngx_http_tnt_module.c

@@ -2002,7 +2002,7 @@ ngx_http_tnt_format_bind_operation(ngx_http_request_t *r, struct tp *tp,
         ngx_str_t *name, ngx_str_t *val)
 {
     u_char      *update_operation, *filedno_pt, *filedno_pt_end;
-    char        filedno_s[sizeof("1867996680")];
+    ngx_int_t   filedno;
 
     update_operation = ngx_http_tnt_read_next(val, ',');
 
@@ -2031,10 +2031,13 @@ ngx_http_tnt_format_bind_operation(ngx_http_request_t *r, struct tp *tp,
         goto no_fieldno;
     }
 
-    snprintf(filedno_s, sizeof(filedno_s), "%.*s",
-            (int) (filedno_pt_end - filedno_pt), (char *) filedno_pt);
+    filedno = ngx_atoi(filedno_pt, (size_t) (filedno_pt_end - filedno_pt));
+    if (filedno < 0 || filedno - 1 < 0) {
+        goto no_fieldno;
+    }
+    filedno -= 1;
 
-    if (tp_op(tp, *update_operation, (uint32_t) atoi(filedno_s)) == NULL) {
+    if (tp_op(tp, *update_operation, (uint32_t) filedno) == NULL) {
         return NGX_ERROR;
     }
 

src/ngx_http_tnt_version.h

@@ -34,6 +34,6 @@
 #ifndef NGX_HTTP_TNT_VERSION_H
 #define NGX_HTTP_TNT_VERSION_H 1
 
-#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.5-rc3"
+#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.5-rc4"
 
 #endif

t/v26_features.py

@@ -321,11 +321,11 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
 update = [
     {'space_id': 512},
     {'value': 1},
-    {'string': '=,1,some XXXX big string'},
-    {'float': '-,2,2.1'},
-    {'double': '=,3,4.1'},
-    {'bool': '=,4,false'},
-    {'int': '%2B,5,1001'}
+    {'string': '=,2,some XXXX big string'},
+    {'float': '-,3,2.1'},
+    {'double': '=,4,4.1'},
+    {'bool': '=,5,false'},
+    {'int': '%2B,6,1001'}
 ]
 
 expected = [
@@ -371,7 +371,7 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
     {'index_id': 1},
     {'key': 1},
     {'key1': 'str'},
-    {'string': '=,2,updated string'}
+    {'string': '=,3,updated string'}
 ]
 
 expected = [
@@ -393,7 +393,7 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
     {'space_id': 514},
     {'key': 2},
     {'key1': 'str2'},
-    {'string': '=,2,Text'}
+    {'string': '=,3,Text'}
 ]
 
 result = get_success(BASE_URL + '/upsert_fmt', upsert, None, False)
@@ -403,7 +403,7 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
     {'space_id': 514},
     {'key': 2},
     {'key1': 'str2'},
-    {'string': '=,2,'}
+    {'string': '=,3,'}
 ]
 
 result = get_success(BASE_URL + '/upsert_fmt', upsert, None, False)
@@ -445,8 +445,8 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
 result = post_form_success(BASE_URL + '/select_post', {'id': 11}, None)
 assert result['result'][0][0] == 11 and result['result'][1][0] == 12, \
         'Expected != result'
-result = post_form_success(BASE_URL + '/update_post', {'id': 12, 'value': '=,1,TEXT',
-    'value1': '=,2,3.14'}, None)
+result = post_form_success(BASE_URL + '/update_post', {'id': 12, 'value': '=,2,TEXT',
+    'value1': '=,3,3.14'}, None)
 assert result['result'][0][0] == 12 and result['result'][0][1] == 'TEXT' \
     and result['result'][0][2] == 3.14, 'Expected != result'
 
@@ -457,27 +457,25 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
 print ('[+] Update format validation')
 
 _, result = post_form(BASE_URL + '/update_post', {'id': 12, 'value': '=,TEXT',
-    'value1': '=,2,3.14'}, None)
+    'value1': '=,3,3.14'}, None)
 assert _ == 400 and 'error' in result, 'Expected != result'
 
 _, result = post_form(BASE_URL + '/update_post', {'id': 12, 'value': 'TEXT',
-    'value1': '=,2,3.14'}, None)
+    'value1': '=,3,3.14'}, None)
 assert _ == 400 and 'error' in result, 'Expected != result'
 _, result = post_form(BASE_URL + '/update_post', {'id': 12, 'value': '=,,TEXT',
-    'value1': '=,2,3.14'}, None)
+    'value1': '=,4,3.14'}, None)
 assert _ == 400 and 'error' in result, 'Expected != result'
 _, result = post_form(BASE_URL + '/update_post', {'id': 12, 'value': '=,TEXT',
-    'value1': '=,2,3.14'}, None)
+    'value1': '=,3,3.14'}, None)
 assert _ == 400 and 'error' in result, 'Expected != result'
 
 print ('[+] OK')
 
 # ============
 #
-print (''' [+] Issues
- https://github.com/tarantool/nginx_upstream_module/issues/110 and
- https://github.com/tarantool/nginx_upstream_module/issues/111
- ''')
+print ('''[+] Issues https://github.com/tarantool/nginx_upstream_module/issues/110 and
+https://github.com/tarantool/nginx_upstream_module/issues/111''')
 
 ## Issue 111
 _, result = delete(BASE_URL + '/issue_110_and_111', \
@@ -489,7 +487,7 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
         None)
 
 result = put_success(BASE_URL + '/issue_110_and_111', \
-        {'key': 'test_inc', 'value': '#,1,10'}, None, True)
+        {'key': 'test_inc', 'value': '#,2,10'}, None, True)
 assert result[0] == 'test_inc', "Expected != Result"
 
 result = get_success(BASE_URL + '/issue_110_and_111', \
@@ -508,7 +506,7 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
         None)
 
 _, result = patch(BASE_URL + '/issue_110_and_111', \
-        {'key': 'test_inc_2', 'new_value' : 1, 'updated_value': '+,1,5'})
+        {'key': 'test_inc_2', 'new_value' : 1, 'updated_value': '+,2,5'})
 assert _ == 200 and 'result' in result and 'id' in result, \
         'expected: result and id'
 
@@ -517,7 +515,7 @@ def arr_of_dicts_to_arr(arr_of_dicts, start_from = 0):
 assert result[1] == 6, "Expected != Result"
 
 _, result = patch(BASE_URL + '/issue_110_and_111', \
-        {'key': 'test_inc_2', 'new_value' : 1, 'updated_value': '=,1,5'})
+        {'key': 'test_inc_2', 'new_value' : 1, 'updated_value': '=,2,5'})
 assert _ == 200 and 'result' in result and 'id' in result, \
         'expected: result and id'
 result = get_success(BASE_URL + '/issue_110_and_111', \