Merge pull request #625 from RedisLabsModules/#621_fix

see #621, fixed, reset aCtx flags if needed
RediSearch · Mar 26, 2019 · 84024f0 · 84024f0
2 parents 04c053a + 549e5ea
commit 84024f0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/document.c b/src/document.c
@@ -42,6 +42,10 @@ static void freeDocumentContext(void *p) {
 
 static int AddDocumentCtx_SetDocument(RSAddDocumentCtx *aCtx, IndexSpec *sp, Document *base,
                                       size_t oldFieldCount) {
+  aCtx->stateFlags &= ~ACTX_F_INDEXABLES;
+  aCtx->stateFlags &= ~ACTX_F_TEXTINDEXED;
+  aCtx->stateFlags &= ~ACTX_F_OTHERINDEXED;
+
   aCtx->doc = *base;
   Document *doc = &aCtx->doc;
 
@@ -93,9 +97,11 @@ static int AddDocumentCtx_SetDocument(RSAddDocumentCtx *aCtx, IndexSpec *sp, Doc
   if (hasTextFields || hasOtherFields) {
     aCtx->stateFlags |= ACTX_F_INDEXABLES;
   }
+
   if (!hasTextFields) {
     aCtx->stateFlags |= ACTX_F_TEXTINDEXED;
   }
+
   if (!hasOtherFields) {
     aCtx->stateFlags |= ACTX_F_OTHERINDEXED;
   }

diff --git a/src/pytest/test.py b/src/pytest/test.py
@@ -1901,6 +1901,14 @@ def testIssue501(env):
     env.assertEqual("qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", rv[0][1])
     env.assertEqual([], rv[0][2])
 
+
+def testIssue621(env):
+    env.expect('ft.create', 'test', 'SCHEMA', 'uuid', 'TAG', 'title', 'TEXT').equal('OK')
+    env.expect('ft.add', 'test', 'a', '1', 'REPLACE', 'PARTIAL', 'FIELDS', 'uuid', 'foo', 'title', 'bar').equal('OK')
+    env.expect('ft.add', 'test', 'a', '1', 'REPLACE', 'PARTIAL', 'FIELDS', 'title', 'bar').equal('OK')
+    env.expect('ft.search', 'test', '@uuid:{foo}').equal([1L, 'a', ['uuid', 'foo', 'title', 'bar']])
+
+
 def grouper(iterable, n, fillvalue=None):
     "Collect data into fixed-length chunks or blocks"
     from itertools import izip_longest