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.

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
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
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
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
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