Repo-copy textproc/redisearch to textproc/redisearch16 and

update to the recent stable version v2.0.

3 files changed, 43 insertions, 0 deletions

diff --git a/textproc/redisearch16/files/patch-src_fork__gc.c b/textproc/redisearch16/files/patch-src_fork__gc.c
new file mode 100644
index 000000000000..9b067f73f84d
--- /dev/null
+++ b/textproc/redisearch16/files/patch-src_fork__gc.c
@@ -0,0 +1,21 @@
+--- src/fork_gc.c.orig	2020-04-12 11:18:47 UTC
++++ src/fork_gc.c
+@@ -282,6 +282,7 @@ done:
+ }
+ 
+ static void sendHeaderString(ForkGC *gc, void *arg) {
++  struct iovec { void *iov_base; size_t iov_len; };
+   struct iovec *iov = arg;
+   FGC_sendBuffer(gc, iov->iov_base, iov->iov_len);
+ }
+@@ -298,7 +299,9 @@ static void FGC_childCollectTerms(ForkGC *gc, RedisSea
+     RedisModuleKey *idxKey = NULL;
+     InvertedIndex *idx = Redis_OpenInvertedIndexEx(sctx, term, strlen(term), 1, &idxKey);
+     if (idx) {
+-      struct iovec iov = {.iov_base = (void *)term, termLen};
++      struct iovec { void *iov_base; size_t iov_len; } iov;
++      iov.iov_base = term;
++      iov.iov_len = termLen;
+       FGC_childRepairInvidx(gc, sctx, idx, sendHeaderString, &iov, NULL);
+     }
+     if (idxKey) {
diff --git a/textproc/redisearch16/files/patch-src_numeric__index.c b/textproc/redisearch16/files/patch-src_numeric__index.c
new file mode 100644
index 000000000000..4129442c1498
--- /dev/null
+++ b/textproc/redisearch16/files/patch-src_numeric__index.c
@@ -0,0 +1,11 @@
+--- src/numeric_index.c.orig	2020-02-29 20:43:50 UTC
++++ src/numeric_index.c
+@@ -474,7 +474,7 @@ int NumericIndexType_Register(RedisModuleCtx *ctx) {
+                                .rdb_save = NumericIndexType_RdbSave,
+                                .aof_rewrite = GenericAofRewrite_DisabledHandler,
+                                .free = NumericIndexType_Free,
+-                               .mem_usage = NumericIndexType_MemUsage};
++                               .mem_usage = (const void *)NumericIndexType_MemUsage};
+ 
+   NumericIndexType = RedisModule_CreateDataType(ctx, "numericdx", NUMERIC_INDEX_ENCVER, &tm);
+   if (NumericIndexType == NULL) {
diff --git a/textproc/redisearch16/files/patch-src_redis__index.c b/textproc/redisearch16/files/patch-src_redis__index.c
new file mode 100644
index 000000000000..36e1bc262208
--- /dev/null
+++ b/textproc/redisearch16/files/patch-src_redis__index.c
@@ -0,0 +1,11 @@
+--- src/redis_index.c.orig	2020-02-29 20:35:56 UTC
++++ src/redis_index.c
+@@ -108,7 +108,7 @@ int InvertedIndex_RegisterType(RedisModuleCtx *ctx) {
+                                .rdb_load = InvertedIndex_RdbLoad,
+                                .rdb_save = InvertedIndex_RdbSave,
+                                .aof_rewrite = GenericAofRewrite_DisabledHandler,
+-                               .mem_usage = InvertedIndex_MemUsage,
++                               .mem_usage = (const void *)InvertedIndex_MemUsage,
+                                .free = InvertedIndex_Free};
+ 
+   InvertedIndexType = RedisModule_CreateDataType(ctx, "ft_invidx", INVERTED_INDEX_ENCVER, &tm);