Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31186/runtime
Modified Files:
Tag: GDK-2
pf_support.mx
Log Message:
removed obsolete void-concurrent-access-conflictpreventio-code
that was already disabled by Niels;
this should fix icc compilation
(runtime/pf_support.mx(6453): error #593: variable "view" was set but never
used)
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.265.2.1
retrieving revision 1.265.2.2
diff -u -d -r1.265.2.1 -r1.265.2.2
--- pf_support.mx 14 Aug 2007 14:04:06 -0000 1.265.2.1
+++ pf_support.mx 15 Aug 2007 11:45:49 -0000 1.265.2.2
@@ -6450,28 +6450,17 @@
@= mval_init_batlist
{
- bit hsh=0, srt, view;
+ bit hsh=0, srt;
bat bid = *(bat*)Tloc(ws_item, pw);
batlist[ii] = BATdescriptor(bid);
- view = (batlist[ii]->htype == TYPE_void && batlist[ii]->hseqbase !=
oid_nil);
srt = (BATtordered(batlist[ii])&1);
- if (batlist[ii]->ttype == TYPE_void && batlist[ii]->tseqbase !=
oid_nil) {
- view = 1; /* do not create the hash table on a void column */
- } else {
- hsh = (BAThash(BATmirror(batlist[ii]), 0) != NULL);
- if (batlist[ii]->ttype != TYPE_oid) {
- GDKerror("mvaljoin: all BATs in the tail of the third
input BAT (ws_item) must have tail type OID.\n");
- ii++;
- @:mval_free_batlist@
- return GDK_FAIL;
- }
- }
- //if (view && !isVIEW(batlist[ii])) {
- /* avoid BUNhead()/BUNtail() corruption due to multi-threading
*/
- //BAT *b = batlist[ii];
- //batlist[ii] = VIEWcreate(b,b); /* view shares master hash
table */
- //BBPunfix(b->batCacheid); /* release the fix of BATdescriptor
*/
- //}
+ hsh = (BAThash(BATmirror(batlist[ii]), 0) != NULL);
+ if (batlist[ii]->ttype != TYPE_oid) {
+ GDKerror("mvaljoin: all BATs in the tail of the third input
BAT (ws_item) must have tail type OID.\n");
+ ii++;
+ @:mval_free_batlist@
+ return GDK_FAIL;
+ }
all_hash &= hsh;
all_sort &= srt;
some_hash |= hsh;
-------------------------------------------------------------------------
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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
