Update of /cvsroot/monetdb/MonetDB4/src/modules/contrib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5828/src/modules/contrib
Modified Files:
ddbench.mx iterator.mx
Log Message:
more consistent use of BAThkey/tkey vs ->t/h->key
Index: iterator.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/contrib/iterator.mx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iterator.mx 4 Oct 2007 10:35:08 -0000 1.4
+++ iterator.mx 14 Nov 2007 12:49:10 -0000 1.5
@@ -735,12 +735,12 @@
bn = BATnew(ht, BATttype(inner), chunksize);
bn->hsorted = outer->result->hsorted;
bn->tsorted = 0;
- bn->hkey = outer->result->hkey && inner->hkey;
+ bn->hkey = BAThkey(outer->result) && BAThkey(inner);
it = ITERinit(outer, "join", nxt, ViewFree, JoinGuess, bn,
outer->result, inner);
it->hdl.join.inner = inner;
if (nxt == JoinNextVoid) {
BATseqbase(bn, outer->result->hseqbase);
- bn->tkey = outer->result->tkey && inner->tkey;
+ bn->tkey = BATtkey(outer->result) && BATtkey(inner);
} else {
(void) BATprepareHash(inner);
it->hdl.join.hash = inner->hhash->hash;
Index: ddbench.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/contrib/ddbench.mx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ddbench.mx 20 Feb 2007 11:32:10 -0000 1.3
+++ ddbench.mx 14 Nov 2007 12:49:10 -0000 1.4
@@ -1792,7 +1792,7 @@
@2 {
[EMAIL PROTECTED]>batBuns->free = ((char*) [EMAIL PROTECTED]) -
[EMAIL PROTECTED]>batBuns->base;
BATsetcount([EMAIL PROTECTED], [EMAIL
PROTECTED]>batBuns->free/BUNsize([EMAIL PROTECTED]));
- [EMAIL PROTECTED]>hkey = BATmirror([EMAIL PROTECTED])->tkey =
b->hkey;
+ [EMAIL PROTECTED]>hkey = BATmirror([EMAIL PROTECTED])->tkey =
BAThkey(b);
[EMAIL PROTECTED]>hsorted = BAThordered(b) &&
((GDKdebug&786432)==0);
[EMAIL PROTECTED]>batDirty = 1;
}
@@ -2002,7 +2002,7 @@
bn->batBuns->free = ((char*) dst) - bn->batBuns->base;
BATsetcount(bn, bn->batBuns->free/BUNsize(bn));
bn->hsorted = BAThordered(b) && BAThordered(sel);
- bn->hkey = BATmirror(bn)->tkey = b->hkey && sel->hkey;
+ bn->hkey = BATmirror(bn)->tkey = BAThkey(b) && BAThkey(sel);
bn->batDirty = 1;
}
@= oidref
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
