Addition to prev. revision

This commit is contained in:
Alexey Milovidov 2019-08-21 08:47:09 +03:00
parent 40454aa7a0
commit 3c3ca97218

View File

@ -103,23 +103,23 @@ static inline T ALWAYS_INLINE packFixed(
switch (key_sizes[j]) switch (key_sizes[j])
{ {
case 1: case 1:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<1>() + index, 1); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<1>() + index, 1);
offset += 1; offset += 1;
break; break;
case 2: case 2:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<2>() + index * 2, 2); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<2>() + index * 2, 2);
offset += 2; offset += 2;
break; break;
case 4: case 4:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<4>() + index * 4, 4); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<4>() + index * 4, 4);
offset += 4; offset += 4;
break; break;
case 8: case 8:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<8>() + index * 8, 8); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<8>() + index * 8, 8);
offset += 8; offset += 8;
break; break;
default: default:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<1>() + index * key_sizes[j], key_sizes[j]); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<1>() + index * key_sizes[j], key_sizes[j]);
offset += key_sizes[j]; offset += key_sizes[j];
} }
} }
@ -169,23 +169,23 @@ static inline T ALWAYS_INLINE packFixed(
switch (key_sizes[j]) switch (key_sizes[j])
{ {
case 1: case 1:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<1>() + i, 1); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<1>() + i, 1);
offset += 1; offset += 1;
break; break;
case 2: case 2:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<2>() + i * 2, 2); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<2>() + i * 2, 2);
offset += 2; offset += 2;
break; break;
case 4: case 4:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<4>() + i * 4, 4); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<4>() + i * 4, 4);
offset += 4; offset += 4;
break; break;
case 8: case 8:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<8>() + i * 8, 8); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<8>() + i * 8, 8);
offset += 8; offset += 8;
break; break;
default: default:
memcpy(bytes + offset, assert_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<1>() + i * key_sizes[j], key_sizes[j]); memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<1>() + i * key_sizes[j], key_sizes[j]);
offset += key_sizes[j]; offset += key_sizes[j];
} }
} }