adjust + fuse types tests

substrait-io · Jan 9, 2025 · 296155a · 296155a
1 parent 99d18f0
commit 296155a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 58 deletions.
diff --git a/test/Dialect/Substrait/types.mlir b/test/Dialect/Substrait/types.mlir
@@ -1,6 +1,20 @@
 // RUN: substrait-opt -split-input-file %s \
 // RUN: | FileCheck %s
 
+// CHECK-LABEL: substrait.plan
+// CHECK:         relation
+// CHECK:         %[[V0:.*]] = named_table @t1 as ["a", "b"] : tuple<!substrait.interval_year, !substrait.interval_day>
+// CHECK-NEXT:    yield %0 : tuple<!substrait.interval_year, !substrait.interval_day>
+
+substrait.plan version 0 : 42 : 1 {
+  relation {
+    %0 = named_table @t1 as ["a", "b"] : tuple<!substrait.interval_year, !substrait.interval_day>
+    yield %0 : tuple<!substrait.interval_year, !substrait.interval_day>
+  }
+}
+
+// -----
+
 // CHECK-LABEL: substrait.plan
 // CHECK:         relation
 // CHECK:         %[[V0:.*]] = named_table @t1 as ["a", "b"] : tuple<f32, f64>

diff --git a/test/Target/SubstraitPB/Export/types.mlir b/test/Target/SubstraitPB/Export/types.mlir
@@ -14,34 +14,15 @@
 // CHECK-NEXT:      read {
 // CHECK:             base_schema {
 // CHECK-NEXT:          names: "a"
+// CHECK-NEXT:          names: "b"
 // CHECK-NEXT:          struct {
 // CHECK-NEXT:            types {
-// CHECK-NEXT:              interval_day {
+// CHECK-NEXT:              interval_year {
 // CHECK-NEXT:                nullability: NULLABILITY_REQUIRED
 // CHECK-NEXT:              }
 // CHECK-NEXT:            }
-// CHECK-NEXT:            nullability: NULLABILITY_REQUIRED
-// CHECK-NEXT:          }
-// CHECK-NEXT:        }
-// CHECK-NEXT:        named_table {
-
-substrait.plan version 0 : 42 : 1 {
-  relation {
-    %0 = named_table @t1 as ["a"] : tuple<!substrait.interval_day>
-    yield %0 : tuple<!substrait.interval_day>
-  }
-}
-
-// -----
-
-// CHECK-LABEL: relations {
-// CHECK-NEXT:    rel {
-// CHECK-NEXT:      read {
-// CHECK:             base_schema {
-// CHECK-NEXT:          names: "a"
-// CHECK-NEXT:          struct {
 // CHECK-NEXT:            types {
-// CHECK-NEXT:              interval_year {
+// CHECK-NEXT:              interval_day {
 // CHECK-NEXT:                nullability: NULLABILITY_REQUIRED
 // CHECK-NEXT:              }
 // CHECK-NEXT:            }
@@ -52,8 +33,8 @@ substrait.plan version 0 : 42 : 1 {
 
 substrait.plan version 0 : 42 : 1 {
   relation {
-    %0 = named_table @t1 as ["a"] : tuple<!substrait.interval_year>
-    yield %0 : tuple<!substrait.interval_year>
+    %0 = named_table @t1 as ["a", "b"] : tuple<!substrait.interval_year, !substrait.interval_day>
+    yield %0 : tuple<!substrait.interval_year, !substrait.interval_day>
   }
 }
 

diff --git a/test/Target/SubstraitPB/Import/types.textpb b/test/Target/SubstraitPB/Import/types.textpb
@@ -13,7 +13,7 @@
 # CHECK:      substrait.plan
 # CHECK-NEXT:   relation
 # CHECK-NEXT:     named_table
-# CHECK-SAME:       : tuple<!substrait.interval_day>
+# CHECK-SAME:       : tuple<!substrait.interval_year, !substrait.interval_day>
 
 relations {
   rel {
@@ -24,45 +24,15 @@ relations {
       }
       base_schema {
         names: "a"
+        names: "b"
         struct {
           types {
-            interval_day {
+            interval_year {
               nullability: NULLABILITY_REQUIRED
             }
           }
-          nullability: NULLABILITY_REQUIRED
-        }
-      }
-      named_table {
-        names: "t1"
-      }
-    }
-  }
-}
-version {
-  minor_number: 42
-  patch_number: 1
-}
-
-# -----
-
-# CHECK:      substrait.plan
-# CHECK-NEXT:   relation
-# CHECK-NEXT:     named_table
-# CHECK-SAME:       : tuple<!substrait.interval_year>
-
-relations {
-  rel {
-    read {
-      common {
-        direct {
-        }
-      }
-      base_schema {
-        names: "a"
-        struct {
           types {
-            interval_year {
+            interval_day {
               nullability: NULLABILITY_REQUIRED
             }
           }