Changeset: b39c49b8398a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b39c49b8398a Added Files: clients/python3/examples/mclient.py clients/python3/monetdb/exceptions.py clients/python3/monetdb/sql/types.py gdk/gdk_batop.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/batcalc.mal monetdb5/modules/mal/batcalc.mal.sh monetdb5/modules/mal/calc.c monetdb5/modules/mal/calc.mal monetdb5/modules/mal/calc.mal.sh sql/test/testdb/Tests/testdb-dump.stable.out.Windows Removed Files: gdk/gdk_batop.mx monetdb5/modules/kernel/batcalc.c monetdb5/modules/kernel/batcalc.mal monetdb5/modules/kernel/batcalc.mal.sh monetdb5/modules/kernel/batifthen.c monetdb5/modules/kernel/batifthen.h monetdb5/modules/kernel/batifthen.mal monetdb5/modules/kernel/calc.c monetdb5/modules/kernel/calc.mal monetdb5/modules/kernel/calc.mal.sh Modified Files: clients/ChangeLog clients/Tests/exports.stable.out clients/python/monetdb/__init__.py clients/python/monetdb/exceptions.py clients/python/monetdb/mapi.py clients/python/monetdb/sql/converters.py clients/python/monetdb/sql/monetize.py clients/python/monetdb/sql/pythonize.py clients/python/monetdb/sql/types.py clients/python/setup.py clients/python/test/capabilities.py clients/python/test/dbapi20.py clients/python/test/runtests.py clients/python3/monetdb/sql/converters.py clients/python3/monetdb/sql/pythonize.py clients/python3/setup.py clients/python3/test/dbapi20.py gdk/Makefile.ag gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_bat.h gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_calc.c gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_sample.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c java/ChangeLog.Jul2012 java/Makefile.ag java/build.properties java/pom.xml java/release.txt java/src/nl/cwi/monetdb/jdbc/MonetConnection.java monetdb5/mal/mal_dataflow.c monetdb5/modules/kernel/Makefile.ag monetdb5/modules/kernel/algebra.mx monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/modulechk.stable.out monetdb5/modules/mal/mal_init.mal monetdb5/tests/gdkTests/Tests/void.stable.out monetdb5/tests/suite_00/Tests/All sql/server/rel_optimizer.c sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/mapi/Tests/php_monetdb.stable.out sql/test/mapi/Tests/python_dbapi.stable.out sql/test/testdb/Tests/testdb-dump.stable.out sql/test/testdb/Tests/testdb-dump.timeout sql/test/testdb/Tests/testdb-load.timeout Branch: sciql Log Message:
merge diffs (truncated from 110825 to 300 lines): diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,3 +1,9 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Thu Jul 19 2012 Gijs Molenaar <g.j.molen...@uva.nl> +- all strings returned by python2 are unicode, removed use_unicode option +- python2 and 3 type convertion speed improvements +- python2 uses new styl objects now (bug #3104) +- split python2 and python3 + diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -64,6 +64,10 @@ BAT *BATcalcge(BAT *b1, BAT *b2); BAT *BATcalcgecst(BAT *b, const ValRecord *v); BAT *BATcalcgt(BAT *b1, BAT *b2); BAT *BATcalcgtcst(BAT *b, const ValRecord *v); +BAT *BATcalcifthencstelse(BAT *b, const ValRecord *c1, BAT *b2); +BAT *BATcalcifthencstelsecst(BAT *b, const ValRecord *c1, const ValRecord *c2); +BAT *BATcalcifthenelse(BAT *b, BAT *b1, BAT *b2); +BAT *BATcalcifthenelsecst(BAT *b, BAT *b1, const ValRecord *c2); BAT *BATcalcincr(BAT *b, int accum, int abort_on_error); BAT *BATcalcisnil(BAT *b); BAT *BATcalciszero(BAT *b); @@ -114,7 +118,6 @@ BAT *BATgroup(BAT *b, int start, int inc BUN BATgrows(BAT *b); BAT *BAThash(BAT *b, BUN masksize); BAT *BAThashjoin(BAT *l, BAT *r, BUN estimate); -BAT *BAThashsplit(BAT *b, BUN n, int unary); BAT *BAThistogram(BAT *b); BAT *BATins(BAT *b, BAT *c, bit force); BAT *BATjoin(BAT *l, BAT *r, BUN estimate); @@ -147,7 +150,6 @@ BAT *BATprev(BAT *b); int BATprint(BAT *b); int BATprintf(stream *f, BAT *b); BAT *BATrangejoin(BAT *l, BAT *rl, BAT *rh, bit li, bit hi); -BAT *BATrangesplit(BAT *b, BUN n, int unary); BAT *BATreplace(BAT *b, BAT *n, bit force); BAT *BATrestrict(BAT *b, const void *hl, const void *hh, const void *tl, const void *th); BAT *BATrevert(BAT *b); @@ -237,7 +239,7 @@ BAT *GDKkey; void *GDKmalloc(size_t size); size_t GDKmem_cursize(void); size_t GDKmem_inuse(void); -void *GDKmmap(char *path, int mode, off_t off, size_t len); +void *GDKmmap(const char *path, int mode, off_t off, size_t len); int GDKms(void); int GDKnr_threads; void GDKprotect(void); @@ -287,7 +289,7 @@ void MT_locktrace_end(void); char *MT_locktrace_nme[65536]; void MT_locktrace_start(void); struct Mallinfo MT_mallinfo(void); -void *MT_mmap(char *path, int mode, off_t off, size_t len); +void *MT_mmap(const char *path, int mode, off_t off, size_t len); int MT_munmap(void *p, size_t len); int MT_path_absolute(const char *path); void MT_sleep_ms(unsigned int ms); @@ -738,54 +740,40 @@ str ALGsum_wrd_lng(lng *res, int *bid, b str ALGsum_wrd_wrd(wrd *res, int *bid, bit *empty_is_nil); str ALGsunion(int *result, int *lid, int *rid); str ALGsunique(int *result, int *bid); +str ALGtdiff(int *result, int *lid, int *rid); str ALGthetajoin(int *result, int *lid, int *rid, int *opc); str ALGthetajoinEstimate(int *result, int *lid, int *rid, int *opc, lng *estimate); str ALGthetaselect(int *result, int *bid, ptr low, str *op); str ALGthetauselect(int *result, int *bid, ptr value, str *op); str ALGthsort(int *result, int *lid); +str ALGtintersect(int *result, int *lid, int *rid); str ALGtmark(int *result, int *bid, oid *base); str ALGtmark_default(int *result, int *bid); str ALGtmarkp(int *result, int *bid, int *nr_parts, int *part_nr); str ALGtopN(int *res, int *bid, lng *top); str ALGtsort(int *result, int *bid); str ALGtsort_rev(int *result, int *bid); +str ALGtunion(int *result, int *lid, int *rid); str ALGtunique(int *result, int *bid); -str ALGuhashsplit(int *result, int *bid, int *nfrag); +str ALGtunique(int *result, int *bid); str ALGuselect(int *result, int *bid, ptr low, ptr high); str ALGuselect1(int *result, int *bid, ptr value); str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin, bit *rin); -str ARRAYfiller(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str ARRAYfiller_bat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str ARRAYseries_bte(int *ret, bte *start, bte *step, bte *stop, int *grp, int *series); -str ARRAYseries_dbl(int *ret, dbl *start, dbl *step, dbl *stop, int *grp, int *series); -str ARRAYseries_flt(int *ret, flt *start, flt *step, flt *stop, int *grp, int *series); -str ARRAYseries_int(int *ret, int *start, int *step, int *stop, int *grp, int *series); -str ARRAYseries_lng(int *ret, lng *start, lng *step, lng *stop, int *grp, int *series); -str ARRAYseries_sht(int *ret, sht *start, sht *step, sht *stop, int *grp, int *series); -str ARRAYtilesAvg_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesAvg_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesAvg_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesAvg_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesAvg_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesAvg_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMax_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMax_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMax_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMax_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMax_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMax_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMin_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMin_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMin_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMin_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMin_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesMin_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesSum_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesSum_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesSum_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesSum_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesSum_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ARRAYtilesSum_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str ARRAYgridBAT_int(int *ret, int *bid, int *groups, int *groupsize, int *clustersize, int *offset); +str ARRAYgridBAT_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng *clustersize, lng *offset); +str ARRAYgridBATshift_int(int *ret, int *bid, int *groups, int *groupsize, int *clustersize, int *offset, int *shift); +str ARRAYgridBATshift_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng *clustersize, lng *offset, lng *shift); +str ARRAYgridShift_int(int *ret, int *groups, int *groupsize, int *clustersize, int *offset, int *shift); +str ARRAYgridShift_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng *offset, lng *shift); +str ARRAYgrid_int(int *ret, int *groups, int *groupsize, int *clustersize, int *offset); +str ARRAYgrid_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng *offset); +str ARRAYmultiply_int_int(int *ret, int *bid, int *rid); +str ARRAYmultiply_int_lng(int *ret, int *bid, int *rid); +str ARRAYmultiply_lng_lng(int *ret, int *bid, int *rid); +str ARRAYmultiply_sht_int(int *ret, int *bid, int *rid); +str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid); +str ARRAYproduct(int *ret, int *bid, int *rid); +str ARRAYproject(int *ret, int *bid, int *cst); str ATTbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ATTbindPartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ATTlocation(str *fnme, int *bid); @@ -937,7 +925,6 @@ ptr BATmin(BAT *b, ptr aggr); char BBPTraceCall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc); str BKCaccbuild(int *ret, int *bid, str *acc, ptr *param); str BKCaccbuild_std(int *ret, int *bid, int *acc); -str BKCaccess(int *res, int *bid, int *m); str BKCappend_force_wrap(int *r, int *bid, int *uid, bit *force); str BKCappend_reverse_val_wrap(int *r, int *bid, ptr u); str BKCappend_val_force_wrap(int *r, int *bid, ptr u, bit *force); @@ -984,7 +971,7 @@ str BKChasWriteMode(bit *res, int *bid); str BKCheat(int *res, str *input); str BKChot(int *res, str *input); str BKChotBAT(int *res, int *bid); -str BKCinfo(int *retval, int *bid); +str BKCinfo(int *ret1, int *ret2, int *bid); str BKCinsert_bat(int *r, int *bid, int *sid); str BKCinsert_bat_force(int *r, int *bid, int *sid, bit *force); char *BKCinsert_bun(int *r, int *bid, ptr h, ptr t); @@ -1259,7 +1246,6 @@ str CMDbbpDiskReads(lng *ret); str CMDbbpDiskSpace(lng *ret); str CMDbbpDiskWrites(lng *ret); str CMDbbpGetObjects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbbpHeadType(int *ret); str CMDbbpHeat(int *ret); str CMDbbpKind(int *ret); str CMDbbpLRefCount(int *ret); @@ -1271,7 +1257,7 @@ str CMDbbpRefCount(int *ret); str CMDbbpReleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbbpStatus(int *ret); str CMDbbpSubCommit(int *ret, int *bid); -str CMDbbpTailType(int *ret); +str CMDbbpType(int *ret); str CMDbbpbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbbpbind2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str CMDbbpbindDefinition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1305,103 +1291,15 @@ str CMDcloseProfilerStream(int *res); str CMDclrFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDclrFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); str CMDconvert_bit(bat *ret, bat *bid); -str CMDconvert_bit(int *ret, int *bid); -str CMDconvert_bit_bte(int *ret, int *bid); -str CMDconvert_bit_int(int *ret, int *bid); -str CMDconvert_bit_lng(int *ret, int *bid); -str CMDconvert_bit_sht(int *ret, int *bid); -str CMDconvert_bit_str(int *ret, int *bid); -str CMDconvert_bit_wrd(int *ret, int *bid); str CMDconvert_bte(bat *ret, bat *bid); -str CMDconvert_bte(int *ret, int *bid); -str CMDconvert_bte_bit(int *ret, int *bid); -str CMDconvert_bte_dbl(int *ret, int *bid); -str CMDconvert_bte_flt(int *ret, int *bid); -str CMDconvert_bte_int(int *ret, int *bid); -str CMDconvert_bte_lng(int *ret, int *bid); -str CMDconvert_bte_oid(int *ret, int *bid); -str CMDconvert_bte_sht(int *ret, int *bid); -str CMDconvert_bte_str(int *ret, int *bid); -str CMDconvert_bte_wrd(int *ret, int *bid); str CMDconvert_dbl(bat *ret, bat *bid); -str CMDconvert_dbl(int *ret, int *bid); -str CMDconvert_dbl_bte(int *ret, int *bid); -str CMDconvert_dbl_flt(int *ret, int *bid); -str CMDconvert_dbl_int(int *ret, int *bid); -str CMDconvert_dbl_lng(int *ret, int *bid); -str CMDconvert_dbl_sht(int *ret, int *bid); -str CMDconvert_dbl_str(int *ret, int *bid); -str CMDconvert_dbl_wrd(int *ret, int *bid); str CMDconvert_flt(bat *ret, bat *bid); -str CMDconvert_flt(int *ret, int *bid); -str CMDconvert_flt_bte(int *ret, int *bid); -str CMDconvert_flt_dbl(int *ret, int *bid); -str CMDconvert_flt_int(int *ret, int *bid); -str CMDconvert_flt_lng(int *ret, int *bid); -str CMDconvert_flt_sht(int *ret, int *bid); -str CMDconvert_flt_str(int *ret, int *bid); -str CMDconvert_flt_wrd(int *ret, int *bid); str CMDconvert_int(bat *ret, bat *bid); -str CMDconvert_int(int *ret, int *bid); -str CMDconvert_int_bit(int *ret, int *bid); -str CMDconvert_int_bte(int *ret, int *bid); -str CMDconvert_int_dbl(int *ret, int *bid); -str CMDconvert_int_flt(int *ret, int *bid); -str CMDconvert_int_lng(int *ret, int *bid); -str CMDconvert_int_oid(int *ret, int *bid); -str CMDconvert_int_sht(int *ret, int *bid); -str CMDconvert_int_str(int *ret, int *bid); -str CMDconvert_int_wrd(int *ret, int *bid); str CMDconvert_lng(bat *ret, bat *bid); -str CMDconvert_lng(int *ret, int *bid); -str CMDconvert_lng_bit(int *ret, int *bid); -str CMDconvert_lng_bte(int *ret, int *bid); -str CMDconvert_lng_dbl(int *ret, int *bid); -str CMDconvert_lng_flt(int *ret, int *bid); -str CMDconvert_lng_int(int *ret, int *bid); -str CMDconvert_lng_oid(int *ret, int *bid); -str CMDconvert_lng_sht(int *ret, int *bid); -str CMDconvert_lng_str(int *ret, int *bid); -str CMDconvert_lng_wrd(int *ret, int *bid); str CMDconvert_oid(bat *ret, bat *bid); -str CMDconvert_oid(int *ret, int *bid); -str CMDconvert_oid_bte(int *ret, int *bid); -str CMDconvert_oid_dbl(int *ret, int *bid); -str CMDconvert_oid_flt(int *ret, int *bid); -str CMDconvert_oid_int(int *ret, int *bid); -str CMDconvert_oid_lng(int *ret, int *bid); -str CMDconvert_oid_sht(int *ret, int *bid); -str CMDconvert_oid_wrd(int *ret, int *bid); str CMDconvert_sht(bat *ret, bat *bid); -str CMDconvert_sht(int *ret, int *bid); -str CMDconvert_sht_bit(int *ret, int *bid); -str CMDconvert_sht_bte(int *ret, int *bid); -str CMDconvert_sht_dbl(int *ret, int *bid); -str CMDconvert_sht_flt(int *ret, int *bid); -str CMDconvert_sht_int(int *ret, int *bid); -str CMDconvert_sht_lng(int *ret, int *bid); -str CMDconvert_sht_oid(int *ret, int *bid); -str CMDconvert_sht_str(int *ret, int *bid); -str CMDconvert_sht_wrd(int *ret, int *bid); str CMDconvert_str(bat *ret, bat *bid); -str CMDconvert_str(int *ret, int *bid); -str CMDconvert_str_bit(int *ret, int *bid); -str CMDconvert_str_bte(int *ret, int *bid); -str CMDconvert_str_dbl(int *ret, int *bid); -str CMDconvert_str_flt(int *ret, int *bid); -str CMDconvert_str_int(int *ret, int *bid); -str CMDconvert_str_lng(int *ret, int *bid); -str CMDconvert_str_sht(int *ret, int *bid); str CMDconvert_wrd(bat *ret, bat *bid); -str CMDconvert_wrd(int *ret, int *bid); -str CMDconvert_wrd_bit(int *ret, int *bid); -str CMDconvert_wrd_bte(int *ret, int *bid); -str CMDconvert_wrd_dbl(int *ret, int *bid); -str CMDconvert_wrd_flt(int *ret, int *bid); -str CMDconvert_wrd_int(int *ret, int *bid); -str CMDconvert_wrd_lng(int *ret, int *bid); -str CMDconvert_wrd_oid(int *ret, int *bid); -str CMDconvert_wrd_sht(int *ret, int *bid); str CMDconvertsignal_bit(bat *ret, bat *bid); str CMDconvertsignal_bte(bat *ret, bat *bid); str CMDconvertsignal_dbl(bat *ret, bat *bid); @@ -1428,108 +1326,19 @@ str CMDgetPageSize(int *ret); str CMDgetSystemTime(lng *ret); str CMDgetTrace(int *res, str *ev); str CMDgetUserTime(lng *ret); -str CMDifThenCst_bit(int *ret, int *bid, bit *tid); -str CMDifThenCst_bte(int *ret, int *bid, bte *tid); -str CMDifThenCst_dbl(int *ret, int *bid, dbl *tid); -str CMDifThenCst_flt(int *ret, int *bid, flt *tid); -str CMDifThenCst_int(int *ret, int *bid, int *tid); -str CMDifThenCst_lng(int *ret, int *bid, lng *tid); -str CMDifThenCst_oid(int *ret, int *bid, oid *tid); -str CMDifThenCst_sht(int *ret, int *bid, sht *tid); -str CMDifThenCst_str(int *ret, int *bid, str *tid); -str CMDifThenElseCst1_bit(int *ret, int *bid, bit *val, int *eid); -str CMDifThenElseCst1_bte(int *ret, int *bid, bte *val, int *eid); -str CMDifThenElseCst1_dbl(int *ret, int *bid, dbl *val, int *eid); -str CMDifThenElseCst1_flt(int *ret, int *bid, flt *val, int *eid); -str CMDifThenElseCst1_int(int *ret, int *bid, int *val, int *eid); -str CMDifThenElseCst1_lng(int *ret, int *bid, lng *val, int *eid); -str CMDifThenElseCst1_oid(int *ret, int *bid, oid *val, int *eid); -str CMDifThenElseCst1_sht(int *ret, int *bid, sht *val, int *eid); -str CMDifThenElseCst1_str(int *ret, int *bid, str *val, int *eid); -str CMDifThenElseCst2_bit(int *ret, int *bid, int *tid, bit *val); -str CMDifThenElseCst2_bte(int *ret, int *bid, int *tid, bte *val); -str CMDifThenElseCst2_dbl(int *ret, int *bid, int *tid, dbl *val); -str CMDifThenElseCst2_flt(int *ret, int *bid, int *tid, flt *val); -str CMDifThenElseCst2_int(int *ret, int *bid, int *tid, int *val); _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list