Changeset: 239b022fdcb8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=239b022fdcb8 Removed Files: monetdb5/mal/Tests/tst062.stable.err monetdb5/mal/Tests/tst062.stable.out Modified Files: clients/Tests/exports.stable.out monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c sql/backends/monet5/sql_gencode.c Branch: default Log Message:
Use inlineProperty for sqlfunctionProp diffs (199 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 @@ -1981,6 +1981,7 @@ str batcalcRef; str batmalRef; str batmmathRef; str batmtimeRef; +str batrapiRef; str batsqlRef; str batstrRef; str batxmlRef; @@ -2537,7 +2538,6 @@ str soundex_impl(str *res, str *Name); str sqlRef; int sqlblob_fromstr(char *instr, int *l, blob **val); int sqlblob_tostr(str *tostr, int *l, const blob *p); -int sqlfunctionProp; str srvpoolRef; str startProfiler(oid user, int mode, int beat); str startRef; @@ -2556,6 +2556,7 @@ str subbandjoinRef; str subcountRef; str subdeltaRef; str subdiffRef; +str subeval_aggrRef; str subgroupRef; str subgroupdoneRef; str subinterRef; diff --git a/monetdb5/mal/Tests/tst062.stable.err b/monetdb5/mal/Tests/tst062.stable.err deleted file mode 100644 --- a/monetdb5/mal/Tests/tst062.stable.err +++ /dev/null @@ -1,30 +0,0 @@ -stderr of test 'tst062` in directory 'monetdb5/mal` itself: - - -# 17:25:46 > -# 17:25:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30228" "--set" "mapi_usock=/var/tmp/mtest-25816/.s.monetdb.30228" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "tst062.mal" -# 17:25:46 > - -# builtin opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 30228 -# cmdline opt mapi_usock = /var/tmp/mtest-25816/.s.monetdb.30228 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal -# cmdline opt gdk_debug = 536870922 - -# 17:25:46 > -# 17:25:46 > "Done." -# 17:25:46 > - diff --git a/monetdb5/mal/Tests/tst062.stable.out b/monetdb5/mal/Tests/tst062.stable.out deleted file mode 100644 --- a/monetdb5/mal/Tests/tst062.stable.out +++ /dev/null @@ -1,57 +0,0 @@ -stdout of test 'tst062` in directory 'monetdb5/mal` itself: - - -# 17:25:46 > -# 17:25:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30228" "--set" "mapi_usock=/var/tmp/mtest-25816/.s.monetdb.30228" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "tst062.mal" -# 17:25:46 > - -# MonetDB 5 server v11.20.0 -# This is an unreleased version -# Serving database 'mTests_monetdb5_mal', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.590 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:30228/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25816/.s.monetdb.30228 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -!SyntaxException:user.l2[9]:invalid return target! -function user.l2():void; - X_3 := sql.mvc(); - X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","part1"); - X_7:bat[:oid,:dbl] := sql.bind(X_3,"sys","part1","x",0); - X_10 := algebra.leftfetchjoin(X_4,X_7); - X_11:bat[:oid,:dbl] := sql.bind(X_3,"sys","part1","y",0); - X_13 := algebra.leftfetchjoin(X_4,X_11); - X_14:bat[:oid,:dbl] := sql.bind(X_3,"sys","part1","z",0); - X_16 := algebra.leftfetchjoin(X_4,X_14); - return (X_10,X_13,X_16) := (X_10,X_13,X_16); -end user.l2; -!TypeException:user.l1[12]:'X_10' may not be used before being initialized -!TypeException:user.l1[12]:'X_13' may not be used before being initialized -!TypeException:user.l1[12]:'X_16' may not be used before being initialized -function user.l1{sqlfunction}() (X_0:bat[:oid,:dbl]{sqlfunction},X_1:bat[:oid,:dbl],X_2:bat[:oid,:dbl]); -barrier X_26 := language.dataflow(); - X_3 := sql.mvc(); - X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","part1"); - X_7:bat[:oid,:dbl] := sql.bind(X_3,"sys","part1","x",0); - X_10 := algebra.leftfetchjoin(X_4,X_7); - X_11:bat[:oid,:dbl] := sql.bind(X_3,"sys","part1","y",0); - X_13 := algebra.leftfetchjoin(X_4,X_11); - X_14:bat[:oid,:dbl] := sql.bind(X_3,"sys","part1","z",0); - X_16 := algebra.leftfetchjoin(X_4,X_14); - language.pass(X_4); -exit X_26; - return (X_10,X_13,X_16) := (X_10,X_13,X_16); -end user.l1; -function user.main():void; -#the number of return arguments does not match spect -# the variabls X_10, X_13, X_16 are only valid within the parallel block -end user.main; - -# 17:25:46 > -# 17:25:46 > "Done." -# 17:25:46 > - diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c --- a/monetdb5/optimizer/opt_prelude.c +++ b/monetdb5/optimizer/opt_prelude.c @@ -230,8 +230,6 @@ str userRef; str vectorRef; str zero_or_oneRef; -int sqlfunctionProp; - int inlineProp; int unsafeProp; @@ -458,7 +456,6 @@ void optimizerInit(void) inlineProp = PropertyIndex("inline"); unsafeProp = PropertyIndex("unsafe"); - sqlfunctionProp = PropertyIndex("sqlfunction"); horiginProp = PropertyIndex("horigin"); toriginProp = PropertyIndex("torigin"); diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h --- a/monetdb5/optimizer/opt_prelude.h +++ b/monetdb5/optimizer/opt_prelude.h @@ -230,8 +230,6 @@ opt_export str userRef; opt_export str vectorRef; opt_export str zero_or_oneRef; -opt_export int sqlfunctionProp; - opt_export int inlineProp; /* binary */ opt_export int unsafeProp; /* binary */ diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c --- a/monetdb5/optimizer/opt_support.c +++ b/monetdb5/optimizer/opt_support.c @@ -242,8 +242,7 @@ optimizeMALBlock(Client cntxt, MalBlkPtr /* assume the type and flow have been checked already */ /* SQL functions intended to be inlined should not be optimized */ - if (varGetProp( mb, getArg(getInstrPtr(mb,0),0), inlineProp ) != NULL && - varGetProp( mb, getArg(getInstrPtr(mb,0),0), sqlfunctionProp ) != NULL) + if (varGetProp( mb, getArg(getInstrPtr(mb,0),0), inlineProp ) != NULL ) return 0; 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 @@ -479,7 +479,7 @@ static int return -1; be->mvc->argc = old_argc; /* SQL function definitions meant for inlineing should not be optimized before */ - varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL); + varSetProp(curBlk, getArg(curInstr, 0), inlineProp, op_eq, NULL); addQueryToCache(c); if (backup) c->curprg = backup; @@ -680,7 +680,7 @@ static int pushEndInstruction(curBlk); /* SQL function definitions meant f r inlineing should not be optimized before */ - varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL); + varSetProp(curBlk, getArg(curInstr, 0), inlineProp, op_eq, NULL); addQueryToCache(c); if (backup) c->curprg = backup; @@ -3086,7 +3086,7 @@ backend_create_sql_func(backend *be, sql if (sideeffects) varSetProp(curBlk, getArg(curInstr, 0), unsafeProp, op_eq, NULL); /* SQL function definitions meant for inlineing should not be optimized before */ - varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL); + varSetProp(curBlk, getArg(curInstr, 0), inlineProp, op_eq, NULL); f->sa = sa; m->sa = osa; addQueryToCache(c); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
