Adding some minor optimisations: the main culprit is still with the language parser (too slow, but almost negligible.. still, it dominates on heavier data)

Author: jackbergus

.github/workflows/cmake.yml

@@ -2,9 +2,9 @@ name: CMake
 
 on:
   push:
-    branches: [ "v2.0" ]
+    branches: [ "prochainefois" ]
   pull_request:
-    branches: [ "v2.0" ]
+    branches: [ "prochainefois" ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

.gitignore

@@ -56,3 +56,4 @@ __pycache__
 viz/parsers/__pycache__/
 /myeasylog.log
 /out.csv
+/cmake-build-debug-coverage/

CMakeLists.txt

@@ -94,7 +94,7 @@ add_library(yaucl_graph OBJECT
         )
 target_link_libraries(yaucl_graph  yaucl_hashing roaring)
 
-add_library(gsm_script ./antlr4/scriptv2/scriptBaseListener.cpp
+add_library(gsm_script OBJECT ./antlr4/scriptv2/scriptBaseListener.cpp
         ./antlr4/scriptv2/scriptBaseVisitor.cpp
         ./antlr4/scriptv2/scriptLexer.cpp
         ./antlr4/scriptv2/scriptParser.cpp
@@ -103,13 +103,13 @@ add_library(gsm_script ./antlr4/scriptv2/scriptBaseListener.cpp
         ./src/scriptv2/ScriptAST.cpp ./include/scriptv2/ScriptAST.h ./src/scriptv2/Funzione.cpp ./include/scriptv2/Funzione.h ./src/scriptv2/Javification.cpp ./include/scriptv2/Javification.h ./src/scriptv2/ScriptVisitor.cpp ./include/scriptv2/ScriptVisitor.h)
 target_link_libraries(gsm_script antlr4_static)
 
-add_library(gsm2  antlr4/graph_grammar/simple_graph_grammarLexer.cpp antlr4/graph_grammar/simple_graph_grammarParser.cpp antlr4/graph_grammar/simple_graph_grammarListener.cpp  antlr4/graph_grammar/simple_graph_grammarVisitor.cpp src/database/PhiTable.cpp include/database/PhiTable.h src/database/AttributeTable.cpp include/database/AttributeTable.h src/database/SimplifiedFuzzyStringMatching.cpp include/database/SimplifiedFuzzyStringMatching.h src/database/LinearGSM.cpp include/database/LinearGSM.h src/database/ActivityTable.cpp include/database/ActivityTable.h src/result.cpp include/result.h src/database/gsm_indices.cpp include/database/gsm_indices.h src/queries/DataQuery.cpp include/queries/DataQuery.h src/database/gsm_object_xi_content.cpp include/database/gsm_object_xi_content.h include/simple_pair_hash.h src/queries/DataPredicate.cpp include/queries/DataPredicate.h
+add_library(gsm2 OBJECT antlr4/graph_grammar/simple_graph_grammarLexer.cpp antlr4/graph_grammar/simple_graph_grammarParser.cpp antlr4/graph_grammar/simple_graph_grammarListener.cpp  antlr4/graph_grammar/simple_graph_grammarVisitor.cpp src/database/PhiTable.cpp include/database/PhiTable.h src/database/AttributeTable.cpp include/database/AttributeTable.h src/database/SimplifiedFuzzyStringMatching.cpp include/database/SimplifiedFuzzyStringMatching.h src/database/LinearGSM.cpp include/database/LinearGSM.h src/database/ActivityTable.cpp include/database/ActivityTable.h src/result.cpp include/result.h src/database/gsm_indices.cpp include/database/gsm_indices.h src/queries/DataQuery.cpp include/queries/DataQuery.h src/database/gsm_object_xi_content.cpp include/database/gsm_object_xi_content.h include/simple_pair_hash.h src/queries/DataPredicate.cpp include/queries/DataPredicate.h
         #src/database/AtomizingPipeline2.cpp include/database/AtomizingPipeline2.h
         submodules/easylogging/src/easylogging++.cc submodules/easylogging/src/easylogging++.h
         src/database/GSMPatternVisitor.cpp include/database/GSMPatternVisitor.h src/database/GraphEdgeMatchTable.cpp include/database/GraphEdgeMatchTable.h src/database/SimpleTable.cpp include/database/SimpleTable.h include/database/gsm_object.h src/database/gsm_object.cpp include/database/gsm_inmemory_db.h src/database/gsm_inmemory_db.cpp include/database/utility.h src/queries/preserve_results.cpp include/queries/preserve_results.h src/queries/delta_updates.cpp include/queries/delta_updates.h src/queries/closure.cpp include/queries/closure.h src/database/GSMIso.cpp include/database/GSMIso.h include/parsing.h include/configuration/base.h src/configuration/Serialisation.cpp include/configuration/Serialisation.h src/configuration/Configuration.cpp include/configuration/Configuration.h src/configuration/Environment.cpp include/configuration/Environment.h)
 target_link_libraries(gsm2 antlr4_static yaucl_structures roaring  yaucl_hashing yaucl_graph )
 
-add_executable(gsm2_server main.cpp src/queries/NestedResultTable.cpp include/queries/NestedResultTable.h)
+add_executable(gsm2_server main.cpp src/queries/NestedResultTable.cpp include/queries/NestedResultTable.h src/database/SchemaIndexer.cpp include/database/SchemaIndexer.h)
 target_link_libraries(gsm2_server  antlr4_static yaucl_structures roaring  yaucl_hashing yaucl_graph  gsm2 gsm_script)
 
 #enable_testing ()

data/test/einstein/einstein_query.txt

@@ -55,7 +55,7 @@ p3 = (V)--[∀n:nsubj]->(>>S)
        del T
        del M
 
-       (S);
+       (S) ;
 
 p4 = (V)--[∀l:dobj||ccomp||nmod]->(Z)
       (Z)--[? case]->(T)

data/test/simple/schema.txt

@@ -0,0 +1,2 @@
+pos
+SizeTAtt

data/test/simple/simple.txt

@@ -0,0 +1,97 @@
+id:0
+ell:
+VBP
+root
+.
+xi:
+play
+.
+properties:
+"pos"	"4"
+.
+phi:
+"punct"
+	1.0	1
+;"nsubj"
+	1.0	2
+	1.0	3
+;"dobj"
+	1.0	4
+;.
+
+id:2
+ell:
+noun
+.
+xi:
+alice
+.
+properties:
+"number"	"singular"
+"pos"	"1"
+"specification"	"common"
+.
+phi:
+"cc"
+	1.0	5
+;"conj"
+	1.0	3
+;.
+
+id:5
+ell:
+CC
+.
+xi:
+and
+.
+properties:
+"pos"	"2"
+.
+phi:
+.
+
+id:3
+ell:
+noun
+.
+xi:
+bob
+.
+properties:
+"number"	"singular"
+"pos"	"3"
+"specification"	"common"
+.
+phi:
+.
+
+id:4
+ell:
+noun
+.
+xi:
+cricket
+.
+properties:
+"number"	"singular"
+"pos"	"5"
+"specification"	"common"
+.
+phi:
+.
+
+id:1
+ell:
+<dot>
+.
+xi:
+<dot>
+.
+properties:
+"pos"	"6"
+.
+phi:
+.
+
+

include/database/GSMPatternVisitor.h

@@ -61,7 +61,7 @@ struct test_pred {
     std::string nsoe;
     std::string pattern_matched, variable_matched;
     DPtr<std::unordered_map<std::string, DPtr<script::structures::ScriptAST>>> optGamma;
-    void*  ptrResult{nullptr};//scriptParser::ScriptContext
+    DPtr<script::structures::ScriptAST>  ptrResult{nullptr};//
     DEFAULT_CONSTRUCTORS(test_pred)
 };
 
@@ -85,7 +85,7 @@ struct rewrite_expr {
         NODE_OR_EDGE,
         SCRIPT_CASE
     };
-    void* ptrResult{nullptr};
+    DPtr<script::structures::ScriptAST> ptrResult{nullptr};
     cases t;                                                    // Using enumeration instead of inheritance
     size_t id;                                                  // Potential id associated to the match
 

include/database/SchemaIndexer.h

@@ -0,0 +1,117 @@
+//
+// Created by giacomo on 16/01/24.
+//
+
+#ifndef GSM2_SCHEMAINDEXER_H
+#define GSM2_SCHEMAINDEXER_H
+
+#include <unordered_map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "utility.h"
+#include "scriptv2/java_types.h"
+#include "scriptv2/ScriptAST.h"
+
+struct SchemaIndexer {
+    std::unordered_map<std::string, size_t>     field_to_schema;
+    std::unordered_map<std::string, std::unordered_map<std::string, size_t>> nested_schema;
+    std::set<size_t>                           isNull, cow;
+    std::vector<DPtr<script::structures::ScriptAST>> values;
+    std::set<size_t> strings;
+    const std::vector<value>* row;
+    const std::vector<std::string>* schema;
+
+    SchemaIndexer(size_t n) :  values(n, std::make_shared<script::structures::ScriptAST>()){
+        fullyIndexed = false;
+        row = nullptr;
+    }
+    void setUp(const std::vector<std::string>* schema)   {
+        this->schema = {schema};
+        for (size_t i = 0, N = schema->size(); i<N; i++) {
+            field_to_schema.emplace(schema->at(i), i);
+        }
+
+    }
+
+    void initialize(const  std::vector<value>* nestedRow) {
+        if (row == nestedRow) return;
+        row = nestedRow;
+        isNull.clear();
+        cow.clear();
+        for (size_t i = 0, N = std::min(nestedRow->size(), field_to_schema.size()); i<N; i++) {
+            const auto& cell = nestedRow->at(i);
+            if (!cell.isNested) {
+                if (std::holds_alternative<bool>(cell.val))
+                    isNull.insert(i);
+                else if (!std::holds_alternative<size_t>(cell.val)) {
+                    strings.emplace(i);
+                }
+            } else {
+                if (!fullyIndexed) {
+                    for (size_t j = 0, M = cell.table.Schema.size(); j<M; j++) {
+                        nested_schema[schema->at(i)].emplace(cell.table.Schema.at(j), j);
+                    }
+                }
+                // TODO: efficient nested values on demand (COW)
+            }
+        }
+        fullyIndexed = true;
+    }
+
+    bool hasKey(const std::string& key) const {
+        return field_to_schema.contains(key);
+    }
+
+    size_t getNativeInt(const std::string& key) const {
+        auto it = field_to_schema.find(key);
+        if ((!row) || it == field_to_schema.end() || (isNull.contains(it->second)))
+            return -1;
+        else
+            return std::get<size_t>(row->at(it->second).val);
+    }
+
+    DPtr<script::structures::ScriptAST> get(const std::string& key);
+
+private:
+    bool fullyIndexed;
+};
+
+struct TemplateIndexer {
+    std::unordered_map<size_t, SchemaIndexer> map;
+    size_t current_template;
+
+    bool contains(const std::string& key) const {
+        auto it = map.find(current_template);
+        return it != map.end() && (it->second.hasKey(key));
+    }
+
+    DPtr<script::structures::ScriptAST> get(const std::string&key) {
+        auto it = map.find(current_template);
+        if (it == map.end() )
+            return script::structures::ScriptAST::null_();
+        return it->second.get(key);
+    }
+
+    size_t getNativeInt(const std::string&key) const {
+        auto it = map.find(current_template);
+        if (it == map.end() )
+            return -1;
+        return it->second.getNativeInt(key);
+    }
+
+    SchemaIndexer& attemptInitialise(size_t i, const std::vector<std::string> *vector) {
+        if (!map.contains(i)) {
+            auto& ref = map.emplace(i, vector->size()).first->second;
+            ref.setUp(vector);
+            return ref;
+        } else {
+            return map.at(i);
+        }
+    }
+};
+
+
+
+#endif //GSM2_SCHEMAINDEXER_H