Break the PR into smaller PRs

Author: EmilianoSanchez

src/storages/AbstractMySegmentsCacheSync.ts

@@ -49,10 +49,12 @@ export abstract class AbstractMySegmentsCacheSync implements ISegmentsCacheSync
    * For client-side synchronizer: it resets or updates the cache.
    */
   resetSegments(segmentsData: MySegmentsData | IMySegmentsResponse): boolean {
+    this.setChangeNumber(segmentsData.cn);
+
     const { added, removed } = segmentsData as MySegmentsData;
-    let isDiff = false;
 
     if (added && removed) {
+      let isDiff = false;
 
       added.forEach(segment => {
         isDiff = this.addSegment(segment) || isDiff;
@@ -61,40 +63,32 @@ export abstract class AbstractMySegmentsCacheSync implements ISegmentsCacheSync
       removed.forEach(segment => {
         isDiff = this.removeSegment(segment) || isDiff;
       });
-    } else {
 
-      const names = ((segmentsData as IMySegmentsResponse).k || []).map(s => s.n).sort();
-      const storedSegmentKeys = this.getRegisteredSegments().sort();
+      return isDiff;
+    }
 
-      // Extreme fast => everything is empty
-      if (!names.length && !storedSegmentKeys.length) {
-        isDiff = false;
-      } else {
+    const names = ((segmentsData as IMySegmentsResponse).k || []).map(s => s.n).sort();
+    const storedSegmentKeys = this.getRegisteredSegments().sort();
 
-        let index = 0;
+    // Extreme fast => everything is empty
+    if (!names.length && !storedSegmentKeys.length) return false;
 
-        while (index < names.length && index < storedSegmentKeys.length && names[index] === storedSegmentKeys[index]) index++;
+    let index = 0;
 
-        // Quick path => no changes
-        if (index === names.length && index === storedSegmentKeys.length) {
-          isDiff = false;
-        } else {
+    while (index < names.length && index < storedSegmentKeys.length && names[index] === storedSegmentKeys[index]) index++;
 
-          // Slowest path => add and/or remove segments
-          for (let removeIndex = index; removeIndex < storedSegmentKeys.length; removeIndex++) {
-            this.removeSegment(storedSegmentKeys[removeIndex]);
-          }
+    // Quick path => no changes
+    if (index === names.length && index === storedSegmentKeys.length) return false;
 
-          for (let addIndex = index; addIndex < names.length; addIndex++) {
-            this.addSegment(names[addIndex]);
-          }
+    // Slowest path => add and/or remove segments
+    for (let removeIndex = index; removeIndex < storedSegmentKeys.length; removeIndex++) {
+      this.removeSegment(storedSegmentKeys[removeIndex]);
+    }
 
-          isDiff = true;
-        }
-      }
+    for (let addIndex = index; addIndex < names.length; addIndex++) {
+      this.addSegment(names[addIndex]);
     }
 
-    this.setChangeNumber(segmentsData.cn);
-    return isDiff;
+    return true;
   }
 }

src/storages/AbstractSplitsCacheSync.ts

@@ -14,10 +14,9 @@ export abstract class AbstractSplitsCacheSync implements ISplitsCacheSync {
   protected abstract setChangeNumber(changeNumber: number): boolean | void
 
   update(toAdd: ISplit[], toRemove: ISplit[], changeNumber: number): boolean {
-    let updated = toAdd.map(addedFF => this.addSplit(addedFF)).some(result => result);
-    updated = toRemove.map(removedFF => this.removeSplit(removedFF.name)).some(result => result) || updated;
     this.setChangeNumber(changeNumber);
-    return updated;
+    const updated = toAdd.map(addedFF => this.addSplit(addedFF)).some(result => result);
+    return toRemove.map(removedFF => this.removeSplit(removedFF.name)).some(result => result) || updated;
   }
 
   abstract getSplit(name: string): ISplit | null

src/storages/inLocalStorage/RBSegmentsCacheInLocal.ts

@@ -26,10 +26,9 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
   }
 
   update(toAdd: IRBSegment[], toRemove: IRBSegment[], changeNumber: number): boolean {
-    let updated = toAdd.map(toAdd => this.add(toAdd)).some(result => result);
-    updated = toRemove.map(toRemove => this.remove(toRemove.name)).some(result => result) || updated;
     this.setChangeNumber(changeNumber);
-    return updated;
+    const updated = toAdd.map(toAdd => this.add(toAdd)).some(result => result);
+    return toRemove.map(toRemove => this.remove(toRemove.name)).some(result => result) || updated;
   }
 
   private setChangeNumber(changeNumber: number) {