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

Add --gen-absl-hash option to generate AbslHashValue for structs. (#8868)

Browse Source
This commit is contained in:
Derek Bailey
2025-12-19 11:49:50 -08:00
committed by GitHub
parent fb55e0c9de
commit 8cb53ccc95
15 changed files with 186 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/BUILD.bazel
View File

@@ -213,6 +213,7 @@ flatbuffer_cc_library(
include_test_args = [
"--gen-object-api",
"--gen-compare",
"--gen-absl-hash",
"--gen-mutable",
"--reflect-names",
"--cpp-ptr-type flatbuffers::unique_ptr",

4
tests/evolution_test/evolution_v1_generated.h
View File

@@ -145,6 +145,10 @@ inline bool operator!=(const Struct &lhs, const Struct &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Struct &obj) {
return H::combine(std::move(h), obj.a(), obj.b());
}
struct TableA FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
typedef TableABuilder Builder;

4
tests/evolution_test/evolution_v2_generated.h
View File

@@ -161,6 +161,10 @@ inline bool operator!=(const Struct &lhs, const Struct &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Struct &obj) {
return H::combine(std::move(h), obj.a(), obj.b());
}
struct TableA FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
typedef TableABuilder Builder;

20
tests/monster_test_generated.h
View File

@@ -712,6 +712,10 @@ inline bool operator!=(const Test &lhs, const Test &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Test &obj) {
return H::combine(std::move(h), obj.a(), obj.b());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
private:
@@ -810,6 +814,10 @@ inline bool operator!=(const Vec3 &lhs, const Vec3 &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Vec3 &obj) {
return H::combine(std::move(h), obj.x(), obj.y(), obj.z(), obj.test1(), obj.test2(), obj.test3());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
private:
@@ -859,6 +867,10 @@ inline bool operator!=(const Ability &lhs, const Ability &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Ability &obj) {
return H::combine(std::move(h), obj.id(), obj.distance());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -912,6 +924,10 @@ inline bool operator!=(const StructOfStructs &lhs, const StructOfStructs &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructs &obj) {
return H::combine(std::move(h), obj.a(), obj.b(), obj.c());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructsOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -945,6 +961,10 @@ inline bool operator!=(const StructOfStructsOfStructs &lhs, const StructOfStruct
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructsOfStructs &obj) {
return H::combine(std::move(h), obj.a());
}
} // namespace Example

20
tests/monster_test_suffix/ext_only/monster_test_generated.hpp
View File

@@ -709,6 +709,10 @@ inline bool operator!=(const Test &lhs, const Test &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Test &obj) {
return H::combine(std::move(h), obj.a(), obj.b());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
private:
@@ -807,6 +811,10 @@ inline bool operator!=(const Vec3 &lhs, const Vec3 &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Vec3 &obj) {
return H::combine(std::move(h), obj.x(), obj.y(), obj.z(), obj.test1(), obj.test2(), obj.test3());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
private:
@@ -856,6 +864,10 @@ inline bool operator!=(const Ability &lhs, const Ability &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Ability &obj) {
return H::combine(std::move(h), obj.id(), obj.distance());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -909,6 +921,10 @@ inline bool operator!=(const StructOfStructs &lhs, const StructOfStructs &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructs &obj) {
return H::combine(std::move(h), obj.a(), obj.b(), obj.c());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructsOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -942,6 +958,10 @@ inline bool operator!=(const StructOfStructsOfStructs &lhs, const StructOfStruct
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructsOfStructs &obj) {
return H::combine(std::move(h), obj.a());
}
} // namespace Example

20
tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h
View File

@@ -709,6 +709,10 @@ inline bool operator!=(const Test &lhs, const Test &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Test &obj) {
return H::combine(std::move(h), obj.a(), obj.b());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
private:
@@ -807,6 +811,10 @@ inline bool operator!=(const Vec3 &lhs, const Vec3 &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Vec3 &obj) {
return H::combine(std::move(h), obj.x(), obj.y(), obj.z(), obj.test1(), obj.test2(), obj.test3());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
private:
@@ -856,6 +864,10 @@ inline bool operator!=(const Ability &lhs, const Ability &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Ability &obj) {
return H::combine(std::move(h), obj.id(), obj.distance());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -909,6 +921,10 @@ inline bool operator!=(const StructOfStructs &lhs, const StructOfStructs &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructs &obj) {
return H::combine(std::move(h), obj.a(), obj.b(), obj.c());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructsOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -942,6 +958,10 @@ inline bool operator!=(const StructOfStructsOfStructs &lhs, const StructOfStruct
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructsOfStructs &obj) {
return H::combine(std::move(h), obj.a());
}
} // namespace Example

20
tests/monster_test_suffix/monster_test_suffix.hpp
View File

@@ -709,6 +709,10 @@ inline bool operator!=(const Test &lhs, const Test &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Test &obj) {
return H::combine(std::move(h), obj.a(), obj.b());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
private:
@@ -807,6 +811,10 @@ inline bool operator!=(const Vec3 &lhs, const Vec3 &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Vec3 &obj) {
return H::combine(std::move(h), obj.x(), obj.y(), obj.z(), obj.test1(), obj.test2(), obj.test3());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
private:
@@ -856,6 +864,10 @@ inline bool operator!=(const Ability &lhs, const Ability &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Ability &obj) {
return H::combine(std::move(h), obj.id(), obj.distance());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -909,6 +921,10 @@ inline bool operator!=(const StructOfStructs &lhs, const StructOfStructs &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructs &obj) {
return H::combine(std::move(h), obj.a(), obj.b(), obj.c());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructOfStructsOfStructs FLATBUFFERS_FINAL_CLASS {
private:
@@ -942,6 +958,10 @@ inline bool operator!=(const StructOfStructsOfStructs &lhs, const StructOfStruct
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const StructOfStructsOfStructs &obj) {
return H::combine(std::move(h), obj.a());
}
} // namespace Example

42
tests/test.cpp
View File

@@ -26,6 +26,13 @@
#define INCLUDE_64_BIT_TESTS 1
#endif
#if __has_include("third_party/absl/container/flat_hash_set.h")
#define HAS_ABSL_CONTAINERS 1
#endif
#ifdef HAS_ABSL_CONTAINERS
#include "third_party/absl/container/flat_hash_set.h"
#endif
#include "alignment_test.h"
#include "evolution_test.h"
#include "flatbuffers/flatbuffers.h"
@@ -1665,6 +1672,40 @@ void UnionUnderlyingTypeTest() {
TEST_ASSERT(unpacked.test_vector_of_union == buffer.test_vector_of_union);
}
void StructsInHashTableTest() {
#if defined(HAS_ABSL_CONTAINERS) && (!defined(_MSC_VER) || _MSC_VER >= 1700)
absl::flat_hash_set<ArrayStruct> hash_set;
ArrayStruct array_struct_1;
array_struct_1.mutate_a(0.4);
for (int i = 0; i < array_struct_1.b()->size(); ++i) {
array_struct_1.mutable_b()->Mutate(i, i * 2);
}
for (int i = 0; i < array_struct_1.d()->size(); ++i) {
NestedStruct nested_struct;
nested_struct.mutable_a()->Mutate(0, i * 3);
array_struct_1.mutable_d()->Mutate(i, nested_struct);
}
ArrayStruct array_struct_2;
array_struct_2.mutate_e(999);
hash_set.insert(array_struct_1);
hash_set.insert(array_struct_2);
TEST_EQ(hash_set.size(), 2);
TEST_ASSERT(hash_set.contains(array_struct_1));
TEST_ASSERT(hash_set.contains(array_struct_2));
ArrayStruct array_struct_3 = array_struct_1;
array_struct_3.mutable_b()->Mutate(0, 2);
TEST_ASSERT(!hash_set.contains(array_struct_3));
hash_set.insert(array_struct_3);
TEST_ASSERT(hash_set.contains(array_struct_3));
#endif // defined(HAS_ABSL_CONTAINERS) && (!defined(_MSC_VER) || _MSC_VER >=
// 1700)
}
static void Offset64Tests() {
#if INCLUDE_64_BIT_TESTS
Offset64Test();
@@ -1794,6 +1835,7 @@ int FlatBufferTests(const std::string& tests_data_path) {
EmbeddedSchemaAccess();
Offset64Tests();
UnionUnderlyingTypeTest();
StructsInHashTableTest();
return 0;
}
} // namespace

12
tests/union_vector/union_vector_generated.h
View File

@@ -384,6 +384,10 @@ inline bool operator!=(const Rapunzel &lhs, const Rapunzel &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const Rapunzel &obj) {
return H::combine(std::move(h), obj.hair_length());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
private:
@@ -417,6 +421,10 @@ inline bool operator!=(const BookReader &lhs, const BookReader &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const BookReader &obj) {
return H::combine(std::move(h), obj.books_read());
}
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) FallingTub FLATBUFFERS_FINAL_CLASS {
private:
@@ -450,6 +458,10 @@ inline bool operator!=(const FallingTub &lhs, const FallingTub &rhs) {
return !(lhs == rhs);
}
template <typename H>
inline H AbslHashValue(H h, const FallingTub &obj) {
return H::combine(std::move(h), obj.weight());
}
struct AttackerT : public ::flatbuffers::NativeTable {
typedef Attacker TableType;