Changeset: 49406609de6e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=49406609de6e Modified Files: monetdb5/extras/jaql/jaqlgencode.c Branch: jacqueline Log Message:
jaqlgencode: remove project workaround
Now that we have a working project on head of a BAT we can just use it.
diffs (67 lines):
diff --git a/monetdb5/extras/jaql/jaqlgencode.c
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -3532,31 +3532,12 @@ dumpvariabletransformation(jc *j, Client
break;
case j_func_arg:
- /* WORKAROUND:
using project(0@0, b)
- * causes misc
propcheck errors, so
- * reverse
twice */
- q =
newInstruction(mb, ASSIGNsymbol);
- setModuleId(q,
batRef);
-
setFunctionId(q, reverseRef);
- q =
pushReturn(mb, q,
-
newTmpVariable(mb, TYPE_any));
- q =
pushArgument(mb, q, b);
- b = getArg(q,
0);
-
pushInstruction(mb, q);
q =
newInstruction(mb, ASSIGNsymbol);
setModuleId(q,
algebraRef);
setFunctionId(q, projectRef);
q =
pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
- q =
pushArgument(mb, q, b);
q = pushOid(mb,
q, 0);
- b = getArg(q,
0);
-
pushInstruction(mb, q);
- q =
newInstruction(mb, ASSIGNsymbol);
- setModuleId(q,
batRef);
-
setFunctionId(q, reverseRef);
- q =
pushReturn(mb, q,
-
newTmpVariable(mb, TYPE_any));
q =
pushArgument(mb, q, b);
b = getArg(q,
0);
pushInstruction(mb, q);
@@ -5733,31 +5714,12 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
break;
case j_func_arg:
a =
dumpwalkvar(mb, a1, a5);
- /*
WORKAROUND: using project(0@0, b)
- *
causes misc propcheck errors, so
- *
reverse twice */
- q =
newInstruction(mb, ASSIGNsymbol);
-
setModuleId(q, batRef);
-
setFunctionId(q, reverseRef);
- q =
pushReturn(mb, q,
-
newTmpVariable(mb, TYPE_any));
- q =
pushArgument(mb, q, a);
- a =
getArg(q, 0);
-
pushInstruction(mb, q);
q =
newInstruction(mb, ASSIGNsymbol);
setModuleId(q, algebraRef);
setFunctionId(q, projectRef);
q =
pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
- q =
pushArgument(mb, q, a);
q =
pushOid(mb, q, 0);
- a =
getArg(q, 0);
-
pushInstruction(mb, q);
- q =
newInstruction(mb, ASSIGNsymbol);
-
setModuleId(q, batRef);
-
setFunctionId(q, reverseRef);
- q =
pushReturn(mb, q,
-
newTmpVariable(mb, TYPE_any));
q =
pushArgument(mb, q, a);
a =
getArg(q, 0);
pushInstruction(mb, q);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
