Include type in existingEntities cacheHEADwebstat-0.7.1main

Fixes the issues of entities having the same value (hash) but occurring
in different places. This is most often when the client states the
virtual host name as the referrer.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/logTypes.hpp b/src/logTypes.hpp
index 7f0473e..d1bda3f 100644
--- a/src/logTypes.hpp
+++ b/src/logTypes.hpp
@@ -38,10 +38,15 @@ namespace WebStat {
 	using EntityId = int32_t;
 	using EntityHash = std::array<uint8_t, MD5_DIGEST_LENGTH>;
 
-	struct Entity {
+	struct EntityKey {
 		EntityHash hash;
-		std::optional<EntityId> id;
 		EntityType type;
+		constexpr auto operator<=>(const EntityKey &) const noexcept = default;
+	};
+
+	struct Entity {
+		EntityKey key;
+		std::optional<EntityId> id;
 		std::string_view value;
 	};
 }