Changeset: a55b199e1e08 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a55b199e1e08
Branch: nested
Log Message:
merge upstream
diffs (89 lines):
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -386,61 +386,3 @@ runtimeProfileExit(Client cntxt, MalBlkP
profilerStatus = 1;
}
}
-
-/*
- * For performance evaluation it is handy to estimate the
- * amount of bytes produced by an instruction.
- * The actual amount is harder to guess, because an instruction
- * may trigger a side effect, such as creating a hash-index.
- * Side effects are ignored.
- */
-
-lng
-getBatSpace(BAT *b)
-{
- lng space = 0;
- if (b == NULL)
- return 0;
- space += BATcount(b) << b->tshift;
- if (space) {
- MT_lock_set(&b->theaplock);
- if (b->tvheap)
- space += heapinfo(b->tvheap, b->batCacheid);
- MT_lock_unset(&b->theaplock);
- MT_rwlock_rdlock(&b->thashlock);
- space += hashinfo(b->thash, b->batCacheid);
- MT_rwlock_rdunlock(&b->thashlock);
- }
- return space;
-}
-
-lng
-getVolume(MalStkPtr stk, InstrPtr pci, int rd)
-{
- int i, limit;
- lng vol = 0;
- BAT *b;
-
- if (stk == NULL)
- return 0;
- limit = rd ? pci->argc : pci->retc;
- i = rd ? pci->retc : 0;
-
- for (; i < limit; i++) {
- if (stk->stk[getArg(pci, i)].bat) {
- oid cnt = 0;
-
- b = BBPquickdesc(stk->stk[getArg(pci, i)].val.bval);
- if (b == NULL)
- continue;
- cnt = BATcount(b);
- /* Usually reading views cost as much as full bats.
- But when we output a slice that is not the case. */
- if (rd)
- vol += (!isVIEW(b) && !VIEWtparent(b)) ?
tailsize(b, cnt) : 0;
- else if (!isVIEW(b))
- vol += tailsize(b, cnt);
- }
- }
- return vol;
-}
diff --git a/monetdb5/mal/mal_runtime.h b/monetdb5/mal/mal_runtime.h
--- a/monetdb5/mal/mal_runtime.h
+++ b/monetdb5/mal/mal_runtime.h
@@ -67,8 +67,6 @@ extern void runtimeProfileBegin(Client c
InstrPtr pci,
RuntimeProfile prof);
extern void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci,
RuntimeProfile prof);
-extern lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
-extern lng getBatSpace(BAT *b);
extern void sqlProfilerEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci, lng clk,
lng ticks);
diff --git a/testing/listexports.py b/testing/listexports.py
--- a/testing/listexports.py
+++ b/testing/listexports.py
@@ -107,7 +107,7 @@ def getrepofiles():
os.chdir(srcdir)
if os.path.exists(os.path.join('.hg', 'store')):
import subprocess
- with subprocess.Popen(['hg', 'files', '-I', '**.[ch]'],
+ with subprocess.Popen(['hg', '--config', 'ui.verbose=False', 'files',
'-I', '**.[ch]'],
stdout=subprocess.PIPE,
text=True) as p:
out, err = p.communicate()
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
