Changeset: cd053cc52341 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd053cc52341
Modified Files:
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Branch: Jun2016
Log Message:
Approvals.
diffs (176 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
@@ -28,10 +28,10 @@ Ready.
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
% 3, 3, 1, 0, 2, 2 # length
-[ "wrd", 32, 0, "", "L1", "L1" ]
+[ "wrd", 32, 0, "", "L2", "L1" ]
[ "wrd", 32, 0, NULL, NULL, NULL ]
-#exec 0(1);
-% .L1 # table_name
+#exec 1(1);
+% .L2 # table_name
% L1 # name
% wrd # type
% 1 # length
diff --git
a/sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
b/sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
--- a/sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
+++ b/sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
@@ -33,8 +33,8 @@ Ready.
#rank() over (order by sum(score) desc) -- cannot use alias 'totalscore' here
#from score_table
#group by s_name;
-% sys.score_table, sys.L1, sys.L3 # table_name
-% s_name, totalscore, L3 # name
+% sys.score_table, sys.L2, sys.L4 # table_name
+% s_name, totalscore, L4 # name
% varchar, bigint, int # type
% 3, 3, 1 # length
[ "foo", 180, 1 ]
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
@@ -46,22 +46,22 @@ Ready.
% clob # type
% 191 # length
function user.s2_1():void;
- X_47:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between
t1.pre and t1.pre + t1.size;","default_pipe",31);
+ X_48:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre
and t1.pre + t1.size;","default_pipe",31);
X_24 := bat.new(nil:oid,nil:str);
- X_32 := bat.append(X_24,"sys.L");
- X_41 := bat.append(X_32,"sys.L");
+ X_32 := bat.append(X_24,"sys.L1");
+ X_41 := bat.append(X_32,"sys.L2");
X_27 := bat.new(nil:oid,nil:str);
X_34 := bat.append(X_27,"id1");
- X_42 := bat.append(X_34,"id2");
+ X_43 := bat.append(X_34,"id2");
X_28 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_28,"int");
- X_44 := bat.append(X_36,"int");
+ X_45 := bat.append(X_36,"int");
X_29 := bat.new(nil:oid,nil:int);
X_38 := bat.append(X_29,32);
- X_45 := bat.append(X_38,32);
+ X_46 := bat.append(X_38,32);
X_31 := bat.new(nil:oid,nil:int);
X_40 := bat.append(X_31,0);
- X_46 := bat.append(X_40,0);
+ X_47 := bat.append(X_40,0);
X_1 := sql.mvc();
C_2:bat[:oid] := sql.tid(X_1,"sys","treeitems");
X_5:bat[:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
@@ -74,7 +74,7 @@ function user.s2_1():void;
X_20 := algebra.projection(C_2,X_18);
X_21 := algebra.projection(r1_18,X_20);
X_22 := algebra.projection(X_13,X_20);
- sql.resultSet(X_41,X_42,X_44,X_45,X_46,X_21,X_22);
+ sql.resultSet(X_41,X_43,X_45,X_46,X_47,X_21,X_22);
end user.s2_1;
#ROLLBACK;
diff --git
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
---
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
+++
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
@@ -44,7 +44,7 @@ function user.s2_1(A0:int):void;
C_9 := algebra.subselect(X_6,C_3,A0,A0,true,false,false);
X_12 := algebra.projection(C_9,X_6);
X_13 := aggr.count(X_12);
- sql.resultSet("sys.L1","L1","wrd",32,0,7,X_13);
+ sql.resultSet("sys.L2","L1","wrd",32,0,7,X_13);
end user.s2_1;
# optimizer.mitosis()
# optimizer.dataflow()
@@ -62,7 +62,7 @@ function user.s3_1(A0:str):void;
C_11 := algebra.subselect(X_6,C_3,X_9,X_9,true,false,false);
X_14 := algebra.projection(C_11,X_6);
X_15 := aggr.count(X_14);
- sql.resultSet("sys.L1","L1","wrd",32,0,7,X_15);
+ sql.resultSet("sys.L2","L1","wrd",32,0,7,X_15);
end user.s3_1;
# optimizer.mitosis()
# optimizer.dataflow()
@@ -80,7 +80,7 @@ function user.s4_1(A0:lng):void;
C_11 := algebra.subselect(X_9,C_3,A0,A0,true,false,false);
X_14 := algebra.projection(C_11,X_6);
X_15 := aggr.count(X_14);
- sql.resultSet("sys.L1","L1","wrd",32,0,7,X_15);
+ sql.resultSet("sys.L2","L1","wrd",32,0,7,X_15);
end user.s4_1;
# optimizer.mitosis()
# optimizer.dataflow()
diff --git
a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
--- a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
+++ b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
@@ -36,7 +36,7 @@ Ready.
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
% 3, 2, 1, 0, 2, 2 # length
-[ "wrd", 32, 0, "", "L3", "L3" ]
+[ "wrd", 32, 0, "", "L4", "L3" ]
#drop table foo;
# 12:27:17 >
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0, true ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query", "varchar", "writable",
33, 0, false, 0, false ]
+[ "sys", "_tables", "query", "varchar", "writable",
34, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, false ]
@@ -96,10 +96,10 @@ Ready.
% schema, table, column, type, mode, typewidth, hashes, phash,
imprints, sorted # name
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint, boolean # type
% 3, 7, 13, 8, 8, 2, 4, 5, 1, 5 #
length
-[ "sys", "_tables", "id", "int", "writable", 4, 2580,
false, 0, false ]
+[ "sys", "_tables", "id", "int", "writable", 4, 1044,
false, 0, false ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query", "varchar", "writable",
45, 0, false, 0, false ]
+[ "sys", "_tables", "query", "varchar", "writable",
33, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, false ]
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -73,7 +73,7 @@ Operation successful
| X_32 := aggr.count(X_31);
|
| X_33 := bat.append(X_27,X_32,true);
|
| X_34:wrd := aggr.sum(X_33);
|
-| sql.resultSet(".L3","L3","wrd",32,0,7,X_34);
|
+| sql.resultSet(".L10","L7","wrd",32,0,7,X_34);
|
| end user.s2_1;
|
+--------------------------------------------------------------------------------------------------+
27 rows
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -288,7 +288,7 @@ set schema "testschema";
# 13:26:28 >
#select count(*) from testschema.smallstring;
-% testschema.L1 # table_name
+% testschema.L2 # table_name
% L1 # name
% wrd # type
% 2 # length
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -275,7 +275,7 @@ set schema "testschema";
# 13:26:27 >
#select count(*) from testschema.smallstring;
-% testschema.L1 # table_name
+% testschema.L2 # table_name
% L1 # name
% wrd # type
% 2 # length
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
