New slt rewrite after the rebase

ggevay · ggevay · commit b565673cceda · 2025-02-16T17:14:44.000+01:00
diff --git a/test/sqllogictest/ldbc_bi.slt b/test/sqllogictest/ldbc_bi.slt
@@ -2017,7 +2017,7 @@ Explained Query:
             ArrangeBy keys=[[#0{rootpostlanguage}]] // { arity: 1 }
               Distinct project=[#0{rootpostlanguage}] // { arity: 1 }
                 Project (#0{rootpostlanguage}) // { arity: 1 }
-                  Filter (#0{rootpostlanguage} = varchar_to_text(#1)) // { arity: 2 }
+                  Filter (#0{rootpostlanguage} = #1) // { arity: 2 }
                     FlatMap unnest_array({"es", "ta", "pt"}) // { arity: 2 }
                       Distinct project=[#0{rootpostlanguage}] // { arity: 1 }
                         Project (#13{rootpostlanguage}) // { arity: 1 }
diff --git a/test/sqllogictest/ldbc_bi_eager.slt b/test/sqllogictest/ldbc_bi_eager.slt
@@ -2024,7 +2024,7 @@ Explained Query:
             ArrangeBy keys=[[#0{rootpostlanguage}]] // { arity: 1 }
               Distinct project=[#0{rootpostlanguage}] // { arity: 1 }
                 Project (#0{rootpostlanguage}) // { arity: 1 }
-                  Filter (#0{rootpostlanguage} = varchar_to_text(#1)) // { arity: 2 }
+                  Filter (#0{rootpostlanguage} = #1) // { arity: 2 }
                     FlatMap unnest_array({"es", "ta", "pt"}) // { arity: 2 }
                       Distinct project=[#0{rootpostlanguage}] // { arity: 1 }
                         Project (#13{rootpostlanguage}) // { arity: 1 }
diff --git a/test/sqllogictest/tpch_create_index.slt b/test/sqllogictest/tpch_create_index.slt
@@ -282,7 +282,7 @@ materialize.public.q02:
         ReadIndex on=region pk_region_regionkey=[delta join lookup] // { arity: 3 }
     cte l4 =
       Project (#0{p_partkey}, #2{p_mfgr}, #10{s_name}, #11{s_address}, #13{s_phone}..=#15{s_comment}, #19{ps_supplycost}, #22{n_name}) // { arity: 9 }
-        Filter (#5{p_size} = 15) AND (#26{r_name} = "EUROPE") AND like["%BRASS"](varchar_to_text(#4{p_type})) // { arity: 28 }
+        Filter like["%BRASS"](#4{p_type}) AND (#5{p_size} = 15) AND (#26{r_name} = "EUROPE") // { arity: 28 }
           Join on=(#0{p_partkey} = #16{ps_partkey} AND #9{s_suppkey} = #17{ps_suppkey} AND #12{s_nationkey} = #21{n_nationkey} AND #23{n_regionkey} = #25{r_regionkey}) type=delta // { arity: 28 }
             implementation
               %0:part » %2:l1[#0]KA » %1:l0[#0]KA » %3:l2[#0]KA » %4:l3[#0]KAef
@@ -744,7 +744,7 @@ materialize.public.q08:
     Map ((#1{sum} / #2{sum})) // { arity: 4 }
       Reduce group_by=[extract_year_d(#2{o_orderdate})] aggregates=[sum(case when (#3{n_name} = "BRAZIL") then (#0{l_extendedprice} * (1 - #1{l_discount})) else 0 end), sum((#0{l_extendedprice} * (1 - #1{l_discount})))] // { arity: 3 }
         Project (#21{l_extendedprice}, #22{l_discount}, #36{o_orderdate}, #54{n_name}) // { arity: 4 }
-          Filter (#58{r_name} = "AMERICA") AND (#36{o_orderdate} <= 1996-12-31) AND (#36{o_orderdate} >= 1995-01-01) AND ("ECONOMY ANODIZED STEEL" = varchar_to_text(#4{p_type})) // { arity: 60 }
+          Filter (#4{p_type} = "ECONOMY ANODIZED STEEL") AND (#58{r_name} = "AMERICA") AND (#36{o_orderdate} <= 1996-12-31) AND (#36{o_orderdate} >= 1995-01-01) // { arity: 60 }
             Join on=(#0{p_partkey} = #17{l_partkey} AND #9{s_suppkey} = #18{l_suppkey} AND #12{s_nationkey} = #53{n_nationkey} AND #16{l_orderkey} = #32{o_orderkey} AND #33{o_custkey} = #41{c_custkey} AND #44{c_nationkey} = #49{n_nationkey} AND #51{n_regionkey} = #57{r_regionkey}) type=delta // { arity: 60 }
               implementation
                 %0:part » %2:lineitem[#1]KA » %3:orders[#0]KAiif » %1:supplier[#0]KA » %4:customer[#0]KA » %5:nation[#0]KA » %7:region[#0]KAef » %6:nation[#0]KA
@@ -841,7 +841,7 @@ materialize.public.q09_primary_idx:
 materialize.public.q09:
   Reduce group_by=[#5{n_name}, extract_year_d(#4{o_orderdate})] aggregates=[sum(((#1{l_extendedprice} * (1 - #2{l_discount})) - (#3{ps_supplycost} * #0{l_quantity})))] // { arity: 3 }
     Project (#20{l_quantity}..=#22{l_discount}, #35{ps_supplycost}, #41{o_orderdate}, #47{n_name}) // { arity: 6 }
-      Filter like["%green%"](varchar_to_text(#1{p_name})) // { arity: 50 }
+      Filter like["%green%"](#1{p_name}) // { arity: 50 }
         Join on=(#0{p_partkey} = #17{l_partkey} = #32{ps_partkey} AND #9{s_suppkey} = #18{l_suppkey} = #33{ps_suppkey} AND #12{s_nationkey} = #46{n_nationkey} AND #16{l_orderkey} = #37{o_orderkey}) type=delta // { arity: 50 }
           implementation
             %0:part » %2:lineitem[#1]KA » %3:partsupp[#0, #1]KKA » %1:supplier[#0]KA » %4:orders[#0]KA » %5:nation[#0]KA
@@ -1145,7 +1145,7 @@ materialize.public.q13:
         ReadIndex on=customer pk_customer_custkey=[differential join] // { arity: 8 }
     cte l1 =
       Project (#0{c_custkey}, #8{o_orderkey}) // { arity: 2 }
-        Filter NOT(like["%special%requests%"](varchar_to_text(#16{o_comment}))) // { arity: 17 }
+        Filter NOT(like["%special%requests%"](#16{o_comment})) // { arity: 17 }
           Join on=(#0{c_custkey} = #9{o_custkey}) type=differential // { arity: 17 }
             implementation
               %1:orders[#1]KAf » %0:l0[#0]KAf
@@ -1212,7 +1212,7 @@ materialize.public.q14_primary_idx:
 materialize.public.q14:
   With
     cte l0 =
-      Reduce aggregates=[sum(case when like["PROMO%"](varchar_to_text(#2{p_type})) then (#0{l_extendedprice} * (1 - #1{l_discount})) else 0 end), sum((#0{l_extendedprice} * (1 - #1{l_discount})))] // { arity: 2 }
+      Reduce aggregates=[sum(case when like["PROMO%"](#2{p_type}) then (#0{l_extendedprice} * (1 - #1{l_discount})) else 0 end), sum((#0{l_extendedprice} * (1 - #1{l_discount})))] // { arity: 2 }
         Project (#5{l_extendedprice}, #6{l_discount}, #20{p_type}) // { arity: 3 }
           Filter (#10{l_shipdate} >= 1995-09-01) AND (date_to_timestamp(#10{l_shipdate}) < 1995-10-01 00:00:00) // { arity: 25 }
             Join on=(#1{l_partkey} = #16{p_partkey}) type=differential // { arity: 25 }
@@ -1370,7 +1370,7 @@ materialize.public.q16:
   With
     cte l0 =
       Project (#1{ps_suppkey}, #8{p_brand}..=#10{p_size}) // { arity: 4 }
-        Filter (#8{p_brand} != "Brand#45") AND NOT(like["MEDIUM POLISHED%"](varchar_to_text(#9{p_type}))) AND ((#10{p_size} = 3) OR (#10{p_size} = 9) OR (#10{p_size} = 14) OR (#10{p_size} = 19) OR (#10{p_size} = 23) OR (#10{p_size} = 36) OR (#10{p_size} = 45) OR (#10{p_size} = 49)) // { arity: 14 }
+        Filter (#8{p_brand} != "Brand#45") AND NOT(like["MEDIUM POLISHED%"](#9{p_type})) AND ((#10{p_size} = 3) OR (#10{p_size} = 9) OR (#10{p_size} = 14) OR (#10{p_size} = 19) OR (#10{p_size} = 23) OR (#10{p_size} = 36) OR (#10{p_size} = 45) OR (#10{p_size} = 49)) // { arity: 14 }
           Join on=(#0{ps_partkey} = #5{p_partkey}) type=differential // { arity: 14 }
             implementation
               %1:part[#0]KAef » %0:partsupp[#0]KAef
@@ -1403,7 +1403,7 @@ materialize.public.q16:
                           Get l1 // { arity: 1 }
                         ArrangeBy keys=[[]] // { arity: 1 }
                           Project (#0{s_suppkey}) // { arity: 1 }
-                            Filter like["%Customer%Complaints%"](varchar_to_text(#6{s_comment})) // { arity: 7 }
+                            Filter like["%Customer%Complaints%"](#6{s_comment}) // { arity: 7 }
                               ReadIndex on=supplier pk_supplier_suppkey=[*** full scan ***] // { arity: 7 }
               Get l1 // { arity: 1 }
 
@@ -1762,7 +1762,7 @@ materialize.public.q20:
           ArrangeBy keys=[[#0{p_partkey}]] // { arity: 1 }
             Distinct project=[#0{p_partkey}] // { arity: 1 }
               Project (#0{p_partkey}) // { arity: 1 }
-                Filter (#0{p_partkey}) IS NOT NULL AND like["forest%"](varchar_to_text(#1{p_name})) // { arity: 9 }
+                Filter like["forest%"](#1{p_name}) AND (#0{p_partkey}) IS NOT NULL // { arity: 9 }
                   ReadIndex on=part pk_part_partkey=[*** full scan ***] // { arity: 9 }
   Return // { arity: 2 }
     Project (#1{s_name}, #2{s_address}) // { arity: 2 }
diff --git a/test/sqllogictest/tpch_create_materialized_view.slt b/test/sqllogictest/tpch_create_materialized_view.slt
@@ -261,7 +261,7 @@ materialize.public.q02:
         ReadIndex on=region pk_region_regionkey=[delta join lookup] // { arity: 3 }
     cte l4 =
       Project (#0{p_partkey}, #2{p_mfgr}, #10{s_name}, #11{s_address}, #13{s_phone}..=#15{s_comment}, #19{ps_supplycost}, #22{n_name}) // { arity: 9 }
-        Filter (#5{p_size} = 15) AND (#26{r_name} = "EUROPE") AND like["%BRASS"](varchar_to_text(#4{p_type})) // { arity: 28 }
+        Filter like["%BRASS"](#4{p_type}) AND (#5{p_size} = 15) AND (#26{r_name} = "EUROPE") // { arity: 28 }
           Join on=(#0{p_partkey} = #16{ps_partkey} AND #9{s_suppkey} = #17{ps_suppkey} AND #12{s_nationkey} = #21{n_nationkey} AND #23{n_regionkey} = #25{r_regionkey}) type=delta // { arity: 28 }
             implementation
               %0:part » %2:l1[#0]KA » %1:l0[#0]KA » %3:l2[#0]KA » %4:l3[#0]KAef
@@ -669,7 +669,7 @@ materialize.public.q08:
     Map ((#1{sum} / #2{sum})) // { arity: 4 }
       Reduce group_by=[extract_year_d(#2{o_orderdate})] aggregates=[sum(case when (#3{n_name} = "BRAZIL") then (#0{l_extendedprice} * (1 - #1{l_discount})) else 0 end), sum((#0{l_extendedprice} * (1 - #1{l_discount})))] // { arity: 3 }
         Project (#21{l_extendedprice}, #22{l_discount}, #36{o_orderdate}, #54{n_name}) // { arity: 4 }
-          Filter (#58{r_name} = "AMERICA") AND (#36{o_orderdate} <= 1996-12-31) AND (#36{o_orderdate} >= 1995-01-01) AND ("ECONOMY ANODIZED STEEL" = varchar_to_text(#4{p_type})) // { arity: 60 }
+          Filter (#4{p_type} = "ECONOMY ANODIZED STEEL") AND (#58{r_name} = "AMERICA") AND (#36{o_orderdate} <= 1996-12-31) AND (#36{o_orderdate} >= 1995-01-01) // { arity: 60 }
             Join on=(#0{p_partkey} = #17{l_partkey} AND #9{s_suppkey} = #18{l_suppkey} AND #12{s_nationkey} = #53{n_nationkey} AND #16{l_orderkey} = #32{o_orderkey} AND #33{o_custkey} = #41{c_custkey} AND #44{c_nationkey} = #49{n_nationkey} AND #51{n_regionkey} = #57{r_regionkey}) type=delta // { arity: 60 }
               implementation
                 %0:part » %2:lineitem[#1]KA » %3:orders[#0]KAiif » %1:supplier[#0]KA » %4:customer[#0]KA » %5:nation[#0]KA » %7:region[#0]KAef » %6:nation[#0]KA
@@ -757,7 +757,7 @@ ORDER BY
 materialize.public.q09:
   Reduce group_by=[#5{n_name}, extract_year_d(#4{o_orderdate})] aggregates=[sum(((#1{l_extendedprice} * (1 - #2{l_discount})) - (#3{ps_supplycost} * #0{l_quantity})))] // { arity: 3 }
     Project (#20{l_quantity}..=#22{l_discount}, #35{ps_supplycost}, #41{o_orderdate}, #47{n_name}) // { arity: 6 }
-      Filter like["%green%"](varchar_to_text(#1{p_name})) // { arity: 50 }
+      Filter like["%green%"](#1{p_name}) // { arity: 50 }
         Join on=(#0{p_partkey} = #17{l_partkey} = #32{ps_partkey} AND #9{s_suppkey} = #18{l_suppkey} = #33{ps_suppkey} AND #12{s_nationkey} = #46{n_nationkey} AND #16{l_orderkey} = #37{o_orderkey}) type=delta // { arity: 50 }
           implementation
             %0:part » %2:lineitem[#1]KA » %3:partsupp[#0, #1]KKA » %1:supplier[#0]KA » %4:orders[#0]KA » %5:nation[#0]KA
@@ -1025,7 +1025,7 @@ materialize.public.q13:
         ReadIndex on=customer pk_customer_custkey=[differential join] // { arity: 8 }
     cte l1 =
       Project (#0{c_custkey}, #8{o_orderkey}) // { arity: 2 }
-        Filter NOT(like["%special%requests%"](varchar_to_text(#16{o_comment}))) // { arity: 17 }
+        Filter NOT(like["%special%requests%"](#16{o_comment})) // { arity: 17 }
           Join on=(#0{c_custkey} = #9{o_custkey}) type=differential // { arity: 17 }
             implementation
               %1:orders[#1]KAf » %0:l0[#0]KAf
@@ -1083,7 +1083,7 @@ WHERE
 materialize.public.q14:
   With
     cte l0 =
-      Reduce aggregates=[sum(case when like["PROMO%"](varchar_to_text(#2{p_type})) then (#0{l_extendedprice} * (1 - #1{l_discount})) else 0 end), sum((#0{l_extendedprice} * (1 - #1{l_discount})))] // { arity: 2 }
+      Reduce aggregates=[sum(case when like["PROMO%"](#2{p_type}) then (#0{l_extendedprice} * (1 - #1{l_discount})) else 0 end), sum((#0{l_extendedprice} * (1 - #1{l_discount})))] // { arity: 2 }
         Project (#5{l_extendedprice}, #6{l_discount}, #20{p_type}) // { arity: 3 }
           Filter (#10{l_shipdate} >= 1995-09-01) AND (date_to_timestamp(#10{l_shipdate}) < 1995-10-01 00:00:00) // { arity: 25 }
             Join on=(#1{l_partkey} = #16{p_partkey}) type=differential // { arity: 25 }
@@ -1226,7 +1226,7 @@ materialize.public.q16:
   With
     cte l0 =
       Project (#1{ps_suppkey}, #8{p_brand}..=#10{p_size}) // { arity: 4 }
-        Filter (#8{p_brand} != "Brand#45") AND NOT(like["MEDIUM POLISHED%"](varchar_to_text(#9{p_type}))) AND ((#10{p_size} = 3) OR (#10{p_size} = 9) OR (#10{p_size} = 14) OR (#10{p_size} = 19) OR (#10{p_size} = 23) OR (#10{p_size} = 36) OR (#10{p_size} = 45) OR (#10{p_size} = 49)) // { arity: 14 }
+        Filter (#8{p_brand} != "Brand#45") AND NOT(like["MEDIUM POLISHED%"](#9{p_type})) AND ((#10{p_size} = 3) OR (#10{p_size} = 9) OR (#10{p_size} = 14) OR (#10{p_size} = 19) OR (#10{p_size} = 23) OR (#10{p_size} = 36) OR (#10{p_size} = 45) OR (#10{p_size} = 49)) // { arity: 14 }
           Join on=(#0{ps_partkey} = #5{p_partkey}) type=differential // { arity: 14 }
             implementation
               %1:part[#0]KAef » %0:partsupp[#0]KAef
@@ -1259,7 +1259,7 @@ materialize.public.q16:
                           Get l1 // { arity: 1 }
                         ArrangeBy keys=[[]] // { arity: 1 }
                           Project (#0{s_suppkey}) // { arity: 1 }
-                            Filter like["%Customer%Complaints%"](varchar_to_text(#6{s_comment})) // { arity: 7 }
+                            Filter like["%Customer%Complaints%"](#6{s_comment}) // { arity: 7 }
                               ReadIndex on=supplier pk_supplier_suppkey=[*** full scan ***] // { arity: 7 }
               Get l1 // { arity: 1 }
 
@@ -1582,7 +1582,7 @@ materialize.public.q20:
           ArrangeBy keys=[[#0{p_partkey}]] // { arity: 1 }
             Distinct project=[#0{p_partkey}] // { arity: 1 }
               Project (#0{p_partkey}) // { arity: 1 }
-                Filter (#0{p_partkey}) IS NOT NULL AND like["forest%"](varchar_to_text(#1{p_name})) // { arity: 9 }
+                Filter like["forest%"](#1{p_name}) AND (#0{p_partkey}) IS NOT NULL // { arity: 9 }
                   ReadIndex on=part pk_part_partkey=[*** full scan ***] // { arity: 9 }
   Return // { arity: 2 }
     Project (#1{s_name}, #2{s_address}) // { arity: 2 }
diff --git a/test/sqllogictest/tpch_select.slt b/test/sqllogictest/tpch_select.slt
