Merge remote-tracking branch 'origin/master'

karmaresearch · Aug 7, 2022 · 94ab253 · 94ab253
2 parents 1341b80 + 5d87ab9
commit 94ab253
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/include/vlog/edb.h b/include/vlog/edb.h
@@ -148,21 +148,21 @@ class EDBLayer {
 
         VLIBEXP void addTridentTable(const EDBConf::Table &tableConf, bool multithreaded);
 
-        void addTopKTable(const EDBConf::Table &tableConf);
+        VLIBEXP void addTopKTable(const EDBConf::Table &tableConf);
 
-        void addEmbTable(const EDBConf::Table &tableConf);
+        VLIBEXP void addEmbTable(const EDBConf::Table &tableConf);
 
 #ifdef MYSQL
-        void addMySQLTable(const EDBConf::Table &tableConf);
+        VLIBEXP void addMySQLTable(const EDBConf::Table &tableConf);
 #endif
 #ifdef ODBC
-        void addODBCTable(const EDBConf::Table &tableConf);
+        VLIBEXP void addODBCTable(const EDBConf::Table &tableConf);
 #endif
 #ifdef MAPI
-        void addMAPITable(const EDBConf::Table &tableConf);
+        VLIBEXP void addMAPITable(const EDBConf::Table &tableConf);
 #endif
 #ifdef MDLITE
-        void addMDLiteTable(const EDBConf::Table &tableConf);
+        VLIBEXP void addMDLiteTable(const EDBConf::Table &tableConf);
 #endif
         VLIBEXP void addInmemoryTable(const EDBConf::Table &tableConf);
         VLIBEXP void addSparqlTable(const EDBConf::Table &tableConf);
@@ -178,7 +178,7 @@ class EDBLayer {
         NamedSemiNaiver prevSemiNaiver;
 
         // need to import the mapping predid -> Predicate from prevSemiNaiver
-        void handlePrevSemiNaiver();
+        VLIBEXP void handlePrevSemiNaiver();
 
         std::string name;
 

diff --git a/include/vlog/edbconf.h b/include/vlog/edbconf.h
@@ -32,7 +32,7 @@ class EDBConf {
 
         void setRootPath(std::string path);
 
-        std::string getRootPath() const;
+        VLIBEXP std::string getRootPath() const;
 
         const std::vector<Table> &getTables() const {
             return tables;

diff --git a/src/vlog/forward/edbfcinternaltable.cpp b/src/vlog/forward/edbfcinternaltable.cpp
@@ -38,7 +38,7 @@ std::pair<std::shared_ptr<const Segment>,
         SegmentInserter oldTuples(nfields);
         SegmentInserter newTuples(nfields);
         auto itr = getSortedIterator();
-        Term_t row[nfields];
+        Term_t row[256];
         while (itr->hasNext()) {
             itr->next();
             for(size_t i = 0; i < nfields; ++i) {

diff --git a/src/vlog/forward/fcinttable.cpp b/src/vlog/forward/fcinttable.cpp
@@ -558,7 +558,7 @@ std::pair<std::shared_ptr<const Segment>,
         SegmentInserter newTuples(nfields);
 
         auto itr = getSortedIterator();
-        Term_t row[nfields];
+        Term_t row[256];
         while (itr->hasNext()) {
             itr->next();
             for(size_t i = 0; i < nfields; ++i) {

diff --git a/src/vlog/ml/helper.cpp b/src/vlog/ml/helper.cpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <sstream>
 #include <iostream>
+#include <ctime>
 #include <vlog/ml/helper.h>
 
 using namespace std;

diff --git a/win64/vlog-core/vlog-core.vcxproj b/win64/vlog-core/vlog-core.vcxproj
@@ -27,9 +27,12 @@
     <ClCompile Include="..\..\src\vlog\common\idxtupletable.cpp" />
     <ClCompile Include="..\..\src\vlog\common\sqltable.cpp" />
     <ClCompile Include="..\..\src\vlog\cycles\checker.cpp" />
-    <ClCompile Include="..\..\src\vlog\deps\detector.cpp" />
-    <ClCompile Include="..\..\src\vlog\deps\mapping.cpp" />
-    <ClCompile Include="..\..\src\vlog\deps\tgpath.cpp" />
+    <ClCompile Include="..\..\src\vlog\embeddings\embtable.cpp" />
+    <ClCompile Include="..\..\src\vlog\embeddings\topktable.cpp" />
+    <ClCompile Include="..\..\src\vlog\trigger\detector.cpp" />
+    <ClCompile Include="..\..\src\vlog\trigger\mapping.cpp" />
+    <ClCompile Include="..\..\src\vlog\trigger\tg.cpp" />
+    <ClCompile Include="..\..\src\vlog\trigger\tgpath.cpp" />
     <ClCompile Include="..\..\src\vlog\forward\chasemgmt.cpp" />
     <ClCompile Include="..\..\src\vlog\forward\column.cpp" />
     <ClCompile Include="..\..\src\vlog\forward\edbfcinternaltable.cpp" />
@@ -48,9 +51,16 @@
     <ClCompile Include="..\..\src\vlog\forward\seminaiver.cpp" />
     <ClCompile Include="..\..\src\vlog\forward\seminaiver_threaded.cpp" />
     <ClCompile Include="..\..\src\vlog\forward\seminaiver_trigger.cpp" />
+    <ClCompile Include="..\..\src\vlog\forward\egdresultjoinproc.cpp" />
+    <ClCompile Include="..\..\src\vlog\incremental\edb-table-from-idb.cpp" />
+    <ClCompile Include="..\..\src\vlog\incremental\edb-table-importer.cpp" />
+    <ClCompile Include="..\..\src\vlog\incremental\incremental-concepts.cpp" />
+    <ClCompile Include="..\..\src\vlog\incremental\removal.cpp" />
     <ClCompile Include="..\..\src\vlog\inmemory\inmemorytable.cpp" />
     <ClCompile Include="..\..\src\vlog\magic\wizard.cpp" />
     <ClCompile Include="..\..\src\vlog\ml\ml.cpp" />
+    <ClCompile Include="..\..\src\vlog\ml\LogisticRegression.cpp" />
+    <ClCompile Include="..\..\src\vlog\ml\helper.cpp" />
     <ClCompile Include="..\..\src\vlog\reasoner.cpp" />
     <ClCompile Include="..\..\src\vlog\sparql\sparqliterator.cpp" />
     <ClCompile Include="..\..\src\vlog\sparql\sparqltable.cpp" />