Changeset: 3844c370f458 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3844c370f458
Modified Files:
Branch: jacqueline
Log Message:
Merged from default
diffs (88 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -5963,6 +5963,8 @@ void mdbShowBreakpoints(Client cntxt);
void mdbStep(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc);
str mdbTrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc);
str mdbTrapClient(Client cntxt, MalBlkPtr mb1, MalStkPtr stk1, InstrPtr pc1);
+int memoryclaims;
+lng memorypool;
aggrFun minAggr;
str minRef;
str min_no_nilRef;
diff --git a/clients/mapiclient/Tests/stethoscope--help.stable.err
b/clients/mapiclient/Tests/stethoscope--help.stable.err
--- a/clients/mapiclient/Tests/stethoscope--help.stable.err
+++ b/clients/mapiclient/Tests/stethoscope--help.stable.err
@@ -17,7 +17,7 @@ stethoscope [options] +[trace options] {
-p | --port=<portnr>
-h | --host=<hostname>
-The trace options:
+The trace options (default 'ISTest'):
S = monitor start of instruction profiling
a = aggregate clock ticks per instruction
e = event counter
@@ -36,6 +36,7 @@ The trace options:
p = process statistics, e.g. page faults, context switches
u = user id
D = Generate dot file upon query start
+ F = dataflow memory claims (in MB)
# 19:24:05 >
# 19:24:05 > "Done."
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -227,7 +227,7 @@ end main;
[ "copy_from", "pattern", "sql",
"(sname:str,tname:str,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
", "mvc_import_table_wrap;" ]
[ "clear_table", "pattern", "sql",
"(sname:str,tname:str):wrd ",
"mvc_clear_table_wrap;" ]
[ "catalog", "pattern", "sql",
"(type:int,iname:str,itype:int,sname:str,tname:str...):void ",
"SQLcatalog;"
]
-[ "catalog", "pattern", "sql",
"(type:int,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
", "SQLcatalog;"
]
+[ "catalog", "pattern", "sql",
"(type:int,sname:str,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
", "SQLcatalog;" ]
[ "catalog", "pattern", "sql",
"(type:int,user:str,passwd:str,enc:int,schema:str,fullname:str):void ",
"SQLcatalog;"
]
[ "catalog", "pattern", "sql",
"(type:int,grantee:str,role:str):void ",
"SQLcatalog;"
]
[ "catalog", "pattern", "sql",
"(type:int,sname:str,t:ptr,restart:lng):void ",
"SQLcatalog;" ]
@@ -260,6 +260,7 @@ end main;
[ "exportChunk", "pattern", "sql",
"(s:streams,res_id:int):void ",
"mvc_export_chunk_wrap;" ]
[ "exportResult", "pattern", "sql",
"(s:streams,res_id:int):void ",
"mvc_export_result_wrap;" ]
[ "exportHead", "pattern", "sql",
"(s:streams,res_id:int):void ",
"mvc_export_head_wrap;" ]
+[ "evalAlgebra", "pattern", "sql",
"(cmd:str,optimize:bit):void ",
"RAstatement;" ]
[ "eval", "pattern", "sql",
"(cmd:str,output:bit):void ",
"SQLstatement;" ]
[ "eval", "pattern", "sql",
"(cmd:str):void ",
"SQLstatement;" ]
[ "forgetPrevious", "pattern", "sql",
"():void ",
"OPTforgetPrevious;"
]
@@ -303,7 +304,6 @@ end main;
[ "resultSet", "pattern", "sql",
"(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:bat[:oid,:any_1]):int ",
"mvc_result_file_wrap;" ]
[ "resultSet", "pattern", "sql",
"(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:any_1):int ",
"mvc_result_file_wrap;" ]
[ "restart", "pattern", "sql",
"(sname:str,sequence:str,start:lng):lng ",
"mvc_restart_seq;" ]
-[ "ra", "pattern", "sql",
"(cmd:str,optimize:bit):void ",
"RAstatement;"
]
[ "shrink", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLshrink;" ]
[ "storage", "pattern", "sql", "()
(schema:bat[:oid,:str],table:bat[:oid,:str],column:bat[:oid,:str],location:bat[:oid,:str],count:bat[:oid,:lng],capacity:bat[:oid,:lng],width:bat[:oid,:int],size:bat[:oid,:lng],hashsize:bat[:oid,:lng],sorted:bat[:oid,:bit])
", "sql_storage;"
]
[ "sql_variables", "pattern", "sql",
"():bat[:oid,:str] ",
"sql_variables;"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -215,7 +215,7 @@ end main;
[ "copy_from", "pattern", "sql",
"(sname:str,tname:str,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
",
"mvc_import_table_wrap;" ]
[ "clear_table", "pattern", "sql",
"(sname:str,tname:str):wrd ",
"mvc_clear_table_wrap;" ]
[ "catalog", "pattern", "sql",
"(type:int,iname:str,itype:int,sname:str,tname:str...):void ",
"SQLcatalog;"
]
-[ "catalog", "pattern", "sql",
"(type:int,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
", "SQLcatalog;"
]
+[ "catalog", "pattern", "sql",
"(type:int,sname:str,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
", "SQLcatalog;" ]
[ "catalog", "pattern", "sql",
"(type:int,user:str,passwd:str,enc:int,schema:str,fullname:str):void ",
"SQLcatalog;"
]
[ "catalog", "pattern", "sql",
"(type:int,grantee:str,role:str):void ",
"SQLcatalog;"
]
[ "catalog", "pattern", "sql",
"(type:int,sname:str,t:ptr,restart:lng):void ",
"SQLcatalog;" ]
@@ -248,6 +248,7 @@ end main;
[ "exportChunk", "pattern", "sql",
"(s:streams,res_id:int):void ",
"mvc_export_chunk_wrap;" ]
[ "exportResult", "pattern", "sql",
"(s:streams,res_id:int):void ",
"mvc_export_result_wrap;" ]
[ "exportHead", "pattern", "sql",
"(s:streams,res_id:int):void ",
"mvc_export_head_wrap;" ]
+[ "evalAlgebra", "pattern", "sql",
"(cmd:str,optimize:bit):void ",
"RAstatement;" ]
[ "eval", "pattern", "sql",
"(cmd:str,output:bit):void ",
"SQLstatement;" ]
[ "eval", "pattern", "sql",
"(cmd:str):void ",
"SQLstatement;" ]
[ "forgetPrevious", "pattern", "sql",
"():void ",
"OPTforgetPrevious;"
]
@@ -291,7 +292,6 @@ end main;
[ "resultSet", "pattern", "sql",
"(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:bat[:oid,:any_1]):int ",
"mvc_result_file_wrap;" ]
[ "resultSet", "pattern", "sql",
"(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:any_1):int ",
"mvc_result_file_wrap;" ]
[ "restart", "pattern", "sql",
"(sname:str,sequence:str,start:lng):lng ",
"mvc_restart_seq;" ]
-[ "ra", "pattern", "sql",
"(cmd:str,optimize:bit):void ",
"RAstatement;"
]
[ "shrink", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLshrink;" ]
[ "storage", "pattern", "sql", "()
(schema:bat[:oid,:str],table:bat[:oid,:str],column:bat[:oid,:str],location:bat[:oid,:str],count:bat[:oid,:lng],capacity:bat[:oid,:lng],width:bat[:oid,:int],size:bat[:oid,:lng],hashsize:bat[:oid,:lng],sorted:bat[:oid,:bit])
", "sql_storage;" ]
[ "sql_variables", "pattern", "sql", "():bat[:oid,:str] ",
"sql_variables;" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
