Changeset: de97b2973b94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de97b2973b94
Added Files:
        clients/mapiclient/Tests/tachograph--help
        clients/mapiclient/Tests/tachograph--help.bat
        clients/mapiclient/Tests/tachograph--help.stable.err
        clients/mapiclient/Tests/tachograph--help.stable.out
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
        sql/backends/monet5/vaults/74_netcdf.mal
        sql/backends/monet5/vaults/74_netcdf.sql
        sql/backends/monet5/vaults/netcdf.c
        sql/backends/monet5/vaults/netcdf.mal
        sql/backends/monet5/vaults/netcdf_vault.h
        sql/test/mergetables/Tests/doubletable.stable.err
        sql/test/mergetables/Tests/doubletable.stable.out
        sql/test/mergetables/Tests/forex1.stable.err
        sql/test/mergetables/Tests/forex1.stable.out
        sql/test/mergetables/Tests/mergedropcrash.sql
        sql/test/mergetables/Tests/mergedropcrash.stable.err
        sql/test/mergetables/Tests/mergedropcrash.stable.out
        sql/test/remote/Tests/ssbm.stable.out.int128
Removed Files:
        clients/Tests/SQL-dump.stable.out.oid32
        clients/Tests/SQL-dump.stable.out.oid32.int128
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/ChangeLog-Archive
        buildtools/ChangeLog.Oct2014
        buildtools/autogen/autogen/am.py
        clients/Tests/All
        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/mapiclient/Tests/All
        clients/mapiclient/Tests/tomograph--help.stable.err
        clients/mapiclient/eventparser.c
        clients/mapiclient/tachograph.c
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/setup.py
        clients/python3/setup.py
        configure.ag
        debian/changelog
        gdk/ChangeLog-Archive
        gdk/ChangeLog.Oct2014
        gdk/gdk_aggr.c
        gdk/gdk_align.c
        gdk/gdk_atomic.h
        gdk/gdk_calc.c
        gdk/gdk_imprints.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_private.h
        gdk/gdk_select.c
        gdk/gdk_system.c
        gdk/gdk_system.h
        gdk/gdk_utils.c
        gdk/libbat.rc
        geom/monetdb5/geom.mal
        java/Makefile.ag
        java/build.properties
        java/pom.xml
        java/release.txt
        libversions
        monetdb5/mal/Tests/performanceTests/performanceLog
        monetdb5/mal/Tests/performanceTests/tst901a.mal
        monetdb5/mal/Tests/performanceTests/tst901b.mal
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_parser.c
        monetdb5/modules/atoms/color.mal
        monetdb5/modules/atoms/inet.mal
        monetdb5/modules/atoms/json.mal
        monetdb5/modules/atoms/mtime.mal
        monetdb5/modules/atoms/url.mal
        monetdb5/modules/atoms/uuid.mal
        monetdb5/modules/atoms/xml.mal
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.mal
        sql/backends/monet5/sql_upgrades.c
        sql/backends/monet5/vaults/Makefile.ag
        sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
        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/jdbc/tests/Tests/All
        sql/jdbc/tests/Tests/Test_Dobjects.stable.out
        sql/scripts/75_storagemodel.sql
        sql/server/rel_optimizer.c
        sql/server/rel_schema.c
        sql/storage/bat/bat_storage.c
        sql/storage/bat/bat_table.c
        sql/storage/store.c
        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/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
        sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
        sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
        sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err
        sql/test/Tests/All
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions.stable.out.int128
        sql/test/leaks/Tests/All
        sql/test/leaks/Tests/check0.stable.out
        sql/test/leaks/Tests/check0.stable.out.int128
        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/mergetables/Tests/All
        sql/test/mergetables/Tests/doubletable.sql
        sql/test/mergetables/Tests/forex.stable.out
        sql/test/mergetables/Tests/forex.stable.out.int128
        sql/test/mergetables/Tests/forex1.sql
        sql/test/mergetables/Tests/mergedrop.sql
        sql/test/remote/Tests/ssbm.SQL.py
        sql/test/remote/Tests/ssbm.stable.out
        sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
        testing/Mtest.py.in
        testing/malcheck.py
        vertoo.data
Branch: bamloader
Log Message:

Merge with default


diffs (truncated from 29273 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -589,3 +589,5 @@ 6607367487d91eb02c5eb7dfb9d96606f8f7c6f0
 e3d0eecdc35dc633fdd89157ba704f60f03756c1 Oct2014_9
 d98df578687e677ae3abbc0ba41e3bb0631ef08a Oct2014_SP2_release
 c80c3439c5d7b2bddb710e584eb0936adc21d462 MonetDB.R-0.9.6
+0529873485e7ec8e4c723f8bf7fc14020a7390b2 Oct2014_11
+f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -91,7 +91,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/Oct2014-SP2/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Oct2014-SP3/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -968,6 +968,73 @@ mv %{buildroot}%{_datadir}/doc/MonetDB-S
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Apr 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423
+- Rebuilt.
+- BZ#3466: UPDATE statements fails with "GDKerror: MT_mremap() failed"
+- BZ#3602: Surprising overload resolution of generate_series
+- BZ#3613: SQL data dictionary contains columns names which are also
+  special keywords. This causes unexpected/unneeded SQL query errors
+- BZ#3645: Network address operators such as << and <<= do not work
+- BZ#3647: missing BAT for a column leads to crash in gtr_update_delta
+- BZ#3648: memory corruption on unclean connection shutdown with local
+  temporary tables
+- BZ#3650: Naming of persistent BATs is fragile
+- BZ#3653: PREPARE crashes mserver if unbound variable is function
+  parameter
+- BZ#3655: SQL WHERE -1 in (-1) issue?
+- BZ#3656: error message after calling fitsload()
+- BZ#3660: Incorrect Results for Comparison Operators on inet Datatype
+- BZ#3661: Ship debug symbols for pre-built binaries
+- BZ#3662: UPDATE row with row value constructor crashes monetdb server
+- BZ#3663: Incorrect result ROW_NUMBER in subquery
+- BZ#3664: SQLstatementIntern missing parameter when using jsonstore
+- BZ#3665: inter-session starvation issue, particularly affects sys.queue
+- BZ#3666: casting text column to inet truncating text column and
+  resulting inet for first occurrence only
+- BZ#3667: insert of negative value for oid column aborts mserver5
+  process with assertion failure
+- BZ#3669: ALTER TABLE <tbl_nm> ADD CONSTRAINT <tbl_uc1> UNIQUE (col1,
+  col2, col3) causes Assertion failure and abort
+- BZ#3671: ODBC-Access on Windows 2012 does not work - E_FAIL
+- BZ#3672: libbat_la-gdk_utils.o: relocation R_X86_64_PC32 against
+  `MT_global_exit' can not be used when making a shared object
+- BZ#3676: merovingian hangs trying to exit
+- BZ#3677: Crash in BATgroup_internal (caused by 87379087770d?)
+- BZ#3678: Ruby driver installation ignores prefix
+- BZ#3680: Prepared statements fail on execution with message 'Symbol
+  type not found'
+- BZ#3684: Wrong query result set WHERE "IS NULL" or "NOT IN" clauses
+  uses in combination with ORDER, LIMIT and OFFSET
+- BZ#3687: 'bat.insert' undefined
+- BZ#3688: Crash at exit (overrun THRerrorcount?)
+- BZ#3689: No more connections accepted if a single client misbehaves
+- BZ#3690: find_fk: Assertion `t && i' failed.
+- BZ#3691: conversion of whitespaces string to double or float is accepted
+  without an error during insert
+- BZ#3693: algebra.join undefined (caused by non-existing variables in
+  the plan)
+- BZ#3696: Inconsistent behavior between dbl (SQL double) and flt (SQL
+  real) data types and across platforms
+- BZ#3697: mserver5[26946]: segfault at 0 ip 00007f3d0e1ab808 sp
+  00007f3cefbfcad0 error 4 in lib_sql.so[7f3d0e180000+16c000]
+- BZ#3699: segfault again! (during last week I found 3 segfault bugs
+  already)
+- BZ#3703: INSERT INTO a MERGE TABLE crashes mserver5
+- BZ#3704: Unknown identifier from subquery
+- BZ#3705: Assertion failure in rel_bin.c:2274: rel2bin_project: Assertion
+  `0' failed.
+- BZ#3706: Assertion failure in gdk_bat.c: BATassertHeadProps: Assertion
+  `!b->H->sorted || cmp <= 0' failed.
+- BZ#3709: "BATproject: does not match always" on abusive use of ALTER
+  TABLE SET READ ONLY
+
+* Tue Feb  3 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423
+- buildtools: We now also create debug packages for Debian and Ubuntu.
+
+* Tue Jan 27 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423
+- gdk: Replaced the rangejoin implementation with one that uses imprints if
+  it can.
+
 * Fri Jan 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.9-20150123
 - Rebuilt.
 - BZ#3467: Field aliases with '#' character excise field names in
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
@@ -346,6 +346,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
+/* Define if you have netcdf installed */
+/* #undef HAVE_NETCDF */
+
 /* Define to 1 if you have the <netdb.h> header file. */
 /* #undef HAVE_NETDB_H */
 
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -373,6 +373,11 @@ create_winconfig_conds_new_py:
 !ELSE
        $(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ENDIF
+!IFDEF HAVE_NETCDF
+       $(ECHO) HAVE_NETCDF_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+       $(ECHO) HAVE_NETCDF_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
 !IFDEF HAVE_ODBC
        $(ECHO) HAVE_ODBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ELSE
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Feb  3 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423
+- We now also create debug packages for Debian and Ubuntu.
+
 * Fri Nov  7 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120
 - The libraries included in the Windows installers have been upgraded.
   We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8.
diff --git a/buildtools/ChangeLog.Oct2014 b/buildtools/ChangeLog.Oct2014
--- a/buildtools/ChangeLog.Oct2014
+++ b/buildtools/ChangeLog.Oct2014
@@ -1,6 +1,3 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
-* Tue Feb  3 2015 Sjoerd Mullender <sjo...@acm.org>
-- We now also create debug packages for Debian and Ubuntu.
-
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
@@ -960,7 +960,9 @@ def am_gem(fd, var, gem, am):
                         dirs.append(d)
             fd.write("\t[ '$(srcdir)' -ef . ] || cp -p '$(srcdir)/%s' '%s'\n" 
% (src, src))
         fd.write("\tgem build '%s'\n" % f)
-        fd.write("\tgem install --local --install-dir ./'%s' --bindir .'%s' 
--force --document=ri,rdoc %s\n" % (rd, am_translate_dir('bindir', am), f[:-4]))
+        # 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)
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_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32?SQL-dump
+HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
+HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32&!BITS64OID32?SQL-dump
 MERCURIAL?malcheck
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
@@ -39774,6 +39774,22 @@ command mtime.year(d:date):int
 address MTIMEdate_extract_year;
 comment extracts year from date (nonzero       value between -5867411 and 
+5867411).
 
+pattern netcdf.attach(filename:str):void 
+address NCDFattach;
+comment Register a NetCDF file in the vault
+
+pattern netcdf.importvariable(fileid:int,varname:str):void 
+address NCDFimportVariable;
+comment Import variable: create array and load data from variable varname of 
file fileid
+
+command netcdf.importvar(filename:str,varid:int):str 
+address NCDFimportVarStmt;
+comment Import variable: compose create array string
+
+command netcdf.test(filename:str):int 
+address NCDFtest;
+comment Returns number of variables in a given NetCDF dataset (file)
+
 pattern optimizer.aliases(mod:str,fcn:str):str 
 address OPTwrapper;
 comment Alias removal optimizer
@@ -40843,7 +40859,7 @@ pattern sql.sysmon_pause(tag:sht):void
 address SYSMONpause;
 pattern sql.sysmon_queue() 
(qtag:bat[:oid,:lng],user:bat[:oid,:str],started:bat[:oid,:timestamp],estimate:bat[:oid,:timestamp],progress:bat[:oid,:int],status:bat[:oid,:str],tag:bat[:oid,:oid],query:bat[:oid,:str])
 
 address SYSMONqueue;
-pattern sql.storage() 
(schema:bat[:oid,:str],table:bat[:oid,:str],column:bat[:oid,:str],type:bat[:oid,:str],mode:bat[:oid,:str],location:bat[:oid,:str],count:bat[:oid,:lng],atomwidth:bat[:oid,:int],columnsize:bat[:oid,:lng],heap:bat[:oid,:lng],hashes:bat[:oid,:lng],imprints:bat[:oid,:lng],sorted:bat[:oid,:bit])
 
+pattern sql.storage() 
(schema:bat[:oid,:str],table:bat[:oid,:str],column:bat[:oid,:str],type:bat[:oid,:str],mode:bat[:oid,:str],location:bat[:oid,:str],count:bat[:oid,:lng],atomwidth:bat[:oid,:int],columnsize:bat[:oid,:lng],heap:bat[:oid,:lng],hashes:bat[:oid,:lng],phash:bat[:oid,:bit],imprints:bat[:oid,:lng],sorted:bat[:oid,:bit])
 
 address sql_storage;
 comment return a table with storage information 
 
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
@@ -50709,6 +50709,22 @@ command mtime.year(d:date):int
 address MTIMEdate_extract_year;
 comment extracts year from date (nonzero       value between -5867411 and 
+5867411).
 
+pattern netcdf.attach(filename:str):void 
+address NCDFattach;
+comment Register a NetCDF file in the vault
+
+pattern netcdf.importvariable(fileid:int,varname:str):void 
+address NCDFimportVariable;
+comment Import variable: create array and load data from variable varname of 
file fileid
+
+command netcdf.importvar(filename:str,varid:int):str 
+address NCDFimportVarStmt;
+comment Import variable: compose create array string
+
+command netcdf.test(filename:str):int 
+address NCDFtest;
+comment Returns number of variables in a given NetCDF dataset (file)
+
 pattern optimizer.aliases(mod:str,fcn:str):str 
 address OPTwrapper;
 comment Alias removal optimizer
@@ -51786,7 +51802,7 @@ pattern sql.sysmon_pause(tag:sht):void
 address SYSMONpause;
 pattern sql.sysmon_queue() 
(qtag:bat[:oid,:lng],user:bat[:oid,:str],started:bat[:oid,:timestamp],estimate:bat[:oid,:timestamp],progress:bat[:oid,:int],status:bat[:oid,:str],tag:bat[:oid,:oid],query:bat[:oid,:str])
 
 address SYSMONqueue;
-pattern sql.storage() 
(schema:bat[:oid,:str],table:bat[:oid,:str],column:bat[:oid,:str],type:bat[:oid,:str],mode:bat[:oid,:str],location:bat[:oid,:str],count:bat[:oid,:lng],atomwidth:bat[:oid,:int],columnsize:bat[:oid,:lng],heap:bat[:oid,:lng],hashes:bat[:oid,:lng],imprints:bat[:oid,:lng],sorted:bat[:oid,:bit])
 
+pattern sql.storage() 
(schema:bat[:oid,:str],table:bat[:oid,:str],column:bat[:oid,:str],type:bat[:oid,:str],mode:bat[:oid,:str],location:bat[:oid,:str],count:bat[:oid,:lng],atomwidth:bat[:oid,:int],columnsize:bat[:oid,:lng],heap:bat[:oid,:lng],hashes:bat[:oid,:lng],phash:bat[:oid,:bit],imprints:bat[:oid,:lng],sorted:bat[:oid,:bit])
 
 address sql_storage;
 comment return a table with storage information 
 
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
@@ -68,6 +68,11 @@ SYSTEM TABLE  sys.dependencies
 SYSTEM TABLE  sys.functions
 SYSTEM TABLE  sys.idxs
 SYSTEM TABLE  sys.keys
+SYSTEM TABLE  sys.netcdf_attrs
+SYSTEM TABLE  sys.netcdf_dims
+SYSTEM TABLE  sys.netcdf_files
+SYSTEM TABLE  sys.netcdf_vardim
+SYSTEM TABLE  sys.netcdf_vars
 SYSTEM TABLE  sys.objects
 SYSTEM TABLE  sys.privileges
 SYSTEM TABLE  sys.schemas
@@ -190,6 +195,8 @@ SYSTEM FUNCTION  sys.ms_round
 SYSTEM FUNCTION  sys.ms_str
 SYSTEM FUNCTION  sys.ms_stuff
 SYSTEM FUNCTION  sys.ms_trunc
+SYSTEM FUNCTION  sys.netcdf_attach
+SYSTEM FUNCTION  sys.netcdf_importvar
 SYSTEM FUNCTION  sys.netmask
 SYSTEM FUNCTION  sys.network
 SYSTEM FUNCTION  sys.newurl
@@ -1159,7 +1166,7 @@ external name sql.sysmon_stop;
 -- For strings we take a sample to determine their average length.
 
 create function sys."storage"()
-returns table ("schema" string, "table" string, "column" string, "type" 
string, "mode" string, location string, "count" bigint, typewidth int, 
columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted 
boolean)
+returns table ("schema" string, "table" string, "column" string, "type" 
string, "mode" string, location string, "count" bigint, typewidth int, 
columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints 
bigint, sorted boolean)
 external name sql."storage";
 create function sys.storagemodel()
 returns table (
@@ -1330,7 +1337,7 @@ CREATE TABLE "sys"."_columns" (
        "number"      INTEGER,
        "storage"     VARCHAR(2048)
 );
-COPY 329 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS 
'\t','\n','"';
+COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS 
'\t','\n','"';
 2002   "id"    "int"   32      0       2001    NULL    true    0       NULL
 2003   "name"  "varchar"       1024    0       2001    NULL    true    1       
NULL
 2004   "authorization" "int"   32      0       2001    NULL    true    2       
NULL
@@ -1564,102 +1571,124 @@ 5777  "progress"      "int"   32      0       5781    
NULL    tru
 5778   "status"        "clob"  0       0       5781    NULL    true    5       
NULL
 5779   "tag"   "oid"   63      0       5781    NULL    true    6       NULL
 5780   "query" "clob"  0       0       5781    NULL    true    7       NULL
-6439   "schema"        "clob"  0       0       6452    NULL    true    0       
NULL
-6440   "table" "clob"  0       0       6452    NULL    true    1       NULL
-6441   "column"        "clob"  0       0       6452    NULL    true    2       
NULL
-6442   "type"  "clob"  0       0       6452    NULL    true    3       NULL
-6443   "mode"  "clob"  0       0       6452    NULL    true    4       NULL
-6444   "location"      "clob"  0       0       6452    NULL    true    5       
NULL
-6445   "count" "bigint"        64      0       6452    NULL    true    6       
NULL
-6446   "typewidth"     "int"   32      0       6452    NULL    true    7       
NULL
-6447   "columnsize"    "bigint"        64      0       6452    NULL    true    
8       NULL
-6448   "heapsize"      "bigint"        64      0       6452    NULL    true    
9       NULL
-6449   "hashes"        "bigint"        64      0       6452    NULL    true    
10      NULL
-6450   "imprints"      "bigint"        64      0       6452    NULL    true    
11      NULL
-6451   "sorted"        "boolean"       1       0       6452    NULL    true    
12      NULL
-6454   "schema"        "clob"  0       0       6464    NULL    true    0       
NULL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to