#26 - Done. The error states of the transcoder are separated to Tarantool error and Transcoder error

Author: dedok

src/debug.h

@@ -62,12 +62,18 @@ static inline void dd(const char* fmt, ...) { }
 
 #include <stdarg.h>
 
-static inline void dd(const char* fmt, ...) { }
+static inline void
+dd(const char* fmt, ...) { }
 
 # endif
 
 #endif /* MY_DEBUG */
 
+static inline const u_char*
+get_str_safe(const u_char *str) {
+  return (str ? str : (const u_char *)"NULL");
+}
+
 #if (NGX_HAVE_VARIADIC_MACROS)
 # define log_crit(log, ...) \
      ngx_log_error_core(NGX_LOG_CRIT, (log), 0, __VA_ARGS__)
@@ -76,7 +82,8 @@ static inline void dd(const char* fmt, ...) { }
 /** TODO
  *  Warn. user here
  */
-static inline void crit(...) {}
+static inline void
+crit(...) {}
 #endif /* NGX_HAVE_VARIADIC_MACROS */
 
 #endif

src/ngx_http_tnt_handlers.c

@@ -813,14 +813,14 @@ ngx_http_tnt_query_handler(ngx_http_request_t *r)
                        (size_t)ctx->preset_method_len, 1))
     {
         err = get_error_text(HTTP_REQUEST_TOO_LARGE);
-        crit("ngx_http_tnt_query_handler - %s", err->msg.data);
+        crit("ngx_http_tnt_query_handler - %s", get_str_safe(err->msg.data));
         return NGX_ERROR;
     }
 
     rc = ngx_http_tnt_get_request_data(r, tlcf, &tp);
     if (rc != NGX_OK) {
         err = get_error_text(HTTP_REQUEST_TOO_LARGE);
-        crit("ngx_http_tnt_query_handler - %s", err->msg.data);
+        crit("ngx_http_tnt_query_handler - %s", get_str_safe(err->msg.data));
         return rc;
     }
 

src/ngx_http_tnt_module.c

@@ -599,43 +599,44 @@ ngx_http_tnt_send_reply(ngx_http_request_t *r,
 
     rc = tp_transcode(&tc, (char *)ctx->tp_cache->start,
                       ctx->tp_cache->end - ctx->tp_cache->start);
-    if (rc == TP_TRANSCODE_OK) {
+    if (rc != TP_TRANSCODE_ERROR) {
 
+        /* Finishing
+         */
         size_t complete_msg_size = 0;
         rc = tp_transcode_complete(&tc, &complete_msg_size);
         if (rc == TP_TRANSCODE_ERROR) {
+            crit("[BUG] failed to complete output transcoding. UNKNOWN ERROR");
+            goto error_exit;
+        }
 
-            crit("[BUG] failed to complete output transcoding");
-
+        /* Ok. We send an error to the client from the Tarantool
+         */
+        if (rc == TP_TNT_ERROR) {
             ngx_pfree(r->pool, output);
 
-            const ngx_http_tnt_error_t *e = get_error_text(UNKNOWN_PARSE_ERROR);
-            output = ngx_http_tnt_set_err(r, e->code, e->msg.data, e->msg.len);
+            /* Swap output */
+            output = ngx_http_tnt_set_err(r, tc.errcode,
+                                          (u_char *)tc.errmsg,
+                                          ngx_strlen(tc.errmsg));
             if (output == NULL) {
                 goto error_exit;
             }
-
-            goto done;
-        }
-
-        output->last = output->pos + complete_msg_size;
-
-    } else if (rc == TP_TRANSCODE_ERROR) {
-
-        crit("[BUG] failed to transcode output, err: '%s'", tc.errmsg);
-
-        ngx_pfree(r->pool, output);
-
-        output = ngx_http_tnt_set_err(r,
-                                      tc.errcode,
-                                      (u_char *)tc.errmsg,
-                                      ngx_strlen(tc.errmsg));
-        if (output == NULL) {
-            goto error_exit;
+        } else {
+            output->last = output->pos + complete_msg_size;
         }
     }
+    /* Transcoder down
+    */
+    else {
+        crit("[BUG] failed to transcode output. errcode: '%d', errmsg: '%s'",
+            tc.errcode,
+            get_str_safe((const u_char *)tc.errmsg));
+        goto error_exit;
+    }
 
-done:
+    /* Transcoding - OK
+     */
     tp_transcode_free(&tc);
 
     if (ctx->batch_size > 0) {
@@ -655,6 +656,9 @@ ngx_http_tnt_send_reply(ngx_http_request_t *r,
     return ngx_http_tnt_output(r, u, output);
 
 error_exit:
+    if (output) {
+      ngx_pfree(r->pool, output);
+    }
     tp_transcode_free(&tc);
     return NGX_ERROR;
 }

src/tp_transcode.c

@@ -932,6 +932,8 @@ tp2json_transcode_internal(tp2json_t *ctx, const char **beg, const char *end)
                                  mp_decode_uint(beg));
         break;
     case MP_INT:
+        /* Well. I guess that's okay. Are you agree?
+         */
         if (unlikely(len < sizeof("18446744073709551615") - 1))
             say_overflow_r(ctx);
 
@@ -1082,9 +1084,8 @@ tp2json_transcode_internal(tp2json_t *ctx, const char **beg, const char *end)
 static enum tt_result
 tp_reply2json_transcode(void *ctx_, const char *in, size_t in_size)
 {
-    enum tt_result rc;
-
     tp2json_t *ctx = ctx_;
+    enum tt_result rc = TP_TRANSCODE_OK;
 
     if (ctx->first_entry) {
 
@@ -1106,6 +1107,8 @@ tp_reply2json_transcode(void *ctx_, const char *in, size_t in_size)
                 elen, ctx->r.error,
                 code_conv(ctx->r.code));
 
+        rc = TP_TNT_ERROR;
+
     } else {
 
         if (!ctx->pure_result) {
@@ -1129,11 +1132,11 @@ tp_reply2json_transcode(void *ctx_, const char *in, size_t in_size)
         ++ctx->pos;
     }
 
-    return TP_TRANSCODE_OK;
+    return rc;
 
 error_exit:
     ctx->pos = ctx->output;
-    return TP_TRANSCODE_ERROR;
+    return rc;
 }
 
 static enum tt_result
@@ -1184,7 +1187,7 @@ tp2json_complete(void *ctx_, size_t *complete_msg_size)
 }
 
 /**
- * Known codecs
+ * List of codecs
  */
 #define CODEC(create_, transcode_, complete_, free_) \
     (tp_codec_t) { \

src/tp_transcode.h

@@ -136,7 +136,8 @@ typedef struct tp_transcode_init_args {
  */
 enum tt_result {
   TP_TRANSCODE_OK    = 1,
-  TP_TRANSCODE_ERROR
+  TP_TRANSCODE_ERROR,
+  TP_TNT_ERROR,
 };
 
 ssize_t
@@ -160,6 +161,7 @@ void tp_transcode_free(tp_transcode_t *t);
  *
  * Returns TP_TRANSCODE_OK if bytes enought for finish transcoding
  * Returns TP_TRANSCODE_ERROR if error occurred
+ * Returns TP_AT_ERROR if error occurred
  */
 enum tt_result tp_transcode(tp_transcode_t *t, const char *b, size_t s);
 
@@ -184,9 +186,9 @@ tp_reply_to_json_set_options(tp_transcode_t *t,
                              int multireturn_skip_count);
 
 /**
- * WARNING! tp_dump() must be use only for debug pupose
+ * WARNING! tp_dump() - is for debug
  *
- * Dump Tarantool message in JSON format
+ * Dump Tarantool message in JSON
  * Returns true, false
  */
 bool