Changeset: 5a5c1385ca56 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a5c1385ca56
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:
properly compute Toptimize
diffs (110 lines):
diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
@@ -44,7 +44,7 @@ end s0_1;
% .explain # table_name
% mal # name
% clob # type
-% 78 # length
+% 73 # length
function user.s1_1{autoCommit=true}(A0:sht,A1:sht):void;
X_4 := udf.fuse(A0,A1);
sql.exportValue(1,".","fuse_single_value","int",32,0,6,X_4,"");
@@ -59,7 +59,7 @@ end s1_1;
% .explain # table_name
% mal # name
% clob # type
-% 84 # length
+% 79 # length
function user.s2_1{autoCommit=true}(A0:int,A1:int):void;
X_4 := udf.fuse(A0,A1);
sql.exportValue(1,".","fuse_single_value","bigint",64,0,6,X_4,"");
@@ -92,7 +92,7 @@ end s2_1;
% .explain # table_name
% mal # name
% clob # type
-% 86 # length
+% 81 # length
function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -116,7 +116,7 @@ end s5_1;
% .explain # table_name
% mal # name
% clob # type
-% 86 # length
+% 81 # length
function user.s6_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -140,7 +140,7 @@ end s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 86 # length
+% 81 # length
function user.s7_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
@@ -48,7 +48,7 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 85 # length
+% 80 # length
function user.s0_1{autoCommit=true}(A0:str):void;
X_3 := udf.reverse(A0);
sql.exportValue(1,".","reverse_single_value","clob",0,0,4,X_3,"");
@@ -81,7 +81,7 @@ end s0_1;
% .explain # table_name
% mal # name
% clob # type
-% 91 # length
+% 85 # length
function user.s3_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_reverse");
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2354,7 +2354,6 @@ backend_dumpproc(backend *be, Client c,
int argc = 0;
char arg[SMALLBUFSIZ];
node *n;
- lng Toptimize = 0;
str pipe;
backup = c->curprg;
@@ -2403,13 +2402,13 @@ backend_dumpproc(backend *be, Client c,
if (backend_dumpstmt(be, mb, s) < 0)
return NULL;
- Toptimize = GDKusec();
// Always keep the SQL query around for monitoring
// if (m->history || QLOGisset()) {
{
char *t;
InstrPtr q;
+ lng Toptimize = GDKusec();
if ( be->q && be->q->codestring) {
t = GDKstrdup( be->q->codestring);
@@ -2422,13 +2421,13 @@ backend_dumpproc(backend *be, Client c,
q->token = REMsymbol; // will be patched
q = pushStr(mb, q, t);
q = pushStr(mb, q, pipe= initSQLoptimizer());
+ Toptimize = GDKusec() - Toptimize;
(void) pushLng(mb, q, Toptimize);
m->Tparse = 0;
GDKfree(pipe);
}
if (cq)
addQueryToCache(c);
- Toptimize = GDKusec() - Toptimize;
curPrg = c->curprg;
if (backup)
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
