X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=vector%2Ftupleitem.c;h=c63e3ec1072bb3544af68f74fa39e46a7840b412;hb=e7cfb732dbf345432b0832c32b99b17a1741b206;hp=14c3b3ba89795aa1f928efd003353e864d7d8ce6;hpb=e47e7f1e366224e9e514e28f172afa65c732db21;p=rrq%2Frrqmisc.git

diff --git a/vector/tupleitem.c b/vector/tupleitem.c
index 14c3b3b..c63e3ec 100644
--- a/vector/tupleitem.c
+++ b/vector/tupleitem.c
@@ -22,7 +22,7 @@
  * vector placement is made at the first empty or hole slot following
  * the hashcode index.
  */
-static unsigned long tupleitem_hashcode(itemkeyfun *this,void *key) {
+static unsigned long tupleitem_hashcode(void *this,void *key) {
     tupleschema *def = (tupleschema *) this;
     tuple *kp = (tuple*) key;
     int i = 0;
@@ -40,18 +40,24 @@ static unsigned long tupleitem_hashcode(itemkeyfun *this,void *key) {
  * This callback function determines whether an item has a
  * given key or not.
  */
-static int tupleitem_haskey(itemkeyfun *this,void *item,void *key) {
+static int tupleitem_haskey(void *this,void *item,void *key) {
     tupleschema *def = (tupleschema *) this;
     tuple *kp = (tuple*) key;
     tuple *tp = (tuple*) item;
     int i = 0;
-    int haskey = 1;
     for ( ; i < def->arity; i++ ) {
-	if ( COLUMN[i] ) {
-	    haskey &= COLUMN[i]->haskey( COLUMN[i], (*tp)[i], (*kp)[i] );
+	if ( COLUMN[i] == 0 ) {
+	    if ( (*kp)[i] &&  (*tp)[i] != (*kp)[i] ) {
+		return 0;
+	    }
+	    continue;
+	}
+	if ( (*kp)[i] &&
+	     COLUMN[i]->haskey( COLUMN[i], (*tp)[i], (*kp)[i] ) == 0 ) {
+	    return 0;
 	}
     }
-    return haskey;
+    return 1;
 }
 
 
@@ -59,7 +65,7 @@ static int tupleitem_haskey(itemkeyfun *this,void *item,void *key) {
  * This callback function returns the key of an item by considering
  * the arity and mask.
  */
-static void *tupleitem_itemkey(itemkeyfun *this,void *item) {
+static void *tupleitem_itemkey(void *this,void *item) {
     tupleschema *def = (tupleschema *) this;
     tuple *tp = (tuple*) item;
     int i, j;
@@ -82,7 +88,7 @@ static void *tupleitem_itemkey(itemkeyfun *this,void *item) {
  * This callback function handles a key obtained from the itemkey
  * callback function to reclaim temporary allocation.
  */
-static void tupleitem_releasekey(itemkeyfun *this,void *key) {
+static void tupleitem_releasekey(void *this,void *key) {
     tupleschema *def = (tupleschema *) this;
     tuple *kp = (tuple*) key;
     int i,j;
@@ -110,7 +116,7 @@ tuple *tuple_create(int arity,...) {
 tupleschema *tupleschema_create(int arity,tuple *columns) {
     tupleschema *ts = (tupleschema*) malloc( sizeof( tupleschema ) );
     (*ts) = (tupleschema) {
-	.functions = {
+	.base = {
 	    .hashcode = tupleitem_hashcode,
 	    .haskey = tupleitem_haskey,
 	    .itemkey = tupleitem_itemkey,
@@ -153,3 +159,4 @@ unsigned long tuple_mask(int arity,tuple *t) {
     }
     return mask;
 }
+