Changeset: fdb9826d1224 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fdb9826d1224
Modified Files:
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.test
Branch: Aug2024
Log Message:

Filter out output expected to be different


diffs (truncated from 381 to 300 lines):

diff --git 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.test
 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.test
--- 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.test
+++ 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.test
@@ -1,14 +1,14 @@
 statement ok
 set optimizer = 'sequential_pipe'
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from fk
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from fk order by id
 ----
 project (
diff --git 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.test
 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.test
--- 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.test
+++ 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.test
@@ -1,7 +1,7 @@
 statement ok
 set optimizer = 'sequential_pipe'
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from v0
 ----
 project (
@@ -12,7 +12,7 @@ project (
 | ) [  ] [ "sys"."count"() NOT NULL UNIQUE as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL UNIQUE ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from v0 order by id
 ----
 project (
diff --git 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
--- 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
+++ 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
@@ -1,21 +1,21 @@
 statement ok
 set optimizer = 'sequential_pipe'
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from fk left outer join pk1 on fk.fk1 = pk1.pk1
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from fk left outer join pk1 on fk.fk1 = pk1.pk1 order 
by id
 ----
 project (
 | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL  ]
 ) [ "fk"."id" NOT NULL UNIQUE HASHCOL  ] [ "fk"."id" ASC NOT NULL UNIQUE 
HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from fk left outer join pk1 on fk.fk1 = pk1.pk1 order 
by id
 ----
 project (
@@ -25,7 +25,7 @@ project (
 | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk1_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v2  from fk left outer join pk2 on fk.fk2 = pk2.pk2 order 
by id
 ----
 project (
@@ -35,21 +35,21 @@ project (
 | ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk2"."v2" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from pk1 right outer join fk on fk.fk1 = pk1.pk1
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from pk1 right outer join fk on fk.fk1 = pk1.pk1 order 
by id
 ----
 project (
 | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL  ]
 ) [ "fk"."id" NOT NULL UNIQUE HASHCOL  ] [ "fk"."id" ASC NOT NULL UNIQUE 
HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from pk1 right outer join fk on fk.fk1 = pk1.pk1 order 
by id
 ----
 project (
@@ -59,7 +59,7 @@ project (
 | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk1_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v2  from pk2 right outer join fk on fk.fk2 = pk2.pk2 order 
by id
 ----
 project (
@@ -69,21 +69,21 @@ project (
 | ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk2"."v2" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from pk1 full outer join fk on fk.fk1 = pk1.pk1
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from pk1 full outer join fk on fk.fk1 = pk1.pk1 order 
by id
 ----
 project (
 | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL  ]
 ) [ "fk"."id" NOT NULL UNIQUE HASHCOL  ] [ "fk"."id" ASC NOT NULL UNIQUE 
HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from pk1 full outer join fk on fk.fk1 = pk1.pk1 order 
by id
 ----
 project (
@@ -93,7 +93,7 @@ project (
 | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk1_fkey" ]
 ) [ "fk"."id" HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v2  from pk2 full outer join fk on fk.fk2 = pk2.pk2 order 
by id
 ----
 project (
@@ -103,7 +103,7 @@ project (
 | ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" HASHCOL , "pk2"."v2" ] [ "fk"."id" ASC HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from pk1 join fk on fk.fk1 = pk1.pk1 order by id
 ----
 project (
@@ -113,7 +113,7 @@ project (
 | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk1_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk1"."v1" NOT NULL ] [ "fk"."id" ASC NOT 
NULL HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v2  from pk2 join fk on fk.fk2 = pk2.pk2 order by id
 ----
 project (
diff --git 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
--- 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
+++ 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
@@ -1,14 +1,14 @@
 statement ok
 set optimizer = 'sequential_pipe'
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from v1
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from v1 order by id
 ----
 project (
@@ -17,7 +17,7 @@ project (
 | ) [ "fk"."id" NOT NULL UNIQUE HASHCOL  as "v1"."id" ]
 ) [ "v1"."id" NOT NULL UNIQUE HASHCOL  ] [ "v1"."id" ASC NOT NULL UNIQUE 
HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from v1 order by id
 ----
 project (
diff --git 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
--- 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
+++ 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
@@ -1,21 +1,21 @@
 statement ok
 set optimizer = 'sequential_pipe'
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from fk left outer join pk1 on fk.fk1 = pk1.pk1 left 
outer join pk2 on fk.fk2 = pk2.pk2
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from fk left outer join pk1 on fk.fk1 = pk1.pk1 left 
outer join pk2 on fk.fk2 = pk2.pk2 order by id
 ----
 project (
 | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL , "fk"."%fk_fk1_fkey" 
JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey" JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" NOT NULL UNIQUE HASHCOL  ] [ "fk"."id" ASC NOT NULL UNIQUE 
HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from fk left outer join pk1 on fk.fk1 = pk1.pk1 left 
outer join pk2 on fk.fk2 = pk2.pk2 order by id
 ----
 project (
@@ -25,7 +25,7 @@ project (
 | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk1_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v2  from fk left outer join pk1 on fk.fk1 = pk1.pk1 left 
outer join pk2 on fk.fk2 = pk2.pk2 order by id
 ----
 project (
@@ -38,21 +38,21 @@ project (
 | ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk2"."v2" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from pk2 right outer join (pk1 right outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from pk2 right outer join (pk1 right outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
 ----
 project (
 | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL , "fk"."%fk_fk1_fkey" 
JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey" JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" NOT NULL UNIQUE HASHCOL  ] [ "fk"."id" ASC NOT NULL UNIQUE 
HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from pk2 right outer join (pk1 right outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
 ----
 project (
@@ -62,7 +62,7 @@ project (
 | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk1_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v2  from pk2 right outer join (pk1 right outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
 ----
 project (
@@ -75,21 +75,21 @@ project (
 | ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" NOT NULL HASHCOL , "pk2"."v2" ] [ "fk"."id" ASC NOT NULL HASHCOL 
 ]
 
-query T nosort
+query T python .plan.filter
    plan select count(*) from pk2 full outer join (pk1 full outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2
 ----
 project (
 |  [ "sys"."cnt"(varchar "sys", varchar "fk") NOT NULL as "%1"."%1" ]
 ) [ "%1"."%1" NOT NULL ]
 
-query T nosort
+query T python .plan.filter
    plan select id       from pk2 full outer join (pk1 full outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
 ----
 project (
 | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL , "fk"."%fk_fk1_fkey" 
JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey" JOINIDX 
"sys"."fk"."fk_fk2_fkey" ]
 ) [ "fk"."id" NOT NULL UNIQUE HASHCOL  ] [ "fk"."id" ASC NOT NULL UNIQUE 
HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v1  from pk2 full outer join (pk1 full outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
 ----
 project (
@@ -99,7 +99,7 @@ project (
 | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX 
"sys"."fk"."fk_fk1_fkey" ]
 ) [ "fk"."id" HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC HASHCOL  ]
 
-query T nosort
+query T python .plan.filter
    plan select id , v2  from pk2 full outer join (pk1 full outer join fk on 
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
 ----
 project (
diff --git 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
--- 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to