Changeset: b23c46fcc042 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b23c46fcc042
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
Keep bat id for detecting view sharing
diffs (40 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -253,12 +253,13 @@ This information can be used to determin
#ifdef MALARGUMENTDETAILS
// Also show details of the arguments for modelling
if(mb){
- logadd("\"res\":[");
+ logadd("\"ret\":[");
for( j=0; j< pci->argc; j++){
int tpe = getVarType(mb, getArg(pci,j));
str tname = 0, cv;
lng total = 0;
BUN cnt = 0;
+ bat bid=0;
str pret = ""; // or prettify
int p = getPC(mb,pci);
@@ -269,10 +270,12 @@ This information can be used to determin
logadd("\"index\":\"%d\",%s", j,pret);
logadd("\"name\":\"%s\",%s", getVarName(mb,
getArg(pci,j)), pret);
if( isaBatType(tpe) ){
- BAT *d=
BATdescriptor(abs(stk->stk[getArg(pci,j)].val.ival));
+ BAT *d= BATdescriptor( bid =
abs(stk->stk[getArg(pci,j)].val.ival));
tname = getTypeName(getColumnType(tpe));
logadd("\"type\":\"bat[:%s]\",%s",
tname,pret);
if( d) {
+ if( isVIEW(d))
+ bid =
abs(VIEWtparent(d));
cnt = BATcount(d);
total += heapinfo(&d->T->heap);
if ( d->T->vheap &&
d->T->vheap->parentid ){
@@ -280,6 +283,7 @@ This information can be used to determin
}
BBPunfix(d->batCacheid);
}
+ logadd("\"bid\":\"%d\",%s", bid,pret);
logadd("\"count\":\""BUNFMT"\",%s",cnt,pret);
logadd("\"size\":" LLFMT",%s",
total,pret);
} else{
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
