tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bolt encoder test.

Browse Source 
Summary: Fixed encoder off-by-one limit.

Reviewers: teon.banek

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D335
This commit is contained in:
Matej Ferencevic 2017-05-03 14:16:56 +02:00
parent cbd3998899
commit 18782e67fd
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/communication/bolt/v1/encoder/base_encoder.hpp
View File

@ -97,7 +97,7 @@ class BaseEncoder : public Loggable {
uint8_t len = size;
WriteRAW(underlying_cast(Marker8[typ]));
WriteRAW(len);
} else if (size <= 65536) {
} else if (size <= 65535) {
uint16_t len = size;
WriteRAW(underlying_cast(Marker16[typ]));
WriteValue(len);

45
tests/unit/bolt_encoder.cpp
View File

@ -15,27 +15,32 @@ using query::TypedValue;
constexpr const int SIZE = 131072;
uint8_t data[SIZE];
void CheckTypeSize(std::vector<uint8_t> &v, int typ, uint64_t size) {
if (size <= 15) {
uint8_t len = size;
len &= 0x0F;
len += type_tiny_magic[typ];
CheckOutput(v, &len, 1, false);
} else if (size <= 255) {
uint8_t len = size;
CheckOutput(v, &type_8_magic[typ], 1, false);
CheckOutput(v, &len, 1, false);
} else if (size <= 65536) {
uint16_t len = size;
len = bswap(len);
CheckOutput(v, &type_16_magic[typ], 1, false);
CheckOutput(v, reinterpret_cast<const uint8_t *>(&len), 2, false);
} else {
uint32_t len = size;
len = bswap(len);
CheckOutput(v, &type_32_magic[typ], 1, false);
CheckOutput(v, reinterpret_cast<const uint8_t *>(&len), 4, false);
uint64_t GetBigEndianInt(std::vector<uint8_t> &v, uint8_t len, uint8_t offset = 1) {
uint64_t ret = 0;
v.erase(v.begin(), v.begin() + offset);
for (int i = 0; i < len; ++i) {
ret <<= 8;
ret += v[i];
}
v.erase(v.begin(), v.begin() + len);
return ret;
}
void CheckTypeSize(std::vector<uint8_t> &v, int typ, uint64_t size) {
uint64_t len;
if ((v[0] & 0xF0) == type_tiny_magic[typ]) {
len = v[0] & 0x0F;
v.erase(v.begin(), v.begin() + 1);
} else if (v[0] == type_8_magic[typ]) {
len = GetBigEndianInt(v, 1);
} else if (v[0] == type_16_magic[typ]) {
len = GetBigEndianInt(v, 2);
} else if (v[0] == type_32_magic[typ]) {
len = GetBigEndianInt(v, 4);
} else {
FAIL() << "Got wrong marker!";
}
ASSERT_EQ(len, size);
}
void CheckRecordHeader(std::vector<uint8_t> &v, uint64_t size) {