Merge lp:~mhr3/libunity/no-double-push into lp:~unity-team/libunity/libunity-7.0

[Michal Hruby]

Make sure we don't duplicate results when pushing.

Make sure we don't duplicate results when pushing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:377
http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-raring-amd64-ci/74

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-libunity-libunity-7.0-ci/74/rebuild

review: Approve (continuous-integration)

[lp:~mhr3/libunity/no-double-push]

378. By Michal Hruby on 2013-05-03

Invalidate pushed models after each clear

379. By Michal Hruby on 2013-05-03

Update symbols

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:379
http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-raring-amd64-ci/75

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-libunity-libunity-7.0-ci/75/rebuild

review: Approve (continuous-integration)

Unmerged revisions

379. By Michal Hruby on 2013-05-03

Update symbols

378. By Michal Hruby on 2013-05-03

Invalidate pushed models after each clear

377. By Michal Hruby on 2013-05-02

Check scope id when re-pushing results

376. By Michal Hruby on 2013-05-02

Don't duplicate results on double push

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-05-01 22:30:59 +0000
+++ debian/libunity9.symbols	2013-05-03 22:43:33 +0000
@@ -369,6 +369,7 @@
  unity_internal_results_synchronizer_prepare_row_buf@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_internal_results_synchronizer_remove_provider@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_internal_results_synchronizer_set_merge_strategy@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
+ unity_internal_scope_channel_check_pushed_models@Base 0replaceme
  unity_internal_scope_channel_construct@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_internal_scope_channel_create_channel@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_internal_scope_channel_get_filter_by_id@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
 
=== modified file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala	2013-05-03 18:43:12 +0000
+++ src/unity-aggregator-scope-private.vala	2013-05-03 22:43:33 +0000
@@ -1454,10 +1454,11 @@
 
     unowned Variant subscopes_filter_variant = hints[SEARCH_SUBSCOPES_HINT];
     uint subscope_filter_tag = 0;
+    string[] enabled_subscopes = {};
     if (subscopes_filter_variant != null && subscopes_filter_variant.get_type_string () == "as")
     {
-      string[] subscopes = (string[]) subscopes_filter_variant;
-      subscope_filter_tag = string.joinv (";", subscopes).hash ();
+      enabled_subscopes = (string[]) subscopes_filter_variant;
+      subscope_filter_tag = string.joinv (";", enabled_subscopes).hash ();
     }
 
     bool invalidate_last_search = filter_row_variant != null;
@@ -1498,6 +1499,8 @@
     // that are not searched this time disappear
     synchronizer.clear ();
 
+    channel.check_pushed_models (search_string);
+
     // if this search will query fewer sources than the last one, there could
     // be a race where results from the last query start appearing for this
     // one (cause the sources took a while to complete the search)
@@ -1579,7 +1582,12 @@
 
     foreach (var provider in channel.get_pushed_models (search_string))
     {
-      push_results_internal (synchronizer, provider);
+      unowned string provider_scope_id = provider.get_data<string> ("scope-id");
+      if (subscope_filter_tag == 0 ||
+        (subscope_filter_tag != 0 && provider_scope_id in enabled_subscopes))
+      {
+        push_results_internal (synchronizer, provider);
+      }
     }
 
     int64 search_start_time = 0;
@@ -1893,6 +1901,9 @@
       throw new ScopeError.REQUEST_FAILED ("Can't deserialize model");
 
     var provider = model_obj as Dee.SerializableModel;
+    var synchronizer_tag = new Dee.ModelTag<Dee.ModelIter> (provider);
+    provider.set_data<Dee.ModelTag<Dee.ModelIter>> ("synchronizer-tag",
+                                                    synchronizer_tag);
     provider.set_data<string> ("uid", "remote:%s".printf (source_scope_id));
     provider.set_data<string> ("scope-id", source_scope_id);
     var sync = _scopes.get_synchronizer (channel_id);
@@ -1909,6 +1920,28 @@
       throw new ScopeError.REQUEST_FAILED ("Merging not implemented");
     }
 
+    // are we trying to re-push results for the same scope? if so, remove
+    // the previous pushed results first
+    foreach (var pushed_model in channel.get_pushed_models (search_string))
+    {
+      if (pushed_model.get_data<string> ("scope-id") == source_scope_id)
+      {
+        var tag = pushed_model.get_data<Dee.ModelTag<Dee.ModelIter>> ("synchronizer-tag");
+        var iter = pushed_model.get_first_iter ();
+        var end_iter = pushed_model.get_last_iter ();
+        while (iter != end_iter)
+        {
+          var target_iter = tag[pushed_model, iter];
+          if (target_iter != null)
+          {
+            sync.receiver.remove (target_iter);
+            tag.clear (pushed_model, iter);
+          }
+          iter = pushed_model.next (iter);
+        }
+      }
+    }
+
     channel.register_pushed_model (search_string, provider);
 
     push_results_internal (sync, provider);
@@ -1929,21 +1962,23 @@
   private void push_results_internal (ResultsSynchronizer synchronizer,
                                       Dee.SerializableModel provider)
   {
+    var tag = provider.get_data<Dee.ModelTag<Dee.ModelIter>> ("synchronizer-tag");
     var iter = provider.get_first_iter ();
     var end = provider.get_last_iter ();
     /* everything is prepared now, we can push results directly
      * into the synchronizer */
+    unowned string source_scope_id = provider.get_data<string> ("scope-id");
     while (iter != end)
     {
-      unowned string source_scope_id = provider.get_data<string> ("scope-id");
       unowned Variant[] row_buf = synchronizer.prepare_row_buf (provider, iter);
-      synchronizer.merge_strategy.merge_result (source_scope_id,
-                                                synchronizer.receiver, row_buf);
-      // inform the synchronizer (or rather its listeners) about the changes
-      synchronizer.transaction_complete (provider, source_scope_id);
+      var target_iter = synchronizer.merge_strategy.merge_result (
+        source_scope_id, synchronizer.receiver, row_buf);
+      tag[provider, iter] = target_iter;
 
       iter = provider.next (iter);
     }
+    // inform the synchronizer (or rather its listeners) about the changes
+    synchronizer.transaction_complete (provider, source_scope_id);
   }
 
   /* DBus properties */
 
=== modified file 'src/unity-scope-channel.vala'
--- src/unity-scope-channel.vala	2013-05-01 20:56:04 +0000
+++ src/unity-scope-channel.vala	2013-05-03 22:43:33 +0000
@@ -223,6 +223,15 @@
     pushed_models.append (model);
   }
 
+  public void check_pushed_models (string search_string)
+  {
+    if (last_push_search_string != search_string)
+    {
+      // invalidate pushed models
+      pushed_models = new GLib.List<Dee.SerializableModel> ();
+    }
+  }
+
   public GLib.List<unowned Dee.SerializableModel> get_pushed_models (string search_string)
   {
     if (last_push_search_string != search_string)