Merge pull request #66 from ParsePlatform/richardross.mutablecontainers.kill

Remove mutable containers functionality.

Author: richardjrossiii

Parse/Internal/ParseJSONCacheItem.cs

@@ -109,7 +109,6 @@
     <Compile Include="Internal\ParseDeleteOperation.cs" />
     <Compile Include="Internal\ParseFieldOperations.cs" />
     <Compile Include="Internal\ParseIncrementOperation.cs" />
-    <Compile Include="Internal\ParseJSONCacheItem.cs" />
     <Compile Include="Internal\ParseRelationOperation.cs" />
     <Compile Include="Internal\ParseRemoveOperation.cs" />
     <Compile Include="Internal\ParseSetOperation.cs" />

Parse/Parse.Android.csproj

@@ -98,7 +98,6 @@
     <Compile Include="Internal\ParseEncoder.cs" />
     <Compile Include="Internal\ParseFieldOperations.cs" />
     <Compile Include="Internal\ParseIncrementOperation.cs" />
-    <Compile Include="Internal\ParseJSONCacheItem.cs" />
     <Compile Include="Internal\ParseObjectCoder.cs" />
     <Compile Include="Internal\ParseRelationOperation.cs" />
     <Compile Include="Internal\ParseRemoveOperation.cs" />

Parse/Parse.Unity.csproj

@@ -91,7 +91,6 @@
     <Compile Include="ParseFieldNameAttribute.cs" />
     <Compile Include="Internal\ParseFieldOperations.cs" />
     <Compile Include="Internal\ParseIncrementOperation.cs" />
-    <Compile Include="Internal\ParseJSONCacheItem.cs" />
     <Compile Include="Internal\ParseRelationOperation.cs" />
     <Compile Include="Internal\ParseRemoveOperation.cs" />
     <Compile Include="Internal\ParseSetOperation.cs" />
@@ -142,9 +141,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Internal\Config\" />
-    <Folder Include="Internal\Push\State\" />
-    <Folder Include="Internal\Push\Coder\" />
-  </ItemGroup>
 </Project>

Parse/Parse.csproj

@@ -144,7 +144,6 @@
     <Compile Include="Internal\ParseEncoder.cs" />
     <Compile Include="Internal\ParseFieldOperations.cs" />
     <Compile Include="Internal\ParseIncrementOperation.cs" />
-    <Compile Include="Internal\ParseJSONCacheItem.cs" />
     <Compile Include="Internal\ParseObjectCoder.cs" />
     <Compile Include="Internal\ParseRelationOperation.cs" />
     <Compile Include="Internal\ParseRemoveOperation.cs" />

Parse/Parse.iOS.csproj

@@ -105,13 +105,6 @@ internal static Guid? InstallationId {
       }
     }
 
-    internal static bool IsContainerObject(object value) {
-      return value is ParseACL ||
-          value is ParseGeoPoint ||
-          ConvertTo<IDictionary<string, object>>(value) is IDictionary<string, object> ||
-          ConvertTo<IList<object>>(value) is IList<object>;
-    }
-
     /// <summary>
     /// Performs a ConvertTo, but returns null if the object can't be
     /// converted to that type.

Parse/ParseClient.cs

@@ -41,8 +41,6 @@ private static readonly IDictionary<Type, IDictionary<string, string>>
     private readonly LinkedList<IDictionary<string, IParseFieldOperation>> operationSetQueue =
         new LinkedList<IDictionary<string, IParseFieldOperation>>();
     private readonly IDictionary<string, object> estimatedData = new Dictionary<string, object>();
-    private readonly IDictionary<object, ParseJSONCacheItem> hashedObjects =
-        new Dictionary<object, ParseJSONCacheItem>();
 
     private static readonly ThreadLocal<bool> isCreatingPointer = new ThreadLocal<bool>(() => false);
 
@@ -430,10 +428,7 @@ internal virtual void MergeFromServer(IObjectState serverState) {
 
         foreach (var pair in serverState) {
           var value = pair.Value;
-          if (ParseClient.IsContainerObject(value)) {
-            // Fill in the cache.
-            AddToHashedObjects(value);
-          } else if (value is ParseObject) {
+          if (value is ParseObject) {
             // Resolve fetched object.
             var parseObject = value as ParseObject;
             if (fetchedObject.ContainsKey(parseObject.ObjectId)) {
@@ -485,58 +480,6 @@ private bool HasDirtyChildren {
       }
     }
 
-    /// <summary>
-    /// Updates the JSON cache value for the given object.
-    /// </summary>
-    private void CheckpointMutableContainer(object obj) {
-      lock (mutex) {
-        if (ParseClient.IsContainerObject(obj)) {
-          hashedObjects[obj] = new ParseJSONCacheItem(obj);
-        }
-      }
-    }
-
-    /// <summary>
-    /// Inspects to see if a given mutable container owned by this object has
-    /// been mutated, and treats any mutation as a new "set" operation.
-    /// </summary>
-    private void CheckForChangesToMutableContainer(string key, object obj) {
-      lock (mutex) {
-        if (ParseClient.IsContainerObject(obj)) {
-          ParseJSONCacheItem oldCacheItem;
-          hashedObjects.TryGetValue(obj, out oldCacheItem);
-          if (oldCacheItem == null) {
-            throw new ArgumentException("ParseObjects contains container item that isn't cached.");
-          }
-          var newCacheItem = new ParseJSONCacheItem(obj);
-          if (!oldCacheItem.Equals(newCacheItem)) {
-            // A mutable container changed out from under us. Treat it as a set operation.
-            PerformOperation(key, new ParseSetOperation(obj));
-          }
-        } else {
-          if (obj != null) {
-            hashedObjects.Remove(obj);
-          }
-        }
-      }
-    }
-
-    /// <summary>
-    /// Inspects to see if any mutable container owned by this object has been mutated, and
-    /// treats any mutation as a new 'Set' operation.
-    /// </summary>
-    internal void CheckForChangesToMutableContainers() {
-      lock (mutex) {
-        foreach (var pair in new Dictionary<string, object>(estimatedData)) {
-          CheckForChangesToMutableContainer(pair.Key, pair.Value);
-        }
-        var toRemove = hashedObjects.Keys.Except(estimatedData.Values).ToArray();
-        foreach (var key in toRemove) {
-          hashedObjects.Remove(key);
-        }
-      }
-    }
-
     /// <summary>
     /// Flattens dictionaries and lists into a single enumerable of all contained objects
     /// that can then be queried over.
@@ -1149,10 +1092,6 @@ internal void RebuildEstimatedData() {
         foreach (var operations in operationSetQueue) {
           ApplyOperations(operations, estimatedData);
         }
-        hashedObjects.Clear();
-        foreach (var pair in estimatedData) {
-          CheckpointMutableContainer(pair.Value);
-        }
         // We've just applied a bunch of operations to estimatedData which
         // may have changed all of its keys. Notify of all keys and properties
         // mapped to keys being changed.
@@ -1184,7 +1123,6 @@ internal void PerformOperation(string key, IParseFieldOperation operation) {
           OnPropertyChanged("IsDirty");
         }
 
-        CheckpointMutableContainer(newValue);
         OnFieldsChanged(new[] { key });
       }
     }
@@ -1493,12 +1431,6 @@ public ICollection<string> Keys {
       }
     }
 
-    internal void AddToHashedObjects(object obj) {
-      lock (mutex) {
-        hashedObjects[obj] = new ParseJSONCacheItem(obj);
-      }
-    }
-
     /// <summary>
     /// Gets or sets the ParseACL governing this object.
     /// </summary>
@@ -1588,7 +1520,6 @@ public bool IsKeyDirty(string key) {
 
     private bool CheckIsDirty(bool considerChildren) {
       lock (mutex) {
-        CheckForChangesToMutableContainers();
         return (dirty || CurrentOperations.Count > 0 || (considerChildren && HasDirtyChildren));
       }
     }

Parse/ParseObject.cs

@@ -558,6 +558,7 @@ internal Task LinkWithAsync(string authType, IDictionary<string, object> data, C
           authData = AuthData = new Dictionary<string, IDictionary<string, object>>();
         }
         authData[authType] = data;
+        AuthData = authData;
         return SaveAsync(cancellationToken);
       }, cancellationToken);
     }