Merge pull request #753 from mcserep/parsing-after-indexing

Optionally run Plugin parsers after DB indexing

Author: intjftw

parser/include/parser/abstractparser.h

@@ -44,6 +44,16 @@ class AbstractParser
    * @return Returns true if the parse succeeded, false otherwise.
    */
   virtual bool parse() = 0;
+  /**
+   * Returns true in case database indices are required for the parser, due to performance reasons.
+   *
+   * Should return the same value on each call for the same object.
+   * @return Returns true if the database indexing has to be performed before the parser is executed.
+   */
+  virtual bool isDatabaseIndexRequired() const
+  {
+    return false;
+  }
 
 protected:
   ParserContext& _ctx;

parser/src/parser.cpp

@@ -411,18 +411,33 @@ int main(int argc, char* argv[])
     incrementalCleanup(ctx);
   }
 
+  std::vector<std::string> afterIndexingPlugins;
+
   // TODO: Handle errors returned by parse().
   for (const std::string& pluginName : pluginNames)
   {
-    LOG(info) << "[" << pluginName << "] parse started!";
-    pHandler.getParser(pluginName)->parse();
+    auto plugin = pHandler.getParser(pluginName);
+    if (!plugin->isDatabaseIndexRequired())
+    {
+      LOG(info) << "[" << pluginName << "] parse started!";
+      plugin->parse();
+    }
+    else {
+      afterIndexingPlugins.push_back(pluginName);
+    }
   }
 
   //--- Add indexes to the database ---//
 
   if (vm.count("force") || isNewDb)
     cc::util::createIndexes(db, SQL_DIR);
 
+  for (const std::string& pluginName : afterIndexingPlugins)
+  {
+    LOG(info) << "[" << pluginName << "] parse started!";
+    pHandler.getParser(pluginName)->parse();
+  }
+
   //--- Create project config file ---//
 
   boost::property_tree::ptree pt;

plugins/cpp_metrics/parser/include/cppmetricsparser/cppmetricsparser.h

@@ -59,6 +59,11 @@ class CppMetricsParser : public AbstractParser
   virtual bool cleanupDatabase() override;
   virtual bool parse() override;
 
+  virtual bool isDatabaseIndexRequired() const override
+  {
+    return true;
+  }
+
 private:
   // Calculate the count of parameters for every function.
   void functionParameters();