Changeset: 5f4251f37c2c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f4251f37c2c Added Files: clients/examples/python/basics.py clients/examples/python/mclient-python2.py clients/examples/python/mclient-python3.py clients/examples/python/perf.py clients/examples/python/sqlsample.py clients/python2/MANIFEST.in clients/python2/Makefile.ag clients/python2/README.rst clients/python2/monetdb/__init__.py clients/python2/monetdb/control.py clients/python2/monetdb/exceptions.py clients/python2/monetdb/mapi.py clients/python2/monetdb/sql/__init__.py clients/python2/monetdb/sql/connections.py clients/python2/monetdb/sql/converters.py clients/python2/monetdb/sql/cursors.py clients/python2/monetdb/sql/monetize.py clients/python2/monetdb/sql/pythonize.py clients/python2/monetdb/sql/types.py clients/python2/setup.py clients/python2/test/capabilities.py clients/python2/test/control.py clients/python2/test/dbapi20.py clients/python2/test/run.sh clients/python2/test/runtests.py clients/python2/test/test_control.py common/utils/math_private.h common/utils/s_nextafterf.c monetdb5/tests/gdkTests/Tests/selecttst.mal monetdb5/tests/gdkTests/Tests/selecttst.stable.err monetdb5/tests/gdkTests/Tests/selecttst.stable.out sql/test/BugTracker-2012/Tests/exp_bin_assertion.Bug-3209.sql sql/test/BugTracker-2012/Tests/exp_bin_assertion.Bug-3209.stable.err sql/test/BugTracker-2012/Tests/exp_bin_assertion.Bug-3209.stable.out sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.sql sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.err sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out sql/test/BugTracker-2012/Tests/inet-casts.Bug-3205.sql sql/test/BugTracker-2012/Tests/inet-casts.Bug-3205.stable.err sql/test/BugTracker-2012/Tests/inet-casts.Bug-3205.stable.out sql/test/mapi/Tests/python2_dbapi.SQL.bat sql/test/mapi/Tests/python2_dbapi.SQL.sh sql/test/mapi/Tests/python2_dbapi.stable.err sql/test/mapi/Tests/python2_dbapi.stable.out sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out sql/test/mapi/Tests/python3_dbapi.SQL.bat sql/test/mapi/Tests/python3_dbapi.SQL.sh sql/test/mapi/Tests/python3_dbapi.stable.err sql/test/mapi/Tests/python3_dbapi.stable.out sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out Removed Files: clients/examples/python/Makefile.ag clients/examples/python/sqlsample.py.in clients/python/MANIFEST.in clients/python/Makefile.ag clients/python/README.rst clients/python/examples/basics.py clients/python/examples/mclient.py clients/python/examples/perf.py clients/python/monetdb/__init__.py clients/python/monetdb/control.py clients/python/monetdb/exceptions.py clients/python/monetdb/mapi.py clients/python/monetdb/sql/__init__.py clients/python/monetdb/sql/connections.py clients/python/monetdb/sql/converters.py clients/python/monetdb/sql/cursors.py clients/python/monetdb/sql/monetize.py clients/python/monetdb/sql/pythonize.py clients/python/monetdb/sql/types.py clients/python/setup.py clients/python/test/capabilities.py clients/python/test/control.py clients/python/test/dbapi20.py clients/python/test/run.sh clients/python/test/runtests.py clients/python/test/test_control.py clients/python3/examples/basics.py clients/python3/examples/mclient.py clients/python3/examples/perf.py sql/backends/monet5/sql_emptyset.c sql/backends/monet5/sql_emptyset.h sql/test/Connections/run.all sql/test/Update_Delete_action/run.all sql/test/mapi/Tests/python_dbapi.SQL.bat sql/test/mapi/Tests/python_dbapi.SQL.sh sql/test/mapi/Tests/python_dbapi.stable.err sql/test/mapi/Tests/python_dbapi.stable.out sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh sql/test/mapi/Tests/python_test_monetdb_sql.stable.err sql/test/mapi/Tests/python_test_monetdb_sql.stable.out 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/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py buildtools/autogen/autogen/var.py clients/Makefile.ag clients/Tests/exports.stable.out clients/examples/Makefile.ag clients/mapiclient/Makefile.ag clients/mapiclient/ReadlineTools.c clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/Tests/stethoscope--help.stable.err clients/mapiclient/dotmonetdb.c clients/mapiclient/stethoscope.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python3/Makefile.ag clients/python3/monetdb/control.py clients/python3/monetdb/mapi.py clients/python3/monetdb/sql/connections.py clients/python3/monetdb/sql/cursors.py clients/python3/setup.py clients/python3/test/test_control.py common/utils/Makefile.ag common/utils/mutils.c configure.ag debian/changelog debian/monetdb-client-testing.install debian/rules gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_bat.c gdk/gdk_calc.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_sample.c gdk/gdk_search.h gdk/gdk_select.c gdk/gdk_setop.mx gdk/gdk_storage.c gdk/gdk_utils.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Oct2012 libversions monetdb5/mal/Tests/run monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_function.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/batxml.mal monetdb5/modules/atoms/inet.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/kernel/algebra.mx monetdb5/modules/kernel/bat5.mal monetdb5/modules/mal/language.c monetdb5/modules/mal/language.h monetdb5/modules/mal/language.mal monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/sample.c monetdb5/modules/mal/sample.h monetdb5/modules/mal/sample.mal monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/transaction.mal monetdb5/optimizer/Tests/mat00.stable.out monetdb5/optimizer/Tests/mat01.stable.out monetdb5/optimizer/Tests/tst4900.mal monetdb5/optimizer/Tests/tst4900.stable.out monetdb5/optimizer/opt_accumulators.c monetdb5/optimizer/opt_aliases.c monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_constants.c monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_emptySet.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_groups.c monetdb5/optimizer/opt_history.c monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_joinpath.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_origin.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prejoin.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_reduce.c monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_wrapper.c monetdb5/scheduler/Tests/oct02.mal monetdb5/tests/BugDay_2005-10-06_4.8/Tests/multiple_servers.SF-914113.MIL.bat monetdb5/tests/BugDay_2005-10-06_4.8/Tests/multiple_servers.SF-914113.MIL.sh monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/monet_daemon.SF-623743 monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/monet_daemon.SF-623743.bat monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.bat monetdb5/tests/gdkTests/Tests/All monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2012 sql/backends/monet5/Makefile.ag sql/backends/monet5/datacell/basket.c sql/backends/monet5/datacell/dcoperator.c sql/backends/monet5/datacell/petrinet.c sql/backends/monet5/embeddedclient.c.in sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.mx sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/sql_parser.y sql/storage/bat/bat_storage.c sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out sql/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701 sql/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701.bat sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2012/Tests/All sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err sql/test/mapi/Tests/All testing/Makefile.ag testing/Mfilter.py.in testing/Mtest.py.in testing/README testing/cmptests.py testing/listexports.py.in testing/process.py testing/quicktest testing/subprocess26.py vertoo.config vertoo.data Branch: rdf Log Message:
Merge with default branch Ha: changed buildtools/autogen/autogen/var.py diffs (truncated from 16916 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -510,3 +510,5 @@ 525f227382ddb8f5377114d11c3b030865493f42 55c1892e82a764a7a6003dded13a6228de3d1661 Oct2012_5 5ba19bc11f7691610501c95ba8d0f1d9e5083a94 Oct2012_SP1_release c341b78e1c2e38445f43bd3ec89fdf40792bed01 Feb2013_root +0ef42179e99bbd8450d9993cf419fcbed96cf61c Oct2012_7 +14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,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/Oct2012-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2012-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -334,7 +334,6 @@ developer. %{_bindir}/malsample.pl %{_bindir}/sqlsample.php %{_bindir}/sqlsample.pl -%{_bindir}/sqlsample.py %if %{?centos:0}%{!?centos:1} %package geom-MonetDB5 @@ -538,7 +537,7 @@ program. %dir %{python_sitelib}/monetdb %{python_sitelib}/monetdb/* %{python_sitelib}/python_monetdb-*.egg-info -%doc clients/python/README.rst +%doc clients/python2/README.rst %package -n python3-monetdb Summary: Native MonetDB client Python3 API @@ -633,7 +632,6 @@ developer, but if you do want to test, t --enable-jdbc=no \ --enable-merocontrol=no \ --enable-monetdb5=yes \ - --enable-noexpand=no \ --enable-odbc=yes \ --enable-oid32=%{?oid32:yes}%{!?oid32:no} \ --enable-optimize=yes \ @@ -650,7 +648,7 @@ developer, but if you do want to test, t --with-mseed=no \ --with-perl=yes \ --with-pthread=yes \ - --with-python=yes \ + --with-python2=yes \ --with-python3=yes \ --with-readline=yes \ --with-rubygem=yes \ @@ -694,6 +692,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Wed Dec 12 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.7-20121212 +- Rebuilt. + +* Fri Nov 23 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212 +- java: Implemented type map support of Connection to allow custom mapping + of UDTs to Java classes. By default the INET and URL UDTs are + now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably, + ResultSet.getObject() and PreparedStatement.setObject() deal with the + type map. + +* Thu Nov 22 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212 +- java: Fixed a problem in PreparedStatement where the prepared statement's + ResultSetMetaData (on its columns to be produced) incorrectly threw + exceptions about non existing columns. Bug #3192 + +* Wed Nov 21 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212 +- sql: Fixed crash when performing an INSERT on a table with string-like column + defaulting to NULL and omitting that column from VALUES, bug #3168 + * Fri Nov 16 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.5-20121116 - Rebuilt. diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -614,6 +614,9 @@ /* Define if you have _sys_siglist */ /* #undef HAVE__SYS_SIGLIST */ +/* Define to 1 if the system has the type `__int128'. */ +/* #undef HAVE___INT128 */ + /* Define to 1 if the system has the type `__int64'. */ #define HAVE___INT64 1 diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -74,13 +74,13 @@ PTHREAD_LIBS = ODBCINST_LIBS = odbccp32.lib user32.lib ODBC_LIBS = odbc32.lib -!IFNDEF PYTHONBASE -PYTHONBASE=C:\Python27 +!IFNDEF PYTHON2BASE +PYTHON2BASE=C:\Python27 !ENDIF -!IFNDEF PYTHONLIB -PYTHONLIB=python27.lib +!IFNDEF PYTHON2LIB +PYTHON2LIB=python27.lib !ENDIF -PYTHON_LIBDIR=share\MonetDB\python +PYTHON2_LIBDIR=share\MonetDB\python !IFNDEF PYTHON3BASE PYTHON3BASE=C:\Python32 @@ -177,7 +177,8 @@ RUBY_DIR = lib\ruby\gems\1.9.1 # some programs we use, probably no need to edit -# install python, flex and bison on your systems +# install python, flex and bison on your systems +# PYTHON may be either a version 2 or a version 3 PYTHON = python YACC = bison LEX = flex @@ -370,6 +371,11 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_PYTHON_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF +!IFDEF HAVE_PYTHON2 + $(ECHO) HAVE_PYTHON2_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!ELSE + $(ECHO) HAVE_PYTHON2_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !IFDEF HAVE_PYTHON3 $(ECHO) HAVE_PYTHON3_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -436,7 +442,8 @@ CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \ "PACKAGE=$(pkg)" \ "PERL_LIBDIR=$(PERL_LIBDIR)" \ "PYTHON=$(PYTHON)" \ - "PYTHON_LIBDIR=$(PYTHON_LIBDIR)" \ + "PYTHON2=$(PYTHON2)" \ + "PYTHON2_LIBDIR=$(PYTHON2_LIBDIR)" \ "PYTHON3=$(PYTHON3)" \ "PYTHON3_LIBDIR=$(PYTHON3_LIBDIR)" \ "RUBY_DIR=$(RUBY_DIR)" \ diff --git a/buildtools/autogen/autogen.py b/buildtools/autogen/autogen.py --- a/buildtools/autogen/autogen.py +++ b/buildtools/autogen/autogen.py @@ -77,7 +77,7 @@ class parser: elif self.state == "=" and isName(token): if token == '""': token = "" - if self.top.has_key(token): + if token in self.top: for i in self.top[token]: self.curvar.append(i) else: @@ -92,7 +92,7 @@ def read_makefile(p, cwd): lineno = 0 for line in fileinput.input(os.path.join(cwd, 'Makefile.ag')): if line.lstrip()[0:1] != "#": - for token in string.split(line): + for token in line.split(): p.parse(token, lineno, line) p.parse("\n", lineno, line) lineno = lineno + 1 @@ -109,19 +109,19 @@ def expand_subdirs(subdirs): res = [] for subdir in subdirs: if "?" in subdir: - parts = string.split(subdir, "?") + parts = subdir.split("?") if len(parts) == 2: - dirs = string.split(parts[1], ":") + dirs = parts[1].split(":") if len(dirs) > 2: - print "!ERROR:syntax error in conditional subdir:", subdir + print("!ERROR:syntax error in conditional subdir: " + subdir) else: cond = parts[0] for d in dirs: - if string.strip(d) != "": + if d.strip() != "": res.append((d, cond)) cond = "!" + cond else: - print "!ERROR:syntax error in conditional subdir:", subdir + print("!ERROR:syntax error in conditional subdir: " + subdir) else: res.append((subdir, None)) return res @@ -133,7 +133,7 @@ def main(cwd, topdir, automake, incdirsm codegen(p.curvar, cwd, topdir, incdirsmap) (InstallList, DocList, OutList) = am.output(p.curvar, cwd, topdir, automake, conditional) msc.output(p.curvar, cwd, topdir) - if p.curvar.has_key('SUBDIRS'): + if 'SUBDIRS' in p.curvar: for (dir, cond) in expand_subdirs(p.curvar['SUBDIRS']): d = os.path.join(cwd, dir) if os.path.exists(d): @@ -172,18 +172,7 @@ def filter(st): return st + '\n' return '' -def dirlen(l, r): - if string.count(l, os.sep) < string.count(r, os.sep): - return -1 - elif string.count(l, os.sep) > string.count(r, os.sep): - return 1 - elif l < r: - return -1 - elif l > r: - return 1 - return 0 - -OutList.sort(dirlen) +OutList.sort(key=lambda x: x.count(os.sep)) OutList = map(filter, OutList) OutListFd = open("acout.in", "w") OutListFd.writelines(OutList) 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 @@ -17,6 +17,8 @@ import os import posixpath +import sys +sys.path.insert(0, os.path.dirname(os.path.realpath(__file__))) from codegen import find_org import re @@ -72,9 +74,9 @@ def am_sort_libs(libs, tree): for (pref,lib,sep,cond) in libs: after = -1 # does lib depend on another library - if tree.has_key('lib_'+ lib): + if 'lib_'+ lib in tree: v = tree['lib_'+lib] - if v.has_key("LIBS"): + if "LIBS" in v: for l in v['LIBS']: if len(l) > 3: l = l[3:] # strip lib prefix @@ -82,9 +84,9 @@ def am_sort_libs(libs, tree): pos = res.index(l) if pos > after: after = pos - elif tree.has_key('LIBS'): + elif 'LIBS' in tree: v = tree['LIBS'] - if v.has_key(lib[1:] + "_DLIBS"): + if lib[1:] + "_DLIBS" in v: for l in v[lib[1:] + '_DLIBS']: if len(l) > 3: l = l[3:] # strip lib prefix @@ -157,14 +159,14 @@ def am_find_srcs(target, deps, am, cond) base, ext = split_filename(target) f = target pf = f - while ext != "h" and deps.has_key(f): + while ext != "h" and f in deps: f = deps[f][0] b, ext = split_filename(f) if ext in automake_ext: pf = f # built source if has dep and ext != cur ext - if not(cond) and deps.has_key(pf) and pf not in am['BUILT_SOURCES']: + if not(cond) and pf in deps and pf not in am['BUILT_SOURCES']: pfb, pfext = split_filename(pf) sfb, sfext = split_filename(deps[pf][0]) if sfext != pfext: @@ -178,7 +180,7 @@ def am_find_srcs(target, deps, am, cond) return dist, "" def am_find_hdrs_r(am, target, deps, hdrs, hdrs_ext, map): - if deps.has_key(target): + if target in deps: tdeps = deps[target] for dtarget in tdeps: t, ext = split_filename(dtarget) @@ -189,7 +191,7 @@ def am_find_hdrs_r(am, target, deps, hdr am_find_hdrs_r(am, dtarget, deps, hdrs, hdrs_ext, map) def am_find_hdrs(am, map): - if map.has_key('HEADERS'): + if 'HEADERS' in map: hdrs_ext = map['HEADERS'] for target in map['TARGETS']: t, ext = split_filename(target) @@ -312,11 +314,11 @@ def am_scripts(fd, var, scripts, am): s, ext = var.split('_', 1) ext = [ ext ] - if scripts.has_key("EXT"): + if "EXT" in scripts: _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
