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

[C++] Enable using struct and array of struct as key (#7741)

Browse Source 
* add unit tests for support struct as key

* make changes to parser and add helper function to generate comparator for struct

* implement

* add more unit tests

* format

* just a test

* test done

* rerun generator

* restore build file

* address comment

* format

* rebase

* rebase

* add more unit tests

* rerun generator

* address some comments

* address comment

* update

* format

* address comment

Co-authored-by: Wen Sun <sunwen@google.com>
Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
Wen Sun
2023-01-24 16:37:13 -08:00
committed by GitHub
parent ee848a02e1
commit 802a3a056a
7 changed files with 853 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
tests/key_field_test.cpp
View File

@@ -40,6 +40,7 @@ void FixedSizedScalarKeyInStructTest() {
auto t = CreateFooTable(fbb, 1, 2, test_string, baz_vec, bar_vec);
fbb.Finish(t);
uint8_t *buf = fbb.GetBufferPointer();
@@ -79,5 +80,146 @@ void FixedSizedScalarKeyInStructTest() {
static_cast<const Bar *>(nullptr));
}
void StructKeyInStructTest() {
flatbuffers::FlatBufferBuilder fbb;
std::vector<Apple> apples;
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 };
apples.push_back(
Apple(2, Color(flatbuffers::make_span(test_float_array1), 3)));
apples.push_back(
Apple(3, Color(flatbuffers::make_span(test_float_array2), 3)));
apples.push_back(
Apple(1, Color(flatbuffers::make_span(test_float_array3), 1)));
auto apples_vec = fbb.CreateVectorOfSortedStructs(&apples);
auto test_string = fbb.CreateString("TEST");
FooTableBuilder foo_builder(fbb);
foo_builder.add_a(1);
foo_builder.add_c(test_string);
foo_builder.add_f(apples_vec);
auto orc = foo_builder.Finish();
fbb.Finish(orc);
uint8_t *buf = fbb.GetBufferPointer();
auto foo_table = GetFooTable(buf);
auto sorted_apple_vec = foo_table->f();
TEST_EQ(sorted_apple_vec->Get(0)->tag(), 1);
TEST_EQ(sorted_apple_vec->Get(1)->tag(), 2);
TEST_EQ(sorted_apple_vec->Get(2)->tag(), 3);
TEST_EQ(sorted_apple_vec
->LookupByKey(Color(flatbuffers::make_span(test_float_array1), 3))
->tag(),
2);
TEST_EQ(sorted_apple_vec->LookupByKey(
Color(flatbuffers::make_span(test_float_array1), 0)),
static_cast<const Apple *>(nullptr));
}
void NestedStructKeyInStructTest() {
flatbuffers::FlatBufferBuilder fbb;
std::vector<Fruit> fruits;
float test_float_array1[3] = { 1.5, 2.5, 0 };
float test_float_array2[3] = { 1.5, 2.5, 0 };
float test_float_array3[3] = { 1.5, 2.5, -1 };
fruits.push_back(
Fruit(Apple(2, Color(flatbuffers::make_span(test_float_array1), 2)), 2));
fruits.push_back(
Fruit(Apple(2, Color(flatbuffers::make_span(test_float_array2), 1)), 1));
fruits.push_back(
Fruit(Apple(2, Color(flatbuffers::make_span(test_float_array3), 3)), 3));
auto test_string = fbb.CreateString("TEST");
auto fruits_vec = fbb.CreateVectorOfSortedStructs(&fruits);
FooTableBuilder foo_builder(fbb);
foo_builder.add_a(1);
foo_builder.add_c(test_string);
foo_builder.add_g(fruits_vec);
auto orc = foo_builder.Finish();
fbb.Finish(orc);
uint8_t *buf = fbb.GetBufferPointer();
auto foo_table = GetFooTable(buf);
auto sorted_fruit_vec = foo_table->g();
TEST_EQ(sorted_fruit_vec->Get(0)->b(), 3);
TEST_EQ(sorted_fruit_vec->Get(1)->b(), 1);
TEST_EQ(sorted_fruit_vec->Get(2)->b(), 2);
TEST_EQ(sorted_fruit_vec->LookupByKey(Apple(2, Color(flatbuffers::make_span(test_float_array2), 1)))->b(), 1);
TEST_EQ(sorted_fruit_vec->LookupByKey(Apple(1, Color(flatbuffers::make_span(test_float_array2), 1))), static_cast<const Fruit *>(nullptr));
}
void FixedSizedStructArrayKeyInStructTest() {
flatbuffers::FlatBufferBuilder fbb;
std::vector<Grain> grains;
uint8_t test_char_array1[3] = { 'u', 's', 'a' };
uint8_t test_char_array2[3] = { 'c', 'h', 'n' };
uint8_t test_char_array3[3] = { 'c', 'h', 'l' };
uint8_t test_char_array4[3] = { 'f', 'r', 'a' };
uint8_t test_char_array5[3] = { 'i', 'n', 'd' };
uint8_t test_char_array6[3] = { 'i', 't', 'a' };
Rice test_rice_array1[3] = {
Rice(flatbuffers::make_span(test_char_array1), 2),
Rice(flatbuffers::make_span(test_char_array2), 1),
Rice(flatbuffers::make_span(test_char_array3), 2)
};
Rice test_rice_array2[3] = {
Rice(flatbuffers::make_span(test_char_array4), 2),
Rice(flatbuffers::make_span(test_char_array5), 1),
Rice(flatbuffers::make_span(test_char_array6), 2)
};
Rice test_rice_array3[3] = {
Rice(flatbuffers::make_span(test_char_array4), 2),
Rice(flatbuffers::make_span(test_char_array6), 1),
Rice(flatbuffers::make_span(test_char_array1), 2)
};
grains.push_back(Grain(flatbuffers::make_span(test_rice_array1), 3));
grains.push_back(Grain(flatbuffers::make_span(test_rice_array2), 1));
grains.push_back(Grain(flatbuffers::make_span(test_rice_array3), 2));
auto test_string = fbb.CreateString("TEST");
auto grains_vec = fbb.CreateVectorOfSortedStructs(&grains);
FooTableBuilder foo_builder(fbb);
foo_builder.add_a(1);
foo_builder.add_c(test_string);
foo_builder.add_h(grains_vec);
auto orc = foo_builder.Finish();
fbb.Finish(orc);
uint8_t *buf = fbb.GetBufferPointer();
auto foo_table = GetFooTable(buf);
auto sorted_grain_vec = foo_table->h();
TEST_EQ(sorted_grain_vec->Get(0)->tag(), 1);
TEST_EQ(sorted_grain_vec->Get(1)->tag(), 2);
TEST_EQ(sorted_grain_vec->Get(2)->tag(), 3);
TEST_EQ(
sorted_grain_vec->LookupByKey(&flatbuffers::CastToArray(test_rice_array1))
->tag(),
3);
Rice test_rice_array[3] = { Rice(flatbuffers::make_span(test_char_array3), 2),
Rice(flatbuffers::make_span(test_char_array2), 1),
Rice(flatbuffers::make_span(test_char_array1),
2) };
TEST_EQ(
sorted_grain_vec->LookupByKey(&flatbuffers::CastToArray(test_rice_array)),
static_cast<const Grain *>(nullptr));
TEST_EQ(
sorted_grain_vec->LookupByKey(&flatbuffers::CastToArray(test_rice_array1))
->tag(),
3);
}
} // namespace tests
} // namespace flatbuffers