date:20140728

MonetDB: bamloader - Merge with default branch.

2014-07-28 Thread Sjoerd Mullender

Changeset: 2403e572ee55 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2403e572ee55
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
debian/changelog
gdk/libbat.rc
libversions
monetdb5/mal/Tests/tst913.stable.out
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_statement.c
sql/test/pg_regress/Tests/date.sql
sql/test/pg_regress/Tests/point.sql
sql/test/pg_regress/Tests/point.stable.out
sql/test/pg_regress/Tests/strings.sql
sql/test/pg_regress/Tests/strings.stable.err
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/postgresql2sql99.sh
vertoo.data
Branch: bamloader
Log Message:

Merge with default branch.


diffs (truncated from 2073 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -569,3 +569,6 @@ 13e1b24f442791f5ab790fa77453d3bd4e88a9c8
 389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release
 dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19
 0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6830d0b9c31fe23954c75014a581f145c7a551ff Jan2014_21
+0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -841,6 +841,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 25 2014 Sjoerd Mullender sjo...@acm.org - 11.17.21-20140725
+- Rebuilt.
+- BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean
+  values
+
 * Tue Jul 22 2014 Sjoerd Mullender sjo...@acm.org - 11.17.19-20140722
 - Rebuilt.
 - BZ#3487: dead link to Professional services
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.17.21-20140725) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org  Fri, 25 Jul 2014 15:09:55 +0200
+
+monetdb (11.17.21-20140725) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean
+values
+
+ -- Sjoerd Mullender sjo...@acm.org  Fri, 25 Jul 2014 15:09:53 +0200
+
 monetdb (11.17.19-20140722) unstable; urgency=low
 
   * Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,7 +36,7 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=10:8:0
+GDK_VERSION=10:9:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=6:5:0
@@ -45,4 +45,4 @@ MAPI_VERSION=6:5:0
 MONETDB5_VERSION=16:9:0
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=5:5:0
+STREAM_VERSION=5:6:0
diff --git a/monetdb5/mal/Tests/tst913.stable.out 
b/monetdb5/mal/Tests/tst913.stable.out
--- a/monetdb5/mal/Tests/tst913.stable.out
+++ b/monetdb5/mal/Tests/tst913.stable.out
@@ -56,8 +56,8 @@ end main;
 # int  bit   # type
 #-#
 [ 0@0,   true]
-[ 1@0,   nil ]
-[ 2@0,   nil ]
+[ 1@0, true  ]
+[ 2@0, false  ]
 [ 3@0,   false   ]
 [ 4@0,   nil ]
 [ 5@0,   nil ]
diff --git a/sql/backends/monet5/sql_statement.c 
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1756,12 +1756,13 @@ stack_push_children(sql_stack *stk, stmt
default:
if ((s-type == st_uselect2 || s-type == st_unique || s-type 
== st_group)  s-op4.stval)
stack_push_stmt(stk, s-op4.stval, 1);
-   if (s-op3)
-   stack_push_stmt(stk, s-op3, 1);
-   if (s-op3)
-   stack_push_stmt(stk, s-op3, 1);
-   if (s-op2)
+   if (s-op2) {
+   if (s-op3)
+   stack_push_stmt(stk, s-op3, 1);
+   if (s-op3)
+   stack_push_stmt(stk, s-op3, 1);
stack_push_stmt(stk, s-op2, 1);
+   }
if (s-op1)
stack_push_stmt(stk, s-op1, 1);
}
diff --git a/sql/test/pg_regress/Tests/date.sql 
b/sql/test/pg_regress/Tests/date.sql
--- a/sql/test/pg_regress/Tests/date.sql
+++ b/sql/test/pg_regress/Tests/date.sql
@@ -197,17 +197,27 @@ SELECT f1 - date '2000-01-01' AS

MonetDB: RIntegration-default - Merge with default branch.

2014-07-28 Thread Sjoerd Mullender

Changeset: c68f84513a6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c68f84513a6a
Added Files:
sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.sql
sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.err
sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.out
Removed Files:
sql/test/Skyserver/Skyserver_dropMath.sql
sql/test/Skyserver/Skyserver_dropMs_functions.sql
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jan2014
clients/R/MonetDB.R/DESCRIPTION
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
common/stream/stream.c
configure.ag
debian/changelog
gdk/gdk_atoms.c
gdk/gdk_logger.c
gdk/libbat.rc
libversions
monetdb5/mal/Tests/tst913.stable.out
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_statement.c
sql/scripts/15_querylog.sql
sql/scripts/16_tracelog.sql
sql/scripts/22_clients.sql
sql/scripts/25_debug.sql
sql/scripts/26_sysmon.sql
sql/scripts/75_storagemodel.sql
sql/scripts/80_statistics.sql
sql/scripts/99_system.sql
sql/test/BugTracker/Tests/rank_over.SF-1691098.sql
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Skyserver/Skyserver_functions.sql
sql/test/Skyserver/Skyserver_functions_v6.sql
sql/test/Skyserver/Tests/Skyserver.SQL.py
sql/test/Skyserver/Tests/Skyserver_v6.SQL.py
sql/test/pg_regress/Tests/date.sql
sql/test/pg_regress/Tests/point.sql
sql/test/pg_regress/Tests/point.stable.out
sql/test/pg_regress/Tests/strings.sql
sql/test/pg_regress/Tests/strings.stable.err
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/postgresql2sql99.sh
testing/Mtest.py.in
vertoo.data
Branch: RIntegration-default
Log Message:

Merge with default branch.


diffs (truncated from 3766 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -567,3 +567,8 @@ 13e1b24f442791f5ab790fa77453d3bd4e88a9c8
 c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17
 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release
 389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release
+dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19
+0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6830d0b9c31fe23954c75014a581f145c7a551ff Jan2014_21
+0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -45,7 +45,7 @@ Vendor: MonetDB BV i...@monetdb.org
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Jan2014-SP2/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jan2014-SP3/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -802,6 +802,24 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 25 2014 Sjoerd Mullender sjo...@acm.org - 11.17.21-20140725
+- Rebuilt.
+- BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean
+  values
+
+* Tue Jul 22 2014 Sjoerd Mullender sjo...@acm.org - 11.17.19-20140722
+- Rebuilt.
+- BZ#3487: dead link to Professional services
+- BZ#3500: MonetDB driver wants an empty string for SQLTables and
+  SQLColumns API calls, where other drivers expect NULL
+- BZ#3514: mserver5 crash due (assertion failure in gdk_select.c)
+- BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c)
+
+* Tue Jun  3 2014 Sjoerd Mullender sjo...@acm.org - 11.17.19-20140722
+- buildtools: Fix configure to continue without Python if the python binary is
+  too old.  This instead of always aborting configure if python happens
+  to be too old.
+
 * Wed May 14 2014 Sjoerd Mullender sjo...@acm.org - 11.17.17-20140514
 - Rebuilt.
 - BZ#3482: Crossproduct error
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE --

MonetDB: RIntegration-default - Disable tests that are bound to ...

2014-07-28 Thread Sjoerd Mullender

Changeset: b3264adff72e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3264adff72e
Modified Files:
clients/Tests/All
Branch: RIntegration-default
Log Message:

Disable tests that are bound to fail.
These tests would need special output in case rintegration is enabled.


diffs (19 lines):

diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,8 +1,8 @@
 exports
-HAVE_GEOMHAVE_CFITSIO!HAVE_SPHINXCLIENT!HAVE_GSL?MAL-signatures
-HAVE_GEOMHAVE_CFITSIO!HAVE_SPHINXCLIENTHAVE_GSL?MAL-signatures_gsl
-HAVE_GEOMHAVE_CFITSIOHAVE_SPHINXCLIENT!HAVE_GSL?MAL-signatures_sphinxclient
-HAVE_GEOM!HAVE_CFITSIO!HAVE_SPHINXCLIENT!HAVE_GSL?MAL-signatures_nocfitsio
-HAVE_GEOM!HAVE_GSL?SQL-dump
-HAVE_GEOMHAVE_GSL?SQL-dump_gsl
-!HAVE_GEOM!HAVE_GSL?SQL-dump_nogeom
+HAVE_GEOMHAVE_CFITSIO!HAVE_SPHINXCLIENT!HAVE_GSL!HAVE_LIBR?MAL-signatures
+HAVE_GEOMHAVE_CFITSIO!HAVE_SPHINXCLIENTHAVE_GSL!HAVE_LIBR?MAL-signatures_gsl
+HAVE_GEOMHAVE_CFITSIOHAVE_SPHINXCLIENT!HAVE_GSL!HAVE_LIBR?MAL-signatures_sphinxclient
+HAVE_GEOM!HAVE_CFITSIO!HAVE_SPHINXCLIENT!HAVE_GSL!HAVE_LIBR?MAL-signatures_nocfitsio
+HAVE_GEOM!HAVE_GSL!HAVE_LIBR?SQL-dump
+HAVE_GEOMHAVE_GSL!HAVE_LIBR?SQL-dump_gsl
+!HAVE_GEOM!HAVE_GSL!HAVE_LIBR?SQL-dump_nogeom
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: RIntegration-default - Tell Windows the bare essentials...

2014-07-28 Thread Sjoerd Mullender

Changeset: 78f04c052cbf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78f04c052cbf
Modified Files:
NT/rules.msc
Branch: RIntegration-default
Log Message:

Tell Windows the bare essentials about libR.


diffs (15 lines):

diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -356,6 +356,11 @@ create_winconfig_conds_new_py:
 !ELSE
$(ECHO) HAVE_LIBBZ2_FALSE=''  $(TOPDIR)\winconfig_conds_new.py
 !ENDIF
+!IFDEF HAVE_LIBR
+   $(ECHO) HAVE_LIBR_FALSE='#'  $(TOPDIR)\winconfig_conds_new.py
+!ELSE
+   $(ECHO) HAVE_LIBR_FALSE=''  $(TOPDIR)\winconfig_conds_new.py
+!ENDIF
 !IFDEF HAVE_LIBZ
$(ECHO) HAVE_LIBZ_FALSE='#'  $(TOPDIR)\winconfig_conds_new.py
 !ELSE
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jan2014 - added test for bug 3506

2014-07-28 Thread Niels Nes

Changeset: d89feba26343 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d89feba26343
Added Files:
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.sql

sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err

sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
Modified Files:
sql/test/BugTracker-2014/Tests/All
Branch: Jan2014
Log Message:

added test for bug 3506


diffs (114 lines):

diff --git a/sql/test/BugTracker-2014/Tests/All 
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -18,6 +18,7 @@ in_incorrect_multi.Bug-3462
 crash_on_groupby_distinct_serial.Bug-3463
 local-temp-1.Bug-3468
 local-temp-2.Bug-3468
+varchar_conversion_crash.Bug-3506
 oid-table-assert.Bug-3514
 round-properties.Bug-3515
 union_with_subqueries.Bug-3518
diff --git 
a/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.sql 
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.sql
@@ -0,0 +1,8 @@
+CREATE TABLE config (id SERIAL ,dataset INT NOT NULL ,section VARCHAR(100) 
,key VARCHAR(100) ,value VARCHAR(500) ,type VARCHAR(5) ,UNIQUE (dataset, 
section, key)) ;
+
+INSERT INTO config (dataset, section, key, value, type) VALUES (6, 
'quality_lofar', 'low_bound', 1.9, 'float');
+INSERT INTO config (dataset, section, key, value, type) VALUES (6, 
'quality_lofar', 'high_bound', 80, 'int');
+
+select * from config;
+
+drop table config;
diff --git 
a/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err 
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
@@ -0,0 +1,38 @@
+stderr of test 'varchar_conversion_crash.Bug-3506` in directory 
'sql/test/BugTracker-2014` itself:
+
+
+# 18:58:33   
+# 18:58:33   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=38663 --set 
mapi_usock=/var/tmp/mtest-28742/.s.monetdb.38663 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
 --set mal_listing=0
+# 18:58:33   
+
+# builtin opt  gdk_dbpath = 
/home/niels/scratch/rc-clean/Linux-x86_64/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 = 38663
+# cmdline opt  mapi_usock = /var/tmp/mtest-28742/.s.monetdb.38663
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt  mal_listing = 0
+
+# 18:58:33   
+# 18:58:33   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-28742 --port=38663
+# 18:58:33   
+
+MAPI  = (monetdb) /var/tmp/mtest-28742/.s.monetdb.38663
+QUERY = INSERT INTO config (dataset, section, key, value, type) VALUES (6, 
'quality_lofar', 'high_bound', 80, 'int');
+ERROR = !EXEC: wrong type for argument 4 of prepared statement: decimal, 
expected decimal
+
+# 18:58:33   
+# 18:58:33   Done.
+# 18:58:33   
+
diff --git 
a/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out 
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
@@ -0,0 +1,42 @@
+stdout of test 'varchar_conversion_crash.Bug-3506` in directory 
'sql/test/BugTracker-2014` itself:
+
+
+# 18:58:33   
+# 18:58:33   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=38663 --set 
mapi_usock=/var/tmp/mtest-28742/.s.monetdb.38663 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
 --set mal_listing=0
+# 18:58:33   
+
+# MonetDB 5 server v11.17.22
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Found 7.334 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:38663/
+# Listening for UNIX domain connection requests on

MonetDB: Jan2014 - removed dead code

2014-07-28 Thread Niels Nes

Changeset: 956d1c0ab176 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=956d1c0ab176
Modified Files:
monetdb5/optimizer/opt_mergetable.c
Branch: Jan2014
Log Message:

removed dead code


diffs (22 lines):

diff --git a/monetdb5/optimizer/opt_mergetable.c 
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -709,18 +709,6 @@ mat_aggr(MalBlkPtr mb, InstrPtr p, mat_t
s = pushArgument(mb, s, getArg(r,0));
pushInstruction(mb, s);
r = s;
-
-/* DEAD CODE FOUND BY COVERITY
-   if (isAvg) {
-   s = newInstruction(mb,ASSIGNsymbol);
-   setModuleId(s, algebraRef);
-   setFunctionId(s, selectNotNilRef);
-   getArg(s,0) = newTmpVariable(mb, battp2);
-   s = pushArgument(mb, s, getArg(u,0));
-   pushInstruction(mb, s);
-   u = s;
-   }
-*/
}
 
/* for avg we do sum (avg*(count/sumcount) ) */
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - reenable the rel_push_semijoin_down optimzer

2014-07-28 Thread Niels Nes

Changeset: 95fd0f2a50b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95fd0f2a50b8
Modified Files:
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-plan.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-plan.stable.out
sql/benchmarks/tpch/Tests/18.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/server/rel_exp.c
sql/server/rel_optimizer.c
Branch: default
Log Message:

reenable the rel_push_semijoin_down optimzer


diffs (truncated from 1015 to 300 lines):

diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out 
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
@@ -1216,7 +1216,7 @@ Ready.
 % rewrite, count # name
 % clob,int # type
 % 7,   1 # length
-[ joinidx,   2   ]
+[ joinidx,   1   ]
 
 # 11:48:06   
 # 11:48:06   Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out 
b/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
@@ -70,7 +70,7 @@ Ready.
 % rewrite, count # name
 % clob,int # type
 % 7,   1 # length
-[ joinidx,   2   ]
+[ joinidx,   1   ]
 
 # 09:17:20   
 # 09:17:20   Done.
diff --git a/sql/benchmarks/tpch/Tests/01-22.stable.out 
b/sql/benchmarks/tpch/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-22.stable.out
@@ -1216,7 +1216,7 @@ Ready.
 % rewrite, count # name
 % clob,int # type
 % 7,   1 # length
-[ joinidx,   2   ]
+[ joinidx,   1   ]
 
 # 11:48:06   
 # 11:48:06   Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781
diff --git a/sql/benchmarks/tpch/Tests/16-explain.stable.out 
b/sql/benchmarks/tpch/Tests/16-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/16-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/16-explain.stable.out
@@ -63,94 +63,94 @@ Ready.
 function 
user.s2_1{autoCommit=true}(A0:str,A1:str,A2:int,A3:int,A4:int,A5:int,A6:int,A7:int,A8:int,A9:int,A10:str):void;
 X_13 := sql.mvc();
 X_14:bat[:oid,:oid]  := sql.tid(X_13,sys,partsupp);
-X_17 := 
sql.bind_idxbat(X_13,sys,partsupp,partsupp_ps_partkey_fkey,0);
-(X_20,r1_20) := 
sql.bind_idxbat(X_13,sys,partsupp,partsupp_ps_partkey_fkey,2);
-X_23 := 
sql.bind_idxbat(X_13,sys,partsupp,partsupp_ps_partkey_fkey,1);
+X_17 := sql.bind(X_13,sys,partsupp,ps_suppkey,0);
+(X_20,r1_20) := sql.bind(X_13,sys,partsupp,ps_suppkey,2);
+X_23 := sql.bind(X_13,sys,partsupp,ps_suppkey,1);
 X_25 := sql.delta(X_17,X_20,r1_20,X_23);
 X_26 := algebra.leftfetchjoin(X_14,X_25);
-X_27:bat[:oid,:oid]  := sql.tid(X_13,sys,part);
-X_29 := sql.bind(X_13,sys,part,p_size,0);
-(X_31,r1_31) := sql.bind(X_13,sys,part,p_size,2);
-X_33 := sql.bind(X_13,sys,part,p_size,1);
-X_34 := sql.delta(X_29,X_31,r1_31,X_33);
-X_35 := algebra.leftfetchjoin(X_27,X_34);
-X_36 := sql.bind(X_13,sys,part,p_type,0);
-(X_38,r1_39) := sql.bind(X_13,sys,part,p_type,2);
-X_40 := sql.bind(X_13,sys,part,p_type,1);
-X_41 := sql.delta(X_36,X_38,r1_39,X_40);
-X_42 := algebra.leftfetchjoin(X_27,X_41);
-X_44 := sql.bind(X_13,sys,part,p_brand,0);
-(X_47,r1_50) := sql.bind(X_13,sys,part,p_brand,2);
-X_49 := sql.bind(X_13,sys,part,p_brand,1);
-X_50 := sql.delta(X_44,X_47,r1_50,X_49);
-X_51 := algebra.leftfetchjoin(X_27,X_50);
-X_52 := algebra.subselect(X_51,A0,A0,true,true,true);
-X_54 := algebra.likesubselect(X_42,X_52,A1,,true);
-X_55 := algebra.subselect(X_35,X_54,A2,A2,true,true,false);
-X_57 := algebra.subselect(X_35,X_54,A3,A3,true,true,false);
-X_58 := bat.mergecand(X_55,X_57);
-X_59 := algebra.subselect(X_35,X_54,A4,A4,true,true,false);
-X_60 := bat.mergecand(X_58,X_59);
-X_61 := algebra.subselect(X_35,X_54,A5,A5,true,true,false);
-X_62 := bat.mergecand(X_60,X_61);
-X_63 := algebra.subselect(X_35,X_54,A6,A6,true,true,false);
-X_64 := bat.mergecand(X_62,X_63);
-X_65 := algebra.subselect(X_35,X_54,A7,A7,true,true,false);
-X_66 := bat.mergecand(X_64,X_65);
-X_67 := algebra.subselect(X_35,X_54,A8,A8,true,true,false);
-X_68 := bat.mergecand(X_66,X_67);
-X_69 := algebra.subselect(X_35,X_54,A9,A9,true,true,false);
-X_70 := bat.mergecand(X_68,X_69);
-X_71 := algebra.leftfetchjoin(X_70,X_27);
-(X_72,r1_83) := algebra.join(X_26,X_71);
-X_74 :=

MonetDB: bamloader - Merge with default branch.

MonetDB: RIntegration-default - Merge with default branch.

MonetDB: RIntegration-default - Disable tests that are bound to ...

MonetDB: RIntegration-default - Tell Windows the bare essentials...

MonetDB: Jan2014 - added test for bug 3506

MonetDB: Jan2014 - removed dead code

MonetDB: default - reenable the rel_push_semijoin_down optimzer

7 matches

Site Navigation

Mail list logo

Footer information