added tostring callback

[rrq/rrqmisc.git] / vector / tupleitem.c

diff --git a/vector/tupleitem.c b/vector/tupleitem.c
index c63e3ec1072bb3544af68f74fa39e46a7840b412..f3dfe2c70b0aff012c7b39397f3881817148bd81 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;
-    unsigned long value = 0;
+    unsigned long value = 5381;
     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;
@@ -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++ ) {
-       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;
            }
-           continue;
-       }
-       if ( (*kp)[i] &&
-            COLUMN[i]->haskey( COLUMN[i], (*tp)[i], (*kp)[i] ) == 0 ) {
-           return 0;
        }
     }
     return 1;
@@ -100,6 +99,28 @@ static void tupleitem_releasekey(void *this,void *key) {
     free( key );
 }
 
+#define OUT(X) a = X; if ( a > limit ) return 0; buffer += a; limit -= a
+
+/**
+ * This callback function writes a representation of an item into
+ * a character buffer.
+ */
+static int tupleitem_tostring(void *this,void *item,char *buffer,int limit) {
+    tupleschema *def = (tupleschema *) this;
+    tuple *t = (tuple*) item;
+    char *x = "<";
+    int a, i;
+    for ( i = 0; i < def->arity; i++ ) {
+       OUT( snprintf( buffer, limit, x ) );
+       x = ",";
+       OUT( def->columns[i]->tostring(
+                def->columns[i], (*t)[i], buffer, limit ) );
+    }
+    OUT( snprintf( buffer, limit, ">" ) );
+    return a;
+}
+
+
 // Allocate
 tuple *tuple_create(int arity,...) {
     va_list ap;
@@ -113,15 +134,18 @@ tuple *tuple_create(int arity,...) {
     return t;
 }
 
+itemkeyfun tupleschema_callbacks = {
+    .hashcode = tupleitem_hashcode,
+    .haskey = tupleitem_haskey,
+    .itemkey = tupleitem_itemkey,
+    .releasekey = tupleitem_releasekey,
+    .tostring = tupleitem_tostring
+};
+
 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
     };
@@ -159,4 +183,3 @@ unsigned long tuple_mask(int arity,tuple *t) {
     }
     return mask;
 }
-