From 59a514bb89f6f39b69bc338fdadcfe2b707ed96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Gra=CC=88tzer?= <simon@graetzer.org>
Date: Sat, 6 May 2017 01:57:09 +0200
Subject: [PATCH] Count fix & tests enabled

---
 arangod/RocksDBEngine/RocksDBFulltextIndex.cpp            | 6 +++++-
 ...ueries-fulltext-mmfiles.js => aql-queries-fulltext.js} | 0
 js/server/tests/dump/dump-rocksdb.js                      | 8 ++++----
 js/server/tests/dump/dump-setup-cluster.js                | 2 +-
 js/server/tests/shell/shell-transactions-noncluster.js    | 6 ------
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename js/server/tests/aql/{aql-queries-fulltext-mmfiles.js => aql-queries-fulltext.js} (100%)

diff --git a/arangod/RocksDBEngine/RocksDBFulltextIndex.cpp b/arangod/RocksDBEngine/RocksDBFulltextIndex.cpp
index e6b4e3619e..3fc0ab48cb 100644
--- a/arangod/RocksDBEngine/RocksDBFulltextIndex.cpp
+++ b/arangod/RocksDBEngine/RocksDBFulltextIndex.cpp
@@ -487,11 +487,15 @@ Result RocksDBFulltextIndex::executeQuery(transaction::Methods* trx,
 
   auto physical = static_cast<RocksDBCollection*>(_collection->getPhysical());
   auto idx = physical->primaryIndex();
-  std::set<std::string>::iterator it = resultSet.cbegin();
   ManagedDocumentResult mmdr;
+  
+  if (maxResults == 0) {// 0 appearantly means "all results"
+    maxResults = SIZE_T_MAX;
+  }
 
   builder.openArray();
   // get the first N results
+  std::set<std::string>::iterator it = resultSet.cbegin();
   while (maxResults > 0 && it != resultSet.cend()) {
     RocksDBToken token = idx->lookupKey(trx, StringRef(*it));
     if (token.revisionId()) {
diff --git a/js/server/tests/aql/aql-queries-fulltext-mmfiles.js b/js/server/tests/aql/aql-queries-fulltext.js
similarity index 100%
rename from js/server/tests/aql/aql-queries-fulltext-mmfiles.js
rename to js/server/tests/aql/aql-queries-fulltext.js
diff --git a/js/server/tests/dump/dump-rocksdb.js b/js/server/tests/dump/dump-rocksdb.js
index 59d1e59576..7ab300ef65 100644
--- a/js/server/tests/dump/dump-rocksdb.js
+++ b/js/server/tests/dump/dump-rocksdb.js
@@ -218,11 +218,11 @@ function dumpTestSuite () {
       assertTrue(c.getIndexes()[6].sparse);
       assertEqual([ "a_ss1", "a_ss2" ], c.getIndexes()[6].fields);
 
-      if (db._engine().name !== "rocksdb") {
-        assertFalse(c.getIndexes()[7].unique);
-        assertEqual("fulltext", c.getIndexes()[7].type);
-        assertEqual([ "a_f" ], c.getIndexes()[7].fields);
+      assertFalse(c.getIndexes()[7].unique);
+      assertEqual("fulltext", c.getIndexes()[7].type);
+      assertEqual([ "a_f" ], c.getIndexes()[7].fields);
 
+      if (db._engine().name !== "rocksdb") {
         assertEqual("geo2", c.getIndexes()[8].type);
         assertEqual([ "a_la", "a_lo" ], c.getIndexes()[8].fields);
         assertFalse(c.getIndexes()[8].unique);
diff --git a/js/server/tests/dump/dump-setup-cluster.js b/js/server/tests/dump/dump-setup-cluster.js
index 7393c53252..a8c5f28433 100644
--- a/js/server/tests/dump/dump-setup-cluster.js
+++ b/js/server/tests/dump/dump-setup-cluster.js
@@ -114,8 +114,8 @@
   c.ensureHashIndex("a_hs1", "a_hs2", { sparse: true });
   c.ensureSkiplist("a_ss1", "a_ss2", { sparse: true });
  
+  c.ensureFulltextIndex("a_f");
   if (db._engine().name !== "rocksdb") {
-    c.ensureFulltextIndex("a_f");
     c.ensureGeoIndex("a_la", "a_lo");
   }
 
diff --git a/js/server/tests/shell/shell-transactions-noncluster.js b/js/server/tests/shell/shell-transactions-noncluster.js
index 2a69293e8f..679f7aeb6b 100644
--- a/js/server/tests/shell/shell-transactions-noncluster.js
+++ b/js/server/tests/shell/shell-transactions-noncluster.js
@@ -1356,9 +1356,6 @@ function transactionOperationsSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     testCreateFulltextIndex : function () {
-      if (db._engine().name === "rocksdb") {
-        return;
-      }
       
       c1 = db._create(cn1);
 
@@ -1975,9 +1972,6 @@ function transactionOperationsSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     testFulltext : function () {
-      if (db._engine().name === "rocksdb") {
-        return;
-      }
       
       c1 = db._create(cn1);
       var idx = c1.ensureFulltextIndex("text");