Changeset: c3d448f9994e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3d448f9994e Modified Files: gdk/gdk.mx gdk/gdk_atoms.mx gdk/gdk_private.h gdk/gdk_search.mx Branch: default Log Message:
Removed some more chr's that were missed in the first round. diffs (105 lines): diff --git a/gdk/gdk.mx b/gdk/gdk.mx --- a/gdk/gdk.mx +++ b/gdk/gdk.mx @@ -2821,9 +2821,6 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b * @item HASHloop_bit * @tab * (BAT *b; Hash *h, size_t idx; bit *value, BUN w) - * @item HASHloop_chr - * @tab - * (BAT *b; Hash *h, size_t idx; char *value, BUN w) * @item HASHloop_bte * @tab * (BAT *b; Hash *h, size_t idx; bte *value, BUN w) @@ -3075,7 +3072,7 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b #define SORTfndlast_wrd(b,v) SORTfndlast_lng(b,v) @:sortloop(wrd,lng,wrd,simple,&wrd_nil)@ #endif -#define SORTloop_bit(b,p,q,tl,th) SORTloop_chr(b,p,q,tl,th) +#define SORTloop_bit(b,p,q,tl,th) SORTloop_bte(b,p,q,tl,th) /* * @+ Common BAT Operations diff --git a/gdk/gdk_atoms.mx b/gdk/gdk_atoms.mx --- a/gdk/gdk_atoms.mx +++ b/gdk/gdk_atoms.mx @@ -64,7 +64,6 @@ All Rights Reserved. * @- maximum atomic string lengths */ #define bitStrlen 8 -#define chrStrlen 8 #define bteStrlen 8 #define shtStrlen 12 #define intStrlen 24 diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h --- a/gdk/gdk_private.h +++ b/gdk/gdk_private.h @@ -129,7 +129,6 @@ int oidWrite(oid *a, stream *s, size_t c int OIDwrite(stream *fp); BUN SORTfnd(BAT *b, ptr v); BUN SORTfnd_bte(BAT *b, ptr v); -BUN SORTfnd_chr(BAT *b, ptr v); BUN SORTfnd_dbl(BAT *b, ptr v); BUN SORTfnd_flt(BAT *b, ptr v); BUN SORTfnd_int(BAT *b, ptr v); @@ -139,7 +138,6 @@ BUN SORTfnd_sht(BAT *b, ptr v); BUN SORTfnd_var(BAT *b, ptr v); BUN SORTfndfirst(BAT *b, ptr v); BUN SORTfndfirst_bte(BAT *b, ptr v); -BUN SORTfndfirst_chr(BAT *b, ptr v); BUN SORTfndfirst_dbl(BAT *b, ptr v); BUN SORTfndfirst_flt(BAT *b, ptr v); BUN SORTfndfirst_int(BAT *b, ptr v); @@ -149,7 +147,6 @@ BUN SORTfndfirst_sht(BAT *b, ptr v); BUN SORTfndfirst_var(BAT *b, ptr v); BUN SORTfndlast(BAT *b, ptr v); BUN SORTfndlast_bte(BAT *b, ptr v); -BUN SORTfndlast_chr(BAT *b, ptr v); BUN SORTfndlast_dbl(BAT *b, ptr v); BUN SORTfndlast_flt(BAT *b, ptr v); BUN SORTfndlast_int(BAT *b, ptr v); diff --git a/gdk/gdk_search.mx b/gdk/gdk_search.mx --- a/gdk/gdk_search.mx +++ b/gdk/gdk_search.mx @@ -90,7 +90,6 @@ gdk_export BUN HASHlist(Hash *h, BUN i); #define hash_any(H,V) (ATOMhash((H)->type, (V)) & (H)->mask) #define heap_hash_any(hp,H,V) ((hp) && (hp)->hashash ? ((BUN *) (V))[-1] & (H)->mask : hash_any(H,V)) #define hash_bte(H,V) ((BUN) (*(unsigned char*) (V)) & (H)->mask) -#define hash_chr(H,V) hash_bte(H,V) #define hash_sht(H,V) ((BUN) mix_sht(*((unsigned short*) (V))) & (H)->mask) #define hash_int(H,V) ((BUN) mix_int(*((unsigned int*) (V))) & (H)->mask) /* XXX return size_t-sized value for 8-byte oid? */ @@ -161,7 +160,7 @@ gdk_export BUN HASHlist(Hash *h, BUN i); #else /* SIZEOF_VOID_P == SIZEOF_LNG */ #define HASHfnd_ptr(x,y,z) HASHfnd_lng(x,y,z) #endif -#define HASHfnd_bit(x,y,z) HASHfnd_chr(x,y,z) +#define HASHfnd_bit(x,y,z) HASHfnd_bte(x,y,z) #define HASHfnd_flt(x,y,z) HASHfnd_int(x,y,z) #define HASHfnd_dbl(x,y,z) HASHfnd_lng(x,y,z) #define HASHfnd_any(x,y,z) HASHfnd(x,y,z) @@ -211,7 +210,7 @@ gdk_export BUN HASHlist(Hash *h, BUN i); #else /* SIZEOF_VOID_P == SIZEOF_LNG */ #define HASHins_ptr(h,i,v) HASHins_lng(h,i,v) #endif -#define HASHins_bit(h,i,v) HASHins_chr(h,i,v) +#define HASHins_bit(h,i,v) HASHins_bte(h,i,v) #if SIZEOF_OID == SIZEOF_INT /* OIDDEPEND */ #define HASHins_oid(h,i,v) HASHins_int(h,i,v) #else @@ -660,13 +659,13 @@ HASHgonebad(BAT *b, ptr v) * @- Range Binary Search * Type-specific versions of SORTfndfirst are available using macro * expansions. It finds the first BUN larger or equal than a certain - * value and expands to @`SORTfndfirst_chr@5, @`SORTfndfirst_sht@5, + * value and expands to @`SORTfndfirst_bte@5, @`SORTfndfirst_sht@5, * @`SORTfndfirst_int@5, @`SORTfndfirst_flt@5, @`SORTfndfirst_lng@5, * @`SORTfndfirst_dbl@5, @`SORTfndfirst_loc@5 and @`SORTfndfirst_var@5. * * Type-specific versions of SORTfndlast are available using macro * expansions. It finds the first BUN smaller or equal than a certain - * value and expands to @`SORTfndlast_chr@5, @`SORTfndlast_sht@5, + * value and expands to @`SORTfndlast_bte@5, @`SORTfndlast_sht@5, * @`SORTfndlast_int@5, @`SORTfndlast_flt@5, @`SORTfndlast_lng@5, * @`SORTfndlast_dbl@5, @`SORTfndlast_loc@5 and @`SORTfndlast_var@5. */ _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
