MonetDB: scoping - Merged with default
Changeset: b8296c326365 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8296c326365
Modified Files:
.bumpversion.cfg
.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/libbat.rc
libversions
monetdb5/modules/atoms/mtime.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/UDF/pyapi3/connection3.c
sql/backends/monet5/UDF/pyapi3/convert_loops.h
sql/backends/monet5/UDF/pyapi3/formatinput3.c
sql/backends/monet5/UDF/pyapi3/pyapi3.c
sql/backends/monet5/UDF/pyapi3/pyheader.h
sql/backends/monet5/UDF/pyapi3/pytypes3.c
sql/backends/monet5/UDF/pyapi3/type_conversion.h
sql/backends/monet5/UDF/pyapi3/type_conversion3.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_user.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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
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/subquery/Tests/subquery6.sql
testing/malcheck.py
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 782 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -6,6 +6,8 @@ tag = False
[bumpversion:file:configure.ag]
[bumpversion:file:MonetDB.spec]
+search = %global version {current_version}
+replace = %global version {new_version}
[bumpversion:file:NT/rules.msc]
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -772,3 +772,6 @@ 0d51d6758f2b1f3f1804415545f8551a38da1848
28480e096722b7f76ab021c0d16c68c6949f41b4 Jun2020_5
0d51d6758f2b1f3f1804415545f8551a38da1848 Jun2020_release
28480e096722b7f76ab021c0d16c68c6949f41b4 Jun2020_release
+80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_7
+28480e096722b7f76ab021c0d16c68c6949f41b4 Jun2020_release
+80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -984,6 +984,9 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Fri May 29 2020 Sjoerd Mullender - 11.37.7-20200529
+- Rebuilt.
+
* Tue May 26 2020 Sjoerd Mullender - 11.37.5-20200526
- Rebuilt.
- BZ#6864: (I)LIKE with multiple % doen't find matches
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
@@ -9101,8 +9101,8 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "hash", "command batcalc.hash(b:bat[:lng]):bat[:lng] ",
"MKEYbathash;", "" ]
[ "batcalc", "hash", "command batcalc.hash(b:bat[:oid]):bat[:lng] ",
"MKEYbathash;", "" ]
[ "batcalc", "hash", "command batcalc.hash(b:bat[:sht]):bat[:lng] ",
"MKEYbathash;", "" ]
-[ "batcalc", "identity", "command
batcalc.identity(b:bat[:any_2]):bat[:oid] ", "BATSQLidentity;", "Returns
the unique row identitfiers." ]
-[ "batcalc", "identity", "pattern batcalc.identity(b:bat[:any_2], s:oid)
(resb:bat[:oid], ns:oid) ", "PBATSQLidentity;", "Returns the unique row
identitfiers." ]
+[ "batcalc", "identity", "command
batcalc.identity(b:bat[:any]):bat[:oid] ", "BATSQLidentity;", "Returns
the unique row identitfiers." ]
+[ "batcalc", "identity", "pattern batcalc.identity(b:bat[:any], s:oid)
(resb:bat[:oid], ns:oid) ", "PBATSQLidentity;", "Returns the unique
row identitfiers." ]
[ "batcalc", "ifthenelse", "pattern batcalc.ifthenelse(b:bat[:bit],
b1:bat[:any_1], b2:bat[:any_1]):bat[:any_1] ", "CMDifthen;", "If-then-else
operation to assemble a conditional result" ]
[ "batcalc", "ifthenelse", "pattern batcalc.ifthenelse(b:bat[:bit],
b1:bat[:any_1], v2:any_1):bat[:any_1] ", "CMDifthen;", "If-then-else
operation to assemble a conditional result" ]
[ "batcalc", "ifthenelse", "pattern batcalc.ifthenelse(b:bat[:bit],
v1:any_1, b2:bat[:any_1]):bat[:any_1] ", "CMDifthen;", "If-then-else
operation to assemble a conditional result" ]
@
MonetDB: scoping - Merged with default
Changeset: 112a90980cf0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=112a90980cf0 Added Files: sql/test/Tests/hot-snapshot-bz2.py sql/test/Tests/hot-snapshot-bz2.stable.err sql/test/Tests/hot-snapshot-bz2.stable.out sql/test/Tests/hot-snapshot-gz.py sql/test/Tests/hot-snapshot-gz.stable.err sql/test/Tests/hot-snapshot-gz.stable.out sql/test/Tests/hot-snapshot-lz4.py sql/test/Tests/hot-snapshot-lz4.stable.err sql/test/Tests/hot-snapshot-lz4.stable.out sql/test/Tests/hot-snapshot-xz.py sql/test/Tests/hot-snapshot-xz.stable.err sql/test/Tests/hot-snapshot-xz.stable.out sql/test/Tests/hot_snapshot_compression.py Modified Files: .bumpversion.cfg .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/Tests/exports.stable.out clients/Tests/mclient-uri.stable.out clients/Tests/mclient-uri.stable.out.Windows clients/examples/perl/sqlsample.pl clients/examples/python/sqlsample.py clients/mapiclient/mclient.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/stream.c configure.ag debian/changelog debian/monetdb5-sql.postinst gdk/gdk_aggr.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_logger.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_value.c gdk/libbat.rc geom/sql/pg_regression/Tests/dump.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/mal/Tests/tst1506.stable.out monetdb5/mal/mal_errors.h monetdb5/mal/mal_exception.c monetdb5/modules/atoms/mtime.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/mal_mapi.c monetdb5/optimizer/opt_remap.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/backends/monet5/Tests/optimizers.stable.out sql/backends/monet5/Tests/rapi09.stable.out sql/backends/monet5/Tests/simpleSQL.stable.out sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_bat2time.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast.h sql/backends/monet5/sql_cast_impl_down_from_flt.h sql/backends/monet5/sql_cast_impl_int.h sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_decimal.mal sql/backends/monet5/sql_decimal.mal.sh sql/backends/monet5/sql_decimal_hge.mal sql/backends/monet5/sql_decimal_hge.mal.sh sql/backends/monet5/sql_hge.mal sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/common/sql_types.c sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_rewriter.c sql/server/rel_rewriter.h sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_atom.c sql/storage/bat/bat_table.c sql/storage/store.c sql/test/BugDay_2005-10-06_2.8/Tests/select_null.stable.out sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/select_not_true.SF-1314945.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/set_types.SF-932360.stable.out sql/test/BugDay_2005-11-09_2.8/Tests/overflow_checking.SF-1089334.stable.err sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_bigint_to_int.SF-1211903.stable.out sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out sql/test/BugTracker-2009/Tests/BOM.SF-2787813.stable.out sql/test/BugTracker-2009/Tests/Division_by_zero_error.SF-2791361.stable.out sql/test/BugTracker-2009/Tests/Floating_point_exception.SF-2791356.stable.out sql/test/BugTracker-2009/Tests/addmonths_missing.SF-2854949.stable.out sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out.int128 sql/test/BugTracker-2009/Tests/coercion.stable.out sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.
MonetDB: scoping - Merged with default
Changeset: fe1ec107fdef for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe1ec107fdef
Added Files:
.bumpversion.cfg
sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.sql
sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.stable.err
sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.stable.out
Removed Files:
vertoo.config
vertoo.data
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/conf/Maddlog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_cross.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_storage.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_tracer.c
gdk/gdk_utils.c
gdk/libbat.rc
geom/monetdb5/geom.c
libversions
monetdb5/mal/mal_client.c
monetdb5/modules/mal/pcre.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/UDF/pyapi3/pyheader.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_rank.c
sql/common/sql_types.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_outer_join_optimizer.h
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_rewriter.c
sql/server/rel_rewriter.h
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_semantic.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err
sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.out
sql/test/BugTracker-2020/Tests/All
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
sql/test/mergetables/Tests/sqlsmith-exists2.sql
sql/test/mergetables/Tests/sqlsmith-exists2.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/miscellaneous/Tests/simple_plans.stable.out
sql/test/subquery/Tests/subquery6.sql
sql/test/subquery/Tests/subquery6.stable.err
sql/test/subquery/Tests/subquery6.stable.out
sql/test/wlcr/Tests/wlr110.py
sql/test/wlcr/Tests/wlr35.py
testing/Mfilter.py
testing/Mtest.py.in
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 4786 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,32 @@
+[bumpversion]
+current_version = 11.38.0
+commit = False
+tag = False
+
+[bumpversion:file:configure.ag]
+
+[bumpversion:file:MonetDB.spec]
+
+[bumpversion:file:NT/rules.msc]
+
+[bumpversion:file:NT/monetdb_config.h.in]
+
+[bumpversion:file:gdk/libbat.rc]
+parse = (?P\d+),(?P\d+),(?P\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/odbc/winsetup/setup.rc]
+parse = (?P\d+),(?P\d+),(?P\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/odbc/driver/driver.rc]
+parse = (?P\d+),(?P\d+),(?P\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/mapilib/mapi.rc]
+parse = (?P\d+),(?P\d+),(?P\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
+parse = (?P\d+),(?P\d+),(?P\d+)
+serialize = {major},{minor},{patch}
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -766,3 +766,6 @@ 179977ed07cd8095f99a6a07968b8e9d1affa753
6b76e1fa9b32421197acf26f63948c858e487d6a Jun2020_root
03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_1
03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_release
+0d51d6758f2b1f3f1804415545f8551a38da1848 Jun2020_3
+03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_release
+0d51d6758f2b1f3f1804415545f8551a38da1848 Jun2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -984,6 +984,10 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Mon May 18 2020 Sjoerd Mullender - 11.37.3-20200518
+- Rebuilt.
+- BZ#6863
MonetDB: scoping - Merged with default
Changeset: 182842f1e943 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=182842f1e943 Added Files: clients/odbc/ChangeLog-Archive debian/libmonetdb20.install documentation/source/manual_pages/README sql/server/cmp_exp_eval.h sql/server/rel_out2inner_join.txt sql/server/rel_outer_join_optimizer.h Removed Files: ChangeLog.Nov2019 buildtools/ChangeLog.Nov2019 clients/ChangeLog.Nov2019 clients/mapilib/ChangeLog.Nov2019 common/stream/ChangeLog.Nov2019 debian/libmonetdb19.install gdk/ChangeLog.Nov2019 geom/ChangeLog.Nov2019 monetdb5/ChangeLog.Nov2019 sql/ChangeLog.Nov2019 testing/ChangeLog.Nov2019 tools/merovingian/ChangeLog.Nov2019 Modified Files: .hgtags ChangeLog-Archive ChangeLog.Jun2020 MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/selinux/ChangeLog-Archive buildtools/selinux/ChangeLog.Jun2020 clients/ChangeLog-Archive clients/ChangeLog.Jun2020 clients/mapilib/mapi.rc clients/odbc/ChangeLog.Jun2020 clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog debian/control documentation/source/manual_pages/monetdb.rst gdk/ChangeLog-Archive gdk/ChangeLog.Jun2020 gdk/gdk_hash.c gdk/gdk_storage.c gdk/libbat.rc geom/lib/libgeom.h geom/monetdb5/geom.c libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jun2020 monetdb5/extras/rapi/rapi.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Jun2020 sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_relation.h sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_query.c sql/storage/bat/bat_logger.c sql/storage/store.c sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out sql/test/BugTracker-2008/Tests/select_not_wrong_result.SF-2080151.stable.out sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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 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/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/subquery/Tests/subquery6.sql sql/test/subquery/Tests/subquery6.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_Not_Nullable_columns.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 testing/Mtest.py.in tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Jun2020 tools/merovingian/client/monetdb.1 tools/merovingian/daemon/handlers.c vertoo.data Branch: scoping Log Message: Merged with default diffs (truncated from 223799 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -764,3 +764,5 @@ 179977ed07cd8095f99a6a07968b8e9d1affa753 e1c7c70bceb205cf23b8a35179b628563871f949 Nov2019_SP3_release 179977ed07cd8095f
MonetDB: scoping - Merged with default
Changeset: a3c58542a294 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3c58542a294
Modified Files:
monetdb5/mal/mal_runtime.c
Branch: scoping
Log Message:
Merged with default
diffs (28 lines):
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -139,12 +139,8 @@ runtimeProfileInit(Client cntxt, MalBlkP
return;
}
// check for recursive call, which does not change the number of workers
- for( i = qtail; i != qhead; i++){
- if( i == qsize){
- i = 0;
- }
- if( i == qhead)
- break;
+ i=qtail;
+ while (i != qhead){
if (QRYqueue[i].mb && QRYqueue[i].mb == mb && stk->up ==
QRYqueue[i].stk){
QRYqueue[i].stk = stk;
mb->tag = stk->tag = qtag++;
@@ -153,6 +149,9 @@ runtimeProfileInit(Client cntxt, MalBlkP
}
if ( QRYqueue[i].status)
paused += (QRYqueue[i].status[0] == 'p' ||
QRYqueue[i].status[0] == 'r'); /* running, prepared or paused */
+ i++;
+ if ( i >= qsize)
+ i = 0;
}
assert(qhead < qsize);
if( (int) (qsize - paused) < MAL_MAXCLIENTS){
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: scoping - Merged with default
Changeset: 184f981f5e4c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=184f981f5e4c Modified Files: clients/ChangeLog.Jun2020 clients/Tests/exports.stable.out clients/mapiclient/mclient.1 clients/mapiclient/msqldump.1 documentation/source/manual_pages/mclient.rst documentation/source/manual_pages/monetdb.rst documentation/source/manual_pages/monetdbd.rst.in documentation/source/manual_pages/mserver5.rst.in documentation/source/manual_pages/msqldump.rst gdk/ChangeLog.Jun2020 gdk/gdk.h gdk/gdk_system.h monetdb5/ChangeLog.Jun2020 monetdb5/mal/mal.h monetdb5/mal/mal_runtime.c monetdb5/tools/Tests/mserver5--help.stable.err monetdb5/tools/Tests/mserver5--help.stable.err.Windows sql/ChangeLog.Jun2020 sql/backends/monet5/sql_scenario.c sql/storage/store.c tools/merovingian/daemon/monetdbd.1.in tools/mserver/mserver5.1.in tools/mserver/mserver5.c Branch: scoping Log Message: Merged with default diffs (truncated from 968 to 300 lines): diff --git a/clients/ChangeLog.Jun2020 b/clients/ChangeLog.Jun2020 --- a/clients/ChangeLog.Jun2020 +++ b/clients/ChangeLog.Jun2020 @@ -3,7 +3,7 @@ * Mon Apr 20 2020 Sjoerd Mullender - The monetdb-client-tools (Debian/Ubuntu) and MonetDB-client-tools - (Fedora/RHcontaining the stethoscope, tachograph, and tomograph has + (Fedora/RH) containing the stethoscope, tachograph, and tomograph has been removed. A completely new version of stethoscope will be released to replace the old version. @@ -20,6 +20,6 @@ gets tagged with the current session identifier * Thu Oct 24 2019 Martin Kersten -- Allow monetdb user to control session and query time out and selective +- Allow monetdb user to control session and query time out and selectively stopping a client sessions with a soft termination request. 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 @@ -297,7 +297,6 @@ void GDKreset(int status); void GDKsetdebug(int debug); gdk_return GDKsetenv(const char *name, const char *value); void GDKsetmallocsuccesscount(lng count); -void GDKsetverbose(int verbosity); ssize_t GDKstrFromStr(unsigned char *restrict dst, const unsigned char *restrict src, ssize_t len); str GDKstrdup(const char *s) __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); str GDKstrndup(const char *s, size_t n) __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); @@ -318,7 +317,6 @@ gdk_return GDKtracer_stop(void); size_t GDKuniqueid(size_t offset); gdk_return GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare) __attribute__((__warn_unused_result__)); lng GDKusec(void); -int GDKverbose; const char *GDKversion(void) __attribute__((__const__)); size_t GDKvm_cursize(void); void *GDKzalloc(size_t size) __attribute__((__malloc__)) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1 --- a/clients/mapiclient/mclient.1 +++ b/clients/mapiclient/mclient.1 @@ -75,6 +75,8 @@ This file can contain defaults for the f .BR database , .BR save_history , .BR format , +.BR host , +.BR port , and .BR width . For example, an entry in a @@ -182,7 +184,11 @@ measured and reported per query. \fB\-\-user\fP\fB=\fP\fIuser\fP (\fB\-u\fP \fIuser\fP) Specify the user to connect as. If this flag is absent, the client will ask for a user name, unless a -default was found in .monetdb file. +default was found in the +.I .monetdb +or +.B $DOTMONETDBFILE +file. .TP \fB\-\-format=\fP\fIformat\fP (\fB\-f\fP \fIformat\fP) Specify the output format. @@ -194,29 +200,34 @@ The possible values are .BR tab , .BR raw , .BR xml , +.BR trash , and -.BR trash . +.BR rowcount . .B csv -is comma-separated values, +is comma-separated values; .B tab -is tab-separated values, +is tab-separated values; .B raw is no special formatting (data is dumped the way the server sends it -to the client), +to the client); .B sql is a pretty format which is meant for human consumption where columns -are clearly shown, +are clearly shown; .B expanded and .B x are synonyms and are another pretty format meant for human consumption -where column values are printed in full and below each other, +where column values are printed in full and below each other; .B xml -is a valid (in the XML sense) document, -and +is a valid (in the XML sense) document; .B trash does not render any output, enabling performance measurements free of any -output rendering/serialization costs. +output rendering/serialization costs; +and +.B rowcount +is a variation on +.B trash +where only the number of affected rows is printed. In addition to plain \fBcsv\fP, two other forms are possible. \fBcsv=\f
MonetDB: scoping - Merged with default
Changeset: 60b08bfdf6e9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60b08bfdf6e9
Added Files:
sql/test/Triggers/Tests/trigger_projection.sql.src
sql/test/Triggers/Tests/trigger_projection.stable.err
sql/test/Triggers/Tests/trigger_projection.stable.out
sql/test/Triggers/trigger_projection.sql
Removed Files:
sql/test/miscellaneous/Tests/trigger_projection.sql
sql/test/miscellaneous/Tests/trigger_projection.stable.err
sql/test/miscellaneous/Tests/trigger_projection.stable.out
Modified Files:
configure.ag
monetdb5/extras/rapi/rapi.c
monetdb5/modules/mal/mkey.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_user.c
sql/test/Triggers/Tests/All
sql/test/Triggers/run.all
sql/test/Users/Tests/createUserRollback.SQL.py
sql/test/Users/Tests/createUserRollback.stable.err
sql/test/Users/Tests/createUserRollback.stable.out
sql/test/miscellaneous/Tests/All
testing/Mtest.py.in
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 641 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -856,7 +856,7 @@ AS_CASE([$enable_optimize], [yes], [
# -finline-functions, -funswitch-loops,
# -fpredictive-commoning, -fgcse-after-reload,
# -ftree-vectorize and -fipa-cp-clone
- CFLAGS="-O3 -fomit-frame-pointer -pipe ${CFLAGS}"
+ CFLAGS="-O2 -fomit-frame-pointer -pipe ${CFLAGS}"
# because we explicitly disable debugging, we can
explicitly
# enable -fomit-frame-pointer here
# notes on -funroll-all-loops:
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -30,6 +30,7 @@
#define USE_RINTERNALS 1
+#include
#include
#include
#include
@@ -110,25 +111,34 @@ static char *RAPIinitialize(void) {
// set some command line arguments
{
structRstart rp;
- Rstart Rp = &rp;
- char *rargv[] = { "R", "--slave", "--vanilla" };
+ char *rargv[] = { "R",
+#if R_VERSION >= R_Version(4,0,0)
+ "--no-echo",
+#else
+ "--slave",
+#endif
+ "--vanilla" };
int stat = 0;
- R_DefParams(Rp);
- Rp->R_Slave = (Rboolean) TRUE;
- Rp->R_Quiet = (Rboolean) TRUE;
- Rp->R_Interactive = (Rboolean) FALSE;
- Rp->R_Verbose = (Rboolean) FALSE;
- Rp->LoadSiteFile = (Rboolean) FALSE;
- Rp->LoadInitFile = (Rboolean) FALSE;
- Rp->RestoreAction = SA_NORESTORE;
- Rp->SaveAction = SA_NOSAVE;
- Rp->NoRenviron = TRUE;
+ R_DefParams(&rp);
+#if R_VERSION >= R_Version(4,0,0)
+ rp.R_NoEcho = (Rboolean) TRUE;
+#else
+ rp.R_Slave = (Rboolean) TRUE;
+#endif
+ rp.R_Quiet = (Rboolean) TRUE;
+ rp.R_Interactive = (Rboolean) FALSE;
+ rp.R_Verbose = (Rboolean) FALSE;
+ rp.LoadSiteFile = (Rboolean) FALSE;
+ rp.LoadInitFile = (Rboolean) FALSE;
+ rp.RestoreAction = SA_NORESTORE;
+ rp.SaveAction = SA_NOSAVE;
+ rp.NoRenviron = TRUE;
stat = Rf_initialize_R(2, rargv);
if (stat < 0) {
return "Rf_initialize failed";
}
- R_SetParams(Rp);
+ R_SetParams(&rp);
}
/* disable stack checking, because threads will throw it off */
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -17,40 +17,29 @@
#include "monetdb_config.h"
#include "mkey.h"
-#define MKEYHASH_bte(valp) ((lng) *(const bte*)(valp))
-#define MKEYHASH_sht(valp) ((lng) *(const sht*)(valp))
-#define MKEYHASH_int(valp) ((lng) *(const int*)(valp))
-#define MKEYHASH_lng(valp) ((lng) *(const lng*)(valp))
+#define MKEYHASH_bte(valp) ((ulng) (lng) *(const bte*)(valp))
+#define MKEYHASH_sht(valp) ((ulng) (lng) *(const sht*)(valp))
+#define MKEYHASH_int(valp) ((ulng) (lng) *(const int*)(valp))
+#define MKEYHASH_lng(valp) ((ulng) (lng) *(const lng*)(valp))
#ifdef HAVE_HGE
-#define MKEYHASH_hge(valp) (((const lng*)(valp))[0] ^ ((const
lng*)(valp))[1])
+#define MKEYHASH_hge(valp) ((ulng) (*(const uhge *)(valp) >> 64) ^ \
+(ulng) *(const uhge
*)(valp))
#endif
-static inline lng
-GDK_ROTATE(lng x, int y, int z
MonetDB: scoping - Merged with default
Changeset: 08348eefa521 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08348eefa521 Added Files: buildtools/selinux/ChangeLog.Jun2020 sql/test/Users/Tests/createUserRollback.SQL.py sql/test/Users/Tests/createUserRollback.stable.err sql/test/Users/Tests/createUserRollback.stable.out Modified Files: clients/Tests/exports.stable.out gdk/gdk_atoms.h gdk/gdk_batop.c gdk/gdk_utils.h monetdb5/optimizer/opt_mergetable.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_select.c sql/server/rel_updates.c sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out sql/test/Users/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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 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/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 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 Branch: scoping Log Message: Merged with default diffs (truncated from 1378 to 300 lines): diff --git a/buildtools/selinux/ChangeLog.Jun2020 b/buildtools/selinux/ChangeLog.Jun2020 new file mode 100644 --- /dev/null +++ b/buildtools/selinux/ChangeLog.Jun2020 @@ -0,0 +1,10 @@ +# ChangeLog file for selinux +# This file is updated with Maddlog + +* Wed May 6 2020 Sjoerd Mullender +- There was a problem with the MonetDB SELinux support on Fedora 32. + That is fixed in this release. In order to do a proper upgrade of + the package if you have already installed MonetDB-selinux on Fedora + 32, you may need to uninstall (dnf remove) the old package and then + install the new. + 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 @@ -14,7 +14,7 @@ char *ATOMformat(int id, const void *val int ATOMindex(const char *nme); size_t ATOMlen(int id, const void *v); str ATOMname(int id); -void *ATOMnil(int id); +void *ATOMnil(int id) __attribute__((__malloc__)); int ATOMprint(int id, const void *val, stream *fd); gdk_return BATappend(BAT *b, BAT *n, BAT *s, bool force) __attribute__((__warn_unused_result__)); void BATassertProps(BAT *b); @@ -299,8 +299,8 @@ gdk_return GDKsetenv(const char *name, c void GDKsetmallocsuccesscount(lng count); void GDKsetverbose(int verbosity); ssize_t GDKstrFromStr(unsigned char *restrict dst, const unsigned char *restrict src, ssize_t len); -str GDKstrdup(const char *s) __attribute__((__warn_unused_result__)); -str GDKstrndup(const char *s, size_t n) __attribute__((__warn_unused_result__)); +str GDKstrdup(const char *s) __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +str GDKstrndup(const char *s, size_t n) __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_level); gdk_return GDKtracer_flush_buffer(void); const char *GDKtracer_get_component_level(const char *comp); diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h --- a/gdk/gdk_atoms.h +++ b/gdk/gdk_atoms.h @@ -68,7 +68,8 @@ gdk_export int ATOMindex(const char *nme gdk_export str ATOMname(int id); gdk_export size_t ATOMlen(int id, const void *v); -gdk_export void *ATOMnil(int id); +gdk_export void *ATOMnil(
MonetDB: scoping - Merged with default
Changeset: a5078eaeaabe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5078eaeaabe
Added Files:
sql/test/miscellaneous/Tests/trigger_projection.sql
sql/test/miscellaneous/Tests/trigger_projection.stable.err
sql/test/miscellaneous/Tests/trigger_projection.stable.out
sql/test/subquery/Tests/subquery6.sql
sql/test/subquery/Tests/subquery6.stable.err
sql/test/subquery/Tests/subquery6.stable.out
Modified Files:
MonetDB.spec
buildtools/selinux/monetdb.te
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
gdk/ChangeLog.Jun2020
gdk/gdk.h
gdk/gdk_calc.c
gdk/gdk_cross.c
gdk/gdk_heap.c
monetdb5/ChangeLog.Jun2020
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/mal/mkey.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_user.c
sql/benchmarks/tpcds/Tests/alter.timeout
sql/include/sql_relation.h
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err
sql/test/BugTracker-2008/Tests/is_distinct_broken.SF-2430201.stable.err
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err
sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
sql/test/analytics/Tests/analytics11.stable.err
sql/test/miscellaneous/Tests/All
sql/test/subquery/Tests/All
sql/test/subquery/Tests/all.stable.out
sql/test/subquery/Tests/any.stable.out
sql/test/subquery/Tests/any_all.stable.out
sql/test/subquery/Tests/correlated.stable.err
sql/test/subquery/Tests/correlated.stable.out
sql/test/subquery/Tests/exists.stable.out
sql/test/subquery/Tests/scalar.stable.out
sql/test/subquery/Tests/subquery.stable.err
sql/test/subquery/Tests/subquery.stable.out
sql/test/subquery/Tests/subquery2.stable.err
sql/test/subquery/Tests/subquery2.stable.out
sql/test/subquery/Tests/subquery3.stable.err
sql/test/subquery/Tests/subquery3.stable.out
sql/test/subquery/Tests/subquery4.stable.err
sql/test/subquery/Tests/subquery4.stable.out
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
sql/test/subquery/Tests/subquery5.stable.out
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 5059 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -510,6 +510,9 @@ Suggests: %{name}-client%{?_isa} = %{ver
%endif
# versions up to 1.0.5 don't accept the queryid field in the result set
Conflicts: python-pymonetdb < 1.0.6
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+Requires(pre): systemd
+%endif
%description -n MonetDB5-server
MonetDB is a database management system that is developed from a
@@ -522,12 +525,14 @@ package if you want to use the MonetDB d
to use the SQL front end, you also need %{name}-SQL-server5.
%pre -n MonetDB5-server
+%{?sysusers_create_package:echo 'u monetdb - "MonetDB Server"
/var/lib/monetdb' | systemd-sysusers --replace=%_sysusersdir/monetdb.conf -}
+
getent group monetdb >/dev/null || groupadd --system monetdb
if getent passwd monetdb >/dev/null; then
case $(getent passwd monetdb | cut -d: -f6) in
%{_localstatedir}/MonetDB) # old value
# change home directory, but not using usermod
- # usermod requires there not to be any running processes owned by the
user
+ # usermod require
MonetDB: scoping - Merged with default
Changeset: 8234f80f9c86 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8234f80f9c86
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_analytic_func.c
monetdb5/modules/kernel/algebra.c
sql/test/analytics/Tests/analytics16.sql
sql/test/analytics/Tests/analytics16.stable.err
sql/test/analytics/Tests/analytics16.stable.out
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 410 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3135,6 +3135,8 @@ BATgroupquantile_avg(BAT *b, BAT *g, BAT
delta = (dbl) x - mean; \
mean += delta / n; \
m2 += delta * ((dbl) x - mean); \
+ if (isinf(m2)) \
+ goto overflow; \
} \
} while (0)
@@ -3182,6 +3184,9 @@ calcvariance(dbl *restrict avgp, const v
if (avgp)
*avgp = mean;
return m2 / (n - issample);
+ overflow:
+ GDKerror("22003!overflow in calculation.\n");
+ return dbl_nil;
}
dbl
@@ -3250,6 +3255,8 @@ BATcalcvariance_sample(dbl *avgp, BAT *b
delta2 = (dbl) y - mean2; \
mean2 += delta2 / n;\
m2 += delta1 * ((dbl) y - mean2); \
+ if (isinf(m2)) \
+ goto overflow; \
} \
} while (0)
@@ -3290,6 +3297,9 @@ calccovariance(const void *v1, const voi
if (n <= (BUN) issample)
return dbl_nil;
return m2 / (n - issample);
+ overflow:
+ GDKerror("22003!overflow in calculation.\n");
+ return dbl_nil;
}
dbl
@@ -3335,6 +3345,8 @@ BATcalccovariance_sample(BAT *b1, BAT *b
up += delta1 * aux; \
down1 += delta1 * ((dbl) x - mean1);\
down2 += delta2 * aux; \
+ if (isinf(up) || isinf(down1) || isinf(down2))
\
+ goto overflow; \
} \
} while (0)
@@ -3385,6 +3397,9 @@ BATcalccorrelation(BAT *b1, BAT *b2)
TRC_DEBUG(ALGO, "b1=" ALGOBATFMT ",b2=" ALGOBATFMT " (" LLFMT "
usec)\n",
ALGOBATPAR(b1), ALGOBATPAR(b2), GDKusec() - t0);
return aux;
+ overflow:
+ GDKerror("22003!overflow in calculation.\n");
+ return dbl_nil;
}
#define AGGR_STDEV(TYPE) \
@@ -3418,6 +3433,8 @@ BATcalccorrelation(BAT *b1, BAT *b2)
} else if (cnts[i] == 1) { \
dbls[i] = issample ? dbl_nil : 0; \
nils2++;\
+ } else if (isinf(m2[i])) { \
+ goto overflow; \
} else if (variance) { \
dbls[i] = m2[i] / (cnts[i] - issample); \
} else {\
@@ -3588,7 +3605,8 @@ dogroupstdev(BAT **avgb, BAT *b, BAT *g,
ALGOOPTBATPAR(bn), ALGOOPTBATPAR(an),
func, GDKusec() - t0);
return bn;
-
+ overflow:
+ GDKerror("22003!overflow in calculation.\n");
alloc_fail:
if (an)
BBPreclaim(an);
@@ -3670,6 +3688,8 @@ BATgroupvariance_population(BAT *b, BAT
} else if (cnts[i] == 1) { \
dbls[i] = issample ? dbl_nil : 0; \
nils2++;\
+ } else if (isinf(m2[i])) { \
+ goto overflow; \
} else {\
dbls[i] = m2[i] / (cnts[i] - issample); \
} \
@@ -3808,6 +3828,8 @@ dogroupcovariance(BAT *b1, BAT *b2, BAT
ALGOOPTBATPAR(bn),
func, GDKusec() - t0);
return bn;
+ overflow:
+ GDKerror("22003!overflow in calculation.\n");
alloc_fail:
BBPreclaim(bn);
GDKfree(mean1);
@@ -3868,6 +3890,8 @@ BATgroupcovariance_population(BAT *b1, B
MonetDB: scoping - Merged with default
Changeset: 6edf3edd7f66 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6edf3edd7f66 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out configure.ag gdk/ChangeLog.Jun2020 gdk/gdk.h gdk/gdk_firstn.c gdk/gdk_join.c monetdb5/ChangeLog.Jun2020 monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal sql/backends/monet5/sql.c sql/backends/monet5/sql_statement.c sql/server/rel_distribute.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_propagate.c sql/server/rel_rel.c sql/server/sql_env.c sql/server/sql_env.h sql/server/sql_partition.c sql/storage/bat/bat_logger.c sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Tests/truncate-statements-extra.stable.out sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.err sql/test/scoping/Tests/scoping02.stable.err sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Branch: scoping Log Message: Merged with default diffs (truncated from 2185 to 300 lines): 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 @@ -591,7 +591,7 @@ stdout of test 'MAL-signatures` in direc [ "algebra", "ilikejoin","command algebra.ilikejoin(l:bat[:str], r:bat[:str], esc:str, sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng) (X_0:bat[:oid], X_1:bat[:oid]) ", "ILIKEjoin;", "Join the string bat L with the pattern bat R\nwith optional candidate lists SL and SR using pattern escape string ESC\nand doing a case insensitive match.\nThe result is two aligned bats with oids of matching rows."] [ "algebra", "ilikeselect", "command algebra.ilikeselect(b:bat[:str], cand:bat[:oid], pat:str, esc:str, anti:bit):bat[:oid] ", "PCRElikeselect1;", "" ] [ "algebra", "ilikeselect", "command algebra.ilikeselect(b:bat[:str], cand:bat[:oid], pat:str, anti:bit):bat[:oid] ", "PCRElikeselect4;", "" ] -[ "algebra", "intersect","command algebra.intersect(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng):bat[:oid] ","ALGintersect;","Intersection of l and r with candidate lists (i.e. half of semi-join)" ] +[ "algebra", "intersect","command algebra.intersect(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, max_one:bit, estimate:lng):bat[:oid] ", "ALGintersect;","Intersection of l and r with candidate lists (i.e. half of semi-join)" ] [ "algebra", "join", "command algebra.join(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng):bat[:oid] ", "ALGjoin1;","Join; only produce left output"] [ "algebra", "join", "command algebra.join(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng) (X_0:bat[:oid], X_1:bat[:oid]) ","ALGjoin;", "Join" ] [ "algebra", "leftjoin", "command algebra.leftjoin(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng):bat[:oid] ", "ALGleftjoin1;","Left join with candidate lists; only produce left output" ] @@ -620,7 +620,7 @@ stdout of test 'MAL-signatures` in direc [ "algebra", "select", "command algebra.select(b:bat[:any_1], s:bat[:oid], low:any_1, high:any_1, li:bit, hi:bit, anti:bit):bat[:oid] ", "ALGselect2;", "Select all head values of the first input BAT for which the tail value\n\tis in range and for which the head value occurs in the tail of the\n\tsecond input BAT.\n\tThe first input is a dense-headed BAT, the second input is a\n\tdense-headed BAT with sorted tail, output is a dense-headed BAT\n\twith in the tail the head value of the input BAT for which the\n\ttail value is between the values low and high (inclusive if li\n\trespectively hi is set). The output BAT is sorted on the tail\n\tvalue. If low or high is nil, the boundary is not considered\n\t(effectively - and + infinity). If anti
MonetDB: scoping - Merged with default
Changeset: 69f5c8e3cb5d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69f5c8e3cb5d
Added Files:
sql/test/miscellaneous/Tests/simple_plans.sql
sql/test/miscellaneous/Tests/simple_plans.stable.err
sql/test/miscellaneous/Tests/simple_plans.stable.out
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/mhelp.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
monetdb5/mal/mal_import.c
monetdb5/optimizer/opt_mergetable.c
sql/ChangeLog.Jun2020
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/25_debug.sql
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_rewriter.c
sql/server/rel_rewriter.h
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/rel_unnest.h
sql/server/rel_updates.c
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/bool_boolean.SF-935601.stable.out
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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
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/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/mergetables/Tests/sqlsmith-exists2.sql
sql/test/mergetables/Tests/sqlsmith-exists2.stable.out
sql/test/miscellaneous/Tests/All
sql/test/miscellaneous/Tests/column_aliases.sql
sql/test/miscellaneous/Tests/column_aliases.stable.err
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/subquery/Tests/subquery3.sql
sql/test/subquery/Tests/subquery3.stable.err
sql/test/subquery/Tests/subquery3.stable.out
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
sql/test/subquery/Tests/subquery5.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
sql/test/testdb-reload/Tests/reload.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/dump.stable.out
sql/test/testdb/Tests/load.sql
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/control.c
tools/merovingian/utils/control.h
tools/merovingian/utils/properties.c
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 7496 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2018,12 +2018,20 @@ dump_function(Mapi mid, stream *toConsol
sep = "";
while (mapi_fetch_row(hdl) != 0) {
const char *aname = mapi_fetch_field(hdl, 0);
- char *atype = strdup(mapi_fetch_field(hdl, 1));
- char *adigs = strdup(mapi_fetch_field(hdl, 2));
- char *ascal = strdup(mapi_fetch_field(hdl, 3));
+ char *atype = mapi_fetch_field(hdl, 1);
+ char *adigs = mapi_fetch_field(hdl, 2);
+
MonetDB: scoping - Merged with default
Changeset: e89ea96de1fd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e89ea96de1fd Added Files: clients/odbc/ChangeLog.Jun2020 Modified Files: ChangeLog.Jun2020 MonetDB.spec clients/ChangeLog.Jun2020 clients/odbc/driver/ODBCUtil.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c common/stream/stream.h common/utils/mstring.h gdk/ChangeLog.Jun2020 gdk/gdk_aggr.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_cand.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_join.c gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_tracer.c gdk/gdk_unique.c monetdb5/ChangeLog.Jun2020 sql/ChangeLog.Jun2020 sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_upgrades.c sql/common/sql_changeset.c sql/common/sql_hash.c sql/common/sql_keyword.c sql/common/sql_list.c sql/common/sql_mem.c sql/common/sql_stack.c sql/include/sql_mem.h sql/include/sql_relation.h sql/rel.txt sql/scripts/51_sys_schema_extension.sql sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_prop.c sql/server/rel_propagate.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_partition.c sql/server/sql_qc.c sql/storage/store_sequence.c sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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 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/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/mergetables/Tests/sqlsmith-exists.stable.out sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.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 tools/merovingian/client/monetdb.c tools/merovingian/daemon/forkmserver.c Branch: scoping Log Message: Merged with default diffs (truncated from 34084 to 300 lines): diff --git a/ChangeLog.Jun2020 b/ChangeLog.Jun2020 --- a/ChangeLog.Jun2020 +++ b/ChangeLog.Jun2020 @@ -1,12 +1,18 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Tue Feb 18 2020 Thodoris Zois -- Added mserver5 option (--dbtrace=) in order to be able to - specify the output directory of the produced traces. - -* Thu Feb 6 2020 Panagiotis Koutsourakis -- Add port and host as fields in the .monetdb file. +* Mon Apr 20 2020 Sjoerd Mullender +- A new system to deal with debug output has been implemented. There is + now an option --dbtrace to mserver5 that takes a file argument to which + debug output is written. The default value is the file mdbtrace.log + inside the database directory. This
MonetDB: scoping - Merged with default
Changeset: 32b67134acf3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32b67134acf3
Modified Files:
MonetDB.spec
buildtools/conf/monetdbd.conf
buildtools/selinux/monetdb.fc
buildtools/selinux/monetdb.te
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
debian/control
debian/monetdb5-server.dirs
debian/monetdb5-server.postinst
debian/monetdb5-sql.install
debian/monetdb5-sql.postinst
gdk/gdk_system.h
gdk/gdk_tracer.c
gdk/gdk_tracer.h
gdk/gdk_utils.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/mal/mdb.c
rpm.mk.in
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_rel.c
sql/server/rel_updates.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.stable.out
sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.sql
sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.stable.out
sql/test/Tests/hot-snapshot.py
sql/test/VOC/Tests/median.Bug-3096.stable.out
sql/test/bugs/Tests/default_with_cast.SF-1334486.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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
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/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/json/Tests/All
sql/test/json/Tests/jsonvalidity.Bug-3753.sql
sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out
sql/test/pg_regress/Tests/date.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
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/dump-nogeom.stable.out
tools/merovingian/ChangeLog.Jun2020
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 2626 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -107,11 +107,14 @@ URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
Source:
https://www.monetdb.org/downloads/sources/Nov2019-SP3/%{name}-%{version}.tar.bz2
-# we need systemd for the _unitdir macro to exist
-# we need checkpolicy and selinux-policy-devel for the SELinux policy
+# The Fedora packaging document says we need systemd-rpm-macros for
+# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
+# that doesn't exist and we need systemd, so instead we just require
+# the macro file that contains the definitions.
+# We need checkpolicy and selinux-policy-devel for the SELinux policy.
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
# RHEL >= 7, and all current Fedora
-BuildRequires: systemd
+BuildRequires: /usr/lib/rpm/macros.d/macros.systemd
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
@@ -519,15 +522,27 @@ package if you want to use the MonetDB d
to use the SQL front end, you also need %{name}-SQL-server5.
%pre -n MonetDB5-server
-getent group monetdb >/dev/null || groupadd -r monetdb
-getent passwd monetdb >/dev/null || \
-useradd -r -g monetdb -d %{_localstatedir}/MonetDB -s /sbin/nologin \
- -c "MonetDB Server" monetdb
+getent group monetdb >/dev/null || groupadd --system monetdb
+if getent passwd monetdb >/dev
MonetDB: scoping - Merged with default
Changeset: b32a1e7975d7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b32a1e7975d7 Added Files: sql/test/analytics/Tests/analytics18.sql sql/test/analytics/Tests/analytics18.stable.err sql/test/analytics/Tests/analytics18.stable.out Modified Files: clients/ChangeLog.Jun2020 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapilib/mapi.c common/utils/mcrypt.c common/utils/mcrypt.h configure.ag gdk/gdk_calc.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_client.c monetdb5/mal/mal_runtime.c monetdb5/modules/mal/querylog.c monetdb5/optimizer/opt_mitosis.c sql/ChangeLog.Jun2020 sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_orderidx.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_session.mal sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_transaction.mal sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_upgrades.h sql/scripts/25_debug.sql sql/scripts/58_hot_snapshot.sql sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_sequence.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/rel_updates.h sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/analytics/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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 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/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/sample/Tests/sample.15.stable.out sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.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 testing/Mtest.py.in tools/merovingian/daemon/argvcmds.c tools/merovingian/utils/control.c Branch: scoping Log Message: Merged with default diffs (truncated from 7410 to 300 lines): diff --git a/clients/ChangeLog.Jun2020 b/clients/ChangeLog.Jun2020 --- a/clients/ChangeLog.Jun2020 +++ b/clients/ChangeLog.Jun2020 @@ -1,6 +1,11 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Thu Apr 16 2020 Sjoerd Mullender +- Removed the possibility of using the MD5 checksum for authentication + purposes. It was never actively used but was there as an option. + Now the option has been removed. + * Fri Oct 25 2019 Pedro Ferreira - Added 'sessionid' column to system function sys.queue(), so each query gets tagged with the current session identifier 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 @@ -11357,9 +11357,9 @@ stdout of test 'MAL-signatures` in direc [ "batsql","lead", "pattern batsql.lead(b:bat[:any_1], p:any_3, o:any_4):bat[:any_1] ","SQLlead;", "return the value in the next row in the partition or NULL if non existent" ] [ "batsql","max", "pattern batsql.max(b:bat[:any_1], s:bat[:lng], e:bat[:lng]):bat[:any_1] ", "SQLmax;", "return the maximum of groups" ] [ "batsql","min", "pattern batsql.min(b:bat[:any_1],
MonetDB: scoping - Merged with default
Changeset: 5551b6da3006 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5551b6da3006
Modified Files:
MonetDB.spec
NT/Makefile
NT/rules.msc
NT/winconfig.py
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
debian/changelog
sql/ChangeLog.Jun2020
sql/backends/monet5/sql_upgrades.c
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/server/sql_tokens.h
sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.sql
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
testing/Mtest.py.in
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 638 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -5062,20 +5062,20 @@ fi
* Fri May 13 2011 Sjoerd Mullender - 11.3.3-20110517
- gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on
-Windows.
+ Windows.
* Wed May 11 2011 Fabian Groffen - 11.3.3-20110517
- java: Insertion via PreparedStatement and retrieval via ResultSet of
timestamp
-and time fields with and without timezones was improved to better
-respect timezones, as partly indicated in bug #2781.
+ and time fields with and without timezones was improved to better
+ respect timezones, as partly indicated in bug #2781.
* Wed May 11 2011 Sjoerd Mullender - 11.3.3-20110517
- monetdb5: Fixed a bug in conversion from string to the URL type. The bug was
-an incorrect call to free().
+ an incorrect call to free().
* Wed Apr 27 2011 Sjoerd Mullender - 11.3.3-20110517
- geom: Fixed various problems so that now all our tests work correctly on
-all our testing platforms.
+ all our testing platforms.
* Thu Apr 21 2011 Sjoerd Mullender - 11.3.1-20110421
- Rebuilt.
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -64,7 +64,6 @@ targetdirs:
if not exist "$(libexecdir)"$(MKDIR) "$(libexecdir)"
if not exist "$(datadir)" $(MKDIR) "$(datadir)"
if not exist "$(sysconfdir)"$(MKDIR) "$(sysconfdir)"
- if not exist "$(sharedstatedir)"$(MKDIR) "$(sharedstatedir)"
if not exist "$(localstatedir)" $(MKDIR) "$(localstatedir)"
if not exist "$(libdir)"$(MKDIR) "$(libdir)"
if not exist "$(infodir)" $(MKDIR) "$(infodir)"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -218,7 +218,6 @@ sbindir = $(exec_prefix)\sbin
libexecdir = $(exec_prefix)\libexec
datadir = $(prefix)\share
sysconfdir = $(prefix)\etc
-sharedstatedir = $(prefix)\com
localstatedir = $(prefix)\var
libdir = $(exec_prefix)\lib
infodir = $(prefix)\info
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -18,7 +18,6 @@ subs = [("@exec_prefix@", r'%prefix%'),
("@datadir@", r'%prefix%\share'),
("@datarootdir@", r'%prefix%\share'),
("@sysconfdir@", r'%prefix%\etc'),
-("@sharedstatedir@", r'%prefix%\com'),
("@localstatedir@", r'%prefix%\var'),
("@libdir@", r'%exec_prefix%\lib'),
("@infodir@", r'%prefix%\info'),
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -853,7 +853,7 @@ def am_translate_dir(path, am):
'libdir', 'libexecdir', 'localstatedir', 'mandir',
'oldincludedir', 'pkgbindir', 'pkgdatadir', 'pkgincludedir',
'pkglibdir', 'pkglocalstatedir', 'pkgsysconfdir', 'sbindir',
- 'sharedstatedir', 'srcdir', 'sysconfdir', 'top_builddir',
+ 'srcdir', 'sysconfdir', 'top_builddir',
'top_srcdir', 'prefix'):
dir = "$("+dir+")"
dir = dir + rest
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -147,7 +147,7 @@ def msc_translate_dir(path, msc):
'libdir', 'libexecdir', 'localstatedir', 'mandir',
'oldincludedir', 'pkgbindir', 'pkgdatadir', 'pkgincludedir',
'pkglibdir', 'pkglocalstatedir', 'pkgsysconfdir', 'sbindir',
- 'sharedstatedir', 'srcdir', 'sysconfdir', 'top_builddir',
+ 'srcdir', 'sysconfdir', 'top_builddir',
'top_srcdir', 'prefix'):
dir = "$("+dir+")"
if rest:
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -5846,29 +5846,29 @
MonetDB: scoping - Merged with default
Changeset: fc86c78da595 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc86c78da595
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_orderidx.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/tablet.c
sql/backends/monet5/mal_backend.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.c
sql/common/sql_types.c
sql/server/rel_exp.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/sql_atom.c
sql/server/sql_partition.c
sql/server/sql_query.c
sql/server/sql_semantic.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/Tests/hot-snapshot.py
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
sql/test/subquery/Tests/subquery5.stable.out
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 879 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1709,7 +1709,7 @@ typedef struct threadStruct {
* into this array + 1 (0 is
* invalid) */
ATOMIC_TYPE pid;/* thread id, 0 = unallocated */
- char name[16];
+ char name[MT_NAME_LEN];
void *data[THREADDATA];
uintptr_t sp;
} *Thread;
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -121,7 +121,7 @@ BATcreatedesc(oid hseq, int tt, bool hea
bn->tvheap->parentid = bn->batCacheid;
bn->tvheap->farmid = BBPselectfarm(role, bn->ttype, varheap);
}
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "BATlock%d", bn->batCacheid); /* fits */
MT_lock_init(&bn->batIdxLock, name);
bn->batDirtydesc = true;
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -910,7 +910,7 @@ BBPreadEntries(FILE *fp, unsigned bbpver
bn->batCount = (BUN) count;
bn->batInserted = bn->batCount;
bn->batCapacity = (BUN) capacity;
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "BATlock%d", bn->batCacheid); /*
fits */
MT_lock_init(&bn->batIdxLock, name);
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -957,7 +957,7 @@ BAThash(BAT *b)
if (BBP_status(b->batCacheid) & BBPEXISTING && !b->theap.dirty
&& !GDKinmemory()) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "hashsync%d",
b->batCacheid);
MT_lock_unset(&b->batIdxLock);
if (MT_create_thread(&tid, BAThashsync, b,
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -534,7 +534,7 @@ BATimprints(BAT *b)
!GDKinmemory()) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "impssync%d",
b->batCacheid);
if (MT_create_thread(&tid, BATimpsync, b,
MT_THR_DETACHED, name) < 0)
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -169,7 +169,7 @@ persistOIDX(BAT *b)
!GDKinmemory()) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "oidxsync%d", b->batCacheid);
if (MT_create_thread(&tid, BATidxsync, b,
MT_THR_DETACHED, name) < 0)
@@ -479,7 +479,7 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
b->batInserted == b->batCount) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "oidxsync%d", b->batCacheid);
if (MT_create_thread(&tid, BATidxsync, b,
MT_THR_DETACHED, name) < 0)
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
MonetDB: scoping - Merged with default
Changeset: 0461e2869d91 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0461e2869d91
Modified Files:
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/rel_unnest.h
sql/test/Tests/hot-snapshot.py
sql/test/subquery/Tests/subquery3.stable.err
sql/test/subquery/Tests/subquery5.stable.err
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 329 to 300 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1194,7 +1194,7 @@ rel_column_ref(sql_query *query, sql_rel
if (exp)
break;
}
- if (exp && outer && outer->card <= CARD_AGGR &&
exp->card > CARD_AGGR && (!is_sql_aggr(f) || is_sql_farg(f)))
+ if (exp && outer && outer->card <= CARD_AGGR &&
exp->card > CARD_AGGR && !is_sql_aggr(f))
return sql_error(sql, ERR_GROUPBY,
SQLSTATE(42000) "SELECT: cannot use non GROUP BY column '%s' in query results
without an aggregate function", name);
if (exp && outer && !is_sql_aggr(f)) {
if (query_outer_used_exp( query, i, exp, f)) {
@@ -1258,7 +1258,7 @@ rel_column_ref(sql_query *query, sql_rel
if (exp)
break;
}
- if (exp && outer && outer->card <= CARD_AGGR &&
exp->card > CARD_AGGR && (!is_sql_aggr(f) || is_sql_farg(f)))
+ if (exp && outer && outer->card <= CARD_AGGR &&
exp->card > CARD_AGGR && !is_sql_aggr(f))
return sql_error(sql, ERR_GROUPBY,
SQLSTATE(42000) "SELECT: cannot use non GROUP BY column '%s.%s' in query
results without an aggregate function", tname, cname);
if (exp && outer && !is_sql_aggr(f)) {
if (query_outer_used_exp( query, i, exp, f)) {
@@ -3358,14 +3358,16 @@ static sql_exp *
exps = sa_list(sql->sa);
if (args && args->data.sym) {
- int ungrouped_col = -1, i, all_aggr = query_has_outer(query);
+ int i, all_aggr = query_has_outer(query);
+ bool found_nested_aggr = false;
+ list *ungrouped_cols = NULL;
+
all_freevar = 1;
- bool found_nested_aggr = false;
for (i = 0; args && args->data.sym; args = args->next, i++) {
int base = (!groupby || !is_project(groupby->op) ||
is_base(groupby->op) || is_processed(groupby));
- bool found_one = false;
- sql_rel *outer = NULL, *gl = base?groupby:groupby->l,
*ogl = gl; /* handle case of subqueries without correlation */
- sql_exp *e = rel_value_exp(query, &gl, args->data.sym,
(f | sql_aggr)& ~sql_farg, ek), *a = NULL;
+ sql_rel *gl = base?groupby:groupby->l, *ogl = gl; /*
handle case of subqueries without correlation */
+ sql_exp *e = rel_value_exp(query, &gl, args->data.sym,
(f | sql_aggr)& ~sql_farg, ek);
+ bool found_one_freevar = false;
has_args = true;
if (gl && gl != ogl) {
@@ -3393,38 +3395,15 @@ static sql_exp *
return e;
}
- if (is_freevar(e) && e->type == e_column) {
- if ((outer = query_fetch_outer(query,
is_freevar(e)-1))) {
- if ((a = rel_find_exp(outer, e)) &&
is_aggr(a->type))
- return sql_error(sql, 05,
SQLSTATE(42000) "SELECT: aggregate function calls cannot be nested");
- }
- }
-
- if (all_aggr) {
- /* get expression from outer */
- int aggr = 0;
- if (a)
- aggr = is_aggr(a->type);
- else if (outer && outer->grouped)
- ungrouped_col = i;
- all_aggr &= aggr;
- } else {
- all_aggr &= (exp_card(e) <= CARD_AGGR &&
!exp_is_atom(e) && is_aggr(e->type) && !is_func(e->type) && (!groupby ||
!is_groupby(groupby->op) || !groupby->r || !exps_find_exp(groupby->r, e)));
- }
- all_freevar &= (exp_only_freevar(query, e, &found_one,
&found_nested_aggr) && found_one);
+ all_aggr &= (exp_card(e) <= CARD_AGGR &&
!exp_is_atom(e) && is_aggr(e->type) && !is_func(e->type) && (!groupby ||
!is_groupby(groupby->op) || !
MonetDB: scoping - Merged with default
Changeset: c3987e3f4c33 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3987e3f4c33
Added Files:
sql/test/miscellaneous/Tests/create_func_temp.sql
sql/test/miscellaneous/Tests/create_func_temp.stable.err
sql/test/miscellaneous/Tests/create_func_temp.stable.out
Modified Files:
clients/examples/perl/sqlsample.pl
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/SQLPrepare.c
gdk/gdk_utils.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/rel_unnest.h
sql/server/sql_scan.c
sql/server/sql_scan.h
sql/storage/store.c
sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.sql
sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.sql
sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
sql/test/Tests/unicode.sql
sql/test/Tests/unicode.stable.out
sql/test/Users/Tests/copyinto.SQL.py
sql/test/Users/Tests/copyinto.stable.err
sql/test/mapi/Tests/perl_dbi.stable.out
sql/test/miscellaneous/Tests/All
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
sql/test/subquery/Tests/subquery5.stable.out
tools/merovingian/utils/utils.c
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 1715 to 300 lines):
diff --git a/clients/examples/perl/sqlsample.pl
b/clients/examples/perl/sqlsample.pl
--- a/clients/examples/perl/sqlsample.pl
+++ b/clients/examples/perl/sqlsample.pl
@@ -48,6 +48,9 @@ my $dbh = DBI->connect( $dsn,
$sth->bind_param( 1, 7 , DBI::SQL_INTEGER() );
$sth->bind_param( 2,'seven' );
$sth->execute;
+ $sth->bind_param( 1,42 , DBI::SQL_INTEGER() );
+ $sth->bind_param( 2, '\\n' );
+ $sth->execute;
}
{
my $sth = $dbh->prepare('select * from perl_table;');
diff --git a/clients/odbc/driver/ODBCConvert.c
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -3197,6 +3197,7 @@ ODBCStore(ODBCStmt *stmt,
case SQL_WCHAR:
case SQL_WVARCHAR:
case SQL_WLONGVARCHAR:
+ assign(buf, bufpos, buflen, 'r', stmt); /* RAW string */
assign(buf, bufpos, buflen, '\'', stmt);
switch (ctype) {
case SQL_C_CHAR:
@@ -3205,22 +3206,11 @@ ODBCStore(ODBCStmt *stmt,
for (i = 0; i < slen; i++) {
unsigned char c = (unsigned char) sval[i];
- if (c == 0) {
+ if (c == 0)
break;
- } else if (c < 0x20 /* || c >= 0x7F */) {
- assign(buf, bufpos, buflen, '\\', stmt);
- assign(buf, bufpos, buflen, '0' + (c >>
6), stmt);
- assign(buf, bufpos, buflen, '0' + ((c
>> 3) & 0x7), stmt);
- assign(buf, bufpos, buflen, '0' + (c &
0x7), stmt);
- } else if (c == '\\') {
- assign(buf, bufpos, buflen, '\\', stmt);
- assign(buf, bufpos, buflen, '\\', stmt);
- } else if (c == '\'') {
- assign(buf, bufpos, buflen, '\\', stmt);
+ if (c == '\'')
assign(buf, bufpos, buflen, '\'', stmt);
- } else {
- assign(buf, bufpos, buflen, c, stmt);
- }
+ assign(buf, bufpos, buflen, c, stmt);
}
break;
case SQL_C_BIT:
diff --git a/clients/odbc/driver/ODBCUtil.c b/clients/odbc/driver/ODBCUtil.c
--- a/clients/odbc/driver/ODBCUtil.c
+++ b/clients/odbc/driver/ODBCUtil.c
@@ -679,7 +679,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
length = (size_t) sprintf(q, "%.*s ESCAPE
%s", n, nquery, p);
break;
case '\\':
- length = (size_t) sprintf(q, "%.*s ESCAPE
'' %s", n, nquery, p);
+ length = (size_t) sprintf(q, "%.*s ESCAPE r
MonetDB: scoping - Merged with default
Changeset: cb95ef0cfd6f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb95ef0cfd6f
Modified Files:
gdk/gdk.h
gdk/gdk_analytic.h
geom/monetdb5/geom.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/mal_io.c
sql/backends/monet5/rel_bin.c
sql/server/sql_mvc.c
sql/server/sql_scan.c
sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql
sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err
sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.sql
sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.err
sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.out
sql/test/Tests/session_vars.sql
sql/test/Tests/session_vars.stable.err
sql/test/Tests/session_vars.stable.out
sql/test/miscellaneous/Tests/declared_tables.sql
sql/test/miscellaneous/Tests/declared_tables.stable.err
sql/test/pg_regress/Tests/timestamp.sql
sql/test/pg_regress/Tests/timestamptz.sql
sql/test/ssqq/Tests/insert_query.stable.err
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.err
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/Tests/insert_quser.stable.err
sql/test/ssqq/Tests/insert_quser.stable.out
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 587 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1928,10 +1928,6 @@ gdk_export int ALIGNsynced(BAT *b1, BAT
gdk_export void BATassertProps(BAT *b);
-#define BATPROPS_QUICK 0 /* only derive easy (non-resource consuming)
properties */
-#define BATPROPS_ALL 1 /* derive all possible properties; no matter
what cost (key=hash) */
-#define BATPROPS_CHECK 3 /* BATPROPS_ALL, but start from scratch and
report illegally set properties */
-
gdk_export BAT *VIEWcreate(oid seq, BAT *b);
gdk_export void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
diff --git a/gdk/gdk_analytic.h b/gdk/gdk_analytic.h
--- a/gdk/gdk_analytic.h
+++ b/gdk/gdk_analytic.h
@@ -14,8 +14,6 @@
#ifndef _GDK_ANALYTIC_H_
#define _GDK_ANALYTIC_H_
-#include "gdk.h"
-
gdk_export gdk_return GDKanalyticaldiff(BAT *r, BAT *b, BAT *p, int tpe);
gdk_export gdk_return GDKanalyticalntile(BAT *r, BAT *b, BAT *p, BAT *n, int
tpe, const void *restrict ntile);
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -1594,11 +1594,15 @@ dumpGeometriesSingle(BAT *idBAT, BAT *ge
snprintf(newPath, lvlDigitsNum + 1, "%u", *lvl);
} else {
//remove the comma at the end of the path
- newPath = GDKmalloc(pathLength
#ifdef STATIC_CODE_ANALYSIS
- + 1
+ /* coverity complains about the allocated space being
+* too small, but we just want to reduce the length of
+* the string by one, so the length in the #else part
+* is exactly what we need */
+ newPath = GDKmalloc(pathLength + 1);
+#else
+ newPath = GDKmalloc(pathLength);
#endif
- );
if (newPath == NULL) {
GDKfree(singleWKB);
throw(MAL, "geom.Dump", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
diff --git a/monetdb5/modules/kernel/status.c b/monetdb5/modules/kernel/status.c
--- a/monetdb5/modules/kernel/status.c
+++ b/monetdb5/modules/kernel/status.c
@@ -633,7 +633,7 @@ SYSgdkThread(bat *ret, bat *ret2)
thr = THRget(i);
if (ATOMIC_GET(&thr->pid)){
if (BUNappend(bn, &thr->tid, false) != GDK_SUCCEED ||
- BUNappend(b, thr->name? thr->name:"", false) !=
GDK_SUCCEED)
+ BUNappend(b, thr->name, false) != GDK_SUCCEED)
goto bailout;
}
}
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -550,7 +550,7 @@ IOtable(Client cntxt, MalBlkPtr mb, MalS
ptr val;
(void) cntxt;
- if ( pci->retc != 1 || pci->argc < 2)
+ if ( pci->retc != 1 || pci->argc < 2 || pci->argc >= MAXPARAMS)
throw(MAL, "io.table", "INTERNAL ERROR" " assertion error retc
%d argc %d", pci->retc, pci->argc);
memset(piv, 0, sizeof(BAT*) * MAXPARAMS);
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -791,12 +791,12 @@ exp_bin(backend *be, sql_exp *e, stmt *l
as = exp_bin(be, at, left, right, NULL, NULL,
NULL, sel);
- if (as && as->nrcols <= 0 &&
MonetDB: scoping - Merged with default and fixed possible variab...
Changeset: 5ecee9f5ac4f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ecee9f5ac4f
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/dotmonetdb.c
clients/mapiclient/mclient.c
common/utils/msabaoth.c
common/utils/mstring.h
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_bbp.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_string.c
gdk/gdk_time.c
gdk/gdk_tracer.c
gdk/gdk_utils.c
geom/lib/libgeom.c
geom/monetdb5/geom.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
monetdb5/modules/mal/sysmon.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/server/rel_prop.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/rel_unnest.h
sql/storage/store.c
sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.err
sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.out
sql/test/subquery/Tests/subquery4.sql
sql/test/subquery/Tests/subquery4.stable.err
sql/test/subquery/Tests/subquery4.stable.out
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
sql/test/subquery/Tests/subquery5.stable.out
testing/difflib.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
Branch: scoping
Log Message:
Merged with default and fixed possible variable name mangling problem with
function parameters
diffs (truncated from 1835 to 300 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
@@ -2489,7 +2489,7 @@ str putNameLen(const char *nme, size_t l
str putRef;
str pyapi3Ref;
str pyapi3mapRef;
-lng qhead, qtail, qsize;
+size_t qhead, qtail, qsize;
str queryRef;
str querylogRef;
str raiseRef;
diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient/dotmonetdb.c
--- a/clients/mapiclient/dotmonetdb.c
+++ b/clients/mapiclient/dotmonetdb.c
@@ -17,6 +17,8 @@ parse_dotmonetdb(DotMonetdb *dotfile)
FILE *config = NULL;
char buf[FILENAME_MAX];
+ if (dotfile == NULL)
+ return;
if ((cfile = getenv("DOTMONETDBFILE")) == NULL) {
/* no environment variable: use a default */
if ((config = fopen(".monetdb", "r")) == NULL) {
@@ -46,9 +48,7 @@ parse_dotmonetdb(DotMonetdb *dotfile)
cfile = strdup(cfile);
}
-if (dotfile) {
- *dotfile = (DotMonetdb) {0};
-}
+ *dotfile = (DotMonetdb) {0};
if (config) {
int line = 0;
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3252,7 +3252,6 @@ main(int argc, char **argv)
}
/* parse config file first, command line options override */
- // parse_dotmonetdb(&user, &passwd, &dbname, &language, &save_history,
&output, &pagewidth);
parse_dotmonetdb(&dotfile);
user = dotfile.user;
passwd = dotfile.passwd;
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -750,6 +750,11 @@ msab_getStatus(sabdb** ret, char *dbname
sabdb *sdb;
sdb = *ret = NULL;
+ if (dbname && strpbrk(dbname, "/\\") != NULL) {
+ snprintf(data, sizeof(data),
+"database name contains disallowed
characters");
+ return strdup(data);
+ }
/* scan the parent for directories */
if ((p = getFarmPath(pathbuf, sizeof(pathbuf), NULL)) != NULL)
return(p);
diff --git a/common/utils/mstring.h b/common/utils/mstring.h
--- a/common/utils/mstring.h
+++ b/common/utils/mstring.h
@@ -12,6 +12,12 @@
#include /* va_list etc. */
#include /* strlen */
+#ifdef __GNUC__
+#define GCC_Pragma(pragma) _Pragma(pragma)
+#else
+#define GCC_Pragma(pragma)
+#endif
+
/* copy at most (n-1) bytes from src to dst and add a terminating NULL
* byte; return length of src (i.e. can be more than what is copied) */
static inline size_t
@@ -23,6 +29,20 @@ strcpy_len(char *restrict dst, const cha
return i;
}
dst[n - 1] = 0;
+/* This code is correct, but GCC gives a warning in certain
+ * conditions, so we disable the warning temporarily.
+ * The warning happens e.g. in
+ * strcpy_len(buf, "fixed string", sizeof(buf))
+ * where buf is larger than the string. In that case we never get here
+ * since return is executed in the l
MonetDB: scoping - Merged with default
Changeset: 581ba79fe19b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=581ba79fe19b Modified Files: NT/makelibdef.py NT/mkodbcwxs.py NT/mksqlwxs.py NT/winconfig.py buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py buildtools/conf/fixlicense.py clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/python/basics.py clients/examples/python/sqlsample.py clients/mapiclient/dotfile.py monetdb5/mal/mal_runtime.c monetdb5/modules/kernel/bat5.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/tools/Tests/mserver5-ipv6.py sql/backends/monet5/Tests/dbextra_lock_test.py sql/backends/monet5/Tests/shutdown.py sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_statement.c sql/benchmarks/hist-uva/ground/create.py sql/benchmarks/ssbm/Tests/explain.SQL.py sql/benchmarks/ssbm/Tests/load.SQL.py sql/benchmarks/ssbm/Tests/plan.SQL.py sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py sql/benchmarks/tpch/Tests/explain.SQL.py sql/benchmarks/tpch/Tests/load.SQL.py sql/benchmarks/tpch/Tests/plan.SQL.py sql/storage/store.c sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py sql/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.unpack_csv.py sql/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py sql/test/BugTracker-2010/Tests/operation-successful.Bug-2589.SQL.py sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py sql/test/BugTracker-2011/Tests/user_create_temp_table.Bug-2916.SQL.py sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.SQL.py sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300.SQL.py sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.SQL.py sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py sql/test/BugTracker/Tests/python
MonetDB: scoping - Merged with default
Changeset: 1fdcd2a61a5a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1fdcd2a61a5a
Added Files:
sql/test/Tests/sysqueue.sql
sql/test/Tests/sysqueue.stable.err
sql/test/Tests/sysqueue.stable.out
Removed Files:
sql/test/BugTracker-2020/Tests/sysqueue.sql
sql/test/BugTracker-2020/Tests/sysqueue.stable.err
sql/test/BugTracker-2020/Tests/sysqueue.stable.out
Modified Files:
clients/mapilib/mapi.c
gdk/gdk_aggr.c
gdk/gdk_analytic_func.c
gdk/gdk_select.c
sql/backends/monet5/UDF/pyapi3/connection3.c
sql/backends/monet5/UDF/pyapi3/emit3.c
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/storage/store.c
sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.sql
sql/test/BugTracker-2017/Tests/sqlsmith02.sql
sql/test/BugTracker-2020/Tests/All
sql/test/Tests/All
sql/test/mergetables/Tests/sqlsmith-exists2.sql
sql/test/mergetables/Tests/sqlsmith-exists2.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
sql/test/subquery/Tests/subquery5.stable.out
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 1541 to 300 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1000,13 +1000,13 @@ static void mapi_store_bind(struct MapiR
static ATOMIC_FLAG mapi_initialized = ATOMIC_FLAG_INIT;
-#define check_stream(mid,s,msg,f,e)\
+#define check_stream(mid, s, msg, e) \
do {\
if ((s) == NULL || mnstr_errnr(s)) {\
- mapi_log_record(mid,msg); \
- mapi_log_record(mid,f); \
+ mapi_log_record(mid, msg); \
+ mapi_log_record(mid, __func__); \
close_connection(mid); \
- mapi_setError((mid), (msg), (f), MTIMEOUT); \
+ mapi_setError((mid), (msg), __func__, MTIMEOUT); \
return (e); \
} \
} while (0)
@@ -1420,7 +1420,7 @@ mapi_log(Mapi mid, const char *nme)
if (mid->tracelog)
close_stream(mid->tracelog);
mid->tracelog = NULL;
- return mapi_setError(mid, "Could not create log file",
"mapi_log", MERROR);
+ return mapi_setError(mid, "Could not create log file",
__func__, MERROR);
}
return MOK;
}
@@ -1529,7 +1529,7 @@ close_result(MapiHdl hdl)
if (mnstr_printf(mid->to, "%s", msg) < 0 ||
mnstr_flush(mid->to)) {
close_connection(mid);
- mapi_setError(mid,
mnstr_error(mid->to), "mapi_close_handle", MTIMEOUT);
+ mapi_setError(mid,
mnstr_error(mid->to), __func__, MTIMEOUT);
break;
}
read_into_cache(hdl, 0);
@@ -1547,7 +1547,7 @@ close_result(MapiHdl hdl)
if (mnstr_printf(mid->to, "%s", msg) < 0 ||
mnstr_flush(mid->to)) {
close_connection(mid);
- mapi_setError(mid,
mnstr_error(mid->to), "mapi_close_handle", MTIMEOUT);
+ mapi_setError(mid,
mnstr_error(mid->to), __func__, MTIMEOUT);
} else
read_into_cache(hdl, 0);
}
@@ -1725,7 +1725,7 @@ mapi_new_handle(Mapi mid)
hdl = malloc(sizeof(*hdl));
if (hdl == NULL) {
- mapi_setError(mid, "Memory allocation failure",
"mapi_new_handle", MERROR);
+ mapi_setError(mid, "Memory allocation failure", __func__,
MERROR);
return NULL;
}
*hdl = (struct MapiStatement) {
@@ -1759,7 +1759,7 @@ finish_handle(MapiHdl hdl)
hdl->needmore = false;
mid->active = hdl;
mnstr_flush(mid->to);
- check_stream(mid, mid->to, "write error on stream",
"finish_handle", mid->error);
+ ch
MonetDB: scoping - Merged with default
Changeset: 867a7bab0c61 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=867a7bab0c61
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_bat.c
monetdb5/mal/mal.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.out
sql/test/BugTracker-2020/Tests/sysqueue.stable.out
tools/merovingian/daemon/snapshot.c
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 540 to 300 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
@@ -2117,6 +2117,7 @@ str diffcandRef;
str differenceRef;
str disconnectRef;
str divRef;
+void dropQRYqueue(void);
str drop_constraintRef;
str drop_functionRef;
str drop_indexRef;
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2100,7 +2100,7 @@ BATmode(BAT *b, bool transient)
#ifdef NDEBUG
/* assertions are disabled, turn failing tests into a message */
#undef assert
-#define assert(test) ((void) ((test) || TRC_CRITICAL_ENDIF(BAT_, "Assertion
`%s' failed\n", #test)))
+#define assert(test) ((void) ((test) || (TRC_CRITICAL_ENDIF(BAT_, "Assertion
`%s' failed\n", #test), 0)))
#endif
/* Assert that properties are set correctly.
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -94,6 +94,7 @@ void mserver_reset(void)
GDKprepareExit();
MCstopClients(0);
+ dropQRYqueue();
setHeartbeat(-1);
stopProfiler(0);
AUTHreset();
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -26,15 +26,15 @@
#include "mal_private.h"
-QueryQueue QRYqueue;
-lng qsize, qhead, qtail;
+QueryQueue QRYqueue = NULL;
+lng qsize = 0, qhead = 0, qtail = 0;
static oid qtag= 1;// A unique query identifier
void
mal_runtime_reset(void)
{
GDKfree(QRYqueue);
- QRYqueue = 0;
+ QRYqueue = NULL;
qsize = 0;
qtag= 1;
qhead = 0;
@@ -63,48 +63,71 @@ isaSQLquery(MalBlkPtr mb){
/* clear the next entry for a new call unless it is a running query */
static void
+clearQRYqueue(int idx)
+{
+ QRYqueue[idx].query = 0;
+ QRYqueue[idx].cntxt = 0;
+ QRYqueue[idx].username = 0;
+ QRYqueue[idx].idx = 0;
+ QRYqueue[idx].memory = 0;
+ QRYqueue[idx].tag = 0;
+ QRYqueue[idx].status =0;
+ QRYqueue[idx].finished = 0;
+ QRYqueue[idx].start = 0;
+ QRYqueue[idx].stk =0;
+ QRYqueue[idx].mb =0;
+}
+
+static void
advanceQRYqueue(void)
{
- for( qhead++; qhead!= qtail; qhead++){
- if( qhead == qsize)
- qhead = 0;
- if(QRYqueue[qhead].status == 0 || (QRYqueue[qhead].status[0] !=
'r' && QRYqueue[qhead].status[0] != 'p'))
- break;
- }
- if( qtail == qsize)
- qtail = 0;
+ qhead++;
+ if( qhead == qsize)
+ qhead = 0;
if( qtail == qhead)
qtail++;
+ if( qtail == qsize)
+ qtail = 0;
/* clean out the element */
- if( QRYqueue[qhead].query){
- GDKfree(QRYqueue[qhead].query);
+ str s = QRYqueue[qhead].query;
+ if( s){
+ /* don;t wipe them when they are still running, prepared, or
paused */
+ /* The upper layer has assured there is at least one slot
available */
+ if(QRYqueue[qhead].status == 0 || (QRYqueue[qhead].status[0] !=
'r' && QRYqueue[qhead].status[0] != 'p'))
+ return advanceQRYqueue();
+ GDKfree(s);
GDKfree(QRYqueue[qhead].username);
- QRYqueue[qhead].cntxt = 0;
- QRYqueue[qhead].username = 0;
- QRYqueue[qhead].idx = 0;
- QRYqueue[qhead].memory = 0;
- QRYqueue[qhead].tag = 0;
- QRYqueue[qhead].query = 0;
- QRYqueue[qhead].status =0;
- QRYqueue[qhead].finished = 0;
- QRYqueue[qhead].start = 0;
- QRYqueue[qhead].stk =0;
- QRYqueue[qhead].mb =0;
+ clearQRYqueue(qhead);
}
}
void
+dropQRYqueue(void)
+{
+ int i;
+ MT_lock_set(&mal_delayLock);
+ for(i = 0; i < qsize; i++){
+ if( QRYqueue[i].query)
+ GDKfree(QRYqueue[i].query);
+ if(QRYqueue[i].username)
+ GDKfree(QRYqueue[i].username);
+ }
+ GDKfree(QRYqueue);
+ QRYqueue = NULL;
MonetDB: scoping - Merged with default
Changeset: a0cd2a68ca8a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0cd2a68ca8a Added Files: sql/test/BugTracker-2020/Tests/sysqueue.sql sql/test/BugTracker-2020/Tests/sysqueue.stable.err sql/test/BugTracker-2020/Tests/sysqueue.stable.out Modified Files: ChangeLog NT/monetdb_config.h.in clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/smack00.c clients/examples/C/smack01.c clients/mapiclient/mclient.c clients/odbc/samples/arraytest.c clients/odbc/samples/odbcsample1.c clients/odbc/samples/testStmtAttr.c clients/odbc/samples/testgetinfo.c gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_cand.c gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_sample.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_system_private.h gdk/gdk_tm.c gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_unique.c gdk/gdk_utils.c geom/lib/libgeom.c monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/sysmon.mal monetdb5/modules/mal/tablet.c monetdb5/optimizer/opt_multiplex.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_upgrades.c sql/common/sql_mem.c sql/scripts/26_sysmon.sql sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_query.c sql/server/sql_query.h sql/storage/store.c sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.stable.err sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.err sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.out sql/test/BugTracker-2019/Tests/rank-nan.Bug-6780.sql sql/test/BugTracker-2019/Tests/rank-nan.Bug-6780.stable.out sql/test/BugTracker-2020/Tests/All sql/test/VOC/Tests/VOC.stable.out sql/test/analytics/Tests/analytics13.sql sql/test/analytics/Tests/analytics13.stable.out sql/test/pg_regress/Tests/inet.stable.err sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 tools/merovingian/client/monetdb.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/snapshot.c Branch: scoping Log Message: Merged with default diffs (truncated from 8001 to 300 lines): diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Thu Apr 2 2020 Martin Kersten +- The sys.queue() has been turned into a circular buffer to allow for + inspection of both active, paused and recently executed queries. + diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -808,6 +808,10 @@ /* #undef size_t */ #if defined(_MSC_VER) && _MSC_VER < 1900 +/* the Visual Studio 2015 version of snprintf is C99 standard + * compliant and different from _snprintf, in older versions, the + * functions are the same and return -1 when the buffer is too + * small */ #define snprintf c99_snprintf #define vsnprintf c99_vsnprintf diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.sta
MonetDB: scoping - Merged with default
Changeset: ad1e7f4cf5d6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad1e7f4cf5d6 Added Files: sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.out Modified Files: clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SingleServer clients/mapiclient/mclient.1 gdk/gdk_bat.c gdk/gdk_tracer.c monetdb5/mal/mal.c monetdb5/mal/mal_parser.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/opt_pushselect.c monetdb5/tools/Tests/mserver5--help.stable.err monetdb5/tools/Tests/mserver5--help.stable.err.Windows sql/ChangeLog.Jun2020 sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_result.c sql/server/rel_schema.c sql/server/sql_mvc.c sql/server/sql_partition.c sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.stable.err sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.stable.out sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.out sql/test/BugTracker-2020/Tests/All sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.err sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.out sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.err sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.out sql/test/merge-partitions/Tests/mergepart05.stable.err sql/test/merge-partitions/Tests/mergepart07.stable.err sql/test/mergetables/Tests/mergedropcrash.stable.err sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/drop.stable.err tools/merovingian/client/monetdb.1 tools/merovingian/daemon/monetdbd.1.in tools/mserver/mserver5.1.in tools/mserver/mserver5.c Branch: scoping Log Message: Merged with default diffs (truncated from 2176 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,4 +1,4 @@ exports -HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP?MAL-signatures +HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures MERCURIAL?malcheck mclient-uri 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 @@ -64,7 +64,7 @@ stdout of test 'MAL-signatures` in direc % .%1, .%1,.%1,.%1,.%1 # table_name % module, function, signature, address,comment # name % clob,clob, clob, clob, clob # type -% 10, 28, 364,38, 874 # length +% 12, 28, 364,38, 874 # length [ "aggr", "allnotequal", "command aggr.allnotequal(l:bat[:any_1], r:bat[:any_1]):bit ", "SQLallnotequal;", "if all values in r are not equal to l return true, else if r has nil nil else false" ] [ "aggr", "anyequal", "pattern aggr.anyequal(l:any_1, r:any_1):bit ", "CMDvarEQ;","" ] [ "aggr", "anyequal", "command aggr.anyequal(l:bat[:any_1], r:bat[:any_1]):bit ", "SQLanyequal;", "if any value in r is equal to l return true, else if r has nil nil else false" ] @@ -11242,6 +11242,14 @@ stdout of test 'MAL-signatures` in direc [ "batmtime", "year", "command batmtime.year(d:bat[:date]):bat[:int] ", "MTIMEdate_extract_year_bulk;", "" ] [ "batpcre", "replace", "command batpcre.replace(orig:bat[:str], pat:str, repl:str, flag:str):bat[:str] ", "PCREreplace_bat_wrap;", "" ] [ "batpcre", "replace_first","command batpcre.replace_first(orig:bat[:str], pat:str, repl:str, flag:str):bat[:str] ", "PCREreplacefirst_bat_wrap;", "" ] +[ "batpyapi3", "eval", "unsafe pattern batpyapi3.eval(fptr:ptr, expr:str, arg:any...):any... ","PYAPI3PyAPIevalStd;", "Execute a simple Python script value" ] +[ "batpyapi3", "eval_aggr","unsafe pattern batpyapi3.eval_aggr(fptr:ptr, expr:st
MonetDB: scoping - Merged with default
Changeset: 86953e259e38 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86953e259e38 Added Files: sql/test/merge-partitions/Tests/mergepart30.sql sql/test/merge-partitions/Tests/mergepart30.stable.err sql/test/merge-partitions/Tests/mergepart30.stable.out tools/merovingian/daemon/snapshot.c tools/merovingian/daemon/snapshot.h Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/odbc/winsetup/setup.c common/options/getopt.c common/options/getopt1.c common/stream/stream.c common/utils/muuid.c gdk/ChangeLog.Jun2020 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_analytic_func.c gdk/gdk_batop.c gdk/gdk_delta.h gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_utils.h monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_linker.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_resolve.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_remap.c monetdb5/tools/Tests/mserver5-ipv6.py sql/ChangeLog.Jun2020 sql/backends/monet5/Tests/dbextra_lock_test.py sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sqlcatalog.mal sql/backends/monet5/wlr.mal sql/common/sql_list.c sql/include/sql_catalog.h sql/include/sql_list.h sql/jdbc/tests/Tests/JdbcClient_create_tables.sql sql/jdbc/tests/Tests/JdbcClient_inserts_selects.sql sql/server/rel_optimizer.c sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/rel_xml.c sql/server/sql_mvc.c sql/server/sql_partition.c sql/server/sql_privileges.c sql/server/sql_semantic.c sql/storage/bat/bat_storage.c sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugDay_2005-11-09_2.9.3/Tests/grant_public.SF-1114580.stable.err sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.stable.out sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py sql/test/BugTracker/Tests/coalesce_equal_coalesce.SF-1907905.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.p
MonetDB: scoping - Merged with default
Changeset: 0a84584c5ac7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a84584c5ac7 Added Files: sql/test/miscellaneous/Tests/table_udf_missing_var.py sql/test/miscellaneous/Tests/table_udf_missing_var.stable.err sql/test/miscellaneous/Tests/table_udf_missing_var.stable.out sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.stable.out Modified Files: clients/Tests/exports.stable.out clients/mapiclient/mclient.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.c common/stream/stream.c common/stream/stream.h common/utils/mcrypt.h common/utils/mutils.h configure.ag gdk/Makefile.ag gdk/gdk.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_calc.c gdk/gdk_group.c gdk/gdk_join.c gdk/gdk_private.h gdk/gdk_time.h gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h monetdb5/modules/atoms/json.c sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi3/conversion3.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statement.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_query.c sql/server/sql_query.h sql/storage/store.c sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single sql/test/miscellaneous/Tests/All sql/test/miscellaneous/Tests/groupby_error.stable.out sql/test/subquery/Tests/subquery3.sql sql/test/subquery/Tests/subquery3.stable.err sql/test/subquery/Tests/subquery3.stable.out sql/test/subquery/Tests/subquery5.sql tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/handlers.h Branch: scoping Log Message: Merged with default diffs (truncated from 4401 to 300 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 @@ -9,7 +9,7 @@ stdout of test 'exports` in directory 'c int ALIGNsynced(BAT *b1, BAT *b2); int ATOMallocate(const char *nme); void *ATOMdup(int id, const void *val); -uint8_t ATOMelmshift(int sz); +uint8_t ATOMelmshift(int sz) __attribute__((__const__)); char *ATOMformat(int id, const void *val); int ATOMindex(const char *nme); size_t ATOMlen(int id, const void *v); @@ -319,7 +319,7 @@ size_t GDKuniqueid(size_t offset); gdk_return GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare) __attribute__((__warn_unused_result__)); lng GDKusec(void); int GDKverbose; -const char *GDKversion(void); +const char *GDKversion(void) __attribute__((__const__)); size_t GDKvm_cursize(void); void *GDKzalloc(size_t size) __attribute__((__malloc__)) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); void HASHdestroy(BAT *b); @@ -441,33 +441,33 @@ BAT *canditer_slice(struct canditer *ci, BAT *canditer_slice2(struct canditer *ci, BUN lo1, BUN hi1, BUN lo2, BUN hi2); int closedir(DIR *dir); char *ctime_r(const time_t *restrict, char *restrict); -date date_add_day(date dt, int days); -date date_add_month(date dt, int months); -int date_century(date dt); -date date_create(int year, int month, int day); -int date_day(date dt); -int date_dayofweek(date dt); -int date_dayofyear(date dt); -int date_decade(date dt); -int date_diff(date d1, date d2); +date date_add_day(date dt, int days) __attribute__((__const__)); +date date_add_month(date dt, int months) __attribute__((__const__)); +int date_century(date dt) __attribute__((__const__)); +date date_create(int year, int month, int day) __attribute__((__const__)); +int date_day(date dt) __attribute__((__const__)); +int date_dayofweek(date dt) __attribute__((__const__)); +int date_dayofyear(date dt) __attribute__((__const__)); +int date_decade(date dt) __attribute__((__const__)); +int date_diff(date d1, date d2) __attribute__((__const__)); ssize_t date_fromstr(const char *buf, size_t *len, date **d, bool external); -int date_month(date dt); -int date_quarter(date dt); +int date_month(date dt) __attribute__((__const__)); +int date_quarter(date dt) __attribute__((__const__)); ssize_t date_tostr(str *buf, size_t *len, const date *val, bool external); -int date_weekofyear(date dt); -int date_year(date dt); -daytime daytime_add_usec(daytime tm, lng usec); -daytime daytime_add_usec_modulo(daytime tm, lng usec); -daytime daytime_create(int hour, int minute, int second, int usec); +int date_weekofyear(date dt) __attribute__((__const__)); +int date_year(date dt) __attribute__((__const__)); +daytime daytime_add_usec(daytime tm, lng usec) __attribute__((__const__)); +daytime daytime_add_usec_modulo(daytime tm, lng usec) __attribute__((__co
MonetDB: scoping - Merged with default
Changeset: 11c596c387f8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11c596c387f8 Added Files: sql/test/subquery/Tests/subquery5.sql Removed Files: debian/fix-deb.sh Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/monetdb-mapi.pc.in debian/monetdb5-sql.install gdk/gdk_aggr.c monetdb5/mal/Tests/performanceTests/tst901a.malC monetdb5/mal/Tests/tst1206.malC monetdb5/mal/Tests/tst770.malC monetdb5/mal/Tests/tst890.malC monetdb5/mal/Tests/tst890.stable.out monetdb5/mal/Tests/tst901.malC monetdb5/mal/Tests/tst901.stable.out monetdb5/mal/Tests/tst901a.malC monetdb5/mal/Tests/tst901a.stable.out monetdb5/mal/Tests/tst903.malC monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/Tests/tst906.malC monetdb5/mal/Tests/tst906.stable.out monetdb5/mal/Tests/tst908.malC monetdb5/mal/Tests/tst960.malC monetdb5/mal/Tests/tst960.stable.out monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/batmtime.mal monetdb5/optimizer/Tests/inline02.stable.out monetdb5/optimizer/Tests/inline03.stable.out monetdb5/optimizer/Tests/inline04.stable.out monetdb5/optimizer/Tests/inline07.stable.out monetdb5/optimizer/Tests/inline09.stable.out monetdb5/optimizer/Tests/inline10.stable.out monetdb5/optimizer/Tests/inline12.stable.out monetdb5/optimizer/Tests/remap.stable.out monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_remap.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_statement.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out sql/test/miscellaneous/Tests/declared_tables.sql sql/test/miscellaneous/Tests/declared_tables.stable.err sql/test/miscellaneous/Tests/declared_tables.stable.out sql/test/miscellaneous/Tests/groupby_error.sql sql/test/miscellaneous/Tests/groupby_error.stable.out sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.err sql/test/miscellaneous/Tests/simple_selects.stable.out sql/test/subquery/Tests/All sql/test/subquery/Tests/subquery4.sql sql/test/subquery/Tests/subquery4.stable.err testing/sqllogictest.py Branch: scoping Log Message: Merged with default diffs (truncated from 68728 to 300 lines): 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 @@ -1501,14 +1501,6 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "!=", "pattern batcalc.!=(v:timestamp, b:bat[:timestamp], nil_matches:bit):bat[:bit] ", "CMDbatNE;","Return V != B" ] [ "batcalc", "!=", "pattern batcalc.!=(v:timestamp, b:bat[:timestamp], s:bat[:oid]):bat[:bit] ", "CMDbatNE;","Return V != B with candidates list"] [ "batcalc", "!=", "pattern batcalc.!=(v:timestamp, b:bat[:timestamp], s:bat[:oid], nil_matches:bit):bat[:bit] ", "CMDbatNE;","Return V != B with candidates list"] -[ "batcalc", "%","pattern batcalc.%(b1:bat[:bte], b2:bat[:bte]):bat[:bte] ", "CMDbatMODsignal;", "Return B1 % B2, signal error on divide by zero"] -[ "batcalc", "%","pattern batcalc.%(b1:bat[:bte], b2:bat[:bte]):bat[:int] ", "CMDbatMODsignal;", "Return B1 % B2, signal error on divide by zero"] -[ "batcalc", "%","pattern batcalc.%(b1:bat[:bte], b2:bat[:bte]):bat[:lng] ", "CMDbatMODsignal;", "Return B1 % B2, signal error on divide by zero"] -[ "batcalc", "%","pattern batcalc.%(b1:bat[:bte], b2:bat[:bte]):bat[:sht] ", "CMDbatMODsignal;", "Return B1 % B2, signal error on divide by zero"] -[ "batcalc", "%","pattern batcalc.%(b1:bat[:bte], b2:bat[:bte], r:bat[:bit]):bat[:bte] ","CMDbatMODsignal;", "Return B1 % B2, signal error on divide by zero"] -[ "batcalc", "%","pattern batcalc.%(b1:bat[:bte], b2:bat[:bte], r:bat[:bit]):bat[:int] ","CMDbatMODsignal;", "Return B1 % B2, signal error on divide by zer
MonetDB: scoping - Merged with default
Changeset: 7d5b16062dd1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d5b16062dd1
Modified Files:
gdk/ChangeLog.Jun2020
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_delta.c
gdk/gdk_project.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_stack.c
sql/backends/monet5/rel_bin.c
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/test/BugTracker-2008/Tests/is_distinct_broken.SF-2430201.sql
sql/test/BugTracker-2008/Tests/is_distinct_broken.SF-2430201.stable.err
sql/test/BugTracker-2008/Tests/is_distinct_broken.SF-2430201.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/subquery/Tests/subquery4.sql
sql/test/subquery/Tests/subquery4.stable.err
sql/test/subquery/Tests/subquery4.stable.out
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 917 to 300 lines):
diff --git a/gdk/ChangeLog.Jun2020 b/gdk/ChangeLog.Jun2020
--- a/gdk/ChangeLog.Jun2020
+++ b/gdk/ChangeLog.Jun2020
@@ -1,6 +1,10 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
+* Fri Mar 20 2020 Sjoerd Mullender
+- Changed the interface of the atom "fix" and "unfix" functions.
+ They now return a value of type gdk_return to indicater success/failure.
+
* Tue Dec 3 2019 Sjoerd Mullender
- Removed the tunique property. The tunique property indicated that
all values in the column had to be distinct. It was removed because
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1512,7 +1512,7 @@ Tputvalue(BAT *b, BUN p, const void *v,
#endif
}
} else {
- ATOMputFIX(b->ttype, Tloc(b, p), v);
+ return ATOMputFIX(b->ttype, Tloc(b, p), v);
}
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -118,16 +118,24 @@ hgeHash(const hge *v)
/*
* @+ Standard Atoms
*/
-static int
+static gdk_return
batFix(const bat *b)
{
- return BBPretain(*b);
+ if (!is_bat_nil(*b) && BBPretain(*b) == 0) {
+ GDKerror("batFix failed\n");
+ return GDK_FAIL;
+ }
+ return GDK_SUCCEED;
}
-static int
+static gdk_return
batUnfix(const bat *b)
{
- return BBPrelease(*b);
+ if (!is_bat_nil(*b) && BBPrelease(*b) < 0) {
+ GDKerror("batUnfix failed\n");
+ return GDK_FAIL;
+ }
+ return GDK_SUCCEED;
}
/*
@@ -1232,8 +1240,8 @@ atomDesc BATatoms[MAXATOMS] = {
.atomWrite = (gdk_return (*)(const void *, stream *, size_t))
batWrite,
.atomCmp = (int (*)(const void *, const void *)) intCmp,
.atomHash = (BUN (*)(const void *)) intHash,
- .atomFix = (int (*)(const void *)) batFix,
- .atomUnfix = (int (*)(const void *)) batUnfix,
+ .atomFix = (gdk_return (*)(const void *)) batFix,
+ .atomUnfix = (gdk_return (*)(const void *)) batUnfix,
},
[TYPE_int] = {
.name = "int",
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -50,8 +50,8 @@ typedef struct {
int (*atomCmp) (const void *v1, const void *v2);
BUN (*atomHash) (const void *v);
/* optional functions */
- int (*atomFix) (const void *atom);
- int (*atomUnfix) (const void *atom);
+ gdk_return (*atomFix) (const void *atom);
+ gdk_return (*atomUnfix) (const void *atom);
/* varsized atom-only ADT functions */
var_t (*atomPut) (Heap *, var_t *off, const void *src);
@@ -266,8 +266,8 @@ gdk_export const ptr ptr_nil;
#define ATOMvarsized(t)(BATatoms[t].atomPut != NULL)
#define ATOMlinear(t) BATatoms[t].linear
#define ATOMtype(t)((t) == TYPE_void ? TYPE_oid : (t))
-#define ATOMfix(t,v) do if (BATatoms[t].atomFix)
BATatoms[t].atomFix(v); while (0)
-#define ATOMunfix(t,v) do if (BATatoms[t].atomUnfix)
BATatoms[t].atomUnfix(v); while (0)
+#define ATOMfix(t,v) (BATatoms[t].atomFix ? BATatoms[t].atomFix(v) :
GDK_SUCCEED)
+#define ATOMunfix(t,v) (BATatoms[t].atomUnfix ?
BATatoms[t].atomUnfix(v) : GDK_SUCCEED)
/* The base type is the storage type if the comparison function, the
* hash function, and the nil value are the same as those of the
@@ -296,11 +296,15 @@ ATOMputVAR(int type, Heap *heap, var_t *
}
-static inline void
+static inline gdk_return __attribute__((__warn_unused_result__))
ATOMputFIX(int type, void *dst, const void *src)
{
+ gdk_return rc;
+
assert(BATatoms[type].atomPut == NULL);
- ATOMfix(type, src);
+ rc = AT
MonetDB: scoping - Merged with default
Changeset: feee86ad66c0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=feee86ad66c0
Added Files:
gdk/gdk_geomlogger.h
gdk/gdk_logger_internals.h
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single
Modified Files:
clients/Tests/exports.stable.out
clients/odbc/driver/SQLGetTypeInfo.c
common/utils/msabaoth.c
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_qsort.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
geom/monetdb5/geom_upgrade.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/sql_mvc.c
sql/storage/bat/bat_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/storage/store_sequence.c
sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.err
sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.out
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/Tests/comment-on.stable.err
sql/test/mergetables/Tests/part-elim.stable.out
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/subquery/Tests/scalar.sql
sql/test/subquery/Tests/scalar.stable.out
sql/test/subquery/Tests/subquery4.sql
sql/test/subquery/Tests/subquery4.stable.err
sql/test/subquery/Tests/subquery4.stable.out
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 4532 to 300 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
@@ -485,7 +485,7 @@ geomcatalogfix_fptr geomcatalogfix_get(v
void geomcatalogfix_set(geomcatalogfix_fptr);
geomsqlfix_fptr geomsqlfix_get(void);
void geomsqlfix_set(geomsqlfix_fptr);
-int geomversion_get(void);
+bool geomversion_get(void);
void geomversion_set(void);
bat getBBPsize(void);
char *get_bin_path(void);
diff --git a/clients/odbc/driver/SQLGetTypeInfo.c
b/clients/odbc/driver/SQLGetTypeInfo.c
--- a/clients/odbc/driver/SQLGetTypeInfo.c
+++ b/clients/odbc/driver/SQLGetTypeInfo.c
@@ -58,10 +58,10 @@ static const struct types {
* to paste into an SQL query (i.e. including quotes). */
{
.type_name = "uuid",
- .data_type = SQL_GUID,
+ .data_type = SQL_GUID, /* -11 */
.column_size = 36,
- .literal_prefix = "NULL",
- .literal_suffix = "NULL",
+ .literal_prefix = "'uuid '''",
+ .literal_suffix = "",
.create_params = "NULL",
.nullable = SQL_NULLABLE,
.case_sensitive = SQL_FALSE,
@@ -69,7 +69,7 @@ static const struct types {
.unsigned_attribute = -1,
.fixed_prec_scale = SQL_FALSE,
.auto_unique_value = -1,
- .local_type_name = "NULL",
+ .local_type_name = "'uuid'",
.minimum_scale = -1,
.maximum_scale = -1,
.sql_data_type = SQL_GUID,
@@ -79,7 +79,7 @@ static const struct types {
},
{
.type_name = "character large object",
- .data_type = SQL_WLONGVARCHAR,
+ .data_type = SQL_WLONGVARCHAR, /* -10 */
.column_size = 100,
.literal_prefix = "",
.literal_suffix = "",
@@ -99,8 +99,50 @@ static const struct types {
.interval_precision = -1,
},
{
+ .type_name = "json",
+ .data_type = SQL_WLONGVARCHAR, /* -10 */
+ .column_size = 100,
+ .literal_prefix = "'json '''",
+ .literal_suffix = "",
+ .create_params = "NULL",
+ .nullable = SQL_NULLABLE,
+ .case_sensitive = SQL_TRUE,
+
MonetDB: scoping - Merged with default
Changeset: 98ab09832bdd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98ab09832bdd Added Files: ChangeLog.Jun2020 buildtools/ChangeLog.Jun2020 clients/ChangeLog.Jun2020 clients/mapilib/ChangeLog.Jun2020 common/stream/ChangeLog.Jun2020 documentation/source/json.rst gdk/ChangeLog.Jun2020 gdk/gdk_time.c gdk/gdk_time.h geom/ChangeLog.Jun2020 monetdb5/ChangeLog.Jun2020 sql/ChangeLog.Jun2020 sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.sql sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.stable.err sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.stable.out sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.sql sql/test/Tests/mediumint.sql sql/test/Tests/mediumint.stable.err sql/test/Tests/mediumint.stable.out sql/test/sys-schema/Tests/utilities.sql sql/test/sys-schema/Tests/utilities.stable.err sql/test/sys-schema/Tests/utilities.stable.out testing/ChangeLog.Jun2020 tools/merovingian/ChangeLog.Jun2020 Removed Files: monetdb5/modules/kernel/batmmath.h sql/test/rdf/Tests/q8_v_small.reqtests sql/test/rdf/Tests/q8_v_small.sql sql/test/rdf/Tests/q8_v_small.stable.err sql/test/rdf/Tests/q8_v_small.stable.out Modified Files: .hgtags ChangeLog MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/ChangeLog clients/R/Tests/dbi.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/mapilib/monetdb-mapi.pc.in clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDbc.h clients/odbc/driver/ODBCStmt.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLGetTypeInfo.c clients/odbc/driver/SQLNativeSql.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSetCursorName.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/utils/muuid.c configure.ag documentation/source/index.rst gdk/ChangeLog gdk/Makefile.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_cand.c gdk/gdk_cand.h gdk/gdk_heap.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_utils.c gdk/libbat.rc geom/lib/libgeom.h geom/monetdb5/geom.c monetdb5/ChangeLog monetdb5/mal/mal_authorize.h monetdb5/mal/mal_import.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_session.c monetdb5/mal/mal_type.c monetdb5/modules/atoms/Tests/json15.malC monetdb5/modules/atoms/Tests/json15.stable.out monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/mtime_analytic.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/Makefile.ag monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.mal monetdb5/modules/kernel/mmath.c monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/batmtime.mal monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/
MonetDB: scoping - Merged with default
Changeset: 826840fe09a1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=826840fe09a1 Added Files: sql/ChangeLog.linear-hashing Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out debian/control gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_cand.c gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_sample.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h geom/sql/functions/Tests/ST_IsSimple.stable.out monetdb5/mal/mal_atom.c monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/modules/kernel/alarm.c monetdb5/modules/kernel/alarm.mal monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/clients.mal monetdb5/modules/mal/pcre.c monetdb5/modules/mal/sysmon.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/wlr.c sql/include/sql_catalog.h sql/rel.txt sql/scripts/22_clients.sql sql/scripts/25_debug.sql sql/scripts/26_sysmon.sql sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_mvc.c sql/server/sql_privileges.c sql/server/sql_symbol.c sql/server/sql_tokens.h sql/storage/bat/bat_table.c sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/TypeException_with_missing_function.Bug-2674.stable.err sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.err sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.stable.err sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300.stable.err sql/test/BugTracker-2016/Tests/invalidcolumns.Bug-3968.stable.err sql/test/BugTracker-2017/Tests/udf_crash_subquery_scalar_paramters.Bug-6399.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker/Tests/ambiguous_join.SF-1580565.stable.err sql/test/Tests/drop-function-if-exists.stable.err sql/test/Tests/ifexists-views.sql sql/test/Users/Tests/sessioncontrol.stable.err sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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 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/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.err sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 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/Test
MonetDB: scoping - Merged with default
Changeset: 00fa4016d75a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00fa4016d75a Added Files: sql/test/VOC/VOCcreate_user.sql sql/test/VOC/VOCdrop.sql sql/test/VOC/VOCdrop_user.sql sql/test/VOC/VOCinsert.sql sql/test/VOC/VOCmanual_examples.sql sql/test/VOC/VOCquery.sql Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out documentation/source/manual_pages/mclient.rst documentation/source/manual_pages/monetdb.rst documentation/source/manual_pages/monetdbd.rst.in documentation/source/manual_pages/mserver5.rst.in documentation/source/manual_pages/msqldump.rst gdk/gdk.h gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_hash.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_posix.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_utils.c monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/modules/atoms/inet.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tracer.c monetdb5/modules/mal/tracer.h monetdb5/modules/mal/tracer.mal sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/nobench/Tests/nobench.sql sql/benchmarks/nobench/Tests/nobench.stable.out sql/scripts/81_tracer.sql sql/server/rel_dump.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/server/sql_privileges.c sql/server/sql_semantic.c sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single sql/test/VOC/Tests/VOC.SQL.py sql/test/VOC/Tests/VOC.stable.out sql/test/VOC/Tests/double_is_null.Bug-3116.sql sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out sql/test/VOC/Tests/median.Bug-3096.sql sql/test/VOC/Tests/median.Bug-3096.stable.out sql/test/VOC/VOCschema.sql sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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 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/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/merge-partitions/Tests/mergepart28.stable.err sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.err sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 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 tools/mserver/mserver5.1.in Branch: scoping Log Message: Merged with default diffs (truncated from 65112 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.
MonetDB: scoping - Merged with default
Changeset: ce0fa095c61c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce0fa095c61c Added Files: clients/R/Tests/SingleServer clients/Tests/SingleServer clients/mapiclient/Tests/SingleServer geom/BugTracker/Tests/SingleServer geom/sql/conformance/Tests/SingleServer geom/sql/functions/Tests/SingleServer geom/sql/pg_regression/Tests/SingleServer monetdb5/extras/mal_optimizer_template/Tests/SingleServer monetdb5/extras/rapi/Tests/SingleServer monetdb5/mal/Tests/SingleServer monetdb5/modules/atoms/Tests/SingleServer monetdb5/modules/kernel/Tests/SingleServer monetdb5/modules/mal/Tests/SingleServer monetdb5/optimizer/Tests/SingleServer monetdb5/scheduler/Tests/SingleServer sql/backends/monet5/Tests/SingleServer sql/backends/monet5/UDF/capi/Tests/SingleServer sql/backends/monet5/UDF/pyapi3/Tests/SingleServer sql/backends/monet5/UDF/udf/Tests/SingleServer sql/backends/monet5/generator/Tests/SingleServer sql/benchmarks/ATIS/Tests/SingleServer sql/benchmarks/arno/Tests/SingleServer sql/benchmarks/arno_flt/Tests/SingleServer sql/benchmarks/blob/Tests/SingleServer sql/benchmarks/moa/Tests/SingleServer sql/benchmarks/nobench/Tests/SingleServer sql/benchmarks/ssbm/Tests/SingleServer sql/benchmarks/tpcds/Tests/SingleServer sql/benchmarks/tpch/LOCKED/Tests/SingleServer sql/benchmarks/tpch/Tests/SingleServer sql/benchmarks/viam/Tests/SingleServer sql/jdbc/tests/Tests/SingleServer sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.err sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.out sql/odbc/samples/Tests/SingleServer sql/test/ADT2006/Tests/SingleServer sql/test/BugConstraints/Tests/SingleServer sql/test/BugDay_2005-10-06_2.8/Tests/SingleServer sql/test/BugDay_2005-10-06_2.9.3/Tests/SingleServer sql/test/BugDay_2005-11-09_2.8/Tests/SingleServer sql/test/BugDay_2005-11-09_2.9.3/Tests/SingleServer sql/test/BugDay_2005-12-19_2.9.3/Tests/SingleServer sql/test/BugTracker-2008/Tests/SingleServer sql/test/BugTracker-2009/Tests/SingleServer sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py sql/test/BugTracker-2010/Tests/SingleServer sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/SingleServer sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/SingleServer sql/test/BugTracker-2011/Tests/SingleServer sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py sql/test/BugTracker-2012/Tests/SingleServer sql/test/BugTracker-2013/Tests/SingleServer sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py sql/test/BugTracker-2014/Tests/SingleServer sql/test/BugTracker-2015/Tests/SingleServer sql/test/BugTracker-2016/Tests/SingleServer sql/test/BugTracker-2017/Tests/SingleServer sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py sql/test/BugTracker-2018/Tests/SingleServer sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py sql/test/BugTracker-2019/Tests/SingleServer sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.stable.err sql/test/BugTracker-2020/Tests/SingleServer sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.sql sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.err sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.out sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.sql sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.stable.err sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.stable.out sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.sql sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.err sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.out sql/test/BugTracker/Tests/SingleServer sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py sql/test/BugTracker/Tests/set_sql_
