collect instead of force, sf_none

Author: octaviansima

src/main/scala/edu/berkeley/cs/rise/opaque/benchmark/Benchmark.scala

@@ -46,7 +46,7 @@ object Benchmark {
   var numPartitions = 2 * spark.sparkContext
       .getConf
       .getInt("spark.executor.instances", 2)
-  var size = "sf_small"
+  var size = "sf_none"
 
   def dataDir: String = {
     if (System.getenv("SPARKSGX_DATA_DIR") == null) {
@@ -97,7 +97,7 @@ object Benchmark {
         this.numPartitions = numPartitions.toInt
       }
       case Array("--size", size: String) => {
-        val supportedSizes = Set("sf_small")
+        val supportedSizes = Set("sf_small", "sf_none")
         if (supportedSizes.contains(size)) {
           this.size = size
         } else {

src/main/scala/edu/berkeley/cs/rise/opaque/benchmark/TPCHBenchmark.scala

@@ -31,19 +31,15 @@ object TPCHBenchmark {
         "query" -> s"TPC-H $queryNumber",
         "system" -> Insecure.name) {
 
-      val df = tpch.performQuery(sqlStr, Insecure)
-      Utils.force(df)
-      df
+      tpch.performQuery(sqlStr, Insecure).collect
     }
 
     Utils.timeBenchmark(
         "distributed" -> (numPartitions > 1),
         "query" -> s"TPC-H $queryNumber",
         "system" -> Encrypted.name) {
 
-      val df = tpch.performQuery(sqlStr, Encrypted)
-      Utils.force(df)
-      df
+      tpch.performQuery(sqlStr, Encrypted).collect
     }
   }