Changeset: b7e44c174724 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7e44c174724
Modified Files:
configure.ag
monetdb5/modules/kernel/algebra.mx
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 320 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -990,67 +990,58 @@
yes-*)
dnl -fomit-frame-pointer crashes memprof
case "$host-$gcc_ver" in
- x86_64-*-*-3.[[2-9]]*|i*86-*-*-3.[[2-9]]*|x86_64-*-*-4.*|i*86-*-*-4.*)
- CFLAGS="$CFLAGS -O6"
- case "$host" in
- i*86-*-cygwin)
- dnl With gcc 3.2, the combination of "-On
-fomit-frame-pointer" (n>1)
- dnl does not seem to produce stable/correct?
binaries under CYGWIN
- dnl (Mdiff and Mserver crash with segmentation
faults);
- dnl hence, we omit -fomit-frame-pointer, here.
- ;;
- *) CFLAGS="$CFLAGS -fomit-frame-pointer";;
- esac
- CFLAGS="$CFLAGS
-finline-functions -falign-loops=4 -falign-jumps=4 -falign-functions=4
-fexpensive-optimizations -funroll-loops
-frerun-cse-after-loop -frerun-loop-opt"
- dnl With gcc 3.2, the combination of "-On
-funroll-all-loops" (n>1)
- dnl does not seem to produce stable/correct? binaries
- dnl (Mserver produces tons of incorrect BATpropcheck
warnings);
- dnl hence, we omit -funroll-all-loops, here.
- case "$gcc_ver" in
- 4.*) CFLAGS="$CFLAGS -ftree-vectorize";;
- dnl "-ftree-vectorize" is only available with
newer versions of gcc, only;
- dnl did not check the exact version, but 4.1 has
it, while 3.4.5 does not.
- esac
- ;;
- x86_64-*-*|i*86-*-*)
- CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions -malign-loops=4 -malign-jumps=4 -malign-functions=4
-fexpensive-optimizations -funroll-all-loops -funroll-loops
-frerun-cse-after-loop -frerun-loop-opt"
- case "$gcc_ver" in
- 4.*) CFLAGS="$CFLAGS -ftree-vectorize";;
- dnl "-ftree-vectorize" is only available with
newer versions of gcc, only;
- dnl did not check the exact version, but 4.1 has
it, while 3.4.5 does not.
- esac
- ;;
- ia64-*-*) CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions
-fexpensive-optimizations
-frerun-cse-after-loop -frerun-loop-opt"
- dnl Obviously, 4-byte alignment doesn't make sense on
Linux64; didn't try 8-byte alignment, yet.
- dnl Further, when combining either of
"-funroll-all-loops" and "-funroll-loops" with "-On" (n>1),
- dnl gcc (3.2.1 & 2.96) does not seem to produce
stable/correct? binaries under Linux64
- dnl (Mserver crashes with segmentation fault);
- dnl hence, we omit both "-funroll-all-loops" and
"-funroll-loops", here
- case "$gcc_ver" in
- 4.*) CFLAGS="$CFLAGS -ftree-vectorize";;
- dnl "-ftree-vectorize" is only available with
newer versions of gcc, only;
- dnl did not check the exact version, but 4.1 has
it, while 3.4.5 does not.
- esac
- ;;
- *-sun-solaris*)
- if test "$bits" = "64" ; then
- NO_INLINE_CFLAGS="$NO_INLINE_CFLAGS -O1"
- fi
- case "$gcc_ver" in
- 4.*)
- CFLAGS="$CFLAGS -O6
-fomit-frame-pointer -finline-functions -fexpensive-optimizations
-funroll-all-loops -funroll-loops -frerun-cse-after-loop -frerun-loop-opt
-ftree-vectorize";;
- *)
- CFLAGS="$CFLAGS -O2
-fomit-frame-pointer -finline-functions";;
- esac
- ;;
- *irix*) CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions"
- ;;
- *aix*) CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions"
- if test "$bits" = "64" ; then
- NO_INLINE_CFLAGS="$NO_INLINE_CFLAGS -O0"
- fi
- ;;
- *) CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions";;
+ powerpc*-apple-darwin*)
+ # -fast switch includes -mdynamic-no-pic, unless -fPIC is
+ # given, which we need for dynamic libraries, flags:
+ # -O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15
+ # -falign-loops=16 -falign-jumps=16 -falign-functions=16
+ # -malign-natural -ffast-math -fstrict-aliasing
+ # -funroll-loops -ftree-loop-linear -ftree-loop-memset
+ # -mcpu=G5 -mpowerpc-gpopt -mtune=G5 -fsched-interblock
+ # -fgcse-sm -mpowerpc64
+ CFLAGS="-fast -fPIC -pipe ${CFLAGS}"
+ ;;
+ i?86-apple-darwin*|x86_64-apple-darwin*)
+ # -fast switch on Intel is a lot less tuned:
+ # -O3 -fomit-frame-pointer -fstrict-aliasing
+ # -momit-leaf-frame-pointer -fno-tree-pre -falign-loops
+ CFLAGS="-fast -pipe ${CFLAGS}"
+ ;;
+ *)
+ # -O1 on gcc enables all slight optimisations:
+ # -fauto-inc-dec -fcprop-registers -fdce -fdefer-pop
+ # -fdelayed-branch -fdse -fguess-branch-probability
+ # -fif-conversion2 -fif-conversion -fipa-pure-const
+ # -fipa-reference -fmerge-constants -fsplit-wide-types
+ # -ftree-builtin-call-dce -ftree-ccp -ftree-ch
+ # -ftree-copyrename -ftree-dce -ftree-dominator-opts
+ # -ftree-dse -ftree-forwprop -ftree-fre -ftree-phiprop
+ # -ftree-sra -ftree-pta -ftree-ter -funit-at-a-time
+ # on top of this -fomit-frame-pointer is enabled on machines
+ # where this does not interfere with debugging.
+ # -O2 on gcc enables optimisations which do not involve a
+ # speed-space tradeoff on top of -O1:
+ # -fthread-jumps -falign-functions -falign-jumps
+ # -falign-loops -falign-labels -fcaller-saves -fcrossjumping
+ # -fcse-follow-jumps -fcse-skip-blocks
+ # -fdelete-null-pointer-checks -fexpensive-optimizations
+ # -fgcse -fgcse-lm -finline-small-functions
+ # -findirect-inlining -fipa-sra -foptimize-sibling-calls
+ # -fpeephole2 -fregmove -freorder-blocks -freorder-functions
+ # -frerun-cse-after-loop -fsched-interblock -fsched-spec
+ # -fschedule-insns -fschedule-insns2 -fstrict-aliasing
+ # -fstrict-overflow -ftree-switch-conversion -ftree-pre
+ # -ftree-vrp
+ # (Gentoo enables -D_FORTIFY_SOURCE=2 starting at -O2)
+ # -O3 on gcc enables some more expensive optimisations on top
+ # of -O2:
+ # -finline-functions, -funswitch-loops,
+ # -fpredictive-commoning, -fgcse-after-reload,
+ # -ftree-vectorize and -fipa-cp-clone
+ CFLAGS="-O3 -pipe ${CFLAGS}"
+ # the following flag used to be applied, but is discouraged by
+ # GCC manpage: -funroll-all-loops
+ ;;
esac
;;
*)
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -18,13 +18,13 @@
rem vaults is not (yet?) built on Windows
rem if not exist "%buildbase%\sql\backends\monet5\vaults\autoload" mkdir
"%buildbase%\sql\backends\monet5\vaults\autoload"
rem copy /y "%srcdir%"\sql\backends\monet5\vaults\??_*.mal
"%buildbase%\sql\backends\monet5\vaults\autoload"
-rem if "@HAVE_MSEED_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
-rem if "@HAVE_CFITSIO_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
+rem if "@HAVE_MSEED_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
+rem if "@HAVE_CFITSIO_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist "%buildbase%\sql\sql\createdb" mkdir
"%buildbase%\sql\sql\createdb"
copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
-if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
+if "@HAVE_RAPTOR_FALSE@"=="" del /f "%buildbase%\sql\sql\createdb\30_rdf.sql"
copy /y "%srcdir%"\geom\monetdb5\??_*.mal
"%buildbase%\sql\backends\monet5\autoload"
copy /y "%srcdir%"\geom\sql\??_*.sql "%buildbase%\sql\sql\createdb"
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -18,13 +18,13 @@
rem vaults is not (yet?) built on Windows
rem if not exist "%buildbase%\sql\backends\monet5\vaults\autoload" mkdir
"%buildbase%\sql\backends\monet5\vaults\autoload"
rem copy /y "%srcdir%"\sql\backends\monet5\vaults\??_*.mal
"%buildbase%\sql\backends\monet5\vaults\autoload"
-rem if "@HAVE_MSEED_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
-rem if "@HAVE_CFITSIO_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
+rem if "@HAVE_MSEED_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
+rem if "@HAVE_CFITSIO_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist "%buildbase%\sql\sql\createdb" mkdir
"%buildbase%\sql\sql\createdb"
copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
-if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
+if "@HAVE_RAPTOR_FALSE@"=="" del /f "%buildbase%\sql\sql\createdb\30_rdf.sql"
rem binaries (.exe)
set PATH=%buildbase%\clients\examples\C;%PATH%
diff --git a/monetdb5/modules/kernel/algebra.mx
b/monetdb5/modules/kernel/algebra.mx
--- a/monetdb5/modules/kernel/algebra.mx
+++ b/monetdb5/modules/kernel/algebra.mx
@@ -1080,7 +1080,7 @@
{
ptr v = (b->ttype == TYPE_bat) ? (ptr) &((BAT *) value)->batCacheid :
value;
- return (*result = BATantiuselect_(b, v, NULL, FALSE, FALSE)) ?
GDK_SUCCEED : GDK_FAIL;
+ return (*result = BATantiuselect_(b, v, NULL, TRUE, TRUE)) ?
GDK_SUCCEED : GDK_FAIL;
}
int
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -18,13 +18,13 @@
rem vaults is not (yet?) built on Windows
rem if not exist "%buildbase%\sql\backends\monet5\vaults\autoload" mkdir
"%buildbase%\sql\backends\monet5\vaults\autoload"
rem copy /y "%srcdir%"\sql\backends\monet5\vaults\??_*.mal
"%buildbase%\sql\backends\monet5\vaults\autoload"
-rem if "@HAVE_MSEED_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
-rem if "@HAVE_CFITSIO_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
+rem if "@HAVE_MSEED_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
+rem if "@HAVE_CFITSIO_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist "%buildbase%\sql\sql\createdb" mkdir
"%buildbase%\sql\sql\createdb"
copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
-if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
+if "@HAVE_RAPTOR_FALSE@"=="" del /f "%buildbase%\sql\sql\createdb\30_rdf.sql"
rem binaries (.exe)
set PATH=%buildbase%\clients\examples\C;%PATH%
diff --git a/sql/test/Tests/mclient-t-s.stable.err.Windows
b/sql/test/Tests/mclient-t-s.stable.err.Windows
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/mclient-t-s.stable.err.Windows
@@ -0,0 +1,108 @@
+stderr of test 'mclient-t-s` in directory 'test` itself:
+
+
+# 19:27:54 >
+# 19:27:54 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37077 --set
xrpc_port=45451 --set monet_prompt= --trace "--dbname=mTests_src_test" --set
mal_listing=0 "--dbinit= inc
lude sql;" ; echo ; echo Over..
+# 19:27:54 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.34.0
+# builtin opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib64/MonetDB
+# builtin opt monet_daemon = yes
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_noheaders = no
+# builtin opt mapi_debug = 0
+# builtin opt mapi_clients = 2
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt gdk_dbname = demo
+# config opt gdk_alloc_map = no
+# config opt gdk_embedded = no
+# config opt gdk_debug = 0
+# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
+# config opt monet_daemon = no
+# config opt monet_welcome = yes
+# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt mal_init = ${exec_prefix}/lib64/MonetDB5/mal_init.mal
+# config opt mal_listing = 2
+# config opt mapi_port = 50000
+# config opt mapi_autosense = false
+# config opt mapi_open = false
+# config opt sql_optimizer = default_pipe
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# cmdline opt config =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 37077
+# cmdline opt xrpc_port = 45451
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbname = mTests_src_test
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf)
+
+# 11:08:32 >
+# 11:08:32 > /usr/bin/python mclient-t-s.SQL.py mclient-t-s
+# 11:08:32 >
+
+mclient: invalid option -- 't'
+Usage: mclient [ options ]
+
+Options are:
+ -h hostname | --host=hostname host to connect to
+ -p portnr | --port=portnr port to connect to
+ -u user | --user=user user id
+ -d database | --database=database database to connect to
+ -e | --echo echo the query
+ -E charset | --encoding=charset specify encoding (character set) of the
terminal
+ -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
+ -H | --history load/save cmdline history (default off)
+ -i | --interactive read stdin after command line args
+ -l language | --language=lang {sql,mal}
+ -L logfile | --log=logfile save client/server interaction
+ -s stmt | --statement=stmt run single statement
+ -X | --Xdebug trace mapi network interaction
+ -? | --help show this usage message
+
+SQL specific opions
+ -n nullstr | --null=nullstr change NULL representation for sql, csv and
tab output modes
+ -r nr | --rows=nr for pagination
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
