Changeset: c08c532add28 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c08c532add28
Modified Files:
gdk/Makefile.ag
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_box.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_recycle.c
monetdb5/modules/atoms/colxml.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/attach.c
monetdb5/modules/mal/cbp.c
monetdb5/modules/mal/extensions.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/inout.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcrelib.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/replication.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/opt_dictionary.c
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_prejoin.c
monetdb5/optimizer/opt_statistics.c
monetdb5/optimizer/opt_tarantula.c
Branch: headless
Log Message:
BATdescriptor->COLdescriptor
diffs (truncated from 1732 to 300 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -28,22 +28,27 @@
VERSION = $(GDK_VERSION)
NAME = bat
SOURCES = \
- gdk_scanselect_defs_chr.mx \
- gdk_scanselect_defs_bte.mx \
- gdk_scanselect_defs_sht.mx \
- gdk_scanselect_defs_int.mx \
- gdk_scanselect_defs_flt.mx \
- gdk_scanselect_defs_dbl.mx \
- gdk_scanselect_defs_lng.mx \
- gdk_scanselect_defs_str.mx \
- gdk_scanselect_defs_fix.mx \
- gdk_scanselect_defs_var.mx \
- gdk_scanselect.mx gdk_batop.mx \
- gdk_search.mx gdk_tm.c gdk_align.mx gdk_bbp.c \
- gdk_heap.c gdk_setop.mx gdk_utils.c gdk_atoms.mx \
+# gdk_scanselect_defs_chr.mx \
+# gdk_scanselect_defs_bte.mx \
+# gdk_scanselect_defs_sht.mx \
+# gdk_scanselect_defs_int.mx \
+# gdk_scanselect_defs_flt.mx \
+# gdk_scanselect_defs_dbl.mx \
+# gdk_scanselect_defs_lng.mx \
+# gdk_scanselect_defs_str.mx \
+# gdk_scanselect_defs_fix.mx \
+# gdk_scanselect_defs_var.mx \
+# gdk_scanselect.mx \
+# gdk_batop.mx \
+# gdk_search.mx \
+# gdk_setop.mx gdk_utils.c gdk_atoms.mx \
+# gdk_relop.mx \
+ gdk_tm.c gdk_align.mx gdk_bbp.c \
+ gdk_heap.c \
gdk_qsort.c gdk_ssort.c gdk_storage.c gdk_col.c \
- gdk_delta.c gdk_relop.mx gdk_system.c gdk_value.mx \
- gdk_rangejoin.mx \
+ gdk_delta.c \
+ gdk_system.c gdk_value.mx \
+# gdk_rangejoin.mx \
gdk_posix.c gdk_logger.mx bat.feps bat1.feps bat2.feps \
libbat.rc
LIBS = ../common/options/libmoptions \
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
@@ -109,31 +109,31 @@
switch(name[0]){
case 'd':
if( idcmp("del",name)==0 && pci->argc==1){
- BATatoms[tpe].atomDel= (void (*)(Heap *, var_t *))
pci->fcn;
+ COLatoms[tpe].atomDel= (void (*)(Heap *, var_t *))
pci->fcn;
setAtomName(pci);
return 1;
}
break;
case 'c':
if( idcmp("cmp",name)==0 && pci->argc==1){
- BATatoms[tpe].atomCmp= (int (*)(ptr, ptr)) pci->fcn;
+ COLatoms[tpe].atomCmp= (int (*)(ptr, ptr)) pci->fcn;
setAtomName(pci);
return 1;
}
if( idcmp("convert",name)==0 && pci->argc==1){
- BATatoms[tpe].atomConvert= (void (*)(ptr, int))
pci->fcn;
+ COLatoms[tpe].atomConvert= (void (*)(ptr, int))
pci->fcn;
setAtomName(pci);
return 1;
}
break;
case 'f':
if( idcmp("fromstr",name)==0 && pci->argc==1){
- BATatoms[tpe].atomFromStr= (int (*)(str, int *, ptr *))
pci->fcn;
+ COLatoms[tpe].atomFromStr= (int (*)(str, int *, ptr *))
pci->fcn;
setAtomName(pci);
return 1;
}
if( idcmp("fix",name)==0 && pci->argc==1){
- BATatoms[tpe].atomFix= (int (*)(ptr)) pci->fcn;
+ COLatoms[tpe].atomFix= (int (*)(ptr)) pci->fcn;
setAtomName(pci);
return 1;
}
@@ -141,33 +141,33 @@
case 'h':
if( idcmp("heap",name)==0 && pci->argc==1){
/* heap function makes an atom varsized */
- BATatoms[tpe].size = sizeof(var_t);
-
assert_shift_width(ATOMelmshift(BATatoms[tpe].size),BATatoms[tpe].size);
- BATatoms[tpe].varsized = 1;
- BATatoms[tpe].align = sizeof(var_t);
- BATatoms[tpe].atomHeap= (void (*)(Heap *, size_t))
pci->fcn;
+ COLatoms[tpe].size = sizeof(var_t);
+
assert_shift_width(ATOMelmshift(COLatoms[tpe].size),COLatoms[tpe].size);
+ COLatoms[tpe].varsized = 1;
+ COLatoms[tpe].align = sizeof(var_t);
+ COLatoms[tpe].atomHeap= (void (*)(Heap *, size_t))
pci->fcn;
setAtomName(pci);
return 1;
}
if( idcmp("heapconvert",name)==0 && pci->argc==1){
- BATatoms[tpe].atomHeapConvert= (void (*)(Heap *, int))
pci->fcn;
+ COLatoms[tpe].atomHeapConvert= (void (*)(Heap *, int))
pci->fcn;
setAtomName(pci);
return 1;
}
if( idcmp("hash",name)==0 && pci->argc==1){
- BATatoms[tpe].atomHash= (BUN (*)(ptr)) pci->fcn;
+ COLatoms[tpe].atomHash= (BUN (*)(ptr)) pci->fcn;
setAtomName(pci);
return 1;
}
if( idcmp("heapcheck",name)==0 && pci->argc==1){
- BATatoms[tpe].atomHeapCheck= (int (*)(Heap *,
HeapRepair *)) pci->fcn;
+ COLatoms[tpe].atomHeapCheck= (int (*)(Heap *,
HeapRepair *)) pci->fcn;
setAtomName(pci);
return 1;
}
break;
case 'l':
if( idcmp("length",name)==0 && pci->argc==1){
- BATatoms[tpe].atomLen= (int (*)(ptr)) pci->fcn;
+ COLatoms[tpe].atomLen= (int (*)(ptr)) pci->fcn;
setAtomName(pci);
return 1;
}
@@ -176,19 +176,19 @@
if( idcmp("null",name)==0 && pci->argc==1){
ptr atmnull = ((ptr (*)(void)) pci->fcn) ();
- BATatoms[tpe].atomNull= atmnull;
+ COLatoms[tpe].atomNull= atmnull;
setAtomName(pci);
return 1;
}
if( idcmp("nequal",name)==0 && pci->argc==1){
- BATatoms[tpe].atomCmp= (int (*)(ptr, ptr)) pci->fcn;
+ COLatoms[tpe].atomCmp= (int (*)(ptr, ptr)) pci->fcn;
setAtomName(pci);
return 1;
}
break;
case 'p':
if( idcmp("put",name)==0 && pci->argc==1){
- BATatoms[tpe].atomPut= (var_t (*)(Heap *, var_t *,
ptr)) pci->fcn;
+ COLatoms[tpe].atomPut= (var_t (*)(Heap *, var_t *,
ptr)) pci->fcn;
setAtomName(pci);
return 1;
}
@@ -196,19 +196,19 @@
case 's':
if( idcmp("storage",name) || pci->argc != 1)
return 0;
- BATatoms[tpe].storage= (* (long (*)(void)) pci->fcn)();
+ COLatoms[tpe].storage= (* (long (*)(void)) pci->fcn)();
setAtomName(pci);
return 1;
case 't':
if( idcmp("tostr",name)==0 && pci->argc==1){
- BATatoms[tpe].atomToStr= (int (*)(str *, int *, ptr))
pci->fcn;
+ COLatoms[tpe].atomToStr= (int (*)(str *, int *, ptr))
pci->fcn;
setAtomName(pci);
return 1;
}
break;
case 'u':
if( idcmp("unfix",name)==0 && pci->argc==1){
- BATatoms[tpe].atomUnfix= (int (*)(ptr)) pci->fcn;
+ COLatoms[tpe].atomUnfix= (int (*)(ptr)) pci->fcn;
setAtomName(pci);
return 1;
}
@@ -216,19 +216,19 @@
case 'v':
if( idcmp("varsized",name) || pci->argc != 1)
return 0;
- BATatoms[tpe].varsized= (* (long (*)(void)) pci->fcn)();
+ COLatoms[tpe].varsized= (* (long (*)(void)) pci->fcn)();
setAtomName(pci);
return 1;
case 'r':
if( idcmp("read",name)==0 && pci->argc==1){
- BATatoms[tpe].atomRead= (void *(*)(void *, stream *,
size_t)) pci->fcn;
+ COLatoms[tpe].atomRead= (void *(*)(void *, stream *,
size_t)) pci->fcn;
setAtomName(pci);
return 1;
}
break;
case 'w':
if( idcmp("write",name)==0 && pci->argc==1){
- BATatoms[tpe].atomWrite= (int (*)(void *, stream *,
size_t)) pci->fcn;
+ COLatoms[tpe].atomWrite= (int (*)(void *, stream *,
size_t)) pci->fcn;
setAtomName(pci);
return 1;
}
@@ -261,16 +261,16 @@
}
ATOMproperty(name,"", (int (*)()) 0, 0);
- if( strlen(name) >= sizeof(BATatoms[0].name))
+ if( strlen(name) >= sizeof(COLatoms[0].name))
return ;
i= ATOMindex(name);
/* overload atom ? */
if (tpe) {
- BATatoms[i] = BATatoms[tpe];
- strncpy(BATatoms[i].name, name, sizeof(BATatoms[i].name));
- BATatoms[i].storage= BATatoms[tpe].storage;
+ COLatoms[i] = COLatoms[tpe];
+ strncpy(COLatoms[i].name, name, sizeof(COLatoms[i].name));
+ COLatoms[i].storage= COLatoms[tpe].storage;
} else { /* cannot overload void atoms */
- BATatoms[i].storage = i;
+ COLatoms[i].storage = i;
}
}
@@ -282,16 +282,16 @@
int i = 0;
ATOMproperty(name,"", (int (*)()) 0, 0);
- if( strlen(name) >= sizeof(BATatoms[0].name))
+ if( strlen(name) >= sizeof(COLatoms[0].name))
return -1;
i= ATOMindex(name);
- BATatoms[i] = BATatoms[TYPE_chr];
- strncpy(BATatoms[i].name, name, sizeof(BATatoms[i].name));
- BATatoms[i].storage= i;
- BATatoms[i].size = size;
- assert_shift_width(ATOMelmshift(BATatoms[i].size),BATatoms[i].size);
- BATatoms[i].align = align;
- BATatoms[i].linear = FALSE;
+ COLatoms[i] = COLatoms[TYPE_chr];
+ strncpy(COLatoms[i].name, name, sizeof(COLatoms[i].name));
+ COLatoms[i].storage= i;
+ COLatoms[i].size = size;
+ assert_shift_width(ATOMelmshift(COLatoms[i].size),COLatoms[i].size);
+ COLatoms[i].align = align;
+ COLatoms[i].linear = FALSE;
return i;
}
@@ -301,10 +301,10 @@
int i = 0;
i= ATOMindex(name);
- BATatoms[i].storage= i;
- BATatoms[i].size = size;
- assert_shift_width(ATOMelmshift(BATatoms[i].size),BATatoms[i].size);
- BATatoms[i].align = align;
+ COLatoms[i].storage= i;
+ COLatoms[i].size = size;
+ assert_shift_width(ATOMelmshift(COLatoms[i].size),COLatoms[i].size);
+ COLatoms[i].align = align;
return i;
}
@@ -324,24 +324,24 @@
return -1; /* ERROR! */
}
ATOMproperty(name,"", (int (*)()) 0, 0);
- if( strlen(name) >= sizeof(BATatoms[0].name))
+ if( strlen(name) >= sizeof(COLatoms[0].name))
return -1;
i= ATOMindex(name);
- BATatoms[i] = BATatoms[tpe];
- strncpy(BATatoms[i].name, name, sizeof(BATatoms[i].name));
- BATatoms[i].storage= tpe;
- BATatoms[i].size *= size;
- assert_shift_width(ATOMelmshift(BATatoms[i].size),BATatoms[i].size);
- BATatoms[i].linear = FALSE;
+ COLatoms[i] = COLatoms[tpe];
+ strncpy(COLatoms[i].name, name, sizeof(COLatoms[i].name));
+ COLatoms[i].storage= tpe;
+ COLatoms[i].size *= size;
+ assert_shift_width(ATOMelmshift(COLatoms[i].size),COLatoms[i].size);
+ COLatoms[i].linear = FALSE;
return i;
}
void
showAtoms(stream *fd){
int i;
- for(i=0;BATatoms[i].name[0] && i<TYPE_any; i++){
- mnstr_printf(fd,"%s", BATatoms[i].name);
- if( BATatoms[i+1].name[0]) mnstr_printf(fd,",");
+ for(i=0;COLatoms[i].name[0] && i<TYPE_any; i++){
+ mnstr_printf(fd,"%s", COLatoms[i].name);
+ if( COLatoms[i+1].name[0]) mnstr_printf(fd,",");
}
mnstr_printf(fd,"\n");
}
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -21,9 +21,9 @@
* Authorisation adminstration management
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
