Changeset: 74ab40712f88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74ab40712f88
Added Files:
gdk/gdk_calc_compare.h
Removed Files:
clients/RunMapprove.bat.in
clients/RunMapprove.in
clients/RunMtest.bat.in
clients/RunMtest.in
clients/Runmclient.bat.in
geom/RunMapprove.bat.in
geom/RunMapprove.in
geom/RunMserver.bat.in
geom/RunMtest.bat.in
geom/RunMtest.in
monetdb5/RunMapprove.bat.in
monetdb5/RunMapprove.in
monetdb5/RunMserver.bat.in
monetdb5/RunMserver.in
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
sql/RunMapprove.bat.in
sql/RunMapprove.in
sql/RunMserver.bat.in
sql/RunMserver.in
sql/RunMtest.bat.in
sql/RunMtest.in
Modified Files:
clients/Makefile.ag
clients/Tests/exports.stable.out
gdk/Makefile.ag
gdk/gdk_calc.c
gdk/gdk_calc.h
geom/Makefile.ag
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
monetdb5/Makefile.ag
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/json.c
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/group.mx
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/batcalc.mal
monetdb5/modules/mal/batcalc.mal.sh
monetdb5/modules/mal/batmtime.mal
monetdb5/modules/mal/batmtime.mal.sh
monetdb5/optimizer/Tests/AEexample.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/remap.stable.out
monetdb5/optimizer/Tests/roberto1.stable.out
monetdb5/optimizer/Tests/tst4800.stable.out
monetdb5/optimizer/Tests/tst4820.stable.out
monetdb5/optimizer/Tests/tst4900.stable.out
sql/Makefile.ag
Branch: default
Log Message:
merge
diffs (truncated from 46599 to 300 lines):
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -17,25 +17,4 @@
SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON?python HAVE_PYTHON?python3
NATIVE_WIN32?NT
-EXTRA_DIST = RunMtest.in RunMtest.bat.in \
- RunMapprove.in \
- Runmclient.bat.in
-
EXTRA_DIST_DIR = Tests
-
-TESTS = RunMtest
-TESTS_ENVIRONMENT = $(SHELL)
-
-scripts_sh = {
- EXT = ""
- COND = NOT_WIN32
- NOINST
- SOURCES = RunMapprove.in RunMtest.in
-}
-
-scripts_bat = {
- EXT = bat
- COND = NATIVE_WIN32
- NOINST
- SOURCES = RunMapprove.bat.in Runmclient.bat.in RunMtest.bat.in
-}
diff --git a/clients/RunMapprove.bat.in b/clients/RunMapprove.bat.in
deleted file mode 100644
--- a/clients/RunMapprove.bat.in
+++ /dev/null
@@ -1,26 +0,0 @@
-@echo off
-
-if not "%1"=="" goto skip
-call %0 -r
-goto end
-
-:skip
-
-setlocal
-
-set pkg=clients
-set buildbase=@XBUILD@
-set builddir=%buildbase%\clients
-set srcdir=@XSOURCE@\clients
-
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
-
-REM execute Mapprove.py in the source directory
-pushd %srcdir%
-
-call "%buildbase%\testing\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
-
-popd
-endlocal
-
-:end
diff --git a/clients/RunMapprove.in b/clients/RunMapprove.in
deleted file mode 100755
--- a/clients/RunMapprove.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.monetdb.org/Legal/MonetDBLicense
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2012 MonetDB B.V.
-# All Rights Reserved.
-
-pkg=clients
-buildbase=@QBUILD@
-builddir="${buildbase}/clients"
-# make sure srcdir contains absolute path name
-srcdir=`cd '@srcdir@'; pwd`
-
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
-export PYTHONPATH
-
-# execute Mapprove.py in the source directory
-cd "$srcdir"
-
-# execute the script.
-# if no arguments, do a recursive approve (Mapprove.py -r), else pass
-# on the arguments
-exec python "${buildbase}/testing/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
deleted file mode 100644
--- a/clients/RunMtest.bat.in
+++ /dev/null
@@ -1,41 +0,0 @@
-@echo off
-
-if not "%1"=="" goto skip
-call %0 -rq
-goto :EOF
-
-:skip
-
-setlocal
-
-set pkg=clients
-set buildbase=@XBUILD@
-set srcdir=@XSOURCE@
-
-rem binaries (.exe)
-set PATH=%buildbase%\clients\examples\C;%PATH%
-set PATH=%buildbase%\clients\mapiclient;%PATH%
-set PATH=%buildbase%\clients\odbc\samples;%PATH%
-set PATH=%buildbase%\testing;%PATH%
-
-rem libraries (.dll)
-set PATH=%buildbase%\clients\mapilib;%PATH%
-set PATH=%buildbase%\clients\perl\Cimpl;%PATH%
-set PATH=%buildbase%\common\stream;%PATH%
-
-set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\testing;%PYTHONPATH%
-
-set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
-
-set perlib=%buildbase%\clients\perl;%srcdir%\clients\perl
-set PERLLIB=%perlib%;%PERLLIB%
-set PERL5LIB=%perlib%;%PERL5LIB%
-
-rem execute Mtest.py in the source directory
-pushd "%srcdir%"
-
-call "%buildbase%\testing\Mtest.py" "--package=%pkg%"
"--dbfarm=%buildbase%\%pkg%\dbfarm" "--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3
%4 %5 %6 %7 %8 %9
-if ERRORLEVEL 1 exit %ERRORLEVEL%
-
-popd
-endlocal
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
deleted file mode 100755
--- a/clients/RunMtest.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.monetdb.org/Legal/MonetDBLicense
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2012 MonetDB B.V.
-# All Rights Reserved.
-
-pkg=clients
-buildbase="@QBUILD@"
-srcdir="@QSOURCE@"
-uname=`uname`
-
-# make sure scripts are executable
-for x in "${buildbase}/clients/python/monetdb/mclient.py"
-do
- if [ -s $x ] ; then
- chmod +x $x
- fi
-done
-
-# enhance various paths to find our stuff
-PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing:$PATH"
-export PATH
-
-PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/testing:${PYTHONPATH}"
-export PYTHONPATH
-
-CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
-export CLASSPATH
-
-perlib="${buildbase}/clients/perl:${srcdir}/clients/perl"
-PERLLIB="${perlib}:${PERLLIB}"
-PERL5LIB="${perlib}:${PERL5LIB}"
-export PERLLIB PERL5LIB
-
-# execute Mtest.py in the source directory
-cd "${srcdir}/${pkg}"
-
-# execute the script.
-# if no arguments, do a recursive test (Mtest.py -r), else pass on the
-# arguments.
-# if the environment variable MTEST_AT is set (value does not matter), pass
-# the --at flag to Mtest.py so that it uses the at command as a watchdog.
-exec python "${buildbase}/testing/Mtest.py" --package=${pkg}
--dbfarm="${buildbase}/${pkg}/dbfarm" --TSTTRGBASE="${buildbase}/${pkg}"
${MTEST_AT+--at} "${@--rq}"
diff --git a/clients/Runmclient.bat.in b/clients/Runmclient.bat.in
deleted file mode 100644
--- a/clients/Runmclient.bat.in
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-setlocal
-
-set buildbase=@XBUILD@
-set builddir=%buildbase%\clients
-
-set PATH=%builddir%\mapiclient;%builddir%\mapilib;%PATH%
-
-"%builddir%\mapiclient\mclient.exe" %*
-
-endlocal
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
@@ -26,79 +26,79 @@ void BATassertProps(BAT *b);
atomDesc BATatoms[];
BAT *BATattach(int tt, const char *heapfile);
BAT *BATbandjoin(BAT *l, BAT *r, ptr mnus, ptr plus, bit li, bit hi);
-BAT *BATcalcabsolute(BAT *b);
-BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int abort_on_error);
-BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
-BAT *BATcalcand(BAT *b1, BAT *b2);
-BAT *BATcalcandcst(BAT *b, const ValRecord *v);
-int BATcalcavg(BAT *b, dbl *avg, BUN *vals);
-BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi);
-BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi);
-BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi);
-BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi);
-BAT *BATcalccmp(BAT *b1, BAT *b2);
-BAT *BATcalccmpcst(BAT *b, const ValRecord *v);
-BAT *BATcalccstadd(const ValRecord *v, BAT *b, int tp, int abort_on_error);
-BAT *BATcalccstand(const ValRecord *v, BAT *b);
-BAT *BATcalccstcmp(const ValRecord *v, BAT *b);
-BAT *BATcalccstdiv(const ValRecord *v, BAT *b, int tp, int abort_on_error);
-BAT *BATcalccsteq(const ValRecord *v, BAT *b);
-BAT *BATcalccstge(const ValRecord *v, BAT *b);
-BAT *BATcalccstgt(const ValRecord *v, BAT *b);
-BAT *BATcalccstle(const ValRecord *v, BAT *b);
-BAT *BATcalccstlsh(const ValRecord *v, BAT *b, int abort_on_error);
-BAT *BATcalccstlt(const ValRecord *v, BAT *b);
-BAT *BATcalccstmod(const ValRecord *v, BAT *b, int tp, int abort_on_error);
-BAT *BATcalccstmul(const ValRecord *v, BAT *b, int tp, int abort_on_error);
-BAT *BATcalccstne(const ValRecord *v, BAT *b);
-BAT *BATcalccstor(const ValRecord *v, BAT *b);
-BAT *BATcalccstrsh(const ValRecord *v, BAT *b, int abort_on_error);
-BAT *BATcalccstsub(const ValRecord *v, BAT *b, int tp, int abort_on_error);
-BAT *BATcalccstxor(const ValRecord *v, BAT *b);
-BAT *BATcalcdecr(BAT *b, int abort_on_error);
-BAT *BATcalcdiv(BAT *b1, BAT *b2, int tp, int abort_on_error);
-BAT *BATcalcdivcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
-BAT *BATcalceq(BAT *b1, BAT *b2);
-BAT *BATcalceqcst(BAT *b, const ValRecord *v);
-BAT *BATcalcge(BAT *b1, BAT *b2);
-BAT *BATcalcgecst(BAT *b, const ValRecord *v);
-BAT *BATcalcgt(BAT *b1, BAT *b2);
-BAT *BATcalcgtcst(BAT *b, const ValRecord *v);
+BAT *BATcalcabsolute(BAT *b, BAT *s);
+BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
+BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s);
+BAT *BATcalcandcst(BAT *b, const ValRecord *v, BAT *s);
+int BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals);
+BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s);
+BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s);
+BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s);
+BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi,
BAT *s);
+BAT *BATcalccmp(BAT *b1, BAT *b2, BAT *s);
+BAT *BATcalccmpcst(BAT *b, const ValRecord *v, BAT *s);
+BAT *BATcalccstadd(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstand(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstcmp(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstdiv(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccsteq(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstge(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstgt(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstle(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstlsh(const ValRecord *v, BAT *b, BAT *s, int abort_on_error);
+BAT *BATcalccstlt(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstmod(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstmul(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstne(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstor(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstrsh(const ValRecord *v, BAT *b, BAT *s, int abort_on_error);
+BAT *BATcalccstsub(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstxor(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalcdecr(BAT *b, BAT *s, int abort_on_error);
+BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
