Changeset: 4497e5d2028e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4497e5d2028e Modified Files: clients/Tests/exports.stable.out clients/Tests/mclient-uri.stable.out monetdb5/modules/mosaic/mosaic.c monetdb5/modules/mosaic/mosaic.h monetdb5/modules/mosaic/mosaic_capped.c monetdb5/modules/mosaic/mosaic_capped.h monetdb5/modules/mosaic/mosaic_delta.c monetdb5/modules/mosaic/mosaic_delta.h monetdb5/modules/mosaic/mosaic_dictionary.h monetdb5/modules/mosaic/mosaic_frame.c monetdb5/modules/mosaic/mosaic_frame.h monetdb5/modules/mosaic/mosaic_join.h monetdb5/modules/mosaic/mosaic_linear.c monetdb5/modules/mosaic/mosaic_linear.h monetdb5/modules/mosaic/mosaic_prefix.c monetdb5/modules/mosaic/mosaic_prefix.h monetdb5/modules/mosaic/mosaic_projection.h monetdb5/modules/mosaic/mosaic_raw.c monetdb5/modules/mosaic/mosaic_raw.h monetdb5/modules/mosaic/mosaic_runlength.c monetdb5/modules/mosaic/mosaic_runlength.h monetdb5/modules/mosaic/mosaic_select.h monetdb5/modules/mosaic/mosaic_var.c monetdb5/modules/mosaic/mosaic_var.h Branch: mosaic Log Message:
Get rid of MOSskip_* functions. diffs (truncated from 527 to 300 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1574,14 +1574,6 @@ str MOSprepareEstimate_capped(MOStask ta str MOSprepareEstimate_var(MOStask task); str MOSprojection(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MOSselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -void MOSskip_capped(MOStask task); -void MOSskip_delta(MOStask task); -void MOSskip_frame(MOStask task); -void MOSskip_linear(MOStask task); -void MOSskip_prefix(MOStask task); -void MOSskip_raw(MOStask task); -void MOSskip_runlength(MOStask task); -void MOSskip_var(MOStask task); str MOSslice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MOSsliceInternal(bat *slices, BUN size, BAT *b); str MOSthetaselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/clients/Tests/mclient-uri.stable.out b/clients/Tests/mclient-uri.stable.out --- a/clients/Tests/mclient-uri.stable.out +++ b/clients/Tests/mclient-uri.stable.out @@ -1,50 +1,2 @@ stdout of test 'mclient-uri` in directory 'clients` itself: - -# 10:30:50 > -# 10:30:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36840" "--set" "mapi_usock=/var/tmp/mtest-2769/.s.monetdb.36840" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients" -# 10:30:50 > - -# MonetDB 5 server v11.25.22 (hg id: 7b4a32dfbcc5+) -# This is an unreleased version -# Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers -# Found 15.589 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:36840/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - - -# 10:30:51 > -# 10:30:51 > "./mclient-uri.SQL.sh" "mclient-uri" -# 10:30:51 > - - -# 10:30:51 > -# 10:30:51 > mclient -d mapi:monetdb://madrid:36840/mTests_clients?language=sql&user=monetdb -f test -E utf-8 -s select 1 -# 10:30:51 > - -% .L2 # table_name -% L2 # name -% tinyint # type -% 1 # length -[ 1 ] - -# 10:30:51 > -# 10:30:51 > mclient -d mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840?database=mTests_clients&language=sql&user=monetdb -f test -E utf-8 -s select 1 -# 10:30:51 > - -% .L2 # table_name -% L2 # name -% tinyint # type -% 1 # length -[ 1 ] - -# 10:30:51 > -# 10:30:51 > "Done." -# 10:30:51 > - 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 @@ -642,47 +642,47 @@ MOSdecompressInternal(BAT** res, BAT* bs task->timer = GDKusec(); - while(task->blk){ + while(MOSgetTag(task->blk) != MOSAIC_EOL){ switch(MOSgetTag(task->blk)){ case MOSAIC_RAW: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_raw\n"); MOSdecompress_raw(task); - MOSskip_raw(task); + MOSadvance_raw(task); break; case MOSAIC_RLE: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_runlength\n"); MOSdecompress_runlength(task); - MOSskip_runlength(task); + MOSadvance_runlength(task); break; case MOSAIC_CAPPED: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_capped\n"); MOSdecompress_capped(task); - MOSskip_capped(task); + MOSadvance_capped(task); break; case MOSAIC_VAR: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_var\n"); MOSdecompress_var(task); - MOSskip_var(task); + MOSadvance_var(task); break; case MOSAIC_DELTA: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_delta\n"); MOSdecompress_delta(task); - MOSskip_delta(task); + MOSadvance_delta(task); break; case MOSAIC_LINEAR: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_linear\n"); MOSdecompress_linear(task); - MOSskip_linear(task); + MOSadvance_linear(task); break; case MOSAIC_FRAME: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_frame\n"); MOSdecompress_frame(task); - MOSskip_frame(task); + MOSadvance_frame(task); break; case MOSAIC_PREFIX: ALGODEBUG mnstr_printf(GDKstdout, "MOSdecompress_prefix\n"); MOSdecompress_prefix(task); - MOSskip_prefix(task); + MOSadvance_prefix(task); break; default: assert(0); } 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 @@ -175,22 +175,6 @@ typedef struct _MosaicEstimation { size_t nr_capped_encoded_blocks; } MosaicEstimation; -/* Run through a column to produce a compressed version */ - -// skip until you hit a candidate -#define MOSskipit()\ -if ( task->n && task->cl ){\ - while(task->n > 0 && *task->cl < (oid) first)\ - {task->cl++; task->n--;}\ - if (task->n <= 0 || *task->cl > (oid) first )\ - continue;\ - if ( *task->cl == (oid) first ){\ - task->cl++; task->n--; \ - }\ -} else if (task->cl) continue; - - - mal_export char *MOSfiltername[]; mal_export bool MOSisTypeAllowed(int compression, BAT* b); mal_export str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/monetdb5/modules/mosaic/mosaic_capped.c b/monetdb5/modules/mosaic/mosaic_capped.c --- a/monetdb5/modules/mosaic/mosaic_capped.c +++ b/monetdb5/modules/mosaic/mosaic_capped.c @@ -162,14 +162,6 @@ MOSlayout_capped(MOStask task, BAT *btec return; } -void -MOSskip_capped(MOStask task) -{ - MOSadvance_capped(task); - if ( MOSgetTag(task->blk) == MOSAIC_EOL) - task->blk = 0; // ENDOFLIST -} - str MOSprepareEstimate_capped(MOStask task) { diff --git a/monetdb5/modules/mosaic/mosaic_capped.h b/monetdb5/modules/mosaic/mosaic_capped.h --- a/monetdb5/modules/mosaic/mosaic_capped.h +++ b/monetdb5/modules/mosaic/mosaic_capped.h @@ -27,7 +27,6 @@ mal_export str MOScreateCappedInfo(MOSta mal_export void MOSlayout_capped(MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); mal_export void MOSlayout_capped_hdr(MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); mal_export void MOSadvance_capped(MOStask task); -mal_export void MOSskip_capped(MOStask task); mal_export str MOSprepareEstimate_capped(MOStask task); mal_export str MOSestimate_capped(MOStask task, MosaicEstimation* current, const MosaicEstimation* previous); mal_export void MOSpostEstimate_capped(MOStask task); 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 @@ -79,14 +79,6 @@ MOSlayout_delta(MOStask task, BAT *btech return; } -void -MOSskip_delta(MOStask task) -{ - MOSadvance_delta(task); - if ( MOSgetTag(task->blk) == MOSAIC_EOL) - task->blk = 0; // ENDOFLIST -} - #define MOScodevectorDelta(Task) (((char*) (Task)->blk)+ wordaligned(sizeof(MosaicBlkHeader_delta_t), BitVectorChunk)) #define determineDeltaParameters(PARAMETERS, SRC, LIMIT, TPE) \ diff --git a/monetdb5/modules/mosaic/mosaic_delta.h b/monetdb5/modules/mosaic/mosaic_delta.h --- a/monetdb5/modules/mosaic/mosaic_delta.h +++ b/monetdb5/modules/mosaic/mosaic_delta.h @@ -21,7 +21,6 @@ bool MOStypes_delta(BAT* b); mal_export void MOSlayout_delta(MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); mal_export void MOSadvance_delta(MOStask task); -mal_export void MOSskip_delta(MOStask task); mal_export str MOSestimate_delta(MOStask task, MosaicEstimation* current, const MosaicEstimation* previous); mal_export void MOScompress_delta(MOStask task, MosaicBlkRec* estimate); mal_export void MOSdecompress_delta(MOStask task); @@ -72,7 +71,7 @@ typedef struct _DeltaParameters_t { }\ IF_EQUAL_APPEND_RESULT(HAS_NIL, TPE);\ }\ - MOSskip_delta(task);\ + MOSadvance_delta(task);\ } #endif /* _MOSAIC_DELTA_ */ 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 @@ -244,7 +244,7 @@ typedef struct { TPE rval = dict[j];\ IF_EQUAL_APPEND_RESULT(HAS_NIL, TPE);\ }\ - MOSskip_##NAME(task);\ + MOSadvance_##NAME(task);\ } #endif /* _MOSAIC_DICTIONARY_ */ diff --git a/monetdb5/modules/mosaic/mosaic_frame.c b/monetdb5/modules/mosaic/mosaic_frame.c --- a/monetdb5/modules/mosaic/mosaic_frame.c +++ b/monetdb5/modules/mosaic/mosaic_frame.c @@ -77,14 +77,6 @@ MOSlayout_frame(MOStask task, BAT *btech return; } -void -MOSskip_frame(MOStask task) -{ - MOSadvance_frame( task); - if ( MOSgetTag(task->blk) == MOSAIC_EOL) - task->blk = 0; // ENDOFLIST -} - #define determineFrameParameters(PARAMETERS, SRC, LIMIT, TPE) \ do {\ TPE *val = SRC, max, min;\ diff --git a/monetdb5/modules/mosaic/mosaic_frame.h b/monetdb5/modules/mosaic/mosaic_frame.h --- a/monetdb5/modules/mosaic/mosaic_frame.h +++ b/monetdb5/modules/mosaic/mosaic_frame.h @@ -23,7 +23,6 @@ mal_export void MOScreateframeDictionary mal_export void MOSlayout_frame_hdr(MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); mal_export void MOSlayout_frame(MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); mal_export void MOSadvance_frame(MOStask task); -mal_export void MOSskip_frame(MOStask task); mal_export str MOSestimate_frame(MOStask task, MosaicEstimation* current, const MosaicEstimation* previous); mal_export void MOScompress_frame(MOStask task, MosaicBlkRec* estimate); mal_export void MOSdecompress_frame(MOStask task); @@ -70,7 +69,7 @@ typedef struct _FrameParameters_t { TPE rval = ADD_DELTA(TPE, min, getBitVector(base, i, bits));\ IF_EQUAL_APPEND_RESULT(HAS_NIL, TPE);\ }\ - MOSskip_frame(task);\ + MOSadvance_frame(task);\ } #endif /* _MOSAIC_FRAME_ */ 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 @@ -87,7 +87,7 @@ MOSjoin_COUI_SIGNATURE(NAME, TPE)\ (void) canditer_prev(lci);\ }\ \ - MOSskip_##NAME(task);\ + MOSadvance_##NAME(task);\ return MAL_SUCCEED;\ } @@ -153,7 +153,7 @@ static str MOSjoin_COUI_##TPE(MOStask ta }\ }\ \ - assert(task->blk == NULL);\ + assert(MOSgetTag(task->blk) == MOSAIC_EOL);\ \ return MAL_SUCCEED;\ } @@ -243,7 +243,7 @@ join_inner_loop_##NAME(TPE, HAS_NIL, RIG }\ }\ \ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
