Changeset: 3130d5abd580 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3130d5abd580
Modified Files:
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_orderidx.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_unique.c
gdk/gdk_utils.c
geom/monetdb5/geom.c
geom/monetdb5/geomBulk.c
geom/monetdb5/geom_upgrade.c
monetdb5/extras/rapi/converters.c.h
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/str.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/oltp.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/txtsim.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/bam_lib.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/wlr.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/bat/bat_utils.c
sql/storage/bat/bat_utils.h
sql/storage/bat/res_table.c
Branch: default
Log Message:
For a whole bunch of GDK level functions, change arg type from int to bool.
Of course only for arguments that were used as a Boolean value.
diffs (truncated from 7583 to 300 lines):
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
@@ -16,11 +16,11 @@ size_t ATOMlen(int id, const void *v);
str ATOMname(int id);
ptr ATOMnil(int id);
int ATOMprint(int id, const void *val, stream *fd);
-gdk_return BATappend(BAT *b, BAT *n, BAT *s, bit force)
__attribute__((__warn_unused_result__));
+gdk_return BATappend(BAT *b, BAT *n, BAT *s, bool force)
__attribute__((__warn_unused_result__));
void BATassertProps(BAT *b);
atomDesc BATatoms[];
BAT *BATattach(int tt, const char *heapfile, int role);
-gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
const void *c1, const void *c2, int li, int hi, BUN estimate)
__attribute__((__warn_unused_result__));
+gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
const void *c1, const void *c2, bool li, bool hi, BUN estimate)
__attribute__((__warn_unused_result__));
BAT *BATcalcabsolute(BAT *b, BAT *s);
BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
@@ -106,17 +106,17 @@ dbl BATcalcvariance_population(dbl *avgp
dbl BATcalcvariance_sample(dbl *avgp, BAT *b);
BAT *BATcalcxor(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcxorcst(BAT *b, const ValRecord *v, BAT *s);
-gdk_return BATclear(BAT *b, int force);
+gdk_return BATclear(BAT *b, bool force);
void BATcommit(BAT *b);
BAT *BATconstant(oid hseq, int tt, const void *val, BUN cnt, int role);
BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error);
BUN BATcount_no_nil(BAT *b);
gdk_return BATdel(BAT *b, BAT *d) __attribute__((__warn_unused_result__));
BAT *BATdense(oid hseq, oid tseq, BUN cnt) __attribute__((warn_unused_result));
-BAT *BATdiff(BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate);
+BAT *BATdiff(BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, BUN estimate);
gdk_return BATextend(BAT *b, BUN newcap)
__attribute__((__warn_unused_result__));
void BATfakeCommit(BAT *b);
-gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands, BAT *grps,
BUN n, int asc, int distinct) __attribute__((__warn_unused_result__));
+gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands, BAT *grps,
BUN n, bool asc, bool distinct) __attribute__((__warn_unused_result__));
int BATgetaccess(BAT *b);
PROPrec *BATgetprop(BAT *b, int idx);
gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s,
BAT *g, BAT *e, BAT *h) __attribute__((__warn_unused_result__));
@@ -139,42 +139,42 @@ BUN BATgrows(BAT *b);
gdk_return BAThash(BAT *b, BUN masksize);
void BAThseqbase(BAT *b, oid o);
gdk_return BATimprints(BAT *b);
-BAT *BATintersect(BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN
estimate);
+BAT *BATintersect(BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, BUN
estimate);
BAT *BATintersectcand(BAT *a, BAT *b);
-gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int
nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
+gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
gdk_return BATkey(BAT *b, bool onoff);
-int BATkeyed(BAT *b);
-gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
int nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
+bool BATkeyed(BAT *b);
+gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
void *BATmax(BAT *b, void *aggr);
BAT *BATmergecand(BAT *a, BAT *b);
void *BATmin(BAT *b, void *aggr);
-gdk_return BATmode(BAT *b, int onoff);
+gdk_return BATmode(BAT *b, int mode);
void BATmsync(BAT *b);
-int BATordered(BAT *b);
-int BATordered_rev(BAT *b);
-gdk_return BATorderidx(BAT *b, int stable);
-gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
+bool BATordered(BAT *b);
+bool BATordered_rev(BAT *b);
+gdk_return BATorderidx(BAT *b, bool stable);
+gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
gdk_return BATprint(BAT *b);
gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]);
gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty);
BAT *BATproject(BAT *l, BAT *r);
BAT *BATprojectchain(BAT **bats);
-gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, int li, int hi, BUN estimate)
__attribute__((__warn_unused_result__));
-gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bit force)
__attribute__((__warn_unused_result__));
+gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, bool li, bool hi, BUN estimate)
__attribute__((__warn_unused_result__));
+gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bool force)
__attribute__((__warn_unused_result__));
gdk_return BATroles(BAT *b, const char *tnme);
BAT *BATsample(BAT *b, BUN n);
-BAT *BATselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int hi,
int anti);
-gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
int nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
+BAT *BATselect(BAT *b, BAT *s, const void *tl, const void *th, bool li, bool
hi, bool anti);
+gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
gdk_return BATsetaccess(BAT *b, int mode);
void BATsetcapacity(BAT *b, BUN cnt);
void BATsetcount(BAT *b, BUN cnt);
void BATsetprop(BAT *b, int idx, int type, void *v);
BAT *BATslice(BAT *b, BUN low, BUN high);
-gdk_return BATsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, int reverse, int stable) __attribute__((__warn_unused_result__));
+gdk_return BATsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, bool reverse, bool stable) __attribute__((__warn_unused_result__));
gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty, const str separator);
gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr)
__attribute__((__warn_unused_result__));
gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty);
-gdk_return BATthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int op, int nil_matches, BUN estimate)
__attribute__((__warn_unused_result__));
+gdk_return BATthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int op, bool nil_matches, BUN estimate)
__attribute__((__warn_unused_result__));
BAT *BATthetaselect(BAT *b, BAT *s, const void *val, const char *op);
void BATtseqbase(BAT *b, oid o);
void BATundo(BAT *b);
@@ -201,11 +201,11 @@ void BBPshare(bat b);
gdk_return BBPsync(int cnt, bat *subcommit);
int BBPunfix(bat b);
void BBPunlock(void);
-gdk_return BUNappend(BAT *b, const void *right, bit force)
__attribute__((__warn_unused_result__));
+gdk_return BUNappend(BAT *b, const void *right, bool force)
__attribute__((__warn_unused_result__));
gdk_return BUNdelete(BAT *b, oid o) __attribute__((__warn_unused_result__));
BUN BUNfnd(BAT *b, const void *right);
-gdk_return BUNinplace(BAT *b, BUN p, const void *right, bit force)
__attribute__((__warn_unused_result__));
-BAT *COLcopy(BAT *b, int tt, int writeable, int role);
+gdk_return BUNinplace(BAT *b, BUN p, const void *right, bool force)
__attribute__((__warn_unused_result__));
+BAT *COLcopy(BAT *b, int tt, bool writable, int role);
BAT *COLnew(oid hseq, int tltype, BUN capacity, int role)
__attribute__((warn_unused_result));
size_t GDK_mem_maxsize;
size_t GDK_vm_maxsize;
@@ -271,7 +271,7 @@ str GDKstrndup(const char *s, size_t n)
void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
ThreadRec GDKthreads[THREADS];
size_t GDKuniqueid(size_t offset);
-gdk_return GDKupgradevarheap(BAT *b, var_t v, int copyall, int mayshare)
__attribute__((__warn_unused_result__));
+gdk_return GDKupgradevarheap(BAT *b, var_t v, int copyall, bool mayshare)
__attribute__((__warn_unused_result__));
lng GDKusec(void);
BAT *GDKval;
const char *GDKversion(void);
@@ -283,7 +283,7 @@ BUN HASHprobe(const Hash *h, const void
void HEAP_free(Heap *heap, var_t block);
void HEAP_initialize(Heap *heap, size_t nbytes, size_t nprivate, int
alignment);
var_t HEAP_malloc(Heap *heap, size_t nbytes);
-gdk_return HEAPextend(Heap *h, size_t size, int mayshare)
__attribute__((__warn_unused_result__));
+gdk_return HEAPextend(Heap *h, size_t size, bool mayshare)
__attribute__((__warn_unused_result__));
size_t HEAPmemsize(Heap *h);
size_t HEAPvmsize(Heap *h);
void IMPSdestroy(BAT *b);
@@ -464,8 +464,8 @@ BUN strHash(const char *s);
size_t strLen(const char *s);
int strNil(const char *s);
const char str_nil[2];
-gdk_return void_inplace(BAT *b, oid id, const void *val, bit force)
__attribute__((__warn_unused_result__));
-gdk_return void_replace_bat(BAT *b, BAT *p, BAT *u, bit force)
__attribute__((__warn_unused_result__));
+gdk_return void_inplace(BAT *b, oid id, const void *val, bool force)
__attribute__((__warn_unused_result__));
+gdk_return void_replace_bat(BAT *b, BAT *p, BAT *u, bool force)
__attribute__((__warn_unused_result__));
int win_mkdir(const char *, const int mode);
int win_rename(const char *, const char *);
int win_rmdir(const char *);
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Tue May 29 2018 Sjoerd Mullender <sjo...@acm.org>
+- A whole bunch of functions that took an int argument that was used as a
+ Boolean (true/false) value now take a value of type bool. The functions
+ BATkeyed, BATordered and BATordered_rev now return a bool instead of
+ an int.
+
* Tue Mar 20 2018 Sjoerd Mullender <sjo...@acm.org>
- Removed the tdense property: it's function is completely replaced by
whether or not tseqbase is equal to oid_nil.
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -691,11 +691,11 @@ gdk_export int VALisnil(const ValRecord
* // static BAT properties
* bat batCacheid; // bat id: index in BBPcache
* int batPersistence; // persistence mode
- * bit batCopiedtodisk; // BAT is saved on disk?
+ * bool batCopiedtodisk; // BAT is saved on disk?
* // dynamic BAT properties
* int batHeat; // heat of BAT in the BBP
* sht batDirty; // BAT modified after last commit?
- * bit batDirtydesc; // BAT descriptor specific dirty flag
+ * bool batDirtydesc; // BAT descriptor specific dirty flag
* Heap* batBuns; // Heap where the buns are stored
* // DELTA status
* BUN batInserted; // first inserted BUN
@@ -703,11 +703,11 @@ gdk_export int VALisnil(const ValRecord
* // Tail properties
* int ttype; // Tail type number
* str tident; // name for tail column
- * bit tkey; // tail values are unique
- * bit tunique; // tail values must be kept unique
- * bit tnonil; // tail has no nils
- * bit tsorted; // are tail values currently ordered?
- * bit tvarsized; // for speed: tail type is varsized?
+ * bool tkey; // tail values are unique
+ * bool tunique; // tail values must be kept unique
+ * bool tnonil; // tail has no nils
+ * bool tsorted; // are tail values currently ordered?
+ * bool tvarsized; // for speed: tail type is varsized?
* // Tail storage
* int tloc; // byte-offset in BUN for tail elements
* Heap *theap; // heap for varsized tail values
@@ -734,7 +734,7 @@ gdk_export int VALisnil(const ValRecord
typedef struct {
/* dynamic bat properties */
MT_Id tid; /* which thread created it */
- unsigned int
+ uint32_t
copiedtodisk:1, /* once written */
dirty:1, /* dirty wrt disk? */
dirtyflushed:1, /* was dirty before commit started? */
@@ -758,7 +758,7 @@ typedef struct PROPrec PROPrec;
typedef struct {
str id; /* label for column */
- unsigned short width; /* byte-width of the atom array */
+ uint16_t width; /* byte-width of the atom array */
bte type; /* type id. */
bte shift; /* log2 of bun width */
bool varsized:1, /* varsized/void (true) or fixedsized (false) */
@@ -859,13 +859,13 @@ typedef struct BATiter {
* HEAPalloc (Heap *h, size_t nitems, size_t itemsize);
* @item int
* @tab
- * HEAPfree (Heap *h, int remove);
+ * HEAPfree (Heap *h, bool remove);
* @item int
* @tab
- * HEAPextend (Heap *h, size_t size, int mayshare);
+ * HEAPextend (Heap *h, size_t size, bool mayshare);
* @item int
* @tab
- * HEAPload (Heap *h, str nme,ext, int trunc);
+ * HEAPload (Heap *h, str nme,ext, bool trunc);
* @item int
* @tab
* HEAPsave (Heap *h, str nme,ext);
@@ -884,7 +884,7 @@ typedef struct BATiter {
* These routines should be used to alloc free or extend heaps; they
* isolate you from the different ways heaps can be accessed.
*/
-gdk_export gdk_return HEAPextend(Heap *h, size_t size, int mayshare)
+gdk_export gdk_return HEAPextend(Heap *h, size_t size, bool mayshare)
__attribute__ ((__warn_unused_result__));
gdk_export size_t HEAPvmsize(Heap *h);
gdk_export size_t HEAPmemsize(Heap *h);
@@ -964,11 +964,11 @@ gdk_export bte ATOMelmshift(int sz);
* @- BUN manipulation
* @multitable @columnfractions 0.08 0.7
* @item BAT*
- * @tab BATappend (BAT *b, BAT *n, BAT *s, bit force)
+ * @tab BATappend (BAT *b, BAT *n, BAT *s, bool force)
* @item BAT*
- * @tab BUNappend (BAT *b, ptr right, bit force)
+ * @tab BUNappend (BAT *b, ptr right, bool force)
* @item BAT*
- * @tab BUNreplace (BAT *b, oid left, ptr right, bit force)
+ * @tab BUNreplace (BAT *b, oid left, ptr right, bool force)
* @item int
* @tab BUNfnd (BAT *b, ptr tail)
* @item BUN
@@ -1029,13 +1029,13 @@ gdk_export bte ATOMelmshift(int sz);
_ptr = (p); \
switch ((b)->twidth) { \
case 1: \
- * (unsigned char *) _ptr = (unsigned char) (_d
- GDK_VAROFFSET); \
+ * (uint8_t *) _ptr = (uint8_t) (_d -
GDK_VAROFFSET); \
break; \
case 2: \
- * (unsigned short *) _ptr = (unsigned short)
(_d - GDK_VAROFFSET); \
+ * (uint16_t *) _ptr = (uint16_t) (_d -
GDK_VAROFFSET); \
break; \
case 4: \
- * (unsigned int *) _ptr = (unsigned int) _d; \
+ * (uint32_t *) _ptr = (uint32_t) _d; \
break; \
case 8: \
* (var_t *) _ptr = _d; \
@@ -1053,13 +1053,13 @@ gdk_export bte ATOMelmshift(int sz);
_ptr = (p); \
switch ((b)->twidth) { \
case 1: \
- _d = (var_t) * (unsigned char *) _ptr +
GDK_VAROFFSET; \
+ _d = (var_t) * (uint8_t *) _ptr +
GDK_VAROFFSET; \
break; \
case 2: \
- _d = (var_t) * (unsigned short *) _ptr +
GDK_VAROFFSET; \
+ _d = (var_t) * (uint16_t *) _ptr +
GDK_VAROFFSET; \
break; \
case 4: \
- _d = (var_t) * (unsigned int *) _ptr; \
+ _d = (var_t) * (uint32_t *) _ptr; \
break; \
case 8: \
_d = * (var_t *) _ptr; \
@@ -1075,13 +1075,13 @@ gdk_export bte ATOMelmshift(int sz);
_ptr = (p); \
switch ((b)->twidth) { \
case 1: \
- * (unsigned char *) _ptr = (unsigned char) (_d
- GDK_VAROFFSET); \
+ * (uint8_t *) _ptr = (uint8_t) (_d -
GDK_VAROFFSET); \
break; \
case 2: \
- * (unsigned short *) _ptr = (unsigned short)
(_d - GDK_VAROFFSET); \
+ * (uint16_t *) _ptr = (uint16_t) (_d -
GDK_VAROFFSET); \
break; \
case 4: \
- * (unsigned int *) _ptr = (unsigned int) _d; \
+ * (uint32_t *) _ptr = (uint32_t) _d; \
break; \
case 8: \
* (var_t *) _ptr = _d; \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
