subject:"MonetDB\: remote_auth \- Merge with default"

MonetDB: remote_auth - Merge with default

2018-05-29 Thread Panagiotis Koutsourakis

Changeset: c360a431a190 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c360a431a190
Modified Files:
MonetDB.spec
debian/monetdb5-server.install
Branch: remote_auth
Log Message:

Merge with default


diffs (30 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -679,7 +679,6 @@ fi
 %endif
 %{_libdir}/monetdb5/lib_capi.so
 %{_libdir}/monetdb5/lib_generator.so
-%{_libdir}/monetdb5/lib_lsst.so
 %{_libdir}/monetdb5/lib_opt_sql_append.so
 %{_libdir}/monetdb5/lib_udf.so
 %{_libdir}/monetdb5/lib_vault.so
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -3,7 +3,6 @@ debian/tmp/usr/lib/libmonetdb5.so.* usr/
 
 # usr/lib/monetdb5/lib_*.so EXCEPT: lib_{bam,geom,gsl,lidar,pyapi,rapi,sql}.so
 debian/tmp/usr/lib/monetdb5/lib_generator.so usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lib_lsst.so usr/lib/monetdb5
 debian/tmp/usr/lib/monetdb5/lib_opt_sql_append.so usr/lib/monetdb5
 debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5
 debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
@@ -25,7 +24,6 @@ debian/tmp/usr/lib/monetdb5/u[!d]*.mal u
 debian/tmp/usr/lib/monetdb5/autoload/??_batcalc.mal usr/lib/monetdb5/autoload
 debian/tmp/usr/lib/monetdb5/autoload/??_calc.mal usr/lib/monetdb5/autoload
 debian/tmp/usr/lib/monetdb5/autoload/??_generator.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/autoload/??_lsst.mal usr/lib/monetdb5/autoload
 debian/tmp/usr/lib/monetdb5/autoload/??_opt_sql_append.mal 
usr/lib/monetdb5/autoload
 debian/tmp/usr/lib/monetdb5/autoload/??_udf.mal usr/lib/monetdb5/autoload
 debian/tmp/usr/lib/monetdb5/autoload/??_vault.mal usr/lib/monetdb5/autoload
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: remote_auth - Merge with default

2018-05-28 Thread Panagiotis Koutsourakis

Changeset: d6e73d6b9447 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6e73d6b9447
Removed Files:
sql/backends/monet5/LSST/80_lsst.mal
sql/backends/monet5/LSST/Makefile.ag
sql/backends/monet5/LSST/Tests/All
sql/backends/monet5/LSST/Tests/lsst.sql.src
sql/backends/monet5/LSST/Tests/lsst.stable.err
sql/backends/monet5/LSST/Tests/lsst.stable.out
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.reqtests
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.err
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/LSST/lsst.h
sql/backends/monet5/LSST/lsst.mal
sql/backends/monet5/LSST/lsst.sql
Modified Files:
.hgtags
ChangeLog
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Mar2018
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
clients/mapiclient/mclient.c
debian/changelog
libversions
monetdb5/ChangeLog
sql/ChangeLog-Archive
sql/ChangeLog.Mar2018
sql/backends/monet5/Makefile.ag
testing/README
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 1643 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -695,3 +695,5 @@ 28edc063ceb6a3726af887911a3e4ac4a33c504f
 f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_3
 28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_release
 f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_release
+ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_5
+ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
+* Fri May 25 2018 Ying Zhang 
+- Added a '-f rowcount' option in mclient to repress printing the actual
+  data of a resultset, but only print the number of returned tuples
+
 * Tue Feb 13 2018 Pedro Ferreira 
 - Added support for lz4 compressed files on stream library
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV 
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Mar2018/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Mar2018-SP1/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1034,6 +1034,59 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri May 25 2018 Panagiotis Koutsourakis  - 
11.29.5-20180525
+- Rebuilt.
+- BZ#6562: Sqlitelogictest crash on group by query with not in operator
+- BZ#6565: Sqlitelogictest crash on complex select query with coalesce
+  call
+- BZ#6566: Sqlitelogictest unavailable calc.- MAL operations
+- BZ#6568: Sqlitelogictest crash on complex case query
+- BZ#6569: Sqlitelogictest select query with not between cause with
+  wrong results
+- BZ#6570: Sqlitelogictest select coalesce undefined calc
+- BZ#6572: ordered index Error in optimizer garbageCollector
+- BZ#6573: Sqlitelogictest crash on complex select query with case
+  statement
+- BZ#6574: server crashed could not find ordered index while creating
+  a table
+- BZ#6575: Sqlitelogictest crash on groupby query with coalesce call
+- BZ#6576: Sqlitelogictest aritmetic expressions with negative numbers
+  handling
+- BZ#6577: creating temp table kills performance of the original query
+- BZ#6578: One two-tuple insert gives different results than two single
+  inserts
+- BZ#6579: Sqlitelogic test infinite loop while compiling SQL query
+- BZ#6581: Join condition errors.
+- BZ#6583: Fixed size string concatenation with integer results in fixed
+  size string of size 0
+- BZ#6584: SELECT FROM REMOTE TABLE WHERE IS NOT NULL produces wrong
+  result
+- BZ#6585: Nested Merge tables cause an infinite loop in rel_optimizer
+- BZ#6587: Sqlitelogictest crash on complex case statement
+- BZ#6589: Sqlitelogictest crash on complex on complex expression
+- BZ#6594: Sqlitelogictest crash on complex case statement
+- BZ#6595: Remote decimal division triggers assertion / returns wrong
+  answer
+- BZ#6598: Python 3.4 not supported (due to usage of Py_DecodeLocale)
+- BZ#6600: Sqlitelogictest queries fail to execute
+- BZ#6601: "where is null" clause on remote table causes problem with
+  next query
+- BZ#6602: Sqlitelogictest wrong results in IN query
+- BZ#6603: Sqlitelogictest: Aggregation query with

MonetDB: remote_auth - Merge with default

2018-05-25 Thread Panagiotis Koutsourakis

Changeset: f5a738b5b6e0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5a738b5b6e0
Added Files:
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
Modified Files:
debian/fix-deb.sh
sql/backends/monet5/UDF/capi/Tests/All
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/capi/cheader.h
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 1191 to 300 lines):

diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -35,7 +35,7 @@ 1)
 esac
 
 case $SUITE in
-wheezy | precise | trusty)
+wheezy | trusty)
 # fix control file because these systems don't have liblas and a
 # too old version of libgeos
 sed -i -e 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' \
@@ -47,7 +47,7 @@ wheezy | precise | trusty)
 esac
 
 case $SUITE in
-wheezy | jessie | precise | trusty | wily)
+wheezy | jessie | trusty | wily)
 # Xenial Xerus (and presumably newer releases) uses php-cli,
 # all others still have php5-cli and don't have php*-sockets
 sed -i 's/php-cli/php5-cli/;s/, *php-sockets//' debian/control
@@ -55,11 +55,18 @@ wheezy | jessie | precise | trusty | wil
 esac
 
 case $SUITE in
-wheezy | precise)
+wheezy)
 # numpy is too old
 sed -i -e 's/, python-dev[^,]*//;s/, python-numpy[^,]*//' \
-e '/^Package:.*monetdb-python2/,/^$/d' debian/control
 sed -i '/pyintegration=yes/s/yes/no/' debian/rules
 rm debian/monetdb-python2.install
 ;;
+trusty)
+# the trusty linker produces unresolved references to openSSL functions
+sed -i '/openssl_LIBS/s/WIN32?//' clients/mapilib/Makefile.ag
+lib=$(grep openssl_LIBS clients/mapilib/Makefile.am)
+lib="${lib%% *}"
+sed -i "s/\\\$($lib)/\$(openssl_LIBS)/g" clients/mapilib/Makefile.am 
clients/mapilib/Makefile.in
+;;
 esac
diff --git a/sql/backends/monet5/UDF/capi/Tests/All 
b/sql/backends/monet5/UDF/capi/Tests/All
--- a/sql/backends/monet5/UDF/capi/Tests/All
+++ b/sql/backends/monet5/UDF/capi/Tests/All
@@ -14,4 +14,6 @@ NOT_WIN32?capi11
 NOT_WIN32?capi12
 NOT_WIN32?capi13
 NOT_WIN32?capi14
-
+NOT_WIN32?capi15
+NOT_WIN32?capi16
+NOT_WIN32?capi17
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi15.sql 
b/sql/backends/monet5/UDF/capi/Tests/capi15.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi15.sql
@@ -0,0 +1,19 @@
+
+START TRANSACTION;
+
+CREATE FUNCTION capi16(i INTEGER, j STRING, k BLOB, l DATE, m TIMESTAMP, n 
TIME)
+RETURNS INTEGER
+LANGUAGE C {
+result->initialize(result, i.count);
+for(size_t it = 0; it < i.count; it++) {
+result->data[it] = i.data[it] * 2;
+}
+};
+
+CREATE TABLE capi16table(i INTEGER, j STRING, k BLOB, l DATE, m TIMESTAMP, n 
TIME);
+SELECT i, capi16(i, j, k, l, m, n) FROM capi16table;
+
+DROP TABLE capi16table;
+DROP FUNCTION capi16;
+
+ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi15.stable.err 
b/sql/backends/monet5/UDF/capi/Tests/capi15.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi15.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'capi15` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 14:47:44 >  
+# 14:47:44 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=32682" "--set" 
"mapi_usock=/var/tmp/mtest-72472/.s.monetdb.32682" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5_UDF_capi" 
"--set" "embedded_c=true"
+# 14:47:44 >  
+
+# builtin opt  gdk_dbpath = /Users/myth/opt/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 32682
+# cmdline opt  mapi_usock = /var/tmp/mtest-72472/.s.monetdb.32682
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbpath = 
/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5_UDF_capi
+# cmdline opt  embedded_c = true
+# cmdline opt  gdk_debug = 553648138
+
+# 14:47:44 >  
+#

MonetDB: remote_auth - Merge with default

2018-05-24 Thread Panagiotis Koutsourakis

Changeset: 4751de1e20bb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4751de1e20bb
Added Files:
sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-not-in.Bug-6605.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-not-in.Bug-6605.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-not-in.Bug-6605.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out
Modified Files:
MonetDB.spec
buildtools/selinux/monetdb.te
gdk/gdk_aggr.c
gdk/gdk_select.c
sql/ChangeLog.Mar2018
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/21_dependency_views.sql
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.err
sql/test/BugTracker-2018/Tests/All

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/orderidx/Tests/simpletable.sql
sql/test/orderidx/Tests/simpletable.stable.out
sql/test/orderidx/Tests/simpletable.stable.out.32bit
sql/test/orderidx/Tests/smalltable.sql
sql/test/orderidx/Tests/smalltable.stable.out
sql/test/orderidx/Tests/smalltable.stable.out.32bit
sql/test/pg_regress/Tests/vacuum.sql
sql/test/pg_regress/Tests/vacuum.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 2824 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -640,7 +640,6 @@ fi
 %exclude %{_libdir}/monetdb5/fits.mal
 %exclude %{_libdir}/monetdb5/autoload/*_fits.mal
 %exclude %{_libdir}/monetdb5/createdb/*_fits.sql
-%exclude %{_libdir}/monetdb5/lib_fits.so
 %endif
 %if %{?with_geos:1}%{!?with_geos:0}
 %exclude %{_libdir}/monetdb5/geom.mal
@@ -674,25 +673,16 @@ fi
 %endif
 %exclude %{_libdir}/monetdb5/autoload/??_sql*.mal
 %{_libdir}/monetdb5/autoload/*.mal
-%if %{?with_geos:1}%{!?with_geos:0}
-%exclude %{_libdir}/monetdb5/lib_geom.so
-%endif
-%if %{?with_lidar:1}%{!?with_lidar:0}
-%exclude %{_libdir}/monetdb5/lib_lidar.so
-%endif
-%if %{?with_pyintegration:1}%{!?with_pyintegration:0}
-%exclude %{_libdir}/monetdb5/lib_pyapi.so
-%endif
-%if %{?with_rintegration:1}%{!?with_rintegration:0}
-%exclude %{_libdir}/monetdb5/lib_rapi.so
-%endif
 %if %{?with_samtools:1}%{!?with_samtools:0}
 %exclude %{_libdir}/monetdb5/bam.mal
 %exclude %{_libdir}/monetdb5/autoload/*_bam.mal
-%exclude %{_libdir}/monetdb5/lib_bam.so
 %endif
-%exclude %{_libdir}/monetdb5/lib_sql.so
-%{_libdir}/monetdb5/*.so
+%{_libdir}/monetdb5/lib_capi.so
+%{_libdir}/monetdb5/lib_generator.so
+%{_libdir}/monetdb5/lib_lsst.so
+%{_libdir}/monetdb5/lib_opt_sql_append.so
+%{_libdir}/monetdb5/lib_udf.so
+%{_libdir}/monetdb5/lib_vault.so
 %doc %{_mandir}/man1/mserver5.1.gz
 %dir %{_datadir}/doc/MonetDB
 %docdir %{_datadir}/doc/MonetDB
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -1,7 +1,24 @@
-policy_module(monetdb, 0.2)
+policy_module(monetdb, 0.3)
 # The above line declares that this file is a SELinux policy file. Its
 # name

MonetDB: remote_auth - Merge with default

2018-05-17 Thread Panagiotis Koutsourakis

Changeset: 742d0f2c8f8e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=742d0f2c8f8e
Branch: remote_auth
Log Message:

Merge with default

For some reason previous merge did not go through correctly

___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: remote_auth - Merge with default

2018-05-17 Thread Panagiotis Koutsourakis

Changeset: 2d3b6c5615b2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d3b6c5615b2
Added Files:

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.out
Modified Files:
sql/backends/monet5/sql_upgrades.c

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
Branch: remote_auth
Log Message:

Merge with default


diffs (207 lines):

diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1509,7 +1509,7 @@ sql_update_mar2018_sp1(Client c, mvc *sq
char *schema = stack_get_string(sql, "current_schema");
 
if (buf == NULL)
-   throw(SQL, "sql_update_dec2016_sp3", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
+   throw(SQL, "sql_update_mar2018_sp1", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos,
"set schema \"sys\";\n"
"drop function 
sys.dependencies_functions_os_triggers();\n"
diff --git 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
--- 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
+++ 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
@@ -29,7 +29,7 @@ Ready.
 #ELSE NULL END ) AS BIGINT) AS col2;
 % .L14 # table_name
 % col2 # name
-% bigint # type
+% hugeint # type
 % 1 # length
 [ NULL ]
 
diff --git 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
--- 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
+++ 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
@@ -28,11 +28,11 @@ Ready.
 #INSERT INTO tab0 VALUES (97,1,99), (15,81,47), (87,21,10);
 [ 3]
 #SELECT ALL - ( - COUNT ( * ) ) FROM tab0 AS cor0 WHERE col0 / ( - + col2 ) 
NOT IN ( + + col0, + col0 * + ( col1 ), + ( + - col0 ) * - 45, + CAST ( NULL AS 
INTEGER ) );
-% sys.L34 # table_name
-% L34 # name
+% sys.L31 # table_name
+% L31 # name
 % bigint # type
 % 1 # length
-[ 3]
+[ 0]
 #DROP TABLE tab0;
 
 # 19:12:39 >  
diff --git 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
--- 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
+++ 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
@@ -2,3 +2,22 @@ CREATE TABLE tab2(col0 INTEGER, col1 INT
 INSERT INTO tab2 VALUES(64,77,40),(75,67,58),(46,51,23);
 SELECT * FROM tab2 WHERE + col2 NOT IN ( + - 59 + + ( 76 ), col1, + CAST ( 
NULL AS INTEGER ), col1, - 19, col1 );
 DROP TABLE tab2;
+
+CREATE TABLE CITIES(CITY varchar(50) NULL);
+INSERT INTO CITIES
+   SELECT 'Paris' UNION ALL
+   SELECT 'Montreal' UNION ALL
+   SELECT 'New York' UNION ALL
+   SELECT NULL;
+
+SELECT 'Found Montreal' WHERE 'Montreal' IN (SELECT city from CITIES);
+SELECT 'Found Sidney' WHERE 'Sidney' IN (SELECT city from CITIES);
+SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN (SELECT city from CITIES);
+SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN ('Paris','Montreal','New 
York');
+SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN ('Paris','Montreal','New 
York', NULL);
+SELECT 'Sidney Not Found' WHERE 'Sidney'<>'Paris' AND 'Sidney'<>'Montreal';
+SELECT 'Sidney Not Found' WHERE 'Sidney'<>'Paris' AND 'Sidney'<>'Montreal' AND 
'Sidney'<>null;
+
+SELECT city from CITIES WHERE city in (select city from CITIES);
+--SELECT 'Sidney Not Found' WHERE NOT EXISTS (SELECT 1/0 FROM CITIES WHERE 
CITY = 'Sidney');
+drop table CITIES;
diff --git 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err
 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'sqlitelogictest-select-not-in-wrong.Bug-6602` in directory 
'sql/test/BugTracker-2018` itself:
+
+
+# 21:00:27 >  
+# 21:00:27 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31602" "--set" 
"mapi_usock=/var/tmp/mtest-15721/.s.monetdb.31602" "--set" "monet_prompt=" 
"--forcemito"

MonetDB: remote_auth - Merge with default

2018-05-16 Thread Panagiotis Koutsourakis

Changeset: a904cdb2b00a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a904cdb2b00a
Removed Files:
NT/mkgeomwxs.py
Modified Files:
NT/Makefile
NT/mksqlwxs.py
buildtools/ChangeLog
clients/mapiclient/mclient.c
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 370 to 300 lines):

diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -26,7 +26,6 @@ install: targetdirs all
$(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" install
$(INSTALL) .monetdb "$(sysconfdir)"
$(PYTHON) $(NT)\mksqlwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" 
"$(prefix)" > "$(prefix)\MonetDB5-SQL-Installer.wxs"
-   $(PYTHON) $(NT)\mkgeomwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" 
"$(prefix)" > "$(prefix)\MonetDB5-Geom-Installer.wxs"
$(PYTHON) $(NT)\mkodbcwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" 
"$(prefix)" > "$(prefix)\MonetDB-ODBC-Installer.wxs"
 
 $(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py
deleted file mode 100644
--- a/NT/mkgeomwxs.py
+++ /dev/null
@@ -1,143 +0,0 @@
-from __future__ import print_function
-
-# python mkgeomwxs.py VERSION makedefs.txt PREFIX > 
PREFIX/MonetDB5-Geom-Installer.wxs
-# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch 
x64/x86 PREFIX/MonetDB5-Geom-Installer.wxs
-# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03 
-sice:ICE60 -sice:ICE82 -ext WixUIExtension 
PREFIX/MonetDB5-Geom-Installer.wixobj
-
-import sys, os
-
-# doesn't change
-upgradecode = {'x64': '{8E6CDFDE-39B9-43D9-97B3-2440C012845C}',
-   'x86': '{92C89C36-0E86-45E1-B3D8-0D6C91108F30}'}
-
-def comp(features, id, depth, files):
-indent = ' ' * depth
-for f in files:
-print('%s' % (indent, id))
-print('%s  ' % 
(indent, f.split('\\')[-1], f))
-print('%s' % indent)
-features.append('_%d' % id)
-id += 1
-return id
-
-def main():
-if len(sys.argv) != 4:
-print(r'Usage: mkgeomwxs.py version makedefs.txt installdir')
-return 1
-makedefs = {}
-for line in open(sys.argv[2]):
-key, val = line.strip().split('=', 1)
-makedefs[key] = val
-if makedefs['bits'] == '64':
-folder = r'ProgramFiles64Folder'
-arch = 'x64'
-else:
-folder = r'ProgramFilesFolder'
-arch = 'x86'
-vs = os.getenv('vs')# inherited from TestTools\common.bat
-features = []
-print(r'')
-print(r'http://schemas.microsoft.com/wix/2006/wi;>')
-print(r'  ' % 
(upgradecode[arch], sys.argv[1]))
-print(r'' % arch)
-print(r'')
-print(r'')
-print(r'')
-# print(r'')
-print(r'')
-print(r'  ')
-print(r'')
-print(r'')
-print(r'')
-print(r'')
-print(r'')
-print(r'  INSTALLDIR')
-print(r'')
-print(r'')
-if vs == '17':
-msvc = r'C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC\Redist\MSVC'
-d = sorted(os.listdir(msvc))[-1]
-msm = '_CRT_%s.msm' % arch
-for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
-if msm in f:
-fn = f
-print(r'  ' % (msvc, d, fn))
-else:
-print(r'  ' % (vs, arch))
-print(r'  ' % folder)
-print(r'')
-print(r'  ')
-id = 1
-print(r'')
-id = comp(features, id, 14,
-  [r'%s\bin\geos_c.dll' % makedefs['LIBGEOS']])
-print(r'')
-print(r'')
-print(r'  ')
-print(r'')
-id = comp(features, id, 18,
-  [r'lib\monetdb5\autoload\%s' % x for x in sorted(filter(lambda 
x: x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 
'lib', 'monetdb5', 'autoload'])
-print(r'')
-print(r'')
-id = comp(features, id, 18,
-  [r'lib\monetdb5\createdb\%s' % x for x in sorted(filter(lambda 
x: x.endswith('.sql') and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 
'lib', 'monetdb5', 'createdb'])
-print(r'')
-id = comp(features, id, 16,
-  [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: 
x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 
'lib', 'monetdb5'])
-id = comp(features, id, 16,
-  [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: 
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' 
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'])
-print(r'  ')
-print(r'')
-print(r'  ')
-print(r'')
-print(r'  ')
-print(r'')
-print(r'')
-for f in features:
-print(r'  ' % f)
-

MonetDB: remote_auth - Merge with default

2018-05-15 Thread Panagiotis Koutsourakis

Changeset: 812bd878c4ca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=812bd878c4ca
Added Files:
sql/test/Dump/Tests/clean-again.reqtests
sql/test/Dump/Tests/clean-again.sql.src
sql/test/Dump/Tests/clean-again.stable.err
sql/test/Dump/Tests/clean-again.stable.out
sql/test/Dump/Tests/dump-again.SQL.py
sql/test/Dump/Tests/dump-again.reqtests
sql/test/Dump/Tests/dump-again.stable.err
sql/test/Dump/Tests/dump-again.stable.out
sql/test/Dump/Tests/reload-again.SQL.py
sql/test/Dump/Tests/reload-again.reqtests
sql/test/Dump/Tests/reload-again.stable.err
sql/test/Dump/Tests/reload-again.stable.out
sql/test/Dump/Tests/test-again.reqtests
sql/test/Dump/Tests/test-again.sql.src
sql/test/Dump/Tests/test-again.stable.err.src
sql/test/Dump/Tests/test-again.stable.out.src
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/msqldump.c
clients/odbc/driver/Makefile.ag
clients/odbc/driver/SQLExecute.c
configure.ag
sql/test/Dump/Tests/All
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 1070 to 300 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -121,15 +121,15 @@ get_schema(Mapi mid)
 }
 
 /* return TRUE if the HUGEINT type exists */
-static int
+static bool
 has_hugeint(Mapi mid)
 {
MapiHdl hdl;
-   int ret;
+   bool ret;
static int hashge = -1;
 
if (hashge >= 0)
-   return hashge;
+   return (bool) hashge;
 
if ((hdl = mapi_query(mid,
  "SELECT id "
@@ -145,7 +145,7 @@ has_hugeint(Mapi mid)
if (mapi_error(mid))
goto bailout;
mapi_close_handle(hdl);
-   hashge = ret;
+   hashge = (int) ret;
return ret;
 
   bailout:
@@ -383,8 +383,8 @@ static int dump_column_definition(
const char *schema,
const char *tname,
const char *tid,
-   int foreign,
-   int hashge);
+   bool foreign,
+   bool hashge);
 
 static const char *geomsubtypes[] = {
NULL,   /* 0 */
@@ -399,7 +399,7 @@ static const char *geomsubtypes[] = {
 };
 
 static int
-dump_type(Mapi mid, stream *toConsole, const char *c_type, const char 
*c_type_digits, const char *c_type_scale, int hashge)
+dump_type(Mapi mid, stream *toConsole, const char *c_type, const char 
*c_type_digits, const char *c_type_scale, bool hashge)
 {
int space = 0;
 
@@ -533,7 +533,7 @@ dump_type(Mapi mid, stream *toConsole, c
 }
 
 static int
-dump_column_definition(Mapi mid, stream *toConsole, const char *schema, const 
char *tname, const char *tid, int foreign, int hashge)
+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;
@@ -782,7 +782,7 @@ describe_table(Mapi mid, const char *sch
int type = 0;
size_t maxquerylen;
char *sname = NULL;
-   int hashge;
+   bool hashge;
 
if (schema == NULL) {
if ((sname = strchr(tname, '.')) != NULL) {
@@ -1281,7 +1281,36 @@ dump_table_data(Mapi mid, const char *sc
s = mapi_fetch_field(hdl, i);
if (s == NULL)
mnstr_printf(toConsole, "NULL");
-   else if (string[i]) {
+   else if (useInserts) {
+   const char *tp = mapi_get_type(hdl, i);
+   if (strcmp(tp, "sec_interval") == 0) {
+   const char *p = strchr(s, '.');
+   if (p == NULL)
+   p = s + strlen(s);
+   mnstr_printf(toConsole, "INTERVAL 
'%.*s' SECOND", (int) (p - s), s);
+   } else if (strcmp(tp, "month_interval") == 0)
+   mnstr_printf(toConsole, "INTERVAL '%s' 
MONTH", s);
+   else if (strcmp(tp, "timestamptz") == 0)
+   mnstr_printf(toConsole, "TIMESTAMP WITH 
TIME ZONE '%s'", s);
+   else if (strcmp(tp, "timestamp") == 0)
+   mnstr_printf(toConsole, "TIMESTAMP 
'%s'", s);
+   else if (strcmp(tp, "timetz") == 0)
+   mnstr_printf(toConsole, "TIME WITH TIME 
ZONE '%s'", s);
+   else if (strcmp(tp, "time") == 0)
+   mnstr_printf(toConsole, "TIME '%s'", s);
+   else if (strcmp(tp, "date") == 0)
+

MonetDB: remote_auth - Merge with default

2018-05-15 Thread Panagiotis Koutsourakis

Changeset: e56350abb97f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e56350abb97f
Added Files:

sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.SQL.py

sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err

sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-distinct-duplicate.Bug-6603.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-distinct-duplicate.Bug-6603.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-distinct-duplicate.Bug-6603.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql

sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.err

sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.out
Modified Files:
clients/mapiclient/dump.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_optimizer.h
sql/server/rel_partition.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
sql/test/BugTracker-2018/Tests/All

sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out
sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/mergetables/Tests/mergequery.stable.out
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 2685 to 300 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -256,7 +256,7 @@ dump_foreign_keys(Mapi mid, const char *
  "pkt.schema_id = ps.id AND "
  "fkt.schema_id = fs.id AND "
  "fkt.system = FALSE "
-   "ORDER BY fs.name,fkt.name, "
+   "ORDER BY fs.name, fkt.name, "
  "fkk.name, nr";
}
hdl = mapi_query(mid, query);
@@ -804,7 +804,7 @@ describe_table(Mapi mid, const char *sch
 
query = malloc(maxquerylen);
snprintf(query, maxquerylen,
-"%s\n"
+"%s "
 "SELECT t.name, t.query, t.type, c.remark "
 "FROM sys.schemas s, sys._tables t LEFT OUTER JOIN comments c 
ON t.id = c.id "
 "WHERE s.name = '%s' AND "
@@ -949,8 +949,12 @@ describe_table(Mapi mid, const char *sch
if (cnt)
mnstr_printf(toConsole, ");\n");
snprintf(query, maxquerylen,
-   "%s\n"
-"SELECT i.name, c.remark FROM sys.idxs i, comments c 
WHERE i.id = c.id AND i.table_id = (SELECT id FROM sys._tables WHERE schema_id 
= (select id FROM sys.schemas WHERE name = '%s') AND name = '%s') ORDER BY 
i.name",
+   "%s "
+"SELECT i.name, c.remark "
+"FROM sys.idxs i, comments c "
+"WHERE i.id = c.id "
+  "AND i.table_id = (SELECT id FROM sys._tables WHERE 
schema_id = (select id FROM sys.schemas WHERE name = '%s') AND name = '%s') "
+"ORDER BY i.name",
 get_compat_clause(mid),
 schema, tname);
if ((hdl = mapi_query(mid, query))

MonetDB: remote_auth - Merge with default

2018-05-10 Thread Panagiotis Koutsourakis

Changeset: 207e2b432fb8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=207e2b432fb8
Added Files:
sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.sql
sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.err
sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.out
sql/test/Tests/copy-from-compressed.csv.bz2
sql/test/Tests/copy-from-compressed.csv.gz
sql/test/Tests/copy-from-compressed.csv.raw
sql/test/Tests/copy-from-compressed.csv.xz
sql/test/Tests/copy-from-compressed.sql.in
sql/test/Tests/copy-from-compressed.stable.err
sql/test/Tests/copy-from-compressed.stable.out
Modified Files:
clients/mapiclient/dump.c
common/stream/stream.c
configure.ag
sql/test/BugTracker-2018/Tests/All
sql/test/Tests/All
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 1121 to 300 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1117,7 +1117,7 @@ describe_schema(Mapi mid, const char *sn
MapiHdl hdl = NULL;
char schemas[5120];
 
-   snprintf(schemas, 5120,
+   snprintf(schemas, sizeof(schemas),
"%s\n"
"SELECT s.name, a.name, c.remark "
"FROM sys.auths a, "
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1630,7 +1630,18 @@ open_xzstream(const char *restrict filen
strncmp(buf, UTF8BOM, UTF8BOMLENGTH) == 0) {
s->isutf8 = 1;
} else {
-   rewind(xz->fp);
+   FILE *fp = xz->fp;
+   lzma_ret ret;
+   lzma_end(>strm);
+   ret = lzma_stream_decoder(>strm, UINT64_MAX, 
LZMA_CONCATENATED);
+   if (ret != LZMA_OK) {
+   destroy(s);
+   free(xz);
+   fclose(fp);
+   return NULL;
+   }
+   rewind(fp);
+   xz->fp = fp;
}
}
return s;
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -87,7 +87,7 @@ AS_VAR_IF([PKG_CONFIG], [],
 # need to be escapes with an extra \.  Configure does not support \'s
 # in path names, so there is no need to do anything special here
 # except set the variables.  The command to set them in case we do
-# need to escape the \'s is Qvar=`echo "$var" | sed 's///g'`
+# need to escape the \'s is Qvar=`AS_ECHO(["$var"]) | sed 's///g'`
 BUILD=[`pwd`]
 AC_SUBST([BUILD])
 
@@ -107,12 +107,12 @@ AS_VAR_IF([prefix], [NONE],
[Qprefix="${ac_default_prefix}"].
[Qprefix="${prefix}"])
 
-Qprefix=`echo "$Qprefix" | sed 's///g'`
+Qprefix=`AS_ECHO(["$Qprefix"]) | sed 's///g'`
 AC_SUBST([Qprefix])
 # exec_prefix is created very late, so let make do the expansion
 AS_VAR_IF([exec_prefix], [NONE],
[Qexec_prefix='${prefix}'],
-   [Qexec_prefix=`echo "$exec_prefix" | sed 's///g'`])
+   [Qexec_prefix=`AS_ECHO(["$exec_prefix"]) | sed 's///g'`])
 AC_SUBST([Qexec_prefix])
 
 # small hack to get icc -no-gcc, done here because AC_PROG_CC shouldn't
@@ -460,7 +460,7 @@ AS_CASE([$CC_version],
[*'Sun Ceres C '*|*'Sun C '*], [
# developer/sunstudioexpress and
# developer/sunstudio12u1 respectively
-   CC_ver="suncc-`echo "$CC_version" | sed -n 's/.*Sun 
Ceres C \(.*\) SunOS.*/\1/p;s/.*Sun C \(.*\) SunOS.*/\1/p'`"
+   CC_ver="suncc-`AS_ECHO(["$CC_version"]) | sed -n 
's/.*Sun Ceres C \(.*\) SunOS.*/\1/p;s/.*Sun C \(.*\) SunOS.*/\1/p'`"
CC_version="$CC_V"],
[AC_MSG_WARN([compiler not recognized:
 `$CC --version` says
@@ -499,7 +499,7 @@ AS_CASE([$host_os],
AS_IF([test -s /etc/os-release], [
# this is the new way of getting release 
information
# works for Fedora >= 17, Ubuntu >= 12.04 
(Precise Pangolin)
-   LINUX_DIST=`source /etc/os-release; echo 
${ID}:${VERSION_ID}`],
+   LINUX_DIST=`source /etc/os-release; 
AS_ECHO(["${ID}:${VERSION_ID}"])`],
[test -s /etc/fedora-release ], [
LINUX_DIST=`cat /etc/fedora-release | head -n1 \
| sed 's|^.*\(Fedora\).* release 
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`],
@@ -529,7 +529,7 @@ AS_CASE([$host_os],
[test -s /etc/debian_version ], [

MonetDB: remote_auth - Merge with default

2018-05-09 Thread Panagiotis Koutsourakis

Changeset: f0358608072b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0358608072b
Added Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.reqtests
sql/test/emptydb-upgrade-chain/Tests/upgrade.reqtests
sql/test/emptydb-upgrade-hge/Tests/upgrade.reqtests
sql/test/emptydb-upgrade/Tests/upgrade.reqtests
Removed Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
Modified Files:
clients/mapiclient/dump.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/21_dependency_functions.sql
sql/server/sql_mvc.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 969 to 300 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2416,13 +2416,13 @@ get_with_comments_as_clause(Mapi mid)
", function_types AS (\n"
"   SELECT function_type_id, function_type_name, 
function_type_keyword\n"
"   FROM sys.function_types, (VALUES\n"
-   "   (1, \'FUNCTION\'), \n"
-   "   (2, \'PROCEDURE\'),\n"
-   "   (3, \'AGGREGATE\'),\n"
-   "   (4, \'FILTER FUNCTION\'),\n"
-   "   (5, \'FUNCTION\'), \n"
-   "   (6, \'FUNCTION\'), \n"
-   "   (7, \'LOADER\')) AS (id, 
function_type_keyword)\n"
+   "   (1, 'FUNCTION'), \n"
+   "   (2, 'PROCEDURE'),\n"
+   "   (3, 'AGGREGATE'),\n"
+   "   (4, 'FILTER FUNCTION'),\n"
+   "   (5, 'FUNCTION'), \n"
+   "   (6, 'FUNCTION'), \n"
+   "   (7, 'LOADER')) AS (id, function_type_keyword)\n"
"   WHERE id = function_type_id\n"
")\n"
", function_languages AS (\n"
diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1502,6 +1502,34 @@ sql_update_mar2018_samtools(Client c, mv
 #endif /* HAVE_SAMTOOLS */
 
 static str
+sql_update_mar2018_sp1(Client c, mvc *sql)
+{
+   size_t bufsize = 2048, pos = 0;
+   char *buf = GDKmalloc(bufsize), *err = NULL;
+   char *schema = stack_get_string(sql, "current_schema");
+
+   if (buf == NULL)
+   throw(SQL, "sql_update_dec2016_sp3", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
+   pos += snprintf(buf + pos, bufsize - pos,
+   "set schema \"sys\";\n"
+   "drop function 
sys.dependencies_functions_os_triggers();\n"
+   "CREATE FUNCTION dependencies_functions_on_triggers()\n"
+   "RETURNS TABLE (sch varchar(100), usr varchar(100), 
dep_type varchar(32))\n"
+   "RETURN TABLE (SELECT f.name, tri.name, 'DEP_TRIGGER' 
from functions as f, triggers as tri, dependencies as dep where dep.id = f.id 
AND dep.depend_id =tri.id AND dep.depend_type = 8);\n"
+   "insert into sys.systemfunctions (select id from 
sys.functions where name in ('dependencies_functions_on_triggers') and 
schema_id = (select id from sys.schemas where name = 'sys') and id not in 
(select function_id from sys.systemfunctions));\n"
+   "delete from systemfunctions where function_id not in 
(select id from functions);\n");
+   if (schema)
+   pos +=

MonetDB: remote_auth - Merge with default

2018-05-03 Thread Panagiotis Koutsourakis

Changeset: 0fd5dea30bad for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0fd5dea30bad
Added Files:
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/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.sql
sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.h
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLTablePrivileges.c
sql/backends/monet5/UDF/capi/Tests/All
sql/backends/monet5/UDF/capi/capi.c
sql/storage/bat/bat_logger.c
sql/test/BugTracker-2018/Tests/All
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 848 to 300 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -15,6 +15,16 @@
 #include 
 #include "msqldump.h"
 
+static const char *
+get_compat_clause(Mapi mid)
+{
+   static const char *compat_clause = NULL;
+   if (!compat_clause) {
+   compat_clause = get_with_comments_as_clause(mid);
+   }
+   return compat_clause;
+}
+
 static void
 quoted_print(stream *f, const char *s, bool singleq)
 {
@@ -790,15 +800,17 @@ describe_table(Mapi mid, const char *sch
 
hashge = has_hugeint(mid);
 
-   maxquerylen = 512 + strlen(tname) + strlen(schema);
+   maxquerylen = 5120 + strlen(tname) + strlen(schema);
 
query = malloc(maxquerylen);
snprintf(query, maxquerylen,
+"%s\n"
 "SELECT t.name, t.query, t.type, c.remark "
-"FROM sys.schemas s, sys._tables t LEFT OUTER JOIN 
sys.comments c ON t.id = c.id "
+"FROM sys.schemas s, sys._tables t LEFT OUTER JOIN comments c 
ON t.id = c.id "
 "WHERE s.name = '%s' AND "
   "t.schema_id = s.id AND "
   "t.name = '%s'",
+get_compat_clause(mid),
 schema, tname);
 
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
@@ -937,7 +949,10 @@ describe_table(Mapi mid, const char *sch
if (cnt)
mnstr_printf(toConsole, ");\n");
snprintf(query, maxquerylen,
-"SELECT i.name, c.remark FROM sys.idxs i, sys.comments 
c WHERE i.id = c.id AND i.table_id = (SELECT id FROM sys._tables WHERE 
schema_id = (select id FROM sys.schemas WHERE name = '%s') AND name = '%s') 
ORDER BY i.name", schema, tname);
+   "%s\n"
+"SELECT i.name, c.remark FROM sys.idxs i, comments c 
WHERE i.id = c.id AND i.table_id = (SELECT id FROM sys._tables WHERE schema_id 
= (select id FROM sys.schemas WHERE name = '%s') AND name = '%s') ORDER BY 
i.name",
+get_compat_clause(mid),
+schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
while (mapi_fetch_row(hdl) != 0) {
@@ -950,13 +965,16 @@ describe_table(Mapi mid, const char *sch
}
 
snprintf(query, maxquerylen,
-"SELECT col.name, com.remark FROM sys._columns col, 
sys.comments com WHERE col.id = com.id AND col.table_id = (SELECT id FROM 
sys._tables WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = '%s') 
AND name = '%s') ORDER BY number", schema, tname);
+   "%s\n"
+   "SELECT col.name, com.remark FROM sys._columns col, 
comments com WHERE col.id = com.id AND col.table_id = (SELECT id FROM 
sys._tables WHERE schema_id = (SELECT id FROM sys.schemas WHERE name = '%s') 
AND name = '%s') ORDER BY number",
+   get_compat_clause(mid),
+   schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
while (mapi_fetch_row(hdl) != 0) {
comment_on(toConsole, "COLUMN", schema, tname,
-  mapi_fetch_field(hdl, 0),
-  mapi_fetch_field(hdl, 1));
+   mapi_fetch_field(hdl, 0),
+   mapi_fetch_field(hdl, 1));
}
mapi_close_handle(hdl);
hdl = NULL;
@@ -1015,10 +1033,11 @@ describe_sequence(Mapi mid, const char *
schema = sname;
}
 
-   maxquerylen = 512 + strlen(tname) + strlen(schema);
+   maxquerylen = 5120 + strlen(tname) + strlen(schema);
 
query = malloc(maxquerylen);
snprintf(query, maxquerylen,
+   "%s\n"
"SELECT s.name, "
 "seq.name, "

MonetDB: remote_auth - Merge with default

2018-04-30 Thread Panagiotis Koutsourakis

Changeset: 4da4871b6315 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4da4871b6315
Added Files:

sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128
Removed Files:

sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
sql/common/sql_types.c
sql/common/sql_types.h
sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.sql
sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 2613 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
@@ -103,8 +103,7 @@ Ready.
 [ "aggr",  "jsonaggr", "command aggr.jsonaggr(val:bat[:str]):str ",
"JSONgroupStr;","Aggregate the string values to array." ]
 [ "aggr",  "max",  "command aggr.max(b:bat[:any_1], g:bat[:oid], 
e:bat[:any_2]):bat[:any_1] ", "AGGRmax3;",""  ]
 [ "aggr",  "max",  "command aggr.max(b:bat[:any_2]):any_2 ",   
"ALGmaxany;",   "Return the highest tail value or nil." ]
-[ "aggr",  "median",   "function aggr.median(b:bat[:any_1]):any_1;",   
"", ""  ]
-[ "aggr",  "median",   "command aggr.median(b:bat[:any_1], 
g:bat[:oid], e:bat[:any_2]):bat[:any_1] ",  "AGGRmedian3;", "Grouped median 
aggregate"  ]
+[ "aggr",  "median",   "command aggr.median(b:bat[:any_1]):any_1 ",
"AGGRmedian;",  "Median aggregate"  ]
 [ "aggr",  "min",  "command aggr.min(b:bat[:any_1], g:bat[:oid], 
e:bat[:any_2]):bat[:any_1] ", "AGGRmin3;",""  ]
 [ "aggr",  "min",  "command aggr.min(b:bat[:any_2]):any_2 ",   
"ALGminany;",   "Return the lowest tail value or nil."  ]
 [ "aggr",  "prod", "command aggr.prod(b:bat[:bte], g:bat[:oid], 
e:bat[:any_1]):bat[:bte] ","AGGRprod3_bte;",   "Grouped tail 
product on bte"   ]
@@ -188,8 +187,7 @@ Ready.
 [ "aggr",  "prod", "pattern aggr.prod(b:bat[:sht], s:bat[:oid], 
nil_if_empty:bit):int ",   "CMDBATprod;",  "Calculate aggregate product of B 
with candidate list." ]
 [ "aggr",  "prod", "pattern aggr.prod(b:bat[:sht], s:bat[:oid], 
nil_if_empty:bit):lng ",   "CMDBATprod;",  "Calculate aggregate product of B 
with candidate list." ]
 [ "aggr",  "prod", "pattern aggr.prod(b:bat[:sht], s:bat[:oid], 
nil_if_empty:bit):sht ",   "CMDBATprod;",  "Calculate aggregate product of B 
with candidate list." ]
-[ "aggr",  "quantile", "function aggr.quantile(b:bat[:any_1], 
q:bat[:dbl]):any_1;","", ""  ]
-[ "aggr",  "quantile", "command aggr.quantile(b:bat[:any_1], 
g:bat[:oid], e:bat[:any_2], q:bat[:dbl]):bat[:any_1] ",   "AGGRquantile3;", 
  "Grouped quantile aggregate"]
+[ "aggr",  "quantile", "command aggr.quantile(b:bat[:any_1], 
q:bat[:dbl]):any_1 ", "AGGRquantile;","Quantile aggregate"]
 [ "aggr",  "stdev","command aggr.stdev(b:bat[:bte], g:bat[:oid], 
e:bat[:any_1]):bat[:dbl] ",   "AGGRstdev3_dbl;",  "Grouped tail 
standard deviation (sample/non-biased) on bte"]
 [ "aggr",  "stdev","command aggr.stdev(b:bat[:dbl], g:bat[:oid], 
e:bat[:any_1]):bat[:dbl] ",   "AGGRstdev3_dbl;",  "Grouped tail 
standard deviation (sample/non-biased) on dbl"]
 [ "aggr",  "stdev","command aggr.stdev(b:bat[:flt], g:bat[:oid], 
e:bat[:any_1]):bat[:dbl] ",   "AGGRstdev3_dbl;",  "Grouped tail 
standard deviation (sample/non-biased) on flt"]
@@ -260,7 +258,6 @@ Ready.
 [ "aggr",  "submax",   "command aggr.submax(b:bat[:any_1], 
g:bat[:oid], e:bat[:any_2], skip_nils:bit):bat[:any_1] ",   "AGGRsubmax_val;",  
"Grouped maximum aggregate" ]
 [ "aggr",  "submax",   "command

MonetDB: remote_auth - Merge with default

2018-04-23 Thread Panagiotis Koutsourakis

Changeset: b55fbdb0811b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b55fbdb0811b
Added Files:
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/nested-merge-tables.Bug-6585.sql
sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err
sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-expression.Bug-6589.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-expression.Bug-6589.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-expression.Bug-6589.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out
Modified Files:
gdk/gdk_project.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_result.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_schema.c
sql/server/rel_select.c

sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out

sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
sql/test/BugTracker-2018/Tests/All

sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/coalesce.stable.out
sql/test/Tests/median_stdev.stable.out
sql/test/Tests/string.stable.out
sql/test/pg_regress/Tests/select_views.stable.out
testing/Mtest.py.in
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 1730 to 300 lines):

diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -18,7 +18,7 @@
 
 #define project_loop(TYPE) \
 static gdk_return  \
-project_##TYPE(BAT *bn, BAT *l, BAT *r, int nilcheck)  \
+project_##TYPE(BAT *bn, BAT *l, BAT *r, bool nilcheck) \
 {  \
oid lo, hi; \
const TYPE *restrict rt;\
@@ -39,11 +39,11 @@ project_##TYPE(BAT *bn, BAT *l, BAT *r, 
if (o[lo] < rseq || o[lo] >= rend) {\
if (is_oid_nil(o[lo])) {\
bt[lo] = TYPE##_nil;\
-   bn->tnonil = 0; \
-   bn->tnil = 1;   \
-   bn->tsorted = 0;\
-   bn->trevsorted = 0; \
-   bn->tkey = 0;   \
+   bn->tnonil = false; \
+   bn->tnil = true;\
+   bn->tsorted = false;\
+   bn->trevsorted = false; \
+   bn->tkey = false;   \
lo++;   \
break;  \
} else {

MonetDB: remote_auth - Merge with default

2018-04-19 Thread Panagiotis Koutsourakis

Changeset: 98971cfc0ea7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98971cfc0ea7
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
monetdb5/optimizer/opt_candidates.c

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
Branch: remote_auth
Log Message:

Merge with default


diffs (135 lines):

diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -75,7 +75,7 @@ def main():
r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb',
r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb',
r'lib\libstream.dll', r'lib\libstream.pdb',
-   r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
+   r'%s\bin\iconv-2.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'], 
libcrypto),
r'%s\bin\zlib1.dll' % makedefs['LIBZLIB']])
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -86,7 +86,7 @@ def main():
r'lib\libmapi.dll', r'lib\libmapi.pdb',
r'lib\libmonetdb5.dll', r'lib\libmonetdb5.pdb',
r'lib\libstream.dll', r'lib\libstream.pdb',
-   r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
+   r'%s\bin\iconv-2.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'], 
libcrypto),
r'%s\bin\libxml2.dll' % makedefs['LIBXML2'],
@@ -126,7 +126,7 @@ def main():
r'lib\libmapi.lib',
r'lib\libmonetdb5.lib',
r'lib\libstream.lib',
-   r'%s\lib\iconv.lib' % makedefs['LIBICONV'],
+   r'%s\lib\iconv.dll.lib' % makedefs['LIBICONV'],
r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'],
r'%s\lib\libcrypto.lib' % makedefs['LIBOPENSSL'],
r'%s\lib\libxml2.lib' % makedefs['LIBXML2'],
diff --git a/monetdb5/optimizer/opt_candidates.c 
b/monetdb5/optimizer/opt_candidates.c
--- a/monetdb5/optimizer/opt_candidates.c
+++ b/monetdb5/optimizer/opt_candidates.c
@@ -70,7 +70,9 @@ OPTcandidatesImplementation(Client cntxt
getFunctionId(p) == groupRef || getFunctionId(p) == 
groupdoneRef)
setVarCList(mb, getArg(p, 1));
} else if (getModuleId(p) == batRef) {
-   if (getFunctionId(p) == mergecandRef || 
getFunctionId(p) == intersectcandRef)
+   if (getFunctionId(p) == mergecandRef ||
+   getFunctionId(p) == intersectcandRef ||
+   getFunctionId(p) == mirrorRef)
setVarCList(mb,getArg(p,0));
}
}
diff --git 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
--- 
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
+++ 
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
@@ -138,16 +138,16 @@ function user.s8_1():void;
 X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "fk":str, "id":str, 0:int);
 X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_8:bat[:int]);
 X_42:bat[:int] := algebra.projection(X_34:bat[:oid], X_17:bat[:int]);
-X_40:bat[:oid] := bat.mirror(X_17:bat[:int]);
-X_41:bat[:oid] := algebra.difference(X_40:bat[:oid], X_34:bat[:oid], 
nil:BAT, nil:BAT, false:bit, nil:lng);
+C_40:bat[:oid] := bat.mirror(X_17:bat[:int]);
+C_41:bat[:oid] := algebra.difference(C_40:bat[:oid], X_34:bat[:oid], 
nil:BAT, nil:BAT, false:bit, nil:lng);
 X_27:bat[:int] := sql.bind(X_4:int, "sys":str, "pk1":str, "v1":str, 0:int);
 X_45:bat[:int] := bat.append(X_43:bat[:int], X_42:bat[:int], true:bit);
-X_47:bat[:int] := algebra.projection(X_41:bat[:oid], X_17:bat[:int]);
+X_47:bat[:int] := algebra.projection(C_41:bat[:oid], X_17:bat[:int]);
 X_48:bat[:int] := bat.append(X_45:bat[:int], X_47:bat[:int], true:bit);
 X_56:bat[:int] := bat.new(nil:int);
 X_55:bat[:int] := algebra.projectionpath(X_35:bat[:oid], C_25:bat[:oid], 
X_27:bat[:int]);
 X_57:bat[:int] := bat.append(X_56:bat[:int], X_55:bat[:int], true:bit);
-

MonetDB: remote_auth - Merge with default

2018-04-18 Thread Panagiotis Koutsourakis

Changeset: 9b36c860bbc4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b36c860bbc4
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
NT/monetdb_config.h.in
NT/rules.msc
buildtools/doc/windowsbuild.rst
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 576 to 300 lines):

diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -34,9 +34,11 @@ def main():
 if makedefs['bits'] == '64':
 folder = r'ProgramFiles64Folder'
 arch = 'x64'
+libcrypto = '-x64'
 else:
 folder = r'ProgramFilesFolder'
 arch = 'x86'
+libcrypto = ''
 vs = os.getenv('vs')# inherited from TestTools\common.bat
 features = []
 print(r'')
@@ -75,8 +77,7 @@ def main():
r'lib\libstream.dll', r'lib\libstream.pdb',
r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
-   r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
-   r'%s\bin\ssleay32.dll' % makedefs['LIBOPENSSL'],
+   r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'], 
libcrypto),
r'%s\bin\zlib1.dll' % makedefs['LIBZLIB']])
 print(r'')
 id = comp(features, id, 12,
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -34,9 +34,11 @@ def main():
 if makedefs['bits'] == '64':
 folder = r'ProgramFiles64Folder'
 arch = 'x64'
+libcrypto = '-x64'
 else:
 folder = r'ProgramFilesFolder'
 arch = 'x86'
+libcrypto = ''
 vs = os.getenv('vs')# inherited from TestTools\common.bat
 features = []
 print(r'')
@@ -86,10 +88,9 @@ def main():
r'lib\libstream.dll', r'lib\libstream.pdb',
r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
-   r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
+   r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'], 
libcrypto),
r'%s\bin\libxml2.dll' % makedefs['LIBXML2'],
r'%s\bin\pcre.dll' % makedefs['LIBPCRE'],
-   r'%s\bin\ssleay32.dll' % makedefs['LIBOPENSSL'],
r'%s\bin\zlib1.dll' % makedefs['LIBZLIB']])
 print(r'')
 print(r'')
@@ -127,10 +128,9 @@ def main():
r'lib\libstream.lib',
r'%s\lib\iconv.lib' % makedefs['LIBICONV'],
r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'],
-   r'%s\lib\libeay32.lib' % makedefs['LIBOPENSSL'],
+   r'%s\lib\libcrypto.lib' % makedefs['LIBOPENSSL'],
r'%s\lib\libxml2.lib' % makedefs['LIBXML2'],
r'%s\lib\pcre.lib' % makedefs['LIBPCRE'],
-   r'%s\lib\ssleay32.lib' % makedefs['LIBOPENSSL'],
r'%s\lib\zdll.lib' % makedefs['LIBZLIB']])
 print(r'')
 print(r'')
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
@@ -600,7 +600,7 @@
 #endif
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST /* const */
 
 /* Define as SQLLEN * or SQLPOINTER depending on the include file */
 #ifdef _WIN64
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -99,9 +99,9 @@ pcre_CFLAGS = -DHAVE_LIBPCRE "-I$(LIBPCR
 !IFDEF HAVE_OPENSSL
 # This is the location of the OpenSSL library
 !IFNDEF LIBOPENSSL
-LIBOPENSSL = C:\openssl-0.9.8k.win$(bits)
+LIBOPENSSL = C:\openssl-1.1.0g.win$(bits)
 !ENDIF
-openssl_LIBS = "$(LIBOPENSSL)\lib\ssleay32.lib" 
"$(LIBOPENSSL)\lib\libeay32.lib"
+openssl_LIBS = "$(LIBOPENSSL)\lib\libcrypto.lib"
 openssl_CFLAGS = -DHAVE_OPENSSL "-I$(LIBOPENSSL)\include"
 !ENDIF
 
@@ -110,7 +110,7 @@ openssl_CFLAGS = -DHAVE_OPENSSL "-I$(LIB
 !IFNDEF LIBICONV
 LIBICONV = C:\iconv-1.9.2.win$(bits)
 !ENDIF
-LTLIBICONV = "$(LIBICONV)\lib\iconv.lib"
+LTLIBICONV = "$(LIBICONV)\lib\iconv.dll.lib"
 ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
 !ENDIF
 
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -18,7 +18,7 @@ architecture, but there are notes throug
 on a 64-bit architecture which is indicated with Windows64.  We have
 successfully built on Windows XP, Windows Server, and Windows 7.
 
-.. _MonetDB: http://dev.monetdb.org/hg/MonetDB/
+.. _MonetDB: https://dev.monetdb.org/hg/MonetDB/
 
 __ MonetDB_
 
@@ -132,7 +132,7 @@ using the command
 
 ::
 
- hg clone http://dev.monetdb.org/hg/MonetDB/
+ hg clone https://dev.monetdb.org/hg/MonetDB/
 
 This will create a folder ``MonetDB`` that contains everything.
 
@@ -154,25 +154,23 @@ Compiler
 
 The suite can be compiled using one

MonetDB: remote_auth - Merge with default

2018-04-16 Thread Panagiotis Koutsourakis

Changeset: 8249da4cd9d1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8249da4cd9d1
Added Files:

sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.stable.err

sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.stable.out
Modified Files:
gdk/gdk_batop.c
gdk/gdk_select.c
monetdb5/modules/kernel/Tests/select.malC
monetdb5/modules/kernel/Tests/select.stable.out
Branch: remote_auth
Log Message:

Merge with default


diffs (truncated from 1736 to 300 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -531,9 +531,6 @@ BATappend(BAT *b, BAT *n, BAT *s, bit fo
}
}
 
-   if (BATcount(b) == 0)
-   BAThseqbase(b, s ? s->hseqbase : n->hseqbase);
-
if (b->tunique) {
/* if b has the unique bit set, only insert values
 * from n that don't already occur in b, and make sure
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -28,7 +28,7 @@
A = (oid *) Tloc((B), 0);   \
}   \
A[(I)] = (V);   \
-   } while (0)
+   } while (false)
 
 BAT *
 virtualize(BAT *bn)
@@ -38,13 +38,13 @@ virtualize(BAT *bn)
   (((bn->ttype == TYPE_void && !is_oid_nil(bn->tseqbase)) ||
 bn->ttype == TYPE_oid) &&
bn->tkey && bn->tsorted));
-   /* since bn has unique and strictly ascending tail values, we
-* can easily check whether the tail is dense */
+   /* since bn has unique and strictly ascending values, we can
+* easily check whether the column is dense */
if (bn && bn->ttype == TYPE_oid &&
(BATcount(bn) <= 1 ||
 * (const oid *) Tloc(bn, 0) + BATcount(bn) - 1 ==
 * (const oid *) Tloc(bn, BUNlast(bn) - 1))) {
-   /* tail is dense, replace by virtual oid */
+   /* column is dense, replace by virtual oid */
ALGODEBUG fprintf(stderr, 
"#virtualize(bn=%s#"BUNFMT",seq="OIDFMT")\n",
  BATgetId(bn), BATcount(bn),
  BATcount(bn) > 0 ? * (const oid *) Tloc(bn, 
0) : 0);
@@ -56,7 +56,7 @@ virtualize(BAT *bn)
bn->theap.storage = bn->theap.newstorage = STORE_MEM;
bn->theap.size = 0;
bn->ttype = TYPE_void;
-   bn->tvarsized = 1;
+   bn->tvarsized = true;
bn->twidth = 0;
bn->tshift = 0;
}
@@ -85,11 +85,11 @@ doublerange(oid l1, oid h1, oid l2, oid 
*p++ = l1++;
while (l2 < h2)
*p++ = l2++;
-   bn->tkey = 1;
-   bn->tsorted = 1;
+   bn->tkey = true;
+   bn->tsorted = true;
bn->trevsorted = BATcount(bn) <= 1;
-   bn->tnil = 0;
-   bn->tnonil = 1;
+   bn->tnil = false;
+   bn->tnonil = true;
return bn;
 }
 
@@ -119,11 +119,11 @@ doubleslice(BAT *b, BUN l1, BUN h1, BUN 
o = (const oid *) Tloc(b, l2);
while (l2++ < h2)
*p++ = *o++;
-   bn->tkey = 1;
-   bn->tsorted = 1;
+   bn->tkey = true;
+   bn->tsorted = true;
bn->trevsorted = BATcount(bn) <= 1;
-   bn->tnil = 0;
-   bn->tnonil = 1;
+   bn->tnil = false;
+   bn->tnonil = true;
return virtualize(bn);
 }
 
@@ -221,7 +221,7 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn, 
}
}
BATsetcount(bn, cnt);
-   bn->tkey = 1;
+   bn->tkey = true;
if (cnt > 1) {
/* hash chains produce results in the order high to
 * low, so we just need to reverse */
@@ -231,7 +231,7 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn, 
dst[h] = o;
}
}
-   bn->tsorted = 1;
+   bn->tsorted = true;
bn->trevsorted = bn->batCount <= 1;
bn->tseqbase = bn->batCount == 0 ? 0 : bn->batCount == 1 ? *dst : 
oid_nil;
return bn;
@@ -240,37 +240,37 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn, 
 /* Imprints select code */
 
 /* inner check */
-#define impscheck(CAND,TEST,ADD)   \
-do {   \
-   e = (BUN) (i+limit-pr_off+off); \
-   if (im[icnt] & mask) {  \
-   if ((im[icnt] & ~innermask) == 0) { \
-   while (p < q && o < e) {\
-   v = src[o-off]; \
-   ADD;\

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

MonetDB: remote_auth - Merge with default

17 matches

Site Navigation

Mail list logo

Footer information