Changeset: 237b792f5d3d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=237b792f5d3d
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_heap.c
gdk/gdk_select.c
Branch: default
Log Message:
tshift is unsigned 8 bit value, also change ttype from bte to int8_t.
diffs (77 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
@@ -9,7 +9,7 @@ stdout of test 'exports` in directory 'c
int ALIGNsynced(BAT *b1, BAT *b2);
int ATOMallocate(const char *nme);
void *ATOMdup(int id, const void *val);
-bte ATOMelmshift(int sz);
+uint8_t ATOMelmshift(int sz);
char *ATOMformat(int id, const void *val);
int ATOMindex(const char *nme);
size_t ATOMlen(int id, const void *v);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -740,8 +740,8 @@ typedef struct {
str id; /* label for column */
uint16_t width; /* byte-width of the atom array */
- bte type; /* type id. */
- bte shift; /* log2 of bun width */
+ int8_t type; /* type id. */
+ uint8_t shift; /* log2 of bun width */
bool varsized:1, /* varsized/void (true) or fixedsized (false) */
key:1, /* no duplicate values present */
unique:1, /* no duplicate values allowed */
@@ -941,7 +941,7 @@ gdk_export gdk_return BATextend(BAT *b,
__attribute__((__warn_unused_result__));
/* internal */
-gdk_export bte ATOMelmshift(int sz);
+gdk_export uint8_t ATOMelmshift(int sz);
/*
* @- BUN manipulation
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -141,10 +141,10 @@ BATcreatedesc(oid hseq, int tt, bool hea
return NULL;
}
-bte
+uint8_t
ATOMelmshift(int sz)
{
- bte sh;
+ uint8_t sh;
int i = sz >> 1;
for (sh = 0; i != 0; sh++) {
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -380,8 +380,8 @@ file_exists(int farmid, const char *dir,
gdk_return
GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare)
{
- bte shift = b->tshift;
- unsigned short width = b->twidth;
+ uint8_t shift = b->tshift;
+ uint16_t width = b->twidth;
unsigned char *pc;
unsigned short *ps;
unsigned int *pi;
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -272,7 +272,7 @@ hashselect(BAT *b, BAT *s, BAT *bn, cons
do { \
BUN dcnt, icnt, limit, i, l, e; \
cchdc_t *restrict d = (cchdc_t *) imprints->dict; \
- bte rpp = ATOMelmshift(IMPS_PAGE >> b->tshift); \
+ uint8_t rpp = ATOMelmshift(IMPS_PAGE >> b->tshift); \
CAND; \
for (i = 0, dcnt = 0, icnt = 0; \
dcnt < imprints->dictcnt && i + off < w + pr_off && p < q;
\
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
