Changeset: 4dcd2707a533 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4dcd2707a533
Modified Files:
gdk/gdk_analytic_func.c
Branch: linear-hashing
Log Message:
Merged with Nov2019
diffs (64 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
@@ -215,24 +215,19 @@ GDKanalyticalntile(BAT *r, BAT *b, BAT *
ANALYTICAL_NTILE_SINGLE_IMP(int, val, BUN, BUN);
break;
case TYPE_lng:
- ANALYTICAL_NTILE_SINGLE_IMP(lng, val,
-#if SIZEOF_VAR_T == SIZEOF_INT
- lng, lng
+#if SIZEOF_OID == SIZEOF_INT
+ ANALYTICAL_NTILE_SINGLE_IMP(lng, val, lng, lng);
#else
- BUN, BUN
+ ANALYTICAL_NTILE_SINGLE_IMP(lng, val, BUN, BUN);
#endif
- );
break;
#ifdef HAVE_HGE
case TYPE_hge:
- ANALYTICAL_NTILE_SINGLE_IMP(hge, (val > (hge)
GDK_lng_max) ? GDK_lng_max : (lng) val,
-#if SIZEOF_VAR_T == SIZEOF_INT
- lng, lng
+#if SIZEOF_OID == SIZEOF_INT
+ ANALYTICAL_NTILE_SINGLE_IMP(hge, (val > (hge)
GDK_lng_max) ? GDK_lng_max : (lng) val, lng, lng);
#else
- BUN, BUN
+ ANALYTICAL_NTILE_SINGLE_IMP(hge, (val > (hge)
GDK_lng_max) ? GDK_lng_max : (lng) val, BUN, BUN);
#endif
- );
- break;
#endif
default:
goto nosupport;
@@ -249,23 +244,19 @@ GDKanalyticalntile(BAT *r, BAT *b, BAT *
ANALYTICAL_NTILE_MULTI_IMP(int, val, BUN, BUN);
break;
case TYPE_lng:
- ANALYTICAL_NTILE_MULTI_IMP(lng, val,
-#if SIZEOF_VAR_T == SIZEOF_INT
- lng, lng
+#if SIZEOF_OID == SIZEOF_INT
+ ANALYTICAL_NTILE_MULTI_IMP(lng, val, lng, lng);
#else
- BUN, BUN
+ ANALYTICAL_NTILE_MULTI_IMP(lng, val, BUN, BUN);
#endif
- );
break;
#ifdef HAVE_HGE
case TYPE_hge:
- ANALYTICAL_NTILE_MULTI_IMP(hge, (val > (hge)
GDK_lng_max) ? GDK_lng_max : (lng) val,
-#if SIZEOF_VAR_T == SIZEOF_INT
- lng, lng
+#if SIZEOF_OID == SIZEOF_INT
+ ANALYTICAL_NTILE_MULTI_IMP(hge, (val > (hge)
GDK_lng_max) ? GDK_lng_max : (lng) val, lng, lng);
#else
- BUN, BUN
+ ANALYTICAL_NTILE_MULTI_IMP(hge, (val > (hge)
GDK_lng_max) ? GDK_lng_max : (lng) val, BUN, BUN);
#endif
- );
break;
#endif
default:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
