Changeset: 7d21147d3306 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d21147d3306
Modified Files:
        sql/benchmarks/tpch/Tests/11-explain.stable.out
        sql/benchmarks/tpch/Tests/11-plan.stable.out
        sql/benchmarks/tpch/Tests/14-explain.stable.out
        sql/benchmarks/tpch/Tests/14-plan.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/17-plan.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out
        sql/benchmarks/tpch/Tests/20-plan.stable.out
        sql/benchmarks/tpch/Tests/22-explain.stable.out
        sql/benchmarks/tpch/Tests/22-plan.stable.out
        sql/common/sql_string.c
        sql/server/rel_select.c
        sql/server/sql_parser.y
        
sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.stable.out
        sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.err
        sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.out
Branch: Oct2014
Log Message:

fixed stringfloatshtcompare Bug 3512


diffs (truncated from 648 to 300 lines):

diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out
@@ -57,7 +57,7 @@ Ready.
 % mal # name
 % clob # type
 % 714 # length
-function user.s2_1{autoCommit=true}(A0:str,A1:lng,A2:str):void;
+function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
     X_5 := sql.mvc();
     X_6:bat[:oid,:oid]  := sql.tid(X_5,"sys","supplier");
     X_9 := sql.bind_idxbat(X_5,"sys","supplier","supplier_s_nationkey_fkey",0);
@@ -109,24 +109,24 @@ function user.s2_1{autoCommit=true}(A0:s
     (X_85,r1_111) := algebra.join(X_18,X_84);
     X_87 := algebra.leftfetchjoin(X_85,X_6);
     (X_88,r1_124) := algebra.join(X_87,X_43);
-    X_91 := algebra.leftfetchjoin(r1_124,X_67);
-    X_92 := algebra.leftfetchjoin(r1_124,X_77);
-    X_93:bat[:oid,:lng]  := batcalc.*(X_91,X_92);
-    X_94:lng  := aggr.sum(X_93);
-    X_95 := calc.*(X_94,A1);
-    X_96 := sql.single(X_95);
-    X_98:bat[:oid,:lng]  := batsql.dec_round(X_96,100:lng);
-    (X_99,r1_157) := algebra.thetajoin(X_80,X_98,1);
-    X_101 := algebra.tinter(X_60,X_99);
-    X_102 := algebra.leftfetchjoin(X_101,X_80);
-    (X_103,r1_161,r2_161) := algebra.subsort(X_102,true,false);
-    X_108:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_161,X_101,X_59);
-    X_109 := algebra.leftfetchjoin(r1_161,X_102);
-    X_110 := sql.resultSet(2,1,X_108);
-    sql.rsColumn(X_110,"sys.partsupp","ps_partkey","int",32,0,X_108);
-    sql.rsColumn(X_110,"sys.L1","value","decimal",19,2,X_109);
-    X_124 := io.stdout();
-    sql.exportResult(X_124,X_110);
+    X_92 := algebra.leftfetchjoin(r1_124,X_67);
+    X_93 := algebra.leftfetchjoin(r1_124,X_77);
+    X_94:bat[:oid,:lng]  := batcalc.*(X_92,X_93);
+    X_95:lng  := aggr.sum(X_94);
+    X_96 := calc.*(X_95,A1);
+    X_97 := sql.single(X_96);
+    X_98:bat[:oid,:lng]  := batcalc.lng(5,X_97,19,2);
+    (X_101,r1_156) := algebra.thetajoin(X_80,X_98,1);
+    X_103 := algebra.tinter(X_60,X_101);
+    X_104 := algebra.leftfetchjoin(X_103,X_80);
+    (X_105,r1_160,r2_160) := algebra.subsort(X_104,true,false);
+    X_110:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_160,X_103,X_59);
+    X_111 := algebra.leftfetchjoin(r1_160,X_104);
+    X_112 := sql.resultSet(2,1,X_110);
+    sql.rsColumn(X_112,"sys.partsupp","ps_partkey","int",32,0,X_110);
+    sql.rsColumn(X_112,"sys.L1","value","decimal",19,2,X_111);
+    X_125 := io.stdout();
+    sql.exportResult(X_125,X_112);
 end s2_1;
 # querylog.define("explain select\n\tps_partkey,\n\tsum(ps_supplycost * 
ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey \nhaving\n\tsum(ps_supplycost * ps_availqty) 
>\n\t(\n\t\tselect\n\t\t\tsum(ps_supplycost * ps_availqty) * 
0.0100000000\n\t\t\t-- The above constant needs to be adjusted 
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 / 
SF.\n\t\tfrom\n\t\t\tpartsupp,\n\t\t\tsupplier,\n\t\t\tnation\n\t\twhere\n\t\t\tps_suppkey
 = s_suppkey\n\t\t\tand s_nationkey = n_nationkey\n\t\t\tand n_name = 
\\'GERMANY\\'\n\t)\norder by\n\tvalue desc;","sequential_pipe")
 
diff --git a/sql/benchmarks/tpch/Tests/11-plan.stable.out 
b/sql/benchmarks/tpch/Tests/11-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/11-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-plan.stable.out
@@ -81,8 +81,8 @@ project (
 | | | | | table(sys.partsupp) [ partsupp.ps_availqty NOT NULL, 
partsupp.ps_supplycost NOT NULL, partsupp.%partsupp_ps_suppkey_fkey NOT NULL 
JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ] COUNT 
 | | | | ) [ partsupp.%partsupp_ps_suppkey_fkey NOT NULL = supplier.%TID% NOT 
NULL JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ]
 | | | ) [  ] [ sys.sum no nil (sys.sql_mul(partsupp.ps_supplycost NOT NULL, 
partsupp.ps_availqty NOT NULL)) as L3.L3 ]
-| | ) [ sys.sql_mul(L3, decimal(11,10) "1") as L4.L4 ]
-| ) [ L2 > sys.scale_down(L4.L4, bigint "100") ]
+| | ) [ sys.sql_mul(L3, decimal(4,3) "10") as L4.L4 ]
+| ) [ L2 > decimal(19,2)[L4.L4] ]
 ) [ partsupp.ps_partkey NOT NULL, L1 as L1.value ] [ L1.value ]
 
 # 22:46:31 >  
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out 
b/sql/benchmarks/tpch/Tests/14-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out
@@ -43,7 +43,7 @@ Ready.
 % mal # name
 % clob # type
 % 405 # length
-function 
user.s2_1{autoCommit=true}(A0:int,A1:str,A2:bte,A3:bte,A4:bte,A5:date,A6:date,A7:int):void;
+function 
user.s2_1{autoCommit=true}(A0:sht,A1:str,A2:bte,A3:bte,A4:bte,A5:date,A6:date,A7:int):void;
     X_10 := sql.mvc();
     X_14:bat[:oid,:date]  := sql.bind(X_10,"sys","lineitem","l_shipdate",0);
     X_11:bat[:oid,:oid]  := sql.tid(X_10,"sys","lineitem");
diff --git a/sql/benchmarks/tpch/Tests/14-plan.stable.out 
b/sql/benchmarks/tpch/Tests/14-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/14-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/14-plan.stable.out
@@ -51,7 +51,7 @@ project (
 | | | table(sys.part) [ part.p_type NOT NULL, part.%TID% NOT NULL ] COUNT 
 | | ) [ lineitem.%lineitem_l_partkey_fkey NOT NULL = part.%TID% NOT NULL 
JOINIDX sys.lineitem.lineitem_l_partkey_fkey ]
 | ) [  ] [ sys.sum no nil 
(sys.ifthenelse(sys.ifthenelse(sys.isnull(sys.like(part.p_type NOT NULL, 
char[char(6) "PROMO%"])), boolean "false", sys.like(part.p_type NOT NULL, 
char[char(6) "PROMO%"])), sys.sql_mul(lineitem.l_extendedprice NOT NULL, 
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL)), 
decimal(19,4)[tinyint "0"])) as L1.L1, sys.sum no nil 
(sys.sql_mul(lineitem.l_extendedprice NOT NULL, 
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL))) as 
L2.L2 ]
-) [ sys.sql_mul(decimal(5,2) "1", sys.sql_div(decimal(19,8)[L1] as L1, L2)) as 
L2.promo_revenue ]
+) [ sys.sql_mul(decimal(4,1) "1", sys.sql_div(decimal(19,8)[L1] as L1, L2)) as 
L2.promo_revenue ]
 
 # 22:46:32 >  
 # 22:46:32 >  "Done."
diff --git a/sql/benchmarks/tpch/Tests/17-explain.stable.out 
b/sql/benchmarks/tpch/Tests/17-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/17-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/17-explain.stable.out
@@ -94,13 +94,13 @@ function user.s2_1{autoCommit=true}(A0:b
     (X_73,r1_87) := sql.bind(X_6,"sys","lineitem","l_quantity",2);
     X_75:bat[:oid,:int]  := sql.bind(X_6,"sys","lineitem","l_quantity",1);
     X_76 := sql.projectdelta(X_7,X_70,X_73,r1_87,X_75);
-    X_83 := algebra.leftfetchjoin(X_55,X_76);
-    X_84 := batcalc.dbl(X_83);
-    X_85:bat[:oid,:dbl]  := aggr.subavg(X_84,X_67,r1_81,true,true);
+    X_82 := algebra.leftfetchjoin(X_55,X_76);
+    X_83 := batcalc.dbl(X_82);
+    X_84:bat[:oid,:dbl]  := aggr.subavg(X_83,X_67,r1_81,true,true);
     X_77:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_144,X_43,X_76);
-    X_78 := batcalc.dbl(X_77);
-    X_87:bat[:oid,:dbl]  := batcalc.*(A3,X_85);
-    X_88:bat[:oid,:bit]  := batcalc.<(X_78,X_87);
+    X_86:bat[:oid,:dbl]  := batcalc.*(A3,X_84);
+    X_87 := batcalc.int(X_86);
+    X_88:bat[:oid,:bit]  := batcalc.<(X_77,X_87);
     X_89 := algebra.subselect(X_88,true,true,true,true,false);
     X_91:bat[:oid,:lng]  := sql.bind(X_6,"sys","lineitem","l_extendedprice",0);
     (X_94,r1_121) := sql.bind(X_6,"sys","lineitem","l_extendedprice",2);
@@ -110,8 +110,8 @@ function user.s2_1{autoCommit=true}(A0:b
     X_99:lng  := aggr.sum(X_98);
     X_100 := calc.lng(2,X_99,18,5);
     X_103 := calc.lng(1,A0,15,2);
-    X_106 := calc./(X_100,X_103);
-    sql.exportValue(1,"sys.L3","avg_yearly","decimal",18,3,8,X_106,"");
+    X_107 := calc./(X_100,X_103);
+    sql.exportValue(1,"sys.L3","avg_yearly","decimal",18,3,8,X_107,"");
 end s2_1;
 # querylog.define("explain select\n\tsum(l_extendedprice) / 7.0 as 
avg_yearly\nfrom\n\tlineitem,\n\tpart\nwhere\n\tp_partkey = l_partkey\n\tand 
p_brand = \\'Brand#23\\'\n\tand p_container = \\'MED BOX\\'\n\tand l_quantity < 
(\n\t\tselect\n\t\t\t0.2 * 
avg(l_quantity)\n\t\tfrom\n\t\t\tlineitem\n\t\twhere\n\t\t\tl_partkey = 
p_partkey\n\t);","sequential_pipe")
 
diff --git a/sql/benchmarks/tpch/Tests/17-plan.stable.out 
b/sql/benchmarks/tpch/Tests/17-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/17-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/17-plan.stable.out
@@ -64,7 +64,7 @@ project (
 | | | | | ) [ L4.l_partkey NOT NULL = part.p_partkey NOT NULL ]
 | | | | ) [ L5.L5 ] [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice 
NOT NULL, L5.L5 HASHCOL , sys.avg no nil (double[L4.l_quantity NOT NULL] as 
lineitem.l_quantity) as L1.L1 ]
 | | | ) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice NOT NULL, 
sys.sql_mul(double(53,1)[decimal(2,1) "2"], L1) as L2.L2 ]
-| | ) [ double(53,1)[lineitem.l_quantity NOT NULL] < L2.L2 ]
+| | ) [ lineitem.l_quantity NOT NULL < int[L2.L2] ]
 | ) [  ] [ sys.sum no nil (lineitem.l_extendedprice NOT NULL) NOT NULL as 
L3.L3 ]
 ) [ sys.sql_div(decimal(18,5)[L3 NOT NULL] as L3, decimal(15,2)[decimal(2,1) 
"70"]) as L3.avg_yearly ]
 
diff --git a/sql/benchmarks/tpch/Tests/20-explain.stable.out 
b/sql/benchmarks/tpch/Tests/20-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/20-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/20-explain.stable.out
@@ -94,12 +94,12 @@ function user.s2_1{autoCommit=true}(A0:s
     X_55:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_43,X_33,X_54);
     (X_56,r1_59) := algebra.join(X_31,X_55);
     X_58 := algebra.tinter(X_32,X_56);
-    X_276 := algebra.leftfetchjoin(X_58,X_23);
+    X_275 := algebra.leftfetchjoin(X_58,X_23);
     X_59 := 
sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",0);
     (X_62,r1_65) := 
sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",2);
     X_64 := 
sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",1);
     X_65 := sql.delta(X_59,X_62,r1_65,X_64);
-    X_66:bat[:oid,:wrd]  := algebra.leftfetchjoin(X_276,X_65);
+    X_66:bat[:oid,:wrd]  := algebra.leftfetchjoin(X_275,X_65);
     X_67:bat[:oid,:oid]  := sql.tid(X_8,"sys","lineitem");
     X_69:bat[:oid,:date]  := sql.bind(X_8,"sys","lineitem","l_shipdate",0);
     (X_71,r1_75) := sql.bind(X_8,"sys","lineitem","l_shipdate",2);
@@ -108,18 +108,18 @@ function user.s2_1{autoCommit=true}(A0:s
     X_75 := algebra.leftfetchjoin(X_67,X_74);
     X_76 := mtime.addmonths(A3,A4);
     X_77 := algebra.subselect(X_75,A2,X_76,true,false,false);
-    X_277 := algebra.leftfetchjoin(X_77,X_67);
+    X_276 := algebra.leftfetchjoin(X_77,X_67);
     X_80:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_partkey",0);
     (X_84,r1_91) := sql.bind(X_8,"sys","lineitem","l_partkey",2);
     X_87:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_partkey",1);
     X_89 := sql.delta(X_80,X_84,r1_91,X_87);
-    X_90:bat[:oid,:int]  := algebra.leftfetchjoin(X_277,X_89);
+    X_90:bat[:oid,:int]  := algebra.leftfetchjoin(X_276,X_89);
     X_91:bat[:oid,:wrd]  := mal.manifold("mkey","hash",X_90);
     X_95:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_suppkey",0);
     (X_98,r1_107) := sql.bind(X_8,"sys","lineitem","l_suppkey",2);
     X_100:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_suppkey",1);
     X_101 := sql.delta(X_95,X_98,r1_107,X_100);
-    X_102:bat[:oid,:int]  := algebra.leftfetchjoin(X_277,X_101);
+    X_102:bat[:oid,:int]  := algebra.leftfetchjoin(X_276,X_101);
     X_103:bat[:oid,:wrd]  := mkey.bulk_rotate_xor_hash(X_91,22,X_102);
     (X_104,r1_114) := algebra.join(X_66,X_103);
     X_106 := algebra.leftfetchjoin(X_58,X_31);
@@ -132,7 +132,7 @@ function user.s2_1{autoCommit=true}(A0:s
     (X_119,r1_132) := sql.bind(X_8,"sys","partsupp","ps_suppkey",2);
     X_122:bat[:oid,:int]  := sql.bind(X_8,"sys","partsupp","ps_suppkey",1);
     X_124 := sql.delta(X_114,X_119,r1_132,X_122);
-    X_125:bat[:oid,:int]  := algebra.leftfetchjoin(X_276,X_124);
+    X_125:bat[:oid,:int]  := algebra.leftfetchjoin(X_275,X_124);
     X_126 := algebra.leftfetchjoin(X_113,X_125);
     X_127 := algebra.leftfetchjoin(X_111,r1_114);
     X_128 := algebra.leftfetchjoin(X_127,X_102);
@@ -142,64 +142,64 @@ function user.s2_1{autoCommit=true}(A0:s
     X_132:bat[:oid,:oid]  := batcalc.identity(X_106);
     X_133 := algebra.leftfetchjoin(X_131,X_132);
     (X_134,r1_150,r2_150) := group.subgroupdone(X_133);
-    X_278 := algebra.leftfetchjoin(r1_150,X_131);
-    X_150:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",0);
-    (X_155,r1_178) := sql.bind(X_8,"sys","lineitem","l_quantity",2);
-    X_157:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",1);
-    X_158 := sql.delta(X_150,X_155,r1_178,X_157);
-    X_159:bat[:oid,:int]  := 
algebra.leftfetchjoinPath(X_130,X_127,X_277,X_158);
-    X_160:bat[:oid,:lng]  := aggr.subsum(X_159,X_134,r1_150,true,true);
+    X_277 := algebra.leftfetchjoin(r1_150,X_131);
+    X_146:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",0);
+    (X_151,r1_172) := sql.bind(X_8,"sys","lineitem","l_quantity",2);
+    X_154:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",1);
+    X_156 := sql.delta(X_146,X_151,r1_172,X_154);
+    X_157:bat[:oid,:int]  := 
algebra.leftfetchjoinPath(X_130,X_127,X_276,X_156);
+    X_158:bat[:oid,:lng]  := aggr.subsum(X_157,X_134,r1_150,true,true);
     X_137:bat[:oid,:int]  := sql.bind(X_8,"sys","partsupp","ps_availqty",0);
     (X_139,r1_155) := sql.bind(X_8,"sys","partsupp","ps_availqty",2);
     X_141:bat[:oid,:int]  := sql.bind(X_8,"sys","partsupp","ps_availqty",1);
     X_142 := sql.delta(X_137,X_139,r1_155,X_141);
-    X_143:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_278,X_58,X_23,X_142);
-    X_144:bat[:oid,:lng]  := batcalc.lng(X_143,19,2);
-    X_147 := calc.lng(1,A1,11,1);
-    X_162:bat[:oid,:lng]  := batcalc.lng(X_160,11,1);
-    X_163:bat[:oid,:lng]  := batcalc.*(X_147,X_162);
-    X_164:bat[:oid,:bit]  := batcalc.>(X_144,X_163);
-    X_165 := algebra.subselect(X_164,true,true,true,true,false);
-    X_167:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_165,X_278,X_125);
-    (X_168,r1_197) := algebra.join(X_21,X_167);
-    X_170 := algebra.tinter(X_22,X_168);
-    X_279 := algebra.leftfetchjoin(X_170,X_9);
-    X_171:bat[:oid,:int]  := sql.bind(X_8,"sys","supplier","s_nationkey",0);
-    (X_174,r1_203) := sql.bind(X_8,"sys","supplier","s_nationkey",2);
-    X_177:bat[:oid,:int]  := sql.bind(X_8,"sys","supplier","s_nationkey",1);
-    X_180 := sql.delta(X_171,X_174,r1_203,X_177);
-    X_181:bat[:oid,:int]  := algebra.leftfetchjoin(X_279,X_180);
+    X_143:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_277,X_58,X_23,X_142);
+    X_144 := calc.lng(1,A1,11,1);
+    X_160:bat[:oid,:lng]  := batcalc.lng(X_158,11,1);
+    X_161:bat[:oid,:lng]  := batcalc.*(X_144,X_160);
+    X_162:bat[:oid,:int]  := batcalc.int(2,X_161);
+    X_163:bat[:oid,:bit]  := batcalc.>(X_143,X_162);
+    X_164 := algebra.subselect(X_163,true,true,true,true,false);
+    X_166:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_164,X_277,X_125);
+    (X_167,r1_197) := algebra.join(X_21,X_166);
+    X_169 := algebra.tinter(X_22,X_167);
+    X_278 := algebra.leftfetchjoin(X_169,X_9);
+    X_170:bat[:oid,:int]  := sql.bind(X_8,"sys","supplier","s_nationkey",0);
+    (X_175,r1_205) := sql.bind(X_8,"sys","supplier","s_nationkey",2);
+    X_178:bat[:oid,:int]  := sql.bind(X_8,"sys","supplier","s_nationkey",1);
+    X_180 := sql.delta(X_170,X_175,r1_205,X_178);
+    X_181:bat[:oid,:int]  := algebra.leftfetchjoin(X_278,X_180);
     X_182:bat[:oid,:oid]  := sql.tid(X_8,"sys","nation");
     X_184:bat[:oid,:str]  := sql.bind(X_8,"sys","nation","n_name",0);
-    (X_187,r1_217) := sql.bind(X_8,"sys","nation","n_name",2);
-    X_189:bat[:oid,:str]  := sql.bind(X_8,"sys","nation","n_name",1);
-    X_190 := sql.delta(X_184,X_187,r1_217,X_189);
-    X_191 := algebra.leftfetchjoin(X_182,X_190);
-    X_192 := algebra.subselect(X_191,A5,A5,true,true,false);
-    X_194:bat[:oid,:int]  := sql.bind(X_8,"sys","nation","n_nationkey",0);
-    (X_196,r1_227) := sql.bind(X_8,"sys","nation","n_nationkey",2);
-    X_198:bat[:oid,:int]  := sql.bind(X_8,"sys","nation","n_nationkey",1);
-    X_199 := sql.delta(X_194,X_196,r1_227,X_198);
-    X_200:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_192,X_182,X_199);
-    (X_201,r1_233) := algebra.join(X_181,X_200);
-    X_280 := algebra.leftfetchjoin(X_201,X_170);
-    X_203:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_name",0);
-    (X_206,r1_238) := sql.bind(X_8,"sys","supplier","s_name",2);
+    (X_186,r1_217) := sql.bind(X_8,"sys","nation","n_name",2);
+    X_188:bat[:oid,:str]  := sql.bind(X_8,"sys","nation","n_name",1);
+    X_189 := sql.delta(X_184,X_186,r1_217,X_188);
+    X_190 := algebra.leftfetchjoin(X_182,X_189);
+    X_191 := algebra.subselect(X_190,A5,A5,true,true,false);
+    X_193:bat[:oid,:int]  := sql.bind(X_8,"sys","nation","n_nationkey",0);
+    (X_195,r1_227) := sql.bind(X_8,"sys","nation","n_nationkey",2);
+    X_197:bat[:oid,:int]  := sql.bind(X_8,"sys","nation","n_nationkey",1);
+    X_198 := sql.delta(X_193,X_195,r1_227,X_197);
+    X_199:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_191,X_182,X_198);
+    (X_200,r1_233) := algebra.join(X_181,X_199);
+    X_279 := algebra.leftfetchjoin(X_200,X_169);
+    X_202:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_name",0);
+    (X_207,r1_240) := sql.bind(X_8,"sys","supplier","s_name",2);
     X_210:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_name",1);
-    X_212 := sql.delta(X_203,X_206,r1_238,X_210);
-    X_213:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_280,X_9,X_212);
-    (X_214,r1_248,r2_248) := algebra.subsort(X_213,false,false);
-    X_218 := algebra.leftfetchjoin(r1_248,X_213);
+    X_212 := sql.delta(X_202,X_207,r1_240,X_210);
+    X_213:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_279,X_9,X_212);
+    (X_214,r1_249,r2_249) := algebra.subsort(X_213,false,false);
+    X_218 := algebra.leftfetchjoin(r1_249,X_213);
     X_219:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_address",0);
-    (X_222,r1_256) := sql.bind(X_8,"sys","supplier","s_address",2);
-    X_224:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_address",1);
-    X_225 := sql.delta(X_219,X_222,r1_256,X_224);
-    X_226:bat[:oid,:str]  := algebra.leftfetchjoinPath(r1_248,X_280,X_9,X_225);
-    X_227 := sql.resultSet(2,1,X_218);
-    sql.rsColumn(X_227,"sys.supplier","s_name","varchar",25,0,X_218);
-    sql.rsColumn(X_227,"sys.supplier","s_address","varchar",40,0,X_226);
-    X_234 := io.stdout();
-    sql.exportResult(X_234,X_227);
+    (X_221,r1_256) := sql.bind(X_8,"sys","supplier","s_address",2);
+    X_223:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_address",1);
+    X_224 := sql.delta(X_219,X_221,r1_256,X_223);
+    X_225:bat[:oid,:str]  := algebra.leftfetchjoinPath(r1_249,X_279,X_9,X_224);
+    X_226 := sql.resultSet(2,1,X_218);
+    sql.rsColumn(X_226,"sys.supplier","s_name","varchar",25,0,X_218);
+    sql.rsColumn(X_226,"sys.supplier","s_address","varchar",40,0,X_225);
+    X_233 := io.stdout();
+    sql.exportResult(X_233,X_226);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to