X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=vector%2Ftupleitem.h;h=59589e7c90555f96dd4e521610eea0f890e48e2f;hb=47f0e2bd1cc8942f5c92ffa2f37db416d98d9e9e;hp=37d5e248f99b41c73fa9748be9837a6a40346dda;hpb=84fa20543ae0464a87fde599d1db66bfdbd29198;p=rrq%2Frrqmisc.git

diff --git a/vector/tupleitem.h b/vector/tupleitem.h
index 37d5e24..59589e7 100644
--- a/vector/tupleitem.h
+++ b/vector/tupleitem.h
@@ -14,6 +14,7 @@ typedef void *tuple[];
  * macro \ref TUPLEITEMINIT may be used to initialize particular
  * tupleschema records, which each become tupleitem declaration for
  * its particular arity and parts declarations
+ * \extends itemkeyfun
  */
 typedef struct {
     /**
@@ -22,7 +23,7 @@ typedef struct {
      * itemkeyfun pointer to be within a tupleschema record so as to
      * provide the handling of the tuple columns.
      */
-    itemkeyfun functions;
+    itemkeyfun base;
 
     /**
      * This is the number of columns in a tuple.
@@ -36,43 +37,6 @@ typedef struct {
     itemkeyfun **columns;
 } tupleschema;
 
-/**
- * This callback function returns the hashcode of a key.
- *
- * \param this is a pointer to the itemkeyfun record from where this
- * callback got invoked
- *
- * \param key is the key to produce a hascode for
- *
- * \returns the hashcode which is a vector_index (i.e. unsigned long)
- *
- * The hashcode is used for indexing into the backing vector for
- * finding the an item via its key. The same key must map consistently
- * to the same hashcode while the hashtable contains an item with that
- * key. Different keys map map to the same hashcode, in which case the
- * vector placement is made at the first empty or hole slot following
- * the hashcode index.
- */
-extern unsigned long tupleitem_hashcode(itemkeyfun *this,void *key);
-
-/**
- * This callback function determines whether an item has a
- * given key or not.
- */
-extern int tupleitem_haskey(itemkeyfun *this,void *item,void *key);
-
-/**
- * This callback function returns the key of an item by considering
- * the arity and schema.
- */
-extern void *tupleitem_itemkey(itemkeyfun *this,void *item);
-
-/**
- * This callback function handles a key obtained from the itemkey
- * callback function to reclaim temporary allocation.
- */
-extern void tupleitem_releasekey(itemkeyfun *this,void *key);
-
 /**
  * Create a tuples with given values.
  */
@@ -90,6 +54,11 @@ extern tupleschema *tupleschema_create(int arity,tuple *columns);
  */
 extern tupleschema *tupleschema_mask(tupleschema *schema,...);
 
+/**
+ * \brief Return 1/0 to indicate whether the query matches the item.
+ */
+extern int tupleschema_match(tupleschema *def,tuple *query,tuple *item);
+
 /**
  * The TUPLEITEMINIT macro is used for initializing a tupleschema
  * record appropriately for a given arity and corresponding sequence