From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 19 Mar 2019 12:02:07 +0000 (+0100)
Subject: [#103,!277] Use composite key for audit entry object type searches.
X-Git-Tag: Kea-1.6.0-beta~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=007546ad5b3410911675289f2f248bd3e859e798;p=thirdparty%2Fkea.git

[#103,!277] Use composite key for audit entry object type searches.
---

diff --git a/src/lib/database/audit_entry.h b/src/lib/database/audit_entry.h
index 7bfe7488fb..70cc3dba54 100644
--- a/src/lib/database/audit_entry.h
+++ b/src/lib/database/audit_entry.h
@@ -8,8 +8,8 @@
 #define AUDIT_ENTRY_H
 
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/multi_index/composite_key.hpp>
 #include <boost/multi_index_container.hpp>
-#include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/shared_ptr.hpp>
@@ -170,12 +170,20 @@ typedef boost::multi_index_container<
     AuditEntryPtr,
     // First index allows for accessing by the object type.
     boost::multi_index::indexed_by<
-        boost::multi_index::hashed_non_unique<
+        boost::multi_index::ordered_non_unique<
             boost::multi_index::tag<AuditEntryObjectTypeTag>,
-            boost::multi_index::const_mem_fun<
+            boost::multi_index::composite_key<
                 AuditEntry,
-                std::string,
-                &AuditEntry::getObjectType
+                boost::multi_index::const_mem_fun<
+                    AuditEntry,
+                    std::string,
+                    &AuditEntry::getObjectType
+                >,
+                boost::multi_index::const_mem_fun<
+                    AuditEntry,
+                    AuditEntry::ModificationType,
+                    &AuditEntry::getModificationType
+                >
             >
         >,