Changeset: a92a92eb840d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a92a92eb840d
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/test/remote/Tests/ssbm.SQL.py
Branch: nostmt
Log Message:
do not inline the mal functions wrapping the remote execution of a
partitial relational plan. This works around a garbage collection
problem.
diffs (31 lines):
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
@@ -424,11 +424,12 @@ static int
pushEndInstruction(curBlk);
/* SQL function definitions meant for inlineing should not be optimized
before */
- curBlk->inlineProp = 1;
+ //for now no inline of the remote function, this gives garbage
collection problems
+ //curBlk->inlineProp = 1;
SQLaddQueryToCache(c);
- chkProgram(c->fdout, c->nspace, c->curprg->def);
- //SQLoptimizeFunction(c,c->curprg->def);
+ //chkProgram(c->fdout, c->nspace, c->curprg->def);
+ SQLoptimizeFunction(c, c->curprg->def);
if (backup)
c->curprg = backup;
name[0] = old; /* make sure stub is called */
diff --git a/sql/test/remote/Tests/ssbm.SQL.py
b/sql/test/remote/Tests/ssbm.SQL.py
--- a/sql/test/remote/Tests/ssbm.SQL.py
+++ b/sql/test/remote/Tests/ssbm.SQL.py
@@ -199,8 +199,6 @@ print str(c.fetchall()[0][0])
# run queries, use mclient so output is comparable
queries = glob.glob(os.path.join(ssbmpath, '[0-1][0-9].sql'))
queries.sort()
-queries = glob.glob(os.path.join(ssbmpath, '04.sql'))
-queries.sort()
for q in queries:
print '# Running Q %s' % os.path.basename(q).replace('.sql','')
mc = process.client('sql', stdin=open(q), dbname='master',
host='localhost', port=masterport, stdout=process.PIPE, stderr=process.PIPE,
log=1)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
