Attachment 60268 Details for Bug 48888 – event cache patch

[patch] event cache patch

event-cache.patch (text/plain), 8.86 KB, created by Trever Fischer on 2012-04-18 11:46:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Trever Fischer

Created: 2012-04-18 11:46:24 UTC

Size: 8.86 KB

patch

obsolete

>diff --git a/.gitignore b/.gitignore
>index 8ab801b..ba42b0f 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -68,6 +68,7 @@ src/zeitgeist-daemon
> mimetype-test
> marshalling-test
> test/direct/datamodel-test
>+test/direct/event-cache-test
> libzeitgeist/*.c
> *.o
> *.la
>diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
>index 6580f13..a123fce 100644
>--- a/extensions/fts++/Makefile.am
>+++ b/extensions/fts++/Makefile.am
>@@ -42,6 +42,7 @@ libzeitgeist_internal_la_VALASOURCES = \
> 	ontology-uris.vala \
> 	mimetype.vala \
> 	ext-dummies.vala \
>+	event-cache.vala \
> 	$(NULL)
> 
> libzeitgeist_internal_la_SOURCES = \
>diff --git a/extensions/fts++/event-cache.vala b/extensions/fts++/event-cache.vala
>new file mode 120000
>index 0000000..3165b02
>--- /dev/null
>+++ b/extensions/fts++/event-cache.vala
>@@ -0,0 +1 @@
>+../../src/event-cache.vala
>\ No newline at end of file
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 8495252..e1f0a19 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -48,6 +48,7 @@ zeitgeist_daemon_VALASOURCES = \
> 	ontology.vala \
> 	ontology-uris.vala \
> 	mimetype.vala \
>+	event-cache.vala \
> 	$(NULL)
> 
> zeitgeist_daemon_SOURCES = \
>diff --git a/src/db-reader.vala b/src/db-reader.vala
>index 5da6245..e162645 100644
>--- a/src/db-reader.vala
>+++ b/src/db-reader.vala
>@@ -45,6 +45,8 @@ public class DbReader : Object
>     protected TableLookup mimetypes_table;
>     protected TableLookup actors_table;
> 
>+    protected EventCache cache;
>+
>     public DbReader () throws EngineError
>     {
>         Object (database: new Zeitgeist.SQLite.Database.read_only ());
>@@ -55,6 +57,7 @@ public class DbReader : Object
>         database.set_deletion_callback (delete_from_cache);
>         db = database.database;
> 
>+        cache = new EventCache ();
>         try
>         {
>             interpretations_table = new TableLookup (database, "interpretation");
>@@ -124,10 +127,26 @@ public class DbReader : Object
>         //  to enhance the performance of SQLite now, and event processing
>         //  will be faster now being C.
> 
>+        var results = new GenericArray<Event?> ();
>+        results.length = event_ids.length;
>         if (event_ids.length == 0)
>-            return new GenericArray<Event?> ();
>+            return results;
> 
>-        var sql_event_ids = database.get_sql_string_from_event_ids (event_ids);
>+        uint32[] uncached_ids = new uint32[0];
>+        for (int i = 0; i < event_ids.length; i++)
>+        {
>+            Event? e = cache.get_event (event_ids[i]);
>+            if (e != null) {
>+                results.set(i, e);
>+            } else {
>+                uncached_ids += event_ids[i];
>+            }
>+        }
>+
>+        if (uncached_ids.length == 0)
>+            return results;
>+
>+        var sql_event_ids = database.get_sql_string_from_event_ids (uncached_ids);
>         string sql = """
>             SELECT * FROM event_view
>             WHERE id IN (%s)
>@@ -155,12 +174,14 @@ public class DbReader : Object
>         database.assert_query_success (rc, "Error", Sqlite.DONE);
> 
>         // Sort events according to the sequence of event_ids
>-        var results = new GenericArray<Event?> ();
>         results.length = event_ids.length;
>         int i = 0;
>         foreach (var id in event_ids)
>         {
>-            results.set(i++, events.lookup (id));
>+            Event e = events.lookup (id);
>+            if (e != null)
>+                cache.cache_event (e);
>+            results.set(i++, e);
>         }
> 
>         return results;
>diff --git a/src/event-cache.vala b/src/event-cache.vala
>new file mode 100644
>index 0000000..e01202b
>--- /dev/null
>+++ b/src/event-cache.vala
>@@ -0,0 +1,77 @@
>+/* event-cache.vala
>+ *
>+ * Copyright Â© 2012 Collabora Ltd.
>+ *             By Trever Fischer <trever.fischer@collabora.co.uk>
>+ *
>+ * This program is free software: you can redistribute it and/or modify
>+ * it under the terms of the GNU Lesser General Public License as published by
>+ * the Free Software Foundation, either version 2.1 of the License, or
>+ * (at your option) any later version.
>+ *
>+ * This program is distributed in the hope that it will be useful,
>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ * GNU General Public License for more details.
>+ *
>+ * You should have received a copy of the GNU Lesser General Public License
>+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>+ *
>+ */
>+
>+using Zeitgeist;
>+
>+namespace Zeitgeist
>+{
>+public class EventCache : Object
>+{
>+
>+    private HashTable<uint32?, Event> cache_table;
>+    private Queue<uint32> lru_queue;
>+    private uint max_cache_size;
>+
>+    construct
>+    {
>+        cache_table = new HashTable<uint32?, Event> (int_hash, int_equal);
>+        lru_queue = new Queue<uint32>();
>+        max_cache_size = Utils.CACHE_SIZE;
>+    }
>+
>+    public Event? get_event(uint32 id)
>+    {
>+        Event? e = cache_table.get (id);
>+        if (e != null)
>+        {
>+            lru_queue.remove_all (id);
>+            lru_queue.push_tail (id);
>+        }
>+        return e;
>+    }
>+
>+    public void cache_event(Event e)
>+    {
>+        cache_table.set (e.id, e);
>+        lru_queue.remove_all (e.id);
>+        lru_queue.push_tail (e.id);
>+
>+        while (lru_queue.length > max_cache_size)
>+        {
>+            uint32 target = lru_queue.pop_head ();
>+            cache_table.remove (target);
>+        }
>+    }
>+
>+    public uint size
>+    {
>+        get { return lru_queue.length; }
>+    }
>+
>+    public uint max_size
>+    {
>+        get { return max_cache_size; }
>+        set { max_cache_size = value; }
>+    }
>+}
>+
>+}
>+
>+// vim:expandtab:ts=4:sw=4
>diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am
>index 468c97c..362f348 100644
>--- a/test/direct/Makefile.am
>+++ b/test/direct/Makefile.am
>@@ -11,6 +11,7 @@ VALAFLAGS = \
> 
> TESTS = \
> 	datamodel-test \
>+	event-cache-test \
> 	marshalling-test \
> 	mimetype-test \
> 	query-operators-test \
>@@ -36,8 +37,12 @@ SRC_FILES = \
> 	$(top_srcdir)/src/ontology.vala \
> 	$(top_srcdir)/src/ontology-uris.vala \
> 	$(top_srcdir)/src/mimetype.vala \
>+	$(top_srcdir)/src/event-cache.vala \
> 	$(NULL)
> 
>+event-cache-test: event-cache-test.vala $(SRC_FILES)
>+	$(VALA_V)$(VALAC) $(VALAFLAGS) -o $@ $^
>+
> datamodel-test: datamodel-test.vala $(SRC_FILES)
> 	$(VALA_V)$(VALAC) $(VALAFLAGS) -o $@ $^
> 
>@@ -66,11 +71,13 @@ CLEANFILES = \
> 	query-operators-test \
> 	table-lookup-test \
> 	where-clause-test \
>+	event-cache-test \
> 	$(NULL)
> 
> EXTRA_DIST = \
> 	assertions.vapi \
> 	datamodel-test.vala \
>+	event-cache-test.vala \
> 	marshalling-test.vala \
> 	mimetype-test.vala \
> 	query-operators-test.vala \
>diff --git a/test/direct/event-cache-test.vala b/test/direct/event-cache-test.vala
>new file mode 100644
>index 0000000..36cfbef
>--- /dev/null
>+++ b/test/direct/event-cache-test.vala
>@@ -0,0 +1,84 @@
>+/* event-cache-test.vala
>+ *
>+ * Copyright Â© 2012 Collabora Ltd.
>+ *             By Trever Fischer <trever.fischer@collabora.co.uk>
>+ *
>+ * This program is free software: you can redistribute it and/or modify
>+ * it under the terms of the GNU Lesser General Public License as published by
>+ * the Free Software Foundation, either version 2.1 of the License, or
>+ * (at your option) any later version.
>+ *
>+ * This program is distributed in the hope that it will be useful,
>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ * GNU General Public License for more details.
>+ *
>+ * You should have received a copy of the GNU Lesser General Public License
>+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>+ *
>+ */
>+
>+using Zeitgeist;
>+using Assertions;
>+
>+int main (string[] args)
>+{
>+    Test.init (ref args);
>+    Log.set_always_fatal (LogLevelFlags.LEVEL_CRITICAL);
>+
>+    Test.add_func("/EventCache/basic", basic_test);
>+    Test.add_func("/EventCache/size", size_test);
>+    Test.add_func("/EventCache/expiration", expiration_test);
>+
>+    return Test.run ();
>+}
>+
>+public void basic_test ()
>+{
>+    EventCache c = new EventCache ();
>+    for (int i = 0; i<1024; i++)
>+    {
>+        Event e = new Event();
>+        e.id = i;
>+        c.cache_event (e);
>+    }
>+    assert (c.size == 1024);
>+}
>+
>+public void size_test ()
>+{
>+    EventCache c = new EventCache ();
>+    c.max_size = 5;
>+    for (int i = 0; i<2048; i++)
>+    {
>+        Event e = new Event();
>+        e.id = i;
>+        c.cache_event (e);
>+    }
>+
>+    assert (c.size == 5);
>+}
>+
>+public void expiration_test ()
>+{
>+    EventCache c = new EventCache ();
>+    c.max_size = 5;
>+    for (int i = 0; i < 5; i++)
>+    {
>+        Event e = new Event();
>+        e.id = i;
>+        c.cache_event (e);
>+    }
>+
>+    // Refresh the LRU stamp for #0, so #30 expires #1
>+    c.get_event(0);
>+    Event e = new Event();
>+    e.id = 30;
>+    c.cache_event (e);
>+
>+    assert(c.get_event(0) != null);
>+    assert(c.get_event(1) == null);
>+    assert(c.get_event(30) != null);
>+}
>+
>+// vim:expandtab:ts=4:sw=4

Actions: View | Splinter Review

Attachments on bug 48888: 60268

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.