Changeset: d176dc4f5d34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d176dc4f5d34
Modified Files:
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/bugs/Tests/in_or_bug.stable.out
Branch: subquery
Log Message:
approve output
diffs (209 lines):
diff --git
a/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
b/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
---
a/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
+++
b/sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
@@ -137,13 +137,13 @@ Ready.
#2399|150|0
[ 3416 ]
#SELECT COUNT(*) FROM sys."functions_cpy";
-% sys.L3 # table_name
+% .L3 # table_name
% L3 # name
% bigint # type
% 4 # length
[ 1167 ]
#SELECT COUNT(*) FROM sys."args_cpy";
-% sys.L3 # table_name
+% .L3 # table_name
% L3 # name
% bigint # type
% 4 # length
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
@@ -72,24 +72,24 @@ end user.s4_1;
% clob # type
% 118 # length
function user.s6_1():void;
- X_1:void := querylog.define("explain select id from v1 order by id;":str,
"sequential_pipe":str, 28:int);
- X_32:bat[:str] := bat.new(nil:str);
- X_38:bat[:int] := bat.new(nil:int);
- X_36:bat[:int] := bat.new(nil:int);
- X_35:bat[:str] := bat.new(nil:str);
- X_34:bat[:str] := bat.new(nil:str);
+ X_1:void := querylog.define("explain select id from v1 order by id;":str,
"sequential_pipe":str, 23:int);
+ X_25:bat[:str] := bat.new(nil:str);
+ X_31:bat[:int] := bat.new(nil:int);
+ X_29:bat[:int] := bat.new(nil:int);
+ X_28:bat[:str] := bat.new(nil:str);
+ X_27:bat[:str] := bat.new(nil:str);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "fk":str, "id":str, 0:int);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_8:bat[:int]);
- (X_25:bat[:int], X_26:bat[:oid], X_27:bat[:oid]) :=
algebra.sort(X_17:bat[:int], false:bit, false:bit, false:bit);
- X_30:bat[:int] := algebra.projection(X_26:bat[:oid], X_17:bat[:int]);
- X_39:bat[:str] := bat.append(X_32:bat[:str], "sys.v1":str);
- X_41:bat[:str] := bat.append(X_34:bat[:str], "id":str);
- X_43:bat[:str] := bat.append(X_35:bat[:str], "int":str);
- X_45:bat[:int] := bat.append(X_36:bat[:int], 32:int);
- X_47:bat[:int] := bat.append(X_38:bat[:int], 0:int);
- sql.resultSet(X_39:bat[:str], X_41:bat[:str], X_43:bat[:str],
X_45:bat[:int], X_47:bat[:int], X_30:bat[:int]);
+ (X_18:bat[:int], X_19:bat[:oid], X_20:bat[:oid]) :=
algebra.sort(X_17:bat[:int], false:bit, false:bit, false:bit);
+ X_23:bat[:int] := algebra.projection(X_19:bat[:oid], X_17:bat[:int]);
+ X_32:bat[:str] := bat.append(X_25:bat[:str], "sys.v1":str);
+ X_34:bat[:str] := bat.append(X_27:bat[:str], "id":str);
+ X_35:bat[:str] := bat.append(X_28:bat[:str], "int":str);
+ X_37:bat[:int] := bat.append(X_29:bat[:int], 32:int);
+ X_39:bat[:int] := bat.append(X_31:bat[:int], 0:int);
+ sql.resultSet(X_32:bat[:str], X_34:bat[:str], X_35:bat[:str],
X_37:bat[:int], X_39:bat[:int], X_23:bat[:int]);
end user.s6_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
@@ -72,24 +72,24 @@ end user.s4_1;
% clob # type
% 118 # length
function user.s6_1():void;
- X_1:void := querylog.define("explain select id from v2 order by id;":str,
"sequential_pipe":str, 33:int);
- X_39:bat[:str] := bat.new(nil:str);
- X_45:bat[:int] := bat.new(nil:int);
- X_43:bat[:int] := bat.new(nil:int);
- X_42:bat[:str] := bat.new(nil:str);
- X_41:bat[:str] := bat.new(nil:str);
+ X_1:void := querylog.define("explain select id from v2 order by id;":str,
"sequential_pipe":str, 23:int);
+ X_25:bat[:str] := bat.new(nil:str);
+ X_31:bat[:int] := bat.new(nil:int);
+ X_29:bat[:int] := bat.new(nil:int);
+ X_28:bat[:str] := bat.new(nil:str);
+ X_27:bat[:str] := bat.new(nil:str);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "fk":str, "id":str, 0:int);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_8:bat[:int]);
- (X_32:bat[:int], X_33:bat[:oid], X_34:bat[:oid]) :=
algebra.sort(X_17:bat[:int], false:bit, false:bit, false:bit);
- X_37:bat[:int] := algebra.projection(X_33:bat[:oid], X_17:bat[:int]);
- X_46:bat[:str] := bat.append(X_39:bat[:str], "sys.v2":str);
- X_48:bat[:str] := bat.append(X_41:bat[:str], "id":str);
- X_50:bat[:str] := bat.append(X_42:bat[:str], "int":str);
- X_52:bat[:int] := bat.append(X_43:bat[:int], 32:int);
- X_54:bat[:int] := bat.append(X_45:bat[:int], 0:int);
- sql.resultSet(X_46:bat[:str], X_48:bat[:str], X_50:bat[:str],
X_52:bat[:int], X_54:bat[:int], X_37:bat[:int]);
+ (X_18:bat[:int], X_19:bat[:oid], X_20:bat[:oid]) :=
algebra.sort(X_17:bat[:int], false:bit, false:bit, false:bit);
+ X_23:bat[:int] := algebra.projection(X_19:bat[:oid], X_17:bat[:int]);
+ X_32:bat[:str] := bat.append(X_25:bat[:str], "sys.v2":str);
+ X_34:bat[:str] := bat.append(X_27:bat[:str], "id":str);
+ X_35:bat[:str] := bat.append(X_28:bat[:str], "int":str);
+ X_37:bat[:int] := bat.append(X_29:bat[:int], 32:int);
+ X_39:bat[:int] := bat.append(X_31:bat[:int], 0:int);
+ sql.resultSet(X_32:bat[:str], X_34:bat[:str], X_35:bat[:str],
X_37:bat[:int], X_39:bat[:int], X_23:bat[:int]);
end user.s6_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
@@ -121,52 +121,52 @@ end user.s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 135 # length
+% 130 # length
function user.s8_1():void;
- X_1:void := querylog.define("explain select id , v2 from v2 order by
id;":str, "sequential_pipe":str, 75:int);
- X_50:bat[:int] := bat.new(nil:int);
+ X_1:void := querylog.define("explain select id , v2 from v2 order by
id;":str, "sequential_pipe":str, 65:int);
+ X_43:bat[:int] := bat.new(nil:int);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
- X_25:bat[:oid] := sql.bind_idxbat(X_4:int, "sys":str, "fk":str,
"fk_fk2_fkey":str, 0:int);
- (X_28:bat[:oid], X_29:bat[:oid]) := sql.bind_idxbat(X_4:int, "sys":str,
"fk":str, "fk_fk2_fkey":str, 2:int);
- X_27:bat[:oid] := sql.bind_idxbat(X_4:int, "sys":str, "fk":str,
"fk_fk2_fkey":str, 1:int);
- X_30:bat[:oid] := sql.delta(X_25:bat[:oid], X_28:bat[:oid],
X_29:bat[:oid], X_27:bat[:oid]);
- X_31:bat[:oid] := algebra.projection(C_5:bat[:oid], X_30:bat[:oid]);
- C_32:bat[:oid] := sql.tid(X_4:int, "sys":str, "pk2":str);
- (X_41:bat[:oid], X_42:bat[:oid]) := algebra.join(X_31:bat[:oid],
C_32:bat[:oid], nil:BAT, nil:BAT, false:bit, nil:lng);
+ X_18:bat[:oid] := sql.bind_idxbat(X_4:int, "sys":str, "fk":str,
"fk_fk2_fkey":str, 0:int);
+ (X_21:bat[:oid], X_22:bat[:oid]) := sql.bind_idxbat(X_4:int, "sys":str,
"fk":str, "fk_fk2_fkey":str, 2:int);
+ X_20:bat[:oid] := sql.bind_idxbat(X_4:int, "sys":str, "fk":str,
"fk_fk2_fkey":str, 1:int);
+ X_23:bat[:oid] := sql.delta(X_18:bat[:oid], X_21:bat[:oid],
X_22:bat[:oid], X_20:bat[:oid]);
+ X_24:bat[:oid] := algebra.projection(C_5:bat[:oid], X_23:bat[:oid]);
+ C_25:bat[:oid] := sql.tid(X_4:int, "sys":str, "pk2":str);
+ (X_34:bat[:oid], X_35:bat[:oid]) := algebra.join(X_24:bat[:oid],
C_25:bat[:oid], nil:BAT, nil:BAT, false:bit, nil:lng);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "fk":str, "id":str, 0:int);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_8:bat[:int]);
- X_49:bat[:int] := algebra.projection(X_41:bat[:oid], X_17:bat[:int]);
- C_47:bat[:oid] := bat.mirror(X_17:bat[:int]);
- C_48:bat[:oid] := algebra.difference(C_47:bat[:oid], X_41:bat[:oid],
nil:BAT, nil:BAT, false:bit, nil:lng);
- X_34:bat[:int] := sql.bind(X_4:int, "sys":str, "pk2":str, "v2":str, 0:int);
- X_52:bat[:int] := bat.append(X_50:bat[:int], X_49:bat[:int], true:bit);
- X_54:bat[:int] := algebra.projection(C_48:bat[:oid], X_17:bat[:int]);
- X_55:bat[:int] := bat.append(X_52:bat[:int], X_54:bat[:int], true:bit);
- X_68:bat[:int] := bat.new(nil:int);
- X_67:bat[:int] := algebra.projectionpath(X_42:bat[:oid], C_32:bat[:oid],
X_34:bat[:int]);
- X_69:bat[:int] := bat.append(X_68:bat[:int], X_67:bat[:int], true:bit);
- X_71:bat[:int] := algebra.project(C_48:bat[:oid], nil:int);
- X_72:bat[:int] := bat.append(X_69:bat[:int], X_71:bat[:int], true:bit);
- X_87:bat[:str] := bat.new(nil:str);
- X_93:bat[:int] := bat.new(nil:int);
- X_91:bat[:int] := bat.new(nil:int);
- X_90:bat[:str] := bat.new(nil:str);
- X_89:bat[:str] := bat.new(nil:str);
- (X_79:bat[:int], X_80:bat[:oid], X_81:bat[:oid]) :=
algebra.sort(X_55:bat[:int], false:bit, false:bit, false:bit);
- X_85:bat[:int] := algebra.projection(X_80:bat[:oid], X_72:bat[:int]);
- X_84:bat[:int] := algebra.projection(X_80:bat[:oid], X_55:bat[:int]);
- X_94:bat[:str] := bat.append(X_87:bat[:str], ".v2":str);
- X_96:bat[:str] := bat.append(X_89:bat[:str], "id":str);
- X_98:bat[:str] := bat.append(X_90:bat[:str], "int":str);
- X_100:bat[:int] := bat.append(X_91:bat[:int], 32:int);
- X_102:bat[:int] := bat.append(X_93:bat[:int], 0:int);
- X_104:bat[:str] := bat.append(X_94:bat[:str], ".v2":str);
- X_105:bat[:str] := bat.append(X_96:bat[:str], "v2":str);
- X_107:bat[:str] := bat.append(X_98:bat[:str], "int":str);
- X_108:bat[:int] := bat.append(X_100:bat[:int], 32:int);
- X_109:bat[:int] := bat.append(X_102:bat[:int], 0:int);
- sql.resultSet(X_104:bat[:str], X_105:bat[:str], X_107:bat[:str],
X_108:bat[:int], X_109:bat[:int], X_84:bat[:int], X_85:bat[:int]);
+ X_42:bat[:int] := algebra.projection(X_34:bat[:oid], X_17:bat[:int]);
+ C_40:bat[:oid] := bat.mirror(X_17:bat[:int]);
+ C_41:bat[:oid] := algebra.difference(C_40:bat[:oid], X_34:bat[:oid],
nil:BAT, nil:BAT, false:bit, nil:lng);
+ X_27:bat[:int] := sql.bind(X_4:int, "sys":str, "pk2":str, "v2":str, 0:int);
+ X_45:bat[:int] := bat.append(X_43:bat[:int], X_42:bat[:int], true:bit);
+ X_47:bat[:int] := algebra.projection(C_41:bat[:oid], X_17:bat[:int]);
+ X_48:bat[:int] := bat.append(X_45:bat[:int], X_47:bat[:int], true:bit);
+ X_56:bat[:int] := bat.new(nil:int);
+ X_55:bat[:int] := algebra.projectionpath(X_35:bat[:oid], C_25:bat[:oid],
X_27:bat[:int]);
+ X_57:bat[:int] := bat.append(X_56:bat[:int], X_55:bat[:int], true:bit);
+ X_59:bat[:int] := algebra.project(C_41:bat[:oid], nil:int);
+ X_60:bat[:int] := bat.append(X_57:bat[:int], X_59:bat[:int], true:bit);
+ X_73:bat[:str] := bat.new(nil:str);
+ X_79:bat[:int] := bat.new(nil:int);
+ X_77:bat[:int] := bat.new(nil:int);
+ X_76:bat[:str] := bat.new(nil:str);
+ X_75:bat[:str] := bat.new(nil:str);
+ (X_67:bat[:int], X_68:bat[:oid], X_69:bat[:oid]) :=
algebra.sort(X_48:bat[:int], false:bit, false:bit, false:bit);
+ X_71:bat[:int] := algebra.projection(X_68:bat[:oid], X_60:bat[:int]);
+ X_70:bat[:int] := algebra.projection(X_68:bat[:oid], X_48:bat[:int]);
+ X_80:bat[:str] := bat.append(X_73:bat[:str], ".v2":str);
+ X_82:bat[:str] := bat.append(X_75:bat[:str], "id":str);
+ X_84:bat[:str] := bat.append(X_76:bat[:str], "int":str);
+ X_86:bat[:int] := bat.append(X_77:bat[:int], 32:int);
+ X_88:bat[:int] := bat.append(X_79:bat[:int], 0:int);
+ X_90:bat[:str] := bat.append(X_80:bat[:str], ".v2":str);
+ X_91:bat[:str] := bat.append(X_82:bat[:str], "v2":str);
+ X_93:bat[:str] := bat.append(X_84:bat[:str], "int":str);
+ X_94:bat[:int] := bat.append(X_86:bat[:int], 32:int);
+ X_95:bat[:int] := bat.append(X_88:bat[:int], 0:int);
+ sql.resultSet(X_90:bat[:str], X_91:bat[:str], X_93:bat[:str],
X_94:bat[:int], X_95:bat[:int], X_70:bat[:int], X_71:bat[:int]);
end user.s8_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
diff --git a/sql/test/bugs/Tests/in_or_bug.stable.out
b/sql/test/bugs/Tests/in_or_bug.stable.out
--- a/sql/test/bugs/Tests/in_or_bug.stable.out
+++ b/sql/test/bugs/Tests/in_or_bug.stable.out
@@ -34,7 +34,7 @@ Ready.
% 1 # length
[ 1 ]
#select count(*) from t1 where c1='1' and (c2 in ('3') or c3 in ('3'));
-% .L3 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 1 # length
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
