MonetDB: Oct2012 - functions: be more careful with using j->star...

[Fabian Groffen]

Changeset: 872d071df139 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=872d071df139
Modified Files:
        monetdb5/extras/jaql/jaqlgencode.c
Branch: Oct2012
Log Message:

functions: be more careful with using j->startoid


diffs (55 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
@@ -3977,7 +3977,11 @@ dumpvariabletransformation(jc *j, Client
                                                                        q = 
pushArgument(mb, q, j->j5);
                                                                        q = 
pushArgument(mb, q, j->j6);
                                                                        q = 
pushArgument(mb, q, j->j7);
-                                                                       q = 
pushArgument(mb, q, j->startoid);
+                                                                       if 
(j->startoid == 0) {
+                                                                               
q = pushOid(mb, q, 0);
+                                                                       } else {
+                                                                               
q = pushArgument(mb, q, j->startoid);
+                                                                       }
                                                                        
dynaarg[i][0] = getArg(q, 0);
                                                                        
pushInstruction(mb, q);
                                                                } else {
@@ -4021,7 +4025,11 @@ dumpvariabletransformation(jc *j, Client
                                                                        q = 
pushArgument(mb, q, j->j5);
                                                                        q = 
pushArgument(mb, q, j->j6);
                                                                        q = 
pushArgument(mb, q, j->j7);
-                                                                       q = 
pushArgument(mb, q, j->startoid);
+                                                                       if 
(j->startoid == 0) {
+                                                                               
q = pushOid(mb, q, 0);
+                                                                       } else {
+                                                                               
q = pushArgument(mb, q, j->startoid);
+                                                                       }
                                                                        q = 
pushStr(mb, q, "");
                                                                        
dynaarg[i][1] = getArg(q, 0);
                                                                        
pushInstruction(mb, q);
@@ -4062,7 +4070,11 @@ dumpvariabletransformation(jc *j, Client
                                                                        q = 
pushArgument(mb, q, j->j5);
                                                                        q = 
pushArgument(mb, q, j->j6);
                                                                        q = 
pushArgument(mb, q, j->j7);
-                                                                       q = 
pushArgument(mb, q, j->startoid);
+                                                                       if 
(j->startoid == 0) {
+                                                                               
q = pushOid(mb, q, 0);
+                                                                       } else {
+                                                                               
q = pushArgument(mb, q, j->startoid);
+                                                                       }
                                                                        q = 
pushDbl(mb, q, 0.0);
                                                                        
dynaarg[i][2] = getArg(q, 0);
                                                                        
pushInstruction(mb, q);
@@ -4103,7 +4115,11 @@ dumpvariabletransformation(jc *j, Client
                                                                        q = 
pushArgument(mb, q, j->j5);
                                                                        q = 
pushArgument(mb, q, j->j6);
                                                                        q = 
pushArgument(mb, q, j->j7);
-                                                                       q = 
pushArgument(mb, q, j->startoid);
+                                                                       if 
(j->startoid == 0) {
+                                                                               
q = pushOid(mb, q, 0);
+                                                                       } else {
+                                                                               
q = pushArgument(mb, q, j->startoid);
+                                                                       }
                                                                        q = 
pushLng(mb, q, 0);
                                                                        
dynaarg[i][3] = getArg(q, 0);
                                                                        
pushInstruction(mb, q);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list