Changeset: 7ac261800695 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ac261800695
Modified Files:
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/SQL-dump.stable.out.oid32
clients/Tests/SQL-dump.stable.out.oid32.int128
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
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/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
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-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
Branch: resultset
Log Message:
approved stable output after (not that) recent changes
... assuming that all these changes where indeed intended like this ...
... only the original authors might be able to tell ...
diffs (truncated from 19377 to 300 lines):
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
@@ -51408,11 +51408,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)
@@ -51564,10 +51564,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
@@ -51588,6 +51584,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
@@ -51732,29 +51736,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
@@ -85,6 +85,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
@@ -104,6 +105,9 @@ SYSTEM FUNCTION sys.boundary
SYSTEM FUNCTION sys.broadcast
SYSTEM FUNCTION sys.buffer
SYSTEM FUNCTION sys.chi2prob
+SYSTEM FUNCTION sys.clearrejects
+SYSTEM FUNCTION sys.cluster1
+SYSTEM FUNCTION sys.cluster2
SYSTEM FUNCTION sys.columnsize
SYSTEM FUNCTION sys.contains
SYSTEM FUNCTION sys.convert
@@ -214,6 +218,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
@@ -497,6 +502,23 @@ create function buffer(a geometry, dista
-- Calculate Chi squared probability
create function sys.chi2prob(chi2 double, datapoints double)
returns double external name gsl."chi2prob";
+-- 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/.
+--
+-- Copyright 2008-2015 MonetDB B.V.
+
+-- Clustering a relational table should be done with care.
+-- For, the oid's are used in join-indices.
+
+-- Clustering of tables may improve IO performance
+-- The foreign key constraints should be dropped before
+-- and re-established after the cluster operation.
+
+create procedure cluster1(sys string, tab string)
+ external name sql.cluster1;
+create procedure cluster2(sys string, tab string)
+ external name sql.cluster2;
-- The predicted storage footprint of the complete database
-- determines the amount of diskspace needed for persistent storage
-- and the upperbound when all possible index structures are created.
@@ -1330,7 +1352,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 329 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 333 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
@@ -1464,202 +1486,206 @@ 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
-5212 "id" "int" 32 0 5211 NULL true 0 NULL
-5213 "name" "varchar" 1024 0 5211 NULL true 1
NULL
-5214 "type" "varchar" 1024 0 5211 NULL true 2
NULL
-5215 "type_digits" "int" 32 0 5211 NULL true 3
NULL
-5216 "type_scale" "int" 32 0 5211 NULL true 4
NULL
-5217 "table_id" "int" 32 0 5211 NULL true 5
NULL
-5218 "default" "varchar" 2048 0 5211 NULL true
6 NULL
-5219 "null" "boolean" 1 0 5211 NULL true 7
NULL
-5220 "number" "int" 32 0 5211 NULL true 8
NULL
-5221 "storage" "varchar" 2048 0 5211 NULL true
9 NULL
-5228 "name" "varchar" 1024 0 5227 NULL true 0
NULL
-5229 "fullname" "varchar" 2048 0 5227 NULL true
1 NULL
-5230 "default_schema" "int" 9 0 5227 NULL true
2 NULL
-5234 "name" "varchar" 1024 0 5233 NULL true 0
NULL
-5235 "fullname" "varchar" 2024 0 5233 NULL true
1 NULL
-5236 "default_schema" "int" 9 0 5233 NULL true
2 NULL
-5238 "login_id" "int" 32 0 5237 NULL true 0
NULL
-5239 "role_id" "int" 32 0 5237 NULL true 1
NULL
-5241 "id" "int" 32 0 5240 NULL true 0 NULL
-5242 "name" "varchar" 1024 0 5240 NULL true 1
NULL
-5243 "grantor" "int" 32 0 5240 NULL true 2
NULL
-5245 "obj_id" "int" 32 0 5244 NULL true 0
NULL
-5246 "auth_id" "int" 32 0 5244 NULL true 1
NULL
-5247 "privileges" "int" 32 0 5244 NULL true 2
NULL
-5248 "grantor" "int" 32 0 5244 NULL true 3
NULL
-5249 "grantable" "int" 32 0 5244 NULL true 4
NULL
-5443 "id" "oid" 63 0 5451 NULL true 0 NULL
-5444 "owner" "clob" 0 0 5451 NULL true 1 NULL
-5445 "defined" "timestamp" 7 0 5451 NULL true
2 NULL
-5446 "query" "clob" 0 0 5451 NULL true 3 NULL
-5447 "pipe" "clob" 0 0 5451 NULL true 4 NULL
-5448 "plan" "clob" 0 0 5451 NULL true 5 NULL
-5449 "mal" "int" 32 0 5451 NULL true 6 NULL
-5450 "optimize" "bigint" 64 0 5451 NULL true
7 NULL
-5453 "id" "oid" 63 0 5462 NULL true 0 NULL
-5454 "start" "timestamp" 7 0 5462 NULL true 1
NULL
-5455 "stop" "timestamp" 7 0 5462 NULL true 2
NULL
-5456 "arguments" "clob" 0 0 5462 NULL true 3
NULL
-5457 "tuples" "wrd" 64 0 5462 NULL true 4
NULL
-5458 "run" "bigint" 64 0 5462 NULL true 5
NULL
-5459 "ship" "bigint" 64 0 5462 NULL true 6
NULL
-5460 "cpu" "int" 32 0 5462 NULL true 7 NULL
-5461 "io" "int" 32 0 5462 NULL true 8 NULL
-5464 "id" "oid" 63 0 5480 NULL true 0 NULL
-5465 "owner" "clob" 0 0 5480 NULL true 1 NULL
-5466 "defined" "timestamp" 7 0 5480 NULL true
2 NULL
-5467 "query" "clob" 0 0 5480 NULL true 3 NULL
-5468 "pipe" "clob" 0 0 5480 NULL true 4 NULL
-5469 "plan" "clob" 0 0 5480 NULL true 5 NULL
-5470 "mal" "int" 32 0 5480 NULL true 6 NULL
-5471 "optimize" "bigint" 64 0 5480 NULL true
7 NULL
-5472 "start" "timestamp" 7 0 5480 NULL true 8
NULL
-5473 "stop" "timestamp" 7 0 5480 NULL true 9
NULL
-5474 "arguments" "clob" 0 0 5480 NULL true 10
NULL
-5475 "tuples" "wrd" 64 0 5480 NULL true 11
NULL
-5476 "run" "bigint" 64 0 5480 NULL true 12
NULL
-5477 "ship" "bigint" 64 0 5480 NULL true 13
NULL
-5478 "cpu" "int" 32 0 5480 NULL true 14 NULL
-5479 "io" "int" 32 0 5480 NULL true 15 NULL
-5506 "event" "int" 32 0 5519 NULL true 0 NULL
-5507 "clk" "varchar" 20 0 5519 NULL true 1
NULL
-5508 "pc" "varchar" 50 0 5519 NULL true 2
NULL
-5509 "thread" "int" 32 0 5519 NULL true 3
NULL
-5510 "ticks" "bigint" 64 0 5519 NULL true 4
NULL
-5511 "rrsmb" "bigint" 64 0 5519 NULL true 5
NULL
-5512 "vmmb" "bigint" 64 0 5519 NULL true 6
NULL
-5513 "reads" "bigint" 64 0 5519 NULL true 7
NULL
-5514 "writes" "bigint" 64 0 5519 NULL true
8 NULL
-5515 "minflt" "bigint" 64 0 5519 NULL true
9 NULL
-5516 "majflt" "bigint" 64 0 5519 NULL true
10 NULL
-5517 "nvcsw" "bigint" 64 0 5519 NULL true 11
NULL
-5518 "stmt" "clob" 0 0 5519 NULL true 12 NULL
-5649 "user" "clob" 0 0 5655 NULL true 0 NULL
-5650 "login" "timestamp" 7 0 5655 NULL true 1
NULL
-5651 "sessiontimeout" "bigint" 64 0 5655 NULL
true 2 NULL
-5652 "lastcommand" "timestamp" 7 0 5655 NULL true
3 NULL
-5653 "querytimeout" "bigint" 64 0 5655 NULL true
4 NULL
-5654 "active" "boolean" 1 0 5655 NULL true
5 NULL
-5732 "name" "clob" 0 0 5735 NULL true 0 NULL
-5733 "def" "clob" 0 0 5735 NULL true 1 NULL
-5734 "status" "clob" 0 0 5735 NULL true 2
NULL
-5741 "name" "clob" 0 0 5743 NULL true 0 NULL
-5742 "value" "clob" 0 0 5743 NULL true 1 NULL
-5773 "qtag" "bigint" 64 0 5781 NULL true 0
NULL
-5774 "user" "clob" 0 0 5781 NULL true 1 NULL
-5775 "started" "timestamp" 7 0 5781 NULL true
2 NULL
-5776 "estimate" "timestamp" 7 0 5781 NULL true
3 NULL
-5777 "progress" "int" 32 0 5781 NULL true 4
NULL
-5778 "status" "clob" 0 0 5781 NULL true 5
NULL
-5779 "tag" "oid" 63 0 5781 NULL true 6 NULL
-5780 "query" "clob" 0 0 5781 NULL true 7 NULL
-6439 "schema" "clob" 0 0 6452 NULL true 0
NULL
-6440 "table" "clob" 0 0 6452 NULL true 1 NULL
-6441 "column" "clob" 0 0 6452 NULL true 2
NULL
-6442 "type" "clob" 0 0 6452 NULL true 3 NULL
-6443 "mode" "clob" 0 0 6452 NULL true 4 NULL
-6444 "location" "clob" 0 0 6452 NULL true 5
NULL
-6445 "count" "bigint" 64 0 6452 NULL true 6
NULL
-6446 "typewidth" "int" 32 0 6452 NULL true 7
NULL
-6447 "columnsize" "bigint" 64 0 6452 NULL true
8 NULL
-6448 "heapsize" "bigint" 64 0 6452 NULL true
9 NULL
-6449 "hashes" "bigint" 64 0 6452 NULL true
10 NULL
-6450 "imprints" "bigint" 64 0 6452 NULL true
11 NULL
-6451 "sorted" "boolean" 1 0 6452 NULL true
12 NULL
-6454 "schema" "clob" 0 0 6464 NULL true 0
NULL
-6455 "table" "clob" 0 0 6464 NULL true 1 NULL
-6456 "column" "clob" 0 0 6464 NULL true 2
NULL
-6457 "type" "clob" 0 0 6464 NULL true 3 NULL
-6458 "typewidth" "int" 32 0 6464 NULL true 4
NULL
-6459 "count" "bigint" 64 0 6464 NULL true 5
NULL
-6460 "distinct" "bigint" 64 0 6464 NULL true
6 NULL
-6461 "atomwidth" "int" 32 0 6464 NULL true 7
NULL
-6462 "reference" "boolean" 1 0 6464 NULL true
8 NULL
-6463 "sorted" "boolean" 1 0 6464 NULL true
9 NULL
-6502 "schema" "clob" 0 0 6512 NULL true 0
NULL
-6503 "table" "clob" 0 0 6512 NULL true 1 NULL
-6504 "column" "clob" 0 0 6512 NULL true 2
NULL
-6505 "type" "clob" 0 0 6512 NULL true 3 NULL
-6506 "count" "bigint" 64 0 6512 NULL true 4
NULL
-6507 "columnsize" "bigint" 64 0 6512 NULL true
5 NULL
-6508 "heapsize" "bigint" 64 0 6512 NULL true
6 NULL
-6509 "hashes" "bigint" 64 0 6512 NULL true
7 NULL
-6510 "imprints" "bigint" 64 0 6512 NULL true
8 NULL
-6511 "sorted" "boolean" 1 0 6512 NULL true
9 NULL
-6514 "schema" "clob" 0 0 6522 NULL true 0
NULL
-6515 "table" "clob" 0 0 6522 NULL true 1 NULL
-6516 "count" "bigint" 64 0 6522 NULL true 2
NULL
-6517 "columnsize" "bigint" 64 0 6522 NULL true
3 NULL
-6518 "heapsize" "bigint" 64 0 6522 NULL true
4 NULL
-6519 "hashes" "bigint" 64 0 6522 NULL true
5 NULL
-6520 "imprints" "bigint" 64 0 6522 NULL true
6 NULL
-6521 "auxiliary" "bigint" 64 0 6522 NULL true
7 NULL
-6524 "column_id" "int" 32 0 6535 NULL true 0
NULL
-6525 "type" "clob" 0 0 6535 NULL true 1 NULL
-6526 "width" "int" 32 0 6535 NULL true 2 NULL
-6527 "stamp" "timestamp" 7 0 6535 NULL true 3
NULL
-6528 "sample" "bigint" 64 0 6535 NULL true
4 NULL
-6529 "count" "bigint" 64 0 6535 NULL true 5
NULL
-6530 "unique" "bigint" 64 0 6535 NULL true
6 NULL
-6531 "nils" "bigint" 64 0 6535 NULL true 7
NULL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
