Changeset: 673888218ca5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=673888218ca5 Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/gdk.h gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_calc.c gdk/gdk_project.c gdk/gdk_unique.c gdk/libbat.rc geom/sql/conformance/Tests/conformance_load.stable.out geom/sql/functions/Tests/loadTestWKT.stable.out geom/sql/pg_regression/Tests/regress_ogc_cover.stable.out libversions monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batstr.c monetdb5/modules/mal/pcre.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Tests/optimizers.stable.out sql/backends/monet5/UDF/capi/Tests/capi00.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/generator/Tests/generator00.stable.out sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_scenario.h sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.out sql/benchmarks/nobench/Tests/nobench.stable.out sql/benchmarks/ssbm/Tests/create.stable.out sql/test/BugDay_2005-10-06_2.8/Tests/select_null.stable.out sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.stable.out sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out sql/test/BugTracker-2013/Tests/php-size-limit-bug.stable.out sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out sql/test/BugTracker-2015/Tests/window_function_crash.Bug-3861.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128 sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Dependencies/Tests/dependency_loop.stable.out sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 sql/test/Dependencies/dependency_DBobjects.sql sql/test/Dependencies/dependency_owner_schema_3.sql sql/test/Dump/Tests/dump-empty.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.out sql/test/LSST/Tests/schema_3_1_88.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out.int128 sql/test/Tests/comment-dump.stable.out sql/test/Update_Delete_action/Tests/delete_cascade.stable.out sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out sql/test/VOC/Tests/VOC.stable.out sql/test/Via-m/Tests/event_s01.stable.out sql/test/copy/Tests/ingestion.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/load.stable.out sql/test/group-concat/Tests/groupconcat01.stable.out sql/test/json/Tests/spaceissue.stable.out sql/test/lateral/Tests/lateral.stable.out sql/test/mergetables/Tests/mergeinit.stable.out sql/test/miscellaneous/Tests/trace_test.stable.out sql/test/orderidx/Tests/simpletable.stable.out sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/quantiles/Tests/quantiles.stable.out sql/test/rdf/Tests/create_tables_t.stable.out sql/test/snodgrass/Tests/cast_select.stable.out sql/test/ssqq/Tests/ssqq.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-load.stable.out testing/difflib.c vertoo.data Branch: merge-partitions Log Message:
Merge with default diffs (truncated from 21847 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -697,3 +697,6 @@ 28edc063ceb6a3726af887911a3e4ac4a33c504f f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_release ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_5 ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release +e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_7 +ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release +e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1033,6 +1033,9 @@ done %postun -p /sbin/ldconfig %changelog +* Thu May 31 2018 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.29.7-20180531 +- Rebuilt. + * Fri May 25 2018 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.29.5-20180525 - Rebuilt. - BZ#6562: Sqlitelogictest crash on group by query with not in operator diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -8,13 +8,14 @@ stdout of test 'MAL-signatures` in direc # MonetDB 5 server v11.20.0 # This is an unreleased version # Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 7.734 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 - -Ready. +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.386 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://xps13:39285/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1158/.s.monetdb.39285 +# MonetDB/GIS module loaded # SQL catalog created, loading sql scripts once # loading sql script: 09_like.sql # loading sql script: 10_math.sql @@ -10872,7 +10873,7 @@ Ready. [ "sql", "optimizer_updates", "pattern sql.optimizer_updates():void ", "SQLoptimizersUpdate;", "" ] [ "sql", "optimizers", "command sql.optimizers() (X_0:bat[:str], X_1:bat[:str], X_2:bat[:str]) ", "getPipeCatalog;", "" ] [ "sql", "password", "pattern sql.password(user:str):str ", "db_password_wrap;", "Return password hash of user" ] -[ "sql", "prelude", "command sql.prelude():void ", "SQLprelude;", "" ] +[ "sql", "prelude", "pattern sql.prelude():void ", "SQLprelude;", "" ] [ "sql", "project", "command sql.project(col:bat[:oid], l:bat[:oid], r:bat[:oid]):bat[:oid] ", "BATleftproject;", "Last step of a left outer join, ie project the inner join (l,r) over the left input side (col)" ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAproject2;", "Return column bat with delta's applied." ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ", "DELTAproject;", "Return column bat with delta's applied." ] @@ -11127,13 +11128,7 @@ Ready. [ "url", "url", "command url.url(s:str):url ", "URLnew;", "Create an URL from a string literal" ] [ "url", "url", "command url.url(s:url):url ", "URLnoop;", "Create an URL from a string literal" ] [ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] [ "user", "s2_1", "function user.s2_1():void;", "", "" ] -[ "user", "sql.init", "function user.sql.init():void;", "", "" ] [ "uuid", "#cmp", "command uuid.#cmp():void ", "UUIDcompare;", "" ] [ "uuid", "#fromstr", "command uuid.#fromstr():void ", "UUIDfromString;", "" ] [ "uuid", "#hash", "command uuid.#hash():void ", "UUIDhash;", "" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -8,13 +8,14 @@ stdout of test 'MAL-signatures` in direc # MonetDB 5 server v11.20.0 # This is an unreleased version # Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 7.734 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 - -Ready. +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.386 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://xps13:39285/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1158/.s.monetdb.39285 +# MonetDB/GIS module loaded # SQL catalog created, loading sql scripts once # loading sql script: 09_like.sql # loading sql script: 10_math.sql @@ -56,9 +57,11 @@ Ready. # loading sql script: 90_generator_hge.sql # loading sql script: 99_system.sql -# 12:57:39 > -# 12:57:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21549" "--port=35702" -# 12:57:39 > +Ready. + +# 16:09:44 > +# 16:09:44 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1158" "--port=39285" +# 16:09:44 > #select * from sys.malfunctions() order by module, "function", address, signature, comment; % .L1, .L1, .L1, .L1, .L1 # table_name @@ -15084,7 +15087,7 @@ Ready. [ "sql", "optimizer_updates", "pattern sql.optimizer_updates():void ", "SQLoptimizersUpdate;", "" ] [ "sql", "optimizers", "command sql.optimizers() (X_0:bat[:str], X_1:bat[:str], X_2:bat[:str]) ", "getPipeCatalog;", "" ] [ "sql", "password", "pattern sql.password(user:str):str ", "db_password_wrap;", "Return password hash of user" ] -[ "sql", "prelude", "command sql.prelude():void ", "SQLprelude;", "" ] +[ "sql", "prelude", "pattern sql.prelude():void ", "SQLprelude;", "" ] [ "sql", "project", "command sql.project(col:bat[:oid], l:bat[:oid], r:bat[:oid]):bat[:oid] ", "BATleftproject;", "Last step of a left outer join, ie project the inner join (l,r) over the left input side (col)" ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAproject2;", "Return column bat with delta's applied." ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ", "DELTAproject;", "Return column bat with delta's applied." ] @@ -15341,13 +15344,7 @@ Ready. [ "url", "url", "command url.url(s:str):url ", "URLnew;", "Create an URL from a string literal" ] [ "url", "url", "command url.url(s:url):url ", "URLnoop;", "Create an URL from a string literal" ] [ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] [ "user", "s2_1", "function user.s2_1():void;", "", "" ] -[ "user", "sql.init", "function user.sql.init():void;", "", "" ] [ "uuid", "#cmp", "command uuid.#cmp():void ", "UUIDcompare;", "" ] [ "uuid", "#fromstr", "command uuid.#fromstr():void ", "UUIDfromString;", "" ] [ "uuid", "#hash", "command uuid.#hash():void ", "UUIDhash;", "" ] diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.29.7) unstable; urgency=low + + * Rebuilt. + + -- Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> Thu, 31 May 2018 10:17:56 +0200 + monetdb (11.29.5) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1045,52 +1045,6 @@ gdk_export bte ATOMelmshift(int sz); ATOMputFIX((b)->ttype, (p), v); \ } \ } while (false) -#define Treplacevalue(b, p, v) \ - do { \ - if ((b)->tvarsized && (b)->ttype) { \ - var_t _d; \ - ptr _ptr; \ - _ptr = (p); \ - switch ((b)->twidth) { \ - case 1: \ - _d = (var_t) * (uint8_t *) _ptr + GDK_VAROFFSET; \ - break; \ - case 2: \ - _d = (var_t) * (uint16_t *) _ptr + GDK_VAROFFSET; \ - break; \ - case 4: \ - _d = (var_t) * (uint32_t *) _ptr; \ - break; \ - case 8: \ - _d = * (var_t *) _ptr; \ - break; \ - } \ - ATOMreplaceVAR((b)->ttype, (b)->tvheap, &_d, v); \ - if ((b)->twidth < SIZEOF_VAR_T && \ - ((b)->twidth <= 2 ? _d - GDK_VAROFFSET : _d) >= ((size_t) 1 << (8 * (b)->twidth))) { \ - /* doesn't fit in current heap, upgrade it */ \ - if (GDKupgradevarheap((b), _d, false, (b)->batRestricted == BAT_READ) != GDK_SUCCEED) \ - goto bunins_failed; \ - } \ - _ptr = (p); \ - switch ((b)->twidth) { \ - case 1: \ - * (uint8_t *) _ptr = (uint8_t) (_d - GDK_VAROFFSET); \ - break; \ - case 2: \ - * (uint16_t *) _ptr = (uint16_t) (_d - GDK_VAROFFSET); \ - break; \ - case 4: \ - * (uint32_t *) _ptr = (uint32_t) _d; \ - break; \ - case 8: \ - * (var_t *) _ptr = _d; \ - break; \ - } \ - } else { \ - ATOMreplaceFIX((b)->ttype, (p), v); \ - } \ - } while (false) #else #define Tputvalue(b, p, v, copyall) \ do { \ @@ -1120,46 +1074,6 @@ gdk_export bte ATOMelmshift(int sz); ATOMputFIX((b)->ttype, (p), v); \ } \ } while (false) -#define Treplacevalue(b, p, v) \ - do { \ - if ((b)->tvarsized && (b)->ttype) { \ - var_t _d; \ - ptr _ptr; \ - _ptr = (p); \ - switch ((b)->twidth) { \ - case 1: \ - _d = (var_t) * (uint8_t *) _ptr + GDK_VAROFFSET; \ - break; \ - case 2: \ - _d = (var_t) * (uint16_t *) _ptr + GDK_VAROFFSET; \ - break; \ - case 4: \ - _d = * (var_t *) _ptr; \ - break; \ - } \ - ATOMreplaceVAR((b)->ttype, (b)->tvheap, &_d, v); \ - if ((b)->twidth < SIZEOF_VAR_T && \ - ((b)->twidth <= 2 ? _d - GDK_VAROFFSET : _d) >= ((size_t) 1 << (8 * (b)->twidth))) { \ - /* doesn't fit in current heap, upgrade it */ \ - if (GDKupgradevarheap((b), _d, false, (b)->batRestricted == BAT_READ) != GDK_SUCCEED) \ - goto bunins_failed; \ - } \ - _ptr = (p); \ - switch ((b)->twidth) { \ - case 1: \ - * (uint8_t *) _ptr = (uint8_t) (_d - GDK_VAROFFSET); \ - break; \ - case 2: \ - * (uint16_t *) _ptr = (uint16_t) (_d - GDK_VAROFFSET); \ - break; \ - case 4: \ - * (var_t *) _ptr = _d; \ - break; \ - } \ - } else { \ - ATOMreplaceFIX((b)->ttype, (p), v); \ - } \ - } while (false) #endif #define tfastins_nocheck(b, p, v, s) \ do { \ @@ -1168,30 +1082,85 @@ gdk_export bte ATOMelmshift(int sz); Tputvalue((b), Tloc((b), (p)), (v), 0); \ } while (false) -#define bunfastapp_nocheck(b, p, t, ts) \ +#define bunfastapp_nocheck(b, p, v, ts) \ do { \ - tfastins_nocheck(b, p, t, ts); \ + tfastins_nocheck(b, p, v, ts); \ (b)->batCount++; \ } while (false) -#define bunfastapp_nocheck_inc(b, p, t) \ - do { \ - bunfastapp_nocheck(b, p, t, Tsize(b)); \ - p++; \ +#define bunfastapp(b, v) \ + do { \ + if (BATcount(b) >= BATcapacity(b)) { \ + if (BATcount(b) == BUN_MAX) { \ + GDKerror("bunfastapp: too many elements to accomodate (" BUNFMT ")\n", BUN_MAX); \ + goto bunins_failed; \ + } \ + if (BATextend((b), BATgrows(b)) != GDK_SUCCEED) \ + goto bunins_failed; \ + } \ + bunfastapp_nocheck(b, (b)->batCount, v, Tsize(b)); \ } while (false) -#define bunfastapp(b, t) \ +#define bunfastappTYPE(TYPE, b, v) \ do { \ - BUN _p = BUNlast(b); \ - if (_p >= BATcapacity(b)) { \ - if (_p == BUN_MAX || BATcount(b) == BUN_MAX) { \ + if (BATcount(b) >= BATcapacity(b)) { \ + if (BATcount(b) == BUN_MAX) { \ GDKerror("bunfastapp: too many elements to accomodate (" BUNFMT ")\n", BUN_MAX); \ goto bunins_failed; \ } \ if (BATextend((b), BATgrows(b)) != GDK_SUCCEED) \ goto bunins_failed; \ } \ - bunfastapp_nocheck(b, _p, t, Tsize(b)); \ + (b)->theap.dirty = true; \ + (b)->theap.free += sizeof(TYPE); \ + ((TYPE *) (b)->theap.base)[(b)->batCount++] = * (const TYPE *) (v); \ + } while (false) + +#define tfastins_nocheckVAR(b, p, v, s) \ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
