Merge branch 'devel' of github.com:arangodb/arangodb into feature/rdb…

…-index-background
arangodb · jsteemann · Dec 21, 2018 · Dec 3, 2018 · Dec 3, 2018 · Dec 4, 2018
commit 31d9d7b9796c81c34813096af6fd9fea26a74d70
@@ -22,13 +22,13 @@ are covered by an edge collection's edge index automatically.
 Using the system attribute `_id` in user-defined indexes is not possible, but 
 indexing `_key`, `_rev`, `_from`, and `_to` is.
 
-Creating new indexes is usually done under an exclusive collection lock. The collection is not
+<!-- Creating new indexes is usually done under an exclusive collection lock. The collection is not
 available as long as the index is created.  This "foreground" index creation can be undesireable, 
 if you have to perform it on a live system without a dedicated maintenance window.
 
 For potentially long running index  creation operations the _rocksdb_ storage-engine also supports 
 creating indexes in "background". The colletion remains available durint the index creation, 
-see the section [Creating Indexes in Background](#creating-indexes-in-background) for more information.
+see the section [Creating Indexes in Background](#creating-indexes-in-background) for more information. -->
 
 ArangoDB provides the following index types:
 
@@ -549,7 +549,7 @@ based on the costs it estimates, even if a vertex centric index might
 in fact be faster. Vertex centric indexes are more likely to be chosen
 for highly connected graphs and with RocksDB storage engine.
 
-
+<!-- 
 Creating Indexes in Background
 ------------------------------
 
@@ -607,4 +607,4 @@ the background index creation needs to keep a list of removed documents in RAM.
 if this list grows to tens of millions of entries.
 
 Building an index is always a write heavy operation (internally), it is alsways a good idea to build indexes
-during times with less load. 
+during times with less load.  -->
@@ -187,7 +187,7 @@ and
 will match.
 
 
-Creating Skiplist Index in Background
+<!-- Creating Skiplist Index in Background
 ---------------------------------
 
 {% hint 'info' %}
@@ -209,4 +209,4 @@ To create a Skiplist index in the background in *arangosh* just specify `inBackg
 db.collection.ensureIndex({ type: "skiplist", fields: [ "value" ], inBackground: true });
 ```
 
-For more information see [Creating Indexes in Background](IndexBasics.md#creating-indexes-in-background)
+For more information see [Creating Indexes in Background](IndexBasics.md#creating-indexes-in-background) -->
diff --git a/arangod/IResearch/IResearchLinkCoordinator.h b/arangod/IResearch/IResearchLinkCoordinator.h
@@ -83,11 +83,14 @@ class IResearchLinkCoordinator final
     return arangodb::Result(TRI_ERROR_NOT_IMPLEMENTED);
   }
 
-  // IResearch does not provide a fixed default sort order
-  virtual bool isSorted() const override { return false; }
-
+
   bool isHidden() const override {
-    return true;
+    return true; // always hide links
+  }
+
+  // IResearch does not provide a fixed default sort order
+  virtual bool isSorted() const override {
+    return IResearchLink::isSorted();
   }
 
   virtual arangodb::IndexIterator* iteratorForCondition(

diff --git a/arangod/IResearch/IResearchRocksDBLink.cpp b/arangod/IResearch/IResearchRocksDBLink.cpp
@@ -171,7 +171,7 @@ void IResearchRocksDBLink::toVelocyPack(
     ));
   }
 
-  if (arangodb::Index::hasFlag(flags, arangodb::Index::Serialize::ObjectId)) {
+  if (arangodb::Index::hasFlag(flags, arangodb::Index::Serialize::Internals)) {
     TRI_ASSERT(_objectId != 0); // If we store it, it cannot be 0
     builder.add("objectId", VPackValue(std::to_string(_objectId)));
   }
@@ -193,4 +193,4 @@ NS_END  // arangodb
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
diff --git a/arangod/RocksDBEngine/RocksDBBuilderIndex.cpp b/arangod/RocksDBEngine/RocksDBBuilderIndex.cpp
@@ -113,6 +113,7 @@ Result RocksDBBuilderIndex::removeInternal(transaction::Methods& trx, RocksDBMet
 }
 
 // Background index filler task
+// FIXME simon: not used right now because rollbacks are not correctly handled yet
 arangodb::Result RocksDBBuilderIndex::fillIndexBackground(std::function<void()> const& unlock) {
   arangodb::Result res;
 

diff --git a/arangod/RocksDBEngine/RocksDBCollection.cpp b/arangod/RocksDBEngine/RocksDBCollection.cpp
@@ -399,8 +399,11 @@ std::shared_ptr<Index> RocksDBCollection::createIndex(
     }
   }
 
+  const bool inBackground = false; // TODO simon: will be enabled in a seperate PR
+#if 0
   bool inBackground = basics::VelocyPackHelper::getBooleanValue(
                         info, StaticStrings::IndexInBackground, false);
+#endif
 
   // Step 4. fill index
   if (res.ok()) {

diff --git a/tests/js/common/shell/shell-index-rocksdb.js → ...mon/shell/shell-index-rocksdb-disabled.js b/tests/js/common/shell/shell-index-rocksdb.js → ...mon/shell/shell-index-rocksdb-disabled.js