Changeset: 29dd8942d938 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29dd8942d938
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst680.mal
monetdb5/mal/Tests/tst680.stable.err
monetdb5/mal/Tests/tst680.stable.out
monetdb5/mal/mal_atom.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/attach.mal
monetdb5/modules/mal/extensions.c
monetdb5/modules/mal/extensions.h
monetdb5/modules/mal/extensions.mal
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/inout.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/language.h
monetdb5/modules/mal/language.mal
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mat.mal
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcrelib.c
monetdb5/modules/mal/pcrelib.h
monetdb5/modules/mal/pcrelib.mal
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.mal
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/xmlcolumn.c
monetdb5/modules/mal/xmlcolumn.h
monetdb5/modules/mal/zorder.c
monetdb5/modules/mal/zorder.h
Branch: headless
Log Message:
Continual COL
After the name changes it is time to check
the algorithms.
diffs (truncated from 2856 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -185,7 +185,6 @@
tst661
tst662
tst670
-tst680
tst700
tst710
tst750
diff --git a/monetdb5/mal/Tests/tst680.mal b/monetdb5/mal/Tests/tst680.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst680.mal
+++ /dev/null
@@ -1,5 +0,0 @@
-#type resolution of variable target lists
-b:= column.new(:int);
-(b1,b2):= column.partition(b);
-b3:= column.partition(b);
-mdb.List();
diff --git a/monetdb5/mal/Tests/tst680.stable.err
b/monetdb5/mal/Tests/tst680.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst680.stable.err
+++ /dev/null
@@ -1,74 +0,0 @@
-stderr of test 'tst680` in directory 'mal` itself:
-
-
-# 08:09:51 >
-# 08:09:51 > mserver5 "--config=/ufs/mk/monet5//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=sql_logs" --set mapi_open=true --set xrpc_open=true --set
mapi_port=31263 --set xrpc_port=47052 --set monet_prompt= --trace
--dbname=mTests_src_mal tst680.mal
-# 08:09:51 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.29.0
-# builtin opt prefix = /ufs/mk/monet5//Linux
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = sql_logs
-# builtin opt xquery_logdir = xquery_logs
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/mk/monet5//Linux
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/mk/monet5//Linux
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = sql_logs
-# cmdline opt config = /ufs/mk/monet5//Linux/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm = /ufs/mk/monet5//Linux/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir = sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 31263
-# cmdline opt xrpc_port = 47052
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_mal
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5//Linux/etc/monetdb5.conf)
-
-# 08:09:51 >
-# 08:09:51 > Done.
-# 08:09:51 >
-
diff --git a/monetdb5/mal/Tests/tst680.stable.out
b/monetdb5/mal/Tests/tst680.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst680.stable.out
+++ /dev/null
@@ -1,33 +0,0 @@
-stdout of test 'tst680` in directory 'mal` itself:
-
-
-# 08:09:51 >
-# 08:09:51 > mserver5 "--config=/ufs/mk/monet5//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=sql_logs" --set mapi_open=true --set xrpc_open=true --set
mapi_port=31263 --set xrpc_port=47052 --set monet_prompt= --trace
--dbname=mTests_src_mal tst680.mal
-# 08:09:51 >
-
-# MonetDB server v5.11.0, based on kernel v1.29.0
-# Serving database 'mTests_src_mal', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:31263/
-function user.main():void;
-#type resolution of variable target lists
- b := bat.new(:oid,:int);
- (b1,b2) := bat.partition(b);
- b3 := bat.partition(b);
- mdb.List();
-end main;
-function user.main():void; # 0 main:void := user.main() {G}
-#type resolution of variable target lists
- b := bat.new(:oid,:int); # 2 b:bat[:oid,:int] :=
CMDBATnew(_3:oid, _4:int) {G}
- (b1,b2) := bat.partition(b); # 3 (b1:bat[:oid,:int],
b2:bat[:oid,:int]) := CMDbatpartition(b:bat[:oid,:int]) {G}
- b3 := bat.partition(b); # 4 b3:bat[:oid,:int] :=
CMDbatpartition(b:bat[:oid,:int]) {G}
- mdb.List(); # 5 _8:void := MDBlistDetail()
-end main; # 6
-
-# 08:09:51 >
-# 08:09:51 > Done.
-# 08:09:51 >
-
diff --git a/monetdb5/mal/mal_atom.c b/monetdb5/mal/mal_atom.c
--- a/monetdb5/mal/mal_atom.c
+++ b/monetdb5/mal/mal_atom.c
@@ -274,7 +274,7 @@
}
}
-/* User defined modules may introduce fixed sized types to store information
in BATs. */
+/* User defined modules may introduce fixed sized types to store information
in column. */
int
malAtomFixed(int size, int align, char *name)
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -46,35 +46,6 @@
int TYPE_blob;
int TYPE_sqlblob;
-blob_export str BLOBprelude(void);
-
-blob_export int BLOBtostr(str *tostr, int *l, blob *pin);
-blob_export int BLOBfromstr(char *instr, int *l, blob **val);
-blob_export int BLOBnequal(blob *l, blob *r);
-blob_export BUN BLOBhash(blob *b);
-blob_export blob * BLOBnull(void);
-blob_export void BLOBconvert(blob *b, int direction);
-blob_export var_t BLOBput(Heap *h, var_t *bun, blob *val);
-blob_export void BLOBdel(Heap *h, var_t *index);
-blob_export int BLOBlength(blob *p);
-blob_export void BLOBheap(Heap *heap, size_t capacity);
-blob_export int SQLBLOBfromstr(char *instr, int *l, blob **val);
-blob_export int SQLBLOBtostr(str *tostr, int *l, blob *pin);
-blob_export str BLOBtoblob(blob **retval, str *s);
-blob_export str BLOBfromblob(str *retval, blob **b);
-blob_export str BLOBfromidx(str *retval, blob **binp, int *index);
-blob_export str BLOBeoln(char *src, char *end);
-blob_export int BLOBnitems(int *ret, blob *b);
-blob_export int BLOBget(Heap *h, int *bun, int *l, blob **val);
-blob_export blob * BLOBread(blob *a, stream *s, size_t cnt);
-blob_export void BLOBwrite(blob *a, stream *s, size_t cnt);
-
-blob_export str BLOBblob_blob(blob **d, blob **s);
-blob_export str BLOBblob_fromstr(blob **b, str *d);
-
-blob_export str BLOBsqlblob_fromstr(sqlblob **b, str *d);
-blob_export str BLOB_isnil(bit *retval, blob *val);
-
str
BLOBprelude(void)
{
@@ -145,10 +116,10 @@
HEAP_free(h, *idx);
}
-BUN
+oid
blob_hash(blob *b)
{
- return (BUN) b->nitems;
+ return (oid) b->nitems;
}
blob *
@@ -692,7 +663,7 @@
blob_del(h, idx);
}
-BUN
+oid
BLOBhash(blob *b)
{
return blob_hash(b);
diff --git a/monetdb5/modules/atoms/blob.h b/monetdb5/modules/atoms/blob.h
--- a/monetdb5/modules/atoms/blob.h
+++ b/monetdb5/modules/atoms/blob.h
@@ -49,4 +49,33 @@
blob_export int sqlblob_tostr(str *tostr, int *l, blob *p);
blob_export int sqlblob_fromstr(char *instr, int *l, blob **val);
+blob_export str BLOBprelude(void);
+
+blob_export int BLOBtostr(str *tostr, int *l, blob *pin);
+blob_export int BLOBfromstr(char *instr, int *l, blob **val);
+blob_export int BLOBnequal(blob *l, blob *r);
+blob_export oid BLOBhash(blob *b);
+blob_export blob * BLOBnull(void);
+blob_export void BLOBconvert(blob *b, int direction);
+blob_export var_t BLOBput(Heap *h, var_t *bun, blob *val);
+blob_export void BLOBdel(Heap *h, var_t *index);
+blob_export int BLOBlength(blob *p);
+blob_export void BLOBheap(Heap *heap, size_t capacity);
+blob_export int SQLBLOBfromstr(char *instr, int *l, blob **val);
+blob_export int SQLBLOBtostr(str *tostr, int *l, blob *pin);
+blob_export str BLOBtoblob(blob **retval, str *s);
+blob_export str BLOBfromblob(str *retval, blob **b);
+blob_export str BLOBfromidx(str *retval, blob **binp, int *index);
+blob_export str BLOBeoln(char *src, char *end);
+blob_export int BLOBnitems(int *ret, blob *b);
+blob_export int BLOBget(Heap *h, int *bun, int *l, blob **val);
+blob_export blob * BLOBread(blob *a, stream *s, size_t cnt);
+blob_export void BLOBwrite(blob *a, stream *s, size_t cnt);
+
+blob_export str BLOBblob_blob(blob **d, blob **s);
+blob_export str BLOBblob_fromstr(blob **b, str *d);
+
+blob_export str BLOBsqlblob_fromstr(sqlblob **b, str *d);
+blob_export str BLOB_isnil(bit *retval, blob *val);
+
#endif /* __BLOB_H__ */
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -3465,7 +3465,7 @@
{ COL *b,*bn;
int v;
date d;
- BUN p,q;
+ oid p,q;
COLiter bi;
if( (b= COLdescriptor(*bid)) == NULL )
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -1092,7 +1092,7 @@
#define UTF8_CONVERSIONS (sizeof(UTF8_lower_upper) /
sizeof(UTF8_lower_upper[0]))
#define UTF8_CONV(A1,A2) \
-{ BUN UTF8_CONV_r; \
+{ oid UTF8_CONV_r; \
int UTF8_CONV_v = (A1); \
HASHfnd_int(UTF8_CONV_r, A2, &UTF8_CONV_v); \
if (UTF8_CONV_r != BUN_NONE) \
diff --git a/monetdb5/modules/mal/attach.mal b/monetdb5/modules/mal/attach.mal
--- a/monetdb5/modules/mal/attach.mal
+++ b/monetdb5/modules/mal/attach.mal
@@ -2,12 +2,12 @@
pattern bind(nme:str,low:oid,hgh:oid):col[:any_2]
address ATTbindPartition
-comment "Find a cheap way to make a BAT partition accessible locally";
+comment "Find a cheap way to make a column partition accessible locally";
pattern bind(nme:str):col[:any_1]
address ATTbind
-comment "Find a cheap way to make the BAT nme accessible locally";
+comment "Find a cheap way to make the column nme accessible locally";
command location(b:col[:any_1]):str
address ATTlocation
-comment "Locate the base of a particulat BAT in the dbfarm";
+comment "Locate the base of a particulat column in the dbfarm";
diff --git a/monetdb5/modules/mal/extensions.c
b/monetdb5/modules/mal/extensions.c
--- a/monetdb5/modules/mal/extensions.c
+++ b/monetdb5/modules/mal/extensions.c
@@ -20,97 +20,26 @@
/* Author(s) M.L.Kersten
* Column Extensions
* The kernel libraries are unaware of the MAL runtime semantics.
- * This calls for declaring some operations in the MAL module section
+ * This calls for declaring some operations in the MAL module section
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
