MonetDB: Dec2016 - Files were removed.
Changeset: 49ac18cba58f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=49ac18cba58f
Modified Files:
gdk/Makefile.ag
Branch: Dec2016
Log Message:
Files were removed.
diffs (11 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -34,7 +34,6 @@ lib_gdk = {
gdk_unique.c \
gdk_interprocess.c gdk_interprocess.h \
gdk_firstn.c \
- bat.feps bat1.feps bat2.feps \
libbat.rc
LIBS = ../common/options/libmoptions \
../common/stream/libstream \
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Dec2016 - Added test for Bug 6205
Changeset: 7c14a3a849fb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7c14a3a849fb Added Files: sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out Modified Files: sql/test/BugTracker-2017/Tests/All Branch: Dec2016 Log Message: Added test for Bug 6205 diffs (142 lines): diff --git a/sql/test/BugTracker-2017/Tests/All b/sql/test/BugTracker-2017/Tests/All --- a/sql/test/BugTracker-2017/Tests/All +++ b/sql/test/BugTracker-2017/Tests/All @@ -17,3 +17,4 @@ oidx-on-strings.Bug-6202 group-by-on-constant.Bug-6082 rel2bin_project-assert.Bug-6080 str2decimal.Bug-6202 +integer_addition_overflow.Bug-6205 diff --git a/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql b/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql @@ -0,0 +1,2 @@ +select 2+3; +select 50 + 100; diff --git a/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err b/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err @@ -0,0 +1,36 @@ +stderr of test 'integer_addition_overflow.Bug-6205` in directory 'sql/test/BugTracker-2017` itself: + + +# 12:12:38 > +# 12:12:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30982" "--set" "mapi_usock=/var/tmp/mtest-42042/.s.monetdb.30982" "--set" "monet_prompt=" "--forcemito" "--dbpath=/Users/jennie/scratch/monet-install/Dec2016/debug/var/MonetDB/mTests_sql_test_BugTracker-2017" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 12:12:38 > + +# builtin opt gdk_dbpath = /Users/jennie/scratch/monet-install/Dec2016/debug/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 = 5 +# 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 = 30982 +# cmdline opt mapi_usock = /var/tmp/mtest-42042/.s.monetdb.30982 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /Users/jennie/scratch/monet-install/Dec2016/debug/var/MonetDB/mTests_sql_test_BugTracker-2017 +# cmdline opt embedded_r = yes +# cmdline opt embedded_py = true +# cmdline opt gdk_debug = 536870922 + +# 12:12:38 > +# 12:12:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-42042" "--port=30982" +# 12:12:38 > + + +# 12:12:39 > +# 12:12:39 > "Done." +# 12:12:39 > + diff --git a/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out b/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out @@ -0,0 +1,81 @@ +stdout of test 'integer_addition_overflow.Bug-6205` in directory 'sql/test/BugTracker-2017` itself: + + +# 12:12:38 > +# 12:12:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30982" "--set" "mapi_usock=/var/tmp/mtest-42042/.s.monetdb.30982" "--set" "monet_prompt=" "--forcemito" "--dbpath=/Users/jennie/scratch/monet-install/Dec2016/debug/var/MonetDB/mTests_sql_test_BugTracker-2017" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 12:12:38 > + +# MonetDB 5 server v11.25.6 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads +# Compiled for x86_64-apple-darwin16.4.0/64bit with 128bit integers +# Found 16.000 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://Nyx.local:30982/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-42042/.s.monetdb.30982 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/Python module loaded +# MonetDB/R module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.sql +# loading sql s
MonetDB: Dec2016 - Approve after changeset 1a49ca7de68d.
Changeset: df2b6d00742f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df2b6d00742f Modified Files: sql/test/pg_regress/Tests/float8.stable.err.Windows Branch: Dec2016 Log Message: Approve after changeset 1a49ca7de68d. diffs (12 lines): diff --git a/sql/test/pg_regress/Tests/float8.stable.err.Windows b/sql/test/pg_regress/Tests/float8.stable.err.Windows --- a/sql/test/pg_regress/Tests/float8.stable.err.Windows +++ b/sql/test/pg_regress/Tests/float8.stable.err.Windows @@ -112,7 +112,7 @@ QUERY = SELECT '' AS bad, f.f1 * '1e200' ERROR = !overflow in calculation -1.2345678901234e+200*9.9997e+199. MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; -ERROR = !decimal (1e20) doesn't have format (18.0) +ERROR = !decimal (1e200) doesn't have format (18.0) MAPI = (monetdb) /var/tmp/mtest-4855/.s.monetdb.34828 QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR = !division by zero. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: data-vaults - Merge with default
Changeset: 24f8d9bd0694 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24f8d9bd0694 Added Files: monetdb5/extras/rapi/Tests/rapi02.stable.out.int128 sql/backends/monet5/Tests/int_notation_1e5.stable.out.int128 sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out.int128 sql/jdbc/tests/Tests/Test_Int128.stable.out.int128 sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out.int128 sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128 sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out.int128 sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.sql sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.err sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.sql sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.sql sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.err sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.out sql/test/mapi/Tests/mal_int128.stable.out.int128 sql/test/mapi/Tests/perl_dec38.stable.out.int128 sql/test/mapi/Tests/perl_int128.stable.out.int128 sql/test/mapi/Tests/php_dec38.stable.out.int128 sql/test/mapi/Tests/php_int128.stable.out.int128 sql/test/mapi/Tests/python2_dec38.stable.out.int128 sql/test/mapi/Tests/python2_int128.stable.out.int128 sql/test/mapi/Tests/python3_dec38.stable.out.int128 sql/test/mapi/Tests/python3_int128.stable.out.int128 sql/test/mapi/Tests/sql_dec38.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/pg_regress/Tests/numeric.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-package-hge.stable.out.int128 Removed Files: gdk/bat.feps gdk/bat.png gdk/bat1.feps gdk/bat1.png gdk/bat2.feps gdk/bat2.png monetdb5/extras/rapi/Tests/rapi02.stable.out sql/backends/monet5/Tests/int_notation_1e5.stable.out sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out sql/jdbc/tests/Tests/Test_Int128.stable.out sql/storage/store_connections.c sql/storage/store_connections.h sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out sql/test/Connections/Tests/All sql/test/Connections/Tests/connections.py sql/test/Connections/Tests/connections.stable.err sql/test/Connections/Tests/connections.stable.err.SunOS sql/test/Connections/Tests/connections.stable.err.Windows sql/test/Connections/Tests/connections.stable.out sql/test/Connections/connections_default_values.sql sql/test/Connections/connections_semantic.sql sql/test/Connections/connections_syntax.sql sql/test/mapi/Tests/mal_int128.stable.out sql/test/mapi/Tests/perl_dec38.stable.out sql/test/mapi/Tests/perl_int128.stable.out sql/test/mapi/Tests/php_dec38.stable.out sql/test/mapi/Tests/php_int128.stable.out sql/test/mapi/Tests/python2_dec38.stable.out sql/test/mapi/Tests/python2_int128.stable.out sql/test/mapi/Tests/python3_dec38.stable.out sql/test/mapi/Tests/python3_int128.stable.out sql/test/mapi/Tests/sql_dec38.stable.out sql/test/mapi/Tests/sql_int128.stable.out sql/test/pg_regress/Tests/numeric.stable.out sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-hge/Tests/dump.stable.o
MonetDB: data-vaults - Approve tests
Changeset: 6bbb70ecf605 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bbb70ecf605 Modified Files: sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 Branch: data-vaults Log Message: Approve tests diffs (truncated from 670 to 300 lines): diff --git a/sql/test/leaks/Tests/check1.stable.out b/sql/test/leaks/Tests/check1.stable.out --- a/sql/test/leaks/Tests/check1.stable.out +++ b/sql/test/leaks/Tests/check1.stable.out @@ -43,10 +43,10 @@ Ready. [ "bit", 5 ] [ "bit", 60 ] [ "bit", 385 ] -[ "bit", 1541] -[ "bit", 1541] -[ "bit", 1541] -[ "bte", 4334] +[ "bit", 1557] +[ "bit", 1557] +[ "bit", 1557] +[ "bte", 4366] [ "int", 0 ] [ "int", 0 ] [ "int", 0 ] @@ -118,18 +118,18 @@ Ready. [ "int", 385 ] [ "int", 388 ] [ "int", 388 ] -[ "int", 1541] -[ "int", 1541] -[ "int", 1541] -[ "int", 1541] -[ "int", 1541] +[ "int", 1557] +[ "int", 1557] +[ "int", 1557] +[ "int", 1557] +[ "int", 1557] [ "int", 3911] [ "int", 3911] -[ "int", 4334] -[ "int", 4334] -[ "int", 4334] -[ "int", 4334] -[ "int", 4334] +[ "int", 4366] +[ "int", 4366] +[ "int", 4366] +[ "int", 4366] +[ "int", 4366] [ "lng", 0 ] [ "lng", 0 ] [ "lng", 0 ] @@ -305,14 +305,14 @@ Ready. [ "str", 385 ] [ "str", 385 ] [ "str", 385 ] -[ "str", 1541] -[ "str", 1541] -[ "str", 1541] +[ "str", 1557] +[ "str", 1557] +[ "str", 1557] [ "str", 3911] [ "str", 3911] [ "str", 3911] -[ "str", 4334] -[ "str", 4334] +[ "str", 4366] +[ "str", 4366] [ "timestamp", 0 ] [ "timestamp", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 b/sql/test/leaks/Tests/check1.stable.out.int128 --- a/sql/test/leaks/Tests/check1.stable.out.int128 +++ b/sql/test/leaks/Tests/check1.stable.out.int128 @@ -43,10 +43,10 @@ Ready. [ "bit", 5 ] [ "bit", 60 ] [ "bit", 385 ] -[ "bit", 1722] -[ "bit", 1722] -[ "bit", 1722] -[ "bte", 4860] +[ "bit", 1738] +[ "bit", 1738] +[ "bit", 1738] +[ "bte", 4892] [ "int", 0 ] [ "int", 0 ] [ "int", 0 ] @@ -118,18 +118,18 @@ Ready. [ "int", 385 ] [ "int", 389 ] [ "int", 389 ] -[ "int", 1722] -[ "int", 1722] -[ "int", 1722] -[ "int", 1722] -[ "int", 1722] +[ "int", 1738] +[ "int", 1738] +[ "int", 1738] +[ "int", 1738] +[ "int", 1738] [ "int", 3911] [ "int", 3911] -[ "int", 4860] -[ "int", 4860] -[ "int", 4860] -[ "int", 4860] -[ "int", 4860] +[ "int", 4892] +[ "int", 4892] +[ "int", 4892] +[ "int", 4892] +[ "int", 4892] [ "lng", 0 ] [ "lng", 0 ] [ "lng", 0 ] @@ -305,14 +305,14 @@ Ready. [ "str", 385 ] [ "str", 385 ] [ "str", 385 ] -[ "str", 1722] -[ "str", 1722] -[ "str", 1722] +[ "str", 1738] +[ "str", 1738] +[ "str", 1738] [ "str", 3911] [ "str", 3911] [ "str", 3911] -[ "str", 4860] -[ "str", 4860] +[ "str", 4892] +[ "str", 4892] [ "timestamp", 0 ] [ "timestamp", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; diff --git a/sql/test/leaks/Tests/check2.stable.out b/sql/test/leaks/Tests/check2.stable.out --- a/sql/test/leaks/Tests/check2.stable.out +++ b/sql/test/leaks/Tests/check2.stable.out @@ -43,10 +43,10 @@ Ready. [ "bit", 5 ] [ "bit", 60 ] [ "bit", 385 ] -[ "bit", 1541] -[ "bit", 1541] -[ "bit", 1541] -[ "bte", 4334] +[ "bit", 1557] +[ "bit", 1557]
MonetDB: Dec2016 - Adding .int128 version for hugeint output
Changeset: 1d48f1a8294a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d48f1a8294a Added Files: sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 Modified Files: sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out Branch: Dec2016 Log Message: Adding .int128 version for hugeint output diffs (56 lines): diff --git a/sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out b/sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out --- a/sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out +++ b/sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out @@ -29,7 +29,7 @@ Ready. #select 1 + 1 as bar, sum(b) from foo group by bar; % .L2, sys.L5 # table_name % bar, L4 # name -% tinyint, hugeint # type +% tinyint, bigint # type % 1, 1 # length #rollback; diff --git a/sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 b/sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 @@ -0,0 +1,39 @@ +stdout of test 'group-by-on-constant.Bug-6082` in directory 'sql/test/BugTracker-2017` itself: + + +# 20:09:41 > +# 20:09:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30955" "--set" "mapi_usock=/var/tmp/mtest-28866/.s.monetdb.30955" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017" +# 20:09:41 > + +# MonetDB 5 server v11.25.6 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 7.332 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.nes.nl:30955/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-28866/.s.monetdb.30955 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 20:09:41 > +# 20:09:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28866" "--port=30955" +# 20:09:41 > + +#start transaction; +#create table foo (a int, b int); +#select 1 + 1 as bar, sum(b) from foo group by bar; +% .L2, sys.L5 # table_name +% bar, L4 # name +% tinyint, hugeint # type +% 1, 1 # length +#rollback; + +# 20:09:42 > +# 20:09:42 > "Done." +# 20:09:42 > + ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Dec2016 - Update instructions have side effects.
Changeset: 9b7490e6a80f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b7490e6a80f
Modified Files:
monetdb5/optimizer/opt_support.c
Branch: Dec2016
Log Message:
Update instructions have side effects.
Test sql/test/BugTracker-2016/select-in-from.Bug-6121 creates a plan
in which batcalc.min is calculated on two BATs, both of which are
appended to later on in the plan. What you definitely don't want to
happen (and what this fixes) is that the append happens concurrently
with, or even before, the batcalc.min.
diffs (25 lines):
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
@@ -394,6 +394,10 @@ hasSideEffects(InstrPtr p, int strict)
{
if( getFunctionId(p) == NULL) return FALSE;
+ /* update instructions have side effects */
+ if (isUpdateInstruction(p))
+ return TRUE;
+
if ( (getModuleId(p) == batRef || getModuleId(p)==sqlRef) &&
(getFunctionId(p) == setAccessRef ||
getFunctionId(p) == setWriteModeRef ||
@@ -439,10 +443,6 @@ hasSideEffects(InstrPtr p, int strict)
if (getFunctionId(p) == zero_or_oneRef) return FALSE;
if (getFunctionId(p) == mvcRef) return FALSE;
if (getFunctionId(p) == singleRef) return FALSE;
- /* the update instructions for SQL has side effects.
- whether this is relevant should be explicitly checked
- in the environment of the call */
- if (isUpdateInstruction(p)) return TRUE;
return TRUE;
}
if( getModuleId(p) == languageRef){
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: exanest - Merge branch Dec2016 into exanest
Changeset: cec9a95e4296 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cec9a95e4296 Added Files: monetdb5/extras/rapi/Tests/rapi02.stable.out.int128 sql/backends/monet5/Tests/int_notation_1e5.stable.out.int128 sql/backends/monet5/Tests/pyapi33.sql sql/backends/monet5/Tests/pyapi33.stable.err sql/backends/monet5/Tests/pyapi33.stable.out sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out.int128 sql/backends/monet5/sql_cast_impl_int.h sql/jdbc/tests/Tests/Test_Int128.stable.out.int128 sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out.int128 sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128 sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out.int128 sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.sql sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.stable.err sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.stable.out sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.out sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.sql sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.err sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.sql sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.err sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.sql sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.err sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.out sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out sql/test/BugTracker-2017/Tests/oidx-on-strings.Bug-6202.sql sql/test/BugTracker-2017/Tests/oidx-on-strings.Bug-6202.stable.err sql/test/BugTracker-2017/Tests/oidx-on-strings.Bug-6202.stable.out sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.sql sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.sql sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.stable.err sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.stable.out sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.sql sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.stable.err sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.stable.out sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.sql sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.err sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.out sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.sql sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.out sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.sql sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.stable.err sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.stable.out sql/test/mapi/Tests/mal_int128.stable.out.int128 sql/test/mapi/Tests/perl_dec38.stable.out.int128 sql/test/mapi/Tests/perl_int128.stable.out.int128 sql/test/mapi/Tests/php_dec38.stable.out.int128 sql/test/mapi/Tests/php_int128.stable.out.int128 sql/test/mapi/Tests/python2_dec38.stable.out.int128 sql/test/mapi/Tests/python2_int128.stable.out.int128 sql/test/mapi/Tests/python3_dec38.stable.out.int128 sql/test/mapi/Tests/python3_int128.stable.out.int128 sql/test/mapi/Tests/sql_dec38.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/pg_regress/Tests/numeric.stable.out.int128 sql/test/testdb-
MonetDB: Dec2016 - Approve EXPLAIN output after changeset 9b7490...
Changeset: 217fa448bbc6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=217fa448bbc6
Modified Files:
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: Dec2016
Log Message:
Approve EXPLAIN output after changeset 9b7490e6a80f.
diffs (truncated from 2298 to 300 lines):
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
@@ -170,17 +170,12 @@ end user.s8_1;
% clob # type
% 100 # length
function user.s16_1():void;
-X_0:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",19:int);
+X_0:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",14:int);
X_28 := bat.new(nil:str);
-X_35 := bat.append(X_28,"sys.L2");
+X_34 := bat.new(nil:int);
+X_32 := bat.new(nil:int);
+X_31 := bat.new(nil:str);
X_30 := bat.new(nil:str);
-X_37 := bat.append(X_30,"L2");
-X_31 := bat.new(nil:str);
-X_39 := bat.append(X_31,"smallint");
-X_32 := bat.new(nil:int);
-X_41 := bat.append(X_32,16:int);
-X_34 := bat.new(nil:int);
-X_43 := bat.append(X_34,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
X_7:bat[:bte] := sql.bind(X_3,"sys","udf_fuse","a",0:int);
@@ -188,6 +183,11 @@ function user.s16_1():void;
X_17:bat[:bte] := sql.bind(X_3,"sys","udf_fuse","b",0:int);
X_23 := algebra.projection(C_4,X_17);
X_24:bat[:sht] := batudf.fuse(X_16,X_23);
+X_35 := bat.append(X_28,"sys.L2");
+X_37 := bat.append(X_30,"L2");
+X_39 := bat.append(X_31,"smallint");
+X_41 := bat.append(X_32,16:int);
+X_43 := bat.append(X_34,0:int);
sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
end user.s16_1;
#inline actions= 0 time=4 usec
@@ -221,17 +221,12 @@ end user.s16_1;
% clob # type
% 100 # length
function user.s18_1():void;
-X_0:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",19:int);
+X_0:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",14:int);
X_28 := bat.new(nil:str);
-X_35 := bat.append(X_28,"sys.L2");
+X_34 := bat.new(nil:int);
+X_32 := bat.new(nil:int);
+X_31 := bat.new(nil:str);
X_30 := bat.new(nil:str);
-X_37 := bat.append(X_30,"L2");
-X_31 := bat.new(nil:str);
-X_39 := bat.append(X_31,"int");
-X_32 := bat.new(nil:int);
-X_41 := bat.append(X_32,32:int);
-X_34 := bat.new(nil:int);
-X_43 := bat.append(X_34,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
X_7:bat[:sht] := sql.bind(X_3,"sys","udf_fuse","c",0:int);
@@ -239,6 +234,11 @@ function user.s18_1():void;
X_17:bat[:sht] := sql.bind(X_3,"sys","udf_fuse","d",0:int);
X_23 := algebra.projection(C_4,X_17);
X_24:bat[:int] := batudf.fuse(X_16,X_23);
+X_35 := bat.append(X_28,"sys.L2");
+X_37 := bat.append(X_30,"L2");
+X_39 := bat.append(X_31,"int");
+X_41 := bat.append(X_32,32:int);
+X_43 := bat.append(X_34,0:int);
sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
end user.s18_1;
#inline actions= 0 time=2 usec
@@ -272,17 +272,12 @@ end user.s18_1;
% clob # type
% 100 # length
function user.s20_1():void;
-X_0:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",19:int);
+X_0:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",14:int);
X_28 := bat.new(nil:str);
-X_35 := bat.append(X_28,"sys.L2");
+
MonetDB: Dec2016 - Approve EXPLAIN output after changeset 9b7490...
Changeset: 1abfcdd54759 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1abfcdd54759
Modified Files:
sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
Branch: Dec2016
Log Message:
Approve EXPLAIN output after changeset 9b7490e6a80f.
diffs (197 lines):
diff --git a/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
b/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
--- a/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
+++ b/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
@@ -62,8 +62,8 @@ Ready.
#(CASE WHEN station136 is NULL THEN 0 ELSE station136 END) +
#(CASE WHEN station136 is NULL THEN 0 ELSE station136 END) +
#(CASE WHEN station136 is NULL THEN 0 ELSE station136 END) +
-% sys.t2239, sys.L1 # table_name
-% station136, L1 # name
+% sys.t2239, sys.L3 # table_name
+% station136, L3 # name
% smallint,bigint # type
% 4, 5 # length
[ 1214,38848 ]
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -44,39 +44,39 @@ project (
% clob # type
% 145 # length
function user.s8_1():void;
-X_0:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b) /
(select 2))) as f from dbg group by d;","sequential_pipe",34:int);
+X_0:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b) /
(select 2))) as f from dbg group by d;","sequential_pipe",19:int);
X_29 := bat.new(nil:str);
-X_36 := bat.append(X_29,"sys.dbg");
-X_46 := bat.append(X_36,"sys.L4");
-X_55 := bat.append(X_46,"sys.L11");
+X_35 := bat.new(nil:int);
+X_33 := bat.new(nil:int);
+X_32 := bat.new(nil:str);
X_31 := bat.new(nil:str);
-X_38 := bat.append(X_31,"d");
-X_48 := bat.append(X_38,"L3");
-X_57 := bat.append(X_48,"f");
-X_32 := bat.new(nil:str);
-X_40 := bat.append(X_32,"int");
-X_50 := bat.append(X_40,"bigint");
-X_59 := bat.append(X_50,"bigint");
-X_33 := bat.new(nil:int);
-X_42 := bat.append(X_33,32:int);
-X_52 := bat.append(X_42,64:int);
-X_60 := bat.append(X_52,63:int);
-X_35 := bat.new(nil:int);
-X_44 := bat.append(X_35,0:int);
-X_54 := bat.append(X_44,0:int);
-X_62 := bat.append(X_54,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","dbg");
+X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int);
+X_19 := algebra.projection(C_4,X_17);
X_7:bat[:int] := sql.bind(X_3,"sys","dbg","a",0:int);
X_10 := algebra.projection(C_4,X_7);
(X_11,C1_14,r2_14) := group.subgroupdone(X_10);
X_14 := algebra.projection(C1_14,X_10);
-X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int);
-X_19 := algebra.projection(C_4,X_17);
X_20:bat[:lng] := aggr.subsum(X_19,X_11,C1_14,true,true);
-X_15 := bat.setKey(X_14,true);
X_22:bat[:lng] := batcalc./(X_20,2:bte);
X_26:bat[:lng] := batcalc.*(X_22,2:bte);
+X_15 := bat.setKey(X_14,true);
+X_36 := bat.append(X_29,"sys.dbg");
+X_38 := bat.append(X_31,"d");
+X_40 := bat.append(X_32,"int");
+X_42 := bat.append(X_33,32:int);
+X_44 := bat.append(X_35,0:int);
+X_46 := bat.append(X_36,"sys.L4");
+X_48 := bat.append(X_38,"L3");
+X_50 := bat.append(X_40,"bigint");
+X_52 := bat.append(X_42,64:int);
+X_54 := bat.append(X_44,0:int);
+X_55 := bat.append(X_46,"sys.L11");
+X_57 := bat.append(X_48,"f");
+X_59 := bat.append(X_50,"bigint");
+X_60 := bat.append(X_52,63:int);
+X_62 := bat.append(X_54,0:int);
sql.resultSet(X_55,X_57,X_59,X_60,X_62,X_15,X_20,X_26);
end user.s8_1;
#inline actions= 0 time=4 usec
@@ -130,39 +130,39 @@ project (
% clob # type
% 150 # length
function user.s20_1():void;
-X_0:void := querylog.define("explain select a as d, sum(b) as e, (2 *
(sum(b) / (select 2))) as f from dbg group by d;","sequential_pipe",34:int);
+X_0:void := querylog.define("explain select a as d, sum(b) as e, (2 *
(sum(b) / (select 2))) as f from dbg group by d;","sequential_pipe",19:int);
X_29 := bat.new(nil:str);
-X_36 := bat.append(X_29,"sys.dbg");
-X_46 := bat.append(X_36,"sys.L4");
-X_55 := bat.append(X_46,"sys.L11");
+X_35 := bat.new(nil:int);
+X_33 := bat.new(nil:int);
+X_32 := bat.new(nil:str);
X_31 := bat.new(nil:str);
-X_38 := bat.append(X_31,"d");
-X_48 := bat.append(X_38,"e");
-X_57 := bat.append(X_48,"f");
-X_32 := bat.new(nil:str);
-X_40 := bat.append(X_32,"int");
-X_50 := bat.append(X_40,"bigint");
-X_59 := bat.append(X_50,"bigint");
-X_33 := ba
MonetDB: Dec2016 - Simplify tests so that we need fewer special ...
Changeset: 19766d7c01ac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19766d7c01ac
Removed Files:
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
Modified Files:
sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.sql
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.sql
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
Branch: Dec2016
Log Message:
Simplify tests so that we need fewer special outputs.
diffs (truncated from 1566 to 300 lines):
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
@@ -1,3 +1,5 @@
+set optimizer = 'sequential_pipe';
+
START TRANSACTION;
CREATE TABLE treeitems (
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
@@ -46,10 +46,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 194 # length
-function user.s6_1():void;
-X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",27:int);
-barrier X_82 := language.dataflow();
+% 197 # length
+function user.s8_1():void;
+X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","sequential_pipe",21:int);
X_37 := bat.new(nil:str);
X_43 := bat.new(nil:int);
X_41 := bat.new(nil:int);
@@ -69,11 +68,6 @@ barrier X_82 := language.dataflow();
X_31 := algebra.projection(C_4,X_29);
X_35 := algebra.projection(X_22,X_31);
X_32 := algebra.projection(r1_23,X_31);
-language.pass(X_10);
-language.pass(X_10);
-language.pass(C_4);
-language.pass(X_31);
-exit X_82;
X_44 := bat.append(X_37,"sys.L2");
X_46 := bat.append(X_39,"id1");
X_48 := bat.append(X_40,"int");
@@ -85,7 +79,7 @@ exit X_82;
X_59 := bat.append(X_50,32:int);
X_60 := bat.append(X_52,0:int);
sql.resultSet(X_54,X_56,X_58,X_59,X_60,X_32,X_35);
-end user.s6_1;
+end user.s8_1;
#inline actions= 0 time=3 usec
#remapactions= 1 time=31 usec
#costmodelactions= 1 time=2 usec
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
@@ -46,10 +46,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 194 # length
-function user.s6_1():void;
-X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",27:int);
-barrier X_84 := language.dataflow();
+% 197 # length
+function user.s8_1():void;
+X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","sequential_pipe",21:int);
X_39 := bat.new(nil:str);
X_45 := bat.new(nil:int);
X_43 := bat.new(nil:int);
@@ -69,11 +68,6 @@ barrier X_84 := language.dataflow();
X_33 := algebra.projection(C_4,X_31);
X_37 := algebra.projection(X_24,X_33);
X_34 := algebra.projection(r1_25,X_33);
-language.pass(X_11);
-language.pass(X_11);
-language.pass(C_4);
-language.pass(X_33);
-exit X_84;
X_46 := bat.append(X_39,"sys.L2");
X_48 := bat.append(X_41,"id1");
X_50 := bat.append(X_42,"int");
@@ -85,9 +79,9 @@ exit X_84;
X_61 := bat.append(X_52,32:int);
X_62 := bat.append(X_54,0:int);
sql.resultSet(X_56,X_58,X_60,X_61,X_62,X_34,X_37);
-end user.s6_1;
-#inline actio
MonetDB: default - Merge with Dec2016 branch.
Changeset: 06e7ddcdd814 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06e7ddcdd814
Added Files:
sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128
sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql
sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err
sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out
Removed Files:
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
Modified Files:
gdk/Makefile.ag
monetdb5/optimizer/opt_support.c
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/backends/monet5/rel_bin.c
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.sql
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.sql
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.err
sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/pg_regress/Tests/float8.stable.err.Windows
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (truncated from 2434 to 300 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -34,7 +34,6 @@ lib_gdk = {
gdk_unique.c \
gdk_interprocess.c gdk_interprocess.h \
gdk_firstn.c \
- bat.feps bat1.feps bat2.feps \
libbat.rc
LIBS = ../common/options/libmoptions \
../common/stream/libstream \
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
@@ -398,6 +398,10 @@ hasSideEffects(InstrPtr p, int strict)
{
if( getFunctionId(p) == NULL) return FALSE;
+ /* update instructions have side effects */
+ if (isUpdateInstruction(p))
+ return TRUE;
+
if ( (getModuleId(p) == batRef || getModuleId(p)==sqlRef) &&
(getFunctionId(p) == setAccessRef ||
getFunctionId(p) == setWriteModeRef ||
@@ -442,10 +446,6 @@ hasSideEffects(InstrPtr p, int strict)
if (getFunctionId(p) == zero_or_oneRef) return FALSE;
if (getFunctionId(p) == mvcRef) return FALSE;
if (getFunctionId(p) == singleRef) return FALSE;
- /* the update instructions for SQL has side effects.
- whether this is relevant should be explicitly checked
- in the environment of the call */
- if (isUpdateInstruction(p)) return TRUE;
return TRUE;
}
if( getModuleId(p) == languageRef){
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
@@ -172,15 +172,10 @@ end user.s8_1;
function user.s16_1():void;
X_1:void := querylog.define("explain select fuse(a,b) from udf_fuse;",
"sequential_pipe", 27:int);
X_29 := bat.new(nil:
MonetDB: Dec2016 - When upgrading, also modify maximum number of...
Changeset: 3780fa0816a0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3780fa0816a0 Added Files: sql/test/emptydb/Tests/check.SQL.py Removed Files: clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py.src Modified Files: clients/Tests/All sql/backends/monet5/sql_upgrades.c sql/test/emptydb-upgrade-chain-hge/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/All sql/test/emptydb-upgrade-chain/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-hge/Tests/All sql/test/emptydb-upgrade-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/All sql/test/emptydb-upgrade/Tests/check.SQL.py.src sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb/Tests/All sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: Dec2016 Log Message: When upgrading, also modify maximum number of digits for decimal function arguments. Also see changeset 84b7fc2a39e7. diffs (truncated from 15834 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,4 +1,3 @@ exports HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures -!BITS32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP&HAVE_SAMTOOLS?SQL-dump MERCURIAL?malcheck diff --git a/clients/Tests/SQL-dump.stable.err b/clients/Tests/SQL-dump.stable.err deleted file mode 100644 --- a/clients/Tests/SQL-dump.stable.err +++ /dev/null @@ -1,36 +0,0 @@ -stderr of test 'SQL-dump` in directory 'clients` itself: - - -# 15:01:36 > -# 15:01:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34237" "--set" "mapi_usock=/var/tmp/mtest-13451/.s.monetdb.34237" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=0" -# 15:01:36 > - -# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = yes -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 5 -# 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 = 34237 -# cmdline opt mapi_usock = /var/tmp/mtest-13451/.s.monetdb.34237 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients -# cmdline opt mal_listing = 0 - -# 15:01:36 > -# 15:01:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13451" "--port=34237" -# 15:01:36 > - - - -# 15:01:41 > -# 15:01:41 > "Done." -# 15:01:41 > - diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out deleted file mode 100644 --- a/clients/Tests/SQL-dump.stable.out +++ /dev/null @@ -1,7515 +0,0 @@ -stdout of test 'SQL-dump` in directory 'clients` itself: - - -# 15:01:36 > -# 15:01:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34237" "--set" "mapi_usock=/var/tmp/mtest-13451/.s.monetdb.34237" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=0" -# 15:01:36 > - -# MonetDB 5 server v11.17.0 (hg id: 51cced809df4) -# This is an unreleased version -# Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 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://madrid.ins.cwi.nl:34237/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13451/.s.monetdb.34237 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded - -Ready. -# SQL catalog created, loading sql scripts once -# loading sql
