Changeset: f6c023e667e4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6c023e667e4
Modified Files:
MonetDB5/src/optimizer/opt_macro.mx
Branch: Oct2010
Log Message:
Simplified expression.
The intention of the two replaced expressions is to make sure that if
X[i] equals X[j], then so do Y[i] and Y[j], and conversely, if the X's
differ, then so do the Y's. The new version of the expressions do the
same, but more concisely.
diffs (21 lines):
diff -r c3f24422e2cb -r f6c023e667e4 MonetDB5/src/optimizer/opt_macro.mx
--- a/MonetDB5/src/optimizer/opt_macro.mx Mon Oct 11 14:31:03 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_macro.mx Mon Oct 11 14:38:44 2010 +0200
@@ -168,7 +168,7 @@
return 0;
for (i = 0; i < p1->argc; i++)
for (j = i + 1; j < p1->argc; j++)
- if ((getArg(p1, i) == getArg(p1, j) && getArg(p2, i) !=
getArg(p2, j)) || (getArg(p1, i) != getArg(p1, j) && getArg(p2, i) ==
getArg(p2, j)))
+ if ((getArg(p1, i) == getArg(p1, j)) != (getArg(p2, i)
== getArg(p2, j)))
return 0;
return 1;
}
@@ -223,7 +223,7 @@
for (i = 0; i < ctop; i++)
for (j = i + 1; j < ctop; j++)
- if ((cvar[i] == cvar[j] && mvar[i] != mvar[j])
||(mvar[i] == mvar[j] && cvar[i] != cvar[j])){
+ if ((cvar[i] == cvar[j]) != (mvar[i] == mvar[j])) {
GDKfree(cvar);
GDKfree(mvar);
return 0;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
