Changeset: bb5607cf823c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb5607cf823c Modified Files: clients/Tests/exports.stable.out clients/mapilib/ChangeLog clients/mapilib/mapi.c clients/mapilib/mapi.h Branch: default Log Message:
Removed unused function mapi_cache_shuffle. diffs (96 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 @@ -479,7 +479,6 @@ MapiMsg mapi_bind_numeric(MapiHdl hdl, i MapiMsg mapi_bind_var(MapiHdl hdl, int fnr, int type, void *ptr); MapiMsg mapi_cache_freeup(MapiHdl hdl, int percentage); MapiMsg mapi_cache_limit(Mapi mid, int limit); -MapiMsg mapi_cache_shuffle(MapiHdl hdl, int percentage); MapiMsg mapi_clear_bindings(MapiHdl hdl); MapiMsg mapi_clear_params(MapiHdl hdl); MapiMsg mapi_close_handle(MapiHdl hdl); diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog --- a/clients/mapilib/ChangeLog +++ b/clients/mapilib/ChangeLog @@ -2,5 +2,6 @@ # This file is updated with Maddlog * Wed Sep 12 2018 Sjoerd Mullender <sjo...@acm.org> +- Removed function mapi_cache_shuffle. - Removed function mapi_stream_query. diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c --- a/clients/mapilib/mapi.c +++ b/clients/mapilib/mapi.c @@ -258,7 +258,6 @@ * @item mapi_bind_var() @tab Bind typed C-variable to a field * @item mapi_cache_freeup() @tab Forcefully shuffle fraction for cache refreshment * @item mapi_cache_limit() @tab Set the tuple cache limit - * @item mapi_cache_shuffle() @tab Set shuffle fraction for cache refreshment * @item mapi_clear_bindings() @tab Clear all field bindings * @item mapi_clear_params() @tab Clear all parameter bindings * @item mapi_close_handle() @tab Close query handle and free resources @@ -632,16 +631,6 @@ * non-read elements. Filling the cache quicker than reading leads to an * error. * - * @item MapiMsg mapi_cache_shuffle(MapiHdl hdl, int percentage) - * - * Make room in the cache by shuffling percentage tuples out of the - * cache. It is sometimes handy to do so, for example, when your - * application is stream-based and you process each tuple as it arrives - * and still need a limited look-back. This percentage can be set - * between 0 to 100. Making shuffle= 100% (default) leads to paging - * behavior, while shuffle==1 leads to a sliding window over a tuple - * stream with 1% refreshing. - * * @item MapiMsg mapi_cache_freeup(MapiHdl hdl, int percentage) * * Forcefully shuffle the cache making room for new rows. It ignores the @@ -783,7 +772,6 @@ struct MapiParam { */ struct MapiRowBuf { int rowlimit; /* maximum number of rows to cache */ - int shuffle; /* percentage of rows to shuffle upon overflow */ int limit; /* current storage space limit */ int writer; int reader; @@ -1442,7 +1430,6 @@ new_result(MapiHdl hdl) result->fields = NULL; result->cache.rowlimit = hdl->mid->cachelimit; - result->cache.shuffle = 100; result->cache.limit = 0; result->cache.writer = 0; result->cache.reader = -1; @@ -4253,19 +4240,6 @@ mapi_cache_limit(Mapi mid, int limit) } MapiMsg -mapi_cache_shuffle(MapiHdl hdl, int percentage) -{ - /* clean out superflous space TODO */ - mapi_hdl_check(hdl, "mapi_cache_shuffle"); - if (percentage < 0 || percentage > 100) { - return mapi_setError(hdl->mid, "Illegal percentage", "mapi_cache_shuffle", MERROR); - } - if (hdl->result) - hdl->result->cache.shuffle = percentage; - return MOK; -} - -MapiMsg mapi_fetch_reset(MapiHdl hdl) { mapi_hdl_check(hdl, "mapi_fetch_reset"); diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h --- a/clients/mapilib/mapi.h +++ b/clients/mapilib/mapi.h @@ -171,7 +171,6 @@ mapi_export MapiMsg mapi_query_done(Mapi mapi_export MapiHdl mapi_send(Mapi mid, const char *cmd); mapi_export MapiMsg mapi_read_response(MapiHdl hdl); mapi_export MapiMsg mapi_cache_limit(Mapi mid, int limit); -mapi_export MapiMsg mapi_cache_shuffle(MapiHdl hdl, int percentage); mapi_export MapiMsg mapi_cache_freeup(MapiHdl hdl, int percentage); mapi_export MapiMsg mapi_seek_row(MapiHdl hdl, int64_t rowne, int whence); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list