Translator.Expressions: less wasted operations

+ renames in PartialIndexFilterBuilder

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Building/Builders/PartialIndexFilterBuilder.cs

@@ -47,29 +47,29 @@ public static void BuildFilter(IndexInfo index)
     protected override Expression VisitBinary(BinaryExpression b)
     {
       if (EnumRewritableOperations(b)) {
-        var rawLeft = b.Left.StripCasts();
-        var rawLeftType = rawLeft.Type.StripNullable();
-        var rawRight = b.Right.StripCasts();
-        var rawRightType = rawRight.Type.StripNullable();
+        var bareLeft = b.Left.StripCasts();
+        var bareLeftType = bareLeft.Type.StripNullable();
+        var bareRight = b.Right.StripCasts();
+        var bareRightType = bareRight.Type.StripNullable();
 
-        if (rawLeftType.IsEnum && rawRight.NodeType == ExpressionType.Constant) {
-          var typeToCast = rawLeft.Type.IsNullable()
-            ? rawLeftType.GetEnumUnderlyingType().ToNullable()
-            : rawLeft.Type.GetEnumUnderlyingType();
+        if (bareLeftType.IsEnum && bareRight.NodeType == ExpressionType.Constant) {
+          var typeToCast = bareLeft.Type.IsNullable()
+            ? bareLeftType.GetEnumUnderlyingType().ToNullable()
+            : bareLeft.Type.GetEnumUnderlyingType();
 
           return base.VisitBinary(Expression.MakeBinary(
             b.NodeType,
-            Expression.Convert(rawLeft, typeToCast),
+            Expression.Convert(bareLeft, typeToCast),
             Expression.Convert(b.Right, typeToCast)));
         }
-        else if (rawRightType.IsEnum && rawLeft.NodeType == ExpressionType.Constant) {
-          var typeToCast = rawRight.Type.IsNullable()
-            ? rawRightType.GetEnumUnderlyingType().ToNullable()
-            : rawRight.Type.GetEnumUnderlyingType();
+        else if (bareRightType.IsEnum && bareLeft.NodeType == ExpressionType.Constant) {
+          var typeToCast = bareRight.Type.IsNullable()
+            ? bareRightType.GetEnumUnderlyingType().ToNullable()
+            : bareRight.Type.GetEnumUnderlyingType();
 
           return base.VisitBinary(Expression.MakeBinary(
             b.NodeType,
-            Expression.Convert(rawRight, typeToCast),
+            Expression.Convert(bareRight, typeToCast),
             Expression.Convert(b.Left, typeToCast)));
         }
       }

Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs

@@ -207,29 +207,33 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression)
           right = Visit(binaryExpression.Right);
         }
       }
-      // Following two checks for enums are here to improve result query
-      // performance because they let not to cast columns to integer.
-      else if (EnumRewritableOperations(binaryExpression) 
-          && binaryExpression.Left.StripCasts() is var rawLeft1 &&  rawLeft1.Type.StripNullable().IsEnum
-          && binaryExpression.Right.StripCasts() is var rawRight1 && rawRight1.NodeType == ExpressionType.Constant) {
-        var rawEnum = rawLeft1;
-
-        var typeToCast = (rawEnum.Type.IsNullable())
-          ? rawEnum.Type.StripNullable().GetEnumUnderlyingType().ToNullable()
-          : rawEnum.Type.GetEnumUnderlyingType();
-        left = Visit(Expression.Convert(rawEnum, typeToCast));
-        right = Visit(Expression.Convert(binaryExpression.Right, typeToCast));
-      }
-      else if (EnumRewritableOperations(binaryExpression)
-          && binaryExpression.Right.StripCasts() is var rawRight2 && rawRight2.Type.StripNullable().IsEnum
-          && binaryExpression.Left.StripCasts() is var rawLeft2 && rawLeft2.NodeType == ExpressionType.Constant) {
-        var rawEnum = rawRight2;
-
-        var typeToCast = (rawEnum.Type.IsNullable())
-          ? rawEnum.Type.StripNullable().GetEnumUnderlyingType().ToNullable()
-          : rawEnum.Type.GetEnumUnderlyingType();
-        left = Visit(Expression.Convert(rawEnum, typeToCast));
-        right = Visit(Expression.Convert(binaryExpression.Left, typeToCast));
+      else if (EnumRewritableOperations(binaryExpression)) {
+        // Following two checks for enums are here to improve result query
+        // performance because they let not to cast columns to integer.
+
+        var bareLeft = binaryExpression.Left.StripCasts();
+        var bareLeftType = bareLeft.Type.StripNullable();
+        var bareRight = binaryExpression.Right.StripCasts();
+        var bareRightType = bareRight.Type.StripNullable();
+
+        if (bareLeftType.IsEnum && bareRight.NodeType == ExpressionType.Constant) {
+          var typeToCast = bareLeft.Type.IsNullable()
+            ? bareLeftType.GetEnumUnderlyingType().ToNullable()
+            : bareLeft.Type.GetEnumUnderlyingType();
+          left = Visit(Expression.Convert(bareLeft, typeToCast));
+          right = Visit(Expression.Convert(binaryExpression.Right, typeToCast));
+        }
+        else if (bareRightType.IsEnum && bareLeft.NodeType == ExpressionType.Constant) {
+          var typeToCast = (bareRight.Type.IsNullable())
+            ? bareRightType.GetEnumUnderlyingType().ToNullable()
+            : bareRight.Type.GetEnumUnderlyingType();
+          left = Visit(Expression.Convert(bareRight, typeToCast));
+          right = Visit(Expression.Convert(binaryExpression.Left, typeToCast));
+        }
+        else {
+          left = Visit(binaryExpression.Left);
+          right = Visit(binaryExpression.Right);
+        }
       }
       else {
         left = Visit(binaryExpression.Left);