MonetDB: default - Added missing == NULL check after malloc() ca...
Changeset: 4c6aa2e90905 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c6aa2e90905
Modified Files:
clients/mapiclient/dump.c
Branch: default
Log Message:
Added missing == NULL check after malloc() calls to prevent runtime crashes.
In ORDER BY use qualified column names, so with table alias prefix.
In tables_views_functions_triggers string use UNION ALL instead of UNION as
table, view, function/procedure and triggers ids are distinct by design.
diffs (297 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -685,16 +685,18 @@ static int
dump_column_definition(Mapi mid, stream *toConsole, const char *schema, const
char *tname, const char *tid, bool foreign, bool hashge)
{
MapiHdl hdl = NULL;
- char *query;
- size_t maxquerylen;
+ char *query = NULL;
+ size_t maxquerylen = 1024;
int cnt;
int slen;
int cap;
#define CAP(X) ((cap = (int) (X)) < 0 ? 0 : cap)
- maxquerylen = 1024;
- if (tid == NULL)
+ if (tid == NULL) {
+ if (tname == NULL || schema == NULL)
+ return 1;
maxquerylen += strlen(tname) + strlen(schema);
+ }
else
maxquerylen += strlen(tid);
if ((query = malloc(maxquerylen)) == NULL)
@@ -713,7 +715,7 @@ dump_column_definition(Mapi mid, stream
"c.number " /* 6 */
"FROM sys._columns c "
"WHERE c.table_id = %s "
-"ORDER BY number", tid);
+"ORDER BY c.number", tid);
else
snprintf(query, maxquerylen,
"SELECT c.name, " /* 0 */
@@ -730,7 +732,7 @@ dump_column_definition(Mapi mid, stream
"'%s' = t.name AND "
"t.schema_id = s.id AND "
"s.name = '%s' "
-"ORDER BY number", tname, schema);
+"ORDER BY c.number", tname, schema);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
@@ -785,7 +787,7 @@ dump_column_definition(Mapi mid, stream
"WHERE kc.id = k.id AND "
"k.table_id = %s AND "
"k.type = 0 "
-"ORDER BY id, nr", tid);
+"ORDER BY k.id, kc.nr", tid);
else
snprintf(query, maxquerylen,
"SELECT kc.name, " /* 0 */
@@ -802,7 +804,7 @@ dump_column_definition(Mapi mid, stream
"t.schema_id = s.id AND "
"s.name = '%s' AND "
"t.name = '%s' "
-"ORDER BY id, nr", schema, tname);
+"ORDER BY k.id, kc.nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
cnt = 0;
@@ -844,7 +846,7 @@ dump_column_definition(Mapi mid, stream
"WHERE kc.id = k.id AND "
"k.table_id = %s AND "
"k.type = 1 "
-"ORDER BY id, nr", tid);
+"ORDER BY k.id, kc.nr", tid);
else
snprintf(query, maxquerylen,
"SELECT kc.name, " /* 0 */
@@ -861,7 +863,7 @@ dump_column_definition(Mapi mid, stream
"t.schema_id = s.id AND "
"s.name = '%s' AND "
"t.name = '%s' "
-"ORDER BY id, nr", schema, tname);
+"ORDER BY k.id, kc.nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
cnt = 0;
@@ -925,7 +927,7 @@ describe_table(Mapi mid, const char *sch
{
int cnt, table_id = 0;
MapiHdl hdl = NULL;
- char *query;
+ char *query = NULL;
char *view = NULL;
char *remark = NULL;
int type = 0;
@@ -939,6 +941,8 @@ describe_table(Mapi mid, const char *sch
size_t len = sname - tname;
sname = malloc(len + 1);
+ if (sname == NULL)
+ return 1;
strncpy(sname, tname, len);
sname[len] = 0;
tname += len + 1;
@@ -951,8 +955,13 @@ describe_table(Mapi mid, const char *sch
hashge = has_hugeint(mid);
maxquerylen = 5120 + strlen(tname) + strlen(schema);
+ query = malloc(maxquerylen);
+ if (query == NULL) {
+ if (sname != NULL)
+
MonetDB: holindex - Closing branch holindex.
Changeset: cebf138e0792 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cebf138e0792 Branch: holindex Log Message: Closing branch holindex. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rdf - Closing branch rdf.
Changeset: 59b82185ae4c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59b82185ae4c Branch: rdf Log Message: Closing branch rdf. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mal-weld - Closing branch mal-weld.
Changeset: dfda04734cae for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dfda04734cae Branch: mal-weld Log Message: Closing branch mal-weld. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rel-weld - Closing branch rel-weld.
Changeset: b234cc456e00 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b234cc456e00 Branch: rel-weld Log Message: Closing branch rel-weld. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Removed option --dbinit.
Changeset: 4465cdac09f6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4465cdac09f6 Added Files: sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5 sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.options5 Removed Files: sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.dbinit5 sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.dbinit5 Modified Files: monetdb5/tools/Tests/mserver5--help.stable.err monetdb5/tools/Tests/mserver5--help.stable.err.Windows testing/Mtest.py.in testing/README testing/process.py tools/mserver/mserver5.1.in tools/mserver/mserver5.c Branch: default Log Message: Removed option --dbinit. diffs (206 lines): diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err b/monetdb5/tools/Tests/mserver5--help.stable.err --- a/monetdb5/tools/Tests/mserver5--help.stable.err +++ b/monetdb5/tools/Tests/mserver5--help.stable.err @@ -13,7 +13,6 @@ stderr of test 'mserver5--help` in direc Usage: mserver5 [options] [scripts] --dbpath= Specify database location --dbextra= Directory for transient BATs ---dbinit= Execute statement at startup --config=Use config_file to read options from --daemon=yes|no Do not read commands from standard input [no] --single-user Allow only one user at a time diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows --- a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows +++ b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows @@ -8,7 +8,6 @@ stderr of test 'mserver5--help` in direc Usage: mserver5.exe [options] [scripts] --dbpath= Specify database location --dbextra= Directory for transient BATs ---dbinit= Execute statement at startup --config=Use config_file to read options from --daemon=yes|no Do not read commands from standard input [no] --single-user Allow only one user at a time diff --git a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.dbinit5 b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.dbinit5 deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.dbinit5 +++ /dev/null @@ -1,1 +0,0 @@ -mdb.setDebug(134217728); diff --git a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5 b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5 new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5 @@ -0,0 +1,1 @@ +--optimizers diff --git a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.dbinit5 b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.dbinit5 deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.dbinit5 +++ /dev/null @@ -1,1 +0,0 @@ -mdb.setDebug(\"performance\"); diff --git a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.options5 b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.options5 new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.options5 @@ -0,0 +1,1 @@ +--performance diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in --- a/testing/Mtest.py.in +++ b/testing/Mtest.py.in @@ -2959,13 +2959,8 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR ClntOut = open(ClntOutFile,"w") ClntErr = open(ClntErrFile,"w") PROLOGUE = [] -DBINIT = [] if os.path.isfile(TST + ".prologue5"): PROLOGUE = [TST + ".prologue5"] -if os.path.isfile(TST + ".dbinit5"): -dbinit = open(TST + ".dbinit5").readline().strip() -if dbinit: -DBINIT = ['--dbinit=%s' % dbinit] Srvr = splitcommand(exe['mserver5'][1]) + LOCAL_CONF if nomito: @@ -2984,14 +2979,14 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR shutil.rmtree(os.path.join(env['GDK_DBFARM'], TSTDB + '_transient'), ignore_errors = True) os.makedirs(os.path.join(env['GDK_DBFARM'], TSTDB + '_transient')) +if os.path.isfile(TST + '.options5'): +Srvr.extend(open(TST + '.options5').read().split()) lang="" if SERVER == "MAL": lang="mal" -Srvr.extend(DBINIT) if SERVER == "SQL": lang="sql" -Srvr.extend(DBINIT) Srvr.extend(PROLOGUE) # enable r integration in server diff --git a/testing/README b/testing/README ---
MonetDB: default - HEADLESSMASK is not used.
Changeset: ceb7244c9dcc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ceb7244c9dcc Modified Files: gdk/gdk.h tools/mserver/mserver5.1.in Branch: default Log Message: HEADLESSMASK is not used. diffs (26 lines): diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -376,8 +376,10 @@ */ #define PARMASK(1<<7) #define PARDEBUG if (GDKdebug & PARMASK) +/* HEADLESSMASK not used anymore #define HEADLESSMASK (1<<8) #define HEADLESSDEBUG if (GDKdebug & HEADLESSMASK) +*/ #define TMMASK (1<<9) #define TMDEBUGif (GDKdebug & TMMASK) #define TEMMASK(1<<10) diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in --- a/tools/mserver/mserver5.1.in +++ b/tools/mserver/mserver5.1.in @@ -139,7 +139,7 @@ combination of): 32 = BATMASK = BAT handling .\" 64 = PARSEMASK= parser debugging 128 = PARMASK = Thread management -256 = HEADLESSMASK = Warn about BAT heads that are not "headless-ready" +.\"256 = HEADLESSMASK = Warn about BAT heads that are not "headless-ready" 512 = TMMASK = Transaction management 1024 = TEMMASK = Locks and Triggers .\" 2048 = DLMASK = Dynamic loading ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: analytics - Merge with default.
Changeset: fed16a283c15 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fed16a283c15 Added Files: sql/test/rename/Tests/All sql/test/rename/Tests/rename00.py sql/test/rename/Tests/rename00.stable.err sql/test/rename/Tests/rename00.stable.out sql/test/rename/Tests/rename01.sql sql/test/rename/Tests/rename01.stable.err sql/test/rename/Tests/rename01.stable.out sql/test/rename/Tests/rename02.sql sql/test/rename/Tests/rename02.stable.err sql/test/rename/Tests/rename02.stable.out sql/test/rename/Tests/rename03.sql sql/test/rename/Tests/rename03.stable.err sql/test/rename/Tests/rename03.stable.out sql/test/rename/Tests/rename04.sql sql/test/rename/Tests/rename04.stable.err sql/test/rename/Tests/rename04.stable.out sql/test/rename/Tests/rename05.sql sql/test/rename/Tests/rename05.stable.err sql/test/rename/Tests/rename05.stable.out sql/test/rename/Tests/rename06.sql sql/test/rename/Tests/rename06.stable.err sql/test/rename/Tests/rename06.stable.out Modified Files: NT/monetdb_config.h.in clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapilib/mapi.c clients/mapilib/mapi.h common/stream/stream.c configure.ag monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_session.c monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_projectionpath.c sql/ChangeLog 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_cat.c sql/backends/monet5/sql_cat.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sqlcatalog.mal sql/backends/monet5/vaults/bam/bam_db_interface.c sql/backends/monet5/wlr.mal sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql sql/benchmarks/tpch/load-sf-0.01.sql sql/benchmarks/tpch/load-sf-1.sql sql/common/sql_changeset.c sql/common/sql_list.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_list.h sql/include/sql_relation.h sql/server/rel_optimizer.c sql/server/rel_schema.c sql/server/rel_semantic.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_partition.c sql/server/sql_partition.h sql/server/sql_scan.c sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/storage/store_sequence.c sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Users/Tests/copyinto.stable.err sql/test/Users/Tests/copyinto.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 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/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/alter_table.stable.out sql/test/pg_regress/Tests/drop.stable.err sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 testing/exportutils.py Branch: analytics Log Message: Merge with default. diffs (truncated from 8275 to 300 lines): 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 @@ -910,5 +910,6 @@ typedef __uint128_t uhge; #define PROMPT1"\001\001\n"/* prompt: ready for new query */ #define PROMPT2"\001\002\n"/* prompt: more data needed */ +#define PROMPT3"\001\003\n"/* prompt: get file content */ #endif /* _SEEN_MONETDB_CONFIG_H */ diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out ---
MonetDB: rename-sql - Closing rename-sql branch after merge into...
Changeset: 2016b2b75f51 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2016b2b75f51 Branch: rename-sql Log Message: Closing rename-sql branch after merge into default ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Updated changelog with rename-sql branch chan...
Changeset: ef7198eb51ba for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef7198eb51ba Modified Files: sql/ChangeLog Branch: default Log Message: Updated changelog with rename-sql branch changes. diffs (19 lines): diff --git a/sql/ChangeLog b/sql/ChangeLog --- a/sql/ChangeLog +++ b/sql/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Thu Oct 18 2018 Pedro Ferreira +- Added possibility to rename SQL schemas, tables and columns with ALTER + statements: + > ALTER SCHEMA [ IF EXISTS ] ident RENAME TO ident + > ALTER TABLE [ IF EXISTS ] qname RENAME TO ident + > ALTER TABLE [ IF EXISTS ] qname RENAME [ COLUMN ] ident TO ident + Also added optional IF EXISTS clause to other existing ALTER TABLE + statements. + * Tue Okt 9 2018 Aris Koning - The sql SAMPLE syntax is extended to include an optional integral SEED parameter that sets the seed for the internal random number generator ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged branch rename-sql into default.
Changeset: 9cfbde226296 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9cfbde226296 Added Files: sql/test/rename/Tests/All sql/test/rename/Tests/rename00.py sql/test/rename/Tests/rename00.stable.err sql/test/rename/Tests/rename00.stable.out sql/test/rename/Tests/rename01.sql sql/test/rename/Tests/rename01.stable.err sql/test/rename/Tests/rename01.stable.out sql/test/rename/Tests/rename02.sql sql/test/rename/Tests/rename02.stable.err sql/test/rename/Tests/rename02.stable.out sql/test/rename/Tests/rename03.sql sql/test/rename/Tests/rename03.stable.err sql/test/rename/Tests/rename03.stable.out sql/test/rename/Tests/rename04.sql sql/test/rename/Tests/rename04.stable.err sql/test/rename/Tests/rename04.stable.out sql/test/rename/Tests/rename05.sql sql/test/rename/Tests/rename05.stable.err sql/test/rename/Tests/rename05.stable.out sql/test/rename/Tests/rename06.sql sql/test/rename/Tests/rename06.stable.err sql/test/rename/Tests/rename06.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/mhelp.c monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_cat.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sqlcatalog.mal sql/backends/monet5/wlr.mal sql/common/sql_changeset.c sql/common/sql_list.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_list.h sql/include/sql_relation.h sql/server/rel_schema.c sql/server/rel_semantic.c sql/server/rel_sequence.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_partition.c sql/server/sql_partition.h sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/storage/store_sequence.c sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/alter_table.stable.out sql/test/pg_regress/Tests/drop.stable.err Branch: default Log Message: Merged branch rename-sql into default. diffs (truncated from 4668 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 @@ -11097,6 +11097,9 @@ Ready. [ "sqlcatalog","grant","pattern sqlcatalog.grant(sname:str, tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "SQLgrant;","Catalog operation grant" ] [ "sqlcatalog","grant_function", "pattern sqlcatalog.grant_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ","SQLgrant_function;", "Catalog operation grant_function" ] [ "sqlcatalog","grant_roles", "pattern sqlcatalog.grant_roles(sname:str, auth:str, grantor:int, admin:int):void ", "SQLgrant_roles;", "Catalog operation grant_roles" ] +[ "sqlcatalog","rename_column","pattern sqlcatalog.rename_column(sname:str, tname:str, cname:str, newnme:str):void ", "SQLrename_column;","Catalog operation rename_column" ] +[ "sqlcatalog","rename_schema","pattern sqlcatalog.rename_schema(sname:str, newnme:str):void ", "SQLrename_schema;","Catalog operation rename_schema" ] +[ "sqlcatalog","rename_table", "pattern sqlcatalog.rename_table(sname:str, tname:str, newnme:str):void ", "SQLrename_table;", "Catalog operation rename_table"] [ "sqlcatalog","rename_user", "pattern sqlcatalog.rename_user(sname:str, newnme:str, action:int):void ", "SQLrename_user;", "Catalog operation rename_user" ] [ "sqlcatalog","revoke", "pattern sqlcatalog.revoke(sname:str, tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ", "SQLrevoke;", "Catalog operation revoke" ] [ "sqlcatalog","revoke_function", "pattern sqlcatalog.revoke_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ", "SQLrevoke_function;", "Catalog operation revoke_function" ] @@ -11328,6 +11331,9 @@ Ready. [ "wlc", "master", "pattern wlc.master():void ", "WLCmaster;", "Activate the workload-capture-replay process" ] [ "wlc", "master", "pattern wlc.master(path:str):void ", "WLCmaster;", "Activate the
MonetDB: exanest - Merge Aug2018-SP1 release into exanest
Changeset: 4358f6f1a057 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4358f6f1a057 Added Files: clients/R/Tests/deps-install.timeout sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.sql sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.err sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.out sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.sql sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.err sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/autogen/autogen/msc.py buildtools/doc/windowsbuild.rst clients/R/Tests/dbapply.R clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/deps-test.timeout clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/install.R clients/mapiclient/mhelp.c clients/mapiclient/tachograph.c clients/mapilib/mapi.rc clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLError.c clients/odbc/driver/SQLGetDescRec.c clients/odbc/driver/SQLGetDiagField.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/stream.c common/utils/mcrypt.c configure.ag debian/changelog debian/fix-deb.sh gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_cross.c gdk/gdk_join.c gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/libbat.rc libversions monetdb5/mal/mal_linker.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/pcre.c monetdb5/optimizer/opt_dataflow.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi/type_conversion.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/vaults/shp/shp.c sql/common/sql_types.c sql/include/sql_hash.h sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out sql/server/rel_select.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/storage/store.c sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.sql sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.stable.out sql/test/BugTracker-2018/Tests/All sql/test/Tests/seq-default.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/pg_regress/Tests/update.stable.out sql/test/seq-default.sql 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/exportutils.py tools/merovingian/daemon/config/monetdbd.in vertoo.data Branch: exanest Log Message: Merge Aug2018-SP1 release into exanest diffs (truncated from 56132 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -709,3 +709,6 @@ 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd 3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_5 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
MonetDB: acticloud - Merge Aug2018-SP1 release into acticloud
Changeset: db90946b30d2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db90946b30d2 Added Files: clients/R/Tests/deps-install.timeout sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.sql sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.err sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.out sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.sql sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.err sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/autogen/autogen/msc.py buildtools/doc/windowsbuild.rst clients/R/Tests/dbapply.R clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/deps-test.timeout clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/install.R clients/mapiclient/mhelp.c clients/mapiclient/tachograph.c clients/mapilib/mapi.rc clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLError.c clients/odbc/driver/SQLGetDescRec.c clients/odbc/driver/SQLGetDiagField.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/stream.c common/utils/mcrypt.c configure.ag debian/changelog debian/fix-deb.sh gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_cross.c gdk/gdk_join.c gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/libbat.rc libversions monetdb5/mal/mal_linker.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/pcre.c monetdb5/optimizer/opt_dataflow.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi/type_conversion.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/vaults/shp/shp.c sql/common/sql_types.c sql/include/sql_hash.h sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out sql/server/rel_select.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/storage/store.c sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.sql sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.stable.out sql/test/BugTracker-2018/Tests/All sql/test/Tests/seq-default.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/pg_regress/Tests/update.stable.out sql/test/seq-default.sql 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/exportutils.py tools/merovingian/daemon/config/monetdbd.in vertoo.data Branch: acticloud Log Message: Merge Aug2018-SP1 release into acticloud diffs (truncated from 56132 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -709,3 +709,6 @@ 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd 3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_5 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
MonetDB: candidate-type - Merge with default branch.
Changeset: f7b8d58d3762 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7b8d58d3762
Modified Files:
monetdb5/optimizer/opt_projectionpath.c
Branch: candidate-type
Log Message:
Merge with default branch.
diffs (16 lines):
diff --git a/monetdb5/optimizer/opt_projectionpath.c
b/monetdb5/optimizer/opt_projectionpath.c
--- a/monetdb5/optimizer/opt_projectionpath.c
+++ b/monetdb5/optimizer/opt_projectionpath.c
@@ -236,8 +236,10 @@ OPTprojectionpathImplementation(Client c
/* inject the complete sub-path */
#ifdef DEBUG_OPT_PROJECTIONPATH
- fprintf(stderr,"#inject ");
- fprintInstruction(stderr,mb, 0, r,
LIST_MAL_ALL);
+ if (r) {
+ fprintf(stderr,"#inject ");
+ fprintInstruction(stderr,mb, 0, r,
LIST_MAL_ALL);
+ }
#endif
if ( getFunctionId(p) == projectionRef){
if( r && getModuleId(r)== algebraRef
&& ( getFunctionId(r)== projectionRef || getFunctionId(r)== projectionpathRef)
){
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: candidate-type - Fix some problems uncovered by testing.
Changeset: 5bf343520c89 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5bf343520c89
Modified Files:
monetdb5/optimizer/opt_projectionpath.c
sql/backends/monet5/sql.c
Branch: candidate-type
Log Message:
Fix some problems uncovered by testing.
diffs (37 lines):
diff --git a/monetdb5/optimizer/opt_projectionpath.c
b/monetdb5/optimizer/opt_projectionpath.c
--- a/monetdb5/optimizer/opt_projectionpath.c
+++ b/monetdb5/optimizer/opt_projectionpath.c
@@ -265,7 +265,8 @@ OPTprojectionpathImplementation(Client c
/* fix the type */
setVarUDFtype(mb, getArg(q,0));
- setVarType(mb, getArg(q,0),
newBatType(ATOMtype(getBatType(getArgType(mb,q,q->argc-1);
+ /* j = getBatType(getArgType(mb,q,q->argc-1)); */
+ /* setVarType(mb, getArg(q,0), newBatType(j ==
TYPE_void ? TYPE_oid : j)); */
if ( getFunctionId(q) == projectionRef )
setFunctionId(q,projectionpathRef);
q->typechk = TYPE_UNKNOWN;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1613,6 +1613,11 @@ DELTAsub(bat *result, const bat *col, co
BBPunfix(u->batCacheid);
throw(MAL, "sql.delta", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
}
+ if (!u->batIscand) {
+ if (res->ttype == TYPE_cnd)
+ res->ttype = TYPE_oid;
+ res->batIscand = false;
+ }
ret = BATappend(res, u, cminu, true);
BBPunfix(u->batCacheid);
if (cminu)
@@ -1628,7 +1633,7 @@ DELTAsub(bat *result, const bat *col, co
if (ret != GDK_SUCCEED) {
throw(MAL, "sql.delta", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
}
- res = u;
+ res = BATfixcand(u);
} else {
BBPunfix(u_val->batCacheid);
BBPunfix(u_id->batCacheid);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017-SP2-selinux-fix - Closing branch.
Changeset: 21afb17571c5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21afb17571c5 Branch: Jul2017-SP2-selinux-fix Log Message: Closing branch. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: config_rss - Use lng return type instead of int.
Changeset: 1c674df3b8f8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c674df3b8f8
Modified Files:
sql/backends/monet5/config_rss/test_rss.c
sql/backends/monet5/config_rss/test_rss.mal
sql/test/configurable_rss/Tests/rss.py
Branch: config_rss
Log Message:
Use lng return type instead of int.
diffs (34 lines):
diff --git a/sql/backends/monet5/config_rss/test_rss.c
b/sql/backends/monet5/config_rss/test_rss.c
--- a/sql/backends/monet5/config_rss/test_rss.c
+++ b/sql/backends/monet5/config_rss/test_rss.c
@@ -17,7 +17,7 @@
#define TEST_FILE "test_file"
-mal_export str TESTrestricted_rss(int* RetVal, lng* GDK_mem_maxsize /*in
bytes*/)
+mal_export str TESTrestricted_rss(lng* RetVal, lng* GDK_mem_maxsize /*in
bytes*/)
{
*RetVal = 0; // Use a dummy return value to make interfacing with
sql/mal easy.
diff --git a/sql/backends/monet5/config_rss/test_rss.mal
b/sql/backends/monet5/config_rss/test_rss.mal
--- a/sql/backends/monet5/config_rss/test_rss.mal
+++ b/sql/backends/monet5/config_rss/test_rss.mal
@@ -1,5 +1,5 @@
module test_config_rss;
-command run_test_config_rss(GDK_mem_maxsize:lng):int
+command run_test_config_rss(GDK_mem_maxsize:lng):lng
address TESTrestricted_rss
comment "C code will allocate memory and test whether the configured rss limit
is violated.";
diff --git a/sql/test/configurable_rss/Tests/rss.py
b/sql/test/configurable_rss/Tests/rss.py
--- a/sql/test/configurable_rss/Tests/rss.py
+++ b/sql/test/configurable_rss/Tests/rss.py
@@ -9,7 +9,7 @@ class RSSTestConfig:
sql_template = \
"""
create function test_rss(bound bigint)
-returns int external name test_config_rss.run_test_config_rss;
+returns bigint external name test_config_rss.run_test_config_rss;
select test_rss({gdk_mem_maxsize});
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: delete_in_vlist - Merge with default.
Changeset: 04c23a684738 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04c23a684738 Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/R/Tests/deps-install.timeout clients/mapilib/ChangeLog.Aug2018 clients/odbc/samples/testStmtAttr.c common/stream/ChangeLog.Aug2018 common/utils/strptime.cpp debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install gdk/ChangeLog.Aug2018 gdk/xoshiro256starstar.h geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 sql/backends/monet5/UDF/capi/Tests/capi14.sql sql/backends/monet5/UDF/capi/Tests/capi14.stable.err sql/backends/monet5/UDF/capi/Tests/capi14.stable.out sql/backends/monet5/UDF/capi/Tests/capi15.sql sql/backends/monet5/UDF/capi/Tests/capi15.stable.err sql/backends/monet5/UDF/capi/Tests/capi15.stable.out sql/backends/monet5/UDF/capi/Tests/capi16.sql sql/backends/monet5/UDF/capi/Tests/capi16.stable.err sql/backends/monet5/UDF/capi/Tests/capi16.stable.out sql/backends/monet5/UDF/capi/Tests/capi17.sql sql/backends/monet5/UDF/capi/Tests/capi17.stable.err sql/backends/monet5/UDF/capi/Tests/capi17.stable.out sql/backends/monet5/UDF/capi/Tests/capi18.sql sql/backends/monet5/UDF/capi/Tests/capi18.stable.err sql/backends/monet5/UDF/capi/Tests/capi18.stable.out sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.sql sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.err sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.out sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.sql sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.err sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.sql sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.err sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.out sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.err sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out
