left outer join 2 failing sporatically as well in multi case, is because

not every partition is getting a foreign row

Author: octaviansima

src/enclave/Enclave/NonObliviousSortMergeJoin.cpp

@@ -5,6 +5,9 @@
 #include "FlatbuffersWriters.h"
 #include "common.h"
 
+#include <iostream>
+using namespace std;
+
 /** 
  * C++ implementation of a non-oblivious sort merge join.
  * Rows MUST be tagged primary or secondary for this to work.

src/main/scala/edu/berkeley/cs/rise/opaque/strategies.scala

@@ -99,16 +99,14 @@ object OpaqueOperators extends Strategy {
       val sortOrder = sortForJoin(primaryKeysProj, tag, partitioned.output)
       val sorted = EncryptedSortExec(sortOrder, false, partitioned)
 
-      val addedNulls = EncryptedAddDummyRowsExec(1, sorted)
-
       val joined = EncryptedSortMergeJoinExec(
         joinType,
         leftKeysProj,
         rightKeysProj,
         leftProjSchema.map(_.toAttribute),
         rightProjSchema.map(_.toAttribute),
         condition, 
-        addedNulls)
+        sorted)
 
       val tagsDropped = joinType match {
         case Inner | LeftOuter | RightOuter => EncryptedProjectExec(dropTags(left.output, right.output), joined)