Changeset: 57f7fbad855e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/57f7fbad855e
Modified Files:
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: default
Log Message:
approved output
diffs (177 lines):
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
@@ -21,7 +21,7 @@ query T nosort
project (
| left outer join (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey" ],
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
@@ -31,7 +31,7 @@ query T nosort
project (
| left outer join (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk2_fkey" JOINIDX "sys"."fk"."fk_fk2_fkey" ],
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
@@ -54,7 +54,7 @@ query T nosort
----
project (
| right outer join (
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ],
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey" ]
| ) [ ("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
]
@@ -64,7 +64,7 @@ query T nosort
----
project (
| right outer join (
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ],
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk2_fkey" JOINIDX "sys"."fk"."fk_fk2_fkey" ]
| ) [ ("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
]
@@ -88,7 +88,7 @@ query T nosort
----
project (
| full outer join (
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ],
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey" ]
| ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk1_fkey" ]
) [ "fk"."id" HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC HASHCOL ]
@@ -98,7 +98,7 @@ query T nosort
----
project (
| full outer join (
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ],
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk2_fkey" JOINIDX "sys"."fk"."fk_fk2_fkey" ]
| ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk2_fkey" ]
) [ "fk"."id" HASHCOL , "pk2"."v2" ] [ "fk"."id" ASC HASHCOL ]
@@ -109,7 +109,7 @@ query T nosort
project (
| join (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey" ],
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
@@ -119,7 +119,7 @@ query T nosort
project (
| join (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk2_fkey" JOINIDX "sys"."fk"."fk_fk2_fkey" ],
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
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
@@ -24,7 +24,7 @@ project (
| project (
| | left outer join (
| | | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey" ],
-| | | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ]
+| | | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ]
| | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk1_fkey" ]
| ) [ "fk"."id" NOT NULL HASHCOL as "v1"."id", "pk1"."v1" as "v1"."v1" ]
) [ "v1"."id" NOT NULL HASHCOL , "v1"."v1" ] [ "v1"."id" ASC NOT NULL HASHCOL
]
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
@@ -21,7 +21,7 @@ query T nosort
project (
| left outer join (
| | 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" ],
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
@@ -34,7 +34,7 @@ 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" ],
| | | table("sys"."pk1") [ "pk1"."%TID%" NOT NULL UNIQUE ]
| | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk1_fkey" ],
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
@@ -57,7 +57,7 @@ query T nosort
----
project (
| right outer join (
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ],
| | 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"."%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
]
@@ -67,7 +67,7 @@ query T nosort
----
project (
| right outer join (
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ],
| | right outer join (
| | | table("sys"."pk1") [ "pk1"."%TID%" NOT NULL UNIQUE ],
| | | 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" ]
@@ -94,7 +94,7 @@ query T nosort
----
project (
| full outer join (
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ],
| | 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"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk1_fkey" ]
) [ "fk"."id" HASHCOL , "pk1"."v1" ] [ "fk"."id" ASC HASHCOL ]
@@ -104,7 +104,7 @@ query T nosort
----
project (
| full outer join (
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ],
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ],
| | full outer join (
| | | table("sys"."pk1") [ "pk1"."%TID%" NOT NULL UNIQUE ],
| | | 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" ]
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
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
@@ -27,7 +27,7 @@ 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" ],
| | | | table("sys"."pk1") [ "pk1"."%TID%" NOT NULL UNIQUE ]
| | | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk1_fkey" ],
-| | | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ]
+| | | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ]
| | ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk2_fkey" ]
| ) [ "fk"."id" NOT NULL HASHCOL as "v2"."id", "pk2"."v2" as "v2"."v2" ]
) [ "v2"."id" NOT NULL HASHCOL , "v2"."v2" ] [ "v2"."id" ASC NOT NULL HASHCOL
]
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.test
@@ -47,7 +47,7 @@ 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" ],
| | | table("sys"."pk2") [ "pk2"."%TID%" NOT NULL UNIQUE ]
| | ) [ ("fk"."%fk_fk2_fkey") = ("pk2"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk2_fkey" ],
-| | table("sys"."pk1") [ "pk1"."v1", "pk1"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk1") [ "pk1"."v1" UNIQUE, "pk1"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
@@ -60,7 +60,7 @@ 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" ],
| | | table("sys"."pk1") [ "pk1"."%TID%" NOT NULL UNIQUE ]
| | ) [ ("fk"."%fk_fk1_fkey") = ("pk1"."%TID%" NOT NULL UNIQUE) JOINIDX
"sys"."fk"."fk_fk1_fkey" ],
-| | table("sys"."pk2") [ "pk2"."v2", "pk2"."%TID%" NOT NULL UNIQUE ]
+| | table("sys"."pk2") [ "pk2"."v2" UNIQUE, "pk2"."%TID%" NOT NULL UNIQUE ]
| ) [ ("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
]
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
