X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=vector%2FRelation.h;h=76c500210574e48fd3c1b9441074cf82d4578c88;hb=e938f8c45fd191d96da48f65262e4efcfada7805;hp=b3c2be7d90dee2c30493b5a4c210607c4553a61e;hpb=6fcd4ffc18696dbf4c11be32837a2035ea5ee92f;p=rrq%2Frrqmisc.git diff --git a/vector/Relation.h b/vector/Relation.h index b3c2be7..76c5002 100644 --- a/vector/Relation.h +++ b/vector/Relation.h @@ -1,5 +1,5 @@ -#ifndef relation_H -#define relation_H +#ifndef Relation_H +#define Relation_H #include #include @@ -43,7 +43,7 @@ typedef struct { * * \related Relation */ -extern Relation *relation_create(TupleSchema *schema); +extern Relation *Relation_create(TupleSchema *schema); /** * \brief Add a key constraint to a \ref Relation. @@ -68,10 +68,10 @@ extern Relation *relation_create(TupleSchema *schema); * \ref tuple "tuples" are then "knocked out" from the Relation by the * new addition. * - * \see relation_add + * \see Relation_add * \related Relation */ -extern int relation_add_constraint(Relation *r,...); +extern int Relation_add_constraint(Relation *r,...); /** * \brief Add the tuple to the Relation. @@ -91,10 +91,10 @@ extern int relation_add_constraint(Relation *r,...); * * \related Relation */ -extern Vector *relation_add(Relation *r,tuple *t); +extern Vector *Relation_add(Relation *r,tuple *t); /** - * \brief Delete all tuples matching to the query \ref tuple fromt the + * \brief Delete all tuples matching to the Query \ref tuple fromt the * \ref Relation. * * \param r is the \ref Relation concerned. @@ -104,29 +104,29 @@ extern Vector *relation_add(Relation *r,tuple *t); * \returns a \Vector Vector of all knocked out tuples, i.e. the * same-key tuples, if any, contained in the Relation * - * Note that deletion uses a "query" tuple, which means that some + * Note that deletion uses a "Query" tuple, which means that some * columns may be null to mark that them match to any value. * * \related Relation */ -extern Vector *relation_delete(Relation *r,tuple *query); +extern Vector *Relation_delete(Relation *r,tuple *Query); /** * \brief Return the next \ref tuple in the \ref Relation that matches - * to the query \ref tuple, at or after the index. + * to the Query \ref tuple, at or after the index. * * \param r is the \ref Relation concerned. * * \param index is a pointer to the \ref Vector index to update. * - * \param query is a query \tuple tuple for selection of certain + * \param Query is a Query \tuple tuple for selection of certain * column values. * * \returns any such matching \tuple tuple and an updateed *index. * * \related Relation */ -extern void *relation_next(Relation *r,VectorIndex *index,tuple *query); +extern void *Relation_next(Relation *r,VectorIndex *index,tuple *Query); /** * \brief Lay out a dynamic \ref Relation initializer for a Relation