Changeset: d674eddedf2f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d674eddedf2f
Modified Files:
monetdb5/modules/mal/wlc.mal
sql/backends/monet5/cquery.mal
sql/backends/monet5/wlr.mal
sql/scripts/50_cquery.sql
sql/test/BugTracker-2011/Tests/like_or.Bug-2924.sql
sql/test/BugTracker-2011/Tests/like_or.Bug-2924.stable.out
Branch: trails
Log Message:
Small change for a test
diffs (211 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, seq:ptr, action:int)
+pattern create_seq( sname:str, seqname:str, action:int)
address WLCgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
+pattern alter_seq( sname:str, seqname:str, 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, tbl:ptr, temp:int)
+pattern create_table(sname:str, tname:str, temp:int)
address WLCgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
+pattern create_view(sname:str, tname:str, 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, tname:str, tbl:ptr, action:int)
+pattern alter_table( sname:str, action:int)
address WLCgeneric
comment "Catalog operation alter_table";
@@ -207,14 +207,14 @@ address WLCgeneric
comment "Catalog operation drop_index";
pattern change_cp( action:int)
-address WLRgeneric
+address WLCgeneric
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, fcn:ptr, ofcn:ptr, replace:int)
+pattern create_function( sname:str, fname:str)
address WLCgeneric
comment "Catalog operation create_function";
diff --git a/sql/backends/monet5/cquery.mal b/sql/backends/monet5/cquery.mal
--- a/sql/backends/monet5/cquery.mal
+++ b/sql/backends/monet5/cquery.mal
@@ -58,13 +58,13 @@ pattern cycles(cnt:int)
address CQcycles
comment "Limit number of petrinet steps";
-pattern beginat(mod:str, fcn:str,beginat:lng)
+pattern beginat(mod:str, fcn:str,unixtime:lng)
address CQbeginAt
-comment "Delay beginning of a continuous query, where beginat is an UNIX
timestamp with microsecond precision";
+comment "Delay beginning of a continuous query, where unixtime is an UNIX
timestamp with microsecond precision";
-pattern beginat(beginat:lng)
+pattern beginat(unixtime:lng)
address CQbeginAt
-comment "Delay beginning of all continuous queries, where beginat is an UNIX
timestamp with microsecond precision";
+comment "Delay beginning of all continuous queries, where unixtime is an UNIX
timestamp with microsecond precision";
# scheduler heart beat for each CQ
pattern heartbeat(mod:str, fcn:str,cnt:lng)
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, seq:ptr, action:int)
+pattern create_seq( sname:str, seqname:str, action:int)
address WLRgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
+pattern alter_seq( sname:str, seqname:str, val:lng)
address WLRgeneric
comment "Catalog operation alter_seq";
@@ -104,42 +104,42 @@ address WLRgeneric
comment "Catalog operation create_schema";
pattern drop_schema( sname:str, s:str, action:int, ifexists:int)
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation drop_schema";
pattern drop_schema( sname:str, s:str, action:int)
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation drop_schema";
-pattern create_table(sname:str, tname:str, tbl:ptr, temp:int)
+pattern create_table(sname:str, tname:str, temp:int)
address WLRgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
+pattern create_view(sname:str, tname:str, temp:int)
address WLRgeneric
comment "Catalog operation create_view";
pattern drop_table( sname:str, name:str, action:int , ifexists:int)
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation drop_table";
pattern drop_table( sname:str, name:str, action:int )
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation drop_table";
pattern drop_view( sname:str, name:str, action:int, ifexists:int)
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation drop_view";
pattern drop_view( sname:str, name:str, action:int)
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation drop_view";
pattern drop_constraint( sname:str, name:str, action:int)
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation drop_constraint";
-pattern alter_table( sname:str, tname:str, tbl:ptr, action:int)
+pattern alter_table( sname:str, action:int)
address WLRgeneric
comment "Catalog operation alter_table";
@@ -219,7 +219,7 @@ pattern drop_function( sname:str, fname:
address WLRgeneric
comment "Catalog operation drop_function";
-pattern create_function( sname:str, fname:str, fcn:ptr, ofcn:ptr, replace:int)
+pattern create_function( sname:str, fname:str)
address WLRgeneric
comment "Catalog operation create_function";
@@ -244,7 +244,7 @@ address WLRgeneric
comment "Catalog operation alter_set_table";
pattern alter_stream_table( sname:str, tnme:str, operation:int, value:int)
-address WLCgeneric
+address WLRgeneric
comment "Catalog operation alter_stream_table";
pattern transaction_release(chain:int,name:str):void
@@ -266,3 +266,4 @@ 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
@@ -32,9 +32,9 @@ create procedure cquery."cycles"("schema
external name cquery."cycles";
-- set the cquery initialization time
-create procedure cquery."beginat"("schema" string, cqname string, beginat
bigint)
+create procedure cquery."beginat"("schema" string, cqname string, unixtime
bigint)
external name cquery."beginat";
-create procedure cquery."beginat"(beginat bigint)
+create procedure cquery."beginat"(unixtime bigint)
external name cquery."beginat";
-- set the scheduler heartbeat
diff --git a/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.sql
b/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.sql
--- a/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.sql
+++ b/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.sql
@@ -1,2 +1,2 @@
-select * from schemas where name like '%ys' escape '=' or name like '%y' escape
+select * from schemas where name like '%ys' escape '=' or name like '%ly'
escape
'=';
diff --git a/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.stable.out
b/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.stable.out
--- a/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.stable.out
+++ b/sql/test/BugTracker-2011/Tests/like_or.Bug-2924.stable.out
@@ -30,7 +30,6 @@ Ready.
% int, varchar, int, int, boolean # type
% 4, 6, 1, 1, 5 # length
[ 2000, "sys", 2, 3, true ]
-[ 7685, "cquery", 3, 3, true ]
# 08:16:49 >
# 08:16:49 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
