Changeset: 27bbf073fad8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27bbf073fad8
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
clients/mapiclient/tachograph.c
configure.ag
gdk/gdk_join.c
gdk/gdk_logger.c
sql/backends/monet5/vaults/Makefile.ag
sql/jdbc/tests/Tests/All
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
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/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: resultset
Log Message:
Merge with default branch.
diffs (truncated from 7889 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
@@ -192,6 +197,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
@@ -1333,7 +1340,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 333 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 355 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
@@ -1571,102 +1578,124 @@ 5800 "rowid" "bigint" 64 0 5804
NULL tru
5801 "fldid" "int" 32 0 5804 NULL true 1 NULL
5802 "message" "clob" 0 0 5804 NULL true 2
NULL
5803 "input" "clob" 0 0 5804 NULL true 3 NULL
-6446 "schema" "clob" 0 0 6459 NULL true 0
NULL
-6447 "table" "clob" 0 0 6459 NULL true 1 NULL
-6448 "column" "clob" 0 0 6459 NULL true 2
NULL
-6449 "type" "clob" 0 0 6459 NULL true 3 NULL
-6450 "mode" "clob" 0 0 6459 NULL true 4 NULL
-6451 "location" "clob" 0 0 6459 NULL true 5
NULL
-6452 "count" "bigint" 64 0 6459 NULL true 6
NULL
-6453 "typewidth" "int" 32 0 6459 NULL true 7
NULL
-6454 "columnsize" "bigint" 64 0 6459 NULL true
8 NULL
-6455 "heapsize" "bigint" 64 0 6459 NULL true
9 NULL
-6456 "hashes" "bigint" 64 0 6459 NULL true
10 NULL
-6457 "imprints" "bigint" 64 0 6459 NULL true
11 NULL
-6458 "sorted" "boolean" 1 0 6459 NULL true
12 NULL
-6461 "schema" "clob" 0 0 6471 NULL true 0
NULL
-6462 "table" "clob" 0 0 6471 NULL true 1 NULL
-6463 "column" "clob" 0 0 6471 NULL true 2
NULL
-6464 "type" "clob" 0 0 6471 NULL true 3 NULL
-6465 "typewidth" "int" 32 0 6471 NULL true 4
NULL
-6466 "count" "bigint" 64 0 6471 NULL true 5
NULL
-6467 "distinct" "bigint" 64 0 6471 NULL true
6 NULL
-6468 "atomwidth" "int" 32 0 6471 NULL true 7
NULL
-6469 "reference" "boolean" 1 0 6471 NULL true
8 NULL
-6470 "sorted" "boolean" 1 0 6471 NULL true
9 NULL
-6509 "schema" "clob" 0 0 6519 NULL true 0
NULL
-6510 "table" "clob" 0 0 6519 NULL true 1 NULL
-6511 "column" "clob" 0 0 6519 NULL true 2
NULL
-6512 "type" "clob" 0 0 6519 NULL true 3 NULL
-6513 "count" "bigint" 64 0 6519 NULL true 4
NULL
-6514 "columnsize" "bigint" 64 0 6519 NULL true
5 NULL
-6515 "heapsize" "bigint" 64 0 6519 NULL true
6 NULL
-6516 "hashes" "bigint" 64 0 6519 NULL true
7 NULL
-6517 "imprints" "bigint" 64 0 6519 NULL true
8 NULL
-6518 "sorted" "boolean" 1 0 6519 NULL true
9 NULL
-6521 "schema" "clob" 0 0 6529 NULL true 0
NULL
-6522 "table" "clob" 0 0 6529 NULL true 1 NULL
-6523 "count" "bigint" 64 0 6529 NULL true 2
NULL
-6524 "columnsize" "bigint" 64 0 6529 NULL true
3 NULL
-6525 "heapsize" "bigint" 64 0 6529 NULL true
4 NULL
-6526 "hashes" "bigint" 64 0 6529 NULL true
5 NULL
-6527 "imprints" "bigint" 64 0 6529 NULL true
6 NULL
-6528 "auxiliary" "bigint" 64 0 6529 NULL true
7 NULL
-6531 "column_id" "int" 32 0 6542 NULL true 0
NULL
-6532 "type" "clob" 0 0 6542 NULL true 1 NULL
-6533 "width" "int" 32 0 6542 NULL true 2 NULL
-6534 "stamp" "timestamp" 7 0 6542 NULL true 3
NULL
-6535 "sample" "bigint" 64 0 6542 NULL true
4 NULL
-6536 "count" "bigint" 64 0 6542 NULL true 5
NULL
-6537 "unique" "bigint" 64 0 6542 NULL true
6 NULL
-6538 "nils" "bigint" 64 0 6542 NULL true 7
NULL
-6539 "minval" "clob" 0 0 6542 NULL true 8
NULL
-6540 "maxval" "clob" 0 0 6542 NULL true 9
NULL
-6541 "sorted" "boolean" 1 0 6542 NULL true
10 NULL
-6637 "file_id" "bigint" 64 0 6645 NULL false
0 NULL
-6638 "file_location" "clob" 0 0 6645 NULL false 1
NULL
-6639 "dbschema" "smallint" 16 0 6645 NULL false
2 NULL
-6640 "format_version" "varchar" 7 0 6645 NULL
true 3 NULL
-6641 "sorting_order" "varchar" 10 0 6645 NULL true
4 NULL
-6642 "comments" "clob" 0 0 6645 NULL true 5
NULL
-6647 "sn" "clob" 0 0 6658 NULL false 0 NULL
-6648 "file_id" "bigint" 64 0 6658 NULL false
1 NULL
-6649 "ln" "int" 32 0 6658 NULL true 2 NULL
-6650 "as" "int" 32 0 6658 NULL true 3 NULL
-6651 "m5" "clob" 0 0 6658 NULL true 4 NULL
-6652 "sp" "clob" 0 0 6658 NULL true 5 NULL
-6653 "ur" "clob" 0 0 6658 NULL true 6 NULL
-6660 "id" "clob" 0 0 6677 NULL false 0 NULL
-6661 "file_id" "bigint" 64 0 6677 NULL false
1 NULL
-6662 "cn" "clob" 0 0 6677 NULL true 2 NULL
-6663 "ds" "clob" 0 0 6677 NULL true 3 NULL
-6664 "dt" "timestamp" 7 0 6677 NULL true 4
NULL
-6665 "fo" "clob" 0 0 6677 NULL true 5 NULL
-6666 "ks" "clob" 0 0 6677 NULL true 6 NULL
-6667 "lb" "clob" 0 0 6677 NULL true 7 NULL
-6668 "pg" "clob" 0 0 6677 NULL true 8 NULL
-6669 "pi" "int" 32 0 6677 NULL true 9 NULL
-6670 "pl" "clob" 0 0 6677 NULL true 10 NULL
-6671 "pu" "clob" 0 0 6677 NULL true 11 NULL
-6672 "sm" "clob" 0 0 6677 NULL true 12 NULL
-6679 "id" "clob" 0 0 6689 NULL false 0 NULL
-6680 "file_id" "bigint" 64 0 6689 NULL false
1 NULL
-6681 "pn" "clob" 0 0 6689 NULL true 2 NULL
-6682 "cl" "clob" 0 0 6689 NULL true 3 NULL
-6683 "pp" "clob" 0 0 6689 NULL true 4 NULL
-6684 "vn" "clob" 0 0 6689 NULL true 5 NULL
-6691 "qname" "clob" 0 0 6702 NULL false 0 NULL
-6692 "flag" "smallint" 16 0 6702 NULL false 1
NULL
-6693 "rname" "clob" 0 0 6702 NULL false 2 NULL
-6694 "pos" "int" 32 0 6702 NULL false 3 NULL
-6695 "mapq" "smallint" 16 0 6702 NULL false 4
NULL
-6696 "cigar" "clob" 0 0 6702 NULL false 5 NULL
-6697 "rnext" "clob" 0 0 6702 NULL false 6 NULL
-6698 "pnext" "int" 32 0 6702 NULL false 7 NULL
-6699 "tlen" "int" 32 0 6702 NULL false 8 NULL
-6700 "seq" "clob" 0 0 6702 NULL false 9 NULL
-6701 "qual" "clob" 0 0 6702 NULL false 10 NULL
-6772 "function_id" "int" 32 0 6773 NULL true 0
NULL
+6431 "file_id" "int" 32 0 6433 NULL true 0
NULL
+6432 "location" "char" 256 0 6433 NULL true 1
NULL
+6435 "dim_id" "int" 32 0 6439 NULL true 0
NULL
+6436 "file_id" "int" 32 0 6439 NULL true 1
NULL
+6437 "name" "varchar" 64 0 6439 NULL true 2
NULL
+6438 "length" "int" 32 0 6439 NULL true 3
NULL
+6441 "var_id" "int" 32 0 6447 NULL true 0
NULL
+6442 "file_id" "int" 32 0 6447 NULL true 1
NULL
+6443 "name" "varchar" 64 0 6447 NULL true 2
NULL
+6444 "vartype" "varchar" 64 0 6447 NULL true
3 NULL
+6445 "ndim" "int" 32 0 6447 NULL true 4 NULL
+6446 "coord_dim_id" "int" 32 0 6447 NULL true 5
NULL
+6449 "var_id" "int" 32 0 6453 NULL true 0
NULL
+6450 "dim_id" "int" 32 0 6453 NULL true 1
NULL
+6451 "file_id" "int" 32 0 6453 NULL true 2
NULL
+6452 "dimpos" "int" 32 0 6453 NULL true 3
NULL
+6455 "obj_name" "varchar" 256 0 6461 NULL true
0 NULL
+6456 "att_name" "varchar" 256 0 6461 NULL true
1 NULL
+6457 "att_type" "varchar" 64 0 6461 NULL true
2 NULL
+6458 "value" "clob" 0 0 6461 NULL true 3 NULL
+6459 "file_id" "int" 32 0 6461 NULL true 4
NULL
+6460 "gr_name" "varchar" 256 0 6461 NULL true
5 NULL
+6485 "schema" "clob" 0 0 6498 NULL true 0
NULL
+6486 "table" "clob" 0 0 6498 NULL true 1 NULL
+6487 "column" "clob" 0 0 6498 NULL true 2
NULL
+6488 "type" "clob" 0 0 6498 NULL true 3 NULL
+6489 "mode" "clob" 0 0 6498 NULL true 4 NULL
+6490 "location" "clob" 0 0 6498 NULL true 5
NULL
+6491 "count" "bigint" 64 0 6498 NULL true 6
NULL
+6492 "typewidth" "int" 32 0 6498 NULL true 7
NULL
+6493 "columnsize" "bigint" 64 0 6498 NULL true
8 NULL
+6494 "heapsize" "bigint" 64 0 6498 NULL true
9 NULL
+6495 "hashes" "bigint" 64 0 6498 NULL true
10 NULL
+6496 "imprints" "bigint" 64 0 6498 NULL true
11 NULL
+6497 "sorted" "boolean" 1 0 6498 NULL true
12 NULL
+6500 "schema" "clob" 0 0 6510 NULL true 0
NULL
+6501 "table" "clob" 0 0 6510 NULL true 1 NULL
+6502 "column" "clob" 0 0 6510 NULL true 2
NULL
+6503 "type" "clob" 0 0 6510 NULL true 3 NULL
+6504 "typewidth" "int" 32 0 6510 NULL true 4
NULL
+6505 "count" "bigint" 64 0 6510 NULL true 5
NULL
+6506 "distinct" "bigint" 64 0 6510 NULL true
6 NULL
+6507 "atomwidth" "int" 32 0 6510 NULL true 7
NULL
+6508 "reference" "boolean" 1 0 6510 NULL true
8 NULL
+6509 "sorted" "boolean" 1 0 6510 NULL true
9 NULL
+6548 "schema" "clob" 0 0 6558 NULL true 0
NULL
+6549 "table" "clob" 0 0 6558 NULL true 1 NULL
+6550 "column" "clob" 0 0 6558 NULL true 2
NULL
+6551 "type" "clob" 0 0 6558 NULL true 3 NULL
+6552 "count" "bigint" 64 0 6558 NULL true 4
NULL
+6553 "columnsize" "bigint" 64 0 6558 NULL true
5 NULL
+6554 "heapsize" "bigint" 64 0 6558 NULL true
6 NULL
+6555 "hashes" "bigint" 64 0 6558 NULL true
7 NULL
+6556 "imprints" "bigint" 64 0 6558 NULL true
8 NULL
+6557 "sorted" "boolean" 1 0 6558 NULL true
9 NULL
+6560 "schema" "clob" 0 0 6568 NULL true 0
NULL
+6561 "table" "clob" 0 0 6568 NULL true 1 NULL
+6562 "count" "bigint" 64 0 6568 NULL true 2
NULL
+6563 "columnsize" "bigint" 64 0 6568 NULL true
3 NULL
+6564 "heapsize" "bigint" 64 0 6568 NULL true
4 NULL
+6565 "hashes" "bigint" 64 0 6568 NULL true
5 NULL
+6566 "imprints" "bigint" 64 0 6568 NULL true
6 NULL
+6567 "auxiliary" "bigint" 64 0 6568 NULL true
7 NULL
+6570 "column_id" "int" 32 0 6581 NULL true 0
NULL
+6571 "type" "clob" 0 0 6581 NULL true 1 NULL
+6572 "width" "int" 32 0 6581 NULL true 2 NULL
+6573 "stamp" "timestamp" 7 0 6581 NULL true 3
NULL
+6574 "sample" "bigint" 64 0 6581 NULL true
4 NULL
+6575 "count" "bigint" 64 0 6581 NULL true 5
NULL
+6576 "unique" "bigint" 64 0 6581 NULL true
6 NULL
+6577 "nils" "bigint" 64 0 6581 NULL true 7
NULL
+6578 "minval" "clob" 0 0 6581 NULL true 8
NULL
+6579 "maxval" "clob" 0 0 6581 NULL true 9
NULL
+6580 "sorted" "boolean" 1 0 6581 NULL true
10 NULL
+6676 "file_id" "bigint" 64 0 6684 NULL false
0 NULL
+6677 "file_location" "clob" 0 0 6684 NULL false 1
NULL
+6678 "dbschema" "smallint" 16 0 6684 NULL false
2 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
