Changeset: c47904b38e57 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c47904b38e57
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
sql/test/mergetables/Tests/mergedropcrash.sql
sql/test/mergetables/Tests/mergedropcrash.stable.err
sql/test/mergetables/Tests/mergedropcrash.stable.out
Modified Files:
NT/monetdb_config.h.in
NT/rules.msc
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/SQL-dump.stable.out.oid32
clients/Tests/SQL-dump.stable.out.oid32.int128
configure.ag
gdk/gdk_join.c
sql/backends/monet5/vaults/Makefile.ag
sql/jdbc/tests/Tests/All
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/server/rel_schema.c
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
testing/Mtest.py.in
Branch: default
Log Message:
Merging heads
diffs (truncated from 7372 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/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?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
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
@@ -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
-6455 "table" "clob" 0 0 6464 NULL true 1 NULL
-6456 "column" "clob" 0 0 6464 NULL true 2
NULL
-6457 "type" "clob" 0 0 6464 NULL true 3 NULL
-6458 "typewidth" "int" 32 0 6464 NULL true 4
NULL
-6459 "count" "bigint" 64 0 6464 NULL true 5
NULL
-6460 "distinct" "bigint" 64 0 6464 NULL true
6 NULL
-6461 "atomwidth" "int" 32 0 6464 NULL true 7
NULL
-6462 "reference" "boolean" 1 0 6464 NULL true
8 NULL
-6463 "sorted" "boolean" 1 0 6464 NULL true
9 NULL
-6502 "schema" "clob" 0 0 6512 NULL true 0
NULL
-6503 "table" "clob" 0 0 6512 NULL true 1 NULL
-6504 "column" "clob" 0 0 6512 NULL true 2
NULL
-6505 "type" "clob" 0 0 6512 NULL true 3 NULL
-6506 "count" "bigint" 64 0 6512 NULL true 4
NULL
-6507 "columnsize" "bigint" 64 0 6512 NULL true
5 NULL
-6508 "heapsize" "bigint" 64 0 6512 NULL true
6 NULL
-6509 "hashes" "bigint" 64 0 6512 NULL true
7 NULL
-6510 "imprints" "bigint" 64 0 6512 NULL true
8 NULL
-6511 "sorted" "boolean" 1 0 6512 NULL true
9 NULL
-6514 "schema" "clob" 0 0 6522 NULL true 0
NULL
-6515 "table" "clob" 0 0 6522 NULL true 1 NULL
-6516 "count" "bigint" 64 0 6522 NULL true 2
NULL
-6517 "columnsize" "bigint" 64 0 6522 NULL true
3 NULL
-6518 "heapsize" "bigint" 64 0 6522 NULL true
4 NULL
-6519 "hashes" "bigint" 64 0 6522 NULL true
5 NULL
-6520 "imprints" "bigint" 64 0 6522 NULL true
6 NULL
-6521 "auxiliary" "bigint" 64 0 6522 NULL true
7 NULL
-6524 "column_id" "int" 32 0 6535 NULL true 0
NULL
-6525 "type" "clob" 0 0 6535 NULL true 1 NULL
-6526 "width" "int" 32 0 6535 NULL true 2 NULL
-6527 "stamp" "timestamp" 7 0 6535 NULL true 3
NULL
-6528 "sample" "bigint" 64 0 6535 NULL true
4 NULL
-6529 "count" "bigint" 64 0 6535 NULL true 5
NULL
-6530 "unique" "bigint" 64 0 6535 NULL true
6 NULL
-6531 "nils" "bigint" 64 0 6535 NULL true 7
NULL
-6532 "minval" "clob" 0 0 6535 NULL true 8
NULL
-6533 "maxval" "clob" 0 0 6535 NULL true 9
NULL
-6534 "sorted" "boolean" 1 0 6535 NULL true
10 NULL
-6630 "file_id" "bigint" 64 0 6638 NULL false
0 NULL
-6631 "file_location" "clob" 0 0 6638 NULL false 1
NULL
-6632 "dbschema" "smallint" 16 0 6638 NULL false
2 NULL
-6633 "format_version" "varchar" 7 0 6638 NULL
true 3 NULL
-6634 "sorting_order" "varchar" 10 0 6638 NULL true
4 NULL
-6635 "comments" "clob" 0 0 6638 NULL true 5
NULL
-6640 "sn" "clob" 0 0 6651 NULL false 0 NULL
-6641 "file_id" "bigint" 64 0 6651 NULL false
1 NULL
-6642 "ln" "int" 32 0 6651 NULL true 2 NULL
-6643 "as" "int" 32 0 6651 NULL true 3 NULL
-6644 "m5" "clob" 0 0 6651 NULL true 4 NULL
-6645 "sp" "clob" 0 0 6651 NULL true 5 NULL
-6646 "ur" "clob" 0 0 6651 NULL true 6 NULL
-6653 "id" "clob" 0 0 6670 NULL false 0 NULL
-6654 "file_id" "bigint" 64 0 6670 NULL false
1 NULL
-6655 "cn" "clob" 0 0 6670 NULL true 2 NULL
-6656 "ds" "clob" 0 0 6670 NULL true 3 NULL
-6657 "dt" "timestamp" 7 0 6670 NULL true 4
NULL
-6658 "fo" "clob" 0 0 6670 NULL true 5 NULL
-6659 "ks" "clob" 0 0 6670 NULL true 6 NULL
-6660 "lb" "clob" 0 0 6670 NULL true 7 NULL
-6661 "pg" "clob" 0 0 6670 NULL true 8 NULL
-6662 "pi" "int" 32 0 6670 NULL true 9 NULL
-6663 "pl" "clob" 0 0 6670 NULL true 10 NULL
-6664 "pu" "clob" 0 0 6670 NULL true 11 NULL
-6665 "sm" "clob" 0 0 6670 NULL true 12 NULL
-6672 "id" "clob" 0 0 6682 NULL false 0 NULL
-6673 "file_id" "bigint" 64 0 6682 NULL false
1 NULL
-6674 "pn" "clob" 0 0 6682 NULL true 2 NULL
-6675 "cl" "clob" 0 0 6682 NULL true 3 NULL
-6676 "pp" "clob" 0 0 6682 NULL true 4 NULL
-6677 "vn" "clob" 0 0 6682 NULL true 5 NULL
-6684 "qname" "clob" 0 0 6695 NULL false 0 NULL
-6685 "flag" "smallint" 16 0 6695 NULL false 1
NULL
-6686 "rname" "clob" 0 0 6695 NULL false 2 NULL
-6687 "pos" "int" 32 0 6695 NULL false 3 NULL
-6688 "mapq" "smallint" 16 0 6695 NULL false 4
NULL
-6689 "cigar" "clob" 0 0 6695 NULL false 5 NULL
-6690 "rnext" "clob" 0 0 6695 NULL false 6 NULL
-6691 "pnext" "int" 32 0 6695 NULL false 7 NULL
-6692 "tlen" "int" 32 0 6695 NULL false 8 NULL
-6693 "seq" "clob" 0 0 6695 NULL false 9 NULL
-6694 "qual" "clob" 0 0 6695 NULL false 10 NULL
-6765 "function_id" "int" 32 0 6766 NULL true 0
NULL
+6424 "file_id" "int" 32 0 6426 NULL true 0
NULL
+6425 "location" "char" 256 0 6426 NULL true 1
NULL
+6428 "dim_id" "int" 32 0 6432 NULL true 0
NULL
+6429 "file_id" "int" 32 0 6432 NULL true 1
NULL
+6430 "name" "varchar" 64 0 6432 NULL true 2
NULL
+6431 "length" "int" 32 0 6432 NULL true 3
NULL
+6434 "var_id" "int" 32 0 6440 NULL true 0
NULL
+6435 "file_id" "int" 32 0 6440 NULL true 1
NULL
+6436 "name" "varchar" 64 0 6440 NULL true 2
NULL
+6437 "vartype" "varchar" 64 0 6440 NULL true
3 NULL
+6438 "ndim" "int" 32 0 6440 NULL true 4 NULL
+6439 "coord_dim_id" "int" 32 0 6440 NULL true 5
NULL
+6442 "var_id" "int" 32 0 6446 NULL true 0
NULL
+6443 "dim_id" "int" 32 0 6446 NULL true 1
NULL
+6444 "file_id" "int" 32 0 6446 NULL true 2
NULL
+6445 "dimpos" "int" 32 0 6446 NULL true 3
NULL
+6448 "obj_name" "varchar" 256 0 6454 NULL true
0 NULL
+6449 "att_name" "varchar" 256 0 6454 NULL true
1 NULL
+6450 "att_type" "varchar" 64 0 6454 NULL true
2 NULL
+6451 "value" "clob" 0 0 6454 NULL true 3 NULL
+6452 "file_id" "int" 32 0 6454 NULL true 4
NULL
+6453 "gr_name" "varchar" 256 0 6454 NULL true
5 NULL
+6478 "schema" "clob" 0 0 6491 NULL true 0
NULL
+6479 "table" "clob" 0 0 6491 NULL true 1 NULL
+6480 "column" "clob" 0 0 6491 NULL true 2
NULL
+6481 "type" "clob" 0 0 6491 NULL true 3 NULL
+6482 "mode" "clob" 0 0 6491 NULL true 4 NULL
+6483 "location" "clob" 0 0 6491 NULL true 5
NULL
+6484 "count" "bigint" 64 0 6491 NULL true 6
NULL
+6485 "typewidth" "int" 32 0 6491 NULL true 7
NULL
+6486 "columnsize" "bigint" 64 0 6491 NULL true
8 NULL
+6487 "heapsize" "bigint" 64 0 6491 NULL true
9 NULL
+6488 "hashes" "bigint" 64 0 6491 NULL true
10 NULL
+6489 "imprints" "bigint" 64 0 6491 NULL true
11 NULL
+6490 "sorted" "boolean" 1 0 6491 NULL true
12 NULL
+6493 "schema" "clob" 0 0 6503 NULL true 0
NULL
+6494 "table" "clob" 0 0 6503 NULL true 1 NULL
+6495 "column" "clob" 0 0 6503 NULL true 2
NULL
+6496 "type" "clob" 0 0 6503 NULL true 3 NULL
+6497 "typewidth" "int" 32 0 6503 NULL true 4
NULL
+6498 "count" "bigint" 64 0 6503 NULL true 5
NULL
+6499 "distinct" "bigint" 64 0 6503 NULL true
6 NULL
+6500 "atomwidth" "int" 32 0 6503 NULL true 7
NULL
+6501 "reference" "boolean" 1 0 6503 NULL true
8 NULL
+6502 "sorted" "boolean" 1 0 6503 NULL true
9 NULL
+6541 "schema" "clob" 0 0 6551 NULL true 0
NULL
+6542 "table" "clob" 0 0 6551 NULL true 1 NULL
+6543 "column" "clob" 0 0 6551 NULL true 2
NULL
+6544 "type" "clob" 0 0 6551 NULL true 3 NULL
+6545 "count" "bigint" 64 0 6551 NULL true 4
NULL
+6546 "columnsize" "bigint" 64 0 6551 NULL true
5 NULL
+6547 "heapsize" "bigint" 64 0 6551 NULL true
6 NULL
+6548 "hashes" "bigint" 64 0 6551 NULL true
7 NULL
+6549 "imprints" "bigint" 64 0 6551 NULL true
8 NULL
+6550 "sorted" "boolean" 1 0 6551 NULL true
9 NULL
+6553 "schema" "clob" 0 0 6561 NULL true 0
NULL
+6554 "table" "clob" 0 0 6561 NULL true 1 NULL
+6555 "count" "bigint" 64 0 6561 NULL true 2
NULL
+6556 "columnsize" "bigint" 64 0 6561 NULL true
3 NULL
+6557 "heapsize" "bigint" 64 0 6561 NULL true
4 NULL
+6558 "hashes" "bigint" 64 0 6561 NULL true
5 NULL
+6559 "imprints" "bigint" 64 0 6561 NULL true
6 NULL
+6560 "auxiliary" "bigint" 64 0 6561 NULL true
7 NULL
+6563 "column_id" "int" 32 0 6574 NULL true 0
NULL
+6564 "type" "clob" 0 0 6574 NULL true 1 NULL
+6565 "width" "int" 32 0 6574 NULL true 2 NULL
+6566 "stamp" "timestamp" 7 0 6574 NULL true 3
NULL
+6567 "sample" "bigint" 64 0 6574 NULL true
4 NULL
+6568 "count" "bigint" 64 0 6574 NULL true 5
NULL
+6569 "unique" "bigint" 64 0 6574 NULL true
6 NULL
+6570 "nils" "bigint" 64 0 6574 NULL true 7
NULL
+6571 "minval" "clob" 0 0 6574 NULL true 8
NULL
+6572 "maxval" "clob" 0 0 6574 NULL true 9
NULL
+6573 "sorted" "boolean" 1 0 6574 NULL true
10 NULL
+6669 "file_id" "bigint" 64 0 6677 NULL false
0 NULL
+6670 "file_location" "clob" 0 0 6677 NULL false 1
NULL
+6671 "dbschema" "smallint" 16 0 6677 NULL false
2 NULL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
