Changeset: 16cbf0e5655e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16cbf0e5655e
Modified Files:
        sql/src/benchmarks/tpch/11.sql
        sql/src/benchmarks/tpch/Tests/01-22.stable.out
        sql/src/benchmarks/tpch/Tests/11.stable.out
Branch: Oct2010
Log Message:

Use correct constant in TPC-H Q11 that matches the scale factor (SF).
Approved stable output accordingly.
Documented that and how the constant in Q11 needs to be adjusted
according to the scale factor (SF).


diffs (truncated from 752 to 300 lines):

diff -r 3516ef78b1bf -r 16cbf0e5655e sql/src/benchmarks/tpch/11.sql
--- a/sql/src/benchmarks/tpch/11.sql    Thu Nov 11 11:15:54 2010 +0100
+++ b/sql/src/benchmarks/tpch/11.sql    Thu Nov 11 11:25:15 2010 +0100
@@ -15,7 +15,9 @@
        sum(ps_supplycost * ps_availqty) >
        (
                select
-                       sum(ps_supplycost * ps_availqty) * 0.0001000000
+                       sum(ps_supplycost * ps_availqty) * 0.0100000000
+                       -- The above constant needs to be adjusted according
+                       -- to the scale factor (SF): constant = 0.0001 / SF.
                from
                        partsupp,
                        supplier,
diff -r 3516ef78b1bf -r 16cbf0e5655e 
sql/src/benchmarks/tpch/Tests/01-22.stable.out
--- a/sql/src/benchmarks/tpch/Tests/01-22.stable.out    Thu Nov 11 11:15:54 
2010 +0100
+++ b/sql/src/benchmarks/tpch/Tests/01-22.stable.out    Thu Nov 11 11:25:15 
2010 +0100
@@ -403,364 +403,7 @@
 % int, decimal # type
 % 4,   21 # length
 [ 1376,        13271249.89     ]
-[ 788, 9498648.06      ]
-[ 1071,        9388264.40      ]
-[ 1768,        9207199.75      ]
-[ 1168,        8881908.96      ]
-[ 1084,        8709494.16      ]
-[ 1415,        8471489.56      ]
-[ 1338,        8293841.12      ]
-[ 124, 8203209.30      ]
-[ 1232,        8111663.34      ]
-[ 1643,        7975862.75      ]
-[ 1952,        7936947.61      ]
-[ 1944,        7880018.60      ]
-[ 1884,        7513422.84      ]
-[ 942, 7511018.76      ]
-[ 670, 7299956.80      ]
-[ 1532,        7222347.20      ]
-[ 1052,        7158586.00      ]
-[ 455, 7064285.84      ]
-[ 1176,        7060670.89      ]
-[ 143, 7037648.64      ]
-[ 1653,        6949533.70      ]
-[ 1140,        6929464.08      ]
-[ 1076,        6877472.96      ]
-[ 2000,        6720009.38      ]
-[ 348, 6681307.34      ]
-[ 810, 6576640.95      ]
-[ 943, 6458641.70      ]
-[ 720, 6391330.27      ]
-[ 1748,        6341530.40      ]
-[ 1241,        6304944.66      ]
-[ 1384,        6279261.12      ]
-[ 1784,        6247863.25      ]
-[ 984, 6136927.00      ]
-[ 445, 6127784.28      ]
-[ 1976,        6079237.08      ]
-[ 1609,        6022720.80      ]
-[ 1563,        5978195.08      ]
-[ 452, 5838052.00      ]
-[ 222, 5737162.24      ]
-[ 1629,        5703117.12      ]
-[ 1454,        5694804.18      ]
-[ 1082,        5681981.25      ]
-[ 691, 5633589.72      ]
-[ 1474,        5614673.64      ]
-[ 1900,        5591905.36      ]
-[ 262, 5553285.32      ]
-[ 1876,        5517997.59      ]
-[ 1027,        5490916.00      ]
-[ 1833,        5451495.00      ]
-[ 513, 5374426.22      ]
-[ 752, 5358919.70      ]
-[ 1367,        5352773.25      ]
-[ 543, 5189101.68      ]
-[ 1144,        5174388.56      ]
-[ 403, 5126118.15      ]
-[ 1406,        5121886.44      ]
-[ 320, 5072099.76      ]
-[ 1940,        5069178.40      ]
-[ 1503,        5050895.50      ]
-[ 1437,        5039590.60      ]
-[ 743, 5039271.42      ]
-[ 82,  4995939.00      ]
-[ 916, 4994730.10      ]
-[ 732, 4932809.82      ]
-[ 356, 4879860.09      ]
-[ 1592,        4831242.60      ]
-[ 1043,        4825921.31      ]
-[ 132, 4781984.14      ]
-[ 1006,        4733954.64      ]
-[ 497, 4711173.60      ]
-[ 1008,        4565588.85      ]
-[ 1370,        4563830.10      ]
-[ 216, 4561143.80      ]
-[ 34,  4501982.71      ]
-[ 1908,        4417931.80      ]
-[ 982, 4391495.46      ]
-[ 1652,        4358793.14      ]
-[ 614, 4356657.45      ]
-[ 1552,        4355541.70      ]
-[ 359, 4353566.87      ]
-[ 1104,        4347515.90      ]
-[ 198, 4315049.00      ]
-[ 998, 4167784.88      ]
-[ 1543,        4159568.16      ]
-[ 1308,        4153124.95      ]
-[ 474, 4123819.20      ]
-[ 1394,        4122729.33      ]
-[ 271, 4095180.96      ]
-[ 908, 4088856.20      ]
-[ 1135,        4045014.13      ]
-[ 1632,        4010794.90      ]
-[ 1362,        3982060.16      ]
-[ 158, 3941881.65      ]
-[ 1852,        3923035.02      ]
-[ 1556,        3896709.54      ]
-[ 584, 3843848.30      ]
-[ 885, 3826021.16      ]
-[ 376, 3781201.96      ]
-[ 712, 3749696.80      ]
-[ 2,   3743241.43      ]
-[ 676, 3735715.20      ]
-[ 1832,        3709008.60      ]
-[ 1955,        3702794.70      ]
-[ 68,  3690702.41      ]
-[ 1435,        3659114.10      ]
-[ 1443,        3656762.84      ]
-[ 1278,        3653100.66      ]
-[ 1920,        3647892.54      ]
-[ 423, 3602031.80      ]
-[ 818, 3589047.60      ]
-[ 779, 3559597.53      ]
-[ 485, 3558511.44      ]
-[ 552, 3555470.10      ]
-[ 1269,        3510427.65      ]
-[ 1602,        3492117.70      ]
-[ 426, 3486888.02      ]
-[ 1452,        3480825.60      ]
-[ 756, 3469373.70      ]
-[ 832, 3447746.46      ]
-[ 1493,        3446867.40      ]
-[ 1650,        3417752.58      ]
-[ 205, 3403046.25      ]
-[ 93,  3361425.89      ]
-[ 76,  3342081.82      ]
-[ 1759,        3303050.40      ]
-[ 886, 3302180.70      ]
-[ 1544,        3288573.16      ]
-[ 1932,        3270900.40      ]
-[ 489, 3253368.30      ]
-[ 594, 3177408.57      ]
-[ 184, 3177162.05      ]
-[ 950, 3165213.01      ]
-[ 1124,        3143279.36      ]
-[ 106, 3099021.98      ]
-[ 1964,        3016553.10      ]
-[ 384, 2964262.77      ]
-[ 974, 2959497.10      ]
-[ 964, 2951329.45      ]
-[ 1984,        2907345.36      ]
-[ 200, 2895688.32      ]
-[ 683, 2829476.95      ]
-[ 1564,        2816506.56      ]
-[ 546, 2788059.64      ]
-[ 502, 2780828.64      ]
-[ 396, 2778421.39      ]
-[ 203, 2761439.88      ]
-[ 866, 2753031.20      ]
-[ 1743,        2743889.49      ]
-[ 1041,        2738083.92      ]
-[ 1432,        2713412.16      ]
-[ 43,  2587359.58      ]
-[ 941, 2587091.52      ]
-[ 1890,        2558739.69      ]
-[ 1866,        2545838.40      ]
-[ 747, 2511745.32      ]
-[ 776, 2506489.89      ]
-[ 554, 2505417.25      ]
-[ 1210,        2490820.92      ]
-[ 1239,        2405206.30      ]
-[ 443, 2382150.05      ]
-[ 1661,        2370574.16      ]
-[ 1079,        2363505.11      ]
-[ 1329,        2305870.42      ]
-[ 1691,        2261159.92      ]
-[ 1247,        2239553.28      ]
-[ 1752,        2230055.76      ]
-[ 150, 2217043.59      ]
-[ 1814,        2213635.20      ]
-[ 289, 2187160.45      ]
-[ 1400,        2139845.10      ]
-[ 1898,        2130114.96      ]
-[ 1809,        2122758.72      ]
-[ 884, 2107479.56      ]
-[ 1038,        2096868.97      ]
-[ 1318,        2051302.44      ]
-[ 524, 2035262.22      ]
-[ 414, 2029692.45      ]
-[ 298, 2026981.74      ]
-[ 1996,        2020953.54      ]
-[ 1742,        2019190.80      ]
-[ 1620,        2010112.00      ]
-[ 877, 1956429.18      ]
-[ 1332,        1919029.56      ]
-[ 1536,        1859318.15      ]
-[ 1116,        1852588.28      ]
-[ 447, 1817951.32      ]
-[ 1676,        1802306.08      ]
-[ 1911,        1779646.44      ]
-[ 1459,        1767602.30      ]
-[ 576, 1761838.75      ]
-[ 1273,        1754235.01      ]
-[ 583, 1725649.92      ]
-[ 532, 1682311.48      ]
-[ 1732,        1652831.20      ]
-[ 1572,        1650953.52      ]
-[ 1889,        1638443.72      ]
-[ 476, 1631154.06      ]
-[ 1221,        1629883.46      ]
-[ 1792,        1606346.10      ]
-[ 243, 1603235.16      ]
-[ 328, 1569826.72      ]
-[ 1999,        1553706.00      ]
-[ 1611,        1529857.01      ]
-[ 643, 1512838.80      ]
-[ 1276,        1467567.28      ]
-[ 1823,        1462293.00      ]
-[ 1,   1456050.96      ]
-[ 27,  1425832.40      ]
-[ 632, 1408087.26      ]
-[ 1184,        1406101.78      ]
-[ 252, 1379186.35      ]
-[ 392, 1354813.18      ]
-[ 1215,        1344383.20      ]
-[ 26,  1337002.89      ]
-[ 84,  1334146.71      ]
-[ 784, 1327297.01      ]
-[ 1803,        1327045.06      ]
-[ 352, 1326102.34      ]
-[ 165, 1289075.76      ]
-[ 176, 1285866.20      ]
-[ 1314,        1244173.26      ]
-[ 1701,        1239095.44      ]
-[ 844, 1225696.05      ]
-[ 1988,        1216798.33      ]
-[ 1847,        1202012.13      ]
-[ 1706,        1184125.10      ]
-[ 744, 1182820.80      ]
-[ 230, 1165932.30      ]
-[ 418, 1078321.44      ]
-[ 174, 1060584.80      ]
-[ 1073,        1028449.89      ]
-[ 1726,        1018673.04      ]
-[ 1206,        1002319.49      ]
-[ 1343,        998105.76       ]
-[ 952, 997684.24       ]
-[ 484, 991530.93       ]
-[ 932, 980620.68       ]
-[ 843, 978862.92       ]
-[ 1841,        962131.86       ]
-[ 494, 957575.34       ]
-[ 659, 954291.05       ]
-[ 251, 939764.70       ]
-[ 1413,        936951.94       ]
-[ 572, 906111.99       ]
-[ 32,  894484.09       ]
-[ 9,   893905.92       ]
-[ 1498,        890887.85       ]
-[ 1790,        878923.64       ]
-[ 1670,        854046.43       ]
-[ 876, 842245.67       ]
-[ 1758,        841275.42       ]
-[ 930, 832963.68       ]
-[ 284, 826642.60       ]
-[ 1710,        811504.38       ]
-[ 1047,        791214.45       ]
-[ 653, 788974.21       ]
-[ 315, 770526.05       ]
-[ 1734,        763569.40       ]
-[ 1017,        715302.72       ]
-[ 1305,        713351.43       ]
-[ 77,  688865.82       ]
-[ 1512,        682434.15       ]
-[ 276, 680239.04       ]
-[ 1284,        671225.94       ]
-[ 1356,        665716.83       ]
-[ 800, 663414.65       ]
-[ 117, 639650.88       ]
-[ 652, 635629.28       ]
-[ 57,  630987.44       ]
-[ 1426,        628241.25       ]
-[ 1196,        622427.16       ]
-[ 51,  622249.54       ]
-[ 1846,        621068.80       ]
-[ 601, 615942.60       ]
-[ 645, 607985.84       ]
-[ 684, 571490.70       ]
-[ 465, 570337.40       ]
-[ 562, 567651.24       ]
-[ 387, 556634.76       ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to