Changeset: c2b734b9868e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c2b734b9868e
Modified Files:
        monetdb5/modules/kernel/batstr.c
Branch: txtsim
Log Message:

Needs to be str module and not batstr for custom join ops


diffs (24 lines):

diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -5797,13 +5797,13 @@ mel_func batstr_init_funcs[] = {
        pattern("batstr", "contains", BATSTRcontains_strcst, false, "Check if 
string haystack contains bat string needle (with CL) + icase flag.", args(1,5, 
batarg("",bit),arg("s",str),batarg("prefix",str),arg("icase",bit),batarg("s",oid))),
        command("batstr", "startsWithselect", BATSTRstartswithselect, false, 
"Select all head values of the first input BAT for which the\ntail value starts 
with the given prefix.", args(1,6, 
batarg("",oid),batarg("b",str),batarg("s",oid),arg("prefix",str),arg("caseignore",bit),arg("anti",bit))),
        command("batstr", "endsWithselect", BATSTRendswithselect, false, 
"Select all head values of the first input BAT for which the\ntail value end 
with the given suffix.", args(1,6, 
batarg("",oid),batarg("b",str),batarg("s",oid),arg("suffix",str),arg("caseignore",bit),arg("anti",bit))),
-       command("batstr", "containsselect", BATSTRcontainsselect, false, 
"Select all head values of the first input BAT for which the\ntail value 
contains the given needle.", args(1,6, 
batarg("",oid),batarg("b",str),batarg("s",oid),arg("needle",str),arg("caseignore",bit),arg("anti",bit))),
-       command("algebra", "startsWithjoin", BATSTRstartswithjoin, false, "Join 
the string bat L with the prefix bat R\nwith optional candidate lists SL and 
SR\nThe result is two aligned bats with oids of matching rows.", args(2,10, 
batarg("",oid),batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),arg("anti",bit))),
-       command("algebra", "startsWithjoin", BATSTRstartswithjoin1, false, "The 
same as BATSTRstartswithjoin, but only produce one output", 
args(1,9,batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),
 arg("anti",bit))),
-       command("algebra", "endsWithjoin", BATSTRendswithjoin, false, "Join the 
string bat L with the suffix bat R\nwith optional candidate lists SL and 
SR\nThe result is two aligned bats with oids of matching rows.", args(2,10, 
batarg("",oid),batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),arg("anti",bit))),
-       command("algebra", "endsWithjoin", BATSTRendswithjoin1, false, "The 
same as BATSTRendswithjoin, but only produce one output", 
args(1,9,batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),
 arg("anti",bit))),
-       command("algebra", "containsWithjoin", BATSTRcontainsjoin, false, "Join 
the string bat L with the bat R if L contains the string of R\nwith optional 
candidate lists SL and SR\nThe result is two aligned bats with oids of matching 
rows.", args(2,10, 
batarg("",oid),batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),arg("anti",bit))),
-       command("algebra", "containsWithjoin", BATSTRcontainsjoin1, false, "The 
same as BATSTRcontainsjoin, but only produce one output", 
args(1,9,batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),
 arg("anti",bit))),
+       command("str", "containsselect", BATSTRcontainsselect, false, "Select 
all head values of the first input BAT for which the\ntail value contains the 
given needle.", args(1,6, 
batarg("",oid),batarg("b",str),batarg("s",oid),arg("needle",str),arg("caseignore",bit),arg("anti",bit))),
+       command("str", "startsWithjoin", BATSTRstartswithjoin, false, "Join the 
string bat L with the prefix bat R\nwith optional candidate lists SL and 
SR\nThe result is two aligned bats with oids of matching rows.", args(2,10, 
batarg("",oid),batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),arg("anti",bit))),
+       command("str", "startsWithjoin", BATSTRstartswithjoin1, false, "The 
same as BATSTRstartswithjoin, but only produce one output", 
args(1,9,batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),
 arg("anti",bit))),
+       command("str", "endsWithjoin", BATSTRendswithjoin, false, "Join the 
string bat L with the suffix bat R\nwith optional candidate lists SL and 
SR\nThe result is two aligned bats with oids of matching rows.", args(2,10, 
batarg("",oid),batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),arg("anti",bit))),
+       command("str", "endsWithjoin", BATSTRendswithjoin1, false, "The same as 
BATSTRendswithjoin, but only produce one output", 
args(1,9,batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),
 arg("anti",bit))),
+       command("str", "containsjoin", BATSTRcontainsjoin, false, "Join the 
string bat L with the bat R if L contains the string of R\nwith optional 
candidate lists SL and SR\nThe result is two aligned bats with oids of matching 
rows.", args(2,10, 
batarg("",oid),batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),arg("anti",bit))),
+       command("str", "containsjoin", BATSTRcontainsjoin1, false, "The same as 
BATSTRcontainsjoin, but only produce one output", 
args(1,9,batarg("",oid),batarg("l",str),batarg("r",str),batarg("caseignore",bit),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng),
 arg("anti",bit))),
        pattern("batstr", "splitpart", STRbatsplitpart, false, "Split string on 
delimiter. Returns\ngiven field (counting from one.)", args(1,4, 
batarg("",str),batarg("s",str),batarg("needle",str),batarg("field",int))),
        pattern("batstr", "splitpart", STRbatsplitpartcst, false, "Split string 
on delimiter. Returns\ngiven field (counting from one.)", args(1,4, 
batarg("",str),batarg("s",str),arg("needle",str),arg("field",int))),
        pattern("batstr", "splitpart", STRbatsplitpart_needlecst, false, "Split 
string on delimiter. Returns\ngiven field (counting from one.)", args(1,4, 
batarg("",str),batarg("s",str),arg("needle",str),batarg("field",int))),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to