Changeset: 442cc0828a51 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=442cc0828a51
Modified Files:
monetdb5/modules/mal/wlc.mal
sql/backends/monet5/Tests/cquery03.sql
sql/backends/monet5/Tests/cquery05.sql
sql/backends/monet5/wlr.mal
sql/scripts/50_cquery.sql
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
Branch: trails
Log Message:
Fixes for more tests
diffs (truncated from 923 to 300 lines):
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
@@ -83,11 +83,11 @@ address WLCcommitCmd
comment "Rollback the workload-capture-replay record";
# The wrapping of the catalog and transaction operations
-pattern create_seq( sname:str, seqname:str, action:int)
+pattern create_seq( sname:str, seqname:str, seq:ptr, action:int)
address WLCgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, val:lng)
+pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
address WLCgeneric
comment "Catalog operation alter_seq";
@@ -107,11 +107,11 @@ pattern drop_schema( sname:str, s:str, a
address WLCgeneric
comment "Catalog operation drop_schema";
-pattern create_table(sname:str, tname:str, temp:int)
+pattern create_table(sname:str, tname:str, tbl:ptr, temp:int)
address WLCgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, tname:str, temp:int)
+pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
address WLCgeneric
comment "Catalog operation create_view";
@@ -129,13 +129,13 @@ comment "Catalog operation drop_view";
pattern drop_view( sname:str, name:str, action:int)
address WLCgeneric
-comment "Catalog operation drop_view";
+comment "Catalog operation drop_view";;
pattern drop_constraint( sname:str, name:str, action:int)
address WLCgeneric
comment "Catalog operation drop_constraint";
-pattern alter_table( sname:str, action:int)
+pattern alter_table( sname:str, tname:str, tbl:ptr, action:int)
address WLCgeneric
comment "Catalog operation alter_table";
@@ -206,11 +206,15 @@ pattern drop_index( sname:str, iname:str
address WLCgeneric
comment "Catalog operation drop_index";
+pattern change_cp( action:int)
+address WLRgeneric
+comment "Pause, resume or stop all continuous queries";
+
pattern drop_function( sname:str, fname:str, fid:int, type:int, action:int)
address WLCgeneric
comment "Catalog operation drop_function";
-pattern create_function( sname:str, fname:str, replace:int)
+pattern create_function( sname:str, fname:str, fcn:ptr, ofcn:ptr, replace:int)
address WLCgeneric
comment "Catalog operation create_function";
diff --git a/sql/backends/monet5/Tests/cquery03.sql
b/sql/backends/monet5/Tests/cquery03.sql
--- a/sql/backends/monet5/Tests/cquery03.sql
+++ b/sql/backends/monet5/Tests/cquery03.sql
@@ -14,7 +14,7 @@ end;
call cqfoo(123);
select * from cqtbl;
-start continuous cqfoo(321);
+start continuous cqfoo(321) with cycles 1;
stop continuous cqfoo(321);
--stop continuous cqfoo;
select * from cqtbl;
diff --git a/sql/backends/monet5/Tests/cquery05.sql
b/sql/backends/monet5/Tests/cquery05.sql
--- a/sql/backends/monet5/Tests/cquery05.sql
+++ b/sql/backends/monet5/Tests/cquery05.sql
@@ -9,7 +9,7 @@ end;
start continuous sys.cq_basic() with heartbeat 1000;
-call cquery.wait(2100);
+call cquery.wait(2400);
pause continuous sys.cq_basic();
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
@@ -87,11 +87,11 @@ pattern clear_table(sname:str, tname:str
address WLRclear_table
comment "Destroy the tuples in the table";
-pattern create_seq( sname:str, seqname:str, action:int)
+pattern create_seq( sname:str, seqname:str, seq:ptr, action:int)
address WLRgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, val:lng)
+pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
address WLRgeneric
comment "Catalog operation alter_seq";
@@ -104,41 +104,42 @@ address WLRgeneric
comment "Catalog operation create_schema";
pattern drop_schema( sname:str, s:str, action:int, ifexists:int)
-address WLRgeneric
+address WLCgeneric
comment "Catalog operation drop_schema";
pattern drop_schema( sname:str, s:str, action:int)
-address WLRgeneric
+address WLCgeneric
comment "Catalog operation drop_schema";
-pattern create_table(sname:str, tname:str, temp:int)
+pattern create_table(sname:str, tname:str, tbl:ptr, temp:int)
address WLRgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, tname:str, temp:int)
+pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
address WLRgeneric
comment "Catalog operation create_view";
pattern drop_table( sname:str, name:str, action:int , ifexists:int)
-address WLRgeneric
+address WLCgeneric
comment "Catalog operation drop_table";
pattern drop_table( sname:str, name:str, action:int )
-address WLRgeneric
+address WLCgeneric
comment "Catalog operation drop_table";
+
pattern drop_view( sname:str, name:str, action:int, ifexists:int)
-address WLRgeneric
+address WLCgeneric
comment "Catalog operation drop_view";
pattern drop_view( sname:str, name:str, action:int)
-address WLRgeneric
+address WLCgeneric
comment "Catalog operation drop_view";
pattern drop_constraint( sname:str, name:str, action:int)
-address WLRgeneric
+address WLCgeneric
comment "Catalog operation drop_constraint";
-pattern alter_table( sname:str, action:int)
+pattern alter_table( sname:str, tname:str, tbl:ptr, action:int)
address WLRgeneric
comment "Catalog operation alter_table";
@@ -210,11 +211,15 @@ pattern drop_index( sname:str, iname:str
address WLRgeneric
comment "Catalog operation drop_index";
+pattern change_cp( action:int)
+address WLRgeneric
+comment "Pause, resume or stop all continuous queries";
+
pattern drop_function( sname:str, fname:str, fid:int, type:int, action:int)
address WLRgeneric
comment "Catalog operation drop_function";
-pattern create_function( sname:str, fname:str, replace:int)
+pattern create_function( sname:str, fname:str, fcn:ptr, ofcn:ptr, replace:int)
address WLRgeneric
comment "Catalog operation create_function";
@@ -261,4 +266,3 @@ comment "A transaction statement (type c
unsafe pattern transaction()
address WLRgeneric
comment "Start an autocommit transaction";
-
diff --git a/sql/scripts/50_cquery.sql b/sql/scripts/50_cquery.sql
--- a/sql/scripts/50_cquery.sql
+++ b/sql/scripts/50_cquery.sql
@@ -31,10 +31,16 @@ create procedure cquery."cycles"(cqcycle
create procedure cquery."cycles"("schema" string, cqname string, cqcycles
integer)
external name cquery."cycles";
+-- set the cquery initialization time
+create procedure cquery."beginat"("schema" string, cqname string, beginat
bigint)
+ external name cquery."beginat";
+create procedure cquery."beginat"(beginat bigint)
+ external name cquery."beginat";
+
-- set the scheduler heartbeat
-create procedure cquery."heartbeat"("schema" string, cqname string, msec
integer)
+create procedure cquery."heartbeat"("schema" string, cqname string, msec
bigint)
external name cquery."heartbeat";
-create procedure cquery."heartbeat"(msec integer)
+create procedure cquery."heartbeat"(msec bigint)
external name cquery."heartbeat";
-- Tumble the stream buffer
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -83,36 +83,33 @@ Ready.
[ "bam", "seq_char", 4, "clob", "" ]
[ "bam", "seq_length", 0, "int", "create function
bam.seq_length(cigar string)\nreturns int external name bam.seq_length;" ]
[ "bam", "seq_length", 1, "clob", "" ]
-[ "cquery", "cycles", 0, "int", "create procedure
cquery.cycles(cycles integer)\n external name cquery.cycles;" ]
-[ "cquery", "cycles", 0, "clob", "create procedure
cquery.cycles(sch string, cqname string, cycles integer)\n external name
cquery.cycles;" ]
+[ "cquery", "beginat", 0, "clob", "create procedure
cquery.\"beginat\"(\"schema\" string, cqname string, beginat bigint)\n external
name cquery.\"beginat\";" ]
+[ "cquery", "beginat", 1, "clob", "" ]
+[ "cquery", "beginat", 2, "bigint", "" ]
+[ "cquery", "beginat", 0, "bigint", "create procedure
cquery.\"beginat\"(beginat bigint)\n external name cquery.\"beginat\";" ]
+[ "cquery", "cycles", 0, "int", "create procedure
cquery.\"cycles\"(cqcycles integer)\n external name cquery.\"cycles\";" ]
+[ "cquery", "cycles", 0, "clob", "create procedure
cquery.\"cycles\"(\"schema\" string, cqname string, cqcycles integer)\n
external name cquery.\"cycles\";" ]
[ "cquery", "cycles", 1, "clob", "" ]
[ "cquery", "cycles", 2, "int", "" ]
-[ "cquery", "deregister", 0, "clob", "create procedure
cquery.deregister(sch string, cqname string)\n external name
cquery.deregister;" ]
-[ "cquery", "deregister", 1, "clob", "" ]
-[ "cquery", "heartbeat", 0, "clob", "create procedure
cquery.heartbeat(\"schema\" string, qryname string, msec integer)\n external
name cquery.heartbeat;" ]
+[ "cquery", "heartbeat", 0, "clob", "create procedure
cquery.\"heartbeat\"(\"schema\" string, cqname string, msec bigint)\n external
name cquery.\"heartbeat\";" ]
[ "cquery", "heartbeat", 1, "clob", "" ]
-[ "cquery", "heartbeat", 2, "int", "" ]
-[ "cquery", "heartbeat", 0, "int", "create procedure
cquery.heartbeat(msec integer)\n external name cquery.heartbeat;" ]
+[ "cquery", "heartbeat", 2, "bigint", "" ]
+[ "cquery", "heartbeat", 0, "bigint", "create procedure
cquery.\"heartbeat\"(msec bigint)\n external name cquery.\"heartbeat\";" ]
[ "cquery", "log", 0, "timestamp", "create function cquery.log()\n
returns table(tick timestamp, \"schema\" string, \"function\" string, time
bigint, errors string)\n external name cquery.log;" ]
[ "cquery", "log", 1, "clob", "" ]
[ "cquery", "log", 2, "clob", "" ]
[ "cquery", "log", 3, "bigint", "" ]
[ "cquery", "log", 4, "clob", "" ]
-[ "cquery", "pause", 0, "clob", "create procedure
cquery.pause(sch string, cqname string)\n external name cquery.pause;" ]
-[ "cquery", "pause", 1, "clob", "" ]
-[ "cquery", "register", 0, "clob", "create procedure
cquery.register(sch string, cqname string)\n external name cquery.register;" ]
-[ "cquery", "register", 1, "clob", "" ]
-[ "cquery", "resume", 0, "clob", "create procedure
cquery.resume(sch string, cqname string)\n external name cquery.resume;" ]
-[ "cquery", "resume", 1, "clob", "" ]
[ "cquery", "show", 0, "clob", "create function cquery.show(\"schema\"
string, qryname string)\nreturns string\nexternal name cquery.show;" ]
[ "cquery", "show", 1, "clob", "" ]
[ "cquery", "show", 2, "clob", "" ]
-[ "cquery", "status", 0, "timestamp", "create function
cquery.status()\n returns table(tick timestamp, \"schema\" string, \"function\"
string, state string, errors string)\n external name cquery.status;" ]
+[ "cquery", "status", 0, "timestamp", "create function
cquery.status()\n returns table(tick timestamp, \"schema\" string, \"function\"
string, state string, errors string, stmt string)\n external name
cquery.status;" ]
[ "cquery", "status", 1, "clob", "" ]
[ "cquery", "status", 2, "clob", "" ]
[ "cquery", "status", 3, "clob", "" ]
[ "cquery", "status", 4, "clob", "" ]
-[ "cquery", "streams", 0, "timestamp", "create function
cquery.streams()\n returns table(tick timestamp, \"schema\" string,
\"function\" string, winsize integer, stride integer, events integer, cycles
integer, errors string)\n external name basket.status;" ]
+[ "cquery", "status", 5, "clob", "" ]
+[ "cquery", "streams", 0, "timestamp", "create function
cquery.streams()\n returns table(tick timestamp, \"schema\" string,
\"function\" string, winsize integer, \"stride\" integer, events integer,
\"cycles\" integer, errors string)\n external name basket.status;" ]
[ "cquery", "streams", 1, "clob", "" ]
[ "cquery", "streams", 2, "clob", "" ]
[ "cquery", "streams", 3, "int", "" ]
@@ -124,15 +121,15 @@ Ready.
[ "cquery", "summary", 1, "clob", "" ]
[ "cquery", "summary", 2, "int", "" ]
[ "cquery", "summary", 3, "bigint", "" ]
-[ "cquery", "tumble", 0, "clob", "create procedure
cquery.tumble(\"schema\" string, \"table\" string, elem integer)\n external
name cquery.tumble;" ]
+[ "cquery", "tumble", 0, "clob", "create procedure
cquery.\"tumble\"(\"schema\" string, \"table\" string, elem integer)\n external
name cquery.\"tumble\";" ]
[ "cquery", "tumble", 1, "clob", "" ]
[ "cquery", "tumble", 2, "int", "" ]
[ "cquery", "wait", 0, "int", "create procedure cquery.wait(ms
integer)\n external name cquery.wait;" ]
[ "cquery", "wait", 0, "bigint", "create procedure
cquery.wait(ms bigint)\n external name cquery.wait;" ]
-[ "cquery", "window", 0, "clob", "create procedure
cquery.window(\"schema\" string, \"table\" string, elem integer)\n external
name basket.window;" ]
+[ "cquery", "window", 0, "clob", "create procedure
cquery.\"window\"(\"schema\" string, \"table\" string, elem integer)\n external
name basket.\"window\";" ]
[ "cquery", "window", 1, "clob", "" ]
[ "cquery", "window", 2, "int", "" ]
-[ "cquery", "window", 0, "clob", "create procedure
cquery.window(\"schema\" string, \"table\" string, elem integer, stride
integer)\n external name basket.window;" ]
+[ "cquery", "window", 0, "clob", "create procedure
cquery.\"window\"(\"schema\" string, \"table\" string, elem integer, \"stride\"
integer)\n external name basket.\"window\";" ]
[ "cquery", "window", 1, "clob", "" ]
[ "cquery", "window", 2, "int", "" ]
[ "cquery", "window", 3, "int", "" ]
diff --git a/sql/test/Tests/systemfunctions.stable.out.int128
b/sql/test/Tests/systemfunctions.stable.out.int128
--- a/sql/test/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/Tests/systemfunctions.stable.out.int128
@@ -83,36 +83,33 @@ Ready.
[ "bam", "seq_char", 4, "clob", "" ]
[ "bam", "seq_length", 0, "int", "create function
bam.seq_length(cigar string)\nreturns int external name bam.seq_length;" ]
[ "bam", "seq_length", 1, "clob", "" ]
-[ "cquery", "cycles", 0, "int", "create procedure
cquery.cycles(cycles integer)\n external name cquery.cycles;" ]
-[ "cquery", "cycles", 0, "clob", "create procedure
cquery.cycles(sch string, cqname string, cycles integer)\n external name
cquery.cycles;" ]
+[ "cquery", "beginat", 0, "clob", "create procedure
cquery.\"beginat\"(\"schema\" string, cqname string, beginat bigint)\n external
name cquery.\"beginat\";" ]
+[ "cquery", "beginat", 1, "clob", "" ]
+[ "cquery", "beginat", 2, "bigint", "" ]
+[ "cquery", "beginat", 0, "bigint", "create procedure
cquery.\"beginat\"(beginat bigint)\n external name cquery.\"beginat\";" ]
+[ "cquery", "cycles", 0, "int", "create procedure
cquery.\"cycles\"(cqcycles integer)\n external name cquery.\"cycles\";" ]
+[ "cquery", "cycles", 0, "clob", "create procedure
cquery.\"cycles\"(\"schema\" string, cqname string, cqcycles integer)\n
external name cquery.\"cycles\";" ]
[ "cquery", "cycles", 1, "clob", "" ]
[ "cquery", "cycles", 2, "int", "" ]
-[ "cquery", "deregister", 0, "clob", "create procedure
cquery.deregister(sch string, cqname string)\n external name
cquery.deregister;" ]
-[ "cquery", "deregister", 1, "clob", "" ]
-[ "cquery", "heartbeat", 0, "clob", "create procedure
cquery.heartbeat(\"schema\" string, qryname string, msec integer)\n external
name cquery.heartbeat;" ]
+[ "cquery", "heartbeat", 0, "clob", "create procedure
cquery.\"heartbeat\"(\"schema\" string, cqname string, msec bigint)\n external
name cquery.\"heartbeat\";" ]
[ "cquery", "heartbeat", 1, "clob", "" ]
-[ "cquery", "heartbeat", 2, "int", "" ]
-[ "cquery", "heartbeat", 0, "int", "create procedure
cquery.heartbeat(msec integer)\n external name cquery.heartbeat;" ]
+[ "cquery", "heartbeat", 2, "bigint", "" ]
+[ "cquery", "heartbeat", 0, "bigint", "create procedure
cquery.\"heartbeat\"(msec bigint)\n external name cquery.\"heartbeat\";" ]
[ "cquery", "log", 0, "timestamp", "create function cquery.log()\n
returns table(tick timestamp, \"schema\" string, \"function\" string, time
bigint, errors string)\n external name cquery.log;" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
