Merge remote-tracking branch 'origin/master'

karmaresearch · Aug 29, 2019 · 66c98c5 · 66c98c5
2 parents 2625f5d + 452e9b3
commit 66c98c5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/include/vlog/fcinttable.h b/include/vlog/fcinttable.h
@@ -158,7 +158,7 @@ class FCInternalTable {
             throw 10;
         }
 
-		virtual bool supportsMerge() const = 0;
+        virtual bool supportsMerge() const = 0;
 
         virtual std::shared_ptr<const FCInternalTable> merge(
                 std::shared_ptr<const FCInternalTable> t, int nthreads) const = 0;
@@ -549,9 +549,9 @@ class InmemoryFCInternalTable final : public FCInternalTable {
                 const uint8_t *posConstantsToFilter,
                 const Term_t *valuesConstantsToFilter) const;
 
-		bool supportsMerge() const {
-			return true;
-		}
+        bool supportsMerge() const {
+            return true;
+        }
 
         std::shared_ptr<const FCInternalTable> merge(std::shared_ptr<const FCInternalTable> t, int nthreads) const;
 
@@ -645,9 +645,9 @@ class EDBFCInternalTable final : public FCInternalTable {
             return getSortedIterator();
         }
 
-		bool supportsMerge() const {
-			return false;
-		}
+        bool supportsMerge() const {
+            return false;
+        }
 
         std::shared_ptr<const FCInternalTable> merge(std::shared_ptr<const FCInternalTable> t, int nthreads) const;
 
@@ -778,9 +778,9 @@ class SingletonTable final : public FCInternalTable {
             return new SingletonItr(iteration);
         }
 
-		bool supportsMerge() const {
-			return false;
-		}
+        bool supportsMerge() const {
+            return false;
+        }
 
         std::shared_ptr<const FCInternalTable> merge(std::shared_ptr<const FCInternalTable> t, int nthreads) const {
             throw 10;

diff --git a/src/vlog/forward/edbfcinternaltable.cpp b/src/vlog/forward/edbfcinternaltable.cpp
@@ -7,6 +7,7 @@ EDBFCInternalTable::EDBFCInternalTable(const size_t iteration,
     nfields(literal.getNVars()),
     query(QSQQuery(literal)),
     layer(layer) {
+
         uint8_t j = 0;
         defaultSorting.clear();
         for (uint8_t i = 0; i < literal.getTupleSize(); ++i) {

diff --git a/src/vlog/forward/joinprocessor.cpp b/src/vlog/forward/joinprocessor.cpp
@@ -1296,7 +1296,6 @@ void JoinExecutor::mergejoin(const FCInternalTable * t1, SemiNaiver * naiver,
                 std::chrono::system_clock::time_point startGI = std::chrono::system_clock::now();
 #endif
 
-
                 TableFilterer filterer(naiver);
                 std::vector<std::shared_ptr<const FCInternalTable>> tablesToMergeJoin;
                 FCIterator itr2 = naiver->getTable(newLiteralToQuery, min, max,
@@ -1995,7 +1994,16 @@ void JoinExecutor::do_mergejoin(const FCInternalTable * filteredT1,
            */
         secS = std::chrono::system_clock::now() - startS;
         FCInternalTableItr *itr2 = sortedItr2;
-        size_t t2Size = t2->getNRows();
+        size_t t2Size = 0;
+        if (vectors2.size() == 0) {
+            if (t2->isEmpty())
+                t2Size = 0;
+            else
+                t2Size = 1;
+        } else {
+            t2Size = vectors2[0]->size();
+        }
+        assert(t2->getNRows() == t2Size);
         if (faster) {
             sortedItr2 = new VectorFCInternalTableItr(vectors2, 0, t2Size);
             LOG(TRACEL) << "Faster algo";