Changeset: 54d545343a55 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=54d545343a55
Added Files:
java/tests/Test_Csendthread.java
sql/jdbc/tests/Tests/Test_Csendthread.SQL.bat
sql/jdbc/tests/Tests/Test_Csendthread.SQL.sh
sql/jdbc/tests/Tests/Test_Csendthread.stable.err
sql/jdbc/tests/Tests/Test_Csendthread.stable.out
Modified Files:
buildtools/autogen/autogen/am.py
configure.ag
debian/monetdb5-server.install
debian/monetdb5-sql.install
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
java/tests/build.xml
monetdb5/optimizer/opt_centipede.c
sql/jdbc/tests/Tests/All
Branch: default
Log Message:
Merge with Oct2012 branch.
diffs (truncated from 733 to 300 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1133,7 +1133,7 @@ def am_includes(fd, var, values, am):
else:
incs = incs + " -I" + am_translate_dir(i, am) \
+ am_add_srcdir(i, am, " -I")
- fd.write("INCLUDES = " + incs + "\n")
+ fd.write("AM_CPPFLAGS = " + incs + "\n")
output_funcs = {'SUBDIRS': am_subdirs,
'EXTRA_DIST': am_extra_dist,
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -870,80 +870,59 @@ if test "x$enable_optim" = xyes; then
JAVACFLAGS="$JAVACFLAGS -g:none -O"
case "$GCC-$CC" in
yes-*clang*)
- CFLAGS="$CFLAGS -O3 -fomit-frame-pointer
-finline-functions"
+ CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -finline-functions"
;;
yes-*)
dnl -fomit-frame-pointer crashes memprof
- case "$host-$gcc_ver" in
- powerpc*-apple-darwin*)
- # -fast switch causes arithmetic differences, and slower
- # running code for SQL, some faster for M5, so we don't use
- # it. Instead we just run with modest -O3 and
- # -fomit-frame-pointer (we don't intend to debug the binary).
- CFLAGS="-O3 -fomit-frame-pointer -pipe ${CFLAGS}"
- ;;
- i?86-apple-darwin*|x86_64-apple-darwin*)
- # -fast switch on Intel is a lot less tuned, and hence safer:
- # -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 -fomit-frame-pointer -pipe ${CFLAGS}"
- # because we explicitly disable debugging, we can explicitly
- # enable -fomit-frame-pointer here
- # notes on -funroll-all-loops:
- # - does nothing on i?86-linux and x86_64-linux
- # - speeds up and causes crashes on powerpc-linux
- # - slows down and makes output incorrect on sparc-solaris
- # - speeds up and fixes some outputs on sparcv9-solaris
- ;;
- esac
-
- # The default configure invocation when doing an rpmbuild also uses this
- MCHECK_ADD_FLAG([-Wp,-D_FORTIFY_SOURCE=2])
- ;;
+ # -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 -fomit-frame-pointer -pipe ${CFLAGS}"
+ # because we explicitly disable debugging, we can explicitly
+ # enable -fomit-frame-pointer here
+ # notes on -funroll-all-loops:
+ # - does nothing on i?86-linux and x86_64-linux
+ # - speeds up and causes crashes on powerpc-linux
+ # - slows down and makes output incorrect on sparc-solaris
+ # - speeds up and fixes some outputs on sparcv9-solaris
+ # notes on -fast for Darwin:
+ # - ppc: -fast switch causes arithmetic differences, and slower
+ # running code for SQL, some faster for M5
+ # - x86/x64: -fast switch results in json code producing wrong
+ # results, or segaults (when used with Mtest)
+ ;;
*)
case "$host-$icc_ver" in
dnl handle non-Intel compilers ($icc_ver=""), first
*solaris*-) CFLAGS="$CFLAGS -xO5"
;;
-# *irix*-) CFLAGS="$CFLAGS -O3 -Ofast=IP27 -OPT:alias=restrict
-IPA"
- *irix*-) CFLAGS="$CFLAGS -O3
-OPT:div_split=ON:fast_complex=ON:fast_exp=ON:fast_nint=ON:Olimit=2147483647:roundoff=3
-TARG:processor=r10k -IPA"
- LDFLAGS="$LDFLAGS -IPA"
- ;;
- *aix*-) CFLAGS="$CFLAGS -O3"
- ;;
*-*-*-) CFLAGS="$CFLAGS -O2"
;;
@@ -1022,6 +1001,9 @@ if test "x$enable_optim" = xyes; then
done
changedCFLAGS="`echo $changedCFLAGS | sed -e 's|^, ||'`"
AC_MSG_RESULT([yes: $changedCFLAGS])
+
+ # The default configure invocation when doing an rpmbuild also uses this
+ MCHECK_ADD_FLAG([-Wp,-D_FORTIFY_SOURCE=2])
else
AC_MSG_RESULT([no])
fi
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -1,72 +1,35 @@
debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/libmonetdb5.so.* usr/lib
+# usr/lib/monetdb5/lib_*.so EXCEPT: lib_{geom,jaql,json,sql}.so
debian/tmp/usr/lib/monetdb5/lib_lsst.so usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_opt_sql_append.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/aggr.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/alarm.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/algebra.mal usr/lib/monetdb5
-#debian/tmp/usr/lib/monetdb5/algebraExtensions.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/array.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/bat*.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/bbp.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/blob.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/box.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/calc.mal usr/lib/monetdb5
-#debian/tmp/usr/lib/monetdb5/chopper.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/clients.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/cluster.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/color.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/const.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/constraints.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/counters.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/factories.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/group.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/groupby.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/identifier.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/inet.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/inspect.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/language.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lock.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/logger.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lsst.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/mal_*.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/manual.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/mat.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/mdb.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/microbenchmark.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/mkey.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/mmath.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/mtime.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/optimizer.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/opt_*.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/pcre.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/pqueue.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/profiler.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/recycle.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/remote.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/run_*.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/sabaoth.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/sample.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/sema.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/srvpool.mal usr/lib/monetdb5
-#debian/tmp/usr/lib/monetdb5/statistics.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/status.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/str.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/streams.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/tokenizer.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/trader.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/transaction.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/txtsim.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/udf.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/unix.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/url.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/urlbox.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/vault.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/xml.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/zorder.mal usr/lib/monetdb5
+# usr/lib/monetdb5/*.mal EXCEPT: geom.mal, jaql*.mal, json*.mal, sql.mal
+debian/tmp/usr/lib/monetdb5/a*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/b*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/c*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/f*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/gr*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/i*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/l*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/m*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/o*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/p*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/r*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/sa*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/se*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/sr*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/st*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/t*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/u*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/v*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/x*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/z*.mal usr/lib/monetdb5
+
+# usr/lib/monetdb5/autoload/*.mal EXCEPT: *_geom.mal, *_jaql.mal, *_sql.mal
debian/tmp/usr/lib/monetdb5/autoload/*_lsst.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/*_opt_sql_append.mal
usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/*_udf.mal usr/lib/monetdb5/autoload
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -21,6 +21,7 @@ debian/tmp/usr/lib/monetdb5/createdb/22_
debian/tmp/usr/lib/monetdb5/createdb/23_skyserver.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/24_zorder.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/25_debug.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/createdb/39_analytics.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/80_udf.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/99_system.sql usr/lib/monetdb5/createdb
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
diff --git a/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -27,7 +27,7 @@ JAVA_HOME = @JAVA_HOME@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/monetdb/lib
- FILES = monetdb-mcl-1.8.jar monetdb-jdbc-2.6.jar jdbcclient.jar
+ FILES = monetdb-mcl-1.8.jar monetdb-jdbc-2.7.jar jdbcclient.jar
}
ant_distmerocontrol = {
diff --git a/java/build.properties b/java/build.properties
--- a/java/build.properties
+++ b/java/build.properties
@@ -19,7 +19,7 @@ MCL_MINOR=8
# major release number
JDBC_MAJOR=2
# minor release number
-JDBC_MINOR=6
+JDBC_MINOR=7
# an additional identifying string
JDBC_VER_SUFFIX=Liberica
# the default port to connect on, if no port given when using SQL
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>monetdb</groupId>
<artifactId>monetdb-jdbc</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
<name>monetdb-jdbc</name>
<description>MonetDB JDBC driver</description>
<repositories>
diff --git a/java/release.txt b/java/release.txt
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
