Changeset: 80d8aeddd348 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/80d8aeddd348
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/backends/monet5/sql.c
Branch: Oct2020
Log Message:
removed unsafe flag from next_value functions
diffs (68 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
@@ -6366,9 +6366,9 @@ stdout of test 'MAL-signatures` in direc
[ "batsql", "lead", "pattern batsql.lead(X_1:bat[:any_1], X_2:bat[:any],
X_3:bat[:any_1], X_4:any_2, X_5:any_3):bat[:any_1] ", "SQLlead;", ""
]
[ "batsql", "max", "pattern batsql.max(X_1:bat[:any_1], X_2:bat[:lng],
X_3:bat[:lng]):bat[:any_1] ", "SQLmax;", "" ]
[ "batsql", "min", "pattern batsql.min(X_1:bat[:any_1], X_2:bat[:lng],
X_3:bat[:lng]):bat[:any_1] ", "SQLmin;", "" ]
-[ "batsql", "next_value", "unsafe pattern
batsql.next_value(X_1:bat[:str], X_2:bat[:str]):bat[:lng] ",
"mvc_bat_next_value;", "" ]
-[ "batsql", "next_value", "unsafe pattern
batsql.next_value(X_1:bat[:str], X_2:str):bat[:lng] ", "mvc_bat_next_value;",
"" ]
-[ "batsql", "next_value", "unsafe pattern batsql.next_value(X_1:str,
X_2:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ]
+[ "batsql", "next_value", "pattern batsql.next_value(X_1:bat[:str],
X_2:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ]
+[ "batsql", "next_value", "pattern batsql.next_value(X_1:bat[:str],
X_2:str):bat[:lng] ", "mvc_bat_next_value;", "" ]
+[ "batsql", "next_value", "pattern batsql.next_value(X_1:str,
X_2:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ]
[ "batsql", "nth_value", "pattern batsql.nth_value(X_1:any,
X_2:bat[:any_1], X_3:lng, X_4:lng):bat[:any] ", "SQLnth_value;", ""
]
[ "batsql", "nth_value", "pattern batsql.nth_value(X_1:bat[:any],
X_2:any_1, X_3:bat[:lng], X_4:bat[:lng]):bat[:any] ", "SQLnth_value;",
"" ]
[ "batsql", "nth_value", "pattern batsql.nth_value(X_1:bat[:any],
X_2:bat[:any_1], X_3:bat[:lng], X_4:bat[:lng]):bat[:any] ", "SQLnth_value;",
"" ]
@@ -9265,7 +9265,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "ms_trunc", "command sql.ms_trunc(X_1:dbl, X_2:int):dbl ",
"dbl_trunc_wrap;", "" ]
[ "sql", "ms_trunc", "command sql.ms_trunc(X_1:flt, X_2:int):flt ",
"flt_trunc_wrap;", "" ]
[ "sql", "mvc", "pattern sql.mvc():int ", "SQLmvc;", ""
]
-[ "sql", "next_value", "unsafe pattern sql.next_value(X_1:str,
X_2:str):lng ", "mvc_next_value;", "" ]
+[ "sql", "next_value", "pattern sql.next_value(X_1:str, X_2:str):lng
", "mvc_next_value;", "" ]
[ "sql", "nth_value", "pattern sql.nth_value(X_1:any, X_2:any_1,
X_3:lng, X_4:lng):any ", "SQLnth_value;", "" ]
[ "sql", "ntile", "pattern sql.ntile(X_1:any, X_2:any_1, X_3:bit,
X_4:bit):any_1 ", "SQLntile;", "" ]
[ "sql", "optimizer_updates", "pattern sql.optimizer_updates():void
", "SQLoptimizersUpdate;", "" ]
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
@@ -8947,9 +8947,9 @@ stdout of test 'MAL-signatures` in direc
[ "batsql", "lead", "pattern batsql.lead(X_1:bat[:any_1], X_2:bat[:any],
X_3:bat[:any_1], X_4:any_2, X_5:any_3):bat[:any_1] ", "SQLlead;", ""
]
[ "batsql", "max", "pattern batsql.max(X_1:bat[:any_1], X_2:bat[:lng],
X_3:bat[:lng]):bat[:any_1] ", "SQLmax;", "" ]
[ "batsql", "min", "pattern batsql.min(X_1:bat[:any_1], X_2:bat[:lng],
X_3:bat[:lng]):bat[:any_1] ", "SQLmin;", "" ]
-[ "batsql", "next_value", "unsafe pattern
batsql.next_value(X_1:bat[:str], X_2:bat[:str]):bat[:lng] ",
"mvc_bat_next_value;", "" ]
-[ "batsql", "next_value", "unsafe pattern
batsql.next_value(X_1:bat[:str], X_2:str):bat[:lng] ", "mvc_bat_next_value;",
"" ]
-[ "batsql", "next_value", "unsafe pattern batsql.next_value(X_1:str,
X_2:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ]
+[ "batsql", "next_value", "pattern batsql.next_value(X_1:bat[:str],
X_2:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ]
+[ "batsql", "next_value", "pattern batsql.next_value(X_1:bat[:str],
X_2:str):bat[:lng] ", "mvc_bat_next_value;", "" ]
+[ "batsql", "next_value", "pattern batsql.next_value(X_1:str,
X_2:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ]
[ "batsql", "nth_value", "pattern batsql.nth_value(X_1:any,
X_2:bat[:any_1], X_3:lng, X_4:lng):bat[:any] ", "SQLnth_value;", ""
]
[ "batsql", "nth_value", "pattern batsql.nth_value(X_1:bat[:any],
X_2:any_1, X_3:bat[:lng], X_4:bat[:lng]):bat[:any] ", "SQLnth_value;",
"" ]
[ "batsql", "nth_value", "pattern batsql.nth_value(X_1:bat[:any],
X_2:bat[:any_1], X_3:bat[:lng], X_4:bat[:lng]):bat[:any] ", "SQLnth_value;",
"" ]
@@ -12612,7 +12612,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "ms_trunc", "command sql.ms_trunc(X_1:dbl, X_2:int):dbl ",
"dbl_trunc_wrap;", "" ]
[ "sql", "ms_trunc", "command sql.ms_trunc(X_1:flt, X_2:int):flt ",
"flt_trunc_wrap;", "" ]
[ "sql", "mvc", "pattern sql.mvc():int ", "SQLmvc;", ""
]
-[ "sql", "next_value", "unsafe pattern sql.next_value(X_1:str,
X_2:str):lng ", "mvc_next_value;", "" ]
+[ "sql", "next_value", "pattern sql.next_value(X_1:str, X_2:str):lng
", "mvc_next_value;", "" ]
[ "sql", "nth_value", "pattern sql.nth_value(X_1:any, X_2:any_1,
X_3:lng, X_4:lng):any ", "SQLnth_value;", "" ]
[ "sql", "ntile", "pattern sql.ntile(X_1:any, X_2:any_1, X_3:bit,
X_4:bit):any_1 ", "SQLntile;", "" ]
[ "sql", "optimizer_updates", "pattern sql.optimizer_updates():void
", "SQLoptimizersUpdate;", "" ]
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5514,10 +5514,10 @@ static mel_func sql_init_funcs[] = {
pattern("sql", "setVariable", setVariable, true, "Set the value of a session
variable", args(1,5,
arg("",int),arg("mvc",int),arg("sname",str),arg("varname",str),argany("value",1))),
pattern("sql", "getVariable", getVariable, false, "Get the value of a session
variable", args(1,4,
argany("",1),arg("mvc",int),arg("sname",str),arg("varname",str))),
pattern("sql", "logfile", mvc_logfile, true, "Enable/disable saving the sql
statement traces", args(1,2, arg("",void),arg("filename",str))),
- pattern("sql", "next_value", mvc_next_value, true, "return the next value of
the sequence", args(1,3, arg("",lng),arg("sname",str),arg("sequence",str))),
- pattern("batsql", "next_value", mvc_bat_next_value, true, "return the next
value of the sequence", args(1,3,
batarg("",lng),batarg("sname",str),arg("sequence",str))),
- pattern("batsql", "next_value", mvc_bat_next_value, true, "return the next
value of sequences", args(1,3,
batarg("",lng),arg("sname",str),batarg("sequence",str))),
- pattern("batsql", "next_value", mvc_bat_next_value, true, "return the next
value of sequences", args(1,3,
batarg("",lng),batarg("sname",str),batarg("sequence",str))),
+ pattern("sql", "next_value", mvc_next_value, false, "return the next value of
the sequence", args(1,3, arg("",lng),arg("sname",str),arg("sequence",str))),
+ pattern("batsql", "next_value", mvc_bat_next_value, false, "return the next
value of the sequence", args(1,3,
batarg("",lng),batarg("sname",str),arg("sequence",str))),
+ pattern("batsql", "next_value", mvc_bat_next_value, false, "return the next
value of sequences", args(1,3,
batarg("",lng),arg("sname",str),batarg("sequence",str))),
+ pattern("batsql", "next_value", mvc_bat_next_value, false, "return the next
value of sequences", args(1,3,
batarg("",lng),batarg("sname",str),batarg("sequence",str))),
pattern("sql", "get_value", mvc_get_value, false, "return the current value
of the sequence", args(1,3, arg("",lng),arg("sname",str),arg("sequence",str))),
pattern("batsql", "get_value", mvc_bat_get_value, false, "return the current
value of the sequence", args(1,3,
batarg("",lng),batarg("sname",str),arg("sequence",str))),
pattern("batsql", "get_value", mvc_bat_get_value, false, "return the current
value of sequences", args(1,3,
batarg("",lng),arg("sname",str),batarg("sequence",str))),
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
