Changeset: fd8e80c1c74a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd8e80c1c74a
Modified Files:
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
Branch: default
Log Message:
Approvals
diffs (truncated from 443 to 300 lines):
diff --git
a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
@@ -71,7 +71,7 @@ stderr of test 'explain_gives_crash.SF-2
# 22:45:54 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35519
# 22:45:54 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-23269/.s.monetdb.37617
QUERY = alter table blabla drop constraint dada;
ERROR = !ALTER TABLE: no such constraint 'dada'
diff --git
a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
@@ -26,75 +26,72 @@ Ready.
#~BeginVariableOutput~#
function user.s4_1{autoCommit=true}():void;
-" X_34:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",23);"
+" X_32:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",22);"
X_2 := sql.mvc();
" sql.catalog(29,""sys"",nil,0);"
" X_10:bat[:oid,:int] := sql.bind(X_2,""sys"",""blabla"",""id"",0);"
" X_8:bat[:oid,:oid] := sql.tid(X_2,""sys"",""blabla"");"
-" X_45 := algebra.subselect(X_10,X_8,nil:int,nil:int,true,true,true);"
+" X_43 := algebra.subselect(X_10,X_8,nil:int,nil:int,true,true,true);"
" (X_12,r1_15) := sql.bind(X_2,""sys"",""blabla"",""id"",2);"
-" X_46 :=
algebra.subselect(r1_15,nil:bat[:oid,:oid],nil:int,nil:int,true,true,true);"
+" X_44 :=
algebra.subselect(r1_15,nil:bat[:oid,:oid],nil:int,nil:int,true,true,true);"
" X_15:bat[:oid,:int] := sql.bind(X_2,""sys"",""blabla"",""id"",1);"
-" X_48 := algebra.subselect(X_15,X_8,nil:int,nil:int,true,true,true);"
-" X_19 := sql.subdelta(X_45,X_8,X_12,X_46,X_48);"
-" X_17 := sql.delta(X_10,X_12,r1_15,X_15);"
-" X_20 := algebra.leftjoin(X_19,X_17);"
-" (X_21,r1_26,r2_26) := group.subgroupdone(X_20);"
- X_24 := aggr.count(r2_26);
- X_25:wrd := aggr.sum(r2_26);
- X_26 := calc.isnil(X_25);
-" X_28 := calc.ifthenelse(X_26,0,X_25);"
-" X_29 := calc.!=(X_24,X_28);"
-" sql.assert(X_29,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
-" sql.exportOperation("""");"
+" X_46 := algebra.subselect(X_15,X_8,nil:int,nil:int,true,true,true);"
+" X_18 := sql.subdelta(X_43,X_8,X_12,X_44,X_46);"
+" X_19 := sql.projectdelta(X_18,X_10,X_12,r1_15,X_15);"
+" (X_20,r1_26,r2_26) := group.subgroupdone(X_19);"
+ X_23 := aggr.count(r2_26);
+ X_24:wrd := aggr.sum(r2_26);
+ X_25 := calc.isnil(X_24);
+" X_27 := calc.ifthenelse(X_25,0,X_24);"
+" X_28 := calc.!=(X_23,X_27);"
+" sql.assert(X_28,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
+ sql.exportOperation();
end user.s4_1;
function user.s5_1{autoCommit=true}():void;
-" X_34:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",23);"
+" X_32:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",22);"
X_2 := sql.mvc();
" sql.catalog(29,""sys"",nil,0);"
" X_10:bat[:oid,:int] := sql.bind(X_2,""sys"",""blabla"",""id"",0);"
" X_8:bat[:oid,:oid] := sql.tid(X_2,""sys"",""blabla"");"
-" X_45 := algebra.subselect(X_10,X_8,nil:int,nil:int,true,true,true);"
+" X_43 := algebra.subselect(X_10,X_8,nil:int,nil:int,true,true,true);"
" (X_12,r1_15) := sql.bind(X_2,""sys"",""blabla"",""id"",2);"
-" X_46 :=
algebra.subselect(r1_15,nil:bat[:oid,:oid],nil:int,nil:int,true,true,true);"
+" X_44 :=
algebra.subselect(r1_15,nil:bat[:oid,:oid],nil:int,nil:int,true,true,true);"
" X_15:bat[:oid,:int] := sql.bind(X_2,""sys"",""blabla"",""id"",1);"
-" X_48 := algebra.subselect(X_15,X_8,nil:int,nil:int,true,true,true);"
-" X_19 := sql.subdelta(X_45,X_8,X_12,X_46,X_48);"
-" X_17 := sql.delta(X_10,X_12,r1_15,X_15);"
-" X_20 := algebra.leftjoin(X_19,X_17);"
-" (X_21,r1_26,r2_26) := group.subgroupdone(X_20);"
- X_24 := aggr.count(r2_26);
- X_25:wrd := aggr.sum(r2_26);
- X_26 := calc.isnil(X_25);
-" X_28 := calc.ifthenelse(X_26,0,X_25);"
-" X_29 := calc.!=(X_24,X_28);"
-" sql.assert(X_29,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
-" sql.exportOperation("""");"
+" X_46 := algebra.subselect(X_15,X_8,nil:int,nil:int,true,true,true);"
+" X_18 := sql.subdelta(X_43,X_8,X_12,X_44,X_46);"
+" X_19 := sql.projectdelta(X_18,X_10,X_12,r1_15,X_15);"
+" (X_20,r1_26,r2_26) := group.subgroupdone(X_19);"
+ X_23 := aggr.count(r2_26);
+ X_24:wrd := aggr.sum(r2_26);
+ X_25 := calc.isnil(X_24);
+" X_27 := calc.ifthenelse(X_25,0,X_24);"
+" X_28 := calc.!=(X_23,X_27);"
+" sql.assert(X_28,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
+ sql.exportOperation();
end user.s5_1;
#~EndVariableOutput~#
#~BeginVariableOutput~#
function user.s9_1{autoCommit=true}():void;
-" X_34:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",23);"
+" X_32:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",22);"
X_2 := sql.mvc();
" sql.catalog(29,""sys"",nil,0);"
" X_10:bat[:oid,:int] := sql.bind(X_2,""sys"",""blabla"",""id"",0);"
" X_8:bat[:oid,:oid] := sql.tid(X_2,""sys"",""blabla"");"
-" X_45 := algebra.subselect(X_10,X_8,nil:int,nil:int,true,true,true);"
+" X_43 := algebra.subselect(X_10,X_8,nil:int,nil:int,true,true,true);"
" (X_12,r1_15) := sql.bind(X_2,""sys"",""blabla"",""id"",2);"
-" X_46 :=
algebra.subselect(r1_15,nil:bat[:oid,:oid],nil:int,nil:int,true,true,true);"
+" X_44 :=
algebra.subselect(r1_15,nil:bat[:oid,:oid],nil:int,nil:int,true,true,true);"
" X_15:bat[:oid,:int] := sql.bind(X_2,""sys"",""blabla"",""id"",1);"
-" X_48 := algebra.subselect(X_15,X_8,nil:int,nil:int,true,true,true);"
-" X_19 := sql.subdelta(X_45,X_8,X_12,X_46,X_48);"
-" X_17 := sql.delta(X_10,X_12,r1_15,X_15);"
-" X_20 := algebra.leftjoin(X_19,X_17);"
-" (X_21,r1_26,r2_26) := group.subgroupdone(X_20);"
- X_24 := aggr.count(r2_26);
- X_25:wrd := aggr.sum(r2_26);
- X_26 := calc.isnil(X_25);
-" X_28 := calc.ifthenelse(X_26,0,X_25);"
-" X_29 := calc.!=(X_24,X_28);"
-" sql.assert(X_29,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
-" sql.exportOperation("""");"
+" X_46 := algebra.subselect(X_15,X_8,nil:int,nil:int,true,true,true);"
+" X_18 := sql.subdelta(X_43,X_8,X_12,X_44,X_46);"
+" X_19 := sql.projectdelta(X_18,X_10,X_12,r1_15,X_15);"
+" (X_20,r1_26,r2_26) := group.subgroupdone(X_19);"
+ X_23 := aggr.count(r2_26);
+ X_24:wrd := aggr.sum(r2_26);
+ X_25 := calc.isnil(X_24);
+" X_27 := calc.ifthenelse(X_25,0,X_24);"
+" X_28 := calc.!=(X_23,X_27);"
+" sql.assert(X_28,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
+ sql.exportOperation();
end user.s9_1;
#~EndVariableOutput~#
diff --git a/sql/test/leaks/Tests/check1.stable.out.int128
b/sql/test/leaks/Tests/check1.stable.out.int128
--- a/sql/test/leaks/Tests/check1.stable.out.int128
+++ b/sql/test/leaks/Tests/check1.stable.out.int128
@@ -40,10 +40,10 @@ Ready.
[ "oid", "bit", 4 ]
[ "oid", "bit", 54 ]
[ "oid", "bit", 361 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bte", 4219 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bte", 4222 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -116,16 +116,16 @@ Ready.
[ "oid", "int", 361 ]
[ "oid", "int", 361 ]
[ "oid", "int", 361 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -272,11 +272,11 @@ Ready.
[ "oid", "str", 361 ]
[ "oid", "str", 361 ]
[ "oid", "str", 361 ]
-[ "oid", "str", 1510 ]
-[ "oid", "str", 1510 ]
-[ "oid", "str", 1510 ]
-[ "oid", "str", 4219 ]
-[ "oid", "str", 4219 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 4222 ]
+[ "oid", "str", 4222 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out.int128
b/sql/test/leaks/Tests/check2.stable.out.int128
--- a/sql/test/leaks/Tests/check2.stable.out.int128
+++ b/sql/test/leaks/Tests/check2.stable.out.int128
@@ -40,10 +40,10 @@ Ready.
[ "oid", "bit", 4 ]
[ "oid", "bit", 54 ]
[ "oid", "bit", 361 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bte", 4219 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bte", 4222 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -116,16 +116,16 @@ Ready.
[ "oid", "int", 361 ]
[ "oid", "int", 361 ]
[ "oid", "int", 361 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -272,11 +272,11 @@ Ready.
[ "oid", "str", 361 ]
[ "oid", "str", 361 ]
[ "oid", "str", 361 ]
-[ "oid", "str", 1510 ]
-[ "oid", "str", 1510 ]
-[ "oid", "str", 1510 ]
-[ "oid", "str", 4219 ]
-[ "oid", "str", 4219 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 4222 ]
+[ "oid", "str", 4222 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check3.stable.out.int128
b/sql/test/leaks/Tests/check3.stable.out.int128
--- a/sql/test/leaks/Tests/check3.stable.out.int128
+++ b/sql/test/leaks/Tests/check3.stable.out.int128
@@ -40,10 +40,10 @@ Ready.
[ "oid", "bit", 4 ]
[ "oid", "bit", 55 ]
[ "oid", "bit", 363 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bit", 1510 ]
-[ "oid", "bte", 4219 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bte", 4222 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -116,16 +116,16 @@ Ready.
[ "oid", "int", 363 ]
[ "oid", "int", 363 ]
[ "oid", "int", 363 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 1510 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
-[ "oid", "int", 4219 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
+[ "oid", "int", 4222 ]
[ "oid", "lng", 0 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
