[tarantool-patches] [PATCH v4 2/5] iproto: replace obuf by mpstream in execute.c

Vladimir Davydov vdavydov.dev at gmail.com
Sat Dec 1 20:24:37 MSK 2018


On Fri, Nov 30, 2018 at 10:25:30PM +0300, Мерген Имеев wrote:
> >@@ -555,18 +545,11 @@ sql_get_description(struct sqlite3_stmt *stmt, struct obuf *out,
> >     * column_name simply returns them.
> >     */
> >    assert(name != NULL);
> >-   size += mp_sizeof_str(strlen(name));
> >-   size += mp_sizeof_str(strlen(type));
> >-   char *pos = (char *) obuf_alloc(out, size);
> >-   if (pos == NULL) {
> >-     diag_set(OutOfMemory, size, "obuf_alloc", "pos");
> >-     return -1;
> >-   }
> >-   pos = mp_encode_map(pos, 2);
> >-   pos = mp_encode_uint(pos, IPROTO_FIELD_NAME);
> >-   pos = mp_encode_str(pos, name, strlen(name));
> >-   pos = mp_encode_uint(pos, IPROTO_FIELD_TYPE);
> >-   pos = mp_encode_str(pos, type, strlen(type));
> >+   mpstream_encode_map(stream, 2);
> >+   mpstream_encode_uint(stream, IPROTO_FIELD_NAME);
> >+   mpstream_encode_str(stream, name);
> >+   mpstream_encode_uint(stream, IPROTO_FIELD_TYPE);
> >+   mpstream_encode_str(stream, type);
> >  }
> >  return 0;
> > }

The patch is mangled - tabs have been replaced with spaces - so I can't
review it as it is now. Please fix your editor/mua/whatever and resend.



More information about the Tarantool-patches mailing list