Changeset: 0ae933dd61d5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ae933dd61d5
Added Files:
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.sql
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.err
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
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-aggregation-distinct-coalesce.Bug-6431.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-cast-decimal.Bug-6445.sql
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/sqlitelogictest-select-in.Bug-6433.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.out
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.err
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.sql
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.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/mergedb.Bug-6820.sql
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
sql/test/mergetables/Tests/mergedb_create.sql
sql/test/mergetables/Tests/mergedb_create.stable.err
sql/test/mergetables/Tests/mergedb_create.stable.out
sql/test/mergetables/Tests/mergedb_drop.sql
sql/test/mergetables/Tests/mergedb_drop.stable.err
sql/test/mergetables/Tests/mergedb_drop.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6426.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6426.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6426.stable.out
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
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:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/selinux/monetdb.te
clients/R/Tests/All
clients/R/Tests/copy_into_fwf.stable.out
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.reqtests
clients/R/Tests/dplyr.R
clients/R/Tests/install.R
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/ChangeLog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2017
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/gdk_calc_private.h
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_orderidx.c
gdk/gdk_project.c
gdk/gdk_qsort.c
gdk/gdk_search.c
gdk/gdk_select.c
gdk/gdk_ssort.c
gdk/gdk_unique.c
gdk/gdk_utils.c
gdk/gdk_value.c
gdk/libbat.rc
geom/monetdb5/geom.c
geom/monetdb5/geom.h
libversions
monetdb5/extras/rapi/converters.c.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/color.c
monetdb5/modules/atoms/color.h
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/str.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_remap.c
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/Tests/pyloader07.sql
sql/backends/monet5/Tests/pyloader07.stable.out
sql/backends/monet5/Tests/pyloader07.stable.out.Windows
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/backends/monet5/UDF/cudf/udf_impl.h
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/generator/generator.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_aggr_bte.mal
sql/backends/monet5/sql_aggr_dbl.mal
sql/backends/monet5/sql_aggr_flt.mal
sql/backends/monet5/sql_aggr_hge.mal
sql/backends/monet5/sql_aggr_int.mal
sql/backends/monet5/sql_aggr_lng.mal
sql/backends/monet5/sql_aggr_sht.mal
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_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_fround.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/bam_lib.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/shp/shp.c
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/include/sql_catalog.h
sql/scripts/39_analytics.sql
sql/scripts/39_analytics_hge.sql
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
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_atom.c
sql/server/sql_mvc.c
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/store.c
sql/storage/store_dependency.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.sql
sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out
sql/test/BugTracker-2012/Tests/insert_serial_with_unique_key.Bug-3091.sql
sql/test/BugTracker-2012/Tests/querycache.Bug-3212.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.err
sql/test/BugTracker-2016/Tests/All
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-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.sql
sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
sql/test/BugTracker-2017/Tests/extract_quarter_week_from_date.Bug-3831.sql
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.sql
sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
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/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Skyserver/drop_user.sql
sql/test/Tests/All
sql/test/Tests/marcin3.stable.err
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
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/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/mapi/Tests/sql_int128.stable.out.int128
sql/test/mergetables/Tests/All
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/remote/Tests/partition_elim.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.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/ChangeLog
testing/Mtest.py.in
tools/merovingian/daemon/merovingian.c
vertoo.data
Branch: mosaic
Log Message:
Merge with default
diffs (truncated from 44250 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -682,3 +682,6 @@ 1534ee14ff84fe5629becc6a5b5e2990b694d5a3
269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
fce449d5af88de715fde36624815a56ef34c56bb Jul2017_7
fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
+3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_9
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
+3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_SP2_release
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}
@@ -970,7 +970,7 @@ fi
--enable-monetdb5=yes \
--enable-netcdf=no \
--enable-odbc=yes \
- --enable-optimize=yes \
+ --enable-optimize=no \
--enable-profile=no \
--enable-pyintegration=%{?with_pyintegration:yes}%{!?with_pyintegration:no} \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
@@ -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
@@ -1041,6 +1046,47 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Sun Nov 5 2017 Sjoerd Mullender <[email protected]> - 11.27.9-20171105
+- BZ#6460 - selinux doen't allow mmap
+
+* Mon Oct 23 2017 Sjoerd Mullender <[email protected]> - 11.27.9-20171023
+- Rebuilt.
+- BZ#6207: identifier ambiguous when grouping and selecting the same
+ column twice
+- BZ#6335: Sqlitelogictest crash in complex SQL query
+- BZ#6405: Compilation error if DISABLE_PARENT_HASH not defined
+- BZ#6412: Overflow in sys.epoch
+- BZ#6413: Wrong answer for TPC-H Q17
+- BZ#6414: Using RPAD returns: could not allocate space
+- BZ#6416: Sqlitelogictest crash in aggregation query with a NOT IN clause
+- BZ#6417: Segfault encountered (sqlsmith)
+- BZ#6418: Segfault in renaming (sqlsmith)
+- BZ#6419: segfault in rel_optimizer (sqlsmith)
+- BZ#6420: Assertion error in mergetable task (sqlsmith)
+- BZ#6422: Another assertion error in rel_or (sqlsmith)
+- BZ#6423: Dereference null pointer (sqlsmith)
+- BZ#6424: Assertion error in rel_rename_expr (sqlsmith)
+- BZ#6425: Assertion error in exp_bin (sqlsmith)
+- BZ#6426: Assertion error in rel_find_exp_ (sqlsmith)
+- BZ#6427: Assertion error in eq_typeswitchloop (sqlsmith)
+- BZ#6428: Sqlitelogictest crash in aggregation query
+- BZ#6430: Assertion raised in another eq_typeswitch error (sqlsmith)
+- BZ#6431: Sqlitelogictest crash in aggregation query with a long
+ having clause
+- BZ#6432: Assertion error in exp_bin (sqlsmith)
+- BZ#6433: Sqlitelogictest crash in complex SELECT query with IN operator
+- BZ#6435: Sqlitelogictest crash in simple select query
+- BZ#6437: System schemas "profiler" and "json" shouldn't be allowed to
+ be dropped.
+- BZ#6438: Implement functionality to enforce the restrict option in:
+ DROP SCHEMA xyz RESTRICT;
+- BZ#6440: Faulty plan generated. Query returns more rows than expected
+ or existing in the view sys.tables.
+
+* Mon Oct 23 2017 Sjoerd Mullender <[email protected]> - 11.27.9-20171023
+- gdk: A serious bug, possibly resulting in database corruption, having to
+ do with appending data to a string BAT was fixed.
+
* Wed Oct 11 2017 Panagiotis Koutsourakis <[email protected]> -
11.27.7-20171011
- Rebuilt.
- BZ#4017: server crashes when executing particular loopback query in
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
@@ -33,6 +33,12 @@
#define _CRT_SECURE_NO_DEPRECATE 1
#endif
+/* include Intel's mathimf.h early, before any other include files
+ * might try to include math.h */
+#ifdef __INTEL_COMPILER
+#include <mathimf.h>
+#endif
+
#include <malloc.h>
#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
@@ -160,14 +166,6 @@
/* Define if the fits module is to be enabled */
/* #undef HAVE_FITS */
-/* Define to 1 if you have the `fpclass' function. */
-#define HAVE_FPCLASS 1 /* uses _fpclass, see mmath.c */
-
-/* Define to 1 if you have the `fpclassify' function. */
-#if defined(_MSC_VER) && _MSC_VER > 1600
-#define HAVE_FPCLASSIFY 1
-#endif
-
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
/* #undef HAVE_FSEEKO */
@@ -237,11 +235,6 @@
/* Define to 1 if you have the <io.h> header file. */
#define HAVE_IO_H 1
-/* Define to 1 if you have the `isinf' function. */
-#if !defined(_MSC_VER) || _MSC_VER > 1600
-#define HAVE_ISINF 1
-#endif
-
/* Define to 1 if you have the <kvm.h> header file. */
/* #undef HAVE_KVM_H */
@@ -369,7 +362,7 @@
/* #undef HAVE_NL_LANGINFO */
/* Define to 1 if you have the `nextafterf' function. */
-#if !defined(_MSC_VER) || _MSC_VER > 1600
+#if defined(__INTEL_COMPILER) || !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_NEXTAFTERF 1
#endif
@@ -430,7 +423,7 @@
/* #undef HAVE_RESTRICT */
/* Define to 1 if you have the `round' function. */
-#if !defined(_MSC_VER) || _MSC_VER > 1600
+#if defined(__INTEL_COMPILER) || !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_ROUND 1
#endif
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -1,4 +1,4 @@
-policy_module(monetdb, 0.1)
+policy_module(monetdb, 0.2)
# The above line declares that this file is a SELinux policy file. Its
# name is monetdb, so the file should be saved as monetdb.te
@@ -39,6 +39,7 @@ manage_files_pattern(mserver5_t, mserver
manage_dirs_pattern(mserver5_t, mserver5_db_t, mserver5_db_t)
manage_files_pattern(monetdbd_t, mserver5_db_t, mserver5_db_t)
manage_dirs_pattern(monetdbd_t, mserver5_db_t, mserver5_db_t)
+allow mserver5_t mserver5_db_t:file { map };
# the context used for the configuration files
type monetdbd_etc_t;
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,8 +1,8 @@
HAVE_LIBR?deps-install
HAVE_LIBR?install
HAVE_LIBR?deps-test
-HAVE_LIBR&HAVE_PERL?dbi
-HAVE_LIBR?dplyr
+HAVE_LIBR?dbi
+#HAVE_LIBR?dplyr too slow
HAVE_LIBR?dplyr-flights
HAVE_LIBR?copy_into_fwf
HAVE_LIBR&NOT_WIN32?dbapply
diff --git a/clients/R/Tests/copy_into_fwf.stable.out
b/clients/R/Tests/copy_into_fwf.stable.out
--- a/clients/R/Tests/copy_into_fwf.stable.out
+++ b/clients/R/Tests/copy_into_fwf.stable.out
@@ -26,6 +26,8 @@ Ready.
<MonetDBResult>
SQL CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE PRECISION, disp
DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION, wt DOUBLE
PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE PRECISION,
gear DOUBLE PRECISION, carb DOUBLE PRECISION)
+ ROWS Fetched: 0 [complete]
+ Changed: NA
mpg cyl disp hp drat wt qsec vs am gear carb
1 21.0 6 160.0 110 3.90 2.620 16.46 0 1 4 4
2 21.0 6 160.0 110 3.90 2.875 17.02 0 1 4 4
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -198,7 +198,7 @@ stopifnot(identical(1L, as.integer(dbGet
# reserved words in data frame column names
stopifnot(dbIsValid(conn))
dbBegin(conn)
-dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24,
some.dot=12), transaction=F)
+dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24, some.dot=12))
stopifnot(dbExistsTable(conn, "evilt"))
dbRollback(conn)
@@ -208,7 +208,7 @@ dbBegin(conn)
data(api, package="survey")
x <- apiclus1
x$idkey <- seq( nrow( x ) )
-dbWriteTable( conn , 'x' , x , transaction=F)
+dbWriteTable( conn , 'x' , x )
stopifnot(dbExistsTable(conn, "x"))
dbRollback(conn)
@@ -217,7 +217,7 @@ stopifnot(!is.null(dbGetQuery(conn, "SEL
#non-standard dbwritetable use
dbBegin(conn)
-dbWriteTable(conn, "vectable", 1:1000, transaction=F)
+dbWriteTable(conn, "vectable", 1:1000)
stopifnot(dbExistsTable(conn, "vectable"))
dbRollback(conn)
diff --git a/clients/R/Tests/dbi.stable.err b/clients/R/Tests/dbi.stable.err
--- a/clients/R/Tests/dbi.stable.err
+++ b/clients/R/Tests/dbi.stable.err
@@ -33,19 +33,16 @@ stderr of test 'dbi` in directory 'clien
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Warning message:
'MonetDBLite::isIdCurrent' is deprecated.
-Use 'dbIsValid' instead.
+Use 'use dbIsValid() instead' instead.
See help("Deprecated")
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
-Treating character vector parameter as file name(s) for monetdb.read.csv()
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
-Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
-Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "some.dot" contain uppercase or reserved SQL characters and
need(s) to be quoted in queries.
Identifier(s) "year", "month", "day" are reserved SQL keywords and need(s) to
be quoted in queries.
Identifier(s) "sch.wide", "comp.imp", "yr.rnd", "acs.k3", "acs.46",
"acs.core", "pct.resp", "not.hsg", "some.col", "col.grad", "grad.sch",
"avg.ed", "api.stu" contain uppercase or reserved SQL characters and need(s) to
be quoted in queries.
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,13 +1,11 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
+options(warn = -1)
+packages_required <- c("digest", "DBI")
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-repos <- "http://cran.rstudio.com/";
-packages_required <- c("devtools", "digest")
-install.packages(packages_required, repos=repos, quiet=T)
-update.packages(repos=repos, ask=F, oldPkgs=packages_required)
-devtools::install_github("rstats-db/DBI", quiet=T)
+install.packages(packages_required, repos="http://cran.rstudio.com/";)
cat("#~EndProfilingOutput~#\n", file=stderr())
cat("#~EndProfilingOutput~#\n\n", file=stdout())
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,26 +1,16 @@
-packages_required <- c('Rcpp', 'dplyr', 'Lahman', 'nycflights13', 'gdata',
'survey')
+packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest")
install_or_upgrade_packages <- function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <- 'http://cran.rstudio.com/'
if(length(np)) install.packages(np, repos=repos, quiet=T)
update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
-
- # dev dplyr
- if (packageVersion("devtools") < 1.6) {
- install.packages("devtools")
- }
- devtools::install_github("hadley/lazyeval")
- devtools::install_github("hadley/dplyr")
-
}
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
-
install_or_upgrade_packages(packages_required)
cat("#~EndProfilingOutput~#\n", file=stderr())
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
