Changeset: cc93c0abb7ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc93c0abb7ee
Added Files:
sql/scripts/27_rejects.sql
sql/test/copy/Tests/ingestion.sql
sql/test/copy/Tests/ingestion.stable.err
sql/test/copy/Tests/ingestion.stable.out
sql/test/copy/Tests/int_parse_best.sql
sql/test/copy/Tests/int_parse_best.stable.err
sql/test/copy/Tests/int_parse_best.stable.out
sql/test/copy/Tests/key_copy.sql
sql/test/copy/Tests/key_copy.stable.err
sql/test/copy/Tests/key_copy.stable.out
sql/test/copy/Tests/nonutf8.sql
sql/test/copy/Tests/nonutf8.stable.err
sql/test/copy/Tests/nonutf8.stable.out
Modified Files:
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/exports.stable.out
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_storage.c
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.h
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
sql/backends/monet5/Tests/limithack.stable.out
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/generator01.stable.err
sql/backends/monet5/generator/Tests/generator02.sql
sql/backends/monet5/generator/Tests/generator04.sql
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/backends/monet5/generator/generator.mal
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_execute.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/benchmarks/ATIS/Tests/select_group.stable.out
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/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/09.stable.out
sql/benchmarks/tpch/LOCKED/Tests/09.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/alter.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
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
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
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out
sql/benchmarks/tpch/Tests/14.stable.out
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/16-explain.stable.out.32bit
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/common/sql_types.c
sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
sql/jdbc/tests/Tests/Test_Dobjects.stable.err
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/17_temporal.sql
sql/scripts/Makefile.ag
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err
sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
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-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-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.err
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.err
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
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-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/BugTracker-2014/Tests/two-column-aggr-with-null.Bug-3428.stable.out
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err
sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Dependencies/Tests/Dependencies.SQL.py
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out.int128
sql/test/Tests/keys.sql.src
sql/test/Tests/keys.stable.err
sql/test/Tests/keys.stable.out
sql/test/Tests/systemfunctions.sql
sql/test/Tests/systemfunctions.stable.err
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.sql.src
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.err
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/copy/Tests/All
sql/test/copy/Tests/int_parse.sql
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/int_parse.stable.out
sql/test/copy/Tests/load_stdin_incorrect_line_nr.sql
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out
sql/test/copy/Tests/null_as_string_errors.sql
sql/test/copy/Tests/null_as_string_errors.stable.err
sql/test/copy/Tests/null_as_string_errors.stable.out
sql/test/leaks/Tests/check0.sql
sql/test/leaks/Tests/check0.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check1.sql.src
sql/test/leaks/Tests/check1.stable.err
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.sql.src
sql/test/leaks/Tests/check2.stable.err
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.sql.src
sql/test/leaks/Tests/check3.stable.err
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.sql.src
sql/test/leaks/Tests/check4.stable.err
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.sql.src
sql/test/leaks/Tests/check5.stable.err
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.sql
sql/test/leaks/Tests/drop3.stable.err
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.sql
sql/test/leaks/Tests/select1.stable.err
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.sql
sql/test/leaks/Tests/select2.stable.err
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.sql
sql/test/leaks/Tests/temp1.stable.err
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.sql
sql/test/leaks/Tests/temp2.stable.err
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.sql
sql/test/leaks/Tests/temp3.stable.err
sql/test/leaks/Tests/temp3.stable.out
sql/test/mergetables/Tests/forex.sql
sql/test/mergetables/Tests/forex.stable.out
sql/test/mergetables/Tests/mergedrop.sql
sql/test/mergetables/Tests/mergekey.sql
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/insert.stable.err
sql/test/pg_regress/Tests/time.stable.err
sql/test/pg_regress/Tests/timetz.stable.err
sql/test/utf8/run.all
Branch: default
Log Message:
Merged resultset branch into default.
This introduces four new features that are, at least conceptually,
independent:
- resultset interface change
- BATmsync: write and sync heaps to disk in the background
- copy into error handling
- copy into double buffering
diffs (truncated from 24528 to 300 lines):
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
@@ -40503,11 +40503,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)
@@ -40663,10 +40663,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
@@ -40687,6 +40683,14 @@ 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
@@ -40827,29 +40831,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,eclass: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.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
@@ -51438,11 +51438,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)
@@ -51602,10 +51602,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
@@ -51626,6 +51622,14 @@ 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
@@ -51770,29 +51774,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,eclass: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.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -93,6 +93,7 @@ SYSTEM VIEW sys.querylog_calls
SYSTEM VIEW sys.querylog_catalog
SYSTEM VIEW sys.querylog_history
SYSTEM VIEW sys.queue
+SYSTEM VIEW sys.rejects
SYSTEM VIEW sys.sessions
SYSTEM VIEW sys.storage
SYSTEM VIEW sys.storagemodel
@@ -112,6 +113,7 @@ SYSTEM FUNCTION sys.boundary
SYSTEM FUNCTION sys.broadcast
SYSTEM FUNCTION sys.buffer
SYSTEM FUNCTION sys.chi2prob
+SYSTEM FUNCTION sys.clearrejects
SYSTEM FUNCTION sys.columnsize
SYSTEM FUNCTION sys.contains
SYSTEM FUNCTION sys.convexhull
@@ -223,6 +225,7 @@ SYSTEM FUNCTION sys.querylog_empty
SYSTEM FUNCTION sys.querylog_enable
SYSTEM FUNCTION sys.queue
SYSTEM FUNCTION sys.radians
+SYSTEM FUNCTION sys.rejects
SYSTEM FUNCTION sys.relate
SYSTEM FUNCTION sys.resume
SYSTEM FUNCTION sys.reuse
@@ -1335,7 +1338,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 358 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 362 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
@@ -1469,231 +1472,235 @@ 2149 "statement" "varchar" 2048 0
2139 N
2151 "id" "int" 32 0 2150 NULL true 0 NULL
2152 "name" "varchar" 1024 0 2150 NULL true 1
NULL
2153 "nr" "int" 32 0 2150 NULL true 2 NULL
-5202 "id" "int" 32 0 5201 NULL true 0 NULL
-5203 "name" "varchar" 1024 0 5201 NULL true 1
NULL
-5204 "schema_id" "int" 32 0 5201 NULL true 2
NULL
-5205 "query" "varchar" 2048 0 5201 NULL true 3
NULL
-5206 "type" "smallint" 16 0 5201 NULL true 4
NULL
-5207 "system" "boolean" 1 0 5201 NULL true
5 NULL
-5208 "commit_action" "smallint" 16 0 5201 NULL true
6 NULL
-5209 "access" "smallint" 16 0 5201 NULL true
7 NULL
-5210 "temporary" "smallint" 16 0 5201 NULL true
8 NULL
-5211 "table_type" "smallint" 16 0 5201 NULL true
9 NULL
-5213 "id" "int" 32 0 5212 NULL true 0 NULL
-5214 "name" "varchar" 1024 0 5212 NULL true 1
NULL
-5215 "type" "varchar" 1024 0 5212 NULL true 2
NULL
-5216 "type_digits" "int" 32 0 5212 NULL true 3
NULL
-5217 "type_scale" "int" 32 0 5212 NULL true 4
NULL
-5218 "table_id" "int" 32 0 5212 NULL true 5
NULL
-5219 "default" "varchar" 2048 0 5212 NULL true
6 NULL
-5220 "null" "boolean" 1 0 5212 NULL true 7
NULL
-5221 "number" "int" 32 0 5212 NULL true 8
NULL
-5222 "storage" "varchar" 2048 0 5212 NULL true
9 NULL
-5229 "name" "varchar" 1024 0 5228 NULL true 0
NULL
-5230 "fullname" "varchar" 2048 0 5228 NULL true
1 NULL
-5231 "default_schema" "int" 9 0 5228 NULL true
2 NULL
-5235 "name" "varchar" 1024 0 5234 NULL true 0
NULL
-5236 "fullname" "varchar" 2024 0 5234 NULL true
1 NULL
-5237 "default_schema" "int" 9 0 5234 NULL true
2 NULL
-5239 "login_id" "int" 32 0 5238 NULL true 0
NULL
-5240 "role_id" "int" 32 0 5238 NULL true 1
NULL
-5242 "id" "int" 32 0 5241 NULL true 0 NULL
-5243 "name" "varchar" 1024 0 5241 NULL true 1
NULL
-5244 "grantor" "int" 32 0 5241 NULL true 2
NULL
-5246 "obj_id" "int" 32 0 5245 NULL true 0
NULL
-5247 "auth_id" "int" 32 0 5245 NULL true 1
NULL
-5248 "privileges" "int" 32 0 5245 NULL true 2
NULL
-5249 "grantor" "int" 32 0 5245 NULL true 3
NULL
-5250 "grantable" "int" 32 0 5245 NULL true 4
NULL
-5459 "id" "oid" 63 0 5467 NULL true 0 NULL
-5460 "owner" "clob" 0 0 5467 NULL true 1 NULL
-5461 "defined" "timestamp" 7 0 5467 NULL true
2 NULL
-5462 "query" "clob" 0 0 5467 NULL true 3 NULL
-5463 "pipe" "clob" 0 0 5467 NULL true 4 NULL
-5464 "plan" "clob" 0 0 5467 NULL true 5 NULL
-5465 "mal" "int" 32 0 5467 NULL true 6 NULL
-5466 "optimize" "bigint" 64 0 5467 NULL true
7 NULL
-5469 "id" "oid" 63 0 5478 NULL true 0 NULL
-5470 "start" "timestamp" 7 0 5478 NULL true 1
NULL
-5471 "stop" "timestamp" 7 0 5478 NULL true 2
NULL
-5472 "arguments" "clob" 0 0 5478 NULL true 3
NULL
-5473 "tuples" "wrd" 64 0 5478 NULL true 4
NULL
-5474 "run" "bigint" 64 0 5478 NULL true 5
NULL
-5475 "ship" "bigint" 64 0 5478 NULL true 6
NULL
-5476 "cpu" "int" 32 0 5478 NULL true 7 NULL
-5477 "io" "int" 32 0 5478 NULL true 8 NULL
-5480 "id" "oid" 63 0 5496 NULL true 0 NULL
-5481 "owner" "clob" 0 0 5496 NULL true 1 NULL
-5482 "defined" "timestamp" 7 0 5496 NULL true
2 NULL
-5483 "query" "clob" 0 0 5496 NULL true 3 NULL
-5484 "pipe" "clob" 0 0 5496 NULL true 4 NULL
-5485 "plan" "clob" 0 0 5496 NULL true 5 NULL
-5486 "mal" "int" 32 0 5496 NULL true 6 NULL
-5487 "optimize" "bigint" 64 0 5496 NULL true
7 NULL
-5488 "start" "timestamp" 7 0 5496 NULL true 8
NULL
-5489 "stop" "timestamp" 7 0 5496 NULL true 9
NULL
-5490 "arguments" "clob" 0 0 5496 NULL true 10
NULL
-5491 "tuples" "wrd" 64 0 5496 NULL true 11
NULL
-5492 "run" "bigint" 64 0 5496 NULL true 12
NULL
-5493 "ship" "bigint" 64 0 5496 NULL true 13
NULL
-5494 "cpu" "int" 32 0 5496 NULL true 14 NULL
-5495 "io" "int" 32 0 5496 NULL true 15 NULL
-5522 "event" "int" 32 0 5535 NULL true 0 NULL
-5523 "clk" "varchar" 20 0 5535 NULL true 1
NULL
-5524 "pc" "varchar" 50 0 5535 NULL true 2
NULL
-5525 "thread" "int" 32 0 5535 NULL true 3
NULL
-5526 "ticks" "bigint" 64 0 5535 NULL true 4
NULL
-5527 "rrsmb" "bigint" 64 0 5535 NULL true 5
NULL
-5528 "vmmb" "bigint" 64 0 5535 NULL true 6
NULL
-5529 "reads" "bigint" 64 0 5535 NULL true 7
NULL
-5530 "writes" "bigint" 64 0 5535 NULL true
8 NULL
-5531 "minflt" "bigint" 64 0 5535 NULL true
9 NULL
-5532 "majflt" "bigint" 64 0 5535 NULL true
10 NULL
-5533 "nvcsw" "bigint" 64 0 5535 NULL true 11
NULL
-5534 "stmt" "clob" 0 0 5535 NULL true 12 NULL
-5665 "user" "clob" 0 0 5671 NULL true 0 NULL
-5666 "login" "timestamp" 7 0 5671 NULL true 1
NULL
-5667 "sessiontimeout" "bigint" 64 0 5671 NULL
true 2 NULL
-5668 "lastcommand" "timestamp" 7 0 5671 NULL true
3 NULL
-5669 "querytimeout" "bigint" 64 0 5671 NULL true
4 NULL
-5670 "active" "boolean" 1 0 5671 NULL true
5 NULL
-5748 "name" "clob" 0 0 5751 NULL true 0 NULL
-5749 "def" "clob" 0 0 5751 NULL true 1 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
