Changeset: 9a6829da3e43 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a6829da3e43
Removed Files:
debian/monetdb5-server-hugeint.install
debian/monetdb5-sql-hugeint.install
monetdb5/modules/kernel/00_aggr_hge.mal.sh
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/mal/00_batcalc_hge.mal.sh
monetdb5/modules/mal/00_calc_hge.mal.sh
monetdb5/modules/mal/01_batcalc.mal.sh
monetdb5/modules/mal/01_calc.mal.sh
monetdb5/modules/mal/batmtime.mal.sh
sql/backends/monet5/sql_decimal.mal.sh
sql/backends/monet5/sql_decimal_hge.mal.sh
sql/backends/monet5/sql_rank.mal.sh
sql/backends/monet5/sql_rank_hge.mal.sh
Modified Files:
monetdb5/mal/mal.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
sql/backends/monet5/sql_upgrades.c
Branch: userstats
Log Message:
merged with default
diffs (truncated from 10802 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -777,3 +777,6 @@ 28480e096722b7f76ab021c0d16c68c6949f41b4
80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_release
1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_9
1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
+bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_11
+1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
+bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# The --with OPTION and --without OPTION arguments can be passed on
# the commandline of both rpmbuild and mock.
-# On 64 bit architectures we build "hugeint" packages.
+# On 64 bit architectures compile with 128 bit integer support.
%if "%{?_lib}" == "lib64"
%bcond_without hugeint
%endif
@@ -379,9 +379,6 @@ extensions for %{name}-SQL-server5.
%files geom-MonetDB5
%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_geom.mal
-%{_libdir}/monetdb5/createdb/*_geom.sql
-%{_libdir}/monetdb5/geom.mal
%{_libdir}/monetdb5/lib_geom.so
%endif
@@ -406,8 +403,7 @@ install it.
%files R
%defattr(-,root,root)
-%{_libdir}/monetdb5/rapi.*
-%{_libdir}/monetdb5/autoload/*_rapi.mal
+%{_libdir}/monetdb5/rapi.R
%{_libdir}/monetdb5/lib_rapi.so
%endif
@@ -432,8 +428,6 @@ install it.
%files python3
%defattr(-,root,root)
-%{_libdir}/monetdb5/pyapi3.*
-%{_libdir}/monetdb5/autoload/*_pyapi3.mal
%{_libdir}/monetdb5/lib_pyapi3.so
%endif
@@ -454,9 +448,6 @@ format.
%files cfitsio
%defattr(-,root,root)
-%{_libdir}/monetdb5/fits.mal
-%{_libdir}/monetdb5/autoload/*_fits.mal
-%{_libdir}/monetdb5/createdb/*_fits.sql
%{_libdir}/monetdb5/lib_fits.so
%endif
@@ -465,10 +456,12 @@ Summary: MonetDB - Monet Database Manage
Group: Applications/Databases
Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Obsoletes: MonetDB5-server-hugeint < 11.38.0
+%if %{with hugeint}
+Provides: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+%endif
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
-%if %{with hugeint}
-Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
%endif
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
@@ -521,37 +514,7 @@ exit 0
%exclude %{_bindir}/stethoscope
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
-%dir %{_libdir}/monetdb5/autoload
-%if %{with fits}
-%exclude %{_libdir}/monetdb5/fits.mal
-%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
-%endif
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/geom.mal
-%endif
-%if %{with py3integration}
-%exclude %{_libdir}/monetdb5/pyapi3.mal
-%endif
-%if %{with rintegration}
-%exclude %{_libdir}/monetdb5/rapi.mal
-%endif
-%exclude %{_libdir}/monetdb5/sql*.mal
-%if %{with hugeint}
-%exclude %{_libdir}/monetdb5/*_hge.mal
-%exclude %{_libdir}/monetdb5/autoload/*_hge.mal
-%endif
-%{_libdir}/monetdb5/*.mal
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
-%endif
-%if %{with py3integration}
-%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal
-%endif
-%if %{with rintegration}
-%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal
-%endif
-%exclude %{_libdir}/monetdb5/autoload/??_sql*.mal
-%{_libdir}/monetdb5/autoload/*.mal
+%{_libdir}/monetdb5/microbenchmark.mal
%{_libdir}/monetdb5/lib_capi.so
%{_libdir}/monetdb5/lib_generator.so
%{_libdir}/monetdb5/lib_udf.so
@@ -560,28 +523,6 @@ exit 0
%docdir %{_datadir}/doc/MonetDB
%{_datadir}/doc/MonetDB/*
-%if %{with hugeint}
-%package -n MonetDB5-server-hugeint
-Summary: MonetDB - 128-bit integer support for MonetDB5-server
-Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa}
-
-%description -n MonetDB5-server-hugeint
-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 front end.
-
-This package provides HUGEINT (128-bit integer) support for the
-MonetDB5-server component.
-
-%files -n MonetDB5-server-hugeint
-%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%{_libdir}/monetdb5/*_hge.mal
-%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal
-%{_libdir}/monetdb5/autoload/*_hge.mal
-%endif
-
%package -n MonetDB5-server-devel
Summary: MonetDB development files
Group: Applications/Databases
@@ -608,10 +549,11 @@ used from the MAL level.
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release}
-%if (0%{?fedora} >= 22)
+Obsoletes: %{name}-SQL-server5-hugeint < 11.38.0
%if %{with hugeint}
-Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
+Provides: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
%endif
+%if (0%{?fedora} >= 22)
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -657,50 +599,13 @@ use SQL with MonetDB, you will need to i
%config(noreplace) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%verify(not mtime) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
-%{_libdir}/monetdb5/autoload/??_sql.mal
%{_libdir}/monetdb5/lib_sql.so
-%dir %{_libdir}/monetdb5/createdb
-%if %{with fits}
-%exclude %{_libdir}/monetdb5/createdb/*_fits.sql
-%endif
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
-%endif
-%{_libdir}/monetdb5/createdb/*.sql
-%{_libdir}/monetdb5/sql*.mal
-%if %{with hugeint}
-%exclude %{_libdir}/monetdb5/createdb/*_hge.sql
-%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%endif
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
-%if %{with hugeint}
-%package SQL-server5-hugeint
-Summary: MonetDB5 128 bit integer (hugeint) support for SQL
-Group: Applications/Databases
-Requires: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
-
-%description SQL-server5-hugeint
-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 front end.
-
-This package provides HUGEINT (128-bit integer) support for the SQL
-front end of MonetDB.
-
-%files SQL-server5-hugeint
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/??_sql_hge.mal
-%{_libdir}/monetdb5/createdb/*_hge.sql
-%{_libdir}/monetdb5/sql*_hge.mal
-%endif
-
%package testing
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -913,9 +818,7 @@ install -d -m 0775 %{buildroot}%{_rundir
# .la files
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/*.la
-rm -f %{buildroot}%{_libdir}/monetdb5/opt_sql_append.mal
rm -f %{buildroot}%{_libdir}/monetdb5/lib_opt_sql_append.so
-rm -f %{buildroot}%{_libdir}/monetdb5/autoload/??_opt_sql_append.mal
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
for selinuxvariant in %{selinux_variants}
@@ -937,6 +840,13 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Thu Jul 23 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.11-20200723
+- Rebuilt.
+- BZ#6917: Decimal parsing fails
+- BZ#6932: Syntax error while parsing JSON numbers with exponent
+- BZ#6934: sys.isauuid() returns wrong answer for some invalid uuid
+ strings
+
* Mon Jul 20 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.9-20200720
- Rebuilt.
- BZ#6844: sys.getUser('https://me:p...@www.monetdb.org/Doc') does not
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -83,11 +83,6 @@ def main():
print(r' <FileSearch Id="CheckFile2" Name="gdk.h"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
- print(r' <Property Id="GEOMEXISTS">')
- print(r' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
- print(r' <FileSearch Id="CheckFile3" Name="geom.mal"/>')
- print(r' </DirectorySearch>')
- print(r' </Property>')
print(r' <Property Id="PYAPI3EXISTS">')
print(r' <DirectorySearch Id="CheckFileDir5" Path="[INSTALLDIR]"
Depth="0">')
print(r' <FileSearch Id="CheckFile5"
Name="pyapi_locatepython3.bat"/>')
@@ -172,33 +167,16 @@ def main():
print(r' </Directory>')
print(r' <Directory Id="lib" Name="lib">')
print(r' <Directory Id="monetdb5" Name="monetdb5">')
- print(r' <Directory Id="autoload" Name="autoload">')
- id = comp(features, id, 18,
- [r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.mal') and ('geom' not in x) and ('pyapi'
not in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5', 'autoload'))))])
- id = comp(geom, id, 18,
- [r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.mal') and ('geom' in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))])
- id = comp(pyapi3, id, 18,
- [r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('_pyapi3.mal'),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))])
- print(r' </Directory>')
- print(r' <Directory Id="createdb" Name="createdb">')
- id = comp(features, id, 18,
- [r'lib\monetdb5\createdb\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.sql') and ('geom' not in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'createdb'))))])
- id = comp(geom, id, 18,
- [r'lib\monetdb5\createdb\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.sql') and ('geom' in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'createdb'))))])
- print(r' </Directory>')
id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' not in x) and ('pyapi' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
+ [r'lib\monetdb5\microbenchmark.mal'])
id = comp(features, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi'
not in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(debug, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
id = comp(geom, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
- id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
- [r'lib\monetdb5\pyapi3.mal',
- r'lib\monetdb5\lib_pyapi3.dll'])
+ [r'lib\monetdb5\lib_pyapi3.dll'])
print(r' </Directory>')
id = comp(extend, id, 14,
[r'lib\libbat.lib',
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -9701,6 +9701,10 @@ stdout of test 'MAL-signatures` in direc
[ "batsql", "avg", "pattern batsql.avg(X_1:bat[:int], X_2:bat[:lng],
X_3:bat[:lng]):bat[:dbl] ", "SQLavg;", "" ]
[ "batsql", "avg", "pattern batsql.avg(X_1:bat[:lng], X_2:bat[:lng],
X_3:bat[:lng]):bat[:dbl] ", "SQLavg;", "" ]
[ "batsql", "avg", "pattern batsql.avg(X_1:bat[:sht], X_2:bat[:lng],
X_3:bat[:lng]):bat[:dbl] ", "SQLavg;", "" ]
+[ "batsql", "avg", "pattern batsql.avg(X_1:bat[:bte], X_2:bat[:lng],
X_3:bat[:lng]):bat[:bte] ", "SQLavginteger;", "" ]
+[ "batsql", "avg", "pattern batsql.avg(X_1:bat[:int], X_2:bat[:lng],
X_3:bat[:lng]):bat[:int] ", "SQLavginteger;", "" ]
+[ "batsql", "avg", "pattern batsql.avg(X_1:bat[:lng], X_2:bat[:lng],
X_3:bat[:lng]):bat[:lng] ", "SQLavginteger;", "" ]
+[ "batsql", "avg", "pattern batsql.avg(X_1:bat[:sht], X_2:bat[:lng],
X_3:bat[:lng]):bat[:sht] ", "SQLavginteger;", "" ]
[ "batsql", "corr", "pattern batsql.corr(X_1:bat[:bte], X_2:bat[:bte],
X_3:bat[:lng], X_4:bat[:lng]):bat[:dbl] ", "SQLcorr;", "" ]
[ "batsql", "corr", "pattern batsql.corr(X_1:bat[:bte], X_2:bte,
X_3:bat[:lng], X_4:bat[:lng]):bat[:dbl] ", "SQLcorr;", "" ]
[ "batsql", "corr", "pattern batsql.corr(X_1:bat[:dbl], X_2:bat[:dbl],
X_3:bat[:lng], X_4:bat[:lng]):bat[:dbl] ", "SQLcorr;", "" ]
@@ -12420,6 +12424,10 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "avg", "pattern sql.avg(X_1:int, X_2:lng, X_3:lng):dbl ",
"SQLavg;", "" ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
