Changeset: 5fcf917126a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fcf917126a8
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/copy/Tests/int_parse_best.stable.out
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out
Branch: default
Log Message:
approved output after recent changes (revert of optimizers, and merge of
changes)
diffs (truncated from 765 to 300 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
@@ -52,110 +52,110 @@ Ready.
% clob # type
% 109 # length
function user.main():void;
- X_690 := bat.new(nil:str);
- X_697 := bat.append(X_690,"sys.lineitem");
- X_707 := bat.append(X_697,"sys.lineitem");
- X_713 := bat.append(X_707,"sys.L1");
- X_723 := bat.append(X_713,"sys.L2");
- X_730 := bat.append(X_723,"sys.L3");
- X_738 := bat.append(X_730,"sys.L4");
- X_746 := bat.append(X_738,"sys.L5");
- X_756 := bat.append(X_746,"sys.L6");
- X_763 := bat.append(X_756,"sys.L7");
- X_770 := bat.append(X_763,"sys.L10");
- X_692 := bat.new(nil:str);
- X_699 := bat.append(X_692,"l_returnflag");
- X_708 := bat.append(X_699,"l_linestatus");
- X_715 := bat.append(X_708,"sum_qty");
- X_725 := bat.append(X_715,"sum_base_price");
- X_732 := bat.append(X_725,"sum_disc_price");
- X_740 := bat.append(X_732,"sum_charge");
- X_748 := bat.append(X_740,"avg_qty");
- X_758 := bat.append(X_748,"avg_price");
- X_765 := bat.append(X_758,"avg_disc");
- X_772 := bat.append(X_765,"count_order");
- X_693 := bat.new(nil:str);
- X_701 := bat.append(X_693,"char");
- X_710 := bat.append(X_701,"char");
- X_717 := bat.append(X_710,"decimal");
- X_727 := bat.append(X_717,"decimal");
- X_734 := bat.append(X_727,"decimal");
- X_742 := bat.append(X_734,"decimal");
- X_750 := bat.append(X_742,"double");
- X_760 := bat.append(X_750,"double");
- X_767 := bat.append(X_760,"double");
- X_774 := bat.append(X_767,"bigint");
- X_694 := bat.new(nil:int);
- X_703 := bat.append(X_694,1);
- X_711 := bat.append(X_703,1);
- X_719 := bat.append(X_711,39);
- X_728 := bat.append(X_719,39);
- X_735 := bat.append(X_728,39);
- X_743 := bat.append(X_735,39);
- X_752 := bat.append(X_743,53);
- X_761 := bat.append(X_752,53);
- X_768 := bat.append(X_761,53);
- X_776 := bat.append(X_768,64);
- X_696 := bat.new(nil:int);
- X_705 := bat.append(X_696,0);
- X_712 := bat.append(X_705,0);
- X_721 := bat.append(X_712,2);
- X_729 := bat.append(X_721,2);
- X_736 := bat.append(X_729,4);
- X_744 := bat.append(X_736,6);
- X_754 := bat.append(X_744,0);
- X_762 := bat.append(X_754,0);
- X_769 := bat.append(X_762,0);
- X_778 := bat.append(X_769,0);
- X_556 := sql.mvc();
- X_560:bat[:date] := sql.bind(X_556,"sys","lineitem","l_shipdate",0);
- C_557:bat[:oid] := sql.tid(X_556,"sys","lineitem");
- X_572:date := mtime.date_sub_msec_interval("1998-12-01",7776000000);
- C_573 := algebra.thetasubselect(X_560,C_557,X_572,"<=");
- X_575:bat[:str] := sql.bind(X_556,"sys","lineitem","l_linestatus",0);
- X_582 := algebra.projection(C_573,X_575);
- X_583:bat[:str] := sql.bind(X_556,"sys","lineitem","l_returnflag",0);
- X_590 := algebra.projection(C_573,X_583);
- (X_591,r1_44,r2_44) := group.subgroup(X_590);
- (X_594,r1_47,r2_47) := group.subgroupdone(X_582,X_591);
- X_597 := algebra.projection(r1_47,X_582);
- X_598 := algebra.projection(r1_47,X_590);
- X_609:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_quantity",0);
- X_616 := algebra.projection(C_573,X_609);
- X_617:bat[:hge] := aggr.subsum(X_616,X_594,r1_47,true,true);
- X_621:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_extendedprice",0);
- X_628 := algebra.projection(C_573,X_621);
- X_629:bat[:hge] := aggr.subsum(X_628,X_594,r1_47,true,true);
- X_639:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_discount",0);
- X_646 := algebra.projection(C_573,X_639);
- X_647:bat[:lng] := batcalc.-(100:lng,X_646);
- X_649:bat[:hge] := batcalc.*(X_628,X_647);
- X_651:bat[:hge] := aggr.subsum(X_649,X_594,r1_47,true,true);
- X_659:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_tax",0);
- X_666 := algebra.projection(C_573,X_659);
- X_670:bat[:lng] := batcalc.+(X_666,100:lng);
- X_673:bat[:hge] := batcalc.*(X_649,X_670);
- X_674:bat[:hge] := aggr.subsum(X_673,X_594,r1_47,true,true);
- X_676:bat[:dbl] := batcalc.dbl(2,X_616);
- X_678:bat[:dbl] := aggr.subavg(X_676,X_594,r1_47,true,true);
- X_680:bat[:dbl] := batcalc.dbl(2,X_628);
- X_681:bat[:dbl] := aggr.subavg(X_680,X_594,r1_47,true,true);
- X_683:bat[:dbl] := batcalc.dbl(2,X_646);
- X_684:bat[:dbl] := aggr.subavg(X_683,X_594,r1_47,true,true);
- X_686:bat[:lng] := aggr.subcount(X_594,X_594,r1_47,false);
- (X_599,r1_52,r2_52) := algebra.subsort(X_598,false,false);
- (X_604,r1_57,r2_57) := algebra.subsort(X_597,r1_52,r2_52,false,false);
- X_607 := algebra.projection(r1_57,X_598);
- X_608 := algebra.projection(r1_57,X_597);
- X_620 := algebra.projection(r1_57,X_617);
- X_630 := algebra.projection(r1_57,X_629);
- X_654 := algebra.projection(r1_57,X_651);
- X_675 := algebra.projection(r1_57,X_674);
- X_679 := algebra.projection(r1_57,X_678);
- X_682 := algebra.projection(r1_57,X_681);
- X_685 := algebra.projection(r1_57,X_684);
- X_688 := algebra.projection(r1_57,X_686);
-
sql.resultSet(X_770,X_772,X_774,X_776,X_778,X_607,X_608,X_620,X_630,X_654,X_675,X_679,X_682,X_685,X_688);
+ X_844 := bat.new(nil:str);
+ X_851 := bat.append(X_844,"sys.lineitem");
+ X_861 := bat.append(X_851,"sys.lineitem");
+ X_867 := bat.append(X_861,"sys.L1");
+ X_877 := bat.append(X_867,"sys.L2");
+ X_884 := bat.append(X_877,"sys.L3");
+ X_892 := bat.append(X_884,"sys.L4");
+ X_900 := bat.append(X_892,"sys.L5");
+ X_910 := bat.append(X_900,"sys.L6");
+ X_917 := bat.append(X_910,"sys.L7");
+ X_924 := bat.append(X_917,"sys.L10");
+ X_846 := bat.new(nil:str);
+ X_853 := bat.append(X_846,"l_returnflag");
+ X_862 := bat.append(X_853,"l_linestatus");
+ X_869 := bat.append(X_862,"sum_qty");
+ X_879 := bat.append(X_869,"sum_base_price");
+ X_886 := bat.append(X_879,"sum_disc_price");
+ X_894 := bat.append(X_886,"sum_charge");
+ X_902 := bat.append(X_894,"avg_qty");
+ X_912 := bat.append(X_902,"avg_price");
+ X_919 := bat.append(X_912,"avg_disc");
+ X_926 := bat.append(X_919,"count_order");
+ X_847 := bat.new(nil:str);
+ X_855 := bat.append(X_847,"char");
+ X_864 := bat.append(X_855,"char");
+ X_871 := bat.append(X_864,"decimal");
+ X_881 := bat.append(X_871,"decimal");
+ X_888 := bat.append(X_881,"decimal");
+ X_896 := bat.append(X_888,"decimal");
+ X_904 := bat.append(X_896,"double");
+ X_914 := bat.append(X_904,"double");
+ X_921 := bat.append(X_914,"double");
+ X_928 := bat.append(X_921,"bigint");
+ X_848 := bat.new(nil:int);
+ X_857 := bat.append(X_848,1);
+ X_865 := bat.append(X_857,1);
+ X_873 := bat.append(X_865,39);
+ X_882 := bat.append(X_873,39);
+ X_889 := bat.append(X_882,39);
+ X_897 := bat.append(X_889,39);
+ X_906 := bat.append(X_897,53);
+ X_915 := bat.append(X_906,53);
+ X_922 := bat.append(X_915,53);
+ X_930 := bat.append(X_922,64);
+ X_850 := bat.new(nil:int);
+ X_859 := bat.append(X_850,0);
+ X_866 := bat.append(X_859,0);
+ X_875 := bat.append(X_866,2);
+ X_883 := bat.append(X_875,2);
+ X_890 := bat.append(X_883,4);
+ X_898 := bat.append(X_890,6);
+ X_908 := bat.append(X_898,0);
+ X_916 := bat.append(X_908,0);
+ X_923 := bat.append(X_916,0);
+ X_932 := bat.append(X_923,0);
+ X_710 := sql.mvc();
+ X_714:bat[:date] := sql.bind(X_710,"sys","lineitem","l_shipdate",0);
+ C_711:bat[:oid] := sql.tid(X_710,"sys","lineitem");
+ X_726:date := mtime.date_sub_msec_interval("1998-12-01",7776000000);
+ C_727 := algebra.thetasubselect(X_714,C_711,X_726,"<=");
+ X_729:bat[:str] := sql.bind(X_710,"sys","lineitem","l_linestatus",0);
+ X_736 := algebra.projection(C_727,X_729);
+ X_737:bat[:str] := sql.bind(X_710,"sys","lineitem","l_returnflag",0);
+ X_744 := algebra.projection(C_727,X_737);
+ (X_745,r1_44,r2_44) := group.subgroup(X_744);
+ (X_748,r1_47,r2_47) := group.subgroupdone(X_736,X_745);
+ X_751 := algebra.projection(r1_47,X_736);
+ X_752 := algebra.projection(r1_47,X_744);
+ X_763:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_quantity",0);
+ X_770 := algebra.projection(C_727,X_763);
+ X_771:bat[:hge] := aggr.subsum(X_770,X_748,r1_47,true,true);
+ X_775:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_extendedprice",0);
+ X_782 := algebra.projection(C_727,X_775);
+ X_783:bat[:hge] := aggr.subsum(X_782,X_748,r1_47,true,true);
+ X_793:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_discount",0);
+ X_800 := algebra.projection(C_727,X_793);
+ X_801:bat[:lng] := batcalc.-(100:lng,X_800);
+ X_803:bat[:hge] := batcalc.*(X_782,X_801);
+ X_805:bat[:hge] := aggr.subsum(X_803,X_748,r1_47,true,true);
+ X_813:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_tax",0);
+ X_820 := algebra.projection(C_727,X_813);
+ X_824:bat[:lng] := batcalc.+(X_820,100:lng);
+ X_827:bat[:hge] := batcalc.*(X_803,X_824);
+ X_828:bat[:hge] := aggr.subsum(X_827,X_748,r1_47,true,true);
+ X_830:bat[:dbl] := batcalc.dbl(2,X_770);
+ X_832:bat[:dbl] := aggr.subavg(X_830,X_748,r1_47,true,true);
+ X_834:bat[:dbl] := batcalc.dbl(2,X_782);
+ X_835:bat[:dbl] := aggr.subavg(X_834,X_748,r1_47,true,true);
+ X_837:bat[:dbl] := batcalc.dbl(2,X_800);
+ X_838:bat[:dbl] := aggr.subavg(X_837,X_748,r1_47,true,true);
+ X_840:bat[:lng] := aggr.subcount(X_748,X_748,r1_47,false);
+ (X_753,r1_52,r2_52) := algebra.subsort(X_752,false,false);
+ (X_758,r1_57,r2_57) := algebra.subsort(X_751,r1_52,r2_52,false,false);
+ X_761 := algebra.projection(r1_57,X_752);
+ X_762 := algebra.projection(r1_57,X_751);
+ X_774 := algebra.projection(r1_57,X_771);
+ X_784 := algebra.projection(r1_57,X_783);
+ X_808 := algebra.projection(r1_57,X_805);
+ X_829 := algebra.projection(r1_57,X_828);
+ X_833 := algebra.projection(r1_57,X_832);
+ X_836 := algebra.projection(r1_57,X_835);
+ X_839 := algebra.projection(r1_57,X_838);
+ X_842 := algebra.projection(r1_57,X_840);
+
sql.resultSet(X_924,X_926,X_928,X_930,X_932,X_761,X_762,X_774,X_784,X_808,X_829,X_833,X_836,X_839,X_842);
end user.main;
#inline actions= 0 time=5 usec
#remap actions=10 time=172 usec
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
@@ -44,35 +44,35 @@ Ready.
% clob # type
% 80 # length
function user.main():void;
- X_562 := sql.mvc();
- X_566:bat[:date] := sql.bind(X_562,"sys","lineitem","l_shipdate",0);
- C_563:bat[:oid] := sql.tid(X_562,"sys","lineitem");
- X_578:date := mtime.addmonths("1995-09-01",1);
- C_579 :=
algebra.subselect(X_566,C_563,"1995-09-01",X_578,true,false,false);
- X_583:bat[:int] := sql.bind(X_562,"sys","lineitem","l_partkey",0);
- X_590 := algebra.projection(C_579,X_583);
- C_591:bat[:oid] := sql.tid(X_562,"sys","part");
- X_593:bat[:int] := sql.bind(X_562,"sys","part","p_partkey",0);
- X_599 := algebra.projection(C_591,X_593);
- (X_600,r1_53) :=
algebra.subjoin(X_590,X_599,nil:BAT,nil:BAT,false,nil:lng);
- X_605:bat[:str] := sql.bind(X_562,"sys","part","p_type",0);
- X_612:bat[:str] := algebra.projectionpath(r1_53,C_591,X_605);
- X_614:bat[:bit] := batalgebra.like(X_612,"PROMO%");
- X_617:bat[:bit] := batcalc.isnil(X_614);
- X_622:bat[:bit] := batcalc.ifthenelse(X_617,false,X_614);
- X_624:bat[:lng] := sql.bind(X_562,"sys","lineitem","l_extendedprice",0);
- X_632:bat[:lng] := algebra.projectionpath(X_600,C_579,X_624);
- X_640:bat[:lng] := sql.bind(X_562,"sys","lineitem","l_discount",0);
- X_648:bat[:lng] := algebra.projectionpath(X_600,C_579,X_640);
- X_649:bat[:lng] := batcalc.-(100:lng,X_648);
- X_651:bat[:hge] := batcalc.*(X_632,X_649);
- X_657:bat[:hge] := batcalc.ifthenelse(X_622,X_651,0:hge);
- X_659:hge := aggr.sum(X_657);
- X_661:hge := calc.*(X_659,1000);
- X_662 := calc.hge(5,X_661,39,9);
- X_671:hge := aggr.sum(X_651);
- X_672:hge := calc./(X_662,X_671);
- sql.resultSet("sys.L2","promo_revenue","decimal",39,5,10,X_672);
+ X_716 := sql.mvc();
+ X_720:bat[:date] := sql.bind(X_716,"sys","lineitem","l_shipdate",0);
+ C_717:bat[:oid] := sql.tid(X_716,"sys","lineitem");
+ X_732:date := mtime.addmonths("1995-09-01",1);
+ C_733 :=
algebra.subselect(X_720,C_717,"1995-09-01",X_732,true,false,false);
+ X_737:bat[:int] := sql.bind(X_716,"sys","lineitem","l_partkey",0);
+ X_744 := algebra.projection(C_733,X_737);
+ C_745:bat[:oid] := sql.tid(X_716,"sys","part");
+ X_747:bat[:int] := sql.bind(X_716,"sys","part","p_partkey",0);
+ X_753 := algebra.projection(C_745,X_747);
+ (X_754,r1_53) :=
algebra.subjoin(X_744,X_753,nil:BAT,nil:BAT,false,nil:lng);
+ X_759:bat[:str] := sql.bind(X_716,"sys","part","p_type",0);
+ X_766:bat[:str] := algebra.projectionpath(r1_53,C_745,X_759);
+ X_768:bat[:bit] := batalgebra.like(X_766,"PROMO%");
+ X_771:bat[:bit] := batcalc.isnil(X_768);
+ X_776:bat[:bit] := batcalc.ifthenelse(X_771,false,X_768);
+ X_778:bat[:lng] := sql.bind(X_716,"sys","lineitem","l_extendedprice",0);
+ X_786:bat[:lng] := algebra.projectionpath(X_754,C_733,X_778);
+ X_794:bat[:lng] := sql.bind(X_716,"sys","lineitem","l_discount",0);
+ X_802:bat[:lng] := algebra.projectionpath(X_754,C_733,X_794);
+ X_803:bat[:lng] := batcalc.-(100:lng,X_802);
+ X_805:bat[:hge] := batcalc.*(X_786,X_803);
+ X_811:bat[:hge] := batcalc.ifthenelse(X_776,X_805,0:hge);
+ X_813:hge := aggr.sum(X_811);
+ X_815:hge := calc.*(X_813,1000);
+ X_816 := calc.hge(5,X_815,39,9);
+ X_825:hge := aggr.sum(X_805);
+ X_826:hge := calc./(X_816,X_825);
+ sql.resultSet("sys.L2","promo_revenue","decimal",39,5,10,X_826);
end user.main;
#inline actions= 0 time=4 usec
#remap actions= 9 time=139 usec
diff --git a/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
@@ -48,41 +48,41 @@ Ready.
% clob # type
% 83 # length
function user.main():void;
- X_556 := sql.mvc();
- C_557:bat[:oid] := sql.tid(X_556,"sys","lineitem");
- X_560:bat[:int] := sql.bind(X_556,"sys","lineitem","l_partkey",0);
- X_569 := algebra.projection(C_557,X_560);
- X_572:bat[:str] := sql.bind(X_556,"sys","part","p_container",0);
- X_580:bat[:str] := sql.bind(X_556,"sys","part","p_brand",0);
- C_570:bat[:oid] := sql.tid(X_556,"sys","part");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
