MonetDB: Jul2017 - Added test for bug 6428

2017-10-16 Thread Pedro Ferreira
Changeset: 725d659cb419 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=725d659cb419
Added Files:

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql
Modified Files:
sql/test/BugTracker-2017/Tests/All
Branch: Jul2017
Log Message:

Added test for bug 6428


diffs (16 lines):

diff --git a/sql/test/BugTracker-2017/Tests/All 
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -79,3 +79,4 @@ sqlsmith.Bug-6423
 sqlsmith.Bug-6424
 sqlsmith.Bug-6425
 double-groupby-column.Bug-6207
+sqlitelogictest-aggregation-having-avg.Bug-6428
diff --git 
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql
 
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql
@@ -0,0 +1,3 @@
+CREATE TABLE tab0(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+SELECT - col0 AS col1 FROM tab0 AS cor0 WHERE NOT + col0 IS NOT NULL GROUP BY 
col1, col0 HAVING NOT - col1 + + AVG ( DISTINCT col0 ) IS NULL;
+DROP TABLE tab0;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - compilation error

2017-10-16 Thread Martin Kersten
Changeset: 786c718b48c6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=786c718b48c6
Modified Files:
sql/backends/monet5/sql.c
Branch: mosaic
Log Message:

compilation error


diffs (14 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4084,9 +4084,9 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
if (sch == NULL || tab == NULL || col == NULL || type == NULL || mode 
== NULL || loc == NULL || imprints == NULL || 
sort == NULL || cnt == NULL || atom == NULL || size == NULL || heap 
== NULL || indices == NULL || phash == NULL ||
revsort == NULL || key == NULL || oidx == NULL || compressed == 
NULL) {
-   goto bailout;
if (compressed)
BBPunfix(compressed->batCacheid);
+   goto bailout;
}
if( pci->argc - pci->retc >= 1)
sname = *getArgReference_str(stk, pci, pci->retc);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - Merger with default

2017-10-16 Thread Martin Kersten
Changeset: 352aa7e7df18 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=352aa7e7df18
Added Files:

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.err

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.out

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.sql
sql/test/bugs/Tests/in.sql
sql/test/bugs/Tests/in.stable.err
sql/test/bugs/Tests/in.stable.out
Removed Files:
ChangeLog.Dec2016
buildtools/ChangeLog.Dec2016
clients/ChangeLog.Dec2016
clients/mapilib/ChangeLog.Dec2016
common/stream/ChangeLog.Dec2016
gdk/ChangeLog.Dec2016
geom/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
testing/ChangeLog.Dec2016
tools/merovingian/ChangeLog.Dec2016
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/stream.c
configure.ag
debian/changelog
gdk/gdk_atoms.c
gdk/gdk_private.h
gdk/gdk_utils.c
gdk/libbat.rc
libversions
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_sabaoth.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/include/sql_mem.h
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/sql_semantic.c

sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out
sql/test/BugTracker-2015/Tests/and_or_in.Bug-3655.stable.out

sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out

sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/str-pad.sql
sql/test/Tests/str-pad.stable.out
sql/test/bugs/Tests/All

sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
sql/test/mergetables/Tests/part-elim.stable.out
vertoo.data
Branch: mosaic
Log Message:

Merger with default


diffs (truncated from 4324 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -680,3 +680,5 @@ 1534ee14ff84fe5629becc6a5b5e2990b694d5a3
 269ab71a82190d6024b3a920837089d657893493 Jul2017_5
 1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
 269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_7
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
diff --git a/ChangeLog.Dec2016 b/ChangeLog.Dec2016
deleted file mode 100644
--- a/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
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/Jul2017-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jul2017-SP2/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir ma

MonetDB: mosaic - Move garbage collection.

2017-10-16 Thread Martin Kersten
Changeset: fcfd15f16cfa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fcfd15f16cfa
Modified Files:
sql/backends/monet5/sql.c
Branch: mosaic
Log Message:

Move garbage collection.


diffs (21 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4086,8 +4086,6 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
if (sch == NULL || tab == NULL || col == NULL || type == NULL || mode 
== NULL || loc == NULL || imprints == NULL || 
sort == NULL || cnt == NULL || atom == NULL || size == NULL || heap 
== NULL || indices == NULL || phash == NULL ||
revsort == NULL || key == NULL || oidx == NULL || compressed == 
NULL) {
-   if (compressed)
-   BBPunfix(compressed->batCacheid);
goto bailout;
}
if( pci->argc - pci->retc >= 1)
@@ -4395,6 +4393,8 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
BBPunfix(key->batCacheid);
if (oidx)
BBPunfix(oidx->batCacheid);
+   if (compressed)
+   BBPunfix(compressed->batCacheid);
throw(SQL, "sql.storage", SQLSTATE(HY001) MAL_MALLOC_FAIL);
 }
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - LIBMOSAIC is also part of libmonetdb5.

2017-10-16 Thread Sjoerd Mullender
Changeset: ec9cbb109d82 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec9cbb109d82
Modified Files:
common/utils/msabaoth.h
monetdb5/mal/mal.h
monetdb5/modules/mal/orderidx.h
Branch: mosaic
Log Message:

LIBMOSAIC is also part of libmonetdb5.


diffs (36 lines):

diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h
--- a/common/utils/msabaoth.h
+++ b/common/utils/msabaoth.h
@@ -52,7 +52,7 @@ typedef struct Ssabuplog {
 } sabuplog;
 
 #ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5) && !defined(LIBMOSAIC)
 #define msab_export extern __declspec(dllimport)
 #else
 #define msab_export extern __declspec(dllexport)
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -17,7 +17,7 @@
 #include 
 
 #ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5)
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5) && !defined(LIBMOSAIC)
 #define mal_export extern __declspec(dllimport)
 #else
 #define mal_export extern __declspec(dllexport)
diff --git a/monetdb5/modules/mal/orderidx.h b/monetdb5/modules/mal/orderidx.h
--- a/monetdb5/modules/mal/orderidx.h
+++ b/monetdb5/modules/mal/orderidx.h
@@ -16,7 +16,7 @@
 #include "mal_namespace.h"
 
 #ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5)
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5) && !defined(LIBMOSAIC)
 #define orderidx_export extern __declspec(dllimport)
 #else
 #define orderidx_export extern __declspec(dllexport)
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Jul2017 - making r tests run again

2017-10-16 Thread Hannes Muehleisen
Changeset: 90e068ebfcf6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90e068ebfcf6
Modified Files:
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
Branch: Jul2017
Log Message:

making r tests run again


diffs (182 lines):

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.
 
 
   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 dratwt  qsec vs am gear carb
 1  21.0   6 160.0 110 3.90 2.620 16.46  0  144
 2  21.0   6 160.0 110 3.90 2.875 17.02  0  144
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.h

MonetDB: data-vaults - Merge with default

2017-10-16 Thread Panagiotis Koutsourakis
Changeset: 0a56a6d9e643 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a56a6d9e643
Added Files:
sql/test/BugTracker-2017/Tests/corr_coersion.Bug-6287.sql
sql/test/BugTracker-2017/Tests/corr_coersion.Bug-6287.stable.err
sql/test/BugTracker-2017/Tests/corr_coersion.Bug-6287.stable.out

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.sql

sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-in.Bug-6410.sql

sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-in.Bug-6410.stable.err

sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-in.Bug-6410.stable.out

sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-not-in.Bug-6409.sql

sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-not-in.Bug-6409.stable.err

sql/test/BugTracker-2017/Tests/sqlitelogictest-having-with-not-in.Bug-6409.stable.out
Modified Files:
buildtools/autogen/autogen/msc.py
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
clients/odbc/driver/ODBCConvert.c
common/stream/stream_socket.h
configure.ag
gdk/gdk_aggr.c
gdk/gdk_atoms.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_utils.c
monetdb5/extras/rapi/Makefile.ag
monetdb5/mal/mal.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_namespace.c
monetdb5/modules/atoms/json.c
monetdb5/modules/kernel/mmath.h
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/sysmon.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_jit.c
monetdb5/optimizer/opt_jit.h
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_cast.h
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/bam_db_interface.h
sql/backends/monet5/vaults/bam/bam_export.h
sql/backends/monet5/vaults/bam/bam_loader.h
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/wlr.c
sql/server/Makefile.ag
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_select.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2017/Tests/All
sql/test/mergetables/Tests/part-elim.stable.out
sql/test/remote/Tests/partition_elim.stable.out
testing/Mtimeout.c
Branch: data-vaults
Log Message:

Merge with default


diffs (truncated from 3972 to 300 lines):

diff --git a/buildtools/autogen/autogen/msc.py 
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -98,7 +98,7 @@ def msc_assignment(fd, var, values, msc)
 o = ""
 for v in values:
 o = o + " " + v.replace('/', '\\')
-if var[0] != '@':
+if var[0] != '@' and '.' not in var:
 fd.write("%s = %s\n" % (var, o))
 
 def msc_cflags(fd, var, values, msc):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1949,7 +1949,6 @@ str alter_tableRef;
 str alter_triggerRef;
 str alter_typeRef;
 str alter_userRef;
-str alter_userRef;
 str alter_viewRef;
 str analyzetableRef;
 str andRef;
@@ -2043,7 +2042,6 @@ str create_tableRef;
 str create_triggerRef;
 str create_typeRef;
 str create_userRef;
-str create_userRef;
 str create_viewRef;
 str crossRef;
 str dataflowRef;
@@ -2079,7 +2077,6 @@ str drop_tableRef;
 str drop_triggerRef;
 str drop_typeRef;
 str drop_userRef;
-str drop_userRef;
 str drop_viewRef;
 void dumpExceptionsToStream(stream *out, str msg);
 void dumpModules(stream *out);
@@ -2191,7 +2188,6 @@ str identityRef;
 str ifthenelseRef;
 str ilikeRef;
 str ilikeselectRef;
-str ilikeselectRef;
 str ilikethetaselectRef;
 str ilikeuselectRef;
 void initHeartbeat(void);
@@ -2249,7 +2245,6 @@ str levenshteinbasic2_impl(int *result, 
 str levenshteinbasic_impl(int *result, str *s, str *t);
 str likeRef;
 str likeselectRef;
-str likeselectRef;
 str likethetaselectRef;
 str likeuselectRef;
 void listModules(stream *out, Module s);
@@ -2459,7 +2454,6 @@ str remapRef;
 str remoteRef;
 void removeInstruction(MalBlkPtr mb, InstrPtr p);
 void removeInstructionBlock(MalBlkPtr mb, in

MonetDB: data-vaults - Include sql_execute.h in the files that u...

2017-10-16 Thread Panagiotis Koutsourakis
Changeset: f6330f3518a3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6330f3518a3
Modified Files:
sql/backends/monet5/vaults/gadget/gadget.c
sql/backends/monet5/vaults/lidar/lidar.c
Branch: data-vaults
Log Message:

Include sql_execute.h in the files that use SQLstatementIntern


diffs (22 lines):

diff --git a/sql/backends/monet5/vaults/gadget/gadget.c 
b/sql/backends/monet5/vaults/gadget/gadget.c
--- a/sql/backends/monet5/vaults/gadget/gadget.c
+++ b/sql/backends/monet5/vaults/gadget/gadget.c
@@ -25,6 +25,7 @@
 #include "sql_mvc.h"
 #include "sql_scenario.h"
 #include "sql.h"
+#include "sql_execute.h"
 #include "clients.h"
 #include "mal_exception.h"
 
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c 
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: data-vaults - Merge with default

2017-10-16 Thread Panagiotis Koutsourakis
Changeset: 4036e6543b9b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4036e6543b9b
Added Files:

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.err

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.out

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.sql
sql/test/bugs/Tests/in.sql
sql/test/bugs/Tests/in.stable.err
sql/test/bugs/Tests/in.stable.out
Removed Files:
ChangeLog.Dec2016
buildtools/ChangeLog.Dec2016
clients/ChangeLog.Dec2016
clients/mapilib/ChangeLog.Dec2016
common/stream/ChangeLog.Dec2016
gdk/ChangeLog.Dec2016
geom/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
testing/ChangeLog.Dec2016
tools/merovingian/ChangeLog.Dec2016
Modified Files:
.hgtags
MonetDB.spec
clients/odbc/driver/SQLGetInfo.c
common/stream/stream.c
debian/changelog
gdk/gdk_utils.c
libversions
monetdb5/mal/mal_client.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_sabaoth.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_remap.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out
sql/include/sql_mem.h
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/sql_semantic.c

sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out
sql/test/BugTracker-2015/Tests/and_or_in.Bug-3655.stable.out

sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out

sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/str-pad.sql
sql/test/Tests/str-pad.stable.out
sql/test/bugs/Tests/All

sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
sql/test/mergetables/Tests/part-elim.stable.out
Branch: data-vaults
Log Message:

Merge with default


diffs (truncated from 4016 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -680,3 +680,5 @@ 1534ee14ff84fe5629becc6a5b5e2990b694d5a3
 269ab71a82190d6024b3a920837089d657893493 Jul2017_5
 1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
 269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_7
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
diff --git a/ChangeLog.Dec2016 b/ChangeLog.Dec2016
deleted file mode 100644
--- a/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
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/Jul2017-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jul2017-SP2/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1041,6 +1041,47 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Oct 11 2017 Panagiotis Koutsourakis  - 
11.27.7-20171011
+- Rebuilt.
+- BZ#4017: server crashes when executing particular loopback query in
+  embedded python
+- BZ#6239: Incorrect profiling
+- BZ#6261: New handling of delta tables hurts badly reusage of bats
+- BZ#6287: should the CORR function return some numeric type that allows
+  fractions?
+- BZ#6321: Two-column aggregation on join result extremely slow.
+- BZ#6343

MonetDB: Jul2017 - fixed bug 6428, ie don't remove groupby if th...

2017-10-16 Thread Niels Nes
Changeset: 0900833d1a87 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0900833d1a87
Added Files:

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
Modified Files:
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_rel.c
Branch: Jul2017
Log Message:

fixed bug 6428, ie don't remove groupby if the alias is different


diffs (178 lines):

diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -796,19 +796,19 @@ exp_match( sql_exp *e1, sql_exp *e2)
 }
 
 /* list already contains matching expression */
-int
+sql_exp*
 exps_find_exp( list *l, sql_exp *e) 
 {
node *n;
 
if (!l || !l->h)
-   return 0;
+   return NULL;
 
for(n=l->h; n; n = n->next) {
if (exp_match(n->data, e))
-   return 1;
+   return n->data;
}
-   return 0;
+   return NULL;
 }
 
 
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -109,7 +109,7 @@ extern int exp_cmp( sql_exp *e1, sql_exp
 extern int exp_equal( sql_exp *e1, sql_exp *e2);
 extern int exp_refers( sql_exp *p, sql_exp *c);
 extern int exp_match( sql_exp *e1, sql_exp *e2);
-extern int exps_find_exp( list *l, sql_exp *e);
+extern sql_exp* exps_find_exp( list *l, sql_exp *e);
 extern int exp_match_exp( sql_exp *e1, sql_exp *e2);
 /* match just the column (cmp equality) expressions */
 extern int exp_match_col_exps( sql_exp *e, list *l);
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -5179,9 +5179,6 @@ rel_groupby_distinct(int *changes, mvc *
if (list_length(arg) != 1 || list_length(rel->r) + nr != 
list_length(rel->exps)) 
return rel;
 
-   darg = arg->h->data;
-   exp_label(sql->sa, darg, ++sql->label);
-
gbe = rel->r;
ngbe = sa_list(sql->sa);
exps = sa_list(sql->sa);
@@ -5189,17 +5186,21 @@ rel_groupby_distinct(int *changes, mvc *
for (n=rel->exps->h; n; n = n->next) {
sql_exp *e = n->data;
if (e != distinct) {
-   e = exp_column(sql->sa, exp_find_rel_name(e), 
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
+   e = exp_column(sql->sa, exp_relname(e), 
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
append(ngbe, e);
append(exps, e);
-   e = exp_column(sql->sa, exp_find_rel_name(e), 
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
+   e = exp_column(sql->sa, exp_relname(e), 
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
append(nexps, e);
}
}
 
-   list_append(gbe, exp_copy(sql->sa, darg));
-   darg = exp_column(sql->sa, exp_find_rel_name(darg), 
exp_name(darg), exp_subtype(darg), darg->card, has_nil(darg), is_intern(darg));
-   list_append(exps, exp_copy(sql->sa, darg));
+   darg = arg->h->data;
+   list_append(gbe, darg = exp_copy(sql->sa, darg));
+   exp_label(sql->sa, darg, ++sql->label);
+
+   darg = exp_column(sql->sa, exp_relname(darg), exp_name(darg), 
exp_subtype(darg), darg->card, has_nil(darg), is_intern(darg));
+   list_append(exps, darg);
+   darg = exp_column(sql->sa, exp_relname(darg), exp_name(darg), 
exp_subtype(darg), darg->card, has_nil(darg), is_intern(darg));
arg->h->data = darg;
l = rel->l = rel_groupby(sql, rel->l, gbe);
l->exps = exps;
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -747,9 +747,11 @@ rel_groupby(mvc *sql, sql_rel *l, list *
list *gexps = sa_list(sql->sa);
 
for (en = groupbyexps->h; en; en = en->next) {
-   sql_exp *e = en->data;
+   sql_exp *e = en->data, *ne;
 
-   if (!exps_find_exp(gexps, e))
+   if ((ne=exps_find_exp(gexps, e)) == NULL || 
+   strcmp(exp_relname(e),exp_relname(ne)) != 0 || 
+   strcmp(exp_name(e),exp_name(ne)) != 0  )
append(gexps, e);
}
groupbyexps = gexps;
diff --git 
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-

MonetDB: Jul2017 - Never treat comparison of oid/void like int/lng.

2017-10-16 Thread Sjoerd Mullender
Changeset: 259a2c0a55d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=259a2c0a55d0
Modified Files:
gdk/gdk_calc_compare.h
Branch: Jul2017
Log Message:

Never treat comparison of oid/void like int/lng.
This fixes bug 6430.


diffs (123 lines):

diff --git a/gdk/gdk_calc_compare.h b/gdk/gdk_calc_compare.h
--- a/gdk/gdk_calc_compare.h
+++ b/gdk/gdk_calc_compare.h
@@ -599,15 +599,25 @@ BATcalcop(BAT *b1, BAT *b2, BAT *s)
return BATconstant(b1->hseqbase, TYPE_TPE, &res, cnt, 
TRANSIENT);
}
 
-   bn = BATcalcop_intern(b1->ttype == TYPE_void ? (void *) &b1->tseqbase : 
(void *) Tloc(b1, 0), ATOMtype(b1->ttype) == TYPE_oid ? b1->ttype : 
ATOMbasetype(b1->ttype), 1,
+   bn = BATcalcop_intern(b1->ttype == TYPE_void ? (const void *) 
&b1->tseqbase : (const void *) Tloc(b1, 0),
+ ATOMtype(b1->ttype) == TYPE_oid ? b1->ttype : 
ATOMbasetype(b1->ttype),
+ 1,
  b1->tvheap ? b1->tvheap->base : NULL,
  b1->twidth,
- b2->ttype == TYPE_void ? (void *) &b2->tseqbase : 
(void *) Tloc(b2, 0), ATOMtype(b2->ttype) == TYPE_oid ? b2->ttype : 
ATOMbasetype(b2->ttype), 1,
+ b2->ttype == TYPE_void ? (const void *) 
&b2->tseqbase : (const void *) Tloc(b2, 0),
+ ATOMtype(b2->ttype) == TYPE_oid ? b2->ttype : 
ATOMbasetype(b2->ttype),
+ 1,
  b2->tvheap ? b2->tvheap->base : NULL,
  b2->twidth,
- cnt, start, end, cand, candend, b1->hseqbase,
+ cnt,
+ start,
+ end,
+ cand,
+ candend,
+ b1->hseqbase,
  cand == NULL && b1->tnonil && b2->tnonil,
- b1->hseqbase, __func__);
+ b1->hseqbase,
+ __func__);
 
return bn;
 }
@@ -623,14 +633,25 @@ BATcalcopcst(BAT *b, const ValRecord *v,
 
CANDINIT(b, s, start, end, cnt, cand, candend);
 
-   bn = BATcalcop_intern(Tloc(b, 0), ATOMbasetype(b->ttype), 1,
+   bn = BATcalcop_intern(b->ttype == TYPE_void ? (const void *) 
&b->tseqbase : (const void *) Tloc(b, 0),
+ ATOMtype(b->ttype) == TYPE_oid ? b->ttype : 
ATOMbasetype(b->ttype),
+ 1,
  b->tvheap ? b->tvheap->base : NULL,
  b->twidth,
- VALptr(v), ATOMbasetype(v->vtype), 0,
- NULL, 0,
- cnt, start, end, cand, candend, b->hseqbase,
+ VALptr(v),
+ ATOMtype(v->vtype) == TYPE_oid ? v->vtype : 
ATOMbasetype(v->vtype),
+ 0,
+ NULL,
+ 0,
+ cnt,
+ start,
+ end,
+ cand,
+ candend,
+ b->hseqbase,
  cand == NULL && b->tnonil && ATOMcmp(v->vtype, 
VALptr(v), ATOMnilptr(v->vtype)) != 0,
- b->hseqbase, __func__);
+ b->hseqbase,
+ __func__);
 
return bn;
 }
@@ -646,14 +667,25 @@ BATcalccstop(const ValRecord *v, BAT *b,
 
CANDINIT(b, s, start, end, cnt, cand, candend);
 
-   bn = BATcalcop_intern(VALptr(v), ATOMbasetype(v->vtype), 0,
- NULL, 0,
- Tloc(b, 0), ATOMbasetype(b->ttype), 1,
+   bn = BATcalcop_intern(VALptr(v),
+ ATOMtype(v->vtype) == TYPE_oid ? v->vtype : 
ATOMbasetype(v->vtype),
+ 0,
+ NULL,
+ 0,
+ b->ttype == TYPE_void ? (const void *) 
&b->tseqbase : (const void *) Tloc(b, 0),
+ ATOMtype(b->ttype) == TYPE_oid ? b->ttype : 
ATOMbasetype(b->ttype),
+ 1,
  b->tvheap ? b->tvheap->base : NULL,
  b->twidth,
- cnt, start, end, cand, candend, b->hseqbase,
+ cnt,
+ start,
+ end,
+ cand,
+ candend,
+ b->hseqbase,
  cand == NULL && b->tnonil && ATOMcmp(v->vtype, 
VALptr(v), ATOMnilptr(v->vtype)) != 0,
- b->hseqbase, __func__);
+ 

MonetDB: default - Merge with Jul2017 branch.

2017-10-16 Thread Sjoerd Mullender
Changeset: 611011acc9d6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=611011acc9d6
Added Files:
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/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/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/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
Modified Files:
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
gdk/gdk_calc_compare.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/modules/atoms/mtime.c
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/backends/monet5/rel_bin.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/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out.int128
sql/test/BugTracker-2012/Tests/querycache.Bug-3212.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
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-2017/Tests/All
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.sql
sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
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
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (truncated from 4979 to 300 lines):

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
 H

MonetDB: Jul2017 - Added test for bug 6431

2017-10-16 Thread Pedro Ferreira
Changeset: 788e56f1c467 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=788e56f1c467
Added Files:

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql
Modified Files:
sql/test/BugTracker-2017/Tests/All
Branch: Jul2017
Log Message:

Added test for bug 6431


diffs (16 lines):

diff --git a/sql/test/BugTracker-2017/Tests/All 
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -80,3 +80,4 @@ sqlsmith.Bug-6424
 sqlsmith.Bug-6425
 double-groupby-column.Bug-6207
 sqlitelogictest-aggregation-having-avg.Bug-6428
+sqlitelogictest-aggregation-distinct-coalesce.Bug-6431
diff --git 
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql
 
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql
@@ -0,0 +1,3 @@
+CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+SELECT DISTINCT + ( - col2 ) AS col0 FROM tab2 AS cor0 WHERE NOT ( - 1 * col2 
) <> ( 37 ) GROUP BY col2 HAVING ( col2 ) IN ( COALESCE ( + ( + COALESCE ( - 
64, COUNT ( * ) + ( col0 ) * 12 ) ), + COUNT ( * ), COUNT ( * ) / 97 ) );
+DROP TABLE tab2;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list