Changeset: 97b8377d65cf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97b8377d65cf Added Files: README.rst debian/libmonetdb13.install sql/backends/monet5/Tests/pyapi33.sql sql/backends/monet5/Tests/pyapi33.stable.err sql/backends/monet5/Tests/pyapi33.stable.out sql/backends/monet5/sql_cast_impl_int.h sql/test/BugTracker-2017/Tests/all_dates.csv.gz sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out sql/test/BugTracker-2017/Tests/empty-interval.Bug-6184.sql sql/test/BugTracker-2017/Tests/empty-interval.Bug-6184.stable.err sql/test/BugTracker-2017/Tests/empty-interval.Bug-6184.stable.out sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.sql.in sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.sql sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.stable.err sql/test/BugTracker-2017/Tests/round-or-truncate.Bug-6193.stable.out sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.sql sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.stable.err sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.stable.out sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.sql sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.out sql/test/malloc_fail/Tests/mallocs.SQL.py sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.err sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out Removed Files: README debian/libmonetdb14.install sql/backends/monet5/sql_cast_impl_down_from_int.h sql/backends/monet5/sql_cast_impl_up_to_int.h sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single sql/test/Tests/setoptimizer.stable.out.Windows sql/test/malloc_fail/Tests/initialize.sql sql/test/malloc_fail/Tests/initialize.stable.err sql/test/malloc_fail/Tests/initialize.stable.out sql/test/malloc_fail/Tests/setmemorylimit-fail.reqtests sql/test/malloc_fail/Tests/setmemorylimit-fail.sql sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.err sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.out sql/test/malloc_fail/Tests/setmemorylimit-fail2.reqtests sql/test/malloc_fail/Tests/setmemorylimit-fail2.sql sql/test/malloc_fail/Tests/setmemorylimit.reqtests sql/test/malloc_fail/Tests/setmemorylimit.sql sql/test/malloc_fail/Tests/setmemorylimit.stable.err sql/test/malloc_fail/Tests/setmemorylimit.stable.out Modified Files: .hgignore .hgtags ChangeLog HowToStart.rst Makefile.ag 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 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog debian/control gdk/ChangeLog gdk/gdk.h gdk/gdk_batop.c gdk/gdk_calc.c gdk/gdk_cross.c gdk/gdk_hash.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h gdk/libbat.rc geom/BugTracker/Tests/All geom/BugTracker/Tests/X_crash.SF-1971632.sql geom/BugTracker/Tests/X_crash.SF-1971632.stable.out geom/monetdb5/geom.c libversions monetdb5/extras/mal_optimizer_template/Tests/All monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/mal/Tests/performanceTests/performanceLog monetdb5/mal/Tests/performanceTests/tst400d.malC monetdb5/mal/Tests/performanceTests/tst901a.malC monetdb5/mal/Tests/performanceTests/tst901b.malC monetdb5/mal/mal.h monetdb5/mal/mal_builder.c monetdb5/mal/mal_client.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_function.c monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h monetdb5/mal/mal_sabaoth.c monetdb5/mal/mal_sabaoth.h monetdb5/mal/mal_session.c monetdb5/mal/mal_stack.c monetdb5/modules/atoms/mtime.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_io.h monetdb5/modules/mal/mal_io.mal monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/sabaoth.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_statistics.c monetdb5/optimizer/opt_wrapper.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/All sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_string.stable.out sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi/unicode.c sql/backends/monet5/UDF/pyapi/unicode.h sql/backends/monet5/generator/Tests/generator04.sql sql/backends/monet5/generator/Tests/generator04.stable.err sql/backends/monet5/sql.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast_impl_down_from_flt.h sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_fround.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/bam/bam_wrapper.c sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/51_sys_schema_extension.sql sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/sql_atom.c sql/server/sql_parser.y sql/storage/bat/bat_table.c sql/test/ADT2006/Tests/bram.stable.out sql/test/BugTracker-2009/Tests/All sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.sql sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128 sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.sql sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker-2017/Tests/All sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.sql sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/DropCascade/Tests/drop_columns_cascade.stable.out sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out sql/test/Tests/keys.stable.out sql/test/Tests/setoptimizer.stable.out sql/test/VOC/Tests/VOC.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/malloc_fail/Tests/All sql/test/mergetables/Tests/forex.stable.out sql/test/mergetables/Tests/forex.stable.out.int128 sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/int8.sql sql/test/pg_regress/Tests/numeric.sql sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric.stable.out sql/test/pg_regress/Tests/numerology.stable.out sql/test/sys-schema/Tests/All sql/test/testdb/Tests/testdb-dump.stable.out.Windows testing/Mtest.py.in testing/process.py tools/merovingian/daemon/controlrunner.c vertoo.data Branch: batcalc-candidates Log Message:
Merge with default branch. diffs (truncated from 20666 to 300 lines): diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -61,21 +61,10 @@ lex.yy.c *.lib # notwithstanding clients/odbc/winsetup/winredist/*.dll: *.dll -# ruby: -*.gem -# java: -*.jar -java/build -java/target -java/bin -java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java -# python: -dist # other files we don't want TAGS tags -*.elc *.pyo *.rej *.orig @@ -99,11 +88,3 @@ NT/unistd.h # package building on Mac OS X MacOSX/build MacOSX/usr - -# Build directory -BUILD - -syntax: regexp -^java/build$ -syntax: regexp -^java/target$ diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -647,3 +647,5 @@ deeebb69952f76e3377664bb97997885b283f9d1 afc859894553ef804cded49a83b035d9d2cda73b Dec2016_3 ea0fe76e0095771bccca626b39e3e839a90ba320 Dec2016_release afc859894553ef804cded49a83b035d9d2cda73b Dec2016_release +bf4b58d202645774b75c7f508c84b30e3be78a49 Dec2016_5 +bf4b58d202645774b75c7f508c84b30e3be78a49 Dec2016_SP1_release diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> +- Added 5 new sys schema tables: function_languages, function_types, + key_types, index_types and privilege_codes. They are pre-loaded with + static content and contain descriptive names for the various integer + type and code values. See also sql/scripts/51_sys_schema_extension.sql diff --git a/HowToStart.rst b/HowToStart.rst --- a/HowToStart.rst +++ b/HowToStart.rst @@ -24,7 +24,7 @@ This document assumes that you are plann installing MonetDB on a Unix-like system (e.g., Linux, IRIX, Solaris, AIX, Mac OS X/Darwin, or CYGWIN). For compilation and installation on a native Windows system (NT, 2000, XP) see the instructions in the -file `../buildtools/doc/windowsbuild.rst`__. +file `buildtools/doc/windowsbuild.rst`__. __ http://dev.monetdb.org/downloads/ __ Windows-Installation.html diff --git a/Makefile.ag b/Makefile.ag --- a/Makefile.ag +++ b/Makefile.ag @@ -13,7 +13,7 @@ SUBDIRS = buildtools common clients \ HAVE_TESTING?testing \ EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \ - MonetDB.spec rpm.mk.in COPYING README license.txt HowToStart.rst + MonetDB.spec rpm.mk.in COPYING README.rst license.txt HowToStart.rst EXTRA_DIST_DIR = NT debian MacOSX diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -124,7 +124,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2016/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP1/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -957,6 +957,21 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Fri Jan 13 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.25.5-20170113 +- Rebuilt. +- BZ#4039: Slow mserver5 start after drop of tables (> 1 hour) +- BZ#4048: Segfault on vacuum with parallel updates +- BZ#6079: pushselect optimizer bug on MAL snippet +- BZ#6140: INNER JOIN gives the results of a CROSS JOIN +- BZ#6150: Query giving wrong results, extra records are appearing +- BZ#6175: The program can't start because python27.dll is missing from + your computer. +- BZ#6178: AVG + GROUP BY returns NULL for some records that should + have results +- BZ#6179: mergetable optimizer messes up sample +- BZ#6182: sys.shutdown triggers assertion in clients.c +- BZ#6184: Incorrect result set - Extra records in result set + * Sat Dec 17 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.3-20161217 - Rebuilt. diff --git a/README b/README deleted file mode 100644 --- a/README +++ /dev/null @@ -1,26 +0,0 @@ -The MonetDB Database System -=========================== - -The MonetDB database is developed by the CWI database research group -(see http://www.monetdb.org/). - -Via the MonetDB project we have brought the MonetDB system in open source, -where it is accessible at http://www.monetdb.org/Downloads/ - -The MonetDB database system is a high-performance database kernel for -query-intensive applications. The MonetDB kernel works together with an -SQL frontend that is in a separate CVS module. - -If you got a source distribution, please compile and install MonetDB first, -following the instructions in the file 'HowToStart.rst' (for Unix) -or 'buildtools/doc/windowsbuild.rst' (for Windows). - - -Copyright Notice -================ - -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. - -Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. diff --git a/README.rst b/README.rst new file mode 100644 --- /dev/null +++ b/README.rst @@ -0,0 +1,34 @@ +The MonetDB Database System +=========================== + +The MonetDB database is developed by the CWI database research group +(see http://www.monetdb.org/). + +Via the MonetDB project we have brought the MonetDB system in open source, +where it is accessible at http://www.monetdb.org/Downloads/ + +The MonetDB database system is a high-performance database kernel for +query-intensive applications. The MonetDB source can be found at our `Mercurial +server`__. There is also a `github mirror`__ that is updated once a day. + +.. _MonetDB: http://dev.monetdb.org/hg/MonetDB/ +__ MonetDB_ + +.. _github: https://github.com/MonetDB/MonetDB +__ github_ + +If you got a source distribution, please compile and install MonetDB first, +following the instructions in the file `HowToStart.rst`__ (for Unix) +or `buildtools/doc/windowsbuild.rst`__ (for Windows). + +__ HowToStart.rst +__ buildtools/doc/windowsbuild.rst + +Copyright Notice +================ + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. + +Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. 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 @@ -7761,7 +7761,7 @@ Ready. [ "io", "printf", "pattern io.printf(fmt:str, val:any...):void ", "IOprintf;", "Select default format " ] [ "io", "printf", "pattern io.printf(filep:streams, fmt:str):void ", "IOprintfStream;", "Select default format " ] [ "io", "printf", "pattern io.printf(filep:streams, fmt:str, val:any...):void ", "IOprintfStream;", "Select default format " ] -[ "io", "setmemorylimit", "command io.setmemorylimit(nbytes:lng):void ", "IOsetmemorylimit;", "Set memory limit for testing" ] +[ "io", "setmallocsuccesscount", "command io.setmallocsuccesscount(count:lng):void ", "IOsetmallocsuccesscount;", "Set number of mallocs that are allowed to succeed." ] [ "io", "stderr", "pattern io.stderr():streams ", "io_stderr;", "return the error stream for the database console" ] [ "io", "stdin", "pattern io.stdin():bstream ", "io_stdin;", "return the input stream to the database client" ] [ "io", "stdout", "pattern io.stdout():streams ", "io_stdout;", "return the output stream for the database client" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -10117,7 +10117,7 @@ Ready. [ "io", "printf", "pattern io.printf(fmt:str, val:any...):void ", "IOprintf;", "Select default format " ] [ "io", "printf", "pattern io.printf(filep:streams, fmt:str):void ", "IOprintfStream;", "Select default format " ] [ "io", "printf", "pattern io.printf(filep:streams, fmt:str, val:any...):void ", "IOprintfStream;", "Select default format " ] -[ "io", "setmemorylimit", "command io.setmemorylimit(nbytes:lng):void ", "IOsetmemorylimit;", "Set memory limit for testing" ] +[ "io", "setmallocsuccesscount", "command io.setmallocsuccesscount(count:lng):void ", "IOsetmallocsuccesscount;", "Set number of mallocs that are allowed to succeed." ] [ "io", "stderr", "pattern io.stderr():streams ", "io_stderr;", "return the error stream for the database console" ] [ "io", "stdin", "pattern io.stdin():bstream ", "io_stdin;", "return the input stream to the database client" ] [ "io", "stdout", "pattern io.stdout():streams ", "io_stdout;", "return the output stream for the database client" ] diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -86,8 +86,12 @@ Ready. \dSt sys.db_user_info \dSt sys.dependencies \dSt sys.dependency_types +\dSt sys.function_languages +\dSt sys.function_types \dSt sys.functions \dSt sys.idxs +\dSt sys.index_types +\dSt sys.key_types \dSt sys.keys \dSt sys.keywords \dSt sys.netcdf_attrs @@ -96,6 +100,7 @@ Ready. \dSt sys.netcdf_vardim \dSt sys.netcdf_vars \dSt sys.objects +\dSt sys.privilege_codes \dSt sys.privileges \dSt sys.schemas \dSt sys.sequences @@ -373,8 +378,12 @@ SYSTEM TABLE sys.connections SYSTEM TABLE sys.db_user_info SYSTEM TABLE sys.dependencies SYSTEM TABLE sys.dependency_types +SYSTEM TABLE sys.function_languages +SYSTEM TABLE sys.function_types SYSTEM TABLE sys.functions SYSTEM TABLE sys.idxs +SYSTEM TABLE sys.index_types +SYSTEM TABLE sys.key_types SYSTEM TABLE sys.keys SYSTEM TABLE sys.keywords SYSTEM TABLE sys.netcdf_attrs @@ -383,6 +392,7 @@ SYSTEM TABLE sys.netcdf_files SYSTEM TABLE sys.netcdf_vardim SYSTEM TABLE sys.netcdf_vars SYSTEM TABLE sys.objects +SYSTEM TABLE sys.privilege_codes SYSTEM TABLE sys.privileges SYSTEM TABLE sys.schemas SYSTEM TABLE sys.sequences @@ -806,8 +816,12 @@ CREATE TABLE "sys"."connections" ("id" I CREATE TABLE "sys"."db_user_info" ("name" VARCHAR(1024), "fullname" VARCHAR(2048), "default_schema" INTEGER); CREATE TABLE "sys"."dependencies" ("id" INTEGER, "depend_id" INTEGER, "depend_type" SMALLINT); CREATE TABLE "sys"."dependency_types" ("dependency_type_id" SMALLINT NOT NULL, "dependency_type_name" VARCHAR(15) NOT NULL, CONSTRAINT "dependency_types_dependency_type_id_pkey" PRIMARY KEY ("dependency_type_id"), CONSTRAINT "dependency_types_dependency_type_name_unique" UNIQUE ("dependency_type_name")); +CREATE TABLE "sys"."function_languages" ("language_id" SMALLINT NOT NULL, "language_name" VARCHAR(20) NOT NULL, CONSTRAINT "function_languages_language_id_pkey" PRIMARY KEY ("language_id"), CONSTRAINT "function_languages_language_name_unique" UNIQUE ("language_name")); +CREATE TABLE "sys"."function_types" ("function_type_id" SMALLINT NOT NULL, "function_type_name" VARCHAR(30) NOT NULL, CONSTRAINT "function_types_function_type_id_pkey" PRIMARY KEY ("function_type_id"), CONSTRAINT "function_types_function_type_name_unique" UNIQUE ("function_type_name")); CREATE TABLE "sys"."functions" ("id" INTEGER, "name" VARCHAR(256), "func" VARCHAR(8196), "mod" VARCHAR(8196), "language" INTEGER, "type" INTEGER, "side_effect" BOOLEAN, "varres" BOOLEAN, "vararg" BOOLEAN, "schema_id" INTEGER); CREATE TABLE "sys"."idxs" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER, "name" VARCHAR(1024)); +CREATE TABLE "sys"."index_types" ("index_type_id" SMALLINT NOT NULL, "index_type_name" VARCHAR(25) NOT NULL, CONSTRAINT "index_types_index_type_id_pkey" PRIMARY KEY ("index_type_id"), CONSTRAINT "index_types_index_type_name_unique" UNIQUE ("index_type_name")); +CREATE TABLE "sys"."key_types" ("key_type_id" SMALLINT NOT NULL, "key_type_name" VARCHAR(15) NOT NULL, CONSTRAINT "key_types_key_type_id_pkey" PRIMARY KEY ("key_type_id"), CONSTRAINT "key_types_key_type_name_unique" UNIQUE ("key_type_name")); CREATE TABLE "sys"."keys" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER, "name" VARCHAR(1024), "rkey" INTEGER, "action" INTEGER); CREATE TABLE "sys"."keywords" ("keyword" VARCHAR(40) NOT NULL, CONSTRAINT "keywords_keyword_pkey" PRIMARY KEY ("keyword")); CREATE TABLE "sys"."netcdf_attrs" ("obj_name" VARCHAR(256), "att_name" VARCHAR(256), "att_type" VARCHAR(64), "value" CHARACTER LARGE OBJECT, "file_id" INTEGER, "gr_name" VARCHAR(256)); @@ -816,6 +830,7 @@ CREATE TABLE "sys"."netcdf_files" ("file CREATE TABLE "sys"."netcdf_vardim" ("var_id" INTEGER, "dim_id" INTEGER, "file_id" INTEGER, "dimpos" INTEGER); CREATE TABLE "sys"."netcdf_vars" ("var_id" INTEGER, "file_id" INTEGER, "name" VARCHAR(64), "vartype" VARCHAR(64), "ndim" INTEGER, "coord_dim_id" INTEGER); CREATE TABLE "sys"."objects" ("id" INTEGER, "name" VARCHAR(1024), "nr" INTEGER); +CREATE TABLE "sys"."privilege_codes" ("privilege_code_id" INTEGER NOT NULL, "privilege_code_name" VARCHAR(30) NOT NULL, CONSTRAINT "privilege_codes_privilege_code_id_pkey" PRIMARY KEY ("privilege_code_id"), CONSTRAINT "privilege_codes_privilege_code_name_unique" UNIQUE ("privilege_code_name")); CREATE TABLE "sys"."privileges" ("obj_id" INTEGER, "auth_id" INTEGER, "privileges" INTEGER, "grantor" INTEGER, "grantable" INTEGER); CREATE TABLE "sys"."schemas" ("id" INTEGER, "name" VARCHAR(1024), "authorization" INTEGER, "owner" INTEGER, "system" BOOLEAN); CREATE TABLE "sys"."sequences" ("id" INTEGER, "schema_id" INTEGER, "name" VARCHAR(256), "start" BIGINT, "minvalue" BIGINT, "maxvalue" BIGINT, "increment" BIGINT, "cacheinc" BIGINT, "cycle" BOOLEAN); @@ -1291,7 +1306,7 @@ drop function pcre_replace(string, strin % .s, .t, .L4, .t, .t, .t, .t # table_name % name, name, query, type, system, commit_action, access # name % varchar, varchar, varchar, smallint, boolean, smallint, smallint # type -% 3, 17, 597, 1, 5, 1, 1 # length +% 3, 18, 597, 1, 5, 1, 1 # length [ "bam", "export", NULL, 0, true, 0, 0 ] [ "bam", "files", NULL, 0, true, 0, 0 ] [ "bam", "pg", NULL, 0, true, 0, 0 ] @@ -1307,9 +1322,13 @@ drop function pcre_replace(string, strin [ "sys", "dependencies", NULL, 0, true, 0, 0 ] [ "sys", "dependency_types", NULL, 0, true, 0, 0 ] [ "sys", "environment", "create view sys.environment as select * from sys.environment();", 1, true, 0, 0 ] +[ "sys", "function_languages", NULL, 0, true, 0, 0 ] +[ "sys", "function_types", NULL, 0, true, 0, 0 ] [ "sys", "functions", NULL, 0, true, 0, 0 ] [ "sys", "geometry_columns", "create view geometry_columns as select e.value as f_table_catalog, s.name as f_table_schema, y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid, y.type from schemas s, environment e, (select t.schema_id, t.name as f_table_name, x.name as f_geometry_column, has_z(info)+has_m(info)+2 as coord_dimension, srid, get_type(info, 0) as type from tables t, (select name, table_id, type_digits as info, type_scale as srid from columns where type in (select distinct sqlname from types where systemname='wkb')) as x where t.id=x.table_id) y where y.schema_id=s.id and e.name='gdk_dbname';", 1, true, 0, 0 ] [ "sys", "idxs", NULL, 0, true, 0, 0 ] +[ "sys", "index_types", NULL, 0, true, 0, 0 ] +[ "sys", "key_types", NULL, 0, true, 0, 0 ] [ "sys", "keys", NULL, 0, true, 0, 0 ] [ "sys", "keywords", NULL, 0, true, 0, 0 ] [ "sys", "netcdf_attrs", NULL, 0, true, 0, 0 ] @@ -1319,6 +1338,7 @@ drop function pcre_replace(string, strin _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
