Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[C++] Update to address comparator failure in big endian #7681

Merged
merged 28 commits into from
Dec 6, 2022
Merged

[C++] Update to address comparator failure in big endian #7681

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
db61fc9
update unit test and generated file to test is extra endianswap can h…
Nov 30, 2022
5bad579
remove EndianScalar wrapper from Get method
Dec 1, 2022
32f6e72
remove endianscalar wrapper
Dec 2, 2022
96dddf2
Merge branch 'google:master' into bigendianfix
sunwen18 Dec 2, 2022
9d661e7
update
Dec 2, 2022
6a03956
update
Dec 2, 2022
736d997
use Array instead
Dec 2, 2022
c2c86df
clang format
Dec 2, 2022
b410843
address error
Dec 2, 2022
535d7a7
clang
Dec 2, 2022
8095517
update
Dec 2, 2022
8d17ef3
manually generate
Dec 2, 2022
931e76b
Move Nim to completed language
dbaileychess Dec 3, 2022
a884533
Add swift link
dbaileychess Dec 3, 2022
8d169cd
Merge branch 'master' into bigendianfix
sunwen18 Dec 3, 2022
772bd78
address comments
Dec 4, 2022
010f729
update unit test
Dec 4, 2022
6a1a150
address comment
Dec 5, 2022
df7e19a
address comment
Dec 5, 2022
730c1fc
regenerate file
Dec 5, 2022
6d3431e
use auto instead of size_t
Dec 5, 2022
3182e02
use uint32_t instead
Dec 6, 2022
fdf6399
Merge branch 'master' into bigendianfix
dbaileychess Dec 6, 2022
bb60b07
Merge branch 'google:master' into bigendianfix
sunwen18 Dec 6, 2022
75f62fa
update
Dec 6, 2022
20aa3fb
format
Dec 6, 2022
9d41fa7
delete extra whitespace
Dec 6, 2022
51ac715
Merge branch 'master' into bigendianfix
dbaileychess Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/idl_gen_cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2309,8 +2309,10 @@ class CppGenerator : public BaseGenerator {
code_ +=
" int KeyCompareWithValue(const {{INPUT_TYPE}} *_{{FIELD_NAME}}"
") const { ";
code_ += " for (auto i = 0; i < {{FIELD_NAME}}()->size(); i++) {";
code_ += " const auto {{FIELD_NAME}}_l = {{FIELD_NAME}}_[i];";
code_ += " const auto* curr_{{FIELD_NAME}} = {{FIELD_NAME}}();";
code_ += " for (auto i = 0; i < curr_{{FIELD_NAME}}->size(); i++) {";
code_ +=
" const auto {{FIELD_NAME}}_l = curr_{{FIELD_NAME}}->Get(i);";
code_ += " const auto {{FIELD_NAME}}_r = _{{FIELD_NAME}}->Get(i);";
code_ += " if({{FIELD_NAME}}_l != {{FIELD_NAME}}_r) ";
code_ +=
Expand Down
18 changes: 10 additions & 8 deletions tests/key_field/key_field_sample_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(1) Baz FLATBUFFERS_FINAL_CLASS {
bool KeyCompareLessThan(const Baz * const o) const {
return KeyCompareWithValue(o->a()) < 0;
}
int KeyCompareWithValue(const flatbuffers::Array<uint8_t, 4> *_a) const {
for (auto i = 0; i < a()->size(); i++) {
const auto a_l = a_[i];
int KeyCompareWithValue(const flatbuffers::Array<uint8_t, 4> *_a) const {
const auto* curr_a = a();
sunwen18 marked this conversation as resolved.
Show resolved Hide resolved
for (auto i = 0; i < curr_a->size(); i++) {
sunwen18 marked this conversation as resolved.
Show resolved Hide resolved
const auto a_l = curr_a->Get(i);
sunwen18 marked this conversation as resolved.
Show resolved Hide resolved
const auto a_r = _a->Get(i);
if(a_l != a_r)
if(a_l != a_r)
return static_cast<int>(a_l > a_r) - static_cast<int>(a_l < a_r);
}
return 0;
Expand Down Expand Up @@ -139,11 +140,12 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Bar FLATBUFFERS_FINAL_CLASS {
bool KeyCompareLessThan(const Bar * const o) const {
return KeyCompareWithValue(o->a()) < 0;
}
int KeyCompareWithValue(const flatbuffers::Array<float, 3> *_a) const {
for (auto i = 0; i < a()->size(); i++) {
const auto a_l = a_[i];
int KeyCompareWithValue(const flatbuffers::Array<float, 3> *_a) const {
const auto* curr_a = a();
for (auto i = 0; i < curr_a->size(); i++) {
const auto a_l = curr_a->Get(i);
const auto a_r = _a->Get(i);
if(a_l != a_r)
if(a_l != a_r)
return static_cast<int>(a_l > a_r) - static_cast<int>(a_l < a_r);
}
return 0;
Expand Down
31 changes: 21 additions & 10 deletions tests/key_field_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ void FixedSizedScalarKeyInStructTest() {
bazs.push_back(Baz(flatbuffers::make_span(test_array3), 2));
bazs.push_back(Baz(flatbuffers::make_span(test_array4), 3));
auto baz_vec = fbb.CreateVectorOfSortedStructs(&bazs);

auto test_string = fbb.CreateString("TEST");

float test_float_array1[3] = { 1.5, 2.5, 0 };
float test_float_array2[3] = { 7.5, 2.5, 0 };
float test_float_array3[3] = { 1.5, 2.5, -1 };
Expand All @@ -36,6 +38,7 @@ void FixedSizedScalarKeyInStructTest() {
bars.push_back(Bar(flatbuffers::make_span(test_float_array4), 1));
auto bar_vec = fbb.CreateVectorOfSortedStructs(&bars);


auto t = CreateFooTable(fbb, 1, 2, test_string, baz_vec, bar_vec);
fbb.Finish(t);

Expand All @@ -45,26 +48,34 @@ void FixedSizedScalarKeyInStructTest() {
auto sorted_baz_vec = foo_table->d();
TEST_EQ(sorted_baz_vec->Get(0)->b(), 1);
TEST_EQ(sorted_baz_vec->Get(3)->b(), 4);

uint8_t test_array[4];
auto* key_array = &flatbuffers::CastToArray(test_array);
key_array->CopyFromSpan(flatbuffers::make_span(test_array1));


TEST_NOTNULL(
sorted_baz_vec->LookupByKey(&flatbuffers::CastToArray(test_array1)));
sorted_baz_vec->LookupByKey(key_array));
TEST_EQ(
sorted_baz_vec->LookupByKey(&flatbuffers::CastToArray(test_array1))->b(),
sorted_baz_vec->LookupByKey(key_array)->b(),
4);
uint8_t array_int[4] = { 7, 2, 3, 0 };
TEST_EQ(sorted_baz_vec->LookupByKey(&flatbuffers::CastToArray(array_int)),
key_array->CopyFromSpan(flatbuffers::make_span(array_int));
TEST_EQ(sorted_baz_vec->LookupByKey(key_array),
static_cast<const Baz *>(nullptr));

auto sorted_bar_vec = foo_table->e();
TEST_EQ(sorted_bar_vec->Get(0)->b(), 1);
TEST_EQ(sorted_bar_vec->Get(3)->b(), 4);
TEST_NOTNULL(sorted_bar_vec->LookupByKey(
&flatbuffers::CastToArray(test_float_array1)));
TEST_EQ(
sorted_bar_vec->LookupByKey(&flatbuffers::CastToArray(test_float_array1))
->b(),
3);

float test_float_array[3];
auto* key_float_array = &flatbuffers::CastToArray(test_float_array);
key_float_array->CopyFromSpan(flatbuffers::make_span(test_float_array1));
TEST_NOTNULL(sorted_bar_vec->LookupByKey(key_float_array));
TEST_EQ(sorted_bar_vec->LookupByKey(key_float_array)->b(), 3);
float array_float[3] = { -1, -2, -3 };
TEST_EQ(sorted_bar_vec->LookupByKey(&flatbuffers::CastToArray(array_float)),
key_float_array->CopyFromSpan(flatbuffers::make_span(array_float));
TEST_EQ(sorted_bar_vec->LookupByKey(key_float_array),
static_cast<const Bar *>(nullptr));
}

Expand Down