date:20150401

MonetDB: default - Merge with Oct2014 branch.

2015-04-01 Thread Stefan Manegold

Changeset: aa7279f2351e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa7279f2351e
Modified Files:
sql/benchmarks/tpch/11.sql
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (13 lines):

diff --git a/sql/benchmarks/tpch/11.sql b/sql/benchmarks/tpch/11.sql
--- a/sql/benchmarks/tpch/11.sql
+++ b/sql/benchmarks/tpch/11.sql
@@ -17,6 +17,9 @@ group by
sum(ps_supplycost * ps_availqty)  (
select
sum(ps_supplycost * ps_availqty) * 0.01
+   -- 
+   -- The above constant needs to be adjusted according
+   -- to the scale factor (SF): constant = 0.0001 / SF.
from
partsupp,
supplier,
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Oct2014 - TPCH Q11: re-added comment that constant need...

2015-04-01 Thread Stefan Manegold

Changeset: 4a77cc98ef2e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a77cc98ef2e
Modified Files:
sql/benchmarks/tpch/11.sql
Branch: Oct2014
Log Message:

TPCH Q11: re-added comment that constant needs to be adjusted according to 
scale factor (SF)


diffs (13 lines):

diff --git a/sql/benchmarks/tpch/11.sql b/sql/benchmarks/tpch/11.sql
--- a/sql/benchmarks/tpch/11.sql
+++ b/sql/benchmarks/tpch/11.sql
@@ -17,6 +17,9 @@ group by
sum(ps_supplycost * ps_availqty)  (
select
sum(ps_supplycost * ps_availqty) * 0.01
+   -- 
+   -- The above constant needs to be adjusted according
+   -- to the scale factor (SF): constant = 0.0001 / SF.
from
partsupp,
supplier,
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: pyapi - Python API: MAL level import

2015-04-01 Thread Hannes Muehleisen

Changeset: fbc06a07b6e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbc06a07b6e3
Added Files:
monetdb5/extras/pyapi/50_pyapi.mal
monetdb5/extras/pyapi/Makefile.ag
monetdb5/extras/pyapi/Tests/All
monetdb5/extras/pyapi/Tests/pyapi00.malC
monetdb5/extras/pyapi/pyapi.c
monetdb5/extras/pyapi/pyapi.h
monetdb5/extras/pyapi/pyapi.mal
Modified Files:
configure.ag
monetdb5/extras/Makefile.ag
testing/Mtest.py.in
Branch: pyapi
Log Message:

Python API: MAL level import


diffs (truncated from 600 to 300 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -226,6 +226,13 @@ AC_ARG_ENABLE(rintegration,
enable_rintegration=$enableval,
enable_rintegration=$dft_rintegration)
 
+dft_pyintegration=auto
+AC_ARG_ENABLE(pyintegration,
+   AS_HELP_STRING([--enable-pyintegration],
+   [enable support for Python integration into MonetDB 
(default=auto)]),
+   enable_pyintegration=$enableval,
+   enable_pyintegration=$dft_pyintegration)
+
 dft_odbc=auto
 AC_ARG_ENABLE(odbc,
AS_HELP_STRING([--enable-odbc],
@@ -2211,6 +2218,7 @@ AC_SUBST(SPHINXCLIENT_CFLAGS, $SPHINXCLI
 AC_SUBST(SPHINXCLIENT_LIBS, $SPHINXCLIENT_LIBS)
 AM_CONDITIONAL(HAVE_SPHINXCLIENT, test x$have_sphinxclient != xno)
 
+# R API (embedded R)
 have_libr=no
 if test x$enable_rintegration != xno; then
case $enable_rintegration in
@@ -2246,6 +2254,41 @@ if test x$enable_rintegration != xno; 
 fi
 AM_CONDITIONAL(HAVE_LIBR, test x$have_libr != xno)
 
+# Python API (embedded Python)
+have_libpy=no
+if test x$enable_pyintegration != xno; then
+   case $enable_pyintegration in
+   yes|auto)
+   XPATH=$PATH
+   ;;
+   /*)
+   XPATH=$enable_pyintegration
+   enable_pyintegration=yes
+   ;;
+   *)
+   AC_MSG_ERROR([--enable-pyintegration value must be 
yes|no|auto|absolute path of python-config])
+   ;;
+   esac
+   AC_PATH_PROG(PYCMD,python-config,,$XPATH)
+   if test x$PYCMD = x; then
+   if test x$enable_pyintegration = xyes; then
+   AC_MSG_ERROR([python-config library required for Python 
integration support])
+   else
+   have_libpy=no
+   why_have_libpy=(python-config command not found)
+   enable_pyintegration=no
+   disable_pyintegration=(python-config command not 
found)
+   fi
+   elif libpy_CFLAGS=`$PYCMD --cflags `  libpy_LIBS=`$PYCMD --ldflags`; 
then
+   have_libpy=yes
+   AC_DEFINE(HAVE_LIBPY, 1, [Define if we can link to python])
+   AC_SUBST(libpy_CFLAGS, $libpy_CFLAGS)
+   AC_SUBST(libpy_LIBS, $libpy_LIBS)
+   fi
+fi
+AM_CONDITIONAL(HAVE_LIBPY, test x$have_libpy != xno)
+
+
 # ODBC, only used by ODBC driver
 if test x$enable_odbc != xno; then
have_unixodbc=auto
@@ -3270,25 +3313,26 @@ done
 echo
 echo * Enabled/disabled components:
 for comp in \
-   'gdk ' \
-   'monetdb5' \
-   'sql ' \
-   'geom' \
-   'console ' \
-   'gsl ' \
-   'fits' \
-   'jsonstore   ' \
-   'microhttpd  ' \
-   'rintegration' \
-   'odbc' \
-   'jdbc' \
-   'control ' \
-   'testing ' \
-   'developer   ' \
-   'strict  ' \
-   'debug   ' \
-   'assert  ' \
-   'optimize' \
+   'gdk  ' \
+   'monetdb5 ' \
+   'sql  ' \
+   'geom ' \
+   'console  ' \
+   'gsl  ' \
+   'fits ' \
+   'jsonstore' \
+   'microhttpd   ' \
+   'rintegration ' \
+   'pyintegration' \
+   'odbc ' \
+   'jdbc ' \
+   'control  ' \
+   'testing  ' \
+   'developer' \
+   'strict   ' \
+   'debug' \
+   'assert   ' \
+   'optimize ' \
 ; do
eval dft=\$dft_$comp
eval enable=\$enable_$comp
diff --git a/monetdb5/extras/Makefile.ag b/monetdb5/extras/Makefile.ag
--- a/monetdb5/extras/Makefile.ag
+++ b/monetdb5/extras/Makefile.ag
@@ -4,5 +4,5 @@
 #
 # Copyright 2008-2015 MonetDB B.V.
 
-SUBDIRS = HAVE_SPHINXCLIENT?sphinx mal_optimizer_template HAVE_LIBR?rapi
+SUBDIRS = HAVE_SPHINXCLIENT?sphinx mal_optimizer_template HAVE_LIBR?rapi 
HAVE_LIBPY?pyapi
 
diff --git a/monetdb5/extras/pyapi/50_pyapi.mal 
b/monetdb5/extras/pyapi/50_pyapi.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/pyapi/50_pyapi.mal
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 2008-2015 MonetDB

MonetDB: pyapi - Python API:

2015-04-01 Thread Hannes Muehleisen

Changeset: 663b509eff6c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=663b509eff6c
Modified Files:
monetdb5/extras/pyapi/Makefile.ag
monetdb5/extras/pyapi/Tests/pyapi00.malC
monetdb5/extras/pyapi/pyapi.c
monetdb5/extras/pyapi/pyapi.mal
Branch: pyapi
Log Message:

Python API:


diffs (truncated from 508 to 300 lines):

diff --git a/monetdb5/extras/pyapi/Makefile.ag 
b/monetdb5/extras/pyapi/Makefile.ag
--- a/monetdb5/extras/pyapi/Makefile.ag
+++ b/monetdb5/extras/pyapi/Makefile.ag
@@ -18,19 +18,18 @@ lib__pyapi = {
MODULE
DIR = libdir/monetdb5
SOURCES = pyapi.c pyapi.h
+   XDEPS = $(libpy_LIBDEP)
LIBS = ../../tools/libmonetdb5 \
../../../gdk/libbat \
$(MALLOC_LIBS) $(libpy_LIBS)
 }
 
-
 headers_pyapi_mal = {
HEADERS = mal
DIR = libdir/monetdb5
SOURCES = pyapi.mal
 }
 
-
 headers_autoload = {
HEADERS = mal
DIR = libdir/monetdb5/autoload
diff --git a/monetdb5/extras/pyapi/Tests/pyapi00.malC 
b/monetdb5/extras/pyapi/Tests/pyapi00.malC
--- a/monetdb5/extras/pyapi/Tests/pyapi00.malC
+++ b/monetdb5/extras/pyapi/Tests/pyapi00.malC
@@ -12,7 +12,7 @@ bat.append(b,1189641421);
 
 io.print(b);
 
-r:bat[:oid,:dbl] := pyapi.eval(nil:ptr,TODO,b);
+r:bat[:oid,:dbl] := pyapi.eval(nil:ptr,print(arg1);someval - Re(fft(arg1)); 
print(someval); return(someval);,b);
 io.print(r);
 
 
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -28,16 +28,14 @@ int PyAPIEnabled(void) {
|| GDKgetenv_isyes(pyapi_enableflag));
 }
 
+// TODO: exclude pyapi from mergetable, too
 // TODO: can we call the Python interpreter in a multi-thread environment?
 static MT_Lock pyapiLock;
 static int pyapiInitialized = FALSE;
 
 
-static int PyAPIinitialize(void) {
-   Py_Initialize();
-   pyapiInitialized++;
-   return 0;
-}
+#define _PYAPI_DEBUG_
+
 
 pyapi_export str PyAPIevalStd(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) {
@@ -48,212 +46,214 @@ pyapi_export str PyAPIevalAggr(Client cn
return PyAPIeval(cntxt, mb, stk, pci, 1);
 }
 
+
 str PyAPIeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, bit 
grouped) {
+   sql_func * sqlfun = *(sql_func**) getArgReference(stk, pci, pci-retc);
+   str exprStr = *getArgReference_str(stk, pci, pci-retc + 1);
 
-   sql_func * sqlfun = *(sql_func**) getArgReference(stk, pci, pci-retc);
-   str exprStr = *getArgReference_str(stk, pci, pci-retc + 1);
+   int i = 1, ai = 0;
+   char argbuf[64];
+   char argnames[1000] = ;
+   size_t pos;
+   char* rcall = NULL;
+   size_t rcalllen;
+   size_t ret_rows = 0;
+   //int ret_cols = 0; /* int because pci-retc is int, too*/
+   str *args;
+   //int evalErr;
+   char *msg = MAL_SUCCEED;
+   BAT *b;
+   BUN cnt;
+   node * argnode;
+   int seengrp = FALSE;
+   PyObject *pArgs; // this is going to be the parameter tuple
 
-   int i = 1, ai = 0;
-   char argbuf[64];
-   char argnames[1000] = ;
-   size_t pos;
-   char* rcall = NULL;
-   size_t rcalllen;
-   size_t ret_rows = 0;
-   //int ret_cols = 0; /* int because pci-retc is int, too*/
-   str *args;
-   //int evalErr;
-   char *msg = MAL_SUCCEED;
-   BAT *b;
-   BUN cnt;
-   node * argnode;
-   int seengrp = FALSE;
-   PyObject *pArgs; // this is going to be the parameter tuple!
+   // we don't need no context, but the compiler needs us to touch it (...)
+   (void) cntxt;
 
-   // we don't need no context, but the compiler needs us to touch 
it (...)
-   (void) cntxt;
+   if (!PyAPIEnabled()) {
+   throw(MAL, pyapi.eval,
+ Embedded Python has not been enabled. Start server 
with --set %s=true,
+ pyapi_enableflag);
+   }
 
-   if (!PyAPIEnabled()) {
-   throw(MAL, pyapi.eval,
- Embedded Python has not been enabled. Start 
server with --set %s=true,
- pyapi_enableflag);
+   rcalllen = strlen(exprStr) + sizeof(argnames) + 100;
+   rcall = malloc(rcalllen);
+   args = (str*) GDKzalloc(sizeof(str) * pci-argc);
+
+   if (args == NULL || rcall == NULL) {
+   throw(MAL, pyapi.eval, MAL_MALLOC_FAIL);
+   // TODO: free args and rcall
+   }
+
+   // TODO: do we need this lock for Python as well?
+   MT_lock_set(pyapiLock, pyapi.evaluate);
+
+
+
+   // first argument after the return contains the pointer to the sql_func 
structure
+   if (sqlfun

MonetDB: pyapi - Python Integration: mc

2015-04-01 Thread Hannes Muehleisen

Changeset: a57eb8b181da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a57eb8b181da
Modified Files:
monetdb5/extras/pyapi/Tests/pyapi00.malC
monetdb5/extras/pyapi/pyapi.c
monetdb5/extras/pyapi/pyapi.h
Branch: pyapi
Log Message:

Python Integration: mc


diffs (62 lines):

diff --git a/monetdb5/extras/pyapi/Tests/pyapi00.malC 
b/monetdb5/extras/pyapi/Tests/pyapi00.malC
--- a/monetdb5/extras/pyapi/Tests/pyapi00.malC
+++ b/monetdb5/extras/pyapi/Tests/pyapi00.malC
@@ -12,7 +12,7 @@ bat.append(b,1189641421);
 
 io.print(b);
 
-r:bat[:oid,:dbl] := pyapi.eval(nil:ptr,print(arg1);someval - Re(fft(arg1)); 
print(someval); return(someval);,b);
+r:bat[:oid,:dbl] := pyapi.eval(nil:ptr,This string is somehow not arriving at 
the C function, why?,b);
 io.print(r);
 
 
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -36,18 +36,21 @@ static int pyapiInitialized = FALSE;
 
 #define _PYAPI_DEBUG_
 
+str PyAPIeval(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, bit grouped);
 
 pyapi_export str PyAPIevalStd(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) {
-   return PyAPIeval(cntxt, mb, stk, pci, 0);
+   (void) cntxt;
+   return PyAPIeval(mb, stk, pci, 0);
 }
 pyapi_export str PyAPIevalAggr(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
 InstrPtr pci) {
-   return PyAPIeval(cntxt, mb, stk, pci, 1);
+   (void) cntxt;
+   return PyAPIeval(mb, stk, pci, 1);
 }
 
 
-str PyAPIeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, bit 
grouped) {
+str PyAPIeval(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, bit grouped) {
sql_func * sqlfun = *(sql_func**) getArgReference(stk, pci, pci-retc);
str exprStr = *getArgReference_str(stk, pci, pci-retc + 1);
 
@@ -68,9 +71,6 @@ str PyAPIeval(Client cntxt, MalBlkPtr mb
int seengrp = FALSE;
PyObject *pArgs; // this is going to be the parameter tuple
 
-   // we don't need no context, but the compiler needs us to touch it (...)
-   (void) cntxt;
-
if (!PyAPIEnabled()) {
throw(MAL, pyapi.eval,
  Embedded Python has not been enabled. Start server 
with --set %s=true,
diff --git a/monetdb5/extras/pyapi/pyapi.h b/monetdb5/extras/pyapi/pyapi.h
--- a/monetdb5/extras/pyapi/pyapi.h
+++ b/monetdb5/extras/pyapi/pyapi.h
@@ -19,8 +19,6 @@
 
 #define pyapi_export extern
 
-pyapi_export str PyAPIeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
-   InstrPtr pci, bit grouped);
 pyapi_export str PyAPIevalStd(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
 pyapi_export str PyAPIevalAggr(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - fixed bug in aggregate handling with large re...

2015-04-01 Thread Niels Nes

Changeset: a423ad041951 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a423ad041951
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.oid32.int128
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/01.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/03.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/05.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/06.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/07.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/08.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/10.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/15.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/17.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/19.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out.int128
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01.stable.out.int128
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/03.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-plan.stable.out.int128
sql/benchmarks/tpch/Tests/08.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/17.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-plan.stable.out.int128
sql/benchmarks/tpch/Tests/18.stable.out
sql/benchmarks/tpch/Tests/18.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/benchmarks/tpch/Tests/22.stable.out
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.stable.out

sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.stable.out

sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out

sql/test/BugTracker-2013/Tests/bogus_aggregation_casts.Bug-3342.stable.out
sql/test/BugTracker-2013/Tests/median.Bug-3352.stable.out
sql/test/Dependencies/Tests/Dependencies_bam.stable.out
sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
sql/test/leaks/Tests/check0_bam.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: default
Log Message:

fixed bug in aggregate handling with large result types (hge)


diffs (truncated from 1912 to 300 lines):

diff --git a/clients/Tests/MAL-signatures_all.stable.out 
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -2320,10 +2320,6 @@ command algebra.ilike(s:str,pat:str):bit
 address PCREilike2;
 command algebra.ilike(s:str,pat:str,esc:str):bit 
 address PCREilike3;
-pattern

MonetDB: default - approve output

2015-04-01 Thread Niels Nes

Changeset: 181f419a2a06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=181f419a2a06
Modified Files:
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
Branch: default
Log Message:

approve output


diffs (30 lines):

diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out
@@ -56,9 +56,9 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 633 # length
+% 812 # length
 function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
-X_132:void := querylog.define(explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty)  
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;,sequential_pipe,72);
+X_132:void := querylog.define(explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty)  
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\t--\t   
\n\t\t\t-- The above constant needs to be adjusted 
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 / 
SF.\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;,sequential_pipe,72);
 X_5 := sql.mvc();
 X_6:bat[:oid,:oid]  := sql.tid(X_5,sys,supplier);
 X_9:bat[:oid,:oid]  := 
sql.bind_idxbat(X_5,sys,supplier,supplier_s_nationkey_fkey,0);
diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
@@ -56,9 +56,9 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 633 # length
+% 812 # length
 function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
-X_132:void := querylog.define(explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty)  
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;,sequential_pipe,72);
+X_132:void := querylog.define(explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty)  
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\t--\t   
\n\t\t\t-- The above constant needs to be adjusted 
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 / 
SF.\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;,sequential_pipe,72);
 X_5 := sql.mvc();
 X_6:bat[:oid,:oid]  := sql.tid(X_5,sys,supplier);
 X_9:bat[:oid,:oid]  := 
sql.bind_idxbat(X_5,sys,supplier,supplier_s_nationkey_fkey,0);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2015-04-01 Thread Niels Nes

Changeset: 9e2c188cfb6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e2c188cfb6d
Modified Files:
sql/test/pg_regress/Tests/interval.stable.out
sql/test/pg_regress/Tests/interval.stable.out.int128
sql/test/quantiles/Tests/quantiles.stable.out
Branch: default
Log Message:

approved output


diffs (45 lines):

diff --git a/sql/test/pg_regress/Tests/interval.stable.out 
b/sql/test/pg_regress/Tests/interval.stable.out
--- a/sql/test/pg_regress/Tests/interval.stable.out
+++ b/sql/test/pg_regress/Tests/interval.stable.out
@@ -102,7 +102,7 @@ Ready.
 % sys.L2 # table_name
 % L2 # name
 % decimal # type
-% 24 # length
+% 41 # length
 [ -7034318805200352350.000 ]
 #select count(f1) from interval_tbl;
 % sys.L1 # table_name
diff --git a/sql/test/pg_regress/Tests/interval.stable.out.int128 
b/sql/test/pg_regress/Tests/interval.stable.out.int128
--- a/sql/test/pg_regress/Tests/interval.stable.out.int128
+++ b/sql/test/pg_regress/Tests/interval.stable.out.int128
@@ -102,7 +102,7 @@ Ready.
 % sys.L2 # table_name
 % L2 # name
 % decimal # type
-% 24 # length
+% 41 # length
 [ -7034318805200352350.000 ]
 #select count(f1) from interval_tbl;
 % sys.L1 # table_name
diff --git a/sql/test/quantiles/Tests/quantiles.stable.out 
b/sql/test/quantiles/Tests/quantiles.stable.out
--- a/sql/test/quantiles/Tests/quantiles.stable.out
+++ b/sql/test/quantiles/Tests/quantiles.stable.out
@@ -103,7 +103,7 @@ Ready.
 % sys.L1 # table_name
 % L1 # name
 % decimal # type
-% 17 # length
+% 20 # length
 [ 36724.50 ]
 #select quantile(l_extendedprice,0.0) from lit;
 % sys.L1 # table_name
@@ -135,7 +135,7 @@ Ready.
 % sys.L1 # table_name
 % L1 # name
 % decimal # type
-% 17 # length
+% 20 # length
 [ 36960.68 ]
 [ 37144.20 ]
 [ 35937.88 ]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Oct2014 branch.

MonetDB: Oct2014 - TPCH Q11: re-added comment that constant need...

MonetDB: pyapi - Python API: MAL level import

MonetDB: pyapi - Python API:

MonetDB: pyapi - Python Integration: mc

MonetDB: default - fixed bug in aggregate handling with large re...

MonetDB: default - approve output

MonetDB: default - approved output

8 matches

Site Navigation

Mail list logo

Footer information