From 66b0f5843d272887ceb09b0d2d339f3cec10eca7 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Wed, 23 May 2007 21:36:08 +0200 Subject: [PATCH] The write_merged() hook is no longer required in simple cases. --- lib/sorter/sort-test.c | 7 ------- lib/sorter/sorter.h | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/sorter/sort-test.c b/lib/sorter/sort-test.c index 3990254d..9a822d14 100644 --- a/lib/sorter/sort-test.c +++ b/lib/sorter/sort-test.c @@ -95,13 +95,6 @@ static inline void s2_write_merged(struct fastbuf *f, struct key2 **k, void **d bwrite(f, k[0], sizeof(struct key2)); } -static inline void s2_copy_merged(struct key2 **k, struct fastbuf **d UNUSED, uns n, struct fastbuf *dest) -{ - for (uns i=1; icnt += k[i]->cnt; - bwrite(dest, k[0], sizeof(struct key2)); -} - #define SORT_KEY_REGULAR struct key2 #define SORT_PREFIX(x) s2_##x #define SORT_INPUT_FB diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h index c2905345..cd5e843f 100644 --- a/lib/sorter/sorter.h +++ b/lib/sorter/sorter.h @@ -64,7 +64,7 @@ * over all given records. * void PREFIX_copy_merged(SORT_KEY **keys, struct fastbuf **data, uns n, struct fastbuf *dest) * takes n records with keys in memory and data in fastbufs and writes - * a single record. + * a single record. Used only if SORT_DATA_SIZE or SORT_UNIFY_WORKSPACE is defined. * SORT_UNIFY_WORKSPACE(key) gets a key and returns the amount of workspace required when merging * the given record. Defaults to 0. * @@ -177,6 +177,13 @@ static inline void P(copy_data)(P(key) *key, struct fastbuf *in, struct fastbuf #endif } +#if defined(SORT_UNIFY) && !defined(SORT_VAR_DATA) && !defined(SORT_UNIFY_WORKSPACE) +static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, uns n, struct fastbuf *dest) +{ + P(write_merged)(dest, keys, NULL, n, NULL); +} +#endif + #if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE) #include "lib/sorter/s-internal.h" #else -- 2.39.2