From ccf217bade2aa198f44759e3fbcbb5d6372eadec Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 18 Jun 2019 11:21:30 -0400
Subject: [PATCH] Migrate more key-value stores.

---
 Scripts/sds_codegen/sds_codegen.sh                  |  2 +-
 Signal/src/util/Backup/OWSBackup.m                  | 13 +++++++------
 .../Database/SDSKeyValueStore+Deprecated.swift      |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Scripts/sds_codegen/sds_codegen.sh b/Scripts/sds_codegen/sds_codegen.sh
index cba991bd22..7743d7b7ea 100755
--- a/Scripts/sds_codegen/sds_codegen.sh
+++ b/Scripts/sds_codegen/sds_codegen.sh
@@ -43,7 +43,7 @@ $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path Signal --swift-bridg
 # We generate Swift extensions to handle serialization, etc. for models.
 RECORD_TYPE_SWIFT="SignalServiceKit/src/Storage/Database/SDSRecordType.swift"
 RECORD_TYPE_JSON="$REPO_ROOT/Scripts/sds_codegen/sds_config/sds_record_type_map.json"
-CONFIG_JSON="$REPO_ROOT/Scripts/sds_codegen/sds-config/sds-config.json"
+CONFIG_JSON="$REPO_ROOT/Scripts/sds_codegen/sds_config/sds-config.json"
 $REPO_ROOT/Scripts/sds_codegen/sds_generate.py  --src-path SignalServiceKit/  --search-path . --record-type-swift-path $RECORD_TYPE_SWIFT  --record-type-json-path $RECORD_TYPE_JSON --config-json-path $CONFIG_JSON
 $REPO_ROOT/Scripts/sds_codegen/sds_generate.py  --src-path SignalShareExtension/  --search-path . --record-type-swift-path $RECORD_TYPE_SWIFT  --record-type-json-path $RECORD_TYPE_JSON --config-json-path $CONFIG_JSON
 $REPO_ROOT/Scripts/sds_codegen/sds_generate.py  --src-path SignalMessaging/  --search-path . --record-type-swift-path $RECORD_TYPE_SWIFT  --record-type-json-path $RECORD_TYPE_JSON --config-json-path $CONFIG_JSON
diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m
index 4a1423b1ae..4bfe6e64cc 100644
--- a/Signal/src/util/Backup/OWSBackup.m
+++ b/Signal/src/util/Backup/OWSBackup.m
@@ -901,20 +901,21 @@ NSError *OWSBackupErrorWithDescription(NSString *description)
 {
     OWSLogInfo(@"");
 
-    [dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        [transaction enumerateKeysAndObjectsInCollection:[OWSBackupFragment collection]
-                                              usingBlock:^(NSString *key, OWSBackupFragment *fragment, BOOL *stop) {
+    [self.databaseStorage readWithBlock:^(SDSAnyReadTransaction *transaction) {
+        [OWSBackupFragment anyVisitAllWithTransaction:transaction
+                                              visitor:^BOOL(OWSBackupFragment *fragment) {
                                                   OWSLogVerbose(@"fragment: %@, %@, %lu, %@, %@, %@, %@",
-                                                      key,
+                                                      fragment.uniqueId,
                                                       fragment.recordName,
                                                       (unsigned long)fragment.encryptionKey.length,
                                                       fragment.relativeFilePath,
                                                       fragment.attachmentId,
                                                       fragment.downloadFilePath,
                                                       fragment.uncompressedDataLength);
+                                                  return YES;
                                               }];
-        OWSLogVerbose(@"Number of fragments: %lu",
-            (unsigned long)[transaction numberOfKeysInCollection:[OWSBackupFragment collection]]);
+        OWSLogVerbose(
+            @"Number of fragments: %lu", (unsigned long)[OWSBackupFragment anyCountWithTransaction:transaction]);
     }];
 }
 
diff --git a/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+Deprecated.swift b/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+Deprecated.swift
index 58f234bcbc..31d1041b20 100644
--- a/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+Deprecated.swift
+++ b/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+Deprecated.swift
@@ -162,7 +162,7 @@ public extension SDSKeyValueStore {
     }
 
     @objc
-    public func removeValue(forKey: String) {
+    func removeValue(forKey key: String) {
         return databaseStorage.write { (transaction) in
             return self.removeValue(forKey: key, transaction: transaction)
         }