Changeset: 7f9817f90a2f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f9817f90a2f
Modified Files:
gdk/gdk_analytic_bounds.c
sql/common/sql_types.c
Branch: window-tunning
Log Message:
Small cleanup and be carefull with operator order
diffs (133 lines):
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -50,7 +50,7 @@
if ((TPE2)(ABSOLUTE(calc)) > rlimit) \
break; \
} \
- rb[k] = j++; \
+ rb[k] = ++j; \
} \
} else { \
for (; k < i; k++) { \
@@ -74,7 +74,7 @@
break; \
} \
} \
- rb[k] = j++; \
+ rb[k] = ++j; \
} \
} \
} while (0)
@@ -134,7 +134,7 @@
v = bp[j]; \
} \
} \
- rb[k] = j++; \
+ rb[k] = ++j; \
} \
} else { \
for (; k < i; k++) { \
@@ -161,7 +161,7 @@
} \
} \
} \
- rb[k] = j++; \
+ rb[k] = ++j; \
} \
} \
} while (0)
@@ -238,7 +238,7 @@
if (ABSOLUTE((TPE) atomcmp(v, next)) >
(TPE) LIMIT) \
break; \
} \
- rb[k] = j++;
\
+ rb[k] = ++j;
\
} \
} else { \
for (; k < i; k++) { \
@@ -262,7 +262,7 @@
break; \
} \
} \
- rb[k] = j++;
\
+ rb[k] = ++j;
\
} \
} \
} while (0)
@@ -320,7 +320,7 @@
v = next; \
} \
} \
- rb[k] = j++; \
+ rb[k] = ++j; \
} \
} else { \
for (; k < i; k++) { \
@@ -349,7 +349,7 @@
} \
} \
} \
- rb[k] = j++;
\
+ rb[k] = ++j;
\
} \
} \
} while (0)
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1420,48 +1420,12 @@ sqltypeinit( sql_allocator *sa)
/* order based operators */
sql_create_analytic(sa, "diff", "sql", "diff", SCALE_NONE, BIT, 1, ANY);
sql_create_analytic(sa, "diff", "sql", "diff", SCALE_NONE, BIT, 2, BIT,
ANY);
-
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, BTE);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, BTE);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, SHT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, SHT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, INT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, INT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, LNG);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, LNG);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, FLT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, FLT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, DBL);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, DBL);
-#ifdef HAVE_HGE
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, HGE);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, HGE);
-#endif
-
- t = decimals; /* BTE */
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, *(t));
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, *(t));
- t++; /* SHT */
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, *(t));
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, *(t));
- t++; /* INT */
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, *(t));
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, *(t));
- t++; /* LNG */
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, *(t));
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, *(t));
-#ifdef HAVE_HGE
- t++; /* HGE */
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, *(t));
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, *(t));
-#endif
-
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, MONINT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, MONINT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, DAYINT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, DAYINT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, SECINT);
- sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, SECINT);
+ for (t = numerical; *t != TME; t++) {
+ if (*t == OID)
+ continue;
+ sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 5, ANY, INT, INT, INT, *t);
+ sql_create_analytic(sa, "window_bound", "sql", "window_bound",
SCALE_NONE, LNG, 6, BIT, ANY, INT, INT, INT, *t);
+ }
sql_create_analytic(sa, "rank", "sql", "rank", SCALE_NONE, INT, 3, ANY,
BIT, BIT);
sql_create_analytic(sa, "dense_rank", "sql", "dense_rank", SCALE_NONE,
INT, 3, ANY, BIT, BIT);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
