AK: Add Ordering support to HashTable and HashMap

Adds a IsOrdered flag to Hashtable and HashMap, which allows iteration
in insertion order

AK/Forward.h

@@ -72,12 +72,18 @@ class CircularQueue;
 template<typename T>
 struct Traits;
 
-template<typename T, typename = Traits<T>>
+template<typename T, typename TraitsForT = Traits<T>, bool IsOrdered = false>
 class HashTable;
 
-template<typename K, typename V, typename = Traits<K>>
+template<typename T, typename TraitsForT = Traits<T>>
+using OrderedHashTable = HashTable<T, TraitsForT, true>;
+
+template<typename K, typename V, typename KeyTraits = Traits<K>, bool IsOrdered = false>
 class HashMap;
 
+template<typename K, typename V, typename KeyTraits>
+using OrderedHashMap = HashMap<K, V, KeyTraits, true>;
+
 template<typename T>
 class Badge;
 

AK/HashMap.h

@@ -19,7 +19,7 @@
 
 namespace AK {
 
-template<typename K, typename V, typename KeyTraits>
+template<typename K, typename V, typename KeyTraits, bool IsOrdered>
 class HashMap {
 private:
     struct Entry {
@@ -68,7 +68,7 @@ public:
     }
     void remove_one_randomly() { m_table.remove(m_table.begin()); }
 
-    using HashTableType = HashTable<Entry, EntryTraits>;
+    using HashTableType = HashTable<Entry, EntryTraits, IsOrdered>;
     using IteratorType = typename HashTableType::Iterator;
     using ConstIteratorType = typename HashTableType::ConstIterator;
 

AK/HashTable.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <AK/Forward.h>
 #include <AK/HashFunctions.h>
 #include <AK/StdLibExtras.h>
 #include <AK/Types.h>
@@ -57,7 +58,28 @@ private:
     BucketType* m_bucket { nullptr };
 };
 
-template<typename T, typename TraitsForT>
+template<typename OrderedHashTableType, typename T, typename BucketType>
+class OrderedHashTableIterator {
+    friend OrderedHashTableType;
+
+public:
+    bool operator==(const OrderedHashTableIterator& other) const { return m_bucket == other.m_bucket; }
+    bool operator!=(const OrderedHashTableIterator& other) const { return m_bucket != other.m_bucket; }
+    T& operator*() { return *m_bucket->slot(); }
+    T* operator->() { return m_bucket->slot(); }
+    void operator++() { m_bucket = m_bucket->next; }
+    void operator--() { m_bucket = m_bucket->previous; }
+
+private:
+    explicit OrderedHashTableIterator(BucketType* bucket)
+        : m_bucket(bucket)
+    {
+    }
+
+    BucketType* m_bucket { nullptr };
+};
+
+template<typename T, typename TraitsForT, bool IsOrdered>
 class HashTable {
     static constexpr size_t load_factor_in_percent = 60;
 
@@ -71,6 +93,28 @@ class HashTable {
         const T* slot() const { return reinterpret_cast<const T*>(storage); }
     };
 
+    struct OrderedBucket {
+        OrderedBucket* previous;
+        OrderedBucket* next;
+        bool used;
+        bool deleted;
+        alignas(T) u8 storage[sizeof(T)];
+        T* slot() { return reinterpret_cast<T*>(storage); }
+        const T* slot() const { return reinterpret_cast<const T*>(storage); }
+    };
+
+    using BucketType = Conditional<IsOrdered, OrderedBucket, Bucket>;
+
+    struct CollectionData {
+    };
+
+    struct OrderedCollectionData {
+        BucketType* head { nullptr };
+        BucketType* tail { nullptr };
+    };
+
+    using CollectionDataType = Conditional<IsOrdered, OrderedCollectionData, CollectionData>;
+
 public:
     HashTable() = default;
     explicit HashTable(size_t capacity) { rehash(capacity); }
@@ -104,6 +148,7 @@ public:
 
     HashTable(HashTable&& other) noexcept
         : m_buckets(other.m_buckets)
+        , m_collection_data(other.m_collection_data)
         , m_size(other.m_size)
         , m_capacity(other.m_capacity)
         , m_deleted_count(other.m_deleted_count)
@@ -112,6 +157,8 @@ public:
         other.m_capacity = 0;
         other.m_deleted_count = 0;
         other.m_buckets = nullptr;
+        if constexpr (IsOrdered)
+            other.m_collection_data = { nullptr, nullptr };
     }
 
     HashTable& operator=(HashTable&& other) noexcept
@@ -127,6 +174,9 @@ public:
         swap(a.m_size, b.m_size);
         swap(a.m_capacity, b.m_capacity);
         swap(a.m_deleted_count, b.m_deleted_count);
+
+        if constexpr (IsOrdered)
+            swap(a.m_collection_data, b.m_collection_data);
     }
 
     [[nodiscard]] bool is_empty() const { return !m_size; }
@@ -152,10 +202,15 @@ public:
         return find(value) != end();
     }
 
-    using Iterator = HashTableIterator<HashTable, T, Bucket>;
+    using Iterator = Conditional<IsOrdered,
+        OrderedHashTableIterator<HashTable, T, BucketType>,
+        HashTableIterator<HashTable, T, BucketType>>;
 
     Iterator begin()
     {
+        if constexpr (IsOrdered)
+            return Iterator(m_collection_data.head);
+
         for (size_t i = 0; i < m_capacity; ++i) {
             if (m_buckets[i].used)
                 return Iterator(&m_buckets[i]);
@@ -168,10 +223,15 @@ public:
         return Iterator(nullptr);
     }
 
-    using ConstIterator = HashTableIterator<const HashTable, const T, const Bucket>;
+    using ConstIterator = Conditional<IsOrdered,
+        OrderedHashTableIterator<const HashTable, const T, const BucketType>,
+        HashTableIterator<const HashTable, const T, const BucketType>>;
 
     ConstIterator begin() const
     {
+        if constexpr (IsOrdered)
+            return ConstIterator(m_collection_data.head);
+
         for (size_t i = 0; i < m_capacity; ++i) {
             if (m_buckets[i].used)
                 return ConstIterator(&m_buckets[i]);
@@ -206,6 +266,17 @@ public:
             bucket.deleted = false;
             --m_deleted_count;
         }
+
+        if constexpr (IsOrdered) {
+            if (!m_collection_data.head) [[unlikely]] {
+                m_collection_data.head = &bucket;
+            } else {
+                bucket.previous = m_collection_data.tail;
+                m_collection_data.tail->next = &bucket;
+            }
+            m_collection_data.tail = &bucket;
+        }
+
         ++m_size;
         return HashSetResult::InsertedNewEntry;
     }
@@ -247,13 +318,28 @@ public:
         VERIFY(iterator.m_bucket);
         auto& bucket = *iterator.m_bucket;
         VERIFY(bucket.used);
-        VERIFY(!bucket.end);
         VERIFY(!bucket.deleted);
+
+        if constexpr (!IsOrdered)
+            VERIFY(!bucket.end);
+
         bucket.slot()->~T();
         bucket.used = false;
         bucket.deleted = true;
         --m_size;
         ++m_deleted_count;
+
+        if constexpr (IsOrdered) {
+            if (bucket.previous)
+                bucket.previous->next = bucket.next;
+            else
+                m_collection_data.head = bucket.next;
+
+            if (bucket.next)
+                bucket.next->previous = bucket.previous;
+            else
+                m_collection_data.tail = bucket.previous;
+        }
     }
 
 private:
@@ -262,39 +348,55 @@ private:
         auto& bucket = lookup_for_writing(value);
         new (bucket.slot()) T(move(value));
         bucket.used = true;
+
+        if constexpr (IsOrdered) {
+            if (!m_collection_data.head) [[unlikely]] {
+                m_collection_data.head = &bucket;
+            } else {
+                bucket.previous = m_collection_data.tail;
+                m_collection_data.tail->next = &bucket;
+            }
+            m_collection_data.tail = &bucket;
+        }
     }
 
     void rehash(size_t new_capacity)
     {
         new_capacity = max(new_capacity, static_cast<size_t>(4));
-        new_capacity = kmalloc_good_size(new_capacity * sizeof(Bucket)) / sizeof(Bucket);
+        new_capacity = kmalloc_good_size(new_capacity * sizeof(BucketType)) / sizeof(BucketType);
 
         auto* old_buckets = m_buckets;
-        auto old_capacity = m_capacity;
+        Iterator old_iter = begin();
+
+        if constexpr (IsOrdered) {
+            m_buckets = (BucketType*)kmalloc(sizeof(BucketType) * (new_capacity));
+            __builtin_memset(m_buckets, 0, sizeof(BucketType) * (new_capacity));
+
+            m_collection_data = { nullptr, nullptr };
+        } else {
+            m_buckets = (BucketType*)kmalloc(sizeof(BucketType) * (new_capacity + 1));
+            __builtin_memset(m_buckets, 0, sizeof(BucketType) * (new_capacity + 1));
+        }
 
-        m_buckets = (Bucket*)kmalloc(sizeof(Bucket) * (new_capacity + 1));
-        __builtin_memset(m_buckets, 0, sizeof(Bucket) * (new_capacity + 1));
         m_capacity = new_capacity;
         m_deleted_count = 0;
 
-        m_buckets[m_capacity].end = true;
+        if constexpr (!IsOrdered)
+            m_buckets[m_capacity].end = true;
 
         if (!old_buckets)
             return;
 
-        for (size_t i = 0; i < old_capacity; ++i) {
+        for (auto it = move(old_iter); it != end(); ++it) {
-            auto& old_bucket = old_buckets[i];
+            insert_during_rehash(move(*it));
-            if (old_bucket.used) {
+            it->~T();
-                insert_during_rehash(move(*old_bucket.slot()));
-                old_bucket.slot()->~T();
-            }
         }
 
         kfree(old_buckets);
     }
 
     template<typename Finder>
-    Bucket* lookup_with_hash(unsigned hash, Finder finder) const
+    BucketType* lookup_with_hash(unsigned hash, Finder finder) const
     {
         if (is_empty())
             return nullptr;
@@ -312,18 +414,18 @@ private:
         }
     }
 
-    const Bucket* lookup_for_reading(const T& value) const
+    const BucketType* lookup_for_reading(const T& value) const
     {
         return lookup_with_hash(TraitsForT::hash(value), [&value](auto& entry) { return TraitsForT::equals(entry, value); });
     }
 
-    Bucket& lookup_for_writing(const T& value)
+    BucketType& lookup_for_writing(const T& value)
     {
         if (should_grow())
             rehash(capacity() * 2);
 
         auto hash = TraitsForT::hash(value);
-        Bucket* first_empty_bucket = nullptr;
+        BucketType* first_empty_bucket = nullptr;
         for (;;) {
             auto& bucket = m_buckets[hash % m_capacity];
 
@@ -335,7 +437,7 @@ private:
                     first_empty_bucket = &bucket;
 
                 if (!bucket.deleted)
-                    return *const_cast<Bucket*>(first_empty_bucket);
+                    return *const_cast<BucketType*>(first_empty_bucket);
             }
 
             hash = double_hash(hash);
@@ -345,12 +447,14 @@ private:
     [[nodiscard]] size_t used_bucket_count() const { return m_size + m_deleted_count; }
     [[nodiscard]] bool should_grow() const { return ((used_bucket_count() + 1) * 100) >= (m_capacity * load_factor_in_percent); }
 
-    Bucket* m_buckets { nullptr };
+    BucketType* m_buckets { nullptr };
+
+    [[no_unique_address]] CollectionDataType m_collection_data;
     size_t m_size { 0 };
     size_t m_capacity { 0 };
     size_t m_deleted_count { 0 };
 };
-
 }
 
 using AK::HashTable;
+using AK::OrderedHashTable;