Changeset: 39a4d8cd9fc9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39a4d8cd9fc9
Added Files:
sql/benchmarks/ATIS/Tests/select_group.stable.out.int128
sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out.int128
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/tachograph.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/rapi/Tests/All
monetdb5/optimizer/opt_coercion.c
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/generator/Tests/generator01.sql
sql/backends/monet5/generator/Tests/generator02.sql
sql/backends/monet5/generator/Tests/generator04.sql
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/tpch/14.sql
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/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
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/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/common/sql_types.c
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
Branch: resultset
Log Message:
merged with default and updated (some) output
diffs (truncated from 8941 to 300 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -38026,8 +38026,12 @@ pattern generator.series(first:sht,last:
address VLTgenerator_table;
pattern generator.series(first:bte,last:bte,step:bte):bat[:oid,:bte]
address VLTgenerator_table;
+pattern generator.series(first:any_1,last:any_1,step:any_1):bat[:oid,:any_1]
+address VLTgenerator_table;
pattern generator.series(first:dbl,last:dbl):bat[:oid,:dbl]
address VLTgenerator_table;
+pattern generator.series(first:timestamp,last:timestamp):bat[:oid,:timestamp]
+address VLTgenerator_table;
pattern generator.series(first:flt,last:flt):bat[:oid,:flt]
address VLTgenerator_table;
pattern generator.series(first:lng,last:lng):bat[:oid,:lng]
@@ -40485,11 +40489,11 @@ pattern sql.current_time():daytime
address SQLcurrent_daytime;
comment Get the clients current daytime
-pattern
sql.copyfrom(t:ptr,sep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
-address mvc_import_table_stdin;
-comment Import a table from bstream s with the given tuple and
seperators (sep/rsep)
-
-pattern
sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
+pattern sql.copy_rejects_clear():void
+address COPYrejects_clear;
+pattern sql.copy_rejects()
(rowid:bat[:oid,:lng],fldid:bat[:oid,:int],msg:bat[:oid,:str],inp:bat[:oid,:str])
+address COPYrejects;
+pattern
sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int,best:int):bat[:oid,:any]...
address mvc_import_table_wrap;
comment Import a table from bstream s with the given tuple and
seperators (sep/rsep)
@@ -40637,10 +40641,6 @@ comment Return column bat with delta's a
command sql.epilogue():void
address SQLepilogue;
-pattern
sql.exportValue{unsafe}(qtype:int,tname:str,name:str,typename:str,digits:int,scale:int,eclass:int,val:any_1,w:str):void
-address mvc_export_value_wrap;
-comment export a single value onto the stream s
-
pattern sql.exportOperation{unsafe}(w:str):void
address mvc_export_operation_wrap;
comment Export result of schema/transaction queries
@@ -40661,10 +40661,22 @@ pattern sql.exportHead{unsafe}(s:streams
address mvc_export_head_wrap;
comment Export a result (in order) to stream s
+pattern
sql.export_table{unsafe}(fname:str,fmt:str,colsep:str,recsep:str,qout:str,nullrep:str,tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:bat[:oid,:any]...):int
+address mvc_export_table_wrap;
+comment Prepare a table result set for the COPY INTO stream
+
+pattern
sql.export_table{unsafe}(fname:str,fmt:str,colsep:str,recsep:str,qout:str,nullrep:str,tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:any...):int
+address mvc_export_row_wrap;
+comment Prepare a table result set for the COPY INTO stream
+
pattern sql.evalAlgebra(cmd:str,optimize:bit):void
address RAstatement;
comment Compile and execute a single 'relational algebra' statement
+pattern sql.eval(cmd:str)
(nme:bat[:oid,:str],tpe:bat[:oid,:str],val:bat[:oid,:any]...)
+address SQLstatementResult;
+comment Compile and execute a single sql statement. Return the result set for
rendering
+
pattern sql.eval(cmd:str,output:bit):void
address SQLstatement;
comment Compile and execute a single sql statement (and optionaly send output
on the output stream)
@@ -40801,29 +40813,17 @@ command sql.round(v:bte,d:int,s:int,r:bt
address bte_round_wrap;
comment round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)
-pattern
sql.rsColumn{unsafe}(rs:int,tname:str,name:str,typename:str,digits:int,scale:int,col:bat[:oid,:any_1]):void
-address mvc_result_column_wrap;
-comment Add the column to the table query result
-
-pattern
sql.rsColumn{unsafe}(rs:int,tname:str,name:str,typename:str,digits:int,scale:int,val:any_1):void
-address mvc_result_value_wrap;
-comment Add the value to the row query result
-
-pattern
sql.resultSet{unsafe}(nr_cols:int,qtype:int,order:bat[:oid,:any_1]):int
-address mvc_result_table_wrap;
+pattern
sql.resultSet{unsafe}(tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:bat[:oid,:any]...):int
+address mvc_table_result_wrap;
+comment Prepare a table result set for the client in default CSV format
+
+pattern
sql.resultSet{unsafe}(tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:any...):int
+address mvc_row_result_wrap;
comment Prepare a table result set
-pattern sql.resultSet{unsafe}(nr_cols:int,qtype:int,order:any_1):int
-address mvc_result_row_wrap;
-comment Prepare a row result set
-
-pattern
sql.resultSet{unsafe}(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:bat[:oid,:any_1]):int
-address mvc_result_file_wrap;
-comment Prepare a file result set
-
-pattern
sql.resultSet{unsafe}(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:any_1):int
-address mvc_result_file_wrap;
-comment Prepare a file result set
+pattern
sql.resultSet{unsafe}(tbl:str,attr:str,tpe:str,len:int,scale:int,val:any):int
+address mvc_scalar_value_wrap;
+comment Prepare a table result set
pattern sql.restart{unsafe}(sname:str,sequence:str,start:lng):lng
address mvc_restart_seq;
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -48937,8 +48937,12 @@ pattern generator.series(first:sht,last:
address VLTgenerator_table;
pattern generator.series(first:bte,last:bte,step:bte):bat[:oid,:bte]
address VLTgenerator_table;
+pattern generator.series(first:any_1,last:any_1,step:any_1):bat[:oid,:any_1]
+address VLTgenerator_table;
pattern generator.series(first:dbl,last:dbl):bat[:oid,:dbl]
address VLTgenerator_table;
+pattern generator.series(first:timestamp,last:timestamp):bat[:oid,:timestamp]
+address VLTgenerator_table;
pattern generator.series(first:flt,last:flt):bat[:oid,:flt]
address VLTgenerator_table;
pattern generator.series(first:lng,last:lng):bat[:oid,:lng]
@@ -48949,6 +48953,8 @@ pattern generator.series(first:sht,last:
address VLTgenerator_table;
pattern generator.series(first:bte,last:bte):bat[:oid,:bte]
address VLTgenerator_table;
+pattern generator.series(first:any_1,last:any_1):bat[:oid,:any_1]
+address VLTgenerator_table;
pattern
generator.thetasubselect(b:bat[:oid,:hge],cnd:bat[:oid,:oid],low:hge,oper:str):bat[:oid,:oid]
address VLTgenerator_thetasubselect;
comment Overloaded selection routine
@@ -51420,11 +51426,11 @@ pattern sql.current_time():daytime
address SQLcurrent_daytime;
comment Get the clients current daytime
-pattern
sql.copyfrom(t:ptr,sep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
-address mvc_import_table_stdin;
-comment Import a table from bstream s with the given tuple and
seperators (sep/rsep)
-
-pattern
sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
+pattern sql.copy_rejects_clear():void
+address COPYrejects_clear;
+pattern sql.copy_rejects()
(rowid:bat[:oid,:lng],fldid:bat[:oid,:int],msg:bat[:oid,:str],inp:bat[:oid,:str])
+address COPYrejects;
+pattern
sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int,best:int):bat[:oid,:any]...
address mvc_import_table_wrap;
comment Import a table from bstream s with the given tuple and
seperators (sep/rsep)
@@ -51576,10 +51582,6 @@ comment Return column bat with delta's a
command sql.epilogue():void
address SQLepilogue;
-pattern
sql.exportValue{unsafe}(qtype:int,tname:str,name:str,typename:str,digits:int,scale:int,eclass:int,val:any_1,w:str):void
-address mvc_export_value_wrap;
-comment export a single value onto the stream s
-
pattern sql.exportOperation{unsafe}(w:str):void
address mvc_export_operation_wrap;
comment Export result of schema/transaction queries
@@ -51600,10 +51602,22 @@ pattern sql.exportHead{unsafe}(s:streams
address mvc_export_head_wrap;
comment Export a result (in order) to stream s
+pattern
sql.export_table{unsafe}(fname:str,fmt:str,colsep:str,recsep:str,qout:str,nullrep:str,tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:bat[:oid,:any]...):int
+address mvc_export_table_wrap;
+comment Prepare a table result set for the COPY INTO stream
+
+pattern
sql.export_table{unsafe}(fname:str,fmt:str,colsep:str,recsep:str,qout:str,nullrep:str,tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:any...):int
+address mvc_export_row_wrap;
+comment Prepare a table result set for the COPY INTO stream
+
pattern sql.evalAlgebra(cmd:str,optimize:bit):void
address RAstatement;
comment Compile and execute a single 'relational algebra' statement
+pattern sql.eval(cmd:str)
(nme:bat[:oid,:str],tpe:bat[:oid,:str],val:bat[:oid,:any]...)
+address SQLstatementResult;
+comment Compile and execute a single sql statement. Return the result set for
rendering
+
pattern sql.eval(cmd:str,output:bit):void
address SQLstatement;
comment Compile and execute a single sql statement (and optionaly send output
on the output stream)
@@ -51744,29 +51758,17 @@ command sql.round(v:bte,d:int,s:int,r:bt
address bte_round_wrap;
comment round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)
-pattern
sql.rsColumn{unsafe}(rs:int,tname:str,name:str,typename:str,digits:int,scale:int,col:bat[:oid,:any_1]):void
-address mvc_result_column_wrap;
-comment Add the column to the table query result
-
-pattern
sql.rsColumn{unsafe}(rs:int,tname:str,name:str,typename:str,digits:int,scale:int,val:any_1):void
-address mvc_result_value_wrap;
-comment Add the value to the row query result
-
-pattern
sql.resultSet{unsafe}(nr_cols:int,qtype:int,order:bat[:oid,:any_1]):int
-address mvc_result_table_wrap;
+pattern
sql.resultSet{unsafe}(tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:bat[:oid,:any]...):int
+address mvc_table_result_wrap;
+comment Prepare a table result set for the client in default CSV format
+
+pattern
sql.resultSet{unsafe}(tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:any...):int
+address mvc_row_result_wrap;
comment Prepare a table result set
-pattern sql.resultSet{unsafe}(nr_cols:int,qtype:int,order:any_1):int
-address mvc_result_row_wrap;
-comment Prepare a row result set
-
-pattern
sql.resultSet{unsafe}(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:bat[:oid,:any_1]):int
-address mvc_result_file_wrap;
-comment Prepare a file result set
-
-pattern
sql.resultSet{unsafe}(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:any_1):int
-address mvc_result_file_wrap;
-comment Prepare a file result set
+pattern
sql.resultSet{unsafe}(tbl:str,attr:str,tpe:str,len:int,scale:int,val:any):int
+address mvc_scalar_value_wrap;
+comment Prepare a table result set
pattern sql.restart{unsafe}(sname:str,sequence:str,start:lng):lng
address mvc_restart_seq;
diff --git a/clients/Tests/SQL-dump_all.stable.out.int128
b/clients/Tests/SQL-dump_all.stable.out.int128
--- a/clients/Tests/SQL-dump_all.stable.out.int128
+++ b/clients/Tests/SQL-dump_all.stable.out.int128
@@ -106,6 +106,7 @@ SYSTEM FUNCTION sys.cluster1
SYSTEM FUNCTION sys.cluster2
SYSTEM FUNCTION sys.columnsize
SYSTEM FUNCTION sys.contains
+SYSTEM FUNCTION sys.convert
SYSTEM FUNCTION sys.convexhull
SYSTEM FUNCTION sys.corr
SYSTEM FUNCTION sys.crosses
@@ -201,6 +202,8 @@ SYSTEM FUNCTION sys.point
SYSTEM FUNCTION sys.pointfromtext
SYSTEM FUNCTION sys.polyfromtext
SYSTEM FUNCTION sys.polygonfromtext
+SYSTEM FUNCTION sys.profiler_openstream
+SYSTEM FUNCTION sys.profiler_stethoscope
SYSTEM FUNCTION sys.quantile
SYSTEM FUNCTION sys.querycache
SYSTEM FUNCTION sys.querylog
@@ -483,22 +486,11 @@ create function boundary(g geometry) ret
create function "broadcast" (p inet) returns inet
external name inet."broadcast";
create function buffer(a geometry, distance float) returns geometry external
name geom."Buffer";
--- The contents of this file are subject to the MonetDB Public License
--- Version 1.1 (the "License"); you may not use this file except in
--- compliance with the License. You may obtain a copy of the License at
--- http://www.monetdb.org/Legal/MonetDBLicense
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at http://mozilla.org/MPL/2.0/.
--
--- Software distributed under the License is distributed on an "AS IS"
--- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
--- License for the specific language governing rights and limitations
--- under the License.
---
--- The Original Code is the MonetDB Database System.
---
--- The Initial Developer of the Original Code is CWI.
--- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
--- Copyright August 2008-2015 MonetDB B.V.
--- All Rights Reserved.
+-- Copyright 2008-2015 MonetDB B.V.
-- (co) Arjen de Rijke, Bart Scheers
-- Use statistical functions from gsl library
@@ -506,22 +498,11 @@ create function buffer(a geometry, dista
-- Calculate Chi squared probability
create function sys.chi2prob(chi2 double, datapoints double)
returns double external name gsl."chi2prob";
--- The contents of this file are subject to the MonetDB Public License
--- Version 1.1 (the "License"); you may not use this file except in
--- compliance with the License. You may obtain a copy of the License at
--- http://www.monetdb.org/Legal/MonetDBLicense
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at http://mozilla.org/MPL/2.0/.
--
--- Software distributed under the License is distributed on an "AS IS"
--- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
--- License for the specific language governing rights and limitations
--- under the License.
---
--- The Original Code is the MonetDB Database System.
---
--- The Initial Developer of the Original Code is CWI.
--- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
--- Copyright August 2008-2015 MonetDB B.V.
--- All Rights Reserved.
+-- Copyright 2008-2015 MonetDB B.V.
-- Clustering a relational table should be done with care.
-- For, the oid's are used in join-indices.
@@ -582,22 +563,11 @@ create function crosses(a geometry, b ge
create function date_to_str(d date, format string) returns string
external name mtime."date_to_str";
CREATE FUNCTION db_users () RETURNS TABLE( name varchar(2048)) EXTERNAL NAME
sql.db_users;
--- The contents of this file are subject to the MonetDB Public License
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
