Changeset: c87610d80785 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c87610d80785 Modified Files: monetdb5/mal/Tests/tst3010.stable.out monetdb5/mal/Tests/tst3050.stable.out monetdb5/mal/Tests/tst830.stable.out monetdb5/optimizer/Tests/common.stable.out monetdb5/scheduler/Tests/sched00.stable.out Branch: Aug2011 Log Message:
Minor output adjustments (transplanted from ae72a7f2f005e734062edc3de549193a902be2b5) diffs (201 lines): diff --git a/monetdb5/mal/Tests/tst3010.stable.out b/monetdb5/mal/Tests/tst3010.stable.out --- a/monetdb5/mal/Tests/tst3010.stable.out +++ b/monetdb5/mal/Tests/tst3010.stable.out @@ -12,12 +12,10 @@ # dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm # dbname:mTests_src_mal # Visit http://monetdb.cwi.nl/ for further information -##Parsing properties and keeping them around -#function add(i:int{readonly},j:int{readonly}):int{writeable,safe}; -# j:= j+i; -# return j; -#end add; -function user.add{writeable,safe}(i:int,j:int):int; +# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:38399/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +function user.add{writeable, safe}(i:int,j:int):int; j := calc.+(j,i); return add := j; end add; diff --git a/monetdb5/mal/Tests/tst3050.stable.out b/monetdb5/mal/Tests/tst3050.stable.out --- a/monetdb5/mal/Tests/tst3050.stable.out +++ b/monetdb5/mal/Tests/tst3050.stable.out @@ -19,9 +19,7 @@ function user.dummy{dense=true}(a:int,b:int):int; return dummy := 1; end dummy; -#function myprint{unsafe,optimizer}():void; -#end myprint; -function user.myprint{unsafe,optimizer}():void; +function user.myprint{unsafe, optimizer}():void; end myprint; # #a:= 0; diff --git a/monetdb5/mal/Tests/tst830.stable.out b/monetdb5/mal/Tests/tst830.stable.out --- a/monetdb5/mal/Tests/tst830.stable.out +++ b/monetdb5/mal/Tests/tst830.stable.out @@ -113,16 +113,16 @@ # oid str # type #-------------------------# [ 0@0, "monetdb" ] +[ 1@0, "test" ] [ 2@0, "checkpoint" ] -[ 1@0, "test" ] #-------------------------# # h t # name # oid str # type #-------------------------# [ 0@0, "monetdb" ] [ 1@0, "test" ] -MALException:removeScenario:scenario 'mal' not found for user 'test' -MALException:addScenario:scenario 'mal' already exists for user 'test' +MALException:removeScenario:scenario-based authorisation is no longer supported +MALException:addScenario:scenario-based authorisation is no longer supported InvalidCredentialsException:setPassword:The administrator cannot set its own password, use changePassword instead InvalidCredentialsException:changePassword:Access denied InvalidCredentialsException:checkCredentials:invalid credentials for user 'monetdb' diff --git a/monetdb5/optimizer/Tests/common.stable.out b/monetdb5/optimizer/Tests/common.stable.out --- a/monetdb5/optimizer/Tests/common.stable.out +++ b/monetdb5/optimizer/Tests/common.stable.out @@ -13,10 +13,10 @@ # Visit http://monetdb.cwi.nl/ for further information # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/ function sql.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2]; - return _5 := bat.new(:any_1,:any_2); + return X_5 := bat.new(:any_1,:any_2); end bind; function sql.bind_dbat(s:str,t:str,i:int):bat[:any_1,:any_2]; - return _4 := bat.new(:any_1,:any_2); + return X_4 := bat.new(:any_1,:any_2); end bind_dbat; function user.s0_0():void; X1:bat[:oid,:int] := sql.bind("tmp","_tables","id",0); @@ -258,16 +258,9 @@ X48 := bat.reverse(X47); X49 := algebra.join(X48,X46); bat.append(X35,X15,true); - X77 := algebra.thetauselect(X35,2:sht,"<"); - X78 := algebra.markT(X77,0@0); - X79 := bat.reverse(X78); bat.append(X44,X43,true); - X83 := algebra.join(X79,X44); - X84 := algebra.markT(X83,0@0); - X85 := bat.reverse(X84); - X86 := algebra.join(X85,X83); - bat.append(X86,X49,true); - (ext115,grp113) := group.new(X86); + bat.append(X49,X49,true); + (ext115,grp113) := group.new(X49); X90:bat[:oid,:str] := sql.bind("tmp","_tables","name",0); X92 := algebra.join(X12,X90); X93:bat[:oid,:str] := sql.bind("sys","_tables","name",0); @@ -281,10 +274,8 @@ X101 := algebra.join(X42,X99); X102 := algebra.join(X48,X101); bat.append(X99,X92,true); - X106 := algebra.join(X79,X99); - X107 := algebra.join(X85,X106); - bat.append(X107,X102,true); - (ext151,grp149) := group.derive(ext115,grp113,X107); + bat.append(X102,X102,true); + (ext151,grp149) := group.derive(ext115,grp113,X102); X111:bat[:oid,:int] := sql.bind("tmp","_tables","schema_id",0); X113 := algebra.join(X12,X111); X114:bat[:oid,:int] := sql.bind("sys","_tables","schema_id",0); @@ -298,10 +289,8 @@ X122 := algebra.join(X42,X120); X123 := algebra.join(X48,X122); bat.append(X120,X113,true); - X127 := algebra.join(X79,X120); - X128 := algebra.join(X85,X127); - bat.append(X128,X123,true); - (ext187,grp185) := group.derive(ext151,grp149,X128); + bat.append(X123,X123,true); + (ext187,grp185) := group.derive(ext151,grp149,X123); X132:bat[:oid,:str] := sql.bind("tmp","_tables","query",0); X134 := algebra.join(X12,X132); X135:bat[:oid,:str] := sql.bind("sys","_tables","query",0); @@ -315,16 +304,12 @@ X143 := algebra.join(X42,X141); X144 := algebra.join(X48,X143); bat.append(X141,X134,true); - X148 := algebra.join(X79,X141); - X149 := algebra.join(X85,X148); - bat.append(X149,X144,true); - (ext223,grp221) := group.derive(ext187,grp185,X149); + bat.append(X144,X144,true); + (ext223,grp221) := group.derive(ext187,grp185,X144); X153 := algebra.join(X42,X35); X154 := algebra.join(X48,X153); - X155 := algebra.join(X79,X35); - X156 := algebra.join(X85,X155); - bat.append(X156,X154,true); - (ext231,grp229) := group.derive(ext223,grp221,X156); + bat.append(X154,X154,true); + (ext231,grp229) := group.derive(ext223,grp221,X154); X160:bat[:oid,:bit] := sql.bind("tmp","_tables","system",0); X162 := algebra.join(X12,X160); X163:bat[:oid,:bit] := sql.bind("sys","_tables","system",0); @@ -338,10 +323,8 @@ X171 := algebra.join(X42,X169); X172 := algebra.join(X48,X171); bat.append(X169,X162,true); - X176 := algebra.join(X79,X169); - X177 := algebra.join(X85,X176); - bat.append(X177,X172,true); - (ext267,grp265) := group.derive(ext231,grp229,X177); + bat.append(X172,X172,true); + (ext267,grp265) := group.derive(ext231,grp229,X172); X181:bat[:oid,:sht] := sql.bind("tmp","_tables","commit_action",0); X183 := algebra.join(X12,X181); X184:bat[:oid,:sht] := sql.bind("sys","_tables","commit_action",0); @@ -355,22 +338,18 @@ X192 := algebra.join(X42,X190); X193 := algebra.join(X48,X192); bat.append(X190,X183,true); - X197 := algebra.join(X79,X190); - X198 := algebra.join(X85,X197); - bat.append(X198,X193,true); - (ext303,grp301) := group.derive(ext267,grp265,X198); + bat.append(X193,X193,true); + (ext303,grp301) := group.derive(ext267,grp265,X193); X203 := algebra.project(X12,1); X205 := algebra.project(X28,0); bat.append(X205,X203,true); X207 := algebra.join(X42,X205); X208 := algebra.join(X48,X207); bat.append(X205,X203,true); - X212 := algebra.join(X79,X205); - X213 := algebra.join(X85,X212); - bat.append(X213,X208,true); - (ext324,grp322) := group.derive(ext303,grp301,X213); + bat.append(X208,X208,true); + (ext324,grp322) := group.derive(ext303,grp301,X208); X217 := bat.mirror(ext324); - X218 := algebra.join(X217,X86); + X218 := algebra.join(X217,X49); X219 := algebra.markT(X218,0@0); X220 := bat.reverse(X219); X221 := aggr.count(X220); diff --git a/monetdb5/scheduler/Tests/sched00.stable.out b/monetdb5/scheduler/Tests/sched00.stable.out --- a/monetdb5/scheduler/Tests/sched00.stable.out +++ b/monetdb5/scheduler/Tests/sched00.stable.out @@ -26,7 +26,7 @@ #shows self-modification in action end main; function user.f():void; # 0 f:void := user.f() {G} - i{runonce,rows>4} := 1; # 1 i:int := _3:int + i{runonce, rows>4} := 1; # 1 i:int := _3:int # just properties mdb.List(); # 3 _5:void := MDBlistDetail() io.print("start running\n"); # 4 _6:void := IOprint_val(_7:str) {G} @@ -36,7 +36,7 @@ end f; # 8 [ "start running\n" ] function user.f():void; # 0 f:void := user.f() {G} - i{runonce,rows>4} := 1; # 1 i:int := _3:int + i{runonce, rows>4} := 1; # 1 i:int := _3:int # just properties mdb.List(); # 3 _5:void := MDBlistDetail() io.print("start running\n"); # 4 _6:void := IOprint_val(_7:str) {G} _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
