Changeset: cc433d189515 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc433d189515
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_subquery.mal
Branch: default
Log Message:
Some more cleanup
diffs (59 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
@@ -6626,7 +6626,7 @@ static mel_func sql_init_funcs[] = {
command("sql", "zero_or_one", zero_or_one_error, false, "if col contains
exactly one value return this. Incase of more raise an exception if err is true
else return nil", args(1,3, argany("",1),batargany("col",1),arg("err",bit))),
command("sql", "zero_or_one", zero_or_one_error_bat, false, "if col contains
exactly one value return this. Incase of more raise an exception if err is true
else return nil", args(1,3, argany("",1),batargany("col",1),batarg("err",bit))),
command("sql", "subzero_or_one", SQLsubzero_or_one, false, "", args(1,5,
batargany("",1),batargany("b",1),batarg("g",oid),batarg("e",oid),arg("no_nil",bit))),
- command("sql", "all", SQLall, false, "if all values in col are equal return
this, else nil", args(1,2, argany("",1),batargany("col",1))),
+ command("sql", "all", SQLall, false, "if all values in b are equal return
this, else nil", args(1,2, argany("",1),batargany("b",1))),
pattern("sql", "suball", SQLall_grp, false, "if all values in l are equal
(per group) return the value, else nil", args(1,5,
batargany("",1),batargany("l",1),batarg("g",oid),batarg("e",oid),arg("no_nil",bit))),
pattern("sql", "suball", SQLall_grp, false, "if all values in l are equal
(per group) return the value, else nil", args(1,6,
batargany("",1),batargany("l",1),batarg("g",oid),batarg("e",oid),batarg("s",oid),arg("no_nil",bit))),
command("sql", "null", SQLnil, false, "if b has a nil return true, else
false", args(1,2, arg("",bit),batargany("b",1))),
@@ -6634,8 +6634,6 @@ static mel_func sql_init_funcs[] = {
pattern("sql", "subnull", SQLnil_grp, false, "if any value in l is nil with
in a group return true for that group, else false; with candidate list",
args(1,6,
batarg("",bit),batargany("l",1),batarg("g",oid),batarg("e",oid),batarg("s",oid),arg("no_nil",bit))),
command("sql", "any", SQLany_cmp, false, "if cmp then true, (nl or nr) nil
then nil, else false", args(1,4,
arg("",bit),arg("cmp",bit),arg("nl",bit),arg("nr",bit))),
command("sql", "all", SQLall_cmp, false, "if !cmp then false, (nl or nr) then
nil, else true", args(1,4,
arg("",bit),arg("cmp",bit),arg("nl",bit),arg("nr",bit))),
-// pattern("aggr", "anyequal", CMDvarEQ, false, "", args(1,3,
arg("",bit),argany("l",1),argany("r",1))),
-// pattern("aggr", "not_anyequal", CMDvarNE, false, "", args(1,3,
arg("",bit),argany("l",1),argany("r",1))),
command("aggr", "anyequal", SQLanyequal, false, "if any value in r is equal
to l return true, else if r has nil nil else false", args(1,3,
arg("",bit),batargany("l",1),batargany("r",1))),
command("aggr", "allnotequal", SQLallnotequal, false, "if all values in r are
not equal to l return true, else if r has nil nil else false", args(1,3,
arg("",bit),batargany("l",1),batargany("r",1))),
pattern("aggr", "subanyequal", SQLanyequal_grp, false, "if any value in r is
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("g",oid),batarg("e",oid),arg("no_nil",bit))),
@@ -6646,7 +6644,6 @@ static mel_func sql_init_funcs[] = {
pattern("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; with
candidate list", args(1,7,
batarg("",bit),batargany("l",1),batargany("r",1),batarg("g",oid),batarg("e",oid),batarg("s",oid),arg("no_nil",bit))),
pattern("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("g",oid),batarg("e",oid),arg("no_nil",bit))),
pattern("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; with candidate list", args(1,8,
batarg("",bit),batargany("l",1),batargany("r",1),batarg("rid",oid),batarg("g",oid),batarg("e",oid),batarg("s",oid),arg("no_nil",bit))),
-// command("aggr", "exist", ALGexist, false, "", args(1,3,
arg("",bit),batargany("b",2),argany("h",1))),
pattern("aggr", "exist", SQLexist, false, "", args(1,2, arg("",bit),
argany("b",1))),
pattern("bataggr", "exist", SQLexist, false, "", args(1,2, batarg("",bit),
argany("b",1))),
pattern("bataggr", "exist", SQLexist, false, "", args(1,2, arg("",bit),
batargany("b",1))),
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
@@ -21,9 +21,9 @@ comment "if col contains exactly one val
command subzero_or_one( b:bat[:any_1], g:bat[:oid], e:bat[:oid], no_nil:bit)
:bat[:any_1]
address SQLsubzero_or_one;
-command all( col:bat[:any_1]) :any_1
+command all(b:bat[:any_1]) :any_1
address SQLall
-comment "if all values in col are equal return this, else nil";
+comment "if all values in b are equal return this, else nil";
pattern suball(l:bat[:any_1], g:bat[:oid], e:bat[:oid], no_nil:bit)
:bat[:any_1]
address SQLall_grp
@@ -52,13 +52,9 @@ comment "if cmp then true, (nl or nr) ni
command all(cmp:bit, nl:bit, nr:bit) :bit
address SQLall_cmp
comment "if !cmp then false, (nl or nr) then nil, else true";
+
module aggr;
-pattern anyequal(l:any_1,r:any_1) :bit
-address CMDvarEQ;
-pattern not_anyequal(l:any_1,r:any_1) :bit
-address CMDvarNE;
-
command anyequal(l:bat[:any_1], r:bat[:any_1]) :bit
address SQLanyequal
comment "if any value in r is equal to l return true, else if r has nil nil
else false";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
