Changeset: 0a0ee486af33 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0a0ee486af33
Branch: resource_management
Log Message:
merge with default
diffs (27 lines):
diff --git
a/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
b/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
--- a/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
+++ b/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
@@ -114,9 +114,9 @@ plan select * from b where (m = 40 and k
----
project (
| select (
-| | table("sys"."b") [ "b"."n", "b"."m", "b"."k" UNIQUE ]
-| ) [ (( [ "b"."m", "b"."k" UNIQUE ]) in ( [ int(8) "20", int(11) "200" ], [
int(8) "60", int(11) "600" ])) or (("b"."m") = (int(8) "40"), ("b"."k" UNIQUE)
> (int(11) "0")) ]
-) [ "b"."n", "b"."m", "b"."k" UNIQUE ]
+| | table("sys"."b") [ "b"."n" NOT NULL, "b"."m" NOT NULL, "b"."k" NOT NULL ]
+| ) [ (( [ "b"."m" NOT NULL, "b"."k" NOT NULL ]) in ( [ int(8) "20", int(11)
"200" ], [ int(8) "60", int(11) "600" ])) or (("b"."m" NOT NULL) = (int(8)
"40"), ("b"."k" NOT NULL) > (int(11) "0")) ]
+) [ "b"."n" NOT NULL, "b"."m" NOT NULL, "b"."k" NOT NULL ]
query II rowsort
select m, k from b where (m = 40) or (m = 20 and k = 200) or (m = 0) or (m =
60 and k = 600) or (m = 180)
@@ -148,7 +148,7 @@ plan select m, k from b where (m = 40) o
----
project (
| select (
-| | table("sys"."b") [ "b"."m", "b"."k" UNIQUE ]
-| ) [ (("b"."m") in (int(8) "40", int(8) "0", int(8) "180")) or (( [ "b"."m",
"b"."k" UNIQUE ]) in ( [ int(8) "20", int(11) "200" ], [ int(8) "60", int(11)
"600" ])) ]
-) [ "b"."m", "b"."k" UNIQUE ]
+| | table("sys"."b") [ "b"."m" NOT NULL, "b"."k" NOT NULL ]
+| ) [ (("b"."m" NOT NULL) in (int(8) "40", int(8) "0", int(8) "180")) or (( [
"b"."m" NOT NULL, "b"."k" NOT NULL ]) in ( [ int(8) "20", int(11) "200" ], [
int(8) "60", int(11) "600" ])) ]
+) [ "b"."m" NOT NULL, "b"."k" NOT NULL ]
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
