From 407db1693882f6f9ce8b3d6d192fba7217fb7aca Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Tue, 21 Apr 2015 16:00:48 -0400
Subject: [PATCH] Implement per-type set methods in terms of set_many methods

---
 lms/djangoapps/courseware/model_data.py | 47 +++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/lms/djangoapps/courseware/model_data.py b/lms/djangoapps/courseware/model_data.py
index 8ea7f5e724..c1380be801 100644
--- a/lms/djangoapps/courseware/model_data.py
+++ b/lms/djangoapps/courseware/model_data.py
@@ -217,14 +217,26 @@ class DjangoOrmFieldCache(object):
             kvs_key (`DjangoKeyValueStore.Key`): The field value to delete
             value: The field value to store
         """
-        cache_key = self._cache_key_for_kvs_key(kvs_key)
-        field_object = self._cache.get(cache_key)
+        self.set_many({kvs_key: value})
 
-        if field_object is None:
-            self._cache[cache_key] = field_object = self._create_object(kvs_key)
+    @contract(kv_dict="dict(DjangoKeyValueStore_Key: *)")
+    def set_many(self, kv_dict):
+        """
+        Set the specified fields to the supplied values.
 
-        self._set_field_value(field_object, kvs_key, value)
-        field_object.save()
+        Arguments:
+            kv_dict (dict): A dictionary mapping :class:`~DjangoKeyValueStore.Key`
+                objects to values to set.
+        """
+        for kvs_key, value in sorted(kv_dict.items()):
+            cache_key = self._cache_key_for_kvs_key(kvs_key)
+            field_object = self._cache.get(cache_key)
+
+            if field_object is None:
+                self._cache[cache_key] = field_object = self._create_object(kvs_key)
+
+            self._set_field_value(field_object, kvs_key, value)
+            field_object.save()
 
     @contract(kvs_key=DjangoKeyValueStore.Key)
     def delete(self, kvs_key):
@@ -375,6 +387,29 @@ class UserStateCache(DjangoOrmFieldCache):
         """
         return key.block_scope_id
 
+    @contract(kv_dict="dict(DjangoKeyValueStore_Key: *)")
+    def set_many(self, kv_dict):
+        """
+        Set the specified fields to the supplied values.
+
+        Arguments:
+            kv_dict (dict): A dictionary mapping :class:`~DjangoKeyValueStore.Key`
+                objects to values to set.
+        """
+        dirty_field_objects = set()
+        for kvs_key, value in kv_dict.items():
+            cache_key = self._cache_key_for_kvs_key(kvs_key)
+            field_object = self._cache.get(cache_key)
+
+            if field_object is None:
+                self._cache[cache_key] = field_object = self._create_object(kvs_key)
+
+            self._set_field_value(field_object, kvs_key, value)
+            dirty_field_objects.add(field_object)
+
+        for field_object in sorted(dirty_field_objects):
+            field_object.save()
+
     @contract(kvs_key=DjangoKeyValueStore.Key)
     def delete(self, kvs_key):
         """