BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-28 18:20:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* update unit test and generated file to test is extra endianswap can help resolve issue

* remove EndianScalar wrapper from Get method

* remove endianscalar wrapper

* update

* update

* use Array instead

* clang format

* address error

* clang

* update

* manually generate

* Move Nim to completed language

* Add swift link

* address comments

* update unit test

* address comment

* address comment

* regenerate file

* use auto instead of size_t

* use uint32_t instead

* update

* format

* delete extra whitespace

Co-authored-by: Wen Sun <sunwen@google.com>
Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
Wen Sun
2022-12-06 14:02:16 -08:00
committed by GitHub
parent 11394575bc
commit b5ebd3fd78
3 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/idl_gen_cpp.cpp
View File

@@ -2269,15 +2269,18 @@ class CppGenerator : public BaseGenerator {
code_.SetValue("INPUT_TYPE", input_type); code_.SetValue("INPUT_TYPE", input_type);
code_ += code_ +=
" int KeyCompareWithValue(const {{INPUT_TYPE}} *_{{FIELD_NAME}}" " int KeyCompareWithValue(const {{INPUT_TYPE}} *_{{FIELD_NAME}}"
") const { "; ") const {";
code_ += " for (auto i = 0; i < {{FIELD_NAME}}()->size(); i++) {";
code_ += " const auto {{FIELD_NAME}}_l = {{FIELD_NAME}}_[i];";
code_ += " const auto {{FIELD_NAME}}_r = _{{FIELD_NAME}}->Get(i);";
code_ += " if({{FIELD_NAME}}_l != {{FIELD_NAME}}_r) ";
code_ += code_ +=
" return static_cast<int>({{FIELD_NAME}}_l > " " const {{INPUT_TYPE}} *curr_{{FIELD_NAME}} = {{FIELD_NAME}}();";
"{{FIELD_NAME}}_r)" code_ +=
" - static_cast<int>({{FIELD_NAME}}_l < {{FIELD_NAME}}_r);"; " for (flatbuffers::uoffset_t i = 0; i < "
"curr_{{FIELD_NAME}}->size(); i++) {";
code_ += " const auto lhs = curr_{{FIELD_NAME}}->Get(i);";
code_ += " const auto rhs = _{{FIELD_NAME}}->Get(i);";
code_ += " if(lhs != rhs)";
code_ +=
" return static_cast<int>(lhs > rhs)"
" - static_cast<int>(lhs < rhs);";
code_ += " }"; code_ += " }";
code_ += " return 0;"; code_ += " return 0;";
} }

26
tests/key_field/key_field_sample_generated.h
View File

@@ -67,12 +67,13 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(1) Baz FLATBUFFERS_FINAL_CLASS {
bool KeyCompareLessThan(const Baz * const o) const { bool KeyCompareLessThan(const Baz * const o) const {
return KeyCompareWithValue(o->a()) < 0; return KeyCompareWithValue(o->a()) < 0;
} }
int KeyCompareWithValue(const flatbuffers::Array<uint8_t, 4> *_a) const { int KeyCompareWithValue(const flatbuffers::Array<uint8_t, 4> *_a) const {
for (auto i = 0; i < a()->size(); i++) { const flatbuffers::Array<uint8_t, 4> *curr_a = a();
const auto a_l = a_[i]; for (flatbuffers::uoffset_t i = 0; i < curr_a->size(); i++) {
const auto a_r = _a->Get(i); const auto lhs = curr_a->Get(i);
if(a_l != a_r) const auto rhs = _a->Get(i);
return static_cast<int>(a_l > a_r) - static_cast<int>(a_l < a_r); if(lhs != rhs)
return static_cast<int>(lhs > rhs) - static_cast<int>(lhs < rhs);
} }
return 0; return 0;
} }
@@ -139,12 +140,13 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Bar FLATBUFFERS_FINAL_CLASS {
bool KeyCompareLessThan(const Bar * const o) const { bool KeyCompareLessThan(const Bar * const o) const {
return KeyCompareWithValue(o->a()) < 0; return KeyCompareWithValue(o->a()) < 0;
} }
int KeyCompareWithValue(const flatbuffers::Array<float, 3> *_a) const { int KeyCompareWithValue(const flatbuffers::Array<float, 3> *_a) const {
for (auto i = 0; i < a()->size(); i++) { const flatbuffers::Array<float, 3> *curr_a = a();
const auto a_l = a_[i]; for (flatbuffers::uoffset_t i = 0; i < curr_a->size(); i++) {
const auto a_r = _a->Get(i); const auto lhs = curr_a->Get(i);
if(a_l != a_r) const auto rhs = _a->Get(i);
return static_cast<int>(a_l > a_r) - static_cast<int>(a_l < a_r); if(lhs != rhs)
return static_cast<int>(lhs > rhs) - static_cast<int>(lhs < rhs);
} }
return 0; return 0;
} }

31
tests/key_field_test.cpp
View File

@@ -24,7 +24,9 @@ void FixedSizedScalarKeyInStructTest() {
bazs.push_back(Baz(flatbuffers::make_span(test_array3), 2)); bazs.push_back(Baz(flatbuffers::make_span(test_array3), 2));
bazs.push_back(Baz(flatbuffers::make_span(test_array4), 3)); bazs.push_back(Baz(flatbuffers::make_span(test_array4), 3));
auto baz_vec = fbb.CreateVectorOfSortedStructs(&bazs); auto baz_vec = fbb.CreateVectorOfSortedStructs(&bazs);
auto test_string = fbb.CreateString("TEST"); auto test_string = fbb.CreateString("TEST");
float test_float_array1[3] = { 1.5, 2.5, 0 }; float test_float_array1[3] = { 1.5, 2.5, 0 };
float test_float_array2[3] = { 7.5, 2.5, 0 }; float test_float_array2[3] = { 7.5, 2.5, 0 };
float test_float_array3[3] = { 1.5, 2.5, -1 }; float test_float_array3[3] = { 1.5, 2.5, -1 };
@@ -36,6 +38,7 @@ void FixedSizedScalarKeyInStructTest() {
bars.push_back(Bar(flatbuffers::make_span(test_float_array4), 1)); bars.push_back(Bar(flatbuffers::make_span(test_float_array4), 1));
auto bar_vec = fbb.CreateVectorOfSortedStructs(&bars); auto bar_vec = fbb.CreateVectorOfSortedStructs(&bars);
auto t = CreateFooTable(fbb, 1, 2, test_string, baz_vec, bar_vec); auto t = CreateFooTable(fbb, 1, 2, test_string, baz_vec, bar_vec);
fbb.Finish(t); fbb.Finish(t);
@@ -45,26 +48,34 @@ void FixedSizedScalarKeyInStructTest() {
auto sorted_baz_vec = foo_table->d(); auto sorted_baz_vec = foo_table->d();
TEST_EQ(sorted_baz_vec->Get(0)->b(), 1); TEST_EQ(sorted_baz_vec->Get(0)->b(), 1);
TEST_EQ(sorted_baz_vec->Get(3)->b(), 4); 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( TEST_NOTNULL(
sorted_baz_vec->LookupByKey(&flatbuffers::CastToArray(test_array1))); sorted_baz_vec->LookupByKey(key_array));
TEST_EQ( TEST_EQ(
sorted_baz_vec->LookupByKey(&flatbuffers::CastToArray(test_array1))->b(), sorted_baz_vec->LookupByKey(key_array)->b(),
4); 4);
uint8_t array_int[4] = { 7, 2, 3, 0 }; 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)); static_cast<const Baz *>(nullptr));
auto sorted_bar_vec = foo_table->e(); auto sorted_bar_vec = foo_table->e();
TEST_EQ(sorted_bar_vec->Get(0)->b(), 1); TEST_EQ(sorted_bar_vec->Get(0)->b(), 1);
TEST_EQ(sorted_bar_vec->Get(3)->b(), 4); TEST_EQ(sorted_bar_vec->Get(3)->b(), 4);
TEST_NOTNULL(sorted_bar_vec->LookupByKey(
&flatbuffers::CastToArray(test_float_array1))); float test_float_array[3];
TEST_EQ( auto* key_float_array = &flatbuffers::CastToArray(test_float_array);
sorted_bar_vec->LookupByKey(&flatbuffers::CastToArray(test_float_array1)) key_float_array->CopyFromSpan(flatbuffers::make_span(test_float_array1));
->b(), TEST_NOTNULL(sorted_bar_vec->LookupByKey(key_float_array));
3); TEST_EQ(sorted_bar_vec->LookupByKey(key_float_array)->b(), 3);
float array_float[3] = { -1, -2, -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)); static_cast<const Bar *>(nullptr));
} }