Changeset: f484d068c1e9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f484d068c1e9
Modified Files:
monetdb5/modules/mosaic/mosaic_join.h
Branch: mosaic
Log Message:
Tidy up code a bit.
diffs (34 lines):
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
@@ -91,7 +91,11 @@ MOSjoin_COUI_SIGNATURE(NAME, TPE)\
return MAL_SUCCEED;\
}
-#define do_join_COUI(NAME, TPE, DUMMY_ARGUMENT) msg =
MOSjoin_COUI_##NAME##_##TPE(r1p, r2p, task, r, rci, nil_matches)
+#define do_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;\
+}
/* Nested loop join with the left (C)ompressed side in the (O)uter loop
* and the right (U)ncompressed side in the (I)nner loop.
@@ -102,8 +106,6 @@ static str MOSjoin_COUI_##TPE(MOStask ta
BAT* r1p = task->lbat;\
BAT* r2p = task->rbat;\
\
- str msg = MAL_SUCCEED;\
-\
struct canditer* lci = task->ci;\
\
while(task->start < task->stop ){\
@@ -143,8 +145,6 @@ static str MOSjoin_COUI_##TPE(MOStask ta
break;\
}\
\
- if (msg != MAL_SUCCEED) return msg;\
-\
if (lci->next == lci->ncand) {\
/* We are at the end of the candidate list.
* So we can stop now.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
