Changeset: 05619bbcdaf1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05619bbcdaf1
Modified Files:
monetdb5/optimizer/opt_remap.c
Branch: unlock
Log Message:
leftover merge of default
diffs (24 lines):
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -63,20 +63,6 @@ OPTremapDirect(Client cntxt, MalBlkPtr m
if (isaBatType(getArgType(mb, p, 2)))
p = pushNil(mb, p, TYPE_bat);
}
- } else if (p->retc == 1 &&
- bufName == batmmathRef &&
- ((p->argc == 3 &&
- (strcmp(fcnName, "sqrt") == 0 ||
- strcmp(fcnName, "atan") == 0)) ||
- (p->argc == 4 && strcmp(fcnName, "atan2") ==
0))) {
- /* mmath.sqrt, mmath.atan, and mmat.atan2 may be called with
- * an extra bit parameter saying whether to actually execute
- * the function or just return a nil; we need to add a nil
- * candidate list in front of that parameter */
- int a = getArg(p, p->argc - 1);
- p->argc--;
- p = pushNil(mb, p, TYPE_bat);
- p = pushArgument(mb, p, a);
}
/* now see if we can resolve the instruction */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
