Changeset: 77dff9afa04e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77dff9afa04e
Modified Files:
monetdb5/mal/Tests/tst1201.stable.out
monetdb5/mal/Tests/tst1202.stable.out
monetdb5/mal/Tests/tst1203.stable.out
monetdb5/mal/Tests/tst1205.stable.out
monetdb5/mal/Tests/tst850.stable.out
monetdb5/modules/mal/Tests/manifold.stable.out
monetdb5/modules/mal/Tests/manifoldstr.stable.out
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/40_json.sql
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
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.stable.out
sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dump/Tests/dump-empty.stable.out
sql/test/Dump/Tests/dump.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/UserDump/Tests/create.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/json/Tests/All
sql/test/json/Tests/books.sql
sql/test/json/Tests/books.stable.out
sql/test/json/Tests/miniexample.sql
sql/test/json/Tests/pgexample.sql
sql/test/json/Tests/pgexample.stable.out
sql/test/json/Tests/spaceissue.sql
sql/test/json/Tests/spaceissue.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/sql_xml/Tests/xml.stable.out
Branch: default
Log Message:
Manifold and json schema test approvals.
diffs (truncated from 1777 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst1201.stable.out
b/monetdb5/mal/Tests/tst1201.stable.out
--- a/monetdb5/mal/Tests/tst1201.stable.out
+++ b/monetdb5/mal/Tests/tst1201.stable.out
@@ -215,296 +215,72 @@ function user.main():void;
## test the operations on rules
ma_a := bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- X_206 := bat.reverse(rule_bat);
- X_208 := bat.new(nil:oid,nil:int);
-barrier (X_212,X_213) := iterator.new(rule_bat);
- X_215 := mtime.month(X_213);
- X_216 := algebra.fetch(X_206,X_212);
- bat.insert(X_208,X_216,X_215);
- redo (X_212,X_213) := iterator.next(rule_bat);
-exit (X_212,X_213);
- na_a:bat[:oid,:int] := X_208;
+ na_a:bat[:oid,:int] := mal.manifold("mtime","month",rule_bat);
oa_a := bat.setColumn(na_a,"month");
# [month](rule_bat).bat.setColumn("month"),
- X_222 := bat.reverse(rule_bat);
- X_224 := bat.new(nil:oid,nil:int);
-barrier (X_226,X_227) := iterator.new(rule_bat);
- X_229 := mtime.weekday(X_227);
- X_230 := algebra.fetch(X_222,X_226);
- bat.insert(X_224,X_230,X_229);
- redo (X_226,X_227) := iterator.next(rule_bat);
-exit (X_226,X_227);
- pa_a:bat[:oid,:int] := X_224;
+ pa_a:bat[:oid,:int] := mal.manifold("mtime","weekday",rule_bat);
qa_a := bat.setColumn(pa_a,"weekday");
# [weekday](rule_bat).bat.setColumn("weekday"),
- X_236 := bat.reverse(rule_bat);
- X_238 := bat.new(nil:oid,nil:int);
-barrier (X_240,X_241) := iterator.new(rule_bat);
- X_243 := mtime.day(X_241);
- X_244 := algebra.fetch(X_236,X_240);
- bat.insert(X_238,X_244,X_243);
- redo (X_240,X_241) := iterator.next(rule_bat);
-exit (X_240,X_241);
- ra_a:bat[:oid,:int] := X_238;
+ ra_a:bat[:oid,:int] := mal.manifold("mtime","day",rule_bat);
sa_a := bat.setColumn(ra_a,"day");
# [day](rule_bat).bat.setColumn("day"),
- X_250 := bat.reverse(rule_bat);
- X_252 := bat.new(nil:oid,nil:int);
-barrier (X_256,X_257) := iterator.new(rule_bat);
- X_259 := mtime.minutes(X_257);
- X_260 := algebra.fetch(X_250,X_256);
- bat.insert(X_252,X_260,X_259);
- redo (X_256,X_257) := iterator.next(rule_bat);
-exit (X_256,X_257);
- ta_a:bat[:oid,:int] := X_252;
+ ta_a:bat[:oid,:int] := mal.manifold("mtime","minutes",rule_bat);
ua_a := bat.setColumn(ta_a,"minutes");
io.print("rule_bat,na_a,pa_a,ra_a,ta_a");
va_a := io.print(rule_nme,rule_bat,na_a,pa_a,ra_a,ta_a);
# [minutes](rule_bat).bat.setColumn("minutes"));
bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- X_266 := bat.reverse(rule_bat);
- X_268 := bat.new(nil:oid,nil:date);
-barrier (X_271,X_272) := iterator.new(rule_bat);
- X_274 := mtime.compute(X_272,2001);
- X_275 := algebra.fetch(X_266,X_271);
- bat.insert(X_268,X_275,X_274);
- redo (X_271,X_272) := iterator.next(rule_bat);
-exit (X_271,X_272);
- xa_a:bat[:oid,:date] := X_268;
+ xa_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,2001);
ya_a := bat.setColumn(xa_a,"2001");
# [compute](rule_bat, 2001).bat.setColumn("2001"),
- X_281 := bat.reverse(rule_bat);
- X_283 := bat.new(nil:oid,nil:date);
-barrier (X_285,X_286) := iterator.new(rule_bat);
- X_288 := mtime.compute(X_286,2001);
- X_289 := algebra.fetch(X_281,X_285);
- bat.insert(X_283,X_289,X_288);
- redo (X_285,X_286) := iterator.next(rule_bat);
-exit (X_285,X_286);
- ab_a:bat[:oid,:date] := X_283;
- X_295 := bat.reverse(ab_a);
- X_297 := bat.new(nil:oid,nil:int);
-barrier (X_301,X_302) := iterator.new(ab_a);
- X_304 := mtime.dayofweek(X_302);
- X_305 := algebra.fetch(X_295,X_301);
- bat.insert(X_297,X_305,X_304);
- redo (X_301,X_302) := iterator.next(ab_a);
-exit (X_301,X_302);
- bb_a:bat[:oid,:int] := X_297;
- X_311 := bat.reverse(bb_a);
- X_313 := bat.new(nil:oid,nil:str);
-barrier (X_316,X_317) := iterator.new(bb_a);
- X_319 := mtime.dayname(X_317);
- X_320 := algebra.fetch(X_311,X_316);
- bat.insert(X_313,X_320,X_319);
- redo (X_316,X_317) := iterator.next(bb_a);
-exit (X_316,X_317);
- cb_a:bat[:oid,:str] := X_313;
+ ab_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,2001);
+ bb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",ab_a);
+ cb_a:bat[:oid,:str] := mal.manifold("mtime","dayname",bb_a);
bat.setColumn(cb_a,"2001");
# [dayname]([dayofweek]([compute](rule_bat,
2001))).bat.setColumn("2001"),
- X_326 := bat.reverse(rule_bat);
- X_328 := bat.new(nil:oid,nil:date);
-barrier (X_331,X_332) := iterator.new(rule_bat);
- X_334 := mtime.compute(X_332,1999);
- X_335 := algebra.fetch(X_326,X_331);
- bat.insert(X_328,X_335,X_334);
- redo (X_331,X_332) := iterator.next(rule_bat);
-exit (X_331,X_332);
- eb_a:bat[:oid,:date] := X_328;
+ eb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1999);
bat.setColumn(eb_a,"1999");
# [compute](rule_bat, 1999).bat.setColumn("1999"),
- X_341 := bat.reverse(rule_bat);
- X_343 := bat.new(nil:oid,nil:date);
-barrier (X_346,X_347) := iterator.new(rule_bat);
- X_349 := mtime.compute(X_347,1999);
- X_350 := algebra.fetch(X_341,X_346);
- bat.insert(X_343,X_350,X_349);
- redo (X_346,X_347) := iterator.next(rule_bat);
-exit (X_346,X_347);
- gb_a:bat[:oid,:date] := X_343;
- X_356 := bat.reverse(gb_a);
- X_358 := bat.new(nil:oid,nil:int);
-barrier (X_361,X_362) := iterator.new(gb_a);
- X_364 := mtime.dayofweek(X_362);
- X_365 := algebra.fetch(X_356,X_361);
- bat.insert(X_358,X_365,X_364);
- redo (X_361,X_362) := iterator.next(gb_a);
-exit (X_361,X_362);
- hb_a:bat[:oid,:int] := X_358;
- X_371 := bat.reverse(hb_a);
- X_373 := bat.new(nil:oid,nil:str);
-barrier (X_376,X_377) := iterator.new(hb_a);
- X_379 := mtime.dayname(X_377);
- X_380 := algebra.fetch(X_371,X_376);
- bat.insert(X_373,X_380,X_379);
- redo (X_376,X_377) := iterator.next(hb_a);
-exit (X_376,X_377);
- ib_a:bat[:oid,:str] := X_373;
+ gb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1999);
+ hb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",gb_a);
+ ib_a:bat[:oid,:str] := mal.manifold("mtime","dayname",hb_a);
bat.setColumn(ib_a,"1999");
# [dayname]([dayofweek]([compute](rule_bat,
1999))).bat.setColumn("1999"),
- X_386 := bat.reverse(rule_bat);
- X_388 := bat.new(nil:oid,nil:date);
-barrier (X_392,X_393) := iterator.new(rule_bat);
- X_395 := mtime.compute(X_393,1992);
- X_396 := algebra.fetch(X_386,X_392);
- bat.insert(X_388,X_396,X_395);
- redo (X_392,X_393) := iterator.next(rule_bat);
-exit (X_392,X_393);
- kb_a:bat[:oid,:date] := X_388;
+ kb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1992);
bat.setColumn(kb_a,"1992");
# [compute](rule_bat, 1992).bat.setColumn("1992"),
- X_402 := bat.reverse(rule_bat);
- X_404 := bat.new(nil:oid,nil:date);
-barrier (X_406,X_407) := iterator.new(rule_bat);
- X_409 := mtime.compute(X_407,1992);
- X_410 := algebra.fetch(X_402,X_406);
- bat.insert(X_404,X_410,X_409);
- redo (X_406,X_407) := iterator.next(rule_bat);
-exit (X_406,X_407);
- mb_a:bat[:oid,:date] := X_404;
- X_416 := bat.reverse(mb_a);
- X_418 := bat.new(nil:oid,nil:int);
-barrier (X_421,X_422) := iterator.new(mb_a);
- X_424 := mtime.dayofweek(X_422);
- X_425 := algebra.fetch(X_416,X_421);
- bat.insert(X_418,X_425,X_424);
- redo (X_421,X_422) := iterator.next(mb_a);
-exit (X_421,X_422);
- nb_a:bat[:oid,:int] := X_418;
- X_431 := bat.reverse(nb_a);
- X_433 := bat.new(nil:oid,nil:str);
-barrier (X_437,X_438) := iterator.new(nb_a);
- X_440 := mtime.dayname(X_438);
- X_441 := algebra.fetch(X_431,X_437);
- bat.insert(X_433,X_441,X_440);
- redo (X_437,X_438) := iterator.next(nb_a);
-exit (X_437,X_438);
- ob_a:bat[:oid,:str] := X_433;
+ mb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1992);
+ nb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",mb_a);
+ ob_a:bat[:oid,:str] := mal.manifold("mtime","dayname",nb_a);
bat.setColumn(ob_a,"1992");
io.print("rule_bat,xa_a,cb_a,eb_a,ib_a,kb_a,ob_a");
qb_a := io.print(rule_nme,rule_bat,xa_a,cb_a,eb_a,ib_a,kb_a,ob_a);
# [dayname]([dayofweek]([compute](rule_bat,
1992))).bat.setColumn("1992"));
rb_a := bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- X_447 := bat.reverse(rule_bat);
- X_449 := bat.new(nil:oid,nil:date);
-barrier (X_452,X_453) := iterator.new(rule_bat);
- X_455 := mtime.compute(X_453,1572);
- X_456 := algebra.fetch(X_447,X_452);
- bat.insert(X_449,X_456,X_455);
- redo (X_452,X_453) := iterator.next(rule_bat);
-exit (X_452,X_453);
- sb_a:bat[:oid,:date] := X_449;
+ sb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1572);
tb_a := bat.setColumn(sb_a,"1572");
# [compute](rule_bat, 1572).bat.setColumn("1572"),
- X_462 := bat.reverse(rule_bat);
- X_464 := bat.new(nil:oid,nil:date);
-barrier (X_466,X_467) := iterator.new(rule_bat);
- X_469 := mtime.compute(X_467,1572);
- X_470 := algebra.fetch(X_462,X_466);
- bat.insert(X_464,X_470,X_469);
- redo (X_466,X_467) := iterator.next(rule_bat);
-exit (X_466,X_467);
- ub_a:bat[:oid,:date] := X_464;
- X_476 := bat.reverse(ub_a);
- X_478 := bat.new(nil:oid,nil:int);
-barrier (X_482,X_483) := iterator.new(ub_a);
- X_485 := mtime.dayofweek(X_483);
- X_486 := algebra.fetch(X_476,X_482);
- bat.insert(X_478,X_486,X_485);
- redo (X_482,X_483) := iterator.next(ub_a);
-exit (X_482,X_483);
- vb_a:bat[:oid,:int] := X_478;
- X_492 := bat.reverse(vb_a);
- X_494 := bat.new(nil:oid,nil:str);
-barrier (X_497,X_498) := iterator.new(vb_a);
- X_500 := mtime.dayname(X_498);
- X_501 := algebra.fetch(X_492,X_497);
- bat.insert(X_494,X_501,X_500);
- redo (X_497,X_498) := iterator.next(vb_a);
-exit (X_497,X_498);
- wb_a:bat[:oid,:str] := X_494;
+ ub_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1572);
+ vb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",ub_a);
+ wb_a:bat[:oid,:str] := mal.manifold("mtime","dayname",vb_a);
xb_a := bat.setColumn(wb_a,"1572");
# [dayname]([dayofweek]([compute](rule_bat,
1572))).bat.setColumn("1572"),
- X_507 := bat.reverse(rule_bat);
- X_509 := bat.new(nil:oid,nil:date);
-barrier (X_512,X_513) := iterator.new(rule_bat);
- X_515 := mtime.compute(X_513,1);
- X_516 := algebra.fetch(X_507,X_512);
- bat.insert(X_509,X_516,X_515);
- redo (X_512,X_513) := iterator.next(rule_bat);
-exit (X_512,X_513);
- yb_a:bat[:oid,:date] := X_509;
+ yb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1);
ac_a := bat.setColumn(yb_a,"1");
# [compute](rule_bat, 1).bat.setColumn("1"),
- X_522 := bat.reverse(rule_bat);
- X_524 := bat.new(nil:oid,nil:date);
-barrier (X_527,X_528) := iterator.new(rule_bat);
- X_530 := mtime.compute(X_528,1);
- X_531 := algebra.fetch(X_522,X_527);
- bat.insert(X_524,X_531,X_530);
- redo (X_527,X_528) := iterator.next(rule_bat);
-exit (X_527,X_528);
- bc_a:bat[:oid,:date] := X_524;
- X_537 := bat.reverse(bc_a);
- X_539 := bat.new(nil:oid,nil:int);
-barrier (X_542,X_543) := iterator.new(bc_a);
- X_545 := mtime.dayofweek(X_543);
- X_546 := algebra.fetch(X_537,X_542);
- bat.insert(X_539,X_546,X_545);
- redo (X_542,X_543) := iterator.next(bc_a);
-exit (X_542,X_543);
- cc_a:bat[:oid,:int] := X_539;
- X_552 := bat.reverse(cc_a);
- X_554 := bat.new(nil:oid,nil:str);
-barrier (X_557,X_558) := iterator.new(cc_a);
- X_560 := mtime.dayname(X_558);
- X_561 := algebra.fetch(X_552,X_557);
- bat.insert(X_554,X_561,X_560);
- redo (X_557,X_558) := iterator.next(cc_a);
-exit (X_557,X_558);
- dc_a:bat[:oid,:str] := X_554;
+ bc_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1);
+ cc_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",bc_a);
+ dc_a:bat[:oid,:str] := mal.manifold("mtime","dayname",cc_a);
ec_a := bat.setColumn(dc_a,"1");
# [dayname]([dayofweek]([compute](rule_bat, 1))).bat.setColumn("1"),
- X_567 := bat.reverse(rule_bat);
- X_569 := bat.new(nil:oid,nil:date);
-barrier (X_573,X_574) := iterator.new(rule_bat);
- X_576 := mtime.compute(X_574,-2000);
- X_577 := algebra.fetch(X_567,X_573);
- bat.insert(X_569,X_577,X_576);
- redo (X_573,X_574) := iterator.next(rule_bat);
-exit (X_573,X_574);
- fc_a:bat[:oid,:date] := X_569;
+ fc_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,-2000);
gc_a := bat.setColumn(fc_a,"-2000");
# [compute](rule_bat, -2000).bat.setColumn("-2000"),
- X_583 := bat.reverse(rule_bat);
- X_585 := bat.new(nil:oid,nil:date);
-barrier (X_587,X_588) := iterator.new(rule_bat);
- X_590 := mtime.compute(X_588,-2000);
- X_591 := algebra.fetch(X_583,X_587);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
