Changeset: 4b51971790f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b51971790f0
Added Files:
clients/R/Tests/copy_into_fwf.R
clients/R/Tests/copy_into_fwf.reqtests
clients/R/Tests/copy_into_fwf.stable.err
clients/R/Tests/copy_into_fwf.stable.out
sql/backends/monet5/Tests/pyapi29.sql
sql/backends/monet5/Tests/pyapi29.stable.err
sql/backends/monet5/Tests/pyapi29.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
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
clients/R/Tests/All
clients/R/Tests/dbi.R
clients/R/Tests/deps-test.R
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
clients/python2/setup.py
clients/python3/setup.py
common/stream/stream.c
common/stream/stream.h
configure.ag
debian/changelog
debian/control
debian/fix-deb.sh
gdk/gdk_bbp.c
gdk/libbat.rc
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
libversions
monetdb5/ChangeLog-Archive
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/pyapi/pyapi.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_matpack.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/Makefile.ag
sql/backends/monet5/Tests/All
sql/backends/monet5/sql.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_upgrades.c
sql/common/sql_list.c
sql/common/sql_types.c
sql/include/sql_list.h
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_prop.c
sql/server/rel_psm.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
vertoo.data
Branch: cand
Log Message:
merged with default
diffs (truncated from 22504 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -624,3 +624,6 @@ 51322027cb7e7c27f03fc7c3cab4db4fd4cd4446
51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_SP4_release
192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_1
192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release
+b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_3
+192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release
+b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,7 +9,7 @@
%define bits 32
%else
%define bits 64
-%define with_int128=1
+%define with_int128 1
%endif
# only add .oidXX suffix if oid size differs from bit size
@@ -695,7 +695,7 @@ fi
%if %{bits} == 64
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
-Group: Application/Databases
+Group: Applications/Databases
Requires: MonetDB5-server%{?_isa}
%description -n MonetDB5-server-hugeint
@@ -910,7 +910,6 @@ Group: Applications/Databases
Requires: %{name}-testing = %{version}-%{release}
Requires: %{name}-client-tests = %{version}-%{release}
Requires: python
-BuildArch: noarch
%description testing-python
MonetDB is a database management system that is developed from a
@@ -1013,6 +1012,10 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Fri Jun 10 2016 Sjoerd Mullender <[email protected]> - 11.23.3-20160610
+- Rebuilt.
+- BZ#4015: Daemon crashes on database release command
+
* Wed Jun 01 2016 Sjoerd Mullender <[email protected]> - 11.23.1-20160601
- Rebuilt.
- BZ#2407: Merovingian: allow binds to given ip/interface
@@ -1276,7 +1279,7 @@ rm -f %{buildroot}%{_bindir}/Maddlog
- gdk: Removed all versions of the SORTloop macro.
* Tue Apr 5 2016 Sjoerd Mullender <[email protected]> - 11.23.1-20160601
-- monetdb5: Removed algerbra.like with a BAT argument. Use
algebra.likesubselect
+- monetdb5: Removed algebra.like with a BAT argument. Use
algebra.likesubselect
instead.
* Tue Apr 5 2016 Sjoerd Mullender <[email protected]> - 11.23.1-20160601
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -4,4 +4,5 @@ HAVE_LIBR?deps-test
HAVE_LIBR?dbi
HAVE_LIBR?dplyr
HAVE_LIBR?dplyr-flights
+HAVE_LIBR?copy_into_fwf
HAVE_LIBR&NOT_WIN32?dbapply
diff --git a/clients/R/Tests/copy_into_fwf.R b/clients/R/Tests/copy_into_fwf.R
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/copy_into_fwf.R
@@ -0,0 +1,35 @@
+if (Sys.getenv("TSTTRGDIR") != "") {
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
+}
+library(DBI, quietly = T)
+
+args <- commandArgs(trailingOnly = TRUE)
+dbport <- 50000
+dbname <- "mTests_clients_R"
+if (length(args) > 0)
+ dbport <- args[[1]]
+if (length(args) > 1)
+ dbname <- args[[2]]
+
+con <- dbConnect(MonetDBLite::MonetDB(), port = dbport, dbname = dbname, wait
= T)
+stopifnot(dbIsValid(con))
+
+tf <- tempfile()
+
+gdata::write.fwf(mtcars, tf, colnames = FALSE)
+
+if (dbExistsTable(con, "mtcars")) dbRemoveTable(con, "mtcars")
+
+dbBegin(con)
+dbSendQuery(con, "CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE
PRECISION, disp DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION,
wt DOUBLE PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE
PRECISION, gear DOUBLE PRECISION, carb DOUBLE PRECISION)")
+
+# delimiters are ineffective for fwf import just set them to make sure they
dont break stuff
+res <- dbSendQuery(con, paste0("COPY OFFSET 1 INTO mtcars FROM '", tf, "'
USING DELIMITERS 'a','b','c' NULL AS '' FWF (4, 2, 6, 4, 5, 6, 6, 2, 2, 2, 2)"))
+
+print(dbReadTable(con, "mtcars"))
+
+stopifnot(nrow(dbReadTable(con, "mtcars")) > 1)
+
+dbRollback(con)
+
+print("SUCCESS")
diff --git a/clients/R/Tests/copy_into_fwf.reqtests
b/clients/R/Tests/copy_into_fwf.reqtests
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/copy_into_fwf.reqtests
@@ -0,0 +1,1 @@
+dbi
diff --git a/clients/R/Tests/copy_into_fwf.stable.err
b/clients/R/Tests/copy_into_fwf.stable.err
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/copy_into_fwf.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'copy_into_fwf` in directory 'clients/R` itself:
+
+
+# 16:40:22 >
+# 16:40:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30658" "--set"
"mapi_usock=/var/tmp/mtest-16034/.s.monetdb.30658" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_clients_R" "--set"
"embedded_r=yes"
+# 16:40:22 >
+
+# builtin opt gdk_dbpath = /tmp/fuckit/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 30658
+# cmdline opt mapi_usock = /var/tmp/mtest-16034/.s.monetdb.30658
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath = /tmp/fuckit/var/MonetDB/mTests_clients_R
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:40:23 >
+# 16:40:23 > "R" "--vanilla" "--slave" "--args" "30658"
+# 16:40:23 >
+
+
+# 16:40:23 >
+# 16:40:23 > "Done."
+# 16:40:23 >
+
diff --git a/clients/R/Tests/copy_into_fwf.stable.out
b/clients/R/Tests/copy_into_fwf.stable.out
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/copy_into_fwf.stable.out
@@ -0,0 +1,71 @@
+stdout of test 'copy_into_fwf` in directory 'clients/R` itself:
+
+
+# 16:40:22 >
+# 16:40:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30658" "--set"
"mapi_usock=/var/tmp/mtest-16034/.s.monetdb.30658" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_clients_R" "--set"
"embedded_r=yes"
+# 16:40:22 >
+
+# MonetDB 5 server v11.24.0
+# This is an unreleased version
+# Serving database 'mTests_clients_R', using 4 threads
+# Compiled for x86_64-apple-darwin15.5.0/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 16.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://dakar.da.cwi.nl:30658/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-16034/.s.monetdb.30658
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 16:40:23 >
+# 16:40:23 > "R" "--vanilla" "--slave" "--args" "30658"
+# 16:40:23 >
+
+[1] TRUE
+<MonetDBResult>
+ SQL CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE PRECISION, disp
DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION, wt DOUBLE
PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE PRECISION,
gear DOUBLE PRECISION, carb DOUBLE PRECISION)
+ ROWS Fetched: 0 [complete]
+ Changed: NA
+ mpg cyl disp hp drat wt qsec vs am gear carb
+1 21.0 6 160.0 110 3.90 2.620 16.46 0 1 4 4
+2 21.0 6 160.0 110 3.90 2.875 17.02 0 1 4 4
+3 22.8 4 108.0 93 3.85 2.320 18.61 1 1 4 1
+4 21.4 6 258.0 110 3.08 3.215 19.44 1 0 3 1
+5 18.7 8 360.0 175 3.15 3.440 17.02 0 0 3 2
+6 18.1 6 225.0 105 2.76 3.460 20.22 1 0 3 1
+7 14.3 8 360.0 245 3.21 3.570 15.84 0 0 3 4
+8 24.4 4 146.7 62 3.69 3.190 20.00 1 0 4 2
+9 22.8 4 140.8 95 3.92 3.150 22.90 1 0 4 2
+10 19.2 6 167.6 123 3.92 3.440 18.30 1 0 4 4
+11 17.8 6 167.6 123 3.92 3.440 18.90 1 0 4 4
+12 16.4 8 275.8 180 3.07 4.070 17.40 0 0 3 3
+13 17.3 8 275.8 180 3.07 3.730 17.60 0 0 3 3
+14 15.2 8 275.8 180 3.07 3.780 18.00 0 0 3 3
+15 10.4 8 472.0 205 2.93 5.250 17.98 0 0 3 4
+16 10.4 8 460.0 215 3.00 5.424 17.82 0 0 3 4
+17 14.7 8 440.0 230 3.23 5.345 17.42 0 0 3 4
+18 32.4 4 78.7 66 4.08 2.200 19.47 1 1 4 1
+19 30.4 4 75.7 52 4.93 1.615 18.52 1 1 4 2
+20 33.9 4 71.1 65 4.22 1.835 19.90 1 1 4 1
+21 21.5 4 120.1 97 3.70 2.465 20.01 1 0 3 1
+22 15.5 8 318.0 150 2.76 3.520 16.87 0 0 3 2
+23 15.2 8 304.0 150 3.15 3.435 17.30 0 0 3 2
+24 13.3 8 350.0 245 3.73 3.840 15.41 0 0 3 4
+25 19.2 8 400.0 175 3.08 3.845 17.05 0 0 3 2
+26 27.3 4 79.0 66 4.08 1.935 18.90 1 1 4 1
+27 26.0 4 120.3 91 4.43 2.140 16.70 0 1 5 2
+28 30.4 4 95.1 113 3.77 1.513 16.90 1 1 5 2
+29 15.8 8 351.0 264 4.22 3.170 14.50 0 1 5 4
+30 19.7 6 145.0 175 3.62 2.770 15.50 0 1 5 6
+31 15.0 8 301.0 335 3.54 3.570 14.60 0 1 5 8
+32 21.4 4 121.0 109 4.11 2.780 18.60 1 1 4 2
+[1] TRUE
+[1] "SUCCESS"
+
+# 16:40:23 >
+# 16:40:23 > "Done."
+# 16:40:23 >
+
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -37,7 +37,7 @@ MonetDBLite::dbSendUpdate(con,"CREATE TA
stopifnot(identical(dbExistsTable(con,tname),TRUE))
MonetDBLite::dbSendUpdate(con,"INSERT INTO monetdbtest VALUES
('one',1,'1111')")
MonetDBLite::dbSendUpdate(con,"INSERT INTO monetdbtest VALUES
('two',2,'22222222')")
-stopifnot(identical(dbGetQuery(con,"SELECT count(*) FROM
monetdbtest")[[1]],2L))
+stopifnot(identical(dbGetQuery(con,"SELECT count(*) FROM monetdbtest")[[1]],2))
stopifnot(identical(dbReadTable(con,tname)[[3]],list(charToRaw("1111"),charToRaw("22222222"))))
dbRemoveTable(con,tname)
stopifnot(identical(dbExistsTable(con,tname),FALSE))
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -4,5 +4,5 @@ dd <- capture.output(suppressMessages(su
repos <- 'http://cran.rstudio.com/'
if(length(np)) install.packages(np, repos=repos, quiet=T)
update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
- })(c('Rcpp', 'dplyr', 'Lahman', 'nycflights13'))
+ })(c('Rcpp', 'dplyr', 'Lahman', 'nycflights13', 'gdata'))
})))
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
@@ -3438,7 +3438,7 @@ drop function pcre_replace(string, strin
[ "sys", "concat", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
[ "sys", "contains", "a", "geometry", 0, 0, 1,
"x", "double", 53, 0, 1, "y", "double", 53,
0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
[ "sys", "copyfrom", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
-[ "sys", "copyfrom", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 0, 0, 1, "arg_4", "varchar", 0,
0, 1, "arg_5", "varchar", 0, 0, 1,
"arg_6", "varchar", 0, 0, 1, "arg_7",
"bigint", 64, 0, 1, "arg_8", "bigint", 64,
0, 1, "arg_9", "int", 32, 0, 1, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
+[ "sys", "copyfrom", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 0, 0, 1, "arg_4", "varchar", 0,
0, 1, "arg_5", "varchar", 0, 0, 1,
"arg_6", "varchar", 0, 0, 1, "arg_7",
"bigint", 64, 0, 1, "arg_8", "bigint", 64,
0, 1, "arg_9", "int", 32, 0, 1, "arg_:",
"varchar", 0, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "corr", "e1", "bigint", 64, 0, 1, "e2",
"bigint", 64, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "corr", "e1", "double", 53, 0, 1, "e2",
"double", 53, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "corr", "e1", "int", 32, 0, 1, "e2", "int",
32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
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
@@ -3481,7 +3481,7 @@ drop function pcre_replace(string, strin
% sys.s, sys.f, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16,
.arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16,
.arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16,
.arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16,
.arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16,
.arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16,
.arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16,
.arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16, .arg16 # table_name
% name, name, name1, type1, type_digits1, type_scale1, inout1,
name2, type2, type_digits2, type_scale2, inout2, name3, type3,
type_digits3, type_scale3, inout3, name4, type4, type_digits4,
type_scale4, inout4, name5, type5, type_digits5, type_scale5, inout5,
name6, type6, type_digits6, type_scale6, inout6, name7, type7,
type_digits7, type_scale7, inout7, name8, type8, type_digits8,
type_scale8, inout8, name9, type9, type_digits9, type_scale9, inout9,
name10, type10, type_digits10, type_scale10, inout10, name11, type11,
type_digits11, type_scale11, inout11, name12, type12, type_digits12,
type_scale12, inout12, name13, type13, type_digits13, type_scale13,
inout13, name14, type14, type_digits14, type_scale14, inout14,
name15, type15, type_digits15, type_scale15, inout15 # name
% varchar, varchar, varchar, varchar, int, int,
tinyint, varchar, varchar, int, int, tinyint,
varchar, varchar, int, int, tinyint, varchar,
varchar, int, int, tinyint, varchar, varchar,
int, int, tinyint, varchar, varchar, int, int,
tinyint, varchar, varchar, int, int, tinyint,
varchar, varchar, int, int, tinyint, varchar,
varchar, int, int, tinyint, varchar, varchar,
int, int, tinyint, varchar, varchar, int, int,
tinyint, varchar, varchar, int, int, tinyint,
varchar, varchar, int, int, tinyint, varchar,
varchar, int, int, tinyint, varchar, varchar,
int, int, tinyint # type
-% 8, 35, 16, 14, 4, 1, 1, 16, 14, 3,
1, 1, 27, 12, 3, 1, 1, 12, 7, 2,
1, 1, 10, 7, 2, 1, 1, 8, 7, 2,
1, 1, 9, 6, 2, 1, 1, 10, 6, 2,
1, 1, 8, 7, 2, 1, 1, 8, 6, 2,
1, 1, 5, 7, 2, 1, 1, 8, 6, 2,
1, 1, 6, 7, 1, 1, 1, 8, 6, 2,
1, 1, 5, 4, 1, 1, 1 # length
+% 8, 35, 16, 14, 4, 1, 1, 16, 14, 3,
1, 1, 27, 12, 3, 1, 1, 12, 7, 2,
1, 1, 10, 7, 2, 1, 1, 8, 7, 2,
1, 1, 9, 6, 2, 1, 1, 10, 6, 2,
1, 1, 8, 7, 2, 1, 1, 8, 7, 2,
1, 1, 5, 7, 2, 1, 1, 8, 6, 2,
1, 1, 6, 7, 1, 1, 1, 8, 6, 2,
1, 1, 5, 4, 1, 1, 1 # length
[ "bam", "bam_drop_file", "dbschema", "smallint", 16,
0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
[ "bam", "bam_export", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "bam", "bam_flag", "flag", "smallint", 16, 0, 1,
"name", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -3635,7 +3635,7 @@ drop function pcre_replace(string, strin
[ "sys", "concat", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
[ "sys", "contains", "a", "geometry", 0, 0, 1,
"x", "double", 53, 0, 1, "y", "double", 53,
0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
[ "sys", "copyfrom", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
-[ "sys", "copyfrom", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 0, 0, 1, "arg_4", "varchar", 0,
0, 1, "arg_5", "varchar", 0, 0, 1,
"arg_6", "varchar", 0, 0, 1, "arg_7",
"bigint", 64, 0, 1, "arg_8", "bigint", 64,
0, 1, "arg_9", "int", 32, 0, 1, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
+[ "sys", "copyfrom", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 0, 0, 1, "arg_4", "varchar", 0,
0, 1, "arg_5", "varchar", 0, 0, 1,
"arg_6", "varchar", 0, 0, 1, "arg_7",
"bigint", 64, 0, 1, "arg_8", "bigint", 64,
0, 1, "arg_9", "int", 32, 0, 1, "arg_:",
"varchar", 0, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "corr", "e1", "bigint", 64, 0, 1, "e2",
"bigint", 64, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "corr", "e1", "double", 53, 0, 1, "e2",
"double", 53, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "corr", "e1", "hugeint", 128, 0, 1, "e2",
"hugeint", 128, 0, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2636,6 +2636,7 @@ stream *socket_rstream(SOCKET socket, co
stream *socket_wastream(SOCKET socket, const char *name);
stream *socket_wstream(SOCKET socket, const char *name);
stream *stream_blackhole_create(void);
+stream *stream_fwf_create(stream *s, size_t num_fields, size_t *widths, char
filler);
stream *udp_rastream(const char *hostname, int port, const char *name);
stream *udp_wastream(const char *hostname, int port, const char *name);
stream *wbstream(stream *s, size_t buflen);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4671,3 +4671,155 @@ stream * stream_blackhole_create (void)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
