Changeset: 5262fa2dfdbb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5262fa2dfdbb
Modified Files:
monetdb5/modules/mosaic/TODO_MOSAIC.txt
monetdb5/modules/mosaic/mosaic.c
monetdb5/modules/mosaic/mosaic_join.h
monetdb5/modules/mosaic/mosaic_projection.h
monetdb5/modules/mosaic/mosaic_select.h
monetdb5/modules/mosaic/mosaic_utility.h
Branch: mosaic
Log Message:
Get rid of the 'do_' prefix.
diffs (121 lines):
diff --git a/monetdb5/modules/mosaic/TODO_MOSAIC.txt
b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
--- a/monetdb5/modules/mosaic/TODO_MOSAIC.txt
+++ b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
@@ -20,7 +20,6 @@ Find a more 'generic' model to estimate
Create a plug-in estimation model framework.
####code issues####
-# Improve macro code style: remove do_ from do_OPERATION-like macro's, NAME ->
TECHNIQUE, small caps technique identifier -> CAPITAL CAPS technique identifier.
See if the iteration algorithms can be improved.
Get rid of (most of) MOStask and/or don't allocate it on the heap.
Make sure the parameters.bits fields are always char.
diff --git a/monetdb5/modules/mosaic/mosaic.c b/monetdb5/modules/mosaic/mosaic.c
--- a/monetdb5/modules/mosaic/mosaic.c
+++ b/monetdb5/modules/mosaic/mosaic.c
@@ -292,13 +292,13 @@ MOSprepareEstimate(MOStask task) {
}
-#define do_estimate(NAME, TPE, NAME_TAG)\
+#define estimate(NAME, TPE, NAME_TAG)\
{\
str msg = MOSestimate_##NAME##_##TPE(task, &estimations[NAME_TAG],
previous);\
if (msg != MAL_SUCCEED) return msg;\
}
-#define do_postEstimate(NAME, TPE, DUMMY_ARGUMENT)
MOSpostEstimate_##NAME##_##TPE(task);
+#define postEstimate(NAME, TPE, DUMMY_ARGUMENT)
MOSpostEstimate_##NAME##_##TPE(task);
#define MOSestimate_AND_MOSoptimizerCost_DEF(TPE) \
static str MOSestimate_inner_##TPE(MOStask task, MosaicEstimation* current,
const MosaicEstimation* previous) {\
@@ -479,7 +479,7 @@ MOSfinalizeDictionary(MOStask task) {
}
-#define do_compress(NAME, TPE, DUMMY_ARGUMENT)\
+#define compress(NAME, TPE, DUMMY_ARGUMENT)\
{\
ALGODEBUG mnstr_printf(GDKstdout, "#MOScompress_" #NAME "\n");\
MOScompress_##NAME##_##TPE(task, estimate);\
@@ -698,7 +698,7 @@ MOScompress(Client cntxt, MalBlkPtr mb,
}
-#define do_decompress(NAME, TPE, DUMMY_ARGUMENT)\
+#define decompress(NAME, TPE, DUMMY_ARGUMENT)\
{\
ALGODEBUG mnstr_printf(GDKstdout, "#MOSdecompress_" #NAME "\n");\
MOSdecompress_##NAME##_##TPE(task);\
diff --git a/monetdb5/modules/mosaic/mosaic_join.h
b/monetdb5/modules/mosaic/mosaic_join.h
--- a/monetdb5/modules/mosaic/mosaic_join.h
+++ b/monetdb5/modules/mosaic/mosaic_join.h
@@ -105,7 +105,7 @@ MOSjoin_COUI_SIGNATURE(NAME, TPE)\
return MAL_SUCCEED;\
}
-#define do_join_COUI(NAME, TPE, DUMMY_ARGUMENT)\
+#define join_COUI(NAME, TPE, DUMMY_ARGUMENT)\
{\
str msg = MOSjoin_COUI_##NAME##_##TPE(r1p, r2p, task, r, rci,
nil_matches);\
if (msg != MAL_SUCCEED) return msg;\
@@ -175,7 +175,7 @@ static str MOSjoin_COUI_##TPE(MOStask ta
* and the right compressed side in the inner loop.
*/
-#define do_join_inner_loop(NAME, TPE, HAS_NIL, RIGHT_CI_NEXT)\
+#define join_inner_loop(NAME, TPE, HAS_NIL, RIGHT_CI_NEXT)\
{\
join_inner_loop_##NAME(TPE, HAS_NIL, RIGHT_CI_NEXT);\
MOSadvance_##NAME##_##TPE(task);\
diff --git a/monetdb5/modules/mosaic/mosaic_projection.h
b/monetdb5/modules/mosaic/mosaic_projection.h
--- a/monetdb5/modules/mosaic/mosaic_projection.h
+++ b/monetdb5/modules/mosaic/mosaic_projection.h
@@ -59,7 +59,7 @@ MOSprojection_SIGNATURE(NAME, TPE)\
return MAL_SUCCEED;\
}
-#define do_projection(NAME, TPE, DUMMY_ARGUMENT)\
+#define projection(NAME, TPE, DUMMY_ARGUMENT)\
{\
MOSprojection_##NAME##_##TPE(task);\
MOSadvance_##NAME##_##TPE(task);\
diff --git a/monetdb5/modules/mosaic/mosaic_select.h
b/monetdb5/modules/mosaic/mosaic_select.h
--- a/monetdb5/modules/mosaic/mosaic_select.h
+++ b/monetdb5/modules/mosaic/mosaic_select.h
@@ -187,7 +187,7 @@ MOSselect_SIGNATURE(NAME, TPE) {\
return MAL_SUCCEED;\
}
-#define do_select(NAME, TPE, DUMMY_ARGUMENT)\
+#define select(NAME, TPE, DUMMY_ARGUMENT)\
{\
MOSselect_##NAME##_##TPE(\
task,\
diff --git a/monetdb5/modules/mosaic/mosaic_utility.h
b/monetdb5/modules/mosaic/mosaic_utility.h
--- a/monetdb5/modules/mosaic/mosaic_utility.h
+++ b/monetdb5/modules/mosaic/mosaic_utility.h
@@ -68,18 +68,18 @@ ALGEBRA_INTERFACE(NAME, dbl);
// This is just an ugly work around for Microsoft Visual Studio to get the
expansion of __VA_ARGS__ right.
#define EXPAND(X) X
-#define DO_OPERATION_ON_INTEGERS_ONLY_bte(OPERATION, NAME, ...)
EXPAND(do_##OPERATION(NAME, bte, __VA_ARGS__))
-#define DO_OPERATION_ON_INTEGERS_ONLY_sht(OPERATION, NAME, ...)
EXPAND(do_##OPERATION(NAME, sht, __VA_ARGS__))
-#define DO_OPERATION_ON_INTEGERS_ONLY_int(OPERATION, NAME, ...)
EXPAND(do_##OPERATION(NAME, int, __VA_ARGS__))
-#define DO_OPERATION_ON_INTEGERS_ONLY_lng(OPERATION, NAME, ...)
EXPAND(do_##OPERATION(NAME, lng, __VA_ARGS__))
+#define DO_OPERATION_ON_INTEGERS_ONLY_bte(OPERATION, NAME, ...)
EXPAND(OPERATION(NAME, bte, __VA_ARGS__))
+#define DO_OPERATION_ON_INTEGERS_ONLY_sht(OPERATION, NAME, ...)
EXPAND(OPERATION(NAME, sht, __VA_ARGS__))
+#define DO_OPERATION_ON_INTEGERS_ONLY_int(OPERATION, NAME, ...)
EXPAND(OPERATION(NAME, int, __VA_ARGS__))
+#define DO_OPERATION_ON_INTEGERS_ONLY_lng(OPERATION, NAME, ...)
EXPAND(OPERATION(NAME, lng, __VA_ARGS__))
#define DO_OPERATION_ON_INTEGERS_ONLY_flt(OPERATION, NAME, ...) assert(0)
#define DO_OPERATION_ON_INTEGERS_ONLY_dbl(OPERATION, NAME, ...) assert(0)
#ifdef HAVE_HGE
-#define DO_OPERATION_ON_INTEGERS_ONLY_hge(OPERATION, NAME, ...)
EXPAND(do_##OPERATION(NAME, hge, __VA_ARGS__))
+#define DO_OPERATION_ON_INTEGERS_ONLY_hge(OPERATION, NAME, ...)
EXPAND(OPERATION(NAME, hge, __VA_ARGS__))
#endif
#define DO_OPERATION_ON_INTEGERS_ONLY(OPERATION, NAME, TPE, ...)
DO_OPERATION_ON_INTEGERS_ONLY_##TPE(OPERATION, NAME, __VA_ARGS__)
-#define DO_OPERATION_ON_ALL_TYPES(OPERATION, NAME, TPE, ...)
EXPAND(do_##OPERATION(NAME, TPE, __VA_ARGS__))
+#define DO_OPERATION_ON_ALL_TYPES(OPERATION, NAME, TPE, ...)
EXPAND(OPERATION(NAME, TPE, __VA_ARGS__))
/*DUMMY_PARAM is just an ugly workaround for the fact that a variadic macro
must have at least one variadic parameter*/
#define DO_OPERATION_IF_ALLOWED(OPERATION, NAME, TPE)
DO_OPERATION_ON_##NAME(OPERATION, TPE, 0 /*DUMMY_PARAM*/)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
