#63 - fixed

Author: dedok

src/tp_transcode.c

@@ -379,7 +379,7 @@ yajl_map_key(void *ctx, const unsigned char * key, size_t len)
         if (unlikely(!tp_call_wof(&s_ctx->tp)))
             say_overflow_r_2(s_ctx);
 
-        /** Set method binded to this transcoding
+        /** Set the method to this transcoding
          */
         if (!s_ctx->read_method) {
             tp_transcode_t *tc = s_ctx->tc;
@@ -488,12 +488,14 @@ yajl_end_map(void *ctx)
 
     if (s_ctx->size == 0) {
 
-        if (unlikely(!tp_call_wof_add_params(&s_ctx->tp)))
-            say_overflow_r_2(s_ctx);
-
         if (!(s_ctx->been_stages & PARAMS)) {
+            dd("ADDING EMPTY PARAMS\n");
+
+            if (unlikely(!tp_call_wof_add_params(&s_ctx->tp)))
+                say_overflow_r_2(s_ctx);
 
-            if (s_ctx->tc->data.pos && s_ctx->tc->data.len) {
+            if (s_ctx->tc->data.pos && s_ctx->tc->data.len
+                    /*has data to bind*/) {
                 tp_encode_array(&s_ctx->tp, 1);
                 if (unlikely(!bind_data(s_ctx)))
                     say_overflow_r_2(s_ctx);
@@ -548,7 +550,7 @@ yajl_start_array(void *ctx)
 
     stack_grow_array(s_ctx);
 
-    bool push_ok = false, bind_first_argument = true;
+    bool push_ok = false, bind_first_argument = false;
     if (unlikely(s_ctx->size == 0)) {
         push_ok = stack_push(s_ctx, s_ctx->tp.p, TYPE_ARRAY | PARAMS);
         bind_first_argument = true;
@@ -565,9 +567,11 @@ yajl_start_array(void *ctx)
 
     tp_add(&s_ctx->tp, 1 + sizeof(uint32_t));
 
-    // Binding data [
-    if (unlikely(bind_first_argument)) {
-        if (!bind_data(s_ctx))
+    // Here is bind data
+    // e.g. http request
+    // [
+    if (bind_first_argument) {
+        if (unlikely(!bind_data(s_ctx)))
             say_overflow_r_2(s_ctx);
     }
     // ]
@@ -588,19 +592,20 @@ yajl_end_array(void *ctx)
 
         dd("array close, count %d ']'\n", item->count);
 
+        size_t item_count = item->count;
         if (unlikely(item->type & PARAMS)) {
             dd("PARAMS END\n");
             s_ctx->stage = WAIT_NEXT;
             s_ctx->been_stages |= PARAMS;
             // Increase number of args for binded data [
             tp_transcode_t *tc = s_ctx->tc;
             if (tc->data.pos && tc->data.len)
-              ++item->count;
+              ++item_count;
             // ]
         }
 
         *(item->ptr++) = 0xdd;
-        *(uint32_t *) item->ptr = mp_bswap_u32(item->count);
+        *(uint32_t *) item->ptr = mp_bswap_u32(item_count);
 
     } else {
         say_wrong_params(s_ctx);

test/test.lua

@@ -43,10 +43,9 @@ box.cfg {
     wal_mode = 'none';
 }
 
-if not box.space.tester then
+box.once('gr', function()
     box.schema.user.grant('guest', 'read,write,execute', 'universe')
-    box.schema.create_space('tester')
-end
+end)
 
 -- BUG -- https://github.com/tarantool/nginx_upstream_module/issues/37 [[
 function read(http_request_full)
@@ -103,7 +102,7 @@ function delete(request, a1, a2)
 end
 
 function insert(request, a1, a2)
-  return request
+  return { request, a1, a2 }
 end
 
 function update(request)

test/v23_features.py

@@ -145,8 +145,21 @@
 delete_success(preset_method_location, {'params':[]}, None)
 result = delete_success(preset_method_location, None, None)
 
-preset_method_location = BASE_URL + '/issue_58'
-
 (rc, result) = request(preset_method_location, [{'id': 1}, {'id': 2}])
 assert(result[0]['id'] == 1), 'expected id = 1'
 assert(result[1]['id'] == 2), 'expected id = 2'
+
+data = {"id":0,"params":[
+            {
+                "soc":"68ALLNVS2",
+                "product_number":2355574,
+                "description":"sd",
+                "business_types":["B2C"],
+                "product_spec_characteristic_values":{
+                    "asd":{"value":"1123asda"}
+                }
+              }
+          ]
+        }
+result = put_success(preset_method_location, data, None)
+assert(result[1] == data['params'][0]), 'result != data'