Merge branch 'devel' into feature/internal-issue-#672

arangodb · gnusi · Apr 3, 2020 · Mar 25, 2020 · Mar 25, 2020 · Mar 25, 2020
commit f14afc20a8d018e451b630989de6b54f6ef2bd1d
diff --git a/arangod/IResearch/IResearchLink.cpp b/arangod/IResearch/IResearchLink.cpp
@@ -43,8 +43,6 @@
 #include "IResearch/IResearchView.h"
 #include "IResearch/IResearchViewCoordinator.h"
 #include "IResearch/VelocyPackHelper.h"
-#include "IResearch/IResearchKludge.h"
-#include "MMFiles/MMFilesCollection.h"
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/DatabasePathFeature.h"
 #include "RestServer/FlushFeature.h"

diff --git a/tests/Mocks/StorageEngineMock.cpp b/tests/Mocks/StorageEngineMock.cpp
@@ -972,7 +972,7 @@ std::shared_ptr<arangodb::Index> PhysicalCollectionMock::createIndex(
             server.getFeature<arangodb::iresearch::IResearchFeature>().factory<arangodb::ClusterEngine>();
         index = factory.instantiate(_logicalCollection, info, id, false);
       } else {
-        index = IResearchDBServerLinkMock::make(id, _logicalCollection, info);
+        index = IResearchLinkMock::buildLinkMock(id, _logicalCollection, info);
       }
     } catch (std::exception const& ex) {
       // ignore the details of all errors here
@@ -1803,17 +1803,6 @@ int StorageEngineMock::writeCreateDatabaseMarker(TRI_voc_tick_t id, VPackSlice c
   return TRI_ERROR_NO_ERROR;
 }
 
-std::shared_ptr<arangodb::iresearch::IResearchLinkMock> StorageEngineMock::buildLinkMock(
-    arangodb::IndexId id, arangodb::LogicalCollection& collection, VPackSlice const& info) {
-  auto index = std::shared_ptr<arangodb::iresearch::IResearchLinkMock>(
-      new arangodb::iresearch::IResearchLinkMock(id, collection));
-  auto res = static_cast<arangodb::iresearch::IResearchLinkMock*>(index.get())->init(info);
-
-  if (!res.ok()) {
-    THROW_ARANGO_EXCEPTION(res);
-  }
-  return index;
-}
 
 TransactionCollectionMock::TransactionCollectionMock(arangodb::TransactionState* state,
                                                      TRI_voc_cid_t cid,

diff --git a/tests/Mocks/StorageEngineMock.h b/tests/Mocks/StorageEngineMock.h
@@ -33,10 +33,9 @@
 #include "StorageEngine/TransactionCollection.h"
 #include "StorageEngine/TransactionState.h"
 #include "Transaction/ContextData.h"
-#include "IResearch/IResearchLink.h"
+#include "IResearch/IResearchLinkMock.h"
 #include "VocBase/Identifiers/IndexId.h"
 #include "VocBase/Identifiers/LocalDocumentId.h"
-#include "IResearch/IResearchLinkHelper.h"
 
 namespace arangodb {
 
@@ -46,9 +45,6 @@ class WalAccess;
 namespace aql {
 class OptimizerRulesFeature;
 }
-namespace iresearch {
-class IResearchLinkMock;
-}
 
 }  // namespace arangodb
 
@@ -180,105 +176,6 @@ class TransactionStateMock : public arangodb::TransactionState {
   virtual bool hasFailedOperations() const override;
 };
 
-
-class IResearchDBServerLinkMock : public arangodb::Index, public arangodb::iresearch::IResearchLink {
- public:
-  IResearchDBServerLinkMock(arangodb::IndexId iid, arangodb::LogicalCollection& collection) :
-    IResearchLink(iid, collection), Index(iid, collection, arangodb::iresearch::IResearchLinkHelper::emptyIndexSlice()) {
-    _unique = false;  // cannot be unique since multiple fields are indexed
-    _sparse = true;   // always sparse
-  }
-
-  static std::shared_ptr<arangodb::Index> make(arangodb::IndexId iid,
-    arangodb::LogicalCollection& collection,
-    arangodb::velocypack::Slice const& definition) {
-    auto link = std::make_shared<IResearchDBServerLinkMock>(iid, collection);
-    link->init(definition, [](irs::directory& dir) {
-      if (InitCallback != nullptr) {
-        InitCallback(dir);
-      }
-      });
-    return link;
-  }
-
-  [[nodiscard]] static auto setCallbakForScope(std::function<void(irs::directory&)> callback) {
-    InitCallback = callback;
-    return irs::make_finally([]() {InitCallback = nullptr; });
-  }
-
-  IndexType type() const override { return IResearchLink::type(); }
-
-  char const* typeName() const override {
-    return IResearchLink::typeName();
-  }
-
-  void unload() override {
-    auto res = IResearchLink::unload();
-
-    if (!res.ok()) {
-      THROW_ARANGO_EXCEPTION(res);
-    }
-  }
-
-  void afterTruncate(TRI_voc_tick_t /*tick*/) override {
-    IResearchLink::afterTruncate();
-  };
-
-  void batchInsert(
-    arangodb::transaction::Methods& trx,
-    std::vector<std::pair<arangodb::LocalDocumentId, arangodb::velocypack::Slice>> const& documents,
-    std::shared_ptr<arangodb::basics::LocalTaskQueue> queue) override {
-    IResearchLink::batchInsert(trx, documents, queue);
-  }
-
-  bool canBeDropped() const override {
-    return IResearchLink::canBeDropped();
-  }
-
-  arangodb::Result drop() override { return IResearchLink::drop(); }
-
-  bool hasSelectivityEstimate() const override {
-    return IResearchLink::hasSelectivityEstimate();
-  }
-
-  arangodb::Result insert(arangodb::transaction::Methods& trx,
-    arangodb::LocalDocumentId const& documentId,
-    arangodb::velocypack::Slice const& doc,
-    arangodb::Index::OperationMode mode) {
-    return IResearchLink::insert(trx, documentId, doc, mode);
-  }
-
-  bool isPersistent() const override { return true; }
-
-  bool isSorted() const override { return IResearchLink::isSorted(); }
-
-  bool isHidden() const override { return IResearchLink::isHidden(); }
-
-  bool needsReversal() const override { return true; }
-
-  void load() override { IResearchLink::load(); }
-
-  bool matchesDefinition(arangodb::velocypack::Slice const& slice) const override {
-    return IResearchLink::matchesDefinition(slice);
-  }
-
-  size_t memory() const override {
-    // FIXME return in memory size
-    return stats().indexSize;
-  }
-
-  using Index::toVelocyPack; // for std::shared_ptr<Builder> Index::toVelocyPack(bool, Index::Serialize)
-  void toVelocyPack(arangodb::velocypack::Builder& builder,
-    std::underlying_type<arangodb::Index::Serialize>::type) const override;
-
-  void toVelocyPackFigures(arangodb::velocypack::Builder& builder) const override {
-    IResearchLink::toVelocyPackStats(builder);
-  }
-
- private:
-  static  std::function<void(irs::directory&)> InitCallback;
-};
-
 class StorageEngineMock : public arangodb::StorageEngine {
  public:
   static std::function<void()> before;
@@ -382,10 +279,6 @@ class StorageEngineMock : public arangodb::StorageEngine {
   virtual arangodb::WalAccess const* walAccess() const override;
   virtual int writeCreateDatabaseMarker(TRI_voc_tick_t id, VPackSlice const& slice) override;
 
-  // public helper function for testing
-  static std::shared_ptr<arangodb::iresearch::IResearchLinkMock> buildLinkMock(
-    arangodb::IndexId id, arangodb::LogicalCollection& collection, arangodb::velocypack::Slice const& info);
-
  private:
   TRI_voc_tick_t _releasedTick;
 };