src/hg/utils/tdbQuery/tdbQuery.c 1.12
1.12 2009/12/03 20:06:06 kent
Adding lm parameter to rqlEvalOnRecord since array operation uses memory.
Index: src/hg/utils/tdbQuery/tdbQuery.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/utils/tdbQuery/tdbQuery.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -B -U 4 -r1.11 -r1.12
--- src/hg/utils/tdbQuery/tdbQuery.c 3 Dec 2009 18:03:09 -0000 1.11
+++ src/hg/utils/tdbQuery/tdbQuery.c 3 Dec 2009 20:06:06 -0000 1.12
@@ -721,17 +721,18 @@
else
return field->val;
}
-static boolean rqlStatementMatch(struct rqlStatement *rql, struct tdbRecord *tdb)
+static boolean rqlStatementMatch(struct rqlStatement *rql, struct tdbRecord *tdb,
+ struct lm *lm)
/* Return TRUE if where clause and tableList in statement evaluates true for tdb. */
{
struct rqlParse *whereClause = rql->whereClause;
if (whereClause == NULL)
return TRUE;
else
{
- struct rqlEval res = rqlEvalOnRecord(whereClause, tdb, lookupField);
+ struct rqlEval res = rqlEvalOnRecord(whereClause, tdb, lookupField, lm);
res = rqlEvalCoerceToBoolean(res);
return res.val.b;
}
}
@@ -838,9 +839,9 @@
fileField = tdbFieldNew("filePos", fileString->string, lm);
slAddTail(&record->fieldList, fileField);
- if (rqlStatementMatch(rql, record))
+ if (rqlStatementMatch(rql, record, lm))
{
if (!clStrict || tableExistsInSelfOrOffspring(p->db, record))
{
matchCount += 1;