Merge pull request #18 from yaeltzirulnikov/yael-use_rax_instead_link…

…ed_list use RedisModuleDict instead linked list
RedisTimeSeries · Nov 14, 2018 · da554db · da554db
2 parents 3675c1a + 2248b4c
commit da554db
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 389 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: 'redislabsmodules/rmbuilder:latest'
+      - image: 'redislabsmodules/rmbuilder:5.0.1'
     environment:
       MODULE_ARTIFACT: redis-tsdb-module.so
     steps:

diff --git a/src/module.c b/src/module.c
@@ -36,7 +36,7 @@ int TSDB_info(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
     RedisModule_ReplyWithSimpleString(ctx, "retentionSecs");
     RedisModule_ReplyWithLongLong(ctx, series->retentionSecs);
     RedisModule_ReplyWithSimpleString(ctx, "chunkCount");
-    RedisModule_ReplyWithLongLong(ctx, series->chunkCount);
+    RedisModule_ReplyWithLongLong(ctx, RedisModule_DictSize(series->chunks));
     RedisModule_ReplyWithSimpleString(ctx, "maxSamplesPerChunk");
     RedisModule_ReplyWithLongLong(ctx, series->maxSamplesPerChunk);
 

diff --git a/src/rdb.c b/src/rdb.c
@@ -70,12 +70,7 @@ void series_rdb_save(RedisModuleIO *io, void *value)
         rule = rule->nextRule;
     }
 
-    Chunk *chunk = series->firstChunk;
-    size_t numSamples =0;
-    while (chunk != NULL) {
-        numSamples += ChunkNumOfSample(chunk);
-        chunk = chunk->nextChunk;
-    }
+    size_t numSamples = SeriesGetNumSamples(series);
     RedisModule_SaveUnsigned(io, numSamples);
 
     SeriesIterator iter = SeriesQuery(series, 0, series->lastTimestamp);

diff --git a/src/redismodule.h b/src/redismodule.h