projects
/
rrq
/
rrqmisc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exported the callbacks, and added convenience macros
[rrq/rrqmisc.git]
/
vector
/
tupleitem.c
diff --git
a/vector/tupleitem.c
b/vector/tupleitem.c
index c63e3ec1072bb3544af68f74fa39e46a7840b412..55328c5446624abda6224bc07993acfcaacdc0c9 100644
(file)
--- a/
vector/tupleitem.c
+++ b/
vector/tupleitem.c
@@
-26,11
+26,15
@@
static unsigned long tupleitem_hashcode(void *this,void *key) {
tupleschema *def = (tupleschema *) this;
tuple *kp = (tuple*) key;
int i = 0;
tupleschema *def = (tupleschema *) this;
tuple *kp = (tuple*) key;
int i = 0;
- unsigned long value =
0
;
+ unsigned long value =
5381
;
for ( ; i < def->arity; i++ ) {
if ( COLUMN[i] ) {
value <<= 3;
for ( ; i < def->arity; i++ ) {
if ( COLUMN[i] ) {
value <<= 3;
- value += COLUMN[i]->hashcode( COLUMN[i], (*kp)[i] );
+ if ( (*kp)[i] ) {
+ value += COLUMN[i]->hashcode( COLUMN[i], (*kp)[i] );
+ } else {
+ value += 17;
+ }
}
}
return value;
}
}
return value;
@@
-46,15
+50,10
@@
static int tupleitem_haskey(void *this,void *item,void *key) {
tuple *tp = (tuple*) item;
int i = 0;
for ( ; i < def->arity; i++ ) {
tuple *tp = (tuple*) item;
int i = 0;
for ( ; i < def->arity; i++ ) {
- if ( COLUMN[i]
== 0
) {
- if (
(*kp)[i] && (*tp)[i] != (*kp)[i]
) {
+ if ( COLUMN[i]
&& (*kp)[i]
) {
+ if (
COLUMN[i]->haskey( COLUMN[i], (*tp)[i], (*kp)[i] ) == 0
) {
return 0;
}
return 0;
}
- continue;
- }
- if ( (*kp)[i] &&
- COLUMN[i]->haskey( COLUMN[i], (*tp)[i], (*kp)[i] ) == 0 ) {
- return 0;
}
}
return 1;
}
}
return 1;
@@
-113,15
+112,17
@@
tuple *tuple_create(int arity,...) {
return t;
}
return t;
}
+itemkeyfun tupleschema_callbacks = {
+ .hashcode = tupleitem_hashcode,
+ .haskey = tupleitem_haskey,
+ .itemkey = tupleitem_itemkey,
+ .releasekey = tupleitem_releasekey
+};
+
tupleschema *tupleschema_create(int arity,tuple *columns) {
tupleschema *ts = (tupleschema*) malloc( sizeof( tupleschema ) );
(*ts) = (tupleschema) {
tupleschema *tupleschema_create(int arity,tuple *columns) {
tupleschema *ts = (tupleschema*) malloc( sizeof( tupleschema ) );
(*ts) = (tupleschema) {
- .base = {
- .hashcode = tupleitem_hashcode,
- .haskey = tupleitem_haskey,
- .itemkey = tupleitem_itemkey,
- .releasekey = tupleitem_releasekey
- },
+ .base = tupleschema_callbacks,
.arity = arity,
.columns = (itemkeyfun**) columns
};
.arity = arity,
.columns = (itemkeyfun**) columns
};