Skip to content

Upgrade Spark to 3.0.1 #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wzheng merged 1 commit into from
Feb 8, 2021
Merged

Upgrade Spark to 3.0.1 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ scalaVersion := "2.12.10"

spName := "amplab/opaque"

sparkVersion := "3.0.0"
sparkVersion := "3.0.1"

sparkComponents ++= Seq("core", "sql", "catalyst")

Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/edu/berkeley/cs/rise/opaque/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down