Changeset: 8ee91206ac78 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ee91206ac78
Added Files:
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
Modified Files:
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/SQL-dump.stable.out.oid32
clients/Tests/SQL-dump.stable.out.oid32.int128
configure.ag
sql/backends/monet5/vaults/Makefile.ag
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
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.int128
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
testing/Mtest.py.in
Branch: default
Log Message:
merged netcdf vault
diffs (truncated from 4456 to 300 lines):
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/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
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
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
@@ -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 351 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
@@ -1672,7 +1679,7 @@ CREATE TABLE "sys"."_tables" (
"commit_action" SMALLINT,
"access" SMALLINT
);
-COPY 45 RECORDS INTO "sys"."_tables" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 50 RECORDS INTO "sys"."_tables" FROM stdin USING DELIMITERS '\t','\n','"';
2001 "schemas" 2000 NULL 0 true 0 0
2007 "types" 2000 NULL 0 true 0 0
2016 "functions" 2000 NULL 0 true 0 0
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -64,6 +64,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
@@ -186,6 +191,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
@@ -1371,7 +1378,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 329 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 351 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
@@ -1605,102 +1612,124 @@ 6230 "progress" "int" 32 0 6234
NULL tru
6231 "status" "clob" 0 0 6234 NULL true 5
NULL
6232 "tag" "oid" 63 0 6234 NULL true 6 NULL
6233 "query" "clob" 0 0 6234 NULL true 7 NULL
-6927 "schema" "clob" 0 0 6940 NULL true 0
NULL
-6928 "table" "clob" 0 0 6940 NULL true 1 NULL
-6929 "column" "clob" 0 0 6940 NULL true 2
NULL
-6930 "type" "clob" 0 0 6940 NULL true 3 NULL
-6931 "mode" "clob" 0 0 6940 NULL true 4 NULL
-6932 "location" "clob" 0 0 6940 NULL true 5
NULL
-6933 "count" "bigint" 64 0 6940 NULL true 6
NULL
-6934 "typewidth" "int" 32 0 6940 NULL true 7
NULL
-6935 "columnsize" "bigint" 64 0 6940 NULL true
8 NULL
-6936 "heapsize" "bigint" 64 0 6940 NULL true
9 NULL
-6937 "hashes" "bigint" 64 0 6940 NULL true
10 NULL
-6938 "imprints" "bigint" 64 0 6940 NULL true
11 NULL
-6939 "sorted" "boolean" 1 0 6940 NULL true
12 NULL
-6942 "schema" "clob" 0 0 6952 NULL true 0
NULL
-6943 "table" "clob" 0 0 6952 NULL true 1 NULL
-6944 "column" "clob" 0 0 6952 NULL true 2
NULL
-6945 "type" "clob" 0 0 6952 NULL true 3 NULL
-6946 "typewidth" "int" 32 0 6952 NULL true 4
NULL
-6947 "count" "bigint" 64 0 6952 NULL true 5
NULL
-6948 "distinct" "bigint" 64 0 6952 NULL true
6 NULL
-6949 "atomwidth" "int" 32 0 6952 NULL true 7
NULL
-6950 "reference" "boolean" 1 0 6952 NULL true
8 NULL
-6951 "sorted" "boolean" 1 0 6952 NULL true
9 NULL
-6990 "schema" "clob" 0 0 7000 NULL true 0
NULL
-6991 "table" "clob" 0 0 7000 NULL true 1 NULL
-6992 "column" "clob" 0 0 7000 NULL true 2
NULL
-6993 "type" "clob" 0 0 7000 NULL true 3 NULL
-6994 "count" "bigint" 64 0 7000 NULL true 4
NULL
-6995 "columnsize" "bigint" 64 0 7000 NULL true
5 NULL
-6996 "heapsize" "bigint" 64 0 7000 NULL true
6 NULL
-6997 "hashes" "bigint" 64 0 7000 NULL true
7 NULL
-6998 "imprints" "bigint" 64 0 7000 NULL true
8 NULL
-6999 "sorted" "boolean" 1 0 7000 NULL true
9 NULL
-7002 "schema" "clob" 0 0 7010 NULL true 0
NULL
-7003 "table" "clob" 0 0 7010 NULL true 1 NULL
-7004 "count" "bigint" 64 0 7010 NULL true 2
NULL
-7005 "columnsize" "hugeint" 128 0 7010 NULL true
3 NULL
-7006 "heapsize" "hugeint" 128 0 7010 NULL true
4 NULL
-7007 "hashes" "hugeint" 128 0 7010 NULL true
5 NULL
-7008 "imprints" "hugeint" 128 0 7010 NULL true
6 NULL
-7009 "auxiliary" "hugeint" 128 0 7010 NULL true
7 NULL
-7012 "column_id" "int" 32 0 7023 NULL true 0
NULL
-7013 "type" "clob" 0 0 7023 NULL true 1 NULL
-7014 "width" "int" 32 0 7023 NULL true 2 NULL
-7015 "stamp" "timestamp" 7 0 7023 NULL true 3
NULL
-7016 "sample" "bigint" 64 0 7023 NULL true
4 NULL
-7017 "count" "bigint" 64 0 7023 NULL true 5
NULL
-7018 "unique" "bigint" 64 0 7023 NULL true
6 NULL
-7019 "nils" "bigint" 64 0 7023 NULL true 7
NULL
-7020 "minval" "clob" 0 0 7023 NULL true 8
NULL
-7021 "maxval" "clob" 0 0 7023 NULL true 9
NULL
-7022 "sorted" "boolean" 1 0 7023 NULL true
10 NULL
-7123 "file_id" "bigint" 64 0 7131 NULL false
0 NULL
-7124 "file_location" "clob" 0 0 7131 NULL false 1
NULL
-7125 "dbschema" "smallint" 16 0 7131 NULL false
2 NULL
-7126 "format_version" "varchar" 7 0 7131 NULL
true 3 NULL
-7127 "sorting_order" "varchar" 10 0 7131 NULL true
4 NULL
-7128 "comments" "clob" 0 0 7131 NULL true 5
NULL
-7133 "sn" "clob" 0 0 7144 NULL false 0 NULL
-7134 "file_id" "bigint" 64 0 7144 NULL false
1 NULL
-7135 "ln" "int" 32 0 7144 NULL true 2 NULL
-7136 "as" "int" 32 0 7144 NULL true 3 NULL
-7137 "m5" "clob" 0 0 7144 NULL true 4 NULL
-7138 "sp" "clob" 0 0 7144 NULL true 5 NULL
-7139 "ur" "clob" 0 0 7144 NULL true 6 NULL
-7146 "id" "clob" 0 0 7163 NULL false 0 NULL
-7147 "file_id" "bigint" 64 0 7163 NULL false
1 NULL
-7148 "cn" "clob" 0 0 7163 NULL true 2 NULL
-7149 "ds" "clob" 0 0 7163 NULL true 3 NULL
-7150 "dt" "timestamp" 7 0 7163 NULL true 4
NULL
-7151 "fo" "clob" 0 0 7163 NULL true 5 NULL
-7152 "ks" "clob" 0 0 7163 NULL true 6 NULL
-7153 "lb" "clob" 0 0 7163 NULL true 7 NULL
-7154 "pg" "clob" 0 0 7163 NULL true 8 NULL
-7155 "pi" "int" 32 0 7163 NULL true 9 NULL
-7156 "pl" "clob" 0 0 7163 NULL true 10 NULL
-7157 "pu" "clob" 0 0 7163 NULL true 11 NULL
-7158 "sm" "clob" 0 0 7163 NULL true 12 NULL
-7165 "id" "clob" 0 0 7175 NULL false 0 NULL
-7166 "file_id" "bigint" 64 0 7175 NULL false
1 NULL
-7167 "pn" "clob" 0 0 7175 NULL true 2 NULL
-7168 "cl" "clob" 0 0 7175 NULL true 3 NULL
-7169 "pp" "clob" 0 0 7175 NULL true 4 NULL
-7170 "vn" "clob" 0 0 7175 NULL true 5 NULL
-7177 "qname" "clob" 0 0 7188 NULL false 0 NULL
-7178 "flag" "smallint" 16 0 7188 NULL false 1
NULL
-7179 "rname" "clob" 0 0 7188 NULL false 2 NULL
-7180 "pos" "int" 32 0 7188 NULL false 3 NULL
-7181 "mapq" "smallint" 16 0 7188 NULL false 4
NULL
-7182 "cigar" "clob" 0 0 7188 NULL false 5 NULL
-7183 "rnext" "clob" 0 0 7188 NULL false 6 NULL
-7184 "pnext" "int" 32 0 7188 NULL false 7 NULL
-7185 "tlen" "int" 32 0 7188 NULL false 8 NULL
-7186 "seq" "clob" 0 0 7188 NULL false 9 NULL
-7187 "qual" "clob" 0 0 7188 NULL false 10 NULL
-7269 "function_id" "int" 32 0 7270 NULL true 0
NULL
+6912 "file_id" "int" 32 0 6914 NULL true 0
NULL
+6913 "location" "char" 256 0 6914 NULL true 1
NULL
+6916 "dim_id" "int" 32 0 6920 NULL true 0
NULL
+6917 "file_id" "int" 32 0 6920 NULL true 1
NULL
+6918 "name" "varchar" 64 0 6920 NULL true 2
NULL
+6919 "length" "int" 32 0 6920 NULL true 3
NULL
+6922 "var_id" "int" 32 0 6928 NULL true 0
NULL
+6923 "file_id" "int" 32 0 6928 NULL true 1
NULL
+6924 "name" "varchar" 64 0 6928 NULL true 2
NULL
+6925 "vartype" "varchar" 64 0 6928 NULL true
3 NULL
+6926 "ndim" "int" 32 0 6928 NULL true 4 NULL
+6927 "coord_dim_id" "int" 32 0 6928 NULL true 5
NULL
+6930 "var_id" "int" 32 0 6934 NULL true 0
NULL
+6931 "dim_id" "int" 32 0 6934 NULL true 1
NULL
+6932 "file_id" "int" 32 0 6934 NULL true 2
NULL
+6933 "dimpos" "int" 32 0 6934 NULL true 3
NULL
+6936 "obj_name" "varchar" 256 0 6942 NULL true
0 NULL
+6937 "att_name" "varchar" 256 0 6942 NULL true
1 NULL
+6938 "att_type" "varchar" 64 0 6942 NULL true
2 NULL
+6939 "value" "clob" 0 0 6942 NULL true 3 NULL
+6940 "file_id" "int" 32 0 6942 NULL true 4
NULL
+6941 "gr_name" "varchar" 256 0 6942 NULL true
5 NULL
+6966 "schema" "clob" 0 0 6979 NULL true 0
NULL
+6967 "table" "clob" 0 0 6979 NULL true 1 NULL
+6968 "column" "clob" 0 0 6979 NULL true 2
NULL
+6969 "type" "clob" 0 0 6979 NULL true 3 NULL
+6970 "mode" "clob" 0 0 6979 NULL true 4 NULL
+6971 "location" "clob" 0 0 6979 NULL true 5
NULL
+6972 "count" "bigint" 64 0 6979 NULL true 6
NULL
+6973 "typewidth" "int" 32 0 6979 NULL true 7
NULL
+6974 "columnsize" "bigint" 64 0 6979 NULL true
8 NULL
+6975 "heapsize" "bigint" 64 0 6979 NULL true
9 NULL
+6976 "hashes" "bigint" 64 0 6979 NULL true
10 NULL
+6977 "imprints" "bigint" 64 0 6979 NULL true
11 NULL
+6978 "sorted" "boolean" 1 0 6979 NULL true
12 NULL
+6981 "schema" "clob" 0 0 6991 NULL true 0
NULL
+6982 "table" "clob" 0 0 6991 NULL true 1 NULL
+6983 "column" "clob" 0 0 6991 NULL true 2
NULL
+6984 "type" "clob" 0 0 6991 NULL true 3 NULL
+6985 "typewidth" "int" 32 0 6991 NULL true 4
NULL
+6986 "count" "bigint" 64 0 6991 NULL true 5
NULL
+6987 "distinct" "bigint" 64 0 6991 NULL true
6 NULL
+6988 "atomwidth" "int" 32 0 6991 NULL true 7
NULL
+6989 "reference" "boolean" 1 0 6991 NULL true
8 NULL
+6990 "sorted" "boolean" 1 0 6991 NULL true
9 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
