Changeset: 9538bd9cb92c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9538bd9cb92c
Modified Files:
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/exports.stable.out
sql/backends/monet5/sql_scenario.c
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_gsl.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/leaks/Tests/check0_gsl.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/drop3_gsl.stable.out
sql/test/leaks/Tests/select1_gsl.stable.out
sql/test/leaks/Tests/select2_gsl.stable.out
sql/test/leaks/Tests/temp1_gsl.stable.out
sql/test/leaks/Tests/temp2_gsl.stable.out
sql/test/leaks/Tests/temp3_gsl.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: default
Log Message:
Moved json atom upgrade to sql_update_default().
Also various approvals.
diffs (truncated from 1890 to 300 lines):
diff --git a/clients/Tests/SQL-dump_gsl.stable.out
b/clients/Tests/SQL-dump_gsl.stable.out
--- a/clients/Tests/SQL-dump_gsl.stable.out
+++ b/clients/Tests/SQL-dump_gsl.stable.out
@@ -1858,77 +1858,77 @@ 5694 "progress" "int" 32 0 5698
NULL tru
5695 "status" "clob" 0 0 5698 NULL true 5
NULL
5696 "tag" "oid" 63 0 5698 NULL true 6 NULL
5697 "query" "clob" 0 0 5698 NULL true 7 NULL
-6272 "schema" "clob" 0 0 6271 NULL true 0
NULL
-6273 "table" "clob" 0 0 6271 NULL true 1 NULL
-6274 "column" "clob" 0 0 6271 NULL true 2
NULL
-6275 "type" "clob" 0 0 6271 NULL true 3 NULL
-6276 "location" "clob" 0 0 6271 NULL true 4
NULL
-6277 "count" "bigint" 64 0 6271 NULL true 5
NULL
-6278 "typewidth" "int" 32 0 6271 NULL true 6
NULL
-6279 "columnsize" "bigint" 64 0 6271 NULL true
7 NULL
-6280 "heapsize" "bigint" 64 0 6271 NULL true
8 NULL
-6281 "indices" "bigint" 64 0 6271 NULL true
9 NULL
-6282 "sorted" "boolean" 1 0 6271 NULL true
10 NULL
-6287 "schema" "clob" 0 0 6298 NULL true 0
NULL
-6288 "table" "clob" 0 0 6298 NULL true 1 NULL
-6289 "column" "clob" 0 0 6298 NULL true 2
NULL
-6290 "type" "clob" 0 0 6298 NULL true 3 NULL
-6291 "location" "clob" 0 0 6298 NULL true 4
NULL
-6292 "count" "bigint" 64 0 6298 NULL true 5
NULL
-6293 "typewidth" "int" 32 0 6298 NULL true 6
NULL
-6294 "columnsize" "bigint" 64 0 6298 NULL true
7 NULL
-6295 "heapsize" "bigint" 64 0 6298 NULL true
8 NULL
-6296 "indices" "bigint" 64 0 6298 NULL true
9 NULL
-6297 "sorted" "boolean" 1 0 6298 NULL true
10 NULL
-6300 "schema" "clob" 0 0 6310 NULL true 0
NULL
-6301 "table" "clob" 0 0 6310 NULL true 1 NULL
-6302 "column" "clob" 0 0 6310 NULL true 2
NULL
-6303 "type" "clob" 0 0 6310 NULL true 3 NULL
-6304 "typewidth" "int" 32 0 6310 NULL true 4
NULL
-6305 "count" "bigint" 64 0 6310 NULL true 5
NULL
-6306 "distinct" "bigint" 64 0 6310 NULL true
6 NULL
-6307 "atomwidth" "int" 32 0 6310 NULL true 7
NULL
-6308 "reference" "boolean" 1 0 6310 NULL true
8 NULL
-6309 "sorted" "boolean" 1 0 6310 NULL true
9 NULL
-6331 "schema" "clob" 0 0 6330 NULL true 0
NULL
-6332 "table" "clob" 0 0 6330 NULL true 1 NULL
-6333 "column" "clob" 0 0 6330 NULL true 2
NULL
-6334 "type" "clob" 0 0 6330 NULL true 3 NULL
-6335 "count" "bigint" 64 0 6330 NULL true 4
NULL
-6336 "columnsize" "bigint" 64 0 6330 NULL true
5 NULL
-6337 "heapsize" "bigint" 64 0 6330 NULL true
6 NULL
-6338 "indices" "bigint" 64 0 6330 NULL true
7 NULL
-6339 "sorted" "boolean" 1 0 6330 NULL true
8 NULL
-6344 "schema" "clob" 0 0 6353 NULL true 0
NULL
-6345 "table" "clob" 0 0 6353 NULL true 1 NULL
-6346 "column" "clob" 0 0 6353 NULL true 2
NULL
-6347 "type" "clob" 0 0 6353 NULL true 3 NULL
-6348 "count" "bigint" 64 0 6353 NULL true 4
NULL
-6349 "columnsize" "bigint" 64 0 6353 NULL true
5 NULL
-6350 "heapsize" "bigint" 64 0 6353 NULL true
6 NULL
-6351 "indices" "bigint" 64 0 6353 NULL true
7 NULL
-6352 "sorted" "boolean" 1 0 6353 NULL true
8 NULL
-6355 "schema" "clob" 0 0 6362 NULL true 0
NULL
-6356 "table" "clob" 0 0 6362 NULL true 1 NULL
-6357 "count" "bigint" 64 0 6362 NULL true 2
NULL
-6358 "columnsize" "bigint" 64 0 6362 NULL true
3 NULL
-6359 "heapsize" "bigint" 64 0 6362 NULL true
4 NULL
-6360 "indices" "bigint" 64 0 6362 NULL true
5 NULL
-6361 "auxillary" "bigint" 53 0 6362 NULL true
6 NULL
-6364 "schema" "clob" 0 0 6377 NULL true 0
NULL
-6365 "table" "clob" 0 0 6377 NULL true 1 NULL
-6366 "column" "clob" 0 0 6377 NULL true 2
NULL
-6367 "type" "clob" 0 0 6377 NULL true 3 NULL
-6368 "width" "int" 32 0 6377 NULL true 4 NULL
-6369 "stamp" "timestamp" 7 0 6377 NULL true 5
NULL
-6370 "sample" "bigint" 64 0 6377 NULL true
6 NULL
-6371 "count" "bigint" 64 0 6377 NULL true 7
NULL
-6372 "unique" "bigint" 64 0 6377 NULL true
8 NULL
-6373 "nils" "bigint" 64 0 6377 NULL true 9
NULL
-6374 "minval" "clob" 0 0 6377 NULL true 10
NULL
-6375 "maxval" "clob" 0 0 6377 NULL true 11
NULL
-6376 "sorted" "boolean" 1 0 6377 NULL true
12 NULL
-6430 "function_id" "int" 32 0 6431 NULL true 0
NULL
+6296 "schema" "clob" 0 0 6295 NULL true 0
NULL
+6297 "table" "clob" 0 0 6295 NULL true 1 NULL
+6298 "column" "clob" 0 0 6295 NULL true 2
NULL
+6299 "type" "clob" 0 0 6295 NULL true 3 NULL
+6300 "location" "clob" 0 0 6295 NULL true 4
NULL
+6301 "count" "bigint" 64 0 6295 NULL true 5
NULL
+6302 "typewidth" "int" 32 0 6295 NULL true 6
NULL
+6303 "columnsize" "bigint" 64 0 6295 NULL true
7 NULL
+6304 "heapsize" "bigint" 64 0 6295 NULL true
8 NULL
+6305 "indices" "bigint" 64 0 6295 NULL true
9 NULL
+6306 "sorted" "boolean" 1 0 6295 NULL true
10 NULL
+6311 "schema" "clob" 0 0 6322 NULL true 0
NULL
+6312 "table" "clob" 0 0 6322 NULL true 1 NULL
+6313 "column" "clob" 0 0 6322 NULL true 2
NULL
+6314 "type" "clob" 0 0 6322 NULL true 3 NULL
+6315 "location" "clob" 0 0 6322 NULL true 4
NULL
+6316 "count" "bigint" 64 0 6322 NULL true 5
NULL
+6317 "typewidth" "int" 32 0 6322 NULL true 6
NULL
+6318 "columnsize" "bigint" 64 0 6322 NULL true
7 NULL
+6319 "heapsize" "bigint" 64 0 6322 NULL true
8 NULL
+6320 "indices" "bigint" 64 0 6322 NULL true
9 NULL
+6321 "sorted" "boolean" 1 0 6322 NULL true
10 NULL
+6324 "schema" "clob" 0 0 6334 NULL true 0
NULL
+6325 "table" "clob" 0 0 6334 NULL true 1 NULL
+6326 "column" "clob" 0 0 6334 NULL true 2
NULL
+6327 "type" "clob" 0 0 6334 NULL true 3 NULL
+6328 "typewidth" "int" 32 0 6334 NULL true 4
NULL
+6329 "count" "bigint" 64 0 6334 NULL true 5
NULL
+6330 "distinct" "bigint" 64 0 6334 NULL true
6 NULL
+6331 "atomwidth" "int" 32 0 6334 NULL true 7
NULL
+6332 "reference" "boolean" 1 0 6334 NULL true
8 NULL
+6333 "sorted" "boolean" 1 0 6334 NULL true
9 NULL
+6355 "schema" "clob" 0 0 6354 NULL true 0
NULL
+6356 "table" "clob" 0 0 6354 NULL true 1 NULL
+6357 "column" "clob" 0 0 6354 NULL true 2
NULL
+6358 "type" "clob" 0 0 6354 NULL true 3 NULL
+6359 "count" "bigint" 64 0 6354 NULL true 4
NULL
+6360 "columnsize" "bigint" 64 0 6354 NULL true
5 NULL
+6361 "heapsize" "bigint" 64 0 6354 NULL true
6 NULL
+6362 "indices" "bigint" 64 0 6354 NULL true
7 NULL
+6363 "sorted" "boolean" 1 0 6354 NULL true
8 NULL
+6368 "schema" "clob" 0 0 6377 NULL true 0
NULL
+6369 "table" "clob" 0 0 6377 NULL true 1 NULL
+6370 "column" "clob" 0 0 6377 NULL true 2
NULL
+6371 "type" "clob" 0 0 6377 NULL true 3 NULL
+6372 "count" "bigint" 64 0 6377 NULL true 4
NULL
+6373 "columnsize" "bigint" 64 0 6377 NULL true
5 NULL
+6374 "heapsize" "bigint" 64 0 6377 NULL true
6 NULL
+6375 "indices" "bigint" 64 0 6377 NULL true
7 NULL
+6376 "sorted" "boolean" 1 0 6377 NULL true
8 NULL
+6379 "schema" "clob" 0 0 6386 NULL true 0
NULL
+6380 "table" "clob" 0 0 6386 NULL true 1 NULL
+6381 "count" "bigint" 64 0 6386 NULL true 2
NULL
+6382 "columnsize" "bigint" 64 0 6386 NULL true
3 NULL
+6383 "heapsize" "bigint" 64 0 6386 NULL true
4 NULL
+6384 "indices" "bigint" 64 0 6386 NULL true
5 NULL
+6385 "auxillary" "bigint" 53 0 6386 NULL true
6 NULL
+6388 "schema" "clob" 0 0 6401 NULL true 0
NULL
+6389 "table" "clob" 0 0 6401 NULL true 1 NULL
+6390 "column" "clob" 0 0 6401 NULL true 2
NULL
+6391 "type" "clob" 0 0 6401 NULL true 3 NULL
+6392 "width" "int" 32 0 6401 NULL true 4 NULL
+6393 "stamp" "timestamp" 7 0 6401 NULL true 5
NULL
+6394 "sample" "bigint" 64 0 6401 NULL true
6 NULL
+6395 "count" "bigint" 64 0 6401 NULL true 7
NULL
+6396 "unique" "bigint" 64 0 6401 NULL true
8 NULL
+6397 "nils" "bigint" 64 0 6401 NULL true 9
NULL
+6398 "minval" "clob" 0 0 6401 NULL true 10
NULL
+6399 "maxval" "clob" 0 0 6401 NULL true 11
NULL
+6400 "sorted" "boolean" 1 0 6401 NULL true
12 NULL
+6454 "function_id" "int" 32 0 6455 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -2006,14 +2006,14 @@ 5656 "environment" 2000 "create view sys
5657 "#bbp" 2000 NULL 2 true 0 false
5677 "#queue" 2000 NULL 2 true 0 false
5698 "queue" 2000 "create view sys.queue as select * from sys.queue();"
1 true 0 false
-6271 "#storage" 2000 NULL 2 true 0 false
-6298 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
-6310 "storagemodelinput" 2000 NULL 0 true 0 false
-6330 "#storagemodel" 2000 NULL 2 true 0 false
-6353 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6362 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxillary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";" 1
true 0 false
-6377 "statistics" 2000 NULL 0 true 0 false
-6431 "systemfunctions" 2000 NULL 0 true 0 false
+6295 "#storage" 2000 NULL 2 true 0 false
+6322 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
+6334 "storagemodelinput" 2000 NULL 0 true 0 false
+6354 "#storagemodel" 2000 NULL 2 true 0 false
+6377 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
+6386 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxillary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";" 1
true 0 false
+6401 "statistics" 2000 NULL 0 true 0 false
+6455 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -2025,7 +2025,7 @@ CREATE TABLE "sys"."args" (
"type_scale" INTEGER,
"number" INTEGER
);
-COPY 3429 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3441 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2152 28 "result" "oid" 63 0 0
2153 28 "arg_1" "wrd" 64 0 1
2154 29 "result" "oid" 63 0 0
@@ -5386,16 +5386,16 @@ 6209 6207 "a" "geometry" 0 0
1
6210 6207 "b" "geometry" 0 0 2
6215 6214 "result" "json" 0 0 0
6216 6214 "js" "json" 0 0 1
-6217 6214 "name" "clob" 0 0 2
+6217 6214 "pathexpr" "clob" 0 0 2
6220 6219 "result" "json" 0 0 0
6221 6219 "js" "json" 0 0 1
-6222 6219 "name" "int" 32 0 2
+6222 6219 "name" "tinyint" 8 0 2
6225 6224 "result" "json" 0 0 0
6226 6224 "js" "json" 0 0 1
-6227 6224 "name" "clob" 0 0 2
+6227 6224 "name" "int" 32 0 2
6230 6229 "result" "json" 0 0 0
6231 6229 "js" "json" 0 0 1
-6232 6229 "e" "clob" 0 0 2
+6232 6229 "name" "bigint" 64 0 2
6235 6234 "result" "clob" 0 0 0
6236 6234 "js" "json" 0 0 1
6237 6234 "e" "clob" 0 0 2
@@ -5405,56 +5405,68 @@ 6244 6243 "result" "boolean" 1
0 0
6245 6243 "js" "clob" 0 0 1
6248 6247 "result" "boolean" 1 0 0
6249 6247 "js" "clob" 0 0 1
-6252 6251 "result" "int" 32 0 0
+6252 6251 "result" "boolean" 1 0 0
6253 6251 "js" "json" 0 0 1
-6256 6255 "result" "clob" 0 0 0
-6257 6255 "v" "clob" 0 0 1
-6261 6260 "result" "uuid" 0 0 0
-6264 6263 "result" "uuid" 0 0 0
-6265 6263 "u" "uuid" 0 0 1
-6268 6267 "result" "double" 53 0 0
-6269 6267 "chi2" "double" 53 0 1
-6270 6267 "datapoints" "double" 53 0 2
-6285 6284 "result" "table" 6271 0 0
-6315 6314 "result" "bigint" 64 0 0
-6316 6314 "nme" "clob" 0 0 1
-6317 6314 "i" "bigint" 64 0 2
-6318 6314 "d" "bigint" 64 0 3
-6321 6320 "result" "bigint" 64 0 0
-6322 6320 "tpe" "clob" 0 0 1
-6323 6320 "i" "bigint" 64 0 2
-6324 6320 "w" "int" 32 0 3
-6327 6326 "result" "bigint" 64 0 0
-6328 6326 "b" "boolean" 1 0 1
-6329 6326 "i" "bigint" 64 0 2
-6342 6341 "result" "table" 6330 0 0
-6382 6381 "tbl" "clob" 0 0 0
-6385 6384 "sch" "clob" 0 0 0
-6386 6384 "tbl" "clob" 0 0 1
-6389 6388 "sch" "clob" 0 0 0
-6390 6388 "tbl" "clob" 0 0 1
-6391 6388 "col" "clob" 0 0 2
-6394 6393 "sample" "bigint" 64 0 0
-6397 6396 "tbl" "clob" 0 0 0
-6398 6396 "sample" "bigint" 64 0 1
-6401 6400 "sch" "clob" 0 0 0
-6402 6400 "tbl" "clob" 0 0 1
-6403 6400 "sample" "bigint" 64 0 2
-6406 6405 "sch" "clob" 0 0 0
-6407 6405 "tbl" "clob" 0 0 1
-6408 6405 "col" "clob" 0 0 2
-6409 6405 "sample" "bigint" 64 0 3
-6412 6411 "result" "clob" 0 0 0
-6413 6411 "src" "clob" 0 0 1
-6416 6415 "result" "smallint" 16 0 0
-6417 6415 "one" "tinyint" 8 0 1
-6418 6415 "two" "tinyint" 8 0 2
-6421 6420 "result" "int" 32 0 0
-6422 6420 "one" "smallint" 16 0 1
-6423 6420 "two" "smallint" 16 0 2
-6426 6425 "result" "bigint" 64 0 0
-6427 6425 "one" "int" 32 0 1
-6428 6425 "two" "int" 32 0 2
+6256 6255 "result" "boolean" 1 0 0
+6257 6255 "js" "json" 0 0 1
+6260 6259 "result" "boolean" 1 0 0
+6261 6259 "js" "json" 0 0 1
+6264 6263 "result" "int" 32 0 0
+6265 6263 "js" "json" 0 0 1
+6268 6267 "result" "json" 0 0 0
+6269 6267 "js" "json" 0 0 1
+6272 6271 "result" "json" 0 0 0
+6273 6271 "js" "json" 0 0 1
+6276 6275 "result" "clob" 0 0 0
+6277 6275 "js" "json" 0 0 1
+6280 6279 "result" "clob" 0 0 0
+6281 6279 "v" "clob" 0 0 1
+6285 6284 "result" "uuid" 0 0 0
+6288 6287 "result" "uuid" 0 0 0
+6289 6287 "u" "uuid" 0 0 1
+6292 6291 "result" "double" 53 0 0
+6293 6291 "chi2" "double" 53 0 1
+6294 6291 "datapoints" "double" 53 0 2
+6309 6308 "result" "table" 6295 0 0
+6339 6338 "result" "bigint" 64 0 0
+6340 6338 "nme" "clob" 0 0 1
+6341 6338 "i" "bigint" 64 0 2
+6342 6338 "d" "bigint" 64 0 3
+6345 6344 "result" "bigint" 64 0 0
+6346 6344 "tpe" "clob" 0 0 1
+6347 6344 "i" "bigint" 64 0 2
+6348 6344 "w" "int" 32 0 3
+6351 6350 "result" "bigint" 64 0 0
+6352 6350 "b" "boolean" 1 0 1
+6353 6350 "i" "bigint" 64 0 2
+6366 6365 "result" "table" 6354 0 0
+6406 6405 "tbl" "clob" 0 0 0
+6409 6408 "sch" "clob" 0 0 0
+6410 6408 "tbl" "clob" 0 0 1
+6413 6412 "sch" "clob" 0 0 0
+6414 6412 "tbl" "clob" 0 0 1
+6415 6412 "col" "clob" 0 0 2
+6418 6417 "sample" "bigint" 64 0 0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
