Changeset: 8d7abdf13c7f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d7abdf13c7f
Added Files:
clients/ruby/Tests/gemtest.rb
clients/ruby/Tests/gemtest.stable.err
clients/ruby/Tests/gemtest.stable.out
sql/backends/monet5/Tests/rapi19.sql
sql/backends/monet5/Tests/rapi19.stable.err
sql/backends/monet5/Tests/rapi19.stable.out
sql/backends/monet5/vaults/75_lidar.mal
sql/backends/monet5/vaults/75_lidar.sql
sql/backends/monet5/vaults/lidar.c
sql/backends/monet5/vaults/lidar.h
sql/backends/monet5/vaults/lidar.mal
sql/test/BugTracker-2015/Tests/and_or_expression.Bug-3851.sql
sql/test/BugTracker-2015/Tests/and_or_expression.Bug-3851.stable.err
sql/test/BugTracker-2015/Tests/and_or_expression.Bug-3851.stable.out
sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.sql
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.sql
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.err
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.out
sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.sql
sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.err
sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.out
sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.sql
sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.err
sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out
sql/test/BugTracker-2015/Tests/limit_dbl.Bug-3847.sql
sql/test/BugTracker-2015/Tests/limit_dbl.Bug-3847.stable.err
sql/test/BugTracker-2015/Tests/limit_dbl.Bug-3847.stable.out
sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.stable.err
sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.stable.out
sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.sql
Removed Files:
monetdb5/mal/mal_properties.c
monetdb5/mal/mal_properties.h
Modified Files:
MonetDB.spec
clients/R/MonetDB.R/R/dbi.R
clients/R/Tests/All
clients/R/Tests/dbi.stable.out
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/Tests/malcheck.stable.err
clients/mapiclient/dump.c
clients/mapilib/mapi.c
clients/ruby/Tests/All
clients/ruby/Tests/rubytest.rb
clients/ruby/Tests/rubytest.stable.err
clients/ruby/Tests/rubytest.stable.out
clients/ruby/doc/readme.txt
configure.ag
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_firstn.c
geom/monetdb5/geom.mal
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
monetdb5/ChangeLog
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/rapi/rapi.c
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst3050.mal
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_errors.h
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_listing.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/atoms/streams.mal
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/alarm.mal
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/mmath.mal
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/manifold.c
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/dataflow3.mal
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/inline00.mal
monetdb5/optimizer/Tests/inline00.stable.out
monetdb5/optimizer/Tests/inline01.mal
monetdb5/optimizer/Tests/inline01.stable.out
monetdb5/optimizer/Tests/inline02.mal
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.mal
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.mal
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline05.mal
monetdb5/optimizer/Tests/inline05.stable.out
monetdb5/optimizer/Tests/inline06.mal
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.mal
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline08.mal
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/inline09.mal
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.mal
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inline11.mal
monetdb5/optimizer/Tests/inlineCst.mal
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineFunction.mal
monetdb5/optimizer/Tests/inlineFunction.stable.out
monetdb5/optimizer/Tests/inlineFunction1.mal
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/inlineFunction2.mal
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/inlineFunction3.mal
monetdb5/optimizer/Tests/inlineFunction3.stable.out
monetdb5/optimizer/Tests/inlineFunction4.mal
monetdb5/optimizer/Tests/inlineFunction4.stable.out
monetdb5/optimizer/Tests/inlineIfthen.mal
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_costModel.h
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/scheduler/Tests/sched00.mal
monetdb5/scheduler/Tests/sched00.stable.out
sql/backends/monet5/Tests/All
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_inspect.mal
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/sql_user.h
sql/backends/monet5/vaults/Makefile.ag
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/copy/Tests/key_copy.stable.err
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/pg_regress/Tests/oid.stable.err.oid32
sql/test/pg_regress/Tests/strings.stable.err.int128
sql/test/remote/Tests/partition_elim.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mfilter.py
testing/Mtest.py.in
Branch: leftmart
Log Message:
Merge with default branch.
diffs (truncated from 19840 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -403,37 +403,12 @@ program.
%files -n rubygem-monetdb-sql
%defattr(-,root,root)
-%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.1
-%{gem_dir}/doc/ruby-monetdb-sql-0.1/*
-%{gem_dir}/cache/ruby-monetdb-sql-0.1.gem
-# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.1
-%{gem_dir}/gems/ruby-monetdb-sql-0.1
-%{gem_dir}/specifications/ruby-monetdb-sql-0.1.gemspec
-
-%package -n rubygem-activerecord-monetdb-adapter
-Summary: MonetDB ruby interface
-Group: Applications/Databases
-Requires: ruby(release)
-Requires: rubygem-activerecord
-Requires: rubygem-monetdb-sql
-BuildArch: noarch
-
-%description -n rubygem-activerecord-monetdb-adapter
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators. It also has an SQL frontend.
-
-This package contains the activerecord adapter for MonetDB.
-
-%files -n rubygem-activerecord-monetdb-adapter
-%defattr(-,root,root)
-%docdir %{gem_dir}/doc/activerecord-monetdb-adapter-0.1
-%{gem_dir}/doc/activerecord-monetdb-adapter-0.1/*
-%{gem_dir}/cache/activerecord-monetdb-adapter-0.1.gem
-# %dir %{gem_dir}/gems/activerecord-monetdb-adapter-0.1
-%{gem_dir}/gems/activerecord-monetdb-adapter-0.1
-%{gem_dir}/specifications/activerecord-monetdb-adapter-0.1.gemspec
+%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.2
+%{gem_dir}/doc/ruby-monetdb-sql-0.2/*
+%{gem_dir}/cache/ruby-monetdb-sql-0.2.gem
+# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.2
+%{gem_dir}/gems/ruby-monetdb-sql-0.2
+%{gem_dir}/specifications/ruby-monetdb-sql-0.2.gemspec
%endif
%package client-tests
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -155,7 +155,7 @@ setMethod("dbDisconnect", "MonetDBConnec
setMethod("dbListTables", "MonetDBConnection", def=function(conn, ...,
sys_tables=F, schema_names=F) {
q <- "select schemas.name as sn, tables.name as tn from sys.tables join
sys.schemas on tables.schema_id=schemas.id"
- if (!sys_tables) q <- paste0(q, " where tables.system=false")
+ if (!sys_tables) q <- paste0(q, " where tables.system=false order by sn, tn")
df <- dbGetQuery(conn, q)
df$tn <- quoteIfNeeded(conn, df$tn, warn=F)
res <- df$tn
@@ -477,9 +477,13 @@ setMethod("dbFetch", signature(res="Mone
if (!dbIsValid(res)) {
stop("Cannot fetch results from closed response.")
}
-
+
# okay, so we arrive here with the tuples from the first result in
res@env$data as a list
info <- res@env$info
+ # apparently, one should be able to fetch results sets from ddl ops
+ if (info$type == Q_UPDATE) {
+ return(data.frame())
+ }
if (res@env$delivered < 0) {
res@env$delivered <- 0
}
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -5,6 +5,5 @@ HAVE_LIBR?dbi
HAVE_LIBR?survey
HAVE_LIBR?dplyr
HAVE_LIBR?dplyr-flights
-HAVE_LIBR?dbapply
+HAVE_LIBR&NOT_WIN32?dbapply
HAVE_LIBR?testrandom
-
diff --git a/clients/R/Tests/dbi.stable.out b/clients/R/Tests/dbi.stable.out
--- a/clients/R/Tests/dbi.stable.out
+++ b/clients/R/Tests/dbi.stable.out
@@ -54,7 +54,7 @@ Ready.
[1] TRUE
[1] 150
[1] 150
-[1] "monetdbtest" "\"Need to quote this table name\""
+[1] "\"Need to quote this table name\"" "monetdbtest"
[1] TRUE
[1] TRUE
[1] TRUE
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -6,8 +6,8 @@ dd <- capture.output(suppressMessages(su
(function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <- "http://cran.rstudio.com/";
- if(length(np)) install.packages(np,repos=repos, type="source", quiet=T)
- update.packages(repos=repos, ask=F, oldPkgs=lp, type="source", quiet=T)
+ if(length(np)) install.packages(np,repos=repos, quiet=T)
+ update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
})(c("DBI", "digest"))
})))
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
@@ -3,8 +3,8 @@ dd <- capture.output(suppressMessages(su
(function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <-
c('http://download.r-forge.r-project.org','http://cran.rstudio.com/')
- if(length(np)) install.packages(np,repos=repos, type="source", quiet=T)
- update.packages(repos=repos, ask=F, oldPkgs=lp, type="source", quiet=T)
+ if(length(np)) install.packages(np,repos=repos, quiet=T)
+ update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
})(c('Rcpp', 'dplyr','survey','sqlsurvey','Lahman','nycflights13'))
})))
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
@@ -2496,7 +2496,7 @@ command algebra.thetasubselect(b:bat[:oi
address ALGthetasubselect1;
comment Select all head values for which the tail value obeys the relation
value OP VAL. Input is a dense-headed BAT, output is a dense-headed BAT with
in the tail the head value of the input BAT for which the relationship
holds. The output BAT is sorted on the tail value.
-command alarm.ctime{unsafe}():str
+command alarm.ctime():str
address ALARMctime;
comment Return the current time as a C-time string.
@@ -2504,7 +2504,7 @@ command alarm.epilogue():void
address ALARMepilogue;
comment Finalize alarm module.
-command alarm.epoch{unsafe}():int
+command alarm.epoch():int
address ALARMepoch;
comment Return the current time as UNIX epoch.
@@ -2512,15 +2512,15 @@ command alarm.prelude():void
address ALARMprelude;
comment Initialize alarm module.
-command alarm.sleep{unsafe}(secs:int):void
+command alarm.sleep(secs:int):void
address ALARMsleep;
comment Sleep a few seconds
-command alarm.time{unsafe}():int
+command alarm.time():int
address ALARMtime;
comment Return time in milliseconds.
-command alarm.usec{unsafe}():lng
+command alarm.usec():lng
address ALARMusec;
comment Return time in microseconds.
@@ -24678,6 +24678,18 @@ pattern batcalc.ifthenelse(b:bat[:oid,:b
address CMDifthen;
comment If-then-else operation to assemble a conditional result
+pattern
batcalc.ifthenelse(v:bit,b1:bat[:oid,:any_1],v2:any_1):bat[:oid,:any_1]
+address CMDifthen;
+comment If-then-else operation to assemble a conditional result
+
+pattern
batcalc.ifthenelse(v:bit,v1:any_1,b2:bat[:oid,:any_1]):bat[:oid,:any_1]
+address CMDifthen;
+comment If-then-else operation to assemble a conditional result
+
+pattern
batcalc.ifthenelse(v:bit,b1:bat[:oid,:any_1],b2:bat[:oid,:any_1]):bat[:oid,:any_1]
+address CMDifthen;
+comment If-then-else operation to assemble a conditional result
+
pattern batcalc.int_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:int]
address CMDconvert_int;
comment cast from str to int with candidates list
@@ -31535,15 +31547,15 @@ command blob.#tostr():void
address BLOBtostr;
command blob.#write():void
address BLOBwrite;
-command bstream.create{unsafe}(s:streams,bufsize:int):bstream
+command bstream.create(s:streams,bufsize:int):bstream
address bstream_create_wrapwrap;
comment create a buffered stream
-command bstream.destroy{unsafe}(s:bstream):void
+command bstream.destroy(s:bstream):void
address bstream_destroy_wrapwrap;
comment destroy bstream
-command bstream.read{unsafe}(s:bstream,size:int):int
+command bstream.read(s:bstream,size:int):int
address bstream_read_wrapwrap;
comment read at least size bytes into the buffer of s
@@ -35127,7 +35139,7 @@ command calc.blob(s:str):blob
address BLOBblob_fromstr;
command calc.blob(b:blob):blob
address BLOBblob_blob;
-function calc.curve{unsafe}(wkt:str):wkb;
+unsafe function calc.curve(wkt:str):wkb;
pattern calc.cmp(v1:dbl,v2:dbl):bte
address CMDvarCMP;
comment Return -1/0/1 if V1 </==/> V2
@@ -36098,7 +36110,7 @@ command calc.lng(v:void,digits:int):lng
address nil_2num_lng;
comment cast to lng and check for overflow
-function calc.linestring{unsafe}(wkt:str):wkb;
+unsafe function calc.linestring(wkt:str):wkb;
command calc.length(s:str):int
address CMDstrlength;
comment Length of STRING
@@ -36271,14 +36283,14 @@ command calc.month_interval(v:str,ek:int
address month_interval_str;
comment cast str to a month_interval and check for overflow
-function calc.multipolygon{unsafe}(wkt:str):wkb;
-function calc.multisurface{unsafe}(wkt:str):wkb;
-function calc.multilinestring{unsafe}(wkt:str):wkb;
-function calc.multicurve{unsafe}(wkt:str):wkb;
-function calc.multipoint{unsafe}(wkt:str):wkb;
+unsafe function calc.multipolygon(wkt:str):wkb;
+unsafe function calc.multisurface(wkt:str):wkb;
+unsafe function calc.multilinestring(wkt:str):wkb;
+unsafe function calc.multicurve(wkt:str):wkb;
+unsafe function calc.multipoint(wkt:str):wkb;
command calc.mbr(v:mbr):mbr
address mbrFromMBR;
-command calc.mbr{unsafe}(v:str):mbr
+command calc.mbr(v:str):mbr
address mbrFromString;
pattern calc.max_no_nil(v1:any_1,v2:any_1):any_1
address CALCmax_no_nil;
@@ -36780,8 +36792,8 @@ pattern calc.or(v1:bit,v2:bit):bit
address CMDvarOR;
comment Return V1 OR V2
-function calc.polygon{unsafe}(wkt:str):wkb;
-function calc.point{unsafe}(wkt:str):wkb;
+unsafe function calc.polygon(wkt:str):wkb;
+unsafe function calc.point(wkt:str):wkb;
command calc.ptr(v:ptr):ptr
address CMDvarCONVERTptr;
comment Cast VALUE to ptr
@@ -37048,7 +37060,7 @@ command calc.second_interval(sc:int,v:bt
address bte_dec2second_interval;
comment cast bte decimal to a second_interval
-function calc.surface{unsafe}(wkt:str):wkb;
+unsafe function calc.surface(wkt:str):wkb;
pattern calc.setoid(v:lng):void
address CMDsetoid;
pattern calc.setoid(v:oid):void
@@ -37556,7 +37568,7 @@ comment cast to wrd and check for overfl
command calc.wkb(v:wkb):wkb
address wkbFromWKB;
-command calc.wkb{unsafe}(v:str):wkb
+command calc.wkb(v:str):wkb
address wkbFromString;
pattern calc.wrd(v:str):wrd
address CMDvarCONVERT;
@@ -38154,7 +38166,7 @@ command geom.Crosses(a:wkb,b:wkb):bit
address wkbCrosses;
comment Returns true if the Geometry a 'spatially crosses' Geometry b
-function geom.CurveFromText{unsafe}(wkt:str,srid:sht):wkb;
+unsafe function geom.CurveFromText(wkt:str,srid:sht):wkb;
command geom.Difference(a:wkb,b:wkb):wkb
address wkbDifference;
comment Returns a geometry that represents the point set difference of
Geometry a with b.
@@ -38183,8 +38195,8 @@ command geom.GeometryTypeId(w:wkb):int
address wkbGeometryTypeId;
comment Returns the name of the instantiable subtype of Geometry of which this
Geometry instance is a member. The name of the instantiable subtype of Geometry
is returned as string.
-function geom.GeomCollectionFromText{unsafe}(wkt:str,srid:sht):wkb;
-function geom.GeomFromText{unsafe}(wkt:str,srid:sht):wkb;
+unsafe function geom.GeomCollectionFromText(wkt:str,srid:sht):wkb;
+unsafe function geom.GeomFromText(wkt:str,srid:sht):wkb;
command geom.Intersection(a:wkb,b:wkb):wkb
address wkbIntersection;
comment Returns a geometry that represents the point set intersection of
Geometry a with b.
@@ -38205,18 +38217,18 @@ command geom.Length(g:wkb):dbl
address wkbLength;
comment Returns the length of the geometry.
-function geom.LineFromText{unsafe}(wkt:str,srid:sht):wkb;
-function geom.MultiPolyFromText{unsafe}(wkt:str,srid:sht):wkb;
-function geom.MultiSurfaceFromText{unsafe}(wkt:str,srid:sht):wkb;
-function geom.MultiLineFromText{unsafe}(wkt:str,srid:sht):wkb;
-function geom.MultiCurveFromText{unsafe}(wkt:str,srid:sht):wkb;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
