Changeset: 68b24e937da8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68b24e937da8
Modified Files:
monetdb5/modules/mosaic/mosaic.c
monetdb5/modules/mosaic/mosaic.h
monetdb5/modules/mosaic/mosaic_delta.c
monetdb5/modules/mosaic/mosaic_dict.c
monetdb5/modules/mosaic/mosaic_dict256.c
monetdb5/modules/mosaic/mosaic_dictionary.h
monetdb5/modules/mosaic/mosaic_dictionary_templates.h
monetdb5/modules/mosaic/mosaic_frame.c
monetdb5/modules/mosaic/mosaic_join.h
monetdb5/modules/mosaic/mosaic_linear.c
monetdb5/modules/mosaic/mosaic_prefix.c
monetdb5/modules/mosaic/mosaic_projection_template.h
monetdb5/modules/mosaic/mosaic_raw.c
monetdb5/modules/mosaic/mosaic_runlength.c
monetdb5/modules/mosaic/mosaic_select_template.h
monetdb5/modules/mosaic/mosaic_template.h
monetdb5/modules/mosaic/mosaic_utility.h
Branch: mosaic
Log Message:
Refactoring: rename some macro's.
diffs (truncated from 1293 to 300 lines):
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
@@ -24,10 +24,10 @@
#include "mosaic_frame.h"
#include "mosaic_prefix.h"
-#define DEFINE_METHOD(NAME) \
+#define DEFINE_METHOD(METHOD) \
{\
- .bit = (1 << NAME),\
- .name = #NAME\
+ .bit = (1 << METHOD),\
+ .name = #METHOD\
}
const Method MOSmethods[] = {
diff --git a/monetdb5/modules/mosaic/mosaic.h b/monetdb5/modules/mosaic/mosaic.h
--- a/monetdb5/modules/mosaic/mosaic.h
+++ b/monetdb5/modules/mosaic/mosaic.h
@@ -199,12 +199,12 @@ typedef struct _MosaicEstimation {
BUN* max_compression_length;
} MosaicEstimation;
-#define GET_PADDING(blk, NAME, TPE) (((MOSBlockHeaderTpe(NAME, TPE)*)
(blk))->padding)
+#define GET_PADDING(blk, METHOD, TPE) (((MOSBlockHeaderTpe(METHOD, TPE)*)
(blk))->padding)
-#define ALIGN_BLOCK_HEADER(task, NAME, TPE)\
+#define ALIGN_BLOCK_HEADER(task, METHOD, TPE)\
{\
if (task->padding) {\
- ALIGNMENT_HELPER_TPE(NAME, TPE) dummy;\
+ ALIGNMENT_HELPER_TPE(METHOD, TPE) dummy;\
uintptr_t alignment = (BUN) ((uintptr_t) (void*) &dummy.b -
(uintptr_t) (void*) &dummy.a);\
uintptr_t SZ = (uintptr_t) (char*)((task)->blk);\
BUN padding = (BUN) ( ( (SZ) % alignment ) ? ( alignment -
((SZ)%alignment) ) : 0 );\
@@ -213,13 +213,13 @@ typedef struct _MosaicEstimation {
*task->padding = (char) padding;\
/*printf("padding: %ld\n", padding);*/\
}\
- task->padding = &GET_PADDING(task->blk, NAME, TPE);\
+ task->padding = &GET_PADDING(task->blk, METHOD, TPE);\
*task->padding = 0;\
}
-#define ASSERT_ALIGNMENT_BLOCK_HEADER(ptr, NAME, TPE)\
+#define ASSERT_ALIGNMENT_BLOCK_HEADER(ptr, METHOD, TPE)\
{\
- ALIGNMENT_HELPER_TPE(NAME, TPE) dummy;\
+ ALIGNMENT_HELPER_TPE(METHOD, TPE) dummy;\
uintptr_t alignment = ((uintptr_t) (void*) &dummy.b - (uintptr_t)
(void*) &dummy.a);\
assert((uintptr_t) (void*) (ptr) % alignment == 0);\
(void) alignment;\
diff --git a/monetdb5/modules/mosaic/mosaic_delta.c
b/monetdb5/modules/mosaic/mosaic_delta.c
--- a/monetdb5/modules/mosaic/mosaic_delta.c
+++ b/monetdb5/modules/mosaic/mosaic_delta.c
@@ -63,25 +63,25 @@ MOSlayout_delta(MOStask* task, BAT *btec
return;
}
-#define NAME delta
-#define METHOD_SPECIFIC_INCLUDE MAKE_TEMPLATE_INCLUDE_FILE(NAME)
+#define METHOD delta
+#define METHOD_TEMPLATES_INCLUDE MAKE_TEMPLATES_INCLUDE_FILE(METHOD)
#define COMPRESSION_DEFINITION
#define TPE bte
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE sht
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE int
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE lng
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#ifdef HAVE_HGE
#define TPE hge
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#endif
#undef COMPRESSION_DEFINITION
@@ -139,5 +139,5 @@ MOSjoin_COUI_DEF(delta, lng)
MOSjoin_COUI_DEF(delta, hge)
#endif
-#undef METHOD_SPECIFIC_INCLUDE
-#undef NAME
+#undef METHOD_TEMPLATES_INCLUDE
+#undef METHOD
diff --git a/monetdb5/modules/mosaic/mosaic_dict.c
b/monetdb5/modules/mosaic/mosaic_dict.c
--- a/monetdb5/modules/mosaic/mosaic_dict.c
+++ b/monetdb5/modules/mosaic/mosaic_dict.c
@@ -87,34 +87,34 @@ MOSlayout_dict(MOStask* task, BAT *btech
return;
}
-#define NAME dict
-#define METHOD_SPECIFIC_INCLUDE "mosaic_dictionary_templates.h"
+#define METHOD dict
+#define METHOD_TEMPLATES_INCLUDE "mosaic_dictionary_templates.h"
#define PREPARATION_DEFINITION
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef PREPARATION_DEFINITION
#define COMPRESSION_DEFINITION
#define TPE bte
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE sht
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE int
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE lng
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE flt
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE dbl
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#ifdef HAVE_HGE
#define TPE hge
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#endif
#undef COMPRESSION_DEFINITION
@@ -163,5 +163,5 @@ MOSjoin_COUI_DEF(dict, dbl)
MOSjoin_COUI_DEF(dict, hge)
#endif
-#undef METHOD_SPECIFIC_INCLUDE
-#undef NAME
+#undef METHOD_TEMPLATES_INCLUDE
+#undef METHOD
diff --git a/monetdb5/modules/mosaic/mosaic_dict256.c
b/monetdb5/modules/mosaic/mosaic_dict256.c
--- a/monetdb5/modules/mosaic/mosaic_dict256.c
+++ b/monetdb5/modules/mosaic/mosaic_dict256.c
@@ -108,34 +108,34 @@ MOSlayout_dict256(MOStask* task, BAT *bt
return;
}
-#define NAME dict256
-#define METHOD_SPECIFIC_INCLUDE "mosaic_dictionary_templates.h"
+#define METHOD dict256
+#define METHOD_TEMPLATES_INCLUDE "mosaic_dictionary_templates.h"
#define PREPARATION_DEFINITION
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef PREPARATION_DEFINITION
#define COMPRESSION_DEFINITION
#define TPE bte
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE sht
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE int
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE lng
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE flt
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#define TPE dbl
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#ifdef HAVE_HGE
#define TPE hge
-#include METHOD_SPECIFIC_INCLUDE
+#include METHOD_TEMPLATES_INCLUDE
#undef TPE
#endif
#undef COMPRESSION_DEFINITION
@@ -184,5 +184,5 @@ MOSjoin_COUI_DEF(dict256, dbl)
MOSjoin_COUI_DEF(dict256, hge)
#endif
-#undef METHOD_SPECIFIC_INCLUDE
-#undef NAME
+#undef METHOD_TEMPLATES_INCLUDE
+#undef METHOD
diff --git a/monetdb5/modules/mosaic/mosaic_dictionary.h
b/monetdb5/modules/mosaic/mosaic_dictionary.h
--- a/monetdb5/modules/mosaic/mosaic_dictionary.h
+++ b/monetdb5/modules/mosaic/mosaic_dictionary.h
@@ -59,28 +59,28 @@ typedef struct _GlobalDictionaryInfo {
#define GetSizeInBytes(INFO) (GET_COUNT(INFO) * GetTypeWidth(INFO))
// task dependent macro's
-#define GET_FINAL_DICT(task, NAME, TPE) (((TPE*) (task)->bsrc->tvmosaic->base)
+ (task)->hdr->CONCAT2(pos_, NAME))
-#define GET_FINAL_BITS(task, NAME) ((task)->hdr->CONCAT2(bits_, NAME))
-#define GET_FINAL_DICT_COUNT(task, NAME) ((task)->hdr->CONCAT2(length_, NAME))
+#define GET_FINAL_DICT(task, METHOD, TPE) (((TPE*)
(task)->bsrc->tvmosaic->base) + (task)->hdr->CONCAT2(pos_, METHOD))
+#define GET_FINAL_BITS(task, METHOD) ((task)->hdr->CONCAT2(bits_, METHOD))
+#define GET_FINAL_DICT_COUNT(task, METHOD) ((task)->hdr->CONCAT2(length_,
METHOD))
-#define MosaicBlkHeader_DEF_dictionary(NAME, TPE)\
+#define MosaicBlkHeader_DEF_dictionary(METHOD, TPE)\
typedef struct {\
MosaicBlkRec rec;\
char padding;\
BitVectorChunk bitvector; /*First chunk of bitvector to force correct
alignment.*/\
-} MOSBlockHeader_##NAME##_##TPE;
+} MOSBlockHeader_##METHOD##_##TPE;
-#define DICTBlockHeaderTpe(NAME, TPE) MOSBlockHeader_##NAME##_##TPE
+#define DICTBlockHeaderTpe(METHOD, TPE) MOSBlockHeader_##METHOD##_##TPE
// MOStask object dependent macro's
-#define MOScodevectorDict(task, NAME, TPE) ((BitVector)
&((DICTBlockHeaderTpe(NAME, TPE)*) (task)->blk)->bitvector)
+#define MOScodevectorDict(task, METHOD, TPE) ((BitVector)
&((DICTBlockHeaderTpe(METHOD, TPE)*) (task)->blk)->bitvector)
-#define outer_loop_dictionary(HAS_NIL, NIL_MATCHES, NAME, TPE, LEFT_CI_NEXT,
RIGHT_CI_NEXT) \
+#define outer_loop_dictionary(HAS_NIL, NIL_MATCHES, METHOD, TPE, LEFT_CI_NEXT,
RIGHT_CI_NEXT) \
{\
- bte bits = GET_FINAL_BITS(task, NAME);\
- TPE* dict = GET_FINAL_DICT(task, NAME, TPE);\
- BitVector base = MOScodevectorDict(task, NAME, TPE);\
+ bte bits = GET_FINAL_BITS(task, METHOD);\
+ TPE* dict = GET_FINAL_DICT(task, METHOD, TPE);\
+ BitVector base = MOScodevectorDict(task, METHOD, TPE);\
for (oid lo = canditer_peekprev(task->ci); !is_oid_nil(lo) && lo < last;
lo = LEFT_CI_NEXT(task->ci)) {\
BUN i = (BUN) (lo - first);\
BitVectorChunk j= getBitVector(base,i,bits);\
@@ -92,11 +92,11 @@ typedef struct {\
}\
}
-#define join_inner_loop_dictionary(NAME, TPE, HAS_NIL, RIGHT_CI_NEXT)\
+#define join_inner_loop_dictionary(METHOD, TPE, HAS_NIL, RIGHT_CI_NEXT)\
{\
- bte bits = GET_FINAL_BITS(task, NAME);\
- TPE* dict = GET_FINAL_DICT(task, NAME, TPE);\
- BitVector base = MOScodevectorDict(task, NAME, TPE);\
+ bte bits = GET_FINAL_BITS(task, METHOD);\
+ TPE* dict = GET_FINAL_DICT(task, METHOD, TPE);\
+ BitVector base = MOScodevectorDict(task, METHOD, TPE);\
for (oid ro = canditer_peekprev(task->ci); !is_oid_nil(ro) && ro < last;
ro = RIGHT_CI_NEXT(task->ci)) {\
BUN i = (BUN) (ro - first);\
BitVectorChunk j= getBitVector(base,i,bits);\
diff --git a/monetdb5/modules/mosaic/mosaic_dictionary_templates.h
b/monetdb5/modules/mosaic/mosaic_dictionary_templates.h
--- a/monetdb5/modules/mosaic/mosaic_dictionary_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_dictionary_templates.h
@@ -1,9 +1,9 @@
#ifdef PREPARATION_DEFINITION
-#define clean_up_info_ID(NAME) CONCAT2(clean_up_info_, NAME)
+#define clean_up_info_ID(METHOD) CONCAT2(clean_up_info_, METHOD)
-static inline void clean_up_info_ID(NAME)(MOStask* task) {
- GlobalDictionaryInfo* info = task->CONCAT2(NAME, _info);
+static inline void clean_up_info_ID(METHOD)(MOStask* task) {
+ GlobalDictionaryInfo* info = task->CONCAT2(METHOD, _info);
BBPreclaim(info->dict);
BBPreclaim(info->admin);
@@ -12,19 +12,19 @@ static inline void clean_up_info_ID(NAME
GDKfree(info);
- task->CONCAT2(NAME, _info) = NULL;
+ task->CONCAT2(METHOD, _info) = NULL;
}
-MOSprepareDictionaryContext_SIGNATURE(NAME)
+MOSprepareDictionaryContext_SIGNATURE(METHOD)
{
const unsigned int zero = 0;
str msg = MAL_SUCCEED;
- GlobalDictionaryInfo** info = &task->CONCAT2(NAME, _info);
+ GlobalDictionaryInfo** info = &task->CONCAT2(METHOD, _info);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
