Changeset: e682f2dc31e2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e682f2dc31e2
Added Files:
sql/backends/monet5/vaults/shp/75_shp.mal
sql/backends/monet5/vaults/shp/75_shp.sql
sql/backends/monet5/vaults/shp/Makefile.ag
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/vaults/shp/shp.h
sql/backends/monet5/vaults/shp/shp.mal
sql/test/BugTracker-2016/Tests/case-with-string-Bug.3932.sql
sql/test/BugTracker-2016/Tests/case-with-string-Bug.3932.stable.err
sql/test/BugTracker-2016/Tests/case-with-string-Bug.3932.stable.out
sql/test/BugTracker-2016/Tests/prepare-utf8.Bug-3930.sql
sql/test/BugTracker-2016/Tests/prepare-utf8.Bug-3930.stable.err
sql/test/BugTracker-2016/Tests/prepare-utf8.Bug-3930.stable.out
Removed Files:
clients/ruby/Changelog
clients/ruby/Makefile.ag
clients/ruby/TODO
clients/ruby/Tests/rubytest.rb.in
clients/ruby/Tests/rubytest.stable.err
clients/ruby/Tests/rubytest.stable.out
clients/ruby/doc/readme.txt
clients/ruby/lib/MonetDB.rb
clients/ruby/lib/MonetDBConnection.rb
clients/ruby/lib/MonetDBData.rb
clients/ruby/lib/MonetDBExceptions.rb
clients/ruby/lib/example.rb
clients/ruby/lib/hasher.rb
clients/ruby/ruby-monetdb-sql-0.2.gemspec
debian/ruby-monetdb-client.install
geom/sql/functions/Tests/ST_NumPoints.stable.err.Windows
Modified Files:
MonetDB.spec
NT/rules.msc
buildtools/ChangeLog
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
clients/Makefile.ag
clients/R/MonetDB.R/DESCRIPTION
clients/Tests/All
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/php/lib/php_mapi.inc
clients/ruby/Tests/All
clients/ruby/Tests/gemtest.rb
common/utils/msabaoth.c
configure.ag
debian/control
debian/copyright
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_search.c
geom/ChangeLog
geom/lib/libgeom.c
geom/lib/libgeom.h
geom/monetdb5/geom.c
geom/monetdb5/geom_upgrade.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_builder.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
monetdb5/modules/mal/batcalc.c
monetdb5/optimizer/opt_querylog.c
sql/backends/monet5/Tests/rapi15.stable.out
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/vaults/Makefile.ag
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/server/sql_parser.y
sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.oid32
sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.sql
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.sql
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.out.int128
sql/test/Tests/All
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
sql/test/leaks/Tests/All
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
testing/Mtest.py.in
Branch: leftmart
Log Message:
merge with default
diffs (truncated from 20955 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,6 +1,6 @@
%define name MonetDB
%define version 11.22.0
-%{!?buildno: %define buildno %(date +%Y%m%d)}
+%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
%define all_x86 i386 i586 i686
@@ -134,15 +134,6 @@ BuildRequires: python-devel
BuildRequires: python3-devel
%endif
BuildRequires: readline-devel
-# On RedHat Enterprise Linux and derivatives (CentOS, Scientific
-# Linux), the rubygem-activerecord package is not available (also not
-# in the Extra Packages for Enterprise Linux EPEL), so it makes no
-# sense providing our ruby packages.
-%if %{?rhel:0}%{!?rhel:1}
-BuildRequires: ruby
-BuildRequires: rubygems
-BuildRequires: rubygems-devel
-%endif
BuildRequires: unixODBC-devel
# BuildRequires: uriparser-devel
BuildRequires: zlib-devel
@@ -402,33 +393,6 @@ program.
%defattr(-,root,root)
%{perl_vendorlib}/*
-%if %{?rhel:0}%{!?rhel:1}
-%package -n rubygem-monetdb-sql
-Summary: MonetDB ruby interface
-Group: Applications/Databases
-Requires: ruby(release)
-Obsoletes: %{name}-client-ruby
-BuildArch: noarch
-
-%description -n rubygem-monetdb-sql
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators. It also has an SQL frontend.
-
-This package contains the files needed to use MonetDB from a Ruby
-program.
-
-%files -n rubygem-monetdb-sql
-%defattr(-,root,root)
-%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.2
-%{gem_dir}/doc/ruby-monetdb-sql-0.2/*
-%{gem_dir}/cache/ruby-monetdb-sql-0.2.gem
-# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.2
-%{gem_dir}/gems/ruby-monetdb-sql-0.2
-%{gem_dir}/specifications/ruby-monetdb-sql-0.2.gemspec
-%endif
-
%package client-tests
Summary: MonetDB Client tests package
Group: Applications/Databases
@@ -988,8 +952,6 @@ developer, but if you do want to test, t
--with-python2=yes \
--with-python3=%{?rhel:no}%{!?rhel:yes} \
--with-readline=yes \
- --with-rubygem=%{?rhel:no}%{!?rhel:yes} \
- --with-rubygem-dir=%{?rhel:no}%{!?rhel:"%{gem_dir}"} \
--with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
--with-sphinxclient=no \
--with-unixodbc=yes \
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -161,10 +161,6 @@ GEOS_LIBS = $(LIBGEOS)\lib\geos_c_i.lib
!ENDIF
GEOS_INCS = -I$(LIBGEOS)\include
-!IFNDEF RUBY_DIR
-RUBY_DIR = lib\ruby\gems\1.9.1
-!ENDIF
-
!IFDEF HAVE_LIBR
# This is the location of the R library
libr_LIBDEP = R.lib
@@ -361,6 +357,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIDAR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_SHP
+ $(ECHO) HAVE_SHP_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_SHP_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_MONETDB5
$(ECHO) HAVE_MONETDB5_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -406,11 +407,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_PYTHON3_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_RUBYGEM
- $(ECHO) HAVE_RUBYGEM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_RUBYGEM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_SAMTOOLS
$(ECHO) HAVE_SAMTOOLS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -466,7 +462,6 @@ CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \
"PYTHON2_LIBDIR=$(PYTHON2_LIBDIR)" \
"PYTHON3=$(PYTHON3)" \
"PYTHON3_LIBDIR=$(PYTHON3_LIBDIR)" \
- "RUBY_DIR=$(RUBY_DIR)" \
"TOPDIR=$(TOPDIR)" \
"VERSION=$(VERSION)" \
"builtby=%USER%@%COMPUTERNAME%" \
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Fri Feb 26 2016 Sjoerd Mullender <sjo...@acm.org>
+- A new package MonetDB-lidar (Fedora) or libmonetdb5-server-lidar
+ (Debian/Ubuntu) has been created to work with LiDAR data.
+
* Sat Jan 23 2016 Sjoerd Mullender <sjo...@acm.org>
- Implemented a systemd configuration file for a monetdbd.service
on Fedora.
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
@@ -928,63 +928,6 @@ def am_libs(fd, var, libsmap, am):
am_find_ins(am, libsmap)
am_deps(fd, libsmap['DEPS'], am)
-def am_gem(fd, var, gem, am):
- gemre = re.compile(r'\.files *= *\[ *(.*[^ ]) *\]')
- rd = 'RUBY_DIR'
- if 'DIR' in gem:
- rd = gem['DIR'][0]
- rd = am_translate_dir(rd, am)
- fd.write('if HAVE_RUBYGEM\n')
- fd.write('all-local-%s:' % var)
- am['ALL'].append(var)
- for f in gem['FILES']:
- fd.write(' %s' % f[:-4])
- fd.write('\n')
- for f in gem['FILES']:
- srcs = list(map(lambda x: x.strip('" '),
- gemre.search(open(os.path.join(am['CWDRAW'],
f)).read()).group(1).split(', ')))
- srcs.append(f)
- sf = f.replace('.', '_')
- am['INSTALL'].append(sf)
- am['UNINSTALL'].append(sf)
- fd.write('%s: %s\n' % (f[:-4], ' '.join(srcs)))
- dirs = []
- for src in srcs:
- if '/' in src:
- d = posixpath.dirname(src)
- if d not in dirs:
- fd.write("\t[ '$(srcdir)' -ef . ] || mkdir -p '%s'\n" %
posixpath.dirname(src))
- dirs.append(d)
- while '/' in d:
- d = posixpath.dirname(d)
- dirs.append(d)
- fd.write("\t[ '$(srcdir)' -ef . ] || cp -p '$(srcdir)/%s' '%s'\n"
% (src, src))
- fd.write("\tgem build '%s'\n" % f)
- # use deprecated --rdoc and --ri options instead of --document=rdoc,ri
- # since we're still building on systems with old gem
- fd.write("\tgem install --local --install-dir ./'%s' --bindir .'%s'
--force --rdoc --ri %s\n" % (rd, am_translate_dir('bindir', am), f[:-4]))
- fd.write('mostlyclean-local: mostlyclean-local-%s\n' % sf)
- fd.write('.PHONY: mostlyclean-local-%s\n' % sf)
- fd.write('mostlyclean-local-%s:\n' % sf)
- for src in srcs:
- fd.write("\t[ '$(srcdir)' -ef . ] || rm -f '%s'\n" % src)
- for d in sorted(dirs, reverse = True):
- fd.write("\t[ '$(srcdir)' -ef . -o ! -d '%s' ] || rmdir '%s'\n" %
(d, d))
- fd.write("install-exec-local-%s: %s\n" % (sf, f[:-4]))
- fd.write("\tmkdir -p $(DESTDIR)'%s'\n" % rd)
- fd.write("\tcp -a ./'%s'/* $(DESTDIR)'%s'\n" % (rd, rd))
- fd.write("uninstall-local-%s: %s\n" % (sf, f[:-4]))
- # remove "-0.1.gemspec" from end of `f'
- fd.write("\tgem uninstall --install-dir $(DESTDIR)'%s' '%s'\n" % (rd,
f[:-12]))
- am['BUILT_SOURCES'].append(f[:-4])
- am['CLEAN'].append(f[:-4])
- fd.write('else\n')
- for f in gem['FILES']:
- sf = f.replace('.', '_')
- fd.write("install-exec-local-%s:\n" % sf)
- fd.write('uninstall-local-%s:\n' % sf)
- fd.write('endif\n')
-
def am_python_generic(fd, var, python, am, PYTHON):
pyre = re.compile(r'packages *= *\[ *(.*[^ ]) *\]')
pynmre = re.compile('name *= *([\'"])([^\'"]+)\\1')
@@ -1153,7 +1096,6 @@ output_funcs = {'SUBDIRS': am_subdirs,
'largeTOC_SHARED_MODS': am_mods_to_libs,
'HEADERS': am_headers,
'ANT': am_ant,
- 'GEM': am_gem,
'PYTHON2': am_python2,
'PYTHON3': am_python3,
}
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -963,38 +963,6 @@ def msc_includes(fd, var, values, msc):
+ msc_add_srcdir(i, msc, " -I")
fd.write("INCLUDES = " + incs + "\n")
-def msc_gem(fd, var, gem, msc):
- gemre = re.compile(r'\.files *= *\[ *(.*[^ ]) *\]')
- rd = 'RUBY_DIR'
- if 'DIR' in gem:
- rd = gem['DIR'][0]
- rd = msc_translate_dir(rd, msc)
- fd.write('!IF defined(HAVE_RUBYGEM)\n')
- for f in gem['FILES']:
- msc['SCRIPTS'].append(f[:-4])
- srcs = list(map(lambda x: x.strip('" '),
- gemre.search(open(os.path.join(msc['cwd'],
f)).read()).group(1).split(', ')))
- srcs.append(f)
- fd.write('%s: %s\n' % (f[:-4], ' '.join(srcs)))
- fd.write('\tgem build %s\n' % f)
- for src in srcs:
- src = src.replace('/', '\\')
- fd.write('%s: "$(srcdir)\\%s"\n' % (src, src))
- if '\\' in src:
- d = src[:src.rfind('\\')]
- fd.write('\tif not exist "%s" $(MKDIR) "%s"\n' % (d, d))
- fd.write('\t$(INSTALL) "$(srcdir)\\%s" "%s"\n' % (src, src))
- msc['INSTALL'][f] = f, '', '', '', 'defined(HAVE_RUBYGEM)'
- fd.write('install_%s: "%s" "%s"\n' % (f, f[:-4], rd))
- fd.write('\tgem install "%s" --local --install-dir "%s" --force
--rdoc\n' % (f[:-4], rd))
- fd.write('"%s":\n' % rd)
- fd.write('\tif not exist "%s" $(MKDIR) "%s"\n' % (rd, rd))
- fd.write('!ELSE\n')
- for f in gem['FILES']:
- fd.write('%s:\n' % f[:-4])
- fd.write('install_%s:\n' % f)
- fd.write('!ENDIF\n')
-
def msc_python_generic(fd, var, python, msc, PYTHON):
pyre = re.compile(r'packages *= *\[ *(.*[^ ]) *\]')
for f in python['FILES']:
@@ -1090,7 +1058,6 @@ output_funcs = {'SUBDIRS': msc_subdirs,
'largeTOC_SHARED_MODS': msc_mods_to_libs,
'HEADERS': msc_headers,
'ANT': msc_ant,
- 'GEM': msc_gem,
'PYTHON2': msc_python2,
'PYTHON3': msc_python3,
}
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -4,6 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3
NATIVE_WIN32?NT
+SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php examples
HAVE_PYTHON2?python2 HAVE_PYTHON3?python3 NATIVE_WIN32?NT
-EXTRA_DIST_DIR = Tests R
+EXTRA_DIST_DIR = Tests R ruby
diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION
--- a/clients/R/MonetDB.R/DESCRIPTION
+++ b/clients/R/MonetDB.R/DESCRIPTION
@@ -10,7 +10,7 @@ Depends: DBI (>= 0.3.1)
Imports: digest (>= 0.6.4), methods, codetools
Enhances: dplyr (>= 0.3.0)
Description: Allows to pull data from MonetDB into R. Includes a DBI
implementation and a dplyr backend.
-License: MPL (== 1.1)
+License: MPL (== 2.0)
URL: http://monetr.r-forge.r-project.org
SystemRequirements: MonetDB, available from http://www.monetdb.org
Collate: mapi.R dbi.R dbapply.R dplyr.R control.R
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,4 +1,4 @@
exports
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
-!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS?SQL-dump
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&!HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
+!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&!HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?SQL-dump
MERCURIAL?malcheck
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
@@ -2312,9 +2312,7 @@ Plant newPlant(MalBlkPtr mb);
InstrPtr newRaiseStmt(MalBlkPtr mb, str nme);
str newRef;
InstrPtr newReturnStmt(MalBlkPtr mb);
-InstrPtr newStmt(MalBlkPtr mb, char *module, char *name);
-InstrPtr newStmt1(MalBlkPtr mb, str module, char *name);
-InstrPtr newStmt2(MalBlkPtr mb, str module, char *name);
+InstrPtr newStmt(MalBlkPtr mb, const char *module, const char *name);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
