Revert "chore: add some static optimization (#294)" (#344)

This partially reverts commit 60db9d0.

This is causing performance regressions

Author: stephenamar-db

sjsonnet/src/sjsonnet/StaticOptimizer.scala

@@ -40,12 +40,9 @@ class StaticOptimizer(
 
     case BinaryOp(pos, lhs, BinaryOp.OP_in, ValidSuper(_, selfIdx)) =>
       InSuper(pos, lhs, selfIdx)
-    case BinaryOp(pos, Val.Str(_, key), BinaryOp.OP_in, obj: Val.Obj) if obj.staticSafe =>
-      Val.bool(pos, obj.containsKey(key))
     case b2 @ BinaryOp(pos, lhs: Val.Str, BinaryOp.OP_%, rhs) =>
       try ApplyBuiltin1(pos, new Format.PartialApplyFmt(lhs.value), rhs, tailstrict = false)
       catch { case _: Exception => b2 }
-    //optimize booleans
     case Or(_, Val.False(_), rhs) => transform(rhs)
     case Or(pos, Val.True(_), _) => Val.True(pos)
     case Or(pos, _, Val.True(_)) => Val.True(pos)
@@ -55,61 +52,6 @@ class StaticOptimizer(
     case UnaryOp(pos, UnaryOp.OP_!, Val.True(_)) => Val.False(pos)
     case UnaryOp(pos, UnaryOp.OP_!, Val.False(_)) => Val.True(pos)
     case UnaryOp(_, UnaryOp.OP_!, UnaryOp(_, UnaryOp.OP_!, expr)) => expr
-    //optimize for numbers
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_+, Val.Num(_, r)) => Val.Num(pos, l + r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_-, Val.Num(_, r)) => Val.Num(pos, l - r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_*, Val.Num(_, r)) => Val.Num(pos, l * r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_/, Val.Num(_, r)) if r != 0 => Val.Num(pos, l / r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_%, Val.Num(_, r)) if r != 0 => Val.Num(pos, l % r)
-    case UnaryOp(pos, UnaryOp.OP_+, Val.Num(_, v)) => Val.Num(pos, v)
-    case UnaryOp(pos, UnaryOp.OP_-, Val.Num(_, v)) => Val.Num(pos, -v)
-    case UnaryOp(pos, UnaryOp.OP_~, Val.Num(_, v)) => Val.Num(pos, ~v.toLong)
-    //optimize for bitwise
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_&, Val.Num(_, r)) =>
-      Val.Num(pos, l.toLong & r.toLong)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_^, Val.Num(_, r)) =>
-      Val.Num(pos, l.toLong ^ r.toLong)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_|, Val.Num(_, r)) =>
-      Val.Num(pos, l.toLong | r.toLong)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_<<, Val.Num(_, r)) if r.isValidInt =>
-      Val.Num(pos, l.toLong << r.toInt)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_>>, Val.Num(_, r)) if r.isValidInt =>
-      Val.Num(pos, l.toLong >> r.toInt)
-    //optimize for strings
-    case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_+, Val.Str(_, r)) => Val.Str(pos, l + r)
-    //optimize for comparing
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_==, Val.Num(_, r)) => Val.bool(pos, l == r)
-    case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_==, Val.Str(_, r)) => Val.bool(pos, l == r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_!=, Val.Num(_, r)) => Val.bool(pos, l != r)
-    case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_!=, Val.Str(_, r)) => Val.bool(pos, l != r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_<, Val.Num(_, r)) => Val.bool(pos, l < r)
-    case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_<, Val.Str(_, r)) => Val.bool(pos, l < r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_>, Val.Num(_, r)) => Val.bool(pos, l > r)
-    case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_>, Val.Str(_, r)) => Val.bool(pos, l > r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_<=, Val.Num(_, r)) => Val.bool(pos, l <= r)
-    case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_<=, Val.Str(_, r)) => Val.bool(pos, l <= r)
-    case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_>=, Val.Num(_, r)) => Val.bool(pos, l >= r)
-    case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_>=, Val.Str(_, r)) => Val.bool(pos, l >= r)
-    //optimize for if else
-    case IfElse(_, Val.True(_), thenExpr, _) => transform(thenExpr)
-    case IfElse(pos, Val.False(_), _, elseExpr) => `elseExpr` match {
-      case null => Val.Null(pos)
-      case _ => transform(elseExpr)
-    }
-    //optimize for obj
-    case b3@BinaryOp(_, lhs: Val.Obj, BinaryOp.OP_+, rhs: Val.Obj) if lhs.staticSafe && rhs.staticSafe =>
-      if (lhs.allKeyNames.isEmpty) {
-        rhs
-      } else if (rhs.allKeyNames.isEmpty) {
-        lhs
-      } else b3
-    //optimize for arr
-    case b4@BinaryOp(pos, lhs: Val.Arr, BinaryOp.OP_+, rhs: Val.Arr) =>
-      if (lhs.length == 0) {
-        new Val.Arr(pos, rhs.asLazyArray)
-      } else if (rhs.length == 0) {
-        new Val.Arr(pos, lhs.asLazyArray)
-      } else b4
 
     case e @ Id(pos, name) =>
       scope.get(name) match {

sjsonnet/src/sjsonnet/Val.scala

@@ -409,8 +409,6 @@ object Val{
         f(k, v)
       }
     }
-
-    def staticSafe:Boolean = static
   }
 
   final class StaticObjectFieldSet(protected val keys: Array[String]) {