From 679c2d5823b524159f1482ff3a62cffb7d6b1135 Mon Sep 17 00:00:00 2001 From: Octavian Sima Date: Wed, 3 Feb 2021 21:18:24 +0000 Subject: [PATCH] upgrade to 3.0.1 --- README.md | 2 +- build.sbt | 2 +- src/main/scala/edu/berkeley/cs/rise/opaque/Utils.scala | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 10d1f5094f..0d0d5b9348 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ After downloading the Opaque codebase, build and test it as follows. ## Usage -Next, run Apache Spark SQL queries with Opaque as follows, assuming [Spark 3.0](https://www.apache.org/dyn/closer.lua/spark/spark-3.0.1/spark-3.0.1-bin-hadoop2.7.tgz) (`wget http://apache.mirrors.pair.com/spark/spark-3.0.1/spark-3.0.1-bin-hadoop2.7.tgz`) is already installed: +Next, run Apache Spark SQL queries with Opaque as follows, assuming [Spark 3.0.1](https://www.apache.org/dyn/closer.lua/spark/spark-3.0.1/spark-3.0.1-bin-hadoop2.7.tgz) (`wget http://apache.mirrors.pair.com/spark/spark-3.0.1/spark-3.0.1-bin-hadoop2.7.tgz`) is already installed: 1. Package Opaque into a JAR: diff --git a/build.sbt b/build.sbt index 95abea0b39..43d6751f41 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ scalaVersion := "2.12.10" spName := "amplab/opaque" -sparkVersion := "3.0.0" +sparkVersion := "3.0.1" sparkComponents ++= Seq("core", "sql", "catalyst") diff --git a/src/main/scala/edu/berkeley/cs/rise/opaque/Utils.scala b/src/main/scala/edu/berkeley/cs/rise/opaque/Utils.scala index 5a85154253..641223a62d 100644 --- a/src/main/scala/edu/berkeley/cs/rise/opaque/Utils.scala +++ b/src/main/scala/edu/berkeley/cs/rise/opaque/Utils.scala @@ -1170,7 +1170,7 @@ object Utils extends Logging { // To avoid the need for special handling of the grouping columns, we transform the grouping expressions // into AggregateExpressions that collect the first seen value. val aggGroupingExpressions = groupingExpressions.map { - case e: NamedExpression => AggregateExpression(First(e, Literal(false)), Complete, false) + case e: NamedExpression => AggregateExpression(First(e, false), Complete, false) } val aggregateExpressions = aggGroupingExpressions ++ aggExpressions @@ -1299,7 +1299,7 @@ object Utils extends Logging { evaluateExprs.map(e => flatbuffersSerializeExpression(builder, e, aggSchema)).toArray) ) - case f @ First(child, Literal(false, BooleanType)) => + case f @ First(child, false) => val first = f.aggBufferAttributes(0) val valueSet = f.aggBufferAttributes(1) @@ -1337,7 +1337,7 @@ object Utils extends Logging { builder, evaluateExprs.map(e => flatbuffersSerializeExpression(builder, e, aggSchema)).toArray)) - case l @ Last(child, Literal(false, BooleanType)) => + case l @ Last(child, false) => val last = l.aggBufferAttributes(0) val valueSet = l.aggBufferAttributes(1)