Merge pull request #323 from joka921/f.parsedQueryRefactor

Refactoring the `ParsedQuery` class

CMakeLists.txt

@@ -17,6 +17,17 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   endif()
 endif()
 
+## Build targets for address sanitizer
+# AddressSanitize
+set(CMAKE_C_FLAGS_ASAN
+        "-fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
+        CACHE STRING "Flags used by the C compiler during AddressSanitizer builds."
+        FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+        "-fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
+        CACHE STRING "Flags used by the C++ compiler during AddressSanitizer builds."
+        FORCE)
+
 ###############################################################################
 ##### Essential settings #####
 ###############################################################################
@@ -124,6 +135,7 @@ message(STATUS "CXX_FLAGS are : " ${CMAKE_CXX_FLAGS})
 message(STATUS "CXX_FLAGS_RELEASE are : " ${CMAKE_CXX_FLAGS_RELEASE})
 message(STATUS "CXX_FLAGS_DEBUG are : " ${CMAKE_CXX_FLAGS_DEBUG})
 message(STATUS "IMPORTANT: Make sure you have selected the desired CMAKE_BUILD_TYPE")
+message(STATUS "CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
 message(STATUS ---)
 
 ###############################################################################

src/engine/QueryPlanner.h

@@ -146,8 +146,7 @@ class QueryPlanner {
     void addAllNodes(uint64_t otherNodes);
   };
 
-  TripleGraph createTripleGraph(
-      std::shared_ptr<const ParsedQuery::GraphPattern> pattern) const;
+  TripleGraph createTripleGraph(const ParsedQuery::GraphPattern* pattern) const;
 
   static ad_utility::HashMap<string, size_t>
   createVariableColumnsMapForTextOperation(
@@ -190,8 +189,7 @@ class QueryPlanner {
 
   bool _enablePatternTrick;
 
-  std::vector<SubtreePlan> optimize(
-      std::shared_ptr<const ParsedQuery::GraphPattern> pattern);
+  std::vector<SubtreePlan> optimize(ParsedQuery::GraphPattern* rootPattern);
 
   /**
    * @brief Fills varToTrip with a mapping from all variables in the root graph
@@ -252,9 +250,8 @@ class QueryPlanner {
   std::string generateUniqueVarName();
 
   // Creates a tree of unions with the given patterns as the trees leaves
-  std::shared_ptr<ParsedQuery::GraphPattern> uniteGraphPatterns(
-      const std::vector<std::shared_ptr<ParsedQuery::GraphPattern>>& patterns)
-      const;
+  ParsedQuery::GraphPattern uniteGraphPatterns(
+      std::vector<ParsedQuery::GraphPattern>&& patterns) const;
 
   /**
    * @brief Merges two rows of the dp optimization table using various types of