commit a6095051537fcd304944f0cf7283add87c85cf39 from: Aleksandr Lyapunov via: Nikita Pettik date: Thu Jul 16 17:13:15 2020 UTC txm: introduce dirty tuples (hotfix) Add forgotten part of the original commit. Part of #4897 commit - 30c57bb3eba94700a49286af2741b2990a5a8887 commit + a6095051537fcd304944f0cf7283add87c85cf39 blob - 1460e81066d1d30a9a3fd5df72601ada747553a9 blob + dfd6fce6e93aa8dd7a9d85e5cb8cb4cf3dae1f05 --- src/box/memtx_engine.c +++ src/box/memtx_engine.c @@ -1131,8 +1131,8 @@ memtx_tuple_new(struct tuple_format *format, const cha * tuple is not the first field of the memtx_tuple. */ uint32_t data_offset = sizeof(struct tuple) + field_map_size; - if (data_offset > UINT16_MAX) { - /* tuple->data_offset is 16 bits */ + if (data_offset > INT16_MAX) { + /** tuple->data_offset is 15 bits */ diag_set(ClientError, ER_TUPLE_METADATA_IS_TOO_BIG, data_offset); goto end; blob - c9d307f50e6b18afe0b05cb977488f1b5d1a994e blob + 9f0f24c6401e2f4243569985ebe7a4bb1f7de503 --- src/box/tuple.c +++ src/box/tuple.c @@ -84,8 +84,8 @@ runtime_tuple_new(struct tuple_format *format, const c goto end; uint32_t field_map_size = field_map_build_size(&builder); uint32_t data_offset = sizeof(struct tuple) + field_map_size; - if (data_offset > UINT16_MAX) { - /* tuple->data_offset is 16 bits */ + if (data_offset > INT16_MAX) { + /** tuple->data_offset is 15 bits */ diag_set(ClientError, ER_TUPLE_METADATA_IS_TOO_BIG, data_offset); goto end; blob - ee501f81e6c73ced62d7585194a1c286c700ce22 blob + 92e0aa1c5811ab58af684464d02d8b97ba260972 --- src/box/vy_stmt.c +++ src/box/vy_stmt.c @@ -160,8 +160,8 @@ vy_stmt_alloc(struct tuple_format *format, uint32_t da { assert(data_offset >= sizeof(struct vy_stmt) + format->field_map_size); - if (data_offset > UINT16_MAX) { - /* tuple->data_offset is 16 bits */ + if (data_offset > INT16_MAX) { + /** tuple->data_offset is 15 bits */ diag_set(ClientError, ER_TUPLE_METADATA_IS_TOO_BIG, data_offset); return NULL;