Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

odissey: update machinarium; misc fixes

This commit is contained in:
Dmitry Simonenko 2017-11-29 14:48:35 +03:00
parent bba88ec17f
commit 5bbcf85b1a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sources/frontend.c
View File

@ -385,9 +385,11 @@ od_frontend_reset_stream(od_client_t *client)
{ {
od_instance_t *instance = client->system->instance; od_instance_t *instance = client->system->instance;
shapito_stream_t *stream = &client->stream; shapito_stream_t *stream = &client->stream;
if (od_unlikely(shapito_stream_used(stream) >= 1024 * 1024)) { int watermark = (instance->scheme.server_pipelining * 2);
od_log(&instance->logger, "main", client, client->server, if (od_unlikely(shapito_stream_used(stream) >= watermark)) {
"client buffer size: %d bytes, cleanup", shapito_stream_used(stream)); od_debug(&instance->logger, "main", client, client->server,
"client buffer size: %d bytes, cleanup",
shapito_stream_used(stream));
shapito_stream_free(stream); shapito_stream_free(stream);
shapito_stream_init(stream); shapito_stream_init(stream);
} else { } else {
@ -461,9 +463,6 @@ od_frontend_remote(od_client_t *client)
stream->start + offset, stream->start + offset,
shapito_stream_used(stream) - offset); shapito_stream_used(stream) - offset);
if (rc == 0) { if (rc == 0) {
od_debug(&instance->logger, "main", client, server,
"(query size: %d, stream size: %d, stream offset: %d)",
query_len, shapito_stream_used(stream), offset);
od_log(&instance->logger, "main", client, server, od_log(&instance->logger, "main", client, server,
"%.*s", query_len, query); "%.*s", query_len, query);
} else { } else {

2
third_party/machinarium vendored

@ -1 +1 @@
Subproject commit a33289b749c71eb31b48c77159ba1d8bd23265ec Subproject commit 2d7e2a020f9049024202f3bf0bb1040308e47158