Skip to content

TPC-H 20 Fix #142

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
octaviansima merged 6 commits into from
Feb 8, 2021
Merged

TPC-H 20 Fix #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
778ae86
string to stringtype error
octaviansima Feb 2, 2021
a0a117c
tpch 20 passes
octaviansima Feb 2, 2021
e54648c
cleanup
octaviansima Feb 2, 2021
c668e02
implemented changes
octaviansima Feb 3, 2021
10715d4
decimal.tofloat
octaviansima Feb 8, 2021
d15d9f7
Merge branch 'master' into tpch-20-decimals
wzheng Feb 8, 2021
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
49 changes: 38 additions & 11 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 @@ -73,7 +73,6 @@ import org.apache.spark.sql.catalyst.expressions.SortOrder
import org.apache.spark.sql.catalyst.expressions.StartsWith
import org.apache.spark.sql.catalyst.expressions.Substring
import org.apache.spark.sql.catalyst.expressions.Subtract
import org.apache.spark.sql.catalyst.expressions.TimeAdd
import org.apache.spark.sql.catalyst.expressions.UnaryMinus
import org.apache.spark.sql.catalyst.expressions.Upper
import org.apache.spark.sql.catalyst.expressions.Year
Expand Down Expand Up @@ -109,6 +108,8 @@ import edu.berkeley.cs.rise.opaque.expressions.VectorMultiply
import edu.berkeley.cs.rise.opaque.expressions.VectorSum
import edu.berkeley.cs.rise.opaque.logical.ConvertToOpaqueOperators
import edu.berkeley.cs.rise.opaque.logical.EncryptLocalRelation
import org.apache.spark.sql.catalyst.expressions.PromotePrecision
import org.apache.spark.sql.catalyst.expressions.CheckOverflow

object Utils extends Logging {
private val perf: Boolean = System.getenv("SGX_PERF") == "1"
Expand Down Expand Up @@ -350,8 +351,6 @@ object Utils extends Logging {
rdd.foreach(x => {})
}



def flatbuffersCreateField(
builder: FlatBufferBuilder, value: Any, dataType: DataType, isNull: Boolean): Int = {
(value, dataType) match {
Expand Down Expand Up @@ -403,6 +402,18 @@ object Utils extends Logging {
tuix.FieldUnion.FloatField,
tuix.FloatField.createFloatField(builder, 0),
isNull)
case (x: Decimal, DecimalType()) =>
tuix.Field.createField(
builder,
tuix.FieldUnion.FloatField,
tuix.FloatField.createFloatField(builder, x.toFloat),
isNull)
case (null, DecimalType()) =>
tuix.Field.createField(
builder,
tuix.FieldUnion.FloatField,
tuix.FloatField.createFloatField(builder, 0),
isNull)
case (x: Double, DoubleType) =>
tuix.Field.createField(
builder,
Expand Down Expand Up @@ -779,6 +790,18 @@ object Utils extends Logging {
op(fromChildren, tree)
}

def getColType(dataType: DataType) = {
dataType match {
case IntegerType => tuix.ColType.IntegerType
case LongType => tuix.ColType.LongType
case FloatType => tuix.ColType.FloatType
case DecimalType() => tuix.ColType.FloatType
case DoubleType => tuix.ColType.DoubleType
case StringType => tuix.ColType.StringType
case _ => throw new OpaqueException("Type not supported: " + dataType.toString())
}
}

/** Serialize an Expression into a tuix.Expr. Returns the offset of the written tuix.Expr. */
def flatbuffersSerializeExpression(
builder: FlatBufferBuilder, expr: Expression, input: Seq[Attribute]): Int = {
Expand Down Expand Up @@ -811,14 +834,7 @@ object Utils extends Logging {
tuix.Cast.createCast(
builder,
childOffset,
dataType match {
case IntegerType => tuix.ColType.IntegerType
case LongType => tuix.ColType.LongType
case FloatType => tuix.ColType.FloatType
case DoubleType => tuix.ColType.DoubleType
case StringType => tuix.ColType.StringType
}))

getColType(dataType)))
// Arithmetic
case (Add(left, right), Seq(leftOffset, rightOffset)) =>
tuix.Expr.createExpr(
Expand Down Expand Up @@ -1087,6 +1103,17 @@ object Utils extends Logging {
tuix.ExprUnion.ClosestPoint,
tuix.ClosestPoint.createClosestPoint(
builder, leftOffset, rightOffset))

case (PromotePrecision(child), Seq(childOffset)) =>
// TODO: Implement decimal serialization, followed by PromotePrecision
childOffset

case (CheckOverflow(child, dataType, _), Seq(childOffset)) =>
// TODO: Implement decimal serialization, followed by CheckOverflow
childOffset

case (_, Seq(childOffset)) =>
throw new OpaqueException("Expression not supported: " + expr.toString())
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/edu/berkeley/cs/rise/opaque/TPCHTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ trait TPCHTests extends OpaqueTestsBase { self =>
tpch.query(19, securityLevel, spark.sqlContext, numPartitions).collect.toSet
}

testAgainstSpark("TPC-H 20", ignore) { securityLevel =>
tpch.query(20, securityLevel, spark.sqlContext, numPartitions).collect
testAgainstSpark("TPC-H 20") { securityLevel =>
tpch.query(20, securityLevel, spark.sqlContext, numPartitions).collect.toSet
}

testAgainstSpark("TPC-H 21", ignore) { securityLevel =>
Expand Down