From 6ff71980aa0752e87ea71584f427f56cc528ed79 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 27 Aug 2018 10:49:13 -0400 Subject: [PATCH] SPARK-1634 - rx Cache() does not handle unsubscribe correctly. --- src/client/spark_api/api/Update.cs | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 385274886..83a49aeff 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -51,6 +51,7 @@ namespace bts.api.core { return $"added [{added}] changed [{changed}] removed [{removed}]"; } #endif + } public class Update where TKey : IEquatable { @@ -115,6 +116,15 @@ namespace bts.api.core { public IEnumerable removed { get; } public TKey key(T t) { return _key(t); } + +#if DEBUG + public override string ToString() { + var a = string.Join(", ", added.Select(_key)); + var c = string.Join(", ", changed.Select(_key)); + var r = string.Join(", ", removed.Select(_key)); + return $"added [{a}] changed [{c}] removed [{r}]"; + } +#endif } struct RowEqualityComparer : IEqualityComparer, IEqualityComparer<(T,T)> @@ -235,6 +245,7 @@ namespace bts.api.core { object guard = new object(); Update cache = null; bool finished = false; + Log.Api.info($"Naggle- {typeof(T).Name} Subscribed {observer.GetHashCode()}"); var d1 = source.Subscribe(update => { // subscribe to the source, merge updates (Quickbus thread) @@ -252,15 +263,20 @@ namespace bts.api.core { cache = null; } if (update != null) { - Log.Api.diag($"Naggle- {update}"); + Log.Api.info($"Naggle- {typeof(T).Name} {update}"); observer.OnNext(update); } if (finished) { + Log.Api.info($"Naggle - Finished {typeof(T).Name} {observer.GetHashCode()}"); observer.OnCompleted(); } }); - return new CompositeDisposable(d1, d2); + return Disposable.Create(() => { + Log.Api.info($"Naggle- Disposed {observer.GetHashCode()}"); + d1.Dispose(); + d2.Dispose(); + }); }); } @@ -270,10 +286,12 @@ namespace bts.api.core { bool first = true; return inner.Subscribe(upd => { if (first) { + Log.Api.info($"Cache- {typeof(T).Name} New"); o.OnNext(upd.as_snapshot()); first = false; } else { + Log.Api.info($"cache- {typeof(T).Name} Update"); o.OnNext(upd); } });