Merge pull request #22668 from RaduBerinde/tag-const

opt: tag constant values
cockroachdb · Feb 13, 2018 · 61ac7fe · 61ac7fe
2 parents c02d506 + 7409b27
commit 61ac7fe
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 3 deletions.
diff --git a/pkg/sql/opt/ops/scalar.opt b/pkg/sql/opt/ops/scalar.opt
@@ -22,22 +22,22 @@ define Variable {
 
 # Const is a typed scalar constant value. The private field is a tree.Datum
 # value having any datum type that's legal in the expression's context.
-[Scalar]
+[Scalar, ConstValue]
 define Const {
     Value Datum
 }
 
 # True is the boolean true value that is equivalent to the tree.DBoolTrue datum
 # value. It is a separate operator to make matching and replacement simpler and
 # more efficient, as patterns can contain (True) expressions.
-[Scalar, Boolean]
+[Scalar, Boolean, ConstValue]
 define True {
 }
 
 # False is the boolean false value that is equivalent to the tree.DBoolFalse
 # datum value. It is a separate operator to make matching and replacement
 # simpler and more efficient, as patterns can contain (False) expressions.
-[Scalar, Boolean]
+[Scalar, Boolean, ConstValue]
 define False {
 }
 

diff --git a/pkg/sql/opt/opt/operator.og.go b/pkg/sql/opt/opt/operator.og.go
diff --git a/pkg/sql/opt/xform/expr.og.go b/pkg/sql/opt/xform/expr.og.go