Changeset: e69f031a1f15 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e69f031a1f15
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_subquery.mal
Branch: default
Log Message:
fixed mel definition of aggr.exist
diffs (52 lines):
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
@@ -6642,12 +6642,12 @@ static mel_func sql_init_funcs[] = {
command("aggr", "suballnotequal", SQLallnotequal_grp, false, "if all values
in r are not equal to l return true, else if r has nil nil else false",
args(1,6,
batarg("",bit),batargany("l",1),batargany("r",1),batarg("gp",oid),batarg("gpe",oid),arg("no_nil",bit))),
command("aggr", "suballnotequal", SQLallnotequal_grp2, false, "if all values
in r are not equal to l return true, else if r has nil nil else false, except
if rid is nil (ie empty) then true", args(1,7,
batarg("",bit),batargany("l",1),batargany("r",1),batarg("rid",oid),batarg("gp",oid),batarg("gpe",oid),arg("no_nil",bit))),
// command("aggr", "exist", ALGexist, false, "", args(1,3,
arg("",bit),batargany("b",2),argany("h",1))),
- command("aggr", "exist", SQLexist, false, "", args(1,2,
arg("",bit),batargany("b",2))),
- pattern("aggr", "exist", SQLexist_val, false, "", args(1,2,
arg("",bit),argany("v",2))),
- command("aggr", "subexist", SQLsubexist, false, "", args(1,5,
batarg("",bit),batargany("b",2),batarg("g",oid),batarg("e",oid),arg("no_nil",bit))),
- command("aggr", "not_exist", SQLnot_exist, false, "", args(1,2,
arg("",bit),batargany("b",2))),
- pattern("aggr", "not_exist", SQLnot_exist_val, false, "", args(1,2,
arg("",bit),argany("v",2))),
- command("aggr", "subnot_exist", SQLsubnot_exist, false, "", args(1,5,
batarg("",bit),batargany("b",2),batarg("g",oid),batarg("e",oid),arg("no_nil",bit))),
+ command("aggr", "exist", SQLexist, false, "", args(1,2,
arg("",bit),batargany("b",0))),
+ pattern("aggr", "exist", SQLexist_val, false, "", args(1,2,
arg("",bit),argany("v",0))),
+ command("aggr", "subexist", SQLsubexist, false, "", args(1,5,
batarg("",bit),batargany("b",0),batarg("g",oid),batarg("e",oid),arg("no_nil",bit))),
+ command("aggr", "not_exist", SQLnot_exist, false, "", args(1,2,
arg("",bit),batargany("b",0))),
+ pattern("aggr", "not_exist", SQLnot_exist_val, false, "", args(1,2,
arg("",bit),argany("v",0))),
+ command("aggr", "subnot_exist", SQLsubnot_exist, false, "", args(1,5,
batarg("",bit),batargany("b",0),batarg("g",oid),batarg("e",oid),arg("no_nil",bit))),
/* wlr */
pattern("wlr", "master", WLRmaster, false, "Initialize the replicator
thread", args(0,1, arg("dbname",str))),
pattern("wlr", "stop", WLRstop, false, "Stop the replicator thread", noargs),
diff --git a/sql/backends/monet5/sql_subquery.mal
b/sql/backends/monet5/sql_subquery.mal
--- a/sql/backends/monet5/sql_subquery.mal
+++ b/sql/backends/monet5/sql_subquery.mal
@@ -78,20 +78,20 @@ comment "if all values in r are not equa
command aggr.exist(b:bat[:any_2], h:any_1):bit
address ALGexist;
-command aggr.exist(b:bat[:any_2]):bit
+command aggr.exist(b:bat[:any_0]):bit
address SQLexist;
-pattern aggr.exist(v:any_2):bit
+pattern aggr.exist(v:any_0):bit
address SQLexist_val;
-command aggr.subexist(b:bat[:any_2], g:bat[:oid], e:bat[:oid],
no_nil:bit):bat[:bit]
+command aggr.subexist(b:bat[:any_0], g:bat[:oid], e:bat[:oid],
no_nil:bit):bat[:bit]
address SQLsubexist;
-command aggr.not_exist(b:bat[:any_2]):bit
+command aggr.not_exist(b:bat[:any_0]):bit
address SQLnot_exist;
-pattern aggr.not_exist(v:any_2):bit
+pattern aggr.not_exist(v:any_0):bit
address SQLnot_exist_val;
-command aggr.subnot_exist(b:bat[:any_2], g:bat[:oid], e:bat[:oid],
no_nil:bit):bat[:bit]
+command aggr.subnot_exist(b:bat[:any_0], g:bat[:oid], e:bat[:oid],
no_nil:bit):bat[:bit]
address SQLsubnot_exist;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
