Changeset: 1f737ac517d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f737ac517d7
Added Files:
monetdb5/modules/mal/Tests/manifoldstr.mal
monetdb5/modules/mal/Tests/manifoldstr.stable.err
monetdb5/modules/mal/Tests/manifoldstr.stable.out
Modified Files:
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/manifold.c
Branch: default
Log Message:
Extending manifold to deal with strings
diffs (truncated from 366 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -70,6 +70,7 @@ tokenizer00
zorder
manifold
+manifoldstr
#HAVE_RAPTOR?rdf
diff --git a/monetdb5/modules/mal/Tests/manifoldstr.mal
b/monetdb5/modules/mal/Tests/manifoldstr.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/manifoldstr.mal
@@ -0,0 +1,43 @@
+# the multiplex code blocks.
+
+t0:= alarm.usec();
+b:= bat.new(:oid,:str);
+
+INT_MAX := 2147483647;
+dbgmsk_restore := mdb.getDebug();
+dbgmsk_unset := 8+8388608;
+dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
+dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
+mdb.setDebug(dbgmsk_set);
+
+r:= mmath.srand(0);
+barrier i:= 0:lng;
+ bat.append(b,"The quick brown fox");
+ redo i:= iterator.next(1:lng,10:lng);
+exit i;
+
+mdb.setDebug(dbgmsk_restore);
+mdb.setDebug(dbgmsk_set);
+
+io.print(b);
+t0:= alarm.usec();
+z:bat[:oid,:str]:= mal.manifold("str","toUpper",b);
+t1:= alarm.usec();
+d0:= t1-t0;
+io.printf("#mal.manifold(str,toUpper) %d\n",d0);
+io.print(z);
+
+
+t0:= alarm.usec();
+x:bat[:oid,:str]:= mal.multiplex("str","toUpper",b);
+t1:= alarm.usec();
+d0:= t1-t0;
+io.printf("#mal.multiplex(str,toUpper) %d\n",d0);
+io.print(x);
+
+
+#t0:= alarm.usec();
+#x:= str.toUpper(b);
+#t1:= alarm.usec();
+#d0:= t1-t0;
+#io.printf("#str.toupper() %d\n",d0);
diff --git a/monetdb5/modules/mal/Tests/manifoldstr.stable.err
b/monetdb5/modules/mal/Tests/manifoldstr.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/manifoldstr.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'manifoldstr` in directory 'monetdb5/modules/mal` itself:
+
+
+# 10:40:29 >
+# 10:40:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39948" "--set"
"mapi_usock=/var/tmp/mtest-9059/.s.monetdb.39948" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"manifoldstr.mal"
+# 10:40:29 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39948
+# cmdline opt mapi_usock = /var/tmp/mtest-9059/.s.monetdb.39948
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_mal
+
+# 10:40:30 >
+# 10:40:30 > "Done."
+# 10:40:30 >
+
diff --git a/monetdb5/modules/mal/Tests/manifoldstr.stable.out
b/monetdb5/modules/mal/Tests/manifoldstr.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/manifoldstr.stable.out
@@ -0,0 +1,114 @@
+stdout of test 'manifoldstr` in directory 'monetdb5/modules/mal` itself:
+
+
+# 10:40:29 >
+# 10:40:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39948" "--set"
"mapi_usock=/var/tmp/mtest-9059/.s.monetdb.39948" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"manifoldstr.mal"
+# 10:40:29 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_modules_mal', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:39948/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9059/.s.monetdb.39948
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+#WARNING To speedup str.toUpper a bulk operator implementation is needed
+function user.main():void;
+# the multiplex code blocks.
+ t0 := alarm.usec();
+ b := bat.new(:oid,:str);
+ INT_MAX := 2147483647;
+ dbgmsk_restore := mdb.getDebug();
+ dbgmsk_unset := calc.+(8,8388608);
+ dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
+ dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
+ mdb.setDebug(dbgmsk_set);
+ r := mmath.srand(0);
+barrier i := 0:lng;
+ bat.append(b,"The quick brown fox");
+ redo i := iterator.next(1:lng,10:lng);
+exit i;
+ mdb.setDebug(dbgmsk_restore);
+ mdb.setDebug(dbgmsk_set);
+ io.print(b);
+ t0 := alarm.usec();
+ z:bat[:oid,:str] := mal.manifold("str","toUpper",b);
+ t1 := alarm.usec();
+ d0 := calc.-(t1,t0);
+ io.printf("#mal.manifold(str,toUpper) %d\n",d0);
+ io.print(z);
+ t0 := alarm.usec();
+ X_43 := bat.reverse(b);
+ X_45 := bat.new(nil:oid,nil:str);
+barrier (X_49,X_50) := iterator.new(b);
+ X_52 := str.toUpper(X_50);
+ X_53 := algebra.fetch(X_43,X_49);
+ bat.insert(X_45,X_53,X_52);
+ redo (X_49,X_50) := iterator.next(b);
+exit (X_49,X_50);
+ x:bat[:oid,:str] := X_45;
+ t1 := alarm.usec();
+ d0 := calc.-(t1,t0);
+ io.printf("#mal.multiplex(str,toUpper) %d\n",d0);
+ io.print(x);
+#t0:= alarm.usec();
+#x:= str.toUpper(b);
+#t1:= alarm.usec();
+#d0:= t1-t0;
+#io.printf("#str.toupper() %d\n",d0);
+end main;
+#--------------------------#
+# h t # name
+# void str # type
+#--------------------------#
+[ 0@0, "The quick brown fox" ]
+[ 1@0, "The quick brown fox" ]
+[ 2@0, "The quick brown fox" ]
+[ 3@0, "The quick brown fox" ]
+[ 4@0, "The quick brown fox" ]
+[ 5@0, "The quick brown fox" ]
+[ 6@0, "The quick brown fox" ]
+[ 7@0, "The quick brown fox" ]
+[ 8@0, "The quick brown fox" ]
+[ 9@0, "The quick brown fox" ]
+#mal.manifold(str,toUpper) 55
+#--------------------------#
+# h t # name
+# void str # type
+#--------------------------#
+[ 0@0, "THE QUICK BROWN FOX" ]
+[ 1@0, "THE QUICK BROWN FOX" ]
+[ 2@0, "THE QUICK BROWN FOX" ]
+[ 3@0, "THE QUICK BROWN FOX" ]
+[ 4@0, "THE QUICK BROWN FOX" ]
+[ 5@0, "THE QUICK BROWN FOX" ]
+[ 6@0, "THE QUICK BROWN FOX" ]
+[ 7@0, "THE QUICK BROWN FOX" ]
+[ 8@0, "THE QUICK BROWN FOX" ]
+[ 9@0, "THE QUICK BROWN FOX" ]
+#mal.multiplex(str,toUpper) 45
+#--------------------------#
+# h t # name
+# void str # type
+#--------------------------#
+[ 0@0, "THE QUICK BROWN FOX" ]
+[ 1@0, "THE QUICK BROWN FOX" ]
+[ 2@0, "THE QUICK BROWN FOX" ]
+[ 3@0, "THE QUICK BROWN FOX" ]
+[ 4@0, "THE QUICK BROWN FOX" ]
+[ 5@0, "THE QUICK BROWN FOX" ]
+[ 6@0, "THE QUICK BROWN FOX" ]
+[ 7@0, "THE QUICK BROWN FOX" ]
+[ 8@0, "THE QUICK BROWN FOX" ]
+[ 9@0, "THE QUICK BROWN FOX" ]
+
+# 10:40:30 >
+# 10:40:30 > "Done."
+# 10:40:30 >
+
diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -41,6 +41,10 @@ typedef struct{
void *first;
void *last;
int size;
+ int type;
+ BATiter bi;
+ BUN o;
+ str *s;
} MULTIarg;
typedef struct{
@@ -55,13 +59,17 @@ typedef struct{
#define ManifoldLoop(Type, ...) \
{ Type *v = (Type*) mut->args[0].first;\
- for( ; p< q && msg == MAL_SUCCEED; ){\
+ for( ; p< q && msg == MAL_SUCCEED; p += mut->args[mut->fvar].size){\
msg = (*mut->pci->fcn)(v, __VA_ARGS__);\
- for( i = mut->fvar; i<= mut->lvar; i++){\
+ for( i = mut->fvar; i<= mut->lvar; i++)\
+ if( mut->args[i].type < TYPE_str){\
args[i] += mut->args[i].size;\
+ } else {\
+ mut->args[i].o++;\
+ mut->args[i].s = (str *) BUNtail(mut->args[i].bi,
mut->args[i].o);\
+ args[i] = (void*) &mut->args[i].s;\
}\
v++;\
- p += mut->args[mut->fvar].size;\
}\
}
@@ -74,6 +82,22 @@ case TYPE_lng: ManifoldLoop(lng,__VA_ARG
case TYPE_oid: ManifoldLoop(oid,__VA_ARGS__); break;\
case TYPE_flt: ManifoldLoop(flt,__VA_ARGS__); break;\
case TYPE_dbl: ManifoldLoop(dbl,__VA_ARGS__); break;\
+case TYPE_str: { \
+ for( ; p< q && msg == MAL_SUCCEED; p += mut->args[mut->fvar].size){\
+ h = BUNhead(mut->args[0].bi, mut->args[0].o);\
+ msg = (*mut->pci->fcn)(&y, __VA_ARGS__);\
+ bunfastins(mut->args[0].b, (void*) h, (void*) y);\
+ for( i = mut->fvar; i<= mut->lvar; i++)\
+ if( mut->args[i].type < TYPE_str){\
+ args[i] += mut->args[i].size;\
+ } else {\
+ mut->args[i].s = (str*) BUNtail(mut->args[i].bi,
mut->args[i].o);\
+ args[i] = (void*) & mut->args[i].s; \
+ mut->args[i].o++;\
+ }\
+ mut->args[0].o++;\
+ }\
+ break;}\
default:\
msg= createException(MAL,"mal.manifold","manifold call limitation ");\
}
@@ -84,16 +108,22 @@ MANIFOLDjob(const MULTItask *mut)
{ int i;
char *p, *q;
char **args;
- str msg= MAL_SUCCEED;
+ str y, msg= MAL_SUCCEED;
+ ptr h;
args = (char**) GDKzalloc(sizeof(char*) * mut->pci->argc);
if( args == NULL)
throw(MAL,"mal.manifold",MAL_MALLOC_FAIL);
for( i = mut->pci->retc+2; i< mut->pci->argc; i++)
- if ( mut->args[i].b )
- args[i] = (char*) mut->args[i].first;
- else
+ if ( mut->args[i].b ){
+ if (mut->args[i].type < TYPE_str)
+ args[i] = (char*) mut->args[i].first;
+ else {
+ mut->args[i].s = (str*) BUNtail(mut->args[i].bi,
mut->args[i].o);
+ args[i] = (void*) & mut->args[i].s;
+ }
+ } else
args[i] = (char*) getArgReference(mut->stk,mut->pci,i);
p = (char*) mut->args[mut->fvar].first;
@@ -107,6 +137,7 @@ MANIFOLDjob(const MULTItask *mut)
default:
msg= createException(MAL,"mal.manifold","manifold call
limitation ");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
