Changeset: c696d4be3c03 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c696d4be3c03
Modified Files:
sql/backends/monet5/sql_scenario.c
Branch: unlock
Log Message:
merged
diffs (truncated from 2261 to 300 lines):
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1677,25 +1677,19 @@ GDKanalyticalavg(BAT *r, BAT *b, BAT *s,
#ifdef TRUNCATE_NUMBERS
#define ANALYTICAL_AVERAGE_INT_CALC_FINALIZE(avg, rem, ncnt) \
do {
- if (rem > 0 && avg < 0) { \
+ if (rem > 0 && avg < 0) \
avg++; \
- rem -= ncnt; \
- }
} while(0)
#else
#define ANALYTICAL_AVERAGE_INT_CALC_FINALIZE(avg, rem, ncnt) \
do { \
if (rem > 0) { \
if (avg < 0) { \
- if (2*rem > ncnt) { \
+ if (2*rem > ncnt) \
avg++; \
- rem -= ncnt; \
- } \
} else { \
- if (2*rem >= ncnt) { \
+ if (2*rem >= ncnt) \
avg++; \
- rem -= ncnt; \
- } \
} \
} \
} while(0)
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1160,6 +1160,11 @@ SQLparser(Client c)
if (msg != MAL_SUCCEED) {
str other = c->curprg->def->errors;
+ /* In debugging mode you may want to
assess what went wrong in the optimizers*/
+#ifndef NDEBUG
+ if( m->emod & mod_debug)
+ runMALDebugger(c,
c->curprg->def);
+#endif
c->curprg->def->errors = 0;
MSresetInstructions(c->curprg->def,
oldstop);
freeVariables(c, c->curprg->def, NULL,
oldvtop);
diff --git a/sql/benchmarks/tpcds/Tests/47.stable.out
b/sql/benchmarks/tpcds/Tests/47.stable.out
--- a/sql/benchmarks/tpcds/Tests/47.stable.out
+++ b/sql/benchmarks/tpcds/Tests/47.stable.out
@@ -37,112 +37,112 @@ stdout of test '47` in directory 'sql/be
# s_company_name,
% sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2,
sys.v2 # table_name
% i_category, i_brand, s_store_name, s_company_name, d_year, d_moy,
avg_monthly_sales, sum_sales, psum, nsum # name
-% char, char, varchar, varchar, int, int, double,
decimal, decimal, decimal # type
-% 50, 50, 5, 7, 4, 1, 24, 20, 20, 20 #
length
-[ "Men", "importoimporto #1", "ese", "Unknown", 1999, 3,
5492.817525, 2070.65, 3307.78, 2784.11 ]
-[ "Music", "exportischolar #1", "eing", "Unknown", 1999, 2,
5134.238322, 1740.21, 4401.89, 2721.61 ]
-[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 4,
5463.700806, 2091.07, 3391.39, 3095.31 ]
-[ "Music", "edu packscholar #1", "ought", "Unknown", 1999,
7, 5552.305013, 2226.34, 4081.99, 7573.33 ]
-[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 2,
5463.700806, 2268.27, 4139.47, 3391.39 ]
-[ "Men", "edu packimporto #1", "ought", "Unknown", 1999,
7, 5176.257426, 1993.73, 3542.54, 5764.35 ]
-[ "Children", "exportiexporti #1", "ese", "Unknown", 1999, 3,
5185.898254, 2019.69, 3479.21, 2982.05 ]
-[ "Shoes", "amalgedu pack #1", "ation", "Unknown", 1999,
6, 5152.095886, 2077.67, 3123.43, 2368.73 ]
-[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 3,
5501.180766, 2453.88, 2683.70, 2615.32 ]
-[ "Children", "exportiexporti #1", "ation", "Unknown", 1999,
4, 5238.357524, 2232.03, 3221.70, 3649.52 ]
-[ "Shoes", "importoedu pack #1", "eing", "Unknown", 1999, 5,
4698.612447, 1703.27, 2687.15, 2757.83 ]
-[ "Music", "exportischolar #1", "bar", "Unknown", 1999, 7,
5318.146708, 2346.06, 3483.88, 7658.62 ]
-[ "Music", "edu packscholar #1", "ation", "Unknown", 1999,
2, 5622.227458, 2657.68, 4207.03, 3543.82 ]
-[ "Children", "exportiexporti #1", "bar", "Unknown", 1999, 7,
5280.662557, 2324.79, 3003.61, 5961.39 ]
-[ "Children", "importoexporti #1", "eing", "Unknown", 1999, 2,
4650.438314, 1734.45, 2341.19, 2720.78 ]
-[ "Shoes", "importoedu pack #1", "ought", "Unknown", 1999,
4, 4537.635834, 1623.33, 2928.34, 1905.23 ]
-[ "Women", "edu packamalg #1", "ation", "Unknown", 1999,
4, 4507.417511, 1596.92, 2865.38, 2665.75 ]
-[ "Men", "importoimporto #1", "ought", "Unknown", 1999,
6, 5045.758321, 2152.15, 2834.94, 2667.92 ]
-[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 4,
5501.180766, 2615.32, 2453.88, 2874.96 ]
-[ "Shoes", "exportiedu pack #1", "bar", "Unknown", 1999, 3,
5296.089091, 2410.44, 2685.85, 3821.39 ]
-[ "Men", "importoimporto #1", "able", "Unknown", 1999, 2,
5194.818359, 2333.43, 2765.75, 2674.91 ]
-[ "Music", "amalgscholar #1", "ought", "Unknown", 1999,
2, 4565.600047, 1727.16, 3895.09, 2606.58 ]
-[ "Music", "edu packscholar #1", "eing", "Unknown", 1999, 5,
5539.30835, 2704.16, 3862.34, 3960.90 ]
-[ "Shoes", "importoedu pack #1", "ation", "Unknown", 1999,
4, 4690.577484, 1855.85, 3524.69, 3050.34 ]
-[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 2,
5501.180766, 2683.70, 4304.21, 2453.88 ]
-[ "Women", "exportiamalg #1", "able", "Unknown", 1999, 2,
4123.60084, 1306.40, 2876.61, 2238.71 ]
-[ "Music", "exportischolar #1", "able", "Unknown", 1999, 5,
5090.105001, 2281.80, 2488.24, 3304.75 ]
-[ "Shoes", "exportiedu pack #1", "ought", "Unknown", 1999,
2, 4755.535868, 1951.00, 3949.06, 2767.05 ]
-[ "Men", "importoimporto #1", "ese", "Unknown", 1999, 6,
5492.817525, 2691.33, 3210.74, 3754.33 ]
-[ "Men", "amalgimporto #1", "ation", "Unknown", 1999,
2, 4909.460775, 2116.43, 3187.20, 3356.64 ]
-[ "Men", "importoimporto #1", "ought", "Unknown", 1999,
2, 5045.758321, 2253.70, 4158.86, 3467.09 ]
-[ "Shoes", "amalgedu pack #1", "ation", "Unknown", 1999,
7, 5152.095886, 2368.73, 2077.67, 7543.60 ]
-[ "Men", "edu packimporto #1", "ese", "Unknown", 1999, 3,
4979.361572, 2201.00, 3110.55, 3118.30 ]
-[ "Children", "exportiexporti #1", "ation", "Unknown", 1999,
2, 5238.357524, 2462.96, 3808.48, 3221.70 ]
-[ "Men", "amalgimporto #1", "ation", "Unknown", 1999,
4, 4909.460775, 2136.23, 3356.64, 3046.51 ]
-[ "Children", "importoexporti #1", "able", "Unknown", 1999, 7,
4586.298319, 1814.46, 2643.58, 6423.18 ]
-[ "Men", "edu packimporto #1", "ation", "Unknown", 1999,
4, 5170.369181, 2407.58, 3086.77, 2492.73 ]
-[ "Shoes", "amalgedu pack #1", "ese", "Unknown", 1999, 7,
4392.186595, 1630.14, 2755.91, 6185.73 ]
-[ "Shoes", "amalgedu pack #1", "able", "Unknown", 1999, 5,
4940.227519, 2187.55, 2894.91, 3018.65 ]
-[ "Men", "edu packimporto #1", "ought", "Unknown", 1999,
4, 5176.257426, 2424.94, 4285.78, 3286.20 ]
-[ "Women", "amalgamalg #1", "able", "Unknown", 1999, 6,
4507.23995, 1761.81, 2891.95, 2302.21 ]
-[ "Men", "importoimporto #1", "ation", "Unknown", 1999,
3, 5410.916646, 2672.68, 3591.65, 2988.08 ]
-[ "Men", "importoimporto #1", "ation", "Unknown", 1999,
5, 5410.916646, 2677.81, 2988.08, 2881.34 ]
-[ "Men", "edu packimporto #1", "bar", "Unknown", 1999, 4,
5632.736633, 2901.64, 3202.87, 3447.78 ]
-[ "Children", "exportiexporti #1", "able", "Unknown", 1999, 5,
4955.241618, 2230.80, 2395.57, 3003.89 ]
-[ "Men", "importoimporto #1", "eing", "Unknown", 1999, 5,
5074.076701, 2356.88, 2833.40, 2854.62 ]
-[ "Men", "edu packimporto #1", "bar", "Unknown", 1999, 2,
5632.736633, 2916.43, 3847.05, 3202.87 ]
-[ "Shoes", "exportiedu pack #1", "ese", "Unknown", 1999, 3,
4865.288371, 2151.76, 3212.91, 3768.25 ]
-[ "Men", "importoimporto #1", "ese", "Unknown", 1999, 4,
5492.817525, 2784.11, 2070.65, 3210.74 ]
-[ "Shoes", "exportiedu pack #1", "bar", "Unknown", 1999, 7,
5296.089091, 2591.12, 3012.98, 6254.36 ]
-[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
5, 4873.510824, 2170.98, 2302.76, 3236.50 ]
-[ "Shoes", "amalgedu pack #1", "able", "Unknown", 1999, 2,
4940.227519, 2239.16, 3495.29, 2563.93 ]
-[ "Children", "exportiexporti #1", "eing", "Unknown", 1999, 7,
5109.654256, 2410.24, 2916.46, 6558.23 ]
-[ "Women", "importoamalg #1", "able", "Unknown", 1999, 7,
4574.742411, 1881.03, 2345.66, 6036.28 ]
-[ "Women", "amalgamalg #1", "ought", "Unknown", 1999,
7, 4619.707509, 1926.67, 3528.98, 5162.15 ]
-[ "Children", "importoexporti #1", "bar", "Unknown", 1999, 7,
4566.775848, 1879.57, 3400.62, 6244.92 ]
-[ "Music", "edu packscholar #1", "ation", "Unknown", 1999,
6, 5622.227458, 2943.26, 3643.42, 3847.77 ]
-[ "Music", "exportischolar #1", "ation", "Unknown", 1999,
4, 4962.650045, 2283.77, 3210.01, 2539.84 ]
-[ "Music", "exportischolar #1", "ation", "Unknown", 1999,
2, 4962.650045, 2284.23, 3250.69, 3210.01 ]
-[ "Men", "edu packimporto #1", "ation", "Unknown", 1999,
5, 5170.369181, 2492.73, 2407.58, 3288.94 ]
-[ "Men", "edu packimporto #1", "able", "Unknown", 1999, 3,
4989.301676, 2318.98, 2618.89, 3315.77 ]
-[ "Music", "exportischolar #1", "bar", "Unknown", 1999, 4,
5318.146708, 2651.96, 2989.10, 3649.76 ]
-[ "Music", "exportischolar #1", "bar", "Unknown", 1999, 2,
5318.146708, 2656.31, 3419.77, 2989.10 ]
-[ "Shoes", "amalgedu pack #1", "bar", "Unknown", 1999, 6,
4805.401713, 2149.56, 2686.70, 3098.25 ]
-[ "Children", "exportiexporti #1", "bar", "Unknown", 1999, 4,
5280.662557, 2625.99, 3301.62, 4331.44 ]
-[ "Music", "amalgscholar #1", "ation", "Unknown", 1999,
4, 4934.504069, 2280.93, 2322.89, 2421.13 ]
-[ "Music", "edu packscholar #1", "able", "Unknown", 1999, 7,
5335.908305, 2684.15, 3543.33, 7540.94 ]
-[ "Shoes", "importoedu pack #1", "eing", "Unknown", 1999, 2,
4698.612447, 2058.86, 3191.74, 2812.15 ]
-[ "Shoes", "edu packedu pack #1", "ought", "Unknown", 1999,
5, 4745.295797, 2109.27, 3203.82, 2737.82 ]
-[ "Shoes", "importoedu pack #1", "ought", "Unknown", 1999,
5, 4537.635834, 1905.23, 1623.33, 3170.58 ]
-[ "Men", "edu packimporto #1", "able", "Unknown", 1999, 6,
4989.301676, 2357.82, 3363.58, 3142.81 ]
-[ "Children", "exportiexporti #1", "able", "Unknown", 1999, 2,
4955.241618, 2326.67, 2746.99, 3097.63 ]
-[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 5,
5501.180766, 2874.96, 2615.32, 3714.00 ]
-[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
7, 4873.510824, 2256.56, 3236.50, 6245.37 ]
-[ "Shoes", "importoedu pack #1", "ese", "Unknown", 1999, 3,
4676.749166, 2060.29, 3273.67, 2610.86 ]
-[ "Men", "amalgimporto #1", "ese", "Unknown", 1999, 6,
4764.596639, 2150.16, 3284.27, 3475.17 ]
-[ "Music", "amalgscholar #1", "ation", "Unknown", 1999,
3, 4934.504069, 2322.89, 3197.76, 2280.93 ]
-[ "Shoes", "exportiedu pack #1", "bar", "Unknown", 1999, 2,
5296.089091, 2685.85, 4235.44, 2410.44 ]
-[ "Children", "importoexporti #1", "able", "Unknown", 1999, 5,
4586.298319, 1982.77, 2837.74, 2643.58 ]
-[ "Music", "exportischolar #1", "able", "Unknown", 1999, 4,
5090.105001, 2488.24, 2966.36, 2281.80 ]
-[ "Shoes", "importoedu pack #1", "able", "Unknown", 1999, 7,
4700.911702, 2100.12, 2533.01, 5888.57 ]
-[ "Music", "edu packscholar #1", "bar", "Unknown", 1999, 2,
5484.789144, 2903.45, 3410.13, 3024.86 ]
-[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
3, 4873.510824, 2300.45, 2797.30, 2302.76 ]
-[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
4, 4873.510824, 2302.76, 2300.45, 2170.98 ]
-[ "Shoes", "importoedu pack #1", "bar", "Unknown", 1999, 3,
4794.679159, 2225.70, 2756.97, 2413.76 ]
-[ "Music", "edu packscholar #1", "ought", "Unknown", 1999,
5, 5552.305013, 2985.49, 3241.69, 4081.99 ]
-[ "Music", "edu packscholar #1", "eing", "Unknown", 1999, 3,
5539.30835, 2973.01, 3069.18, 3862.34 ]
-[ "Shoes", "amalgedu pack #1", "eing", "Unknown", 1999, 7,
4706.544189, 2143.18, 2458.07, 5967.73 ]
-[ "Children", "exportiexporti #1", "ought", "Unknown", 1999,
5, 5018.279175, 2458.03, 3467.53, 2683.61 ]
-[ "Children", "exportiexporti #1", "able", "Unknown", 1999, 4,
4955.241618, 2395.57, 3097.63, 2230.80 ]
-[ "Children", "exportiexporti #1", "eing", "Unknown", 1999, 2,
5109.654256, 2550.30, 4039.10, 2685.10 ]
-[ "Music", "exportischolar #1", "ought", "Unknown", 1999,
4, 5079.182434, 2520.64, 3233.50, 3079.89 ]
-[ "Women", "edu packamalg #1", "ation", "Unknown", 1999,
2, 4507.417511, 1951.42, 4166.02, 2865.38 ]
-[ "Women", "amalgamalg #1", "ought", "Unknown", 1999,
1, 4619.707509, 2065.94, 9639.59, 2521.70 ]
-[ "Music", "importoscholar #1", "ought", "Unknown", 1999,
3, 4004.448242, 1456.84, 2438.63, 2790.03 ]
-[ "Shoes", "edu packedu pack #1", "eing", "Unknown", 1999, 5,
4664.861613, 2122.71, 3131.02, 2852.96 ]
-[ "Women", "importoamalg #1", "bar", "Unknown", 1999, 3,
4437.210815, 1895.27, 2678.48, 2999.04 ]
-[ "Music", "exportischolar #1", "able", "Unknown", 1999, 2,
5090.105001, 2550.48, 3702.29, 2966.36 ]
-[ "Music", "edu packscholar #1", "able", "Unknown", 1999, 1,
5335.908305, 2796.97, 13360.68, 3413.22 ]
-[ "Children", "exportiexporti #1", "eing", "Unknown", 1999, 4,
5109.654256, 2574.12, 2685.10, 2672.73 ]
+% char, char, varchar, varchar, int, int,
decimal, decimal, decimal, decimal # type
+% 50, 50, 5, 7, 4, 1, 20, 20, 20, 20 #
length
+[ "Men", "importoimporto #1", "ese", "Unknown", 1999, 3,
5492.82, 2070.65, 3307.78, 2784.11 ]
+[ "Music", "exportischolar #1", "eing", "Unknown", 1999, 2,
5134.24, 1740.21, 4401.89, 2721.61 ]
+[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 4,
5463.70, 2091.07, 3391.39, 3095.31 ]
+[ "Music", "edu packscholar #1", "ought", "Unknown", 1999,
7, 5552.31, 2226.34, 4081.99, 7573.33 ]
+[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 2,
5463.70, 2268.27, 4139.47, 3391.39 ]
+[ "Men", "edu packimporto #1", "ought", "Unknown", 1999,
7, 5176.26, 1993.73, 3542.54, 5764.35 ]
+[ "Children", "exportiexporti #1", "ese", "Unknown", 1999, 3,
5185.90, 2019.69, 3479.21, 2982.05 ]
+[ "Shoes", "amalgedu pack #1", "ation", "Unknown", 1999,
6, 5152.10, 2077.67, 3123.43, 2368.73 ]
+[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 3,
5501.18, 2453.88, 2683.70, 2615.32 ]
+[ "Children", "exportiexporti #1", "ation", "Unknown", 1999,
4, 5238.36, 2232.03, 3221.70, 3649.52 ]
+[ "Shoes", "importoedu pack #1", "eing", "Unknown", 1999, 5,
4698.61, 1703.27, 2687.15, 2757.83 ]
+[ "Music", "exportischolar #1", "bar", "Unknown", 1999, 7,
5318.15, 2346.06, 3483.88, 7658.62 ]
+[ "Music", "edu packscholar #1", "ation", "Unknown", 1999,
2, 5622.23, 2657.68, 4207.03, 3543.82 ]
+[ "Children", "exportiexporti #1", "bar", "Unknown", 1999, 7,
5280.66, 2324.79, 3003.61, 5961.39 ]
+[ "Children", "importoexporti #1", "eing", "Unknown", 1999, 2,
4650.44, 1734.45, 2341.19, 2720.78 ]
+[ "Shoes", "importoedu pack #1", "ought", "Unknown", 1999,
4, 4537.64, 1623.33, 2928.34, 1905.23 ]
+[ "Women", "edu packamalg #1", "ation", "Unknown", 1999,
4, 4507.42, 1596.92, 2865.38, 2665.75 ]
+[ "Men", "importoimporto #1", "ought", "Unknown", 1999,
6, 5045.76, 2152.15, 2834.94, 2667.92 ]
+[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 4,
5501.18, 2615.32, 2453.88, 2874.96 ]
+[ "Shoes", "exportiedu pack #1", "bar", "Unknown", 1999, 3,
5296.09, 2410.44, 2685.85, 3821.39 ]
+[ "Men", "importoimporto #1", "able", "Unknown", 1999, 2,
5194.82, 2333.43, 2765.75, 2674.91 ]
+[ "Music", "amalgscholar #1", "ought", "Unknown", 1999,
2, 4565.60, 1727.16, 3895.09, 2606.58 ]
+[ "Music", "edu packscholar #1", "eing", "Unknown", 1999, 5,
5539.31, 2704.16, 3862.34, 3960.90 ]
+[ "Shoes", "importoedu pack #1", "ation", "Unknown", 1999,
4, 4690.58, 1855.85, 3524.69, 3050.34 ]
+[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 2,
5501.18, 2683.70, 4304.21, 2453.88 ]
+[ "Women", "exportiamalg #1", "able", "Unknown", 1999, 2,
4123.60, 1306.40, 2876.61, 2238.71 ]
+[ "Music", "exportischolar #1", "able", "Unknown", 1999, 5,
5090.11, 2281.80, 2488.24, 3304.75 ]
+[ "Shoes", "exportiedu pack #1", "ought", "Unknown", 1999,
2, 4755.54, 1951.00, 3949.06, 2767.05 ]
+[ "Men", "importoimporto #1", "ese", "Unknown", 1999, 6,
5492.82, 2691.33, 3210.74, 3754.33 ]
+[ "Men", "amalgimporto #1", "ation", "Unknown", 1999,
2, 4909.46, 2116.43, 3187.20, 3356.64 ]
+[ "Men", "importoimporto #1", "ought", "Unknown", 1999,
2, 5045.76, 2253.70, 4158.86, 3467.09 ]
+[ "Shoes", "amalgedu pack #1", "ation", "Unknown", 1999,
7, 5152.10, 2368.73, 2077.67, 7543.60 ]
+[ "Men", "edu packimporto #1", "ese", "Unknown", 1999, 3,
4979.36, 2201.00, 3110.55, 3118.30 ]
+[ "Children", "exportiexporti #1", "ation", "Unknown", 1999,
2, 5238.36, 2462.96, 3808.48, 3221.70 ]
+[ "Men", "amalgimporto #1", "ation", "Unknown", 1999,
4, 4909.46, 2136.23, 3356.64, 3046.51 ]
+[ "Children", "importoexporti #1", "able", "Unknown", 1999, 7,
4586.30, 1814.46, 2643.58, 6423.18 ]
+[ "Men", "edu packimporto #1", "ation", "Unknown", 1999,
4, 5170.37, 2407.58, 3086.77, 2492.73 ]
+[ "Shoes", "amalgedu pack #1", "ese", "Unknown", 1999, 7,
4392.19, 1630.14, 2755.91, 6185.73 ]
+[ "Shoes", "amalgedu pack #1", "able", "Unknown", 1999, 5,
4940.23, 2187.55, 2894.91, 3018.65 ]
+[ "Men", "edu packimporto #1", "ought", "Unknown", 1999,
4, 5176.26, 2424.94, 4285.78, 3286.20 ]
+[ "Women", "amalgamalg #1", "able", "Unknown", 1999, 6,
4507.24, 1761.81, 2891.95, 2302.21 ]
+[ "Men", "importoimporto #1", "ation", "Unknown", 1999,
3, 5410.92, 2672.68, 3591.65, 2988.08 ]
+[ "Men", "importoimporto #1", "ation", "Unknown", 1999,
5, 5410.92, 2677.81, 2988.08, 2881.34 ]
+[ "Men", "edu packimporto #1", "bar", "Unknown", 1999, 4,
5632.74, 2901.64, 3202.87, 3447.78 ]
+[ "Children", "exportiexporti #1", "able", "Unknown", 1999, 5,
4955.24, 2230.80, 2395.57, 3003.89 ]
+[ "Men", "importoimporto #1", "eing", "Unknown", 1999, 5,
5074.08, 2356.88, 2833.40, 2854.62 ]
+[ "Men", "edu packimporto #1", "bar", "Unknown", 1999, 2,
5632.74, 2916.43, 3847.05, 3202.87 ]
+[ "Shoes", "exportiedu pack #1", "ese", "Unknown", 1999, 3,
4865.29, 2151.76, 3212.91, 3768.25 ]
+[ "Men", "importoimporto #1", "ese", "Unknown", 1999, 4,
5492.82, 2784.11, 2070.65, 3210.74 ]
+[ "Shoes", "exportiedu pack #1", "bar", "Unknown", 1999, 7,
5296.09, 2591.12, 3012.98, 6254.36 ]
+[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
5, 4873.51, 2170.98, 2302.76, 3236.50 ]
+[ "Shoes", "amalgedu pack #1", "able", "Unknown", 1999, 2,
4940.23, 2239.16, 3495.29, 2563.93 ]
+[ "Children", "exportiexporti #1", "eing", "Unknown", 1999, 7,
5109.65, 2410.24, 2916.46, 6558.23 ]
+[ "Women", "importoamalg #1", "able", "Unknown", 1999, 7,
4574.74, 1881.03, 2345.66, 6036.28 ]
+[ "Women", "amalgamalg #1", "ought", "Unknown", 1999,
7, 4619.71, 1926.67, 3528.98, 5162.15 ]
+[ "Children", "importoexporti #1", "bar", "Unknown", 1999, 7,
4566.78, 1879.57, 3400.62, 6244.92 ]
+[ "Music", "edu packscholar #1", "ation", "Unknown", 1999,
6, 5622.23, 2943.26, 3643.42, 3847.77 ]
+[ "Music", "exportischolar #1", "ation", "Unknown", 1999,
4, 4962.65, 2283.77, 3210.01, 2539.84 ]
+[ "Music", "exportischolar #1", "ation", "Unknown", 1999,
2, 4962.65, 2284.23, 3250.69, 3210.01 ]
+[ "Men", "edu packimporto #1", "ation", "Unknown", 1999,
5, 5170.37, 2492.73, 2407.58, 3288.94 ]
+[ "Men", "edu packimporto #1", "able", "Unknown", 1999, 3,
4989.30, 2318.98, 2618.89, 3315.77 ]
+[ "Music", "exportischolar #1", "bar", "Unknown", 1999, 4,
5318.15, 2651.96, 2989.10, 3649.76 ]
+[ "Music", "exportischolar #1", "bar", "Unknown", 1999, 2,
5318.15, 2656.31, 3419.77, 2989.10 ]
+[ "Shoes", "amalgedu pack #1", "bar", "Unknown", 1999, 6,
4805.40, 2149.56, 2686.70, 3098.25 ]
+[ "Children", "exportiexporti #1", "bar", "Unknown", 1999, 4,
5280.66, 2625.99, 3301.62, 4331.44 ]
+[ "Music", "amalgscholar #1", "ation", "Unknown", 1999,
4, 4934.50, 2280.93, 2322.89, 2421.13 ]
+[ "Music", "edu packscholar #1", "able", "Unknown", 1999, 7,
5335.91, 2684.15, 3543.33, 7540.94 ]
+[ "Shoes", "importoedu pack #1", "eing", "Unknown", 1999, 2,
4698.61, 2058.86, 3191.74, 2812.15 ]
+[ "Shoes", "edu packedu pack #1", "ought", "Unknown", 1999,
5, 4745.30, 2109.27, 3203.82, 2737.82 ]
+[ "Shoes", "importoedu pack #1", "ought", "Unknown", 1999,
5, 4537.64, 1905.23, 1623.33, 3170.58 ]
+[ "Men", "edu packimporto #1", "able", "Unknown", 1999, 6,
4989.30, 2357.82, 3363.58, 3142.81 ]
+[ "Children", "exportiexporti #1", "able", "Unknown", 1999, 2,
4955.24, 2326.67, 2746.99, 3097.63 ]
+[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 5,
5501.18, 2874.96, 2615.32, 3714.00 ]
+[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
7, 4873.51, 2256.56, 3236.50, 6245.37 ]
+[ "Shoes", "importoedu pack #1", "ese", "Unknown", 1999, 3,
4676.75, 2060.29, 3273.67, 2610.86 ]
+[ "Men", "amalgimporto #1", "ese", "Unknown", 1999, 6,
4764.60, 2150.16, 3284.27, 3475.17 ]
+[ "Music", "amalgscholar #1", "ation", "Unknown", 1999,
3, 4934.50, 2322.89, 3197.76, 2280.93 ]
+[ "Shoes", "exportiedu pack #1", "bar", "Unknown", 1999, 2,
5296.09, 2685.85, 4235.44, 2410.44 ]
+[ "Children", "importoexporti #1", "able", "Unknown", 1999, 5,
4586.30, 1982.77, 2837.74, 2643.58 ]
+[ "Music", "exportischolar #1", "able", "Unknown", 1999, 4,
5090.11, 2488.24, 2966.36, 2281.80 ]
+[ "Shoes", "importoedu pack #1", "able", "Unknown", 1999, 7,
4700.91, 2100.12, 2533.01, 5888.57 ]
+[ "Music", "edu packscholar #1", "bar", "Unknown", 1999, 2,
5484.79, 2903.45, 3410.13, 3024.86 ]
+[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
3, 4873.51, 2300.45, 2797.30, 2302.76 ]
+[ "Shoes", "exportiedu pack #1", "ation", "Unknown", 1999,
4, 4873.51, 2302.76, 2300.45, 2170.98 ]
+[ "Shoes", "importoedu pack #1", "bar", "Unknown", 1999, 3,
4794.68, 2225.70, 2756.97, 2413.76 ]
+[ "Music", "edu packscholar #1", "ought", "Unknown", 1999,
5, 5552.31, 2985.49, 3241.69, 4081.99 ]
+[ "Music", "edu packscholar #1", "eing", "Unknown", 1999, 3,
5539.31, 2973.01, 3069.18, 3862.34 ]
+[ "Shoes", "amalgedu pack #1", "eing", "Unknown", 1999, 7,
4706.54, 2143.18, 2458.07, 5967.73 ]
+[ "Children", "exportiexporti #1", "ought", "Unknown", 1999,
5, 5018.28, 2458.03, 3467.53, 2683.61 ]
+[ "Children", "exportiexporti #1", "able", "Unknown", 1999, 4,
4955.24, 2395.57, 3097.63, 2230.80 ]
+[ "Children", "exportiexporti #1", "eing", "Unknown", 1999, 2,
5109.65, 2550.30, 4039.10, 2685.10 ]
+[ "Music", "exportischolar #1", "ought", "Unknown", 1999,
4, 5079.18, 2520.64, 3233.50, 3079.89 ]
+[ "Women", "edu packamalg #1", "ation", "Unknown", 1999,
2, 4507.42, 1951.42, 4166.02, 2865.38 ]
+[ "Women", "amalgamalg #1", "ought", "Unknown", 1999,
1, 4619.71, 2065.94, 9639.59, 2521.70 ]
+[ "Music", "importoscholar #1", "ought", "Unknown", 1999,
3, 4004.45, 1456.84, 2438.63, 2790.03 ]
+[ "Shoes", "edu packedu pack #1", "eing", "Unknown", 1999, 5,
4664.86, 2122.71, 3131.02, 2852.96 ]
+[ "Women", "importoamalg #1", "bar", "Unknown", 1999, 3,
4437.21, 1895.27, 2678.48, 2999.04 ]
+[ "Music", "exportischolar #1", "able", "Unknown", 1999, 2,
5090.11, 2550.48, 3702.29, 2966.36 ]
+[ "Music", "edu packscholar #1", "able", "Unknown", 1999, 1,
5335.91, 2796.97, 13360.68, 3413.22 ]
+[ "Children", "exportiexporti #1", "eing", "Unknown", 1999, 4,
5109.65, 2574.12, 2685.10, 2672.73 ]
-# 10:36:18 >
-# 10:36:18 > "Done."
-# 10:36:18 >
+# 09:14:40 >
+# 09:14:40 > "Done."
+# 09:14:40 >
# 18:29:57 >
# 18:29:57 > "Done."
diff --git a/sql/benchmarks/tpcds/Tests/47.stable.out.int128
b/sql/benchmarks/tpcds/Tests/47.stable.out.int128
--- a/sql/benchmarks/tpcds/Tests/47.stable.out.int128
+++ b/sql/benchmarks/tpcds/Tests/47.stable.out.int128
@@ -37,112 +37,112 @@ stdout of test '47` in directory 'sql/be
# s_company_name,
% sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2,
sys.v2 # table_name
% i_category, i_brand, s_store_name, s_company_name, d_year, d_moy,
avg_monthly_sales, sum_sales, psum, nsum # name
-% char, char, varchar, varchar, int, int, double,
decimal, decimal, decimal # type
-% 50, 50, 5, 7, 4, 1, 24, 40, 40, 40 #
length
-[ "Men", "importoimporto #1", "ese", "Unknown", 1999, 3,
5492.817525, 2070.65, 3307.78, 2784.11 ]
-[ "Music", "exportischolar #1", "eing", "Unknown", 1999, 2,
5134.238322, 1740.21, 4401.89, 2721.61 ]
-[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 4,
5463.700806, 2091.07, 3391.39, 3095.31 ]
-[ "Music", "edu packscholar #1", "ought", "Unknown", 1999,
7, 5552.305013, 2226.34, 4081.99, 7573.33 ]
-[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 2,
5463.700806, 2268.27, 4139.47, 3391.39 ]
-[ "Men", "edu packimporto #1", "ought", "Unknown", 1999,
7, 5176.257426, 1993.73, 3542.54, 5764.35 ]
-[ "Children", "exportiexporti #1", "ese", "Unknown", 1999, 3,
5185.898254, 2019.69, 3479.21, 2982.05 ]
-[ "Shoes", "amalgedu pack #1", "ation", "Unknown", 1999,
6, 5152.095886, 2077.67, 3123.43, 2368.73 ]
-[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 3,
5501.180766, 2453.88, 2683.70, 2615.32 ]
-[ "Children", "exportiexporti #1", "ation", "Unknown", 1999,
4, 5238.357524, 2232.03, 3221.70, 3649.52 ]
-[ "Shoes", "importoedu pack #1", "eing", "Unknown", 1999, 5,
4698.612447, 1703.27, 2687.15, 2757.83 ]
-[ "Music", "exportischolar #1", "bar", "Unknown", 1999, 7,
5318.146708, 2346.06, 3483.88, 7658.62 ]
-[ "Music", "edu packscholar #1", "ation", "Unknown", 1999,
2, 5622.227458, 2657.68, 4207.03, 3543.82 ]
-[ "Children", "exportiexporti #1", "bar", "Unknown", 1999, 7,
5280.662557, 2324.79, 3003.61, 5961.39 ]
-[ "Children", "importoexporti #1", "eing", "Unknown", 1999, 2,
4650.438314, 1734.45, 2341.19, 2720.78 ]
-[ "Shoes", "importoedu pack #1", "ought", "Unknown", 1999,
4, 4537.635834, 1623.33, 2928.34, 1905.23 ]
-[ "Women", "edu packamalg #1", "ation", "Unknown", 1999,
4, 4507.417511, 1596.92, 2865.38, 2665.75 ]
-[ "Men", "importoimporto #1", "ought", "Unknown", 1999,
6, 5045.758321, 2152.15, 2834.94, 2667.92 ]
-[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 4,
5501.180766, 2615.32, 2453.88, 2874.96 ]
-[ "Shoes", "exportiedu pack #1", "bar", "Unknown", 1999, 3,
5296.089091, 2410.44, 2685.85, 3821.39 ]
-[ "Men", "importoimporto #1", "able", "Unknown", 1999, 2,
5194.818359, 2333.43, 2765.75, 2674.91 ]
-[ "Music", "amalgscholar #1", "ought", "Unknown", 1999,
2, 4565.600047, 1727.16, 3895.09, 2606.58 ]
-[ "Music", "edu packscholar #1", "eing", "Unknown", 1999, 5,
5539.30835, 2704.16, 3862.34, 3960.90 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
