Merge pull request #698 from splitio/FME-4396-Pausing-GeneralInfo

[FME-4396] - Pausing - General info

Author: MartinCardozo-SDK

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 {
+        return generalInfoDao.longValue(info: .segmentsInUse) ?? 0
+    }
+
+    func setSegmentsInUse(_ count: Int64) {
+        generalInfoDao.update(info: .segmentsInUse, longValue: count)
+    }
 }

Split/Storage/Splits/PersistentSplitsStorage.swift

@@ -12,10 +12,12 @@ protocol PersistentSplitsStorage {
     func update(splitChange: ProcessedSplitChange)
     func update(split: Split)
     func update(bySetsFilter: SplitFilter?)
+    func update(segmentsInUse: Int64)
     func getBySetsFilter() -> SplitFilter?
     func getSplitsSnapshot() -> SplitsSnapshot
     func getChangeNumber() -> Int64
     func getUpdateTimestamp() -> Int64
+    func getSegmentsInUse() -> Int64
     func getAll() -> [Split]
     func delete(splitNames: [String])
     func clear()
@@ -49,6 +51,10 @@ class DefaultPersistentSplitsStorage: PersistentSplitsStorage {
     func update(flagsSpec: String) {
         generalInfoDao.update(info: .flagsSpec, stringValue: flagsSpec)
     }
+    
+    func update(segmentsInUse: Int64) {
+        generalInfoDao.update(info: .segmentsInUse, longValue: segmentsInUse)
+    }
 
     func getFilterQueryString() -> String {
         return generalInfoDao.stringValue(info: .splitsFilterQueryString) ?? ""
@@ -57,6 +63,10 @@ class DefaultPersistentSplitsStorage: PersistentSplitsStorage {
     func getFlagsSpec() -> String {
         return generalInfoDao.stringValue(info: .flagsSpec) ?? ""
     }
+    
+    func getSegmentsInUse() -> Int64 {
+        generalInfoDao.longValue(info: .segmentsInUse) ?? 0
+    }
 
     func update(bySetsFilter filter: SplitFilter?) {
         guard let filter = filter else {

Split/Storage/split_cache.xcdatamodeld/split_cache_v6.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="23G93" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23788.4" systemVersion="24F74" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Attribute" representedClassName="AttributeEntity" syncable="YES">
         <attribute name="attributes" attributeType="String"/>
         <attribute name="updatedAt" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>

SplitTests/Fake/Storage/GeneralInfoStorageMock.swift

@@ -2,13 +2,15 @@ import Foundation
 @testable import Split
 
 class GeneralInfoStorageMock: GeneralInfoStorage {
+    
     let queue = DispatchQueue(label: "test", target: .global())
     var updateTimestamp: Int64 = 0
     var rolloutCacheLastClearTimestamp: Int64 = 0
     var splitsFilterQueryString: String = ""
     var flagsSpec = ""
     var ruleBasedSegmentsChangeNumber: Int64 = -1
     var lastProxyUpdateTimestamp: Int64 = 0
+    var segmentsInUse: Int64 = 0
 
     func getUpdateTimestamp() -> Int64 {
         return updateTimestamp
@@ -57,4 +59,12 @@ class GeneralInfoStorageMock: GeneralInfoStorage {
     func setLastProxyUpdateTimestamp(_ timestamp: Int64) {
         lastProxyUpdateTimestamp = timestamp
     }
+    
+    func getSegmentsInUse() -> Int64 {
+        segmentsInUse
+    }
+    
+    func setSegmentsInUse(_ count: Int64) {
+        segmentsInUse = count
+    }
 }

SplitTests/Fake/Storage/PersistentSplitsStorageStub.swift

@@ -86,4 +86,13 @@ class PersistentSplitsStorageStub: PersistentSplitsStorage {
         getBySetsFilterCalled = false
         return nil
     }
+    
+    var segmentsInUse: Int64 = 0
+    func update(segmentsInUse: Int64) {
+        self.segmentsInUse = segmentsInUse
+    }
+    
+    func getSegmentsInUse() -> Int64 {
+        segmentsInUse
+    }
 }

SplitTests/Storage/GeneralInfoDaoTests.swift

@@ -54,6 +54,15 @@ class GeneralInfoDaoTest: XCTestCase {
         XCTAssertEqual(1, v1)
         XCTAssertEqual(2, v2)
     }
+    
+    func testCreateUpdateSegmentsInUse() {
+        let data: Int64 = 13
+        
+        generalInfoDao.update(info: .segmentsInUse, longValue: data)
+        let segmentsInUse = generalInfoDao.longValue(info: .segmentsInUse)
+        
+        XCTAssertEqual(data, segmentsInUse)
+    }
 
     override func tearDown() {
     }