MonetDB: default - Merge with Jul2017 branch.
Changeset: f59c9e53e089 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f59c9e53e089
Modified Files:
MonetDB.spec
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (15 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1002,6 +1002,11 @@ make %{?_smp_mflags}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
cd buildtools/selinux
+%if 0%{?fedora} < 27
+# no `map' policy available before Fedora 27
+sed -i '/map/d' monetdb.te
+%endif
+
for selinuxvariant in %{selinux_variants}
do
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Get rid of binary data file in favor of a cal...
Changeset: 2558332b32b1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2558332b32b1 Added Files: sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql Removed Files: sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2 sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in Branch: Jul2017 Log Message: Get rid of binary data file in favor of a call to generate_series. diffs (19 lines): diff --git a/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2 b/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2 deleted file mode 100644 index 90b03b56a0ff24e708d77fbeadc169f998762bfc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 GIT binary patch literal 0 Hc$@https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - bzip2 no longer needed.
Changeset: 544589ddde36 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=544589ddde36 Modified Files: sql/test/BugTracker-2016/Tests/All Branch: Jul2017 Log Message: bzip2 no longer needed. diffs (12 lines): diff --git a/sql/test/BugTracker-2016/Tests/All b/sql/test/BugTracker-2016/Tests/All --- a/sql/test/BugTracker-2016/Tests/All +++ b/sql/test/BugTracker-2016/Tests/All @@ -19,7 +19,7 @@ catalog_name_qualifier.Bug-3948 stream_table_crash.Bug-3952 null_in_null.Bug-3900 rank_rewrite.Bug-3890 -HAVE_LIBBZ2?min-max-uuid-column-wrong-results.Bug-3953 +min-max-uuid-column-wrong-results.Bug-3953 update_crash.Bug-3954 group_distinct_quantile.Bug-3927 HAVE_GEOM?merge_project.Bug-3955 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Use less volatile table when testing.
Changeset: 1d6d58c83a79 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d6d58c83a79 Modified Files: sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out Branch: Jul2017 Log Message: Use less volatile table when testing. diffs (58 lines): diff --git a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql --- a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql +++ b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql @@ -1,3 +1,3 @@ -select name,name from sys.functions group by name limit 2; -select name, name from sys.functions group by name,name limit 2; -select f.name, f.name from sys.functions AS f group by name,name limit 2; +select privilege_code_name,privilege_code_name from sys.privilege_codes group by privilege_code_name limit 2; +select privilege_code_name, privilege_code_name from sys.privilege_codes group by privilege_code_name,privilege_code_name limit 2; +select f.privilege_code_name, f.privilege_code_name from sys.privilege_codes AS f group by privilege_code_name,privilege_code_name limit 2; diff --git a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out --- a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out +++ b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out @@ -24,27 +24,27 @@ Ready. # 08:52:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-4722" "--port=34679" # 08:52:53 > -#select name,name from sys.functions group by name limit 2; -% sys.functions, sys.functions # table_name -% name,name # name +#select privilege_code_name,privilege_code_name from sys.privilege_codes group by privilege_code_name limit 2; +% sys.privilege_codes, sys.privilege_codes # table_name +% privilege_code_name, privilege_code_name # name % varchar, varchar # type -% 11, 11 # length -[ "mbr_overlap", "mbr_overlap" ] -[ "mbr_above", "mbr_above" ] -#select name, name from sys.functions group by name,name limit 2; -% sys.functions, sys.functions # table_name -% name,name # name +% 6, 6 # length +[ "SELECT","SELECT"] +[ "UPDATE","UPDATE"] +#select privilege_code_name, privilege_code_name from sys.privilege_codes group by privilege_code_name,privilege_code_name limit 2; +% sys.privilege_codes, sys.privilege_codes # table_name +% privilege_code_name, privilege_code_name # name % varchar, varchar # type -% 11, 11 # length -[ "mbr_overlap", "mbr_overlap" ] -[ "mbr_above", "mbr_above" ] -#select f.name, f.name from sys.functions AS f group by name,name limit 2; +% 6, 6 # length +[ "SELECT","SELECT"] +[ "UPDATE","UPDATE"] +#select f.privilege_code_name, f.privilege_code_name from sys.privilege_codes AS f group by privilege_code_name,privilege_code_name limit 2; % sys.f, sys.f # table_name -% name,name # name +% privilege_code_name, privilege_code_name # name % varchar, varchar # type -% 11, 11 # length -[ "mbr_overlap", "mbr_overlap" ] -[ "mbr_above", "mbr_above" ] +% 6, 6 # length +[ "SELECT","SELECT"] +[ "UPDATE","UPDATE"] # 08:52:53 > # 08:52:53 > "Done." ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Check results of sql_session_create
Changeset: 4a11a91e6d27 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a11a91e6d27
Modified Files:
sql/server/sql_mvc.c
sql/storage/store.c
Branch: Jul2017
Log Message:
Check results of sql_session_create
diffs (31 lines):
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -556,6 +556,13 @@ mvc_create(int clientid, backend_stack s
store_lock();
m->session = sql_session_create(stk, 1 /*autocommit on*/);
store_unlock();
+ if(!m->session) {
+ qc_destroy(m->qc);
+ _DELETE(m->vars);
+ _DELETE(m->args);
+ _DELETE(m);
+ return NULL;
+ }
m->type = Q_PARSE;
m->pushdown = 1;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1846,6 +1846,10 @@ idle_manager(void)
}
s = sql_session_create(gtrans->stk, 0);
+ if(!s) {
+ MT_lock_unset(&bs_lock);
+ continue;
+ }
sql_trans_begin(s);
if (store_vacuum( s->tr ) == 0)
sql_trans_commit(s->tr);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Sorry again for the merge
Changeset: b6c462f2f6df for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6c462f2f6df Added Files: sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql Removed Files: sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2 sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in Modified Files: sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out Branch: Jul2017 Log Message: Sorry again for the merge diffs (89 lines): diff --git a/sql/test/BugTracker-2016/Tests/All b/sql/test/BugTracker-2016/Tests/All --- a/sql/test/BugTracker-2016/Tests/All +++ b/sql/test/BugTracker-2016/Tests/All @@ -19,7 +19,7 @@ catalog_name_qualifier.Bug-3948 stream_table_crash.Bug-3952 null_in_null.Bug-3900 rank_rewrite.Bug-3890 -HAVE_LIBBZ2?min-max-uuid-column-wrong-results.Bug-3953 +min-max-uuid-column-wrong-results.Bug-3953 update_crash.Bug-3954 group_distinct_quantile.Bug-3927 HAVE_GEOM?merge_project.Bug-3955 diff --git a/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2 b/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2 deleted file mode 100644 index 90b03b56a0ff24e708d77fbeadc169f998762bfc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 GIT binary patch literal 0 Hc$@ "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-4722" "--port=34679" # 08:52:53 > -#select name,name from sys.functions group by name limit 2; -% sys.functions, sys.functions # table_name -% name,name # name +#select privilege_code_name,privilege_code_name from sys.privilege_codes group by privilege_code_name limit 2; +% sys.privilege_codes, sys.privilege_codes # table_name +% privilege_code_name, privilege_code_name # name % varchar, varchar # type -% 11, 11 # length -[ "mbr_overlap", "mbr_overlap" ] -[ "mbr_above", "mbr_above" ] -#select name, name from sys.functions group by name,name limit 2; -% sys.functions, sys.functions # table_name -% name,name # name +% 6, 6 # length +[ "SELECT","SELECT"] +[ "UPDATE","UPDATE"] +#select privilege_code_name, privilege_code_name from sys.privilege_codes group by privilege_code_name,privilege_code_name limit 2; +% sys.privilege_codes, sys.privilege_codes # table_name +% privilege_code_name, privilege_code_name # name % varchar, varchar # type -% 11, 11 # length -[ "mbr_overlap", "mbr_overlap" ] -[ "mbr_above", "mbr_above" ] -#select f.name, f.name from sys.functions AS f group by name,name limit 2; +% 6, 6 # length +[ "SELECT","SELECT"] +[ "UPDATE","UPDATE"] +#select f.privilege_code_name, f.privilege_code_name from sys.privilege_codes AS f group by privilege_code_name,privilege_code_name limit 2; % sys.f, sys.f # table_name -% name,name # name +% privilege_code_name, privilege_code_name # name % varchar, varchar # type -% 11, 11 # length -[ "mbr_overlap", "mbr_overlap" ] -[ "mbr_above", "mbr_above" ] +% 6, 6 # length +[ "SELECT","SELECT"] +[ "UPDATE","UPDATE"] # 08:52:53 > # 08:52:53 > "Done." ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Approve upgrade for 32 bit.
Changeset: 952d57b7ba07 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=952d57b7ba07 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: Jul2017 Log Message: Approve upgrade for 32 bit. diffs (84 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -24,6 +24,17 @@ stdout of test 'upgrade` in directory 's # MonetDB/R module loaded Ready. +Running database upgrade commands: +GRANT SELECT ON sys.keywords TO PUBLIC; +GRANT SELECT ON sys.table_types TO PUBLIC; +GRANT SELECT ON sys.dependency_types TO PUBLIC; +GRANT SELECT ON sys.function_types TO PUBLIC; +GRANT SELECT ON sys.function_languages TO PUBLIC; +GRANT SELECT ON sys.key_types TO PUBLIC; +GRANT SELECT ON sys.index_types TO PUBLIC; +GRANT SELECT ON sys.privilege_codes TO PUBLIC; +GRANT EXECUTE ON FUNCTION sys.environment() TO PUBLIC; +GRANT SELECT ON sys.environment TO PUBLIC; # 13:21:57 > # 13:21:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29247" "--port=33065" diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out @@ -24,6 +24,17 @@ stdout of test 'upgrade` in directory 's # MonetDB/R module loaded Ready. +Running database upgrade commands: +GRANT SELECT ON sys.keywords TO PUBLIC; +GRANT SELECT ON sys.table_types TO PUBLIC; +GRANT SELECT ON sys.dependency_types TO PUBLIC; +GRANT SELECT ON sys.function_types TO PUBLIC; +GRANT SELECT ON sys.function_languages TO PUBLIC; +GRANT SELECT ON sys.key_types TO PUBLIC; +GRANT SELECT ON sys.index_types TO PUBLIC; +GRANT SELECT ON sys.privilege_codes TO PUBLIC; +GRANT EXECUTE ON FUNCTION sys.environment() TO PUBLIC; +GRANT SELECT ON sys.environment TO PUBLIC; # 15:41:18 > # 15:41:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-7576" "--port=32696" diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out @@ -19,6 +19,17 @@ stdout of test 'upgrade` in directory 's # MonetDB/SQL module loaded Ready. +Running database upgrade commands: +GRANT SELECT ON sys.keywords TO PUBLIC; +GRANT SELECT ON sys.table_types TO PUBLIC; +GRANT SELECT ON sys.dependency_types TO PUBLIC; +GRANT SELECT ON sys.function_types TO PUBLIC; +GRANT SELECT ON sys.function_languages TO PUBLIC; +GRANT SELECT ON sys.key_types TO PUBLIC; +GRANT SELECT ON sys.index_types TO PUBLIC; +GRANT SELECT ON sys.privilege_codes TO PUBLIC; +GRANT EXECUTE ON FUNCTION sys.environment() TO PUBLIC; +GRANT SELECT ON sys.environment TO PUBLIC; # 13:21:58 > # 13:21:58 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade" diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out b/sql/test/testdb-upgrade/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out @@ -19,6 +19,17 @@ stdout of test 'upgrade` in directory 's # MonetDB/SQL module loaded Ready. +Running database upgrade commands: +GRANT SELECT ON sys.keywords TO PUBLIC; +GRANT SELECT ON sys.table_types TO PUBLIC; +GRANT SELECT ON sys.dependency_types TO PUBLIC; +GRANT SELECT ON sys.function_types TO PUBLIC; +GRANT SELECT ON sys.function_languages TO PUBLIC; +GRANT SELECT ON sys.key_types TO PUBLIC; +GRANT SELECT ON sys.index_types TO PUBLIC; +GRANT SELECT ON sys.privilege_codes TO PUBLIC; +GRANT EXECUTE ON FUNCTION sys.environment() TO PUBLIC; +GRANT SELECT ON sys.environment TO PUBLIC; # 16:00:56 > # 16:00:56 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade" ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Add test condition.
Changeset: 49b8453cdd4d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=49b8453cdd4d Modified Files: sql/test/mergetables/Tests/All Branch: Jul2017 Log Message: Add test condition. diffs (14 lines): diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All --- a/sql/test/mergetables/Tests/All +++ b/sql/test/mergetables/Tests/All @@ -22,8 +22,8 @@ addtable mergedb_create HAVE_NETCDF&HAVE_SAMTOOLS?mergedb.Bug-6820 -HAVE_NETCDF?sqlsmith.Bug-6426 +HAVE_NETCDF&HAVE_SAMTOOLS?sqlsmith.Bug-6426 HAVE_NETCDF?sqlsmith.Bug-6451 HAVE_NETCDF?sqlsmith.Bug-6453 -HAVE_NETCDF?sqlsmith.Bug-6455 +HAVE_NETCDF&HAVE_SAMTOOLS?sqlsmith.Bug-6455 mergedb_drop ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: jitudf - Merge with default.
Changeset: 53bb444c8ee1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53bb444c8ee1
Added Files:
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.sql
sql/test/BugTracker-2017/Tests/insert_into_multiple_subqueries.Bug-6448.sql
sql/test/BugTracker-2017/Tests/insert_into_multiple_subqueries.Bug-6448.stable.err
sql/test/BugTracker-2017/Tests/insert_into_multiple_subqueries.Bug-6448.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-cast-decimal.Bug-6445.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-cast-decimal.Bug-6445.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6449.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6449.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6449.stable.out
sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.sql
sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.stable.err
sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.stable.out
sql/test/Tests/fsum.sql
sql/test/Tests/fsum.stable.err
sql/test/Tests/fsum.stable.out
sql/test/Tests/fsum1.sql.src
sql/test/Tests/fsum1.stable.err.src
sql/test/Tests/fsum1.stable.out.src
sql/test/mergetables/Tests/sqlsmith.Bug-6451.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6451.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6451.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6453.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6453.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6453.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6455.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6455.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6455.stable.out
Removed Files:
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.SQL.py
sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out.int128
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
buildtools/selinux/monetdb.te
clients/Tests/exports.stable.out
configure.ag
gdk/ChangeLog.Jul2017
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_bat.c
gdk/gdk_calc.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_utils.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
monetdb5/mal/mal_parser.c
monetdb5/modules/kernel/mmath.h
sql/backends/monet5/sql_gencode.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_select.c
sql/server/rel_sequence.c
sql/server/rel_updates.c
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_scan.c
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.err
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.sql
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Tests/All
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.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.int128
sql/test/mergetables/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-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.int128
testing/Mtest.py.in
tools/merovingian/daemon/merovingian.c
Branch: jitudf
Log Message:
Merge with default.
diffs (truncated from 25152 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -885,7 +885,7 @@ developer, but if you do want to test, t
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
%package selinux
-Summary: MonetDB - Monet Database Management System
+Summary: SELinux policy files for MonetDB
Group: Applications/Databases
%if "%{_selinux_policy_version}" != ""
Requires: selinux-policy >= %{_selinux_policy_version}
@@ -1002,6 +
MonetDB: Jul2017 - Check the output of registering a name in the...
Changeset: 1613b618c34c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1613b618c34c
Modified Files:
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/mal/language.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_remap.c
sql/backends/monet5/sql_scenario.c
Branch: Jul2017
Log Message:
Check the output of registering a name in the MAL namespace
diffs (151 lines):
diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -38,8 +38,13 @@ newAssignment(MalBlkPtr mb)
InstrPtr
newStmt(MalBlkPtr mb, const char *module, const char *name)
{
- InstrPtr q = newInstruction(mb, putName(module), putName(name));
+ InstrPtr q;
+ str mName = putName(module), nName = putName(name);
+ if(mName == NULL || nName == NULL) {
+ return NULL;
+ }
+ q = newInstruction(mb, mName, nName);
if ( q == NULL)
return NULL;
setDestVar(q, newTmpVariable(mb, TYPE_any));
@@ -71,11 +76,18 @@ InstrPtr
newFcnCall(MalBlkPtr mb, char *mod, char *fcn)
{
InstrPtr q = newAssignment(mb);
+ str fcnName, modName;
if ( q == NULL || mod == NULL || fcn == NULL)
return NULL;
- setModuleId(q, putName(mod));
- setFunctionId(q, putName(fcn));
+ modName = putName(mod);
+ fcnName = putName(fcn);
+ if(modName == NULL || fcnName == NULL) {
+ freeInstruction(q);
+ return NULL;
+ }
+ setModuleId(q, modName);
+ setFunctionId(q, fcnName);
return q;
}
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -23,6 +23,9 @@ Symbol newFunction(str mod, str nme,int
InstrPtr p;
int varid;
+ if(mod == NULL || nme == NULL)
+ return NULL;
+
s = newSymbol(nme,kind);
if (s == NULL)
return NULL;
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -29,6 +29,10 @@ newSymbol(str nme, int kind)
if (cur == NULL)
return NULL;
cur->name = putName(nme);
+ if(cur->name == NULL) {
+ GDKfree(cur);
+ return NULL;
+ }
cur->kind = kind;
cur->peer = NULL;
cur->def = newMalBlk(kind == FUNCTIONsymbol? STMT_INCREMENT : 2);
diff --git a/monetdb5/modules/mal/language.c b/monetdb5/modules/mal/language.c
--- a/monetdb5/modules/mal/language.c
+++ b/monetdb5/modules/mal/language.c
@@ -180,18 +180,26 @@ CMDregisterFunction(Client cntxt, MalBlk
str *code = getArgReference_str(stk,pci,3);
str *help = getArgReference_str(stk,pci,4);
InstrPtr sig;
- str msg;
+ str msg, fcnName, modName, ahelp;
msg= compileString(&sym, cntxt,*code);
if( sym) {
mnstr_printf(cntxt->fdout,"#register FUNCTION %s.%s\n",
getModuleId(sym->def->stmt[0]),
getFunctionId(sym->def->stmt[0]));
mb= sym->def;
+ fcnName = putName(*fcn);
+ modName = putName(*mod);
+ ahelp = GDKstrdup(*help);
+ if(fcnName == NULL || modName == NULL || help == NULL) {
+ freeSymbol(sym);
+ GDKfree(ahelp);
+ throw(MAL, "language.register", MAL_MALLOC_FAIL);
+ }
if( help)
- mb->help= GDKstrdup(*help);
+ mb->help= ahelp;
sig= getSignature(sym);
- sym->name= putName(*fcn);
- setModuleId(sig, putName(*mod));
+ sym->name= fcnName;
+ setModuleId(sig, modName);
setFunctionId(sig, sym->name);
insertSymbol(findModule(cntxt->nspace, getModuleId(sig)), sym);
}
diff --git a/monetdb5/optimizer/opt_multiplex.c
b/monetdb5/optimizer/opt_multiplex.c
--- a/monetdb5/optimizer/opt_multiplex.c
+++ b/monetdb5/optimizer/opt_multiplex.c
@@ -57,6 +57,8 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
mod = putName(mod);
fcn = VALget(&getVar(mb, getArg(pci, pci->retc+1))->value);
fcn = putName(fcn);
+ if(mod == NULL || fcn == NULL)
+ throw(MAL, "optimizer.multiplex", MAL_MALLOC_FAIL);
#ifndef NDEBUG
fprintf(stderr,"#WARNING To speedup %s.%s a bulk operator
implementation is needed\n#", mod,fcn);
fprintInstruction(stderr, mb, stk, pci, LIST_MAL_DEBUG);
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -23,6 +23,7 @@ OPTremapDirect(Client cnt
monetdb-java: embedded - Merged with default
Changeset: 89c285fc0a49 for monetdb-java URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=89c285fc0a49 Modified Files: .hgtags ChangeLog ChangeLog-Archive Makefile build.properties build.xml pom.xml release.txt src/main/java/nl/cwi/monetdb/client/JdbcClient.java src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java src/main/java/nl/cwi/monetdb/mcl/responses/ResultSetResponse.java src/main/java/nl/cwi/monetdb/merovingian/Control.java src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java src/main/java/nl/cwi/monetdb/util/Extract.java src/main/java/nl/cwi/monetdb/util/SQLExporter.java src/main/java/nl/cwi/monetdb/util/SQLRestore.java tests/Test_Cmanycon.java tests/Test_PSmanycon.java tests/build.xml Branch: embedded Log Message: Merged with default diffs (truncated from 3875 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 80de05f07508fec938845b4a6e05f600bf0b48c0 v2.24 c43c293f3d5841517cbe0d858108c4da5fb1ec0c v2.26 a6a2f4ee2d42d7e192f9d8d37f79ea99178d7f2c v2.25 +fe8170e2b549c22ceb2d96301022b9304f62424d v2.27 diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,37 @@ # ChangeLog file for monetdb-java # This file is updated with Maddlog +* Mon Oct 23 2017 Sjoerd Mullender +- Compiled and released new jars: monetdb-jdbc-2.27.jar, monetdb-mcl-1.16.jar + and updated jdbcclient.jar + +* Thu Oct 5 2017 Martin van Dinther +- Corrected method Connection.prepareCall(). It used to return null. + Now it throws an SQLFeatureNotSupportedException to comply with the + JDBC specification. + +* Thu Sep 28 2017 Martin van Dinther +- Added possibility to let the JDBC driver return columnType value + Types.VARCHAR instead of Types.CLOB in case the result column of a + ResultSet or parameter in a PreparedStatement is of data type 'clob'. + To enable this behavior provide it as JDBC connection URL property: + treat_clob_as_varchar=true + For example: jdbc:monetdb://localhost:5/demo?treat_clob_as_varchar=true + See also: + https://www.monetdb.org/Documentation/Manuals/SQLreference/Programming/JDBC + This custom clob mapping informs generic JDBC programs to fetch clob + column values via method ResultSet.getString() instead of getClob() + and Clob.getCharacterStream() and next fetching from the stream. + As MonetDB server MAPI communication protocol does not support + streaming of parts of a CLOB value, the current implementation is to + send over the whole CLOB value as a string. Therefore there is no + performance gain when fetching those Clob values via getClob() and + getCharacterStream(). In fact it creates a lot of overhead (additional + objects and method calls) and triples the amount of needed Java Heap memory + for each Clob value! + With this connection property set, you can reduce this overhead when + working with clob column data from generic JDBC programs. + * Thu Sep 7 2017 Martin van Dinther - Implemented PreparedStatement methods setNCharacterStream(int, Reader) and setNCharacterStream(int, Reader, long). @@ -15,8 +46,8 @@ - Implemented PreparedStatement method setURL(int, URL). - Implemented PreparedStatement method setNString(int, String). - The MonetDB JDBC driver code and jdbcclient program are now compiled - without debug info and with optimise flag enabled. The new jar files are - now smaller in size. + without debug info and with optimise flag enabled. + The new jar files are now some 20% smaller in size. * Thu Aug 17 2017 Martin van Dinther - Implemented ResultSet method getNCharacterStream(). @@ -24,16 +55,7 @@ and getCharacterStream(long pos, long length). Method getCharacterStream() is called by DBeaver to fetch the Clob value. It used to throw a SQLFeatureNotSupportedException with message: - "Method getCharacterStream() currently not supported". This caused + "Operation getCharacterStream() currently not supported". This caused DBeaver to log the exception and show NULL as the value on screen, which is incorrect. This has been fixed. -* Fri Jul 28 2017 Sjoerd Mullender -- Compiled and released new jars: monetdb-jdbc-2.26.jar and updated jdbcclient.jar - -* Thu Jul 13 2017 Martin van Dinther -- Corrected implementation of PreparedStatement method - setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) - for the case the targetSqlType is Types.CLOB. - See also: http
