Merge branch 'rb_segments_storage_consumer_mode' into rb_segments_storage_standalone_mode

Author: EmilianoSanchez

src/storages/__tests__/RBSegmentsCacheAsync.spec.ts

@@ -0,0 +1,59 @@
+import { RBSegmentsCacheInRedis } from '../inRedis/RBSegmentsCacheInRedis';
+import { RBSegmentsCachePluggable } from '../pluggable/RBSegmentsCachePluggable';
+import { KeyBuilderSS } from '../KeyBuilderSS';
+import { rbSegment, rbSegmentWithInSegmentMatcher } from '../__tests__/testUtils';
+import { loggerMock } from '../../logger/__tests__/sdkLogger.mock';
+import { metadata } from './KeyBuilder.spec';
+import { RedisAdapter } from '../inRedis/RedisAdapter';
+import { wrapperMockFactory } from '../pluggable/__tests__/wrapper.mock';
+
+const keys = new KeyBuilderSS('RBSEGMENT', metadata);
+
+const redisClient = new RedisAdapter(loggerMock);
+const cacheInRedis = new RBSegmentsCacheInRedis(loggerMock, keys, redisClient);
+
+const storageWrapper = wrapperMockFactory();
+const cachePluggable = new RBSegmentsCachePluggable(loggerMock, keys, storageWrapper);
+
+describe.each([{ cache: cacheInRedis, wrapper: redisClient }, { cache: cachePluggable, wrapper: storageWrapper }])('Rule-based segments cache async (Redis & Pluggable)', ({ cache, wrapper }) => {
+
+  afterAll(async () => {
+    await wrapper.del(keys.buildRBSegmentsTillKey());
+    await wrapper.disconnect();
+  });
+
+  test('update should add and remove segments correctly', async () => {
+    // Add segments
+    expect(await cache.update([rbSegment, rbSegmentWithInSegmentMatcher], [], 1)).toBe(true);
+    expect(await cache.get(rbSegment.name)).toEqual(rbSegment);
+    expect(await cache.get(rbSegmentWithInSegmentMatcher.name)).toEqual(rbSegmentWithInSegmentMatcher);
+    expect(await cache.getChangeNumber()).toBe(1);
+
+    // Remove a segment
+    expect(await cache.update([], [rbSegment], 2)).toBe(true);
+    expect(await cache.get(rbSegment.name)).toBeNull();
+    expect(await cache.get(rbSegmentWithInSegmentMatcher.name)).toEqual(rbSegmentWithInSegmentMatcher);
+    expect(await cache.getChangeNumber()).toBe(2);
+
+    // Remove remaining segment
+    expect(await cache.update([], [rbSegmentWithInSegmentMatcher], 3)).toBe(true);
+    expect(await cache.get(rbSegment.name)).toBeNull();
+    expect(await cache.get(rbSegmentWithInSegmentMatcher.name)).toBeNull();
+    expect(await cache.getChangeNumber()).toBe(3);
+
+    // No changes
+    expect(await cache.update([], [rbSegmentWithInSegmentMatcher], 4)).toBe(false);
+    expect(await cache.getChangeNumber()).toBe(4);
+  });
+
+  test('contains should check for segment existence correctly', async () => {
+    await cache.update([rbSegment, rbSegmentWithInSegmentMatcher], [], 1);
+
+    expect(await cache.contains(new Set([rbSegment.name]))).toBe(true);
+    expect(await cache.contains(new Set([rbSegment.name, rbSegmentWithInSegmentMatcher.name]))).toBe(true);
+    expect(await cache.contains(new Set(['nonexistent']))).toBe(false);
+    expect(await cache.contains(new Set([rbSegment.name, 'nonexistent']))).toBe(false);
+
+    await cache.update([], [rbSegment, rbSegmentWithInSegmentMatcher], 2);
+  });
+});

src/storages/inRedis/RBSegmentsCacheInRedis.ts

@@ -55,13 +55,13 @@ export class RBSegmentsCacheInRedis implements IRBSegmentsCacheAsync {
   }
 
   setChangeNumber(changeNumber: number) {
-    return this.redis.set(this.keys.buildRBSegmentTillKey(), changeNumber + '').then(
+    return this.redis.set(this.keys.buildRBSegmentsTillKey(), changeNumber + '').then(
       status => status === 'OK'
     );
   }
 
   getChangeNumber(): Promise<number> {
-    return this.redis.get(this.keys.buildRBSegmentTillKey()).then((value: string | null) => {
+    return this.redis.get(this.keys.buildRBSegmentsTillKey()).then((value: string | null) => {
       const i = parseInt(value as string, 10);
 
       return isNaNNumber(i) ? -1 : i;
@@ -73,7 +73,7 @@ export class RBSegmentsCacheInRedis implements IRBSegmentsCacheAsync {
 
   // @TODO implement if required by DataLoader or producer mode
   clear() {
-    return Promise.resolve(true);
+    return Promise.resolve();
   }
 
 }

src/storages/pluggable/RBSegmentsCachePluggable.ts

@@ -54,11 +54,11 @@ export class RBSegmentsCachePluggable implements IRBSegmentsCacheAsync {
   }
 
   setChangeNumber(changeNumber: number) {
-    return this.wrapper.set(this.keys.buildRBSegmentTillKey(), changeNumber + '');
+    return this.wrapper.set(this.keys.buildRBSegmentsTillKey(), changeNumber + '');
   }
 
   getChangeNumber(): Promise<number> {
-    return this.wrapper.get(this.keys.buildRBSegmentTillKey()).then((value) => {
+    return this.wrapper.get(this.keys.buildRBSegmentsTillKey()).then((value) => {
       const i = parseInt(value as string, 10);
 
       return isNaNNumber(i) ? -1 : i;
@@ -70,7 +70,7 @@ export class RBSegmentsCachePluggable implements IRBSegmentsCacheAsync {
 
   // @TODO implement if required by DataLoader or producer mode
   clear() {
-    return Promise.resolve(true);
+    return Promise.resolve();
   }
 
 }