Changeset: a4e2b1fe6ddb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4e2b1fe6ddb
Modified Files:
gdk/gdk_join.c
Branch: Oct2014
Log Message:
Use lower result size estimate for {range,band,theta}join.
diffs (33 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2299,8 +2299,7 @@ BATsubthetajoin(BAT **r1p, BAT **r2p, BA
if (joinparamcheck(l, r, NULL, sl, sr, "BATsubthetajoin") == GDK_FAIL)
return GDK_FAIL;
if (joininitresults(&r1, &r2,
- estimate != BUN_NONE ? estimate :
- (sl ? BATcount(sl) : BATcount(l)) * (sr ?
BATcount(sr) : BATcount(r)),
+ estimate != BUN_NONE ? estimate : sl ? BATcount(sl)
: BATcount(l),
"BATsubthetajoin") == GDK_FAIL)
return GDK_FAIL;
*r1p = r1;
@@ -2406,8 +2405,7 @@ BATsubbandjoin(BAT **r1p, BAT **r2p, BAT
if (joinparamcheck(l, r, NULL, sl, sr, "BATsubbandjoin") == GDK_FAIL)
return GDK_FAIL;
if (joininitresults(&r1, &r2,
- estimate != BUN_NONE ? estimate :
- (sl ? BATcount(sl) : BATcount(l)) * (sr ?
BATcount(sr) : BATcount(r)),
+ estimate != BUN_NONE ? estimate : sl ? BATcount(sl)
: BATcount(l),
"BATsubbandjoin") == GDK_FAIL)
return GDK_FAIL;
*r1p = r1;
@@ -2427,8 +2425,7 @@ BATsubrangejoin(BAT **r1p, BAT **r2p, BA
if (joinparamcheck(l, rl, rh, sl, sr, "BATsubrangejoin") == GDK_FAIL)
return GDK_FAIL;
if (joininitresults(&r1, &r2,
- estimate != BUN_NONE ? estimate :
- (sl ? BATcount(sl) : BATcount(l)) * (sr ?
BATcount(sr) : BATcount(rl)),
+ estimate != BUN_NONE ? estimate : sl ? BATcount(sl)
: BATcount(l),
"BATsubrangejoin") == GDK_FAIL)
return GDK_FAIL;
*r1p = r1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
