Changeset: d079b311e685 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d079b311e685
Modified Files:
monetdb5/modules/mosaic/mosaic_delta_templates.h
monetdb5/modules/mosaic/mosaic_dictionary_templates.h
monetdb5/modules/mosaic/mosaic_frame_templates.h
monetdb5/modules/mosaic/mosaic_join_templates.h
monetdb5/modules/mosaic/mosaic_linear_templates.h
monetdb5/modules/mosaic/mosaic_prefix_templates.h
monetdb5/modules/mosaic/mosaic_raw_templates.h
monetdb5/modules/mosaic/mosaic_runlength_templates.h
monetdb5/modules/mosaic/mosaic_utility.h
Branch: mosaic
Log Message:
Use the more accurate 'MAYBE_HAS_NIL' instead of 'HAS_NIL'.
diffs (156 lines):
diff --git a/monetdb5/modules/mosaic/mosaic_delta_templates.h
b/monetdb5/modules/mosaic/mosaic_delta_templates.h
--- a/monetdb5/modules/mosaic/mosaic_delta_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_delta_templates.h
@@ -260,7 +260,7 @@ MOSjoin_inner_loop_SIGNATURE(delta, TPE,
TPE delta = getBitVector(base, j, bits);
rval = ACCUMULATE(acc, delta, sign_mask, TPE);
}
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
IF_EQUAL_APPEND_RESULT(true, TPE);
#else
IF_EQUAL_APPEND_RESULT(false, TPE);
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
@@ -555,7 +555,7 @@ MOSjoin_inner_loop_SIGNATURE(METHOD, TPE
BUN offset = 0;
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
if (IS_NIL(TPE, dict[0]) && ((--klast) && (++dict) && (++offset)) &&
IS_NIL(TPE, lval)) {
key_found = true;
key = 0;
@@ -592,7 +592,7 @@ MOSjoin_inner_loop_SIGNATURE(METHOD, TPE
{
oid lval = (oid) key;
oid rval = (oid) j;
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
IF_EQUAL_APPEND_RESULT(true, oid);
#else
IF_EQUAL_APPEND_RESULT(false, oid);
diff --git a/monetdb5/modules/mosaic/mosaic_frame_templates.h
b/monetdb5/modules/mosaic/mosaic_frame_templates.h
--- a/monetdb5/modules/mosaic/mosaic_frame_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_frame_templates.h
@@ -233,7 +233,7 @@ MOSjoin_inner_loop_SIGNATURE(frame, 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);
TPE rval = ADD_DELTA(TPE, min, getBitVector(base, i, bits));
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
IF_EQUAL_APPEND_RESULT(true, TPE);
#else
IF_EQUAL_APPEND_RESULT(false, TPE);
diff --git a/monetdb5/modules/mosaic/mosaic_join_templates.h
b/monetdb5/modules/mosaic/mosaic_join_templates.h
--- a/monetdb5/modules/mosaic/mosaic_join_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_join_templates.h
@@ -58,7 +58,7 @@ static inline str OUTER_LOOP_UNCOMPRESSE
for (BUN li = 0; li < lci->ncand; li++, MOSinitializeScan(task,
task->bsrc), canditer_reset(rci)) {
oid lo = LEFT_CI_NEXT(lci);
TPE lval = vl[lo-l->hseqbase];
-#if defined HAS_NIL && defined NILS_DO_NOT_MATCH
+#if !defined HAS_NO_NIL && defined NILS_DO_NOT_MATCH
if ((IS_NIL(TPE, lval))) {continue;};
#endif
@@ -154,13 +154,13 @@ static str MOSjoin_generic_ID(TPE) (MOSt
bool nil = !l->tnonil;
if( nil && nil_matches){
- DO_JOIN_WITH_NIL_INFO(TPE, _HAS_NIL, _NILS_MATCH);
+ DO_JOIN_WITH_NIL_INFO(TPE, _MAYBE_HAS_NIL, _NILS_MATCH);
}
if( !nil && nil_matches){
DO_JOIN_WITH_NIL_INFO(TPE, _HAS_NO_NIL, _NILS_MATCH);
}
if( nil && !nil_matches){
- DO_JOIN_WITH_NIL_INFO(TPE, _HAS_NIL, _NILS_DO_NOT_MATCH);
+ DO_JOIN_WITH_NIL_INFO(TPE, _MAYBE_HAS_NIL, _NILS_DO_NOT_MATCH);
}
if( !nil && !nil_matches){
DO_JOIN_WITH_NIL_INFO(TPE, _HAS_NO_NIL, _NILS_DO_NOT_MATCH);
@@ -171,13 +171,13 @@ static str MOSjoin_generic_ID(TPE) (MOSt
// macro adiministration
#elif ! defined NIL
-#define NIL _HAS_NIL
-#define HAS_NIL
+#define NIL _MAYBE_HAS_NIL
#include "mosaic_join_templates.h"
-#undef HAS_NIL
#undef NIL
#define NIL _HAS_NO_NIL
+#define HAS_NO_NIL
#include "mosaic_join_templates.h"
+#undef HAS_NO_NIL
#undef NIL
#define DEFINE_MOSjoin_generic
#include "mosaic_join_templates.h"
diff --git a/monetdb5/modules/mosaic/mosaic_linear_templates.h
b/monetdb5/modules/mosaic/mosaic_linear_templates.h
--- a/monetdb5/modules/mosaic/mosaic_linear_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_linear_templates.h
@@ -174,7 +174,7 @@ MOSjoin_inner_loop_SIGNATURE(linear, 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);
TPE rval = (TPE) (offset + (i * step));
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
IF_EQUAL_APPEND_RESULT(true, TPE);
#else
IF_EQUAL_APPEND_RESULT(false, TPE);
diff --git a/monetdb5/modules/mosaic/mosaic_prefix_templates.h
b/monetdb5/modules/mosaic/mosaic_prefix_templates.h
--- a/monetdb5/modules/mosaic/mosaic_prefix_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_prefix_templates.h
@@ -259,7 +259,7 @@ MOSjoin_inner_loop_SIGNATURE(prefix, 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);
TPE rval = (TPE) (prefix | getBitVector(base,i,suffix_bits));
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
IF_EQUAL_APPEND_RESULT(true, TPE);
#else
IF_EQUAL_APPEND_RESULT(false, TPE);
diff --git a/monetdb5/modules/mosaic/mosaic_raw_templates.h
b/monetdb5/modules/mosaic/mosaic_raw_templates.h
--- a/monetdb5/modules/mosaic/mosaic_raw_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_raw_templates.h
@@ -147,7 +147,7 @@ MOSjoin_inner_loop_SIGNATURE(raw, TPE, N
TPE* vr = &GET_INIT_raw(task, TPE);
for (oid ro = canditer_peekprev(task->ci); !is_oid_nil(ro) && ro < last;
ro = RIGHT_CI_NEXT(task->ci)) {
TPE rval = vr[ro-first];
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
IF_EQUAL_APPEND_RESULT(true, TPE);
#else
IF_EQUAL_APPEND_RESULT(false, TPE);
diff --git a/monetdb5/modules/mosaic/mosaic_runlength_templates.h
b/monetdb5/modules/mosaic/mosaic_runlength_templates.h
--- a/monetdb5/modules/mosaic/mosaic_runlength_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_runlength_templates.h
@@ -154,7 +154,7 @@ MOSjoin_inner_loop_SIGNATURE(runlength,
BUN last = first + MOSgetCnt(task->blk);
const TPE rval = GET_VAL_runlength(task, TPE);
for (oid ro = canditer_peekprev(task->ci); !is_oid_nil(ro) && ro < last;
ro = RIGHT_CI_NEXT(task->ci)) {
- #ifdef HAS_NIL
+ #ifndef HAS_NO_NIL
IF_EQUAL_APPEND_RESULT(true, TPE);
#else
IF_EQUAL_APPEND_RESULT(false, TPE);
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
@@ -81,10 +81,10 @@ MOSselect_SIGNATURE(METHOD, TPE);\
MOSprojection_SIGNATURE(METHOD, TPE);\
MOSjoin_COUI_SIGNATURE(METHOD, TPE);\
MOSBlockHeader_DEF(METHOD, TPE);\
-MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _HAS_NIL ,
canditer_next);\
-MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _HAS_NO_NIL , canditer_next);\
-MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _HAS_NIL ,
canditer_next_dense);\
-MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _HAS_NO_NIL , canditer_next_dense);\
+MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _MAYBE_HAS_NIL, canditer_next);\
+MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _HAS_NO_NIL,
canditer_next);\
+MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _MAYBE_HAS_NIL,
canditer_next_dense);\
+MOSjoin_inner_loop_SIGNATURE(METHOD, TPE, _HAS_NO_NIL,
canditer_next_dense);\
ALIGNMENT_HELPER__DEF(METHOD, TPE);
#ifdef HAVE_HGE
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
