Changeset: f13a2a89ef9f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f13a2a89ef9f
Modified Files:
monetdb5/extras/jaql/jaqlgencode.c
Branch: default
Log Message:
jaql: fix sort tests with hack
Work around requirement to have oid-headed BATs created only, by
generating the appropriate BAT with equal non-oid head and tail using
bat.mirror().
diffs (54 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
@@ -6077,7 +6077,7 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
setModuleId(q, batRef);
setFunctionId(q, newRef);
q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
- q = pushType(mb, q, TYPE_bte);
+ q = pushType(mb, q, TYPE_oid);
q = pushType(mb, q, TYPE_bte);
c = getArg(q, 0);
pushInstruction(mb, q);
@@ -6086,7 +6086,7 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
setFunctionId(q, insertRef);
q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
q = pushArgument(mb, q, c);
- q = pushBte(mb, q, 's');
+ q = pushNil(mb, q, TYPE_oid);
q = pushBte(mb, q, 's');
c = getArg(q, 0);
pushInstruction(mb, q);
@@ -6095,7 +6095,7 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
setFunctionId(q, insertRef);
q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
q = pushArgument(mb, q, c);
- q = pushBte(mb, q, 'i');
+ q = pushNil(mb, q, TYPE_oid);
q = pushBte(mb, q, 'i');
c = getArg(q, 0);
pushInstruction(mb, q);
@@ -6104,8 +6104,22 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
setFunctionId(q, insertRef);
q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
q = pushArgument(mb, q, c);
+ q = pushNil(mb, q, TYPE_oid);
q = pushBte(mb, q, 'd');
- q = pushBte(mb, q, 'd');
+ c = 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, c);
+ c = getArg(q, 0);
+ pushInstruction(mb, q);
+ q = newInstruction(mb, ASSIGNsymbol);
+ setModuleId(q, batRef);
+ setFunctionId(q, mirrorRef);
+ q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
+ q = pushArgument(mb, q, c);
c = getArg(q, 0);
pushInstruction(mb, q);
q = newInstruction(mb, ASSIGNsymbol);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
