Update of /cvsroot/monetdb/pathfinder/compiler/algebra/map
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19598/algebra/map
Modified Files:
intro_thetajoin.c
Log Message:
-- Fix two more occurrences of the bug introduced 1 hour ago :|
Index: intro_thetajoin.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/intro_thetajoin.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- intro_thetajoin.c 19 Mar 2008 13:27:22 -0000 1.18
+++ intro_thetajoin.c 19 Mar 2008 14:44:03 -0000 1.19
@@ -63,7 +63,6 @@
#include "child_mnemonic.h"
#define SEEN(n) (n)->bit_dag
-#define EDGE(n) (n)->refctr
#define BOOL_COLS(n) (n)->prop->icols
#define LEFT_COLS(n) (n)->prop->l_icols
@@ -134,10 +133,10 @@
LEFT_COLS(n) = union_ (LEFT_COLS(n), left_cols);
RIGHT_COLS(n) = union_ (RIGHT_COLS(n), right_cols);
- EDGE(n)++;
+ PFprop_refctr (n) = PFprop_refctr (n) - 1;
/* nothing to do if we haven't collected
all incoming column lists of that node */
- if (EDGE(n) < PFprop_refctr (n))
+ if (PFprop_refctr (n) > 0)
return false;
/* remove all unnecessary columns from our structure */
@@ -614,8 +613,6 @@
static void
reset_fun (PFla_op_t *n)
{
- EDGE(n) = 0;
-
/* reset the referenced column information */
BOOL_COLS(n) = 0;
LEFT_COLS(n) = 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
