Changeset: 4ab6e7d155fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ab6e7d155fb
Modified Files:
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: Mar2018
Log Message:
Approve after changeset dbfe771d0187.
diffs (truncated from 485 to 300 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -135,8 +135,8 @@ function user.s8_1():void;
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_11:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_16:bat[:int] := sql.delta(X_8:bat[:int], C_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
+ (X_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_16:bat[:int] := sql.delta(X_8:bat[:int], X_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_16:bat[:int]);
X_19:bat[:str] := bat.new(nil:str);
X_21:bat[:str] := bat.new(nil:str);
@@ -170,8 +170,8 @@ function user.s10_1():void;
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_11:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_16:bat[:int] := sql.delta(X_8:bat[:int], C_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
+ (X_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_16:bat[:int] := sql.delta(X_8:bat[:int], X_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_16:bat[:int]);
X_18:lng := calc.lng(2:lng);
X_20:lng := calc.lng(nil:lng);
@@ -210,8 +210,8 @@ function user.s12_1():void;
C_7:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_10:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_13:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_15:bat[:oid], X_16:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_18:bat[:int] := sql.delta(X_10:bat[:int], C_15:bat[:oid],
X_16:bat[:int], X_13:bat[:int]);
+ (X_15:bat[:oid], X_16:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_18:bat[:int] := sql.delta(X_10:bat[:int], X_15:bat[:oid],
X_16:bat[:int], X_13:bat[:int]);
X_19:bat[:int] := algebra.projection(C_7:bat[:oid], X_18:bat[:int]);
X_20:lng := calc.lng(2:lng);
X_21:lng := calc.lng(0:lng);
@@ -251,8 +251,8 @@ function user.s14_1():void;
C_10:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_13:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_16:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_21:bat[:int] := sql.delta(X_13:bat[:int], C_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
+ (X_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_21:bat[:int] := sql.delta(X_13:bat[:int], X_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
X_22:bat[:int] := algebra.projection(C_10:bat[:oid], X_21:bat[:int]);
X_23:lng := calc.lng(1:lng);
X_24:lng := calc.lng(2:lng);
@@ -292,8 +292,8 @@ function user.s16_1():void;
C_10:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_13:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_16:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_21:bat[:int] := sql.delta(X_13:bat[:int], C_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
+ (X_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_21:bat[:int] := sql.delta(X_13:bat[:int], X_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
X_22:bat[:int] := algebra.projection(C_10:bat[:oid], X_21:bat[:int]);
X_23:lng := calc.lng(2:lng);
X_24:lng := calc.lng(1:lng);
@@ -333,8 +333,8 @@ function user.s18_1():void;
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_11:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_16:bat[:int] := sql.delta(X_8:bat[:int], C_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
+ (X_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_16:bat[:int] := sql.delta(X_8:bat[:int], X_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_16:bat[:int]);
(X_18:bat[:int], X_19:bat[:oid], X_20:bat[:oid]) :=
algebra.sort(X_17:bat[:int], false:bit, false:bit);
X_23:bat[:int] := algebra.projection(X_19:bat[:oid], X_17:bat[:int]);
@@ -370,8 +370,8 @@ function user.s20_1():void;
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_11:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_16:bat[:int] := sql.delta(X_8:bat[:int], C_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
+ (X_13:bat[:oid], X_14:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_16:bat[:int] := sql.delta(X_8:bat[:int], X_13:bat[:oid], X_14:bat[:int],
X_11:bat[:int]);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_16:bat[:int]);
(X_18:bat[:int], X_19:bat[:oid], X_20:bat[:oid]) :=
algebra.sort(X_17:bat[:int], false:bit, false:bit);
X_23:bat[:int] := algebra.projection(X_19:bat[:oid], X_17:bat[:int]);
@@ -414,8 +414,8 @@ function user.s22_1():void;
C_7:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_10:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_13:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_15:bat[:oid], X_16:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_18:bat[:int] := sql.delta(X_10:bat[:int], C_15:bat[:oid],
X_16:bat[:int], X_13:bat[:int]);
+ (X_15:bat[:oid], X_16:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_18:bat[:int] := sql.delta(X_10:bat[:int], X_15:bat[:oid],
X_16:bat[:int], X_13:bat[:int]);
X_19:bat[:int] := algebra.projection(C_7:bat[:oid], X_18:bat[:int]);
X_20:lng := calc.lng(0:lng);
X_22:lng := calc.+(X_20:lng, X_5:lng);
@@ -462,8 +462,8 @@ function user.s24_1():void;
C_10:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_13:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_16:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_21:bat[:int] := sql.delta(X_13:bat[:int], C_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
+ (X_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_21:bat[:int] := sql.delta(X_13:bat[:int], X_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
X_22:bat[:int] := algebra.projection(C_10:bat[:oid], X_21:bat[:int]);
X_23:lng := calc.lng(0:lng);
X_25:lng := calc.+(X_23:lng, X_9:lng);
@@ -512,8 +512,8 @@ function user.s26_1():void;
C_10:bat[:oid] := sql.tid(X_4:int, "sys":str, "oblo":str);
X_13:bat[:int] := sql.bind(X_4:int, "sys":str, "oblo":str, "a":str, 0:int);
X_16:bat[:int] := sql.emptybind(X_4:int, "sys":str, "oblo":str, "a":str,
1:int);
- (C_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
- X_21:bat[:int] := sql.delta(X_13:bat[:int], C_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
+ (X_18:bat[:oid], X_19:bat[:int]) := sql.emptybind(X_4:int, "sys":str,
"oblo":str, "a":str, 2:int);
+ X_21:bat[:int] := sql.delta(X_13:bat[:int], X_18:bat[:oid],
X_19:bat[:int], X_16:bat[:int]);
X_22:bat[:int] := algebra.projection(C_10:bat[:oid], X_21:bat[:int]);
X_23:lng := calc.lng(0:lng);
X_25:lng := calc.+(X_23:lng, X_9:lng);
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -41,16 +41,16 @@ function user.s4_1():void;
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
C_95:bat[:oid] := algebra.likeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
C_96:bat[:oid] := algebra.likeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, false:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
C_98:bat[:oid] := algebra.likeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
- C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
X_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_42:bat[:str] := bat.append(X_35:bat[:str], "sys.functions":str);
X_44:bat[:str] := bat.append(X_37:bat[:str], "name":str);
X_46:bat[:str] := bat.append(X_38:bat[:str], "varchar":str);
@@ -102,16 +102,16 @@ function user.s6_1():void;
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
C_95:bat[:oid] := algebra.likeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
C_96:bat[:oid] := algebra.likeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, true:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
C_98:bat[:oid] := algebra.likeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
- C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
X_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_42:bat[:str] := bat.append(X_35:bat[:str], "sys.functions":str);
X_44:bat[:str] := bat.append(X_37:bat[:str], "name":str);
X_46:bat[:str] := bat.append(X_38:bat[:str], "varchar":str);
@@ -164,16 +164,16 @@ function user.s8_1():void;
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
C_95:bat[:oid] := algebra.ilikeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
C_96:bat[:oid] := algebra.ilikeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, false:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
C_98:bat[:oid] := algebra.ilikeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
- C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
X_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_42:bat[:str] := bat.append(X_35:bat[:str], "sys.functions":str);
X_44:bat[:str] := bat.append(X_37:bat[:str], "name":str);
X_46:bat[:str] := bat.append(X_38:bat[:str], "varchar":str);
@@ -224,16 +224,16 @@ function user.s10_1():void;
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
C_95:bat[:oid] := algebra.ilikeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
C_96:bat[:oid] := algebra.ilikeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, true:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
C_98:bat[:oid] := algebra.ilikeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
- C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
X_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_33:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_32:bat[:str] := sql.projectdelta(C_29:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_42:bat[:str] := bat.append(X_35:bat[:str], "sys.functions":str);
X_44:bat[:str] := bat.append(X_37:bat[:str], "name":str);
X_46:bat[:str] := bat.append(X_38:bat[:str], "varchar":str);
@@ -305,15 +305,15 @@ function user.s20_1():void;
X_5:int := sql.mvc();
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_100:bat[:bit] := batalgebra.like(X_18:bat[:str], "%optimizers%":str);
C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
@@ -366,15 +366,15 @@ function user.s22_1():void;
X_5:int := sql.mvc();
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_100:bat[:bit] := batalgebra.not_like(X_18:bat[:str], "%optimizers%":str);
C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
@@ -427,15 +427,15 @@ function user.s24_1():void;
X_5:int := sql.mvc();
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_100:bat[:bit] := batalgebra.ilike(X_18:bat[:str], "%optimizers%":str);
C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
@@ -488,15 +488,15 @@ function user.s26_1():void;
X_5:int := sql.mvc();
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
- (C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
+ X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_100:bat[:bit] := batalgebra.not_ilike(X_18:bat[:str],
"%optimizers%":str);
C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
- (C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
+ (X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
C_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
diff --git a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
--- a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
+++ b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
@@ -72,15 +72,15 @@ function user.s4_1():void;
X_6:int := sql.mvc();
C_7:bat[:oid] := sql.tid(X_6:int, "sys":str, "functions":str);
X_20:bat[:str] := sql.bind(X_6:int, "sys":str, "functions":str,
"name":str, 0:int);
- (C_23:bat[:oid], X_24:bat[:str]) := sql.bind(X_6:int, "sys":str,
"functions":str, "name":str, 2:int);
+ (X_23:bat[:oid], X_24:bat[:str]) := sql.bind(X_6:int, "sys":str,
"functions":str, "name":str, 2:int);
X_22:bat[:str] := sql.bind(X_6:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_25:bat[:str] := sql.delta(X_20:bat[:str], C_23:bat[:oid],
X_24:bat[:str], X_22:bat[:str]);
+ X_25:bat[:str] := sql.delta(X_20:bat[:str], X_23:bat[:oid],
X_24:bat[:str], X_22:bat[:str]);
X_26:bat[:str] := algebra.projection(C_7:bat[:oid], X_25:bat[:str]);
X_29:bat[:str] := mal.manifold("str":str, "replace":str, X_26:bat[:str],
"a":str, "A":str);
X_10:bat[:int] := sql.bind(X_6:int, "sys":str, "functions":str, "id":str,
0:int);
- (C_15:bat[:oid], X_16:bat[:int]) := sql.bind(X_6:int, "sys":str,
"functions":str, "id":str, 2:int);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
