Changeset: 44004a347d2b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44004a347d2b Added Files: sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.sql sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.err sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.out sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.sql sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.stable.err sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.stable.out Modified Files: buildtools/ChangeLog.Oct2014 clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_none.stable.out clients/Tests/exports.stable.out debian/control debian/rules monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/inet.h monetdb5/modules/atoms/inet.mal testing/Mtest.py.in Branch: default Log Message:
Merge with Oct2014 branch. diffs (truncated from 499 to 300 lines): diff --git a/buildtools/ChangeLog.Oct2014 b/buildtools/ChangeLog.Oct2014 --- a/buildtools/ChangeLog.Oct2014 +++ b/buildtools/ChangeLog.Oct2014 @@ -1,3 +1,6 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Tue Feb 3 2015 Sjoerd Mullender <[email protected]> +- We now also create debug packages for Debian and Ubuntu. + diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -38540,6 +38540,8 @@ command inet.new(s:str):inet address INETnew; comment Create an inet from a string literal +command inet.#null():inet +address INETnull; command inet.setmasklen(X_1:inet,X_2:int):inet address INETsetmasklen; comment Set netmask length for inet value diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures_fits_geom.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -38457,6 +38457,8 @@ command inet.new(s:str):inet address INETnew; comment Create an inet from a string literal +command inet.#null():inet +address INETnull; command inet.setmasklen(X_1:inet,X_2:int):inet address INETsetmasklen; comment Set netmask length for inet value diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -38433,6 +38433,8 @@ command inet.new(s:str):inet address INETnew; comment Create an inet from a string literal +command inet.#null():inet +address INETnull; command inet.setmasklen(X_1:inet,X_2:int):inet address INETsetmasklen; comment Set netmask length for inet value diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -38266,6 +38266,8 @@ command inet.new(s:str):inet address INETnew; comment Create an inet from a string literal +command inet.#null():inet +address INETnull; command inet.setmasklen(X_1:inet,X_2:int):inet address INETsetmasklen; comment Set netmask length for inet value 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 @@ -1311,6 +1311,7 @@ str INETmasklen(int *retval, inet *val); str INETnetmask(inet *retval, inet *val); str INETnetwork(inet *retval, inet *val); str INETnew(inet *retval, str *in); +inet *INETnull(void); str INETsetmasklen(inet *retval, inet *val, int *mask); str INETtext(str *retval, inet *val); int INETtoString(str *retval, int *len, inet *handle); diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -324,3 +324,16 @@ Description: Native MonetDB client Pytho program. This package is for Python version 3. If you want to use Python version 2, you need python-monetdb. +Package: monetdb-dbg +Architecture: any +Section: debug +Priority: extra +Depends: ${misc:Depends} +Description: Debugging symbols for monetdb packages + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL frontend. + . + This package contains the debugging symbols for all monetdb binary + packages. diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -64,7 +64,8 @@ override_dh_auto_configure: --with-samtools=yes \ --with-sphinxclient=no \ --with-unixodbc=yes \ - --with-valgrind=no + --with-valgrind=no \ + X_CFLAGS=-g # currently the test suite fails override_dh_auto_test: @@ -79,3 +80,6 @@ override_dh_python2: override_dh_python3: dh_python3 clients/python3 + +override_dh_strip: + dh_strip --dbg-package=monetdb-dbg diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c --- a/monetdb5/modules/atoms/inet.c +++ b/monetdb5/modules/atoms/inet.c @@ -33,6 +33,9 @@ #include "mal.h" #include "mal_exception.h" #include "inet.h" + +static inet inet_nil = {0,0,0,0,0,0,0,1}; + /** * Creates a new inet from the given string. * Warning: GDK function, does NOT pass a string by reference, and wants @@ -715,3 +718,9 @@ INET_fromstr(inet *ret, str *s) INETfromString(*s, &len, &ret); return MAL_SUCCEED; } + +inet * +INETnull(void) +{ + return &inet_nil; +} diff --git a/monetdb5/modules/atoms/inet.h b/monetdb5/modules/atoms/inet.h --- a/monetdb5/modules/atoms/inet.h +++ b/monetdb5/modules/atoms/inet.h @@ -77,4 +77,4 @@ inet_export str INETtext(str *retval, in inet_export str INETabbrev(str *retval, inet *val); inet_export str INET_inet(inet *d, inet *s); inet_export str INET_fromstr(inet *ret, str *s); - +inet_export inet *INETnull(void); diff --git a/monetdb5/modules/atoms/inet.mal b/monetdb5/modules/atoms/inet.mal --- a/monetdb5/modules/atoms/inet.mal +++ b/monetdb5/modules/atoms/inet.mal @@ -17,6 +17,8 @@ atom inet:lng; +command null() :inet +address INETnull; command cmp() :int address INETcompare; command fromstr() diff --git a/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.sql b/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.sql @@ -0,0 +1,36 @@ +CREATE TABLE t1 (id VARCHAR(48), col1 VARCHAR(32), col2 VARCHAR(8), excepted BOOLEAN); +INSERT INTO t1 (id, col1, col2, excepted) VALUES ('12', 'col1.A.99.code', '.03', 'false'), ('12', 'col1.A.99.code', '.02', 'false'); + +CREATE TABLE t2 (id VARCHAR(48), col3 VARCHAR(32), col2 VARCHAR(8), row int); +INSERT INTO t2 (id, col3, col2, row) VALUES ('12',null,null,null); +UPDATE t2 SET (col3, col2, row) = +(SELECT col1, col2, row +FROM ( + SELECT id, col1, col2, + ROW_NUMBER() OVER (PARTITION BY id ORDER BY (col1 LIKE '%.%.99.%') ASC, + col1 ASC, col2 ASC) AS row + FROM t1 + WHERE excepted = false + AND col1 LIKE '%.A.%' +) AS t3 +WHERE t3.row = 1 +AND t2.id= t3.id +); +SELECT * FROM t2; + +DROP TABLE t2; +CREATE TABLE t2 (id VARCHAR(48), col3 VARCHAR(32), col2 VARCHAR(8), row int); +INSERT INTO t2 (id, col3, col2, row) VALUES ('12',null,null,null); +CREATE TABLE t3 AS ( + SELECT id, col1, col2, + ROW_NUMBER() OVER (PARTITION BY id ORDER BY (col1 LIKE '%.%.99.%') ASC, + col1 ASC,col2 ASC) AS row + FROM t1 + WHERE excepted = false AND col1 LIKE '%.A.%' +) WITH DATA; +UPDATE t2 SET (col3, col2, row) = (SELECT col1, col2, row FROM t3 WHERE t2.id= t3.id AND t3.row = 1); +SELECT * FROM t2; + +DROP TABLE t1; +DROP TABLE t2; +DROP TABLE t3; diff --git a/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.err b/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.err @@ -0,0 +1,37 @@ +stderr of test 'incorrect-ROW_NUMBER.Bug-3663` in directory 'sql/test/BugTracker-2015` itself: + + +# 00:49:14 > +# 00:49:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39791" "--set" "mapi_usock=/var/tmp/mtest-15650/.s.monetdb.39791" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Oct2014/debug/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 00:49:14 > + +# builtin opt gdk_dbpath = /export/scratch2/zhang/monet-install/Oct2014/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 = 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 = 39791 +# cmdline opt mapi_usock = /var/tmp/mtest-15650/.s.monetdb.39791 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch2/zhang/monet-install/Oct2014/debug/var/MonetDB/mTests_sql_test_BugTracker-2015 +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 00:49:15 > +# 00:49:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15650" "--port=39791" +# 00:49:15 > + + +# 00:49:15 > +# 00:49:15 > "Done." +# 00:49:15 > + diff --git a/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.out b/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.out @@ -0,0 +1,109 @@ +stdout of test 'incorrect-ROW_NUMBER.Bug-3663` in directory 'sql/test/BugTracker-2015` itself: + + +# 00:49:14 > +# 00:49:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39791" "--set" "mapi_usock=/var/tmp/mtest-15650/.s.monetdb.39791" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Oct2014/debug/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 00:49:14 > + +# MonetDB 5 server v11.19.10 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs 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://riga.ins.cwi.nl:39791/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-15650/.s.monetdb.39791 +# MonetDB/GIS module loaded +# MonetDB/SQL 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: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 41_jsonstore.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 99_system.sql + +# 00:49:15 > +# 00:49:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15650" "--port=39791" +# 00:49:15 > + +#CREATE TABLE t1 (id VARCHAR(48), col1 VARCHAR(32), col2 VARCHAR(8), excepted BOOLEAN); +#INSERT INTO t1 (id, col1, col2, excepted) VALUES ('12', 'col1.A.99.code', '.03', 'false'), ('12', 'col1.A.99.code', '.02', 'false'); +[ 2 ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
