[FME-4401] - Pausing - E2E Test 3

Split.xcodeproj/project.pbxproj

@@ -353,6 +353,9 @@
 		59FB7C35220329B900ECC96A /* SplitFactoryBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FB7C34220329B900ECC96A /* SplitFactoryBuilderTests.swift */; };
 		59FB7C3C2203795F00ECC96A /* LocalhostSplitsParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */; };
 		59FB7C3E22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */; };
+		5B279CF92E340FC600B73A36 /* splitschanges_no_segments.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B279CF82E340FB900B73A36 /* splitschanges_no_segments.json */; };
+		5B343EAD2E26E93B006BEBE7 /* StorageHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B343EAC2E26E937006BEBE7 /* StorageHelper.swift */; };
+		5B343EAE2E26E93B006BEBE7 /* StorageHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B343EAC2E26E937006BEBE7 /* StorageHelper.swift */; };
 		5B48D8172DEA2CED00351925 /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; };
 		5B91B8392DDE4A3B000510F0 /* SplitDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */; };
 		5BF52DF72DE0B60700FEDAFE /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; };
@@ -1557,6 +1560,8 @@
 		59FB7C34220329B900ECC96A /* SplitFactoryBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitFactoryBuilderTests.swift; sourceTree = "<group>"; };
 		59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalhostSplitsParser.swift; sourceTree = "<group>"; };
 		59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceDelimitedLocalhostSplitsParser.swift; sourceTree = "<group>"; };
+		5B279CF82E340FB900B73A36 /* splitschanges_no_segments.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = splitschanges_no_segments.json; sourceTree = "<group>"; };
+		5B343EAC2E26E937006BEBE7 /* StorageHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageHelper.swift; sourceTree = "<group>"; };
 		5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitDTOTests.swift; sourceTree = "<group>"; };
 		5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcher.swift; sourceTree = "<group>"; };
 		5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcherTest.swift; sourceTree = "<group>"; };
@@ -2620,6 +2625,7 @@
 				5905D4DD2559C950006DA3B1 /* MySegments */,
 				3B6DEF0920EA6AE40067435E /* DefaultFileStorage.swift */,
 				5912D1462194715500BC698C /* FileStorage.swift */,
+				5B343EAC2E26E937006BEBE7 /* StorageHelper.swift */,
 				59E6A38825557C8D005DE642 /* split_cache.xcdatamodeld */,
 				5905D4D72555FE74006DA3B1 /* SplitDatabase.swift */,
 				955892AA25C187EA00F67FBA /* CoreDataContextBuilder.swift */,
@@ -2939,6 +2945,7 @@
 		592C6ADB211CBB86002D120C /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				5B279CF82E340FB900B73A36 /* splitschanges_no_segments.json */,
 				C5A7D5562DDBD4280081D190 /* split_changes_rbs.json */,
 				95F7BBD32C1A273900C5F2E4 /* Cert */,
 				C5977C052BF273A3003E293A /* between_semver.csv */,
@@ -3987,6 +3994,7 @@
 				95F7BBDE2C1A27C200C5F2E4 /* rsa_3072_public_01.pem in Resources */,
 				C5BD1E522D130FB6008EF198 /* splitchanges_toggle.json in Resources */,
 				95F7BBDA2C1A27C200C5F2E4 /* rsa_2048_public_01.pem in Resources */,
+				5B279CF92E340FC600B73A36 /* splitschanges_no_segments.json in Resources */,
 				592C6AED211CBBB0002D120C /* splitchanges_2.json in Resources */,
 				950F72FF292E8D6C008A0040 /* SplitiOSFull.xctestplan in Resources */,
 				59FB7C2A2202463000ECC96A /* localhost_1.splits in Resources */,
@@ -4241,6 +4249,7 @@
 				59F4AA9B24FE93E300A1C69A /* NotificationManagerKeeper.swift in Sources */,
 				95C1600D27D28CF4008562E3 /* PersistentAttributesStorage.swift in Sources */,
 				95726075262F548500350CCA /* SplitBgSynchronizer.swift in Sources */,
+				5B343EAE2E26E93B006BEBE7 /* StorageHelper.swift in Sources */,
 				95C1600B27D28CB8008562E3 /* OneKeyPersistentAttributesStorage.swift in Sources */,
 				5BF52DF72DE0B60700FEDAFE /* PrerequisitesMatcher.swift in Sources */,
 				9519A91127D6935700278AEC /* ByKeyAttributesStorage.swift in Sources */,
@@ -4802,6 +4811,7 @@
 				958FD8A12C51318B00E5609B /* PublicKeyHeaders.swift in Sources */,
 				956A7E17297043130080D53C /* ImpressionsStorage.swift in Sources */,
 				95B02DCD28D0BDE20030EC8B /* split_cache.xcdatamodeld in Sources */,
+				5B343EAD2E26E93B006BEBE7 /* StorageHelper.swift in Sources */,
 				95F0569129B63C61009F5A68 /* Cipher.swift in Sources */,
 				95B02CAB28D0BDC10030EC8B /* Yaml.swift in Sources */,
 				95B02CAC28D0BDC10030EC8B /* YAMLOperators.swift in Sources */,

Split/Api/SplitDatabaseHelper.swift

@@ -111,9 +111,11 @@ struct SplitDatabaseHelper {
 
         let persistentEventsStorage = openPersistentEventsStorage(database: splitDatabase)
         let eventsStorage = openEventsStorage(persistentStorage: persistentEventsStorage)
+
+        let generalInfoStorage = openGeneralInfoStorage(database: splitDatabase)
 
-        let mySegmentsStorage = openMySegmentsStorage(database: splitDatabase)
-        let myLargeSegmentsStorage = openMyLargeSegmentsStorage(database: splitDatabase)
+        let mySegmentsStorage = openMySegmentsStorage(database: splitDatabase, generalInfoStorage: generalInfoStorage)
+        let myLargeSegmentsStorage = openMyLargeSegmentsStorage(database: splitDatabase, generalInfoStorage: generalInfoStorage)
         let attributesStorage = openAttributesStorage(database: splitDatabase,
                                                       splitClientConfig: splitClientConfig)
 
@@ -125,7 +127,6 @@ struct SplitDatabaseHelper {
         let hashedImpressionsStorage = DefaultHashedImpressionsStorage(
             cache: LRUCache(capacity: ServiceConstants.lastSeenImpressionCachSize),
             persistentStorage: persistentHashedImpressionsStorage)
-        let generalInfoStorage = openGeneralInfoStorage(database: splitDatabase)
 
         let persistentRuleBasedSegmentsStorage = DefaultPersistentRuleBasedSegmentsStorage(
             database: splitDatabase,
@@ -187,14 +188,14 @@ struct SplitDatabaseHelper {
         return DefaultPersistentMyLargeSegmentsStorage(database: database)
     }
 
-    static func openMySegmentsStorage(database: SplitDatabase) -> MySegmentsStorage {
+    static func openMySegmentsStorage(database: SplitDatabase, generalInfoStorage: GeneralInfoStorage) -> MySegmentsStorage {
         let persistentMySegmentsStorage = openPersistentMySegmentsStorage(database: database)
-        return DefaultMySegmentsStorage(persistentMySegmentsStorage: persistentMySegmentsStorage)
+        return DefaultMySegmentsStorage(persistentMySegmentsStorage: persistentMySegmentsStorage, generalInfoStorage: generalInfoStorage)
     }
 
-    static func openMyLargeSegmentsStorage(database: SplitDatabase) -> MySegmentsStorage {
+    static func openMyLargeSegmentsStorage(database: SplitDatabase, generalInfoStorage: GeneralInfoStorage) -> MySegmentsStorage {
         let persistentMyLargeSegmentsStorage = openPersistentMyLargeSegmentsStorage(database: database)
-        return MyLargeSegmentsStorage(persistentStorage: persistentMyLargeSegmentsStorage)
+        return MyLargeSegmentsStorage(persistentStorage: persistentMyLargeSegmentsStorage, generalInfoStorage: generalInfoStorage)
     }
 
     static func openPersistentAttributesStorage(database: SplitDatabase) -> PersistentAttributesStorage {

Split/Events/SplitEventsManager.swift

@@ -102,7 +102,6 @@ class DefaultSplitEventsManager: SplitEventsManager {
                 self.eventsQueue.stop()
                 self.eventsQueue.stop()
             }
-
         }
     }
 

Split/FetcherEngine/Refresh/EmptyMySegmentsStorage.swift

@@ -47,4 +47,8 @@ class EmptyMySegmentsStorage: MySegmentsStorage {
 
     func clear() {
     }
+
+    func isUsingSegments() -> Bool {
+        false
+    }
 }

Split/FetcherEngine/Refresh/PeriodicSyncWorker.swift

@@ -213,8 +213,9 @@ class PeriodicMySegmentsSyncWorker: BasePeriodicSyncWorker {
     }
 
     override func fetchFromRemote() {
-        // Polling should be done once sdk ready is fired in initial sync
-        if !isSdkReadyFired() {
+        // Polling should be done once sdk ready is fired in initial sync, and if there are Segments in use.
+        // Both storages read the same value so we can use any of them (using myLargeSegmentsStorage).
+        if !isSdkReadyFired() || !(myLargeSegmentsStorage.isUsingSegments()) {
             return
         }
 

Split/Localhost/LocalhostSplitsStorage.swift

@@ -14,6 +14,7 @@ class LocalhostSplitsStorage: SplitsStorage {
     var updateTimestamp: Int64 = 1
     var splitsFilterQueryString: String = ""
     var flagsSpec: String = ""
+    internal var segmentsInUse: Int64 = 0
 
     private let inMemorySplits = ConcurrentDictionary<String, Split>()
 
@@ -75,4 +76,8 @@ class LocalhostSplitsStorage: SplitsStorage {
     func destroy() {
         inMemorySplits.removeAll()
     }
+
+    func forceParsing() {
+
+    }
 }

Split/Network/Sync/FeatureFlagsSynchronizer.swift

@@ -78,13 +78,26 @@ class DefaultFeatureFlagsSynchronizer: FeatureFlagsSynchronizer {
             return
         }
 
-        let splitsStorage = self.storageContainer.splitsStorage
+        let splitsStorage = storageContainer.splitsStorage
         let ruleBasedSegmentsStorage = storageContainer.ruleBasedSegmentsStorage
-        DispatchQueue.general.async {
+
+        DispatchQueue.general.async { [weak self] in
+            guard let self = self else { return }
+
             let start = Date.nowMillis()
             self.filterSplitsInCache()
+
+            // Part of /memberships hits optimization
+            if self.storageContainer.generalInfoStorage.getSegmentsInUse() == nil {
+                splitsStorage.forceParsing()
+                ruleBasedSegmentsStorage.forceParsing()
+            }
+
+            // Load local
             splitsStorage.loadLocal()
             ruleBasedSegmentsStorage.loadLocal()
+
+            // Events & Logs
             if splitsStorage.getAll().count > 0 {
                 self.splitEventsManager.notifyInternalEvent(.splitsLoadedFromCache)
             }

Split/Network/Sync/MySegmentsSynchronizer.swift

@@ -19,6 +19,7 @@ protocol MySegmentsSynchronizer {
     func destroy()
 }
 
+// One instance per client
 class DefaultMySegmentsSynchronizer: MySegmentsSynchronizer {
 
     private let mySegmentsStorage: ByKeyMySegmentsStorage
@@ -98,6 +99,7 @@ class DefaultMySegmentsSynchronizer: MySegmentsSynchronizer {
         mySegmentsSyncWorker.start()
     }
 
+    // Used for streaming
     func forceMySegmentsSync(changeNumbers: SegmentsChangeNumber, delay: Int64) {
         if isDestroyed.value {
             return
@@ -149,12 +151,6 @@ class DefaultMySegmentsSynchronizer: MySegmentsSynchronizer {
             return
         }
 
-        syncChangeNumbers?.mutate {
-            if $0.msChangeNumber <= changeNumbers.msChangeNumber,
-               changeNumbers.mlsChangeNumber <= changeNumbers.mlsChangeNumber {
-            }
-        }
-
         if timerManager?.isScheduled(timer: .syncSegments) ?? false {
             return
         }

Split/Storage/GeneralInfo/GeneralInfoDao.swift

@@ -18,6 +18,7 @@ enum GeneralInfo: String {
     case rolloutCacheLastClearTimestamp = "rolloutCacheLastClearTimestamp"
     case ruleBasedSegmentsChangeNumber = "ruleBasedSegmentsChangeNumber"
     case lastProxyUpdateTimestamp = "lastProxyCheckTimestamp"
+    case segmentsInUse = "segmentsInUse"
 }
 
 protocol GeneralInfoDao {

Split/Storage/GeneralInfo/GeneralInfoStorage.swift

@@ -17,6 +17,10 @@ protocol GeneralInfoStorage {
     // Proxy handling methods
     func getLastProxyUpdateTimestamp() -> Int64
     func setLastProxyUpdateTimestamp(_ timestamp: Int64)
+
+    // Segments in use (for /memberships optimization)
+    func getSegmentsInUse() -> Int64?
+    func setSegmentsInUse(_ count: Int64)
 }
 
 class DefaultGeneralInfoStorage: GeneralInfoStorage {
@@ -78,4 +82,12 @@ class DefaultGeneralInfoStorage: GeneralInfoStorage {
     func setLastProxyUpdateTimestamp(_ timestamp: Int64) {
         generalInfoDao.update(info: .lastProxyUpdateTimestamp, longValue: timestamp)
     }
+
+    func getSegmentsInUse() -> Int64? {
+        generalInfoDao.longValue(info: .segmentsInUse)
+    }
+
+    func setSegmentsInUse(_ count: Int64) {
+        generalInfoDao.update(info: .segmentsInUse, longValue: count)
+    }
 }

Split/Storage/MySegments/ByKeyMySegmentsStorage.swift

@@ -8,14 +8,15 @@
 
 import Foundation
 
-protocol ByKeyMySegmentsStorage {
+protocol ByKeyMySegmentsStorage: SegmentsChecker {
     var changeNumber: Int64 { get }
     func loadLocal()
     func getAll() -> Set<String>
     func set(_ change: SegmentChange)
     func getCount() -> Int
 }
 
+// One instance per client
 class DefaultByKeyMySegmentsStorage: ByKeyMySegmentsStorage {
 
     private let mySegmentsStorage: MySegmentsStorage
@@ -48,4 +49,9 @@ class DefaultByKeyMySegmentsStorage: ByKeyMySegmentsStorage {
     func getCount() -> Int {
         return mySegmentsStorage.getCount(forKey: userKey)
     }
+
+    // MARK: For Network Traffic Optimization
+    func isUsingSegments() -> Bool {
+        mySegmentsStorage.isUsingSegments()
+    }
 }

Split/Storage/MySegments/MyLargeSegmentsStorage.swift

@@ -15,13 +15,15 @@ class MyLargeSegmentsStorage: MySegmentsStorage {
     private let defaultChangeNumber = ServiceConstants.defaultSegmentsChangeNumber
     private let syncQueue: DispatchQueue
     private let syncQueueKey = DispatchSpecificKey<Void>()
+    private let generalInfoStorage: GeneralInfoStorage
 
     var keys: Set<String> {
         return inMemorySegments.keys
     }
 
-    init(persistentStorage: PersistentMySegmentsStorage) {
+    init(persistentStorage: PersistentMySegmentsStorage, generalInfoStorage: GeneralInfoStorage) {
         self.persistentStorage = persistentStorage
+        self.generalInfoStorage = generalInfoStorage
         self.syncQueue = DispatchQueue(label: "split-large-segments-storage")
         syncQueue.setSpecific(key: syncQueueKey, value: ())
     }
@@ -92,4 +94,9 @@ class MyLargeSegmentsStorage: MySegmentsStorage {
             return syncQueue.sync(execute: block)
         }
     }
+
+    // MARK: For Network Traffic Optimization
+    func isUsingSegments() -> Bool {
+        (generalInfoStorage.getSegmentsInUse() ?? 0) > 0
+    }
 }

Split/Storage/MySegments/MySegmentsStorage.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-protocol MySegmentsStorage: RolloutDefinitionsCache {
+protocol MySegmentsStorage: RolloutDefinitionsCache, SegmentsChecker {
     var keys: Set<String> { get }
     func loadLocal(forKey key: String)
     func changeNumber(forKey key: String) -> Int64?
@@ -21,17 +21,24 @@ protocol MySegmentsStorage: RolloutDefinitionsCache {
     func getCount() -> Int
 }
 
+protocol SegmentsChecker {
+    func isUsingSegments() -> Bool
+}
+
+// One instance per factory
 class DefaultMySegmentsStorage: MySegmentsStorage {
 
     private var inMemoryMySegments: SynchronizedDictionarySet<String, String> = SynchronizedDictionarySet()
     private let persistenStorage: PersistentMySegmentsStorage
+    private let generalInfoStorage: GeneralInfoStorage
 
     var keys: Set<String> {
         return inMemoryMySegments.keys
     }
 
-    init(persistentMySegmentsStorage: PersistentMySegmentsStorage) {
+    init(persistentMySegmentsStorage: PersistentMySegmentsStorage, generalInfoStorage: GeneralInfoStorage) {
         persistenStorage = persistentMySegmentsStorage
+        self.generalInfoStorage = generalInfoStorage
     }
 
     func loadLocal(forKey key: String) {
@@ -83,4 +90,9 @@ class DefaultMySegmentsStorage: MySegmentsStorage {
         inMemoryMySegments.removeAll()
         persistenStorage.deleteAll()
     }
+
+    // MARK: For Network Traffic Optimization
+    func isUsingSegments() -> Bool {
+        (generalInfoStorage.getSegmentsInUse() ?? 0) > 0
+    }
 }

Split/Storage/RuleBasedSegments/PersistentRuleBasedSegmentsStorage.swift

@@ -13,6 +13,9 @@ protocol PersistentRuleBasedSegmentsStorage {
     func update(toAdd: Set<RuleBasedSegment>, toRemove: Set<RuleBasedSegment>, changeNumber: Int64)
     func clear()
     func getChangeNumber() -> Int64
+
+    func getSegmentsInUse() -> Int64?
+    func setSegmentsInUse(_ segmentsInUse: Int64)
 }
 
 class DefaultPersistentRuleBasedSegmentsStorage: PersistentRuleBasedSegmentsStorage {
@@ -55,4 +58,12 @@ class DefaultPersistentRuleBasedSegmentsStorage: PersistentRuleBasedSegmentsStor
     func getChangeNumber() -> Int64 {
         return generalInfoStorage.getRuleBasedSegmentsChangeNumber()
     }
+
+    func getSegmentsInUse() -> Int64? {
+        generalInfoStorage.getSegmentsInUse()
+    }
+
+    func setSegmentsInUse(_ segmentsInUse: Int64) {
+        generalInfoStorage.setSegmentsInUse(segmentsInUse)
+    }
 }