Changeset: d18b0a317120 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d18b0a317120
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.sql
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/mal/wlc.mal
sql/backends/monet5/wlr.mal
sql/test/BugTracker-2018/Tests/All
Branch: default
Log Message:
Merge with Mar2018
diffs (96 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -11170,6 +11170,7 @@ stdout of test 'MAL-signatures` in direc
[ "wlc", "append", "pattern wlc.append(sname:str, tname:str,
cname:str, ins:any):int ", "WLCappend;", "Keep the insertions in the
workload-capture-replay list" ]
[ "wlc", "catalog", "pattern wlc.catalog(q:str):void ",
"WLCcatalog;", "Keep the catalog changing queries for replay. " ]
[ "wlc", "clear_table", "pattern wlc.clear_table(sname:str,
tname:str):int ", "WLCclear_table;", "Keep the deletions in the
workload-capture-replay list" ]
+[ "wlc", "comment_on", "pattern wlc.comment_on(objid:int,
remark:str):void ", "WLCgeneric;", "Catalog operation comment_on" ]
[ "wlc", "commit", "pattern wlc.commit():void ",
"WLCcommitCmd;", "Commit the workload-capture-replay record" ]
[ "wlc", "commit", "pattern wlc.commit():void ",
"WLCcommitCmd;", "Mark the end of the work unit" ]
[ "wlc", "create_function", "pattern wlc.create_function(sname:str,
fname:str):void ", "WLCgeneric;", "Catalog operation create_function"
]
@@ -11229,6 +11230,7 @@ stdout of test 'MAL-signatures` in direc
[ "wlr", "append", "pattern wlr.append(sname:str, tname:str,
cname:str, ins:any...):int ", "WLRappend;", "Apply the insertions in the
workload-capture-replay list" ]
[ "wlr", "catalog", "pattern wlr.catalog(q:str):void ",
"WLRcatalog;", "A catalog changing query" ]
[ "wlr", "clear_table", "pattern wlr.clear_table(sname:str,
tname:str):int ", "WLRclear_table;", "Destroy the tuples in the table"
]
+[ "wlr", "comment_on", "pattern wlr.comment_on(objid:int,
remark:str):void ", "WLRgeneric;", "Catalog operation comment_on" ]
[ "wlr", "commit", "pattern wlr.commit():void ", "WLRcommit;",
"Mark the end of the work unit" ]
[ "wlr", "create_function", "pattern wlr.create_function(sname:str,
fname:str):void ", "WLRgeneric;", "Catalog operation create_function"
]
[ "wlr", "create_role", "pattern wlr.create_role(sname:str, role:str,
grator:int):void ", "WLRgeneric;", "Catalog operation create_role" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -15386,6 +15386,7 @@ Ready.
[ "wlc", "append", "pattern wlc.append(sname:str, tname:str,
cname:str, ins:any):int ", "WLCappend;", "Keep the insertions in the
workload-capture-replay list" ]
[ "wlc", "catalog", "pattern wlc.catalog(q:str):void ",
"WLCcatalog;", "Keep the catalog changing queries for replay. " ]
[ "wlc", "clear_table", "pattern wlc.clear_table(sname:str,
tname:str):int ", "WLCclear_table;", "Keep the deletions in the
workload-capture-replay list" ]
+[ "wlc", "comment_on", "pattern wlc.comment_on(objid:int,
remark:str):void ", "WLCgeneric;", "Catalog operation comment_on" ]
[ "wlc", "commit", "pattern wlc.commit():void ",
"WLCcommitCmd;", "Commit the workload-capture-replay record" ]
[ "wlc", "commit", "pattern wlc.commit():void ",
"WLCcommitCmd;", "Mark the end of the work unit" ]
[ "wlc", "create_function", "pattern wlc.create_function(sname:str,
fname:str):void ", "WLCgeneric;", "Catalog operation create_function"
]
@@ -15445,6 +15446,7 @@ Ready.
[ "wlr", "append", "pattern wlr.append(sname:str, tname:str,
cname:str, ins:any...):int ", "WLRappend;", "Apply the insertions in the
workload-capture-replay list" ]
[ "wlr", "catalog", "pattern wlr.catalog(q:str):void ",
"WLRcatalog;", "A catalog changing query" ]
[ "wlr", "clear_table", "pattern wlr.clear_table(sname:str,
tname:str):int ", "WLRclear_table;", "Destroy the tuples in the table"
]
+[ "wlr", "comment_on", "pattern wlr.comment_on(objid:int,
remark:str):void ", "WLRgeneric;", "Catalog operation comment_on" ]
[ "wlr", "commit", "pattern wlr.commit():void ", "WLRcommit;",
"Mark the end of the work unit" ]
[ "wlr", "create_function", "pattern wlr.create_function(sname:str,
fname:str):void ", "WLRgeneric;", "Catalog operation create_function"
]
[ "wlr", "create_role", "pattern wlr.create_role(sname:str, role:str,
grator:int):void ", "WLRgeneric;", "Catalog operation create_role" ]
diff --git a/monetdb5/modules/mal/wlc.mal b/monetdb5/modules/mal/wlc.mal
--- a/monetdb5/modules/mal/wlc.mal
+++ b/monetdb5/modules/mal/wlc.mal
@@ -222,6 +222,10 @@ pattern alter_set_table( sname:str, tnme
address WLCgeneric
comment "Catalog operation alter_set_table";
+pattern comment_on(objid:int, remark:str)
+address WLCgeneric
+comment "Catalog operation comment_on";
+
pattern transaction_release(chain:int,name:str):void
address WLCgeneric
comment "A transaction statement (type can be commit,release,rollback or
start)";
diff --git a/sql/backends/monet5/wlr.mal b/sql/backends/monet5/wlr.mal
--- a/sql/backends/monet5/wlr.mal
+++ b/sql/backends/monet5/wlr.mal
@@ -227,6 +227,10 @@ pattern alter_set_table( sname:str, tnme
address WLRgeneric
comment "Catalog operation alter_set_table";
+pattern comment_on(objid:int, remark:str)
+address WLRgeneric
+comment "Catalog operation comment_on";
+
pattern transaction_release(chain:int,name:str):void
address WLRgeneric
comment "A transaction statement (type can be commit,release,rollback or
start)";
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -67,3 +67,4 @@ sqlitelogictest-groupby-distinct-duplica
procedure-create-table.Bug-6604
sqlitelogictest-cast-null-not-in.Bug-6605
sqlitelogictest-groupby-coalesce-error-message.Bug-6608
+sqlitelogictest-algebra-rangejoin-undefined.Bug-6610
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.sql
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.sql
@@ -0,0 +1,17 @@
+CREATE TABLE tab0(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+CREATE TABLE tab1(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+
+INSERT INTO tab0 VALUES (89,91,82), (35,97,1), (24,86,33);
+INSERT INTO tab1 VALUES (64,10,57), (3,26,54), (80,13,96);
+INSERT INTO tab2 VALUES (7,31,27), (79,17,38), (78,59,26);
+
+SELECT DISTINCT * FROM tab2, tab1 AS cor0 CROSS JOIN tab1 WHERE cor0.col1 NOT
BETWEEN tab2.col0 AND ( NULL );
+
+SELECT ALL * FROM tab1, tab2, tab2 AS cor0 WHERE + tab2.col2 BETWEEN (
tab1.col0 ) AND NULL;
+
+SELECT * FROM tab0, tab2 AS cor0 WHERE ( - tab0.col0 ) BETWEEN ( cor0.col2 )
AND ( NULL );
+
+DROP TABLE tab0;
+DROP TABLE tab1;
+DROP TABLE tab2;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
