Multi-way merges work fine in simple cases.

[libucw.git] / lib / sorter / sorter.h

diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h
index d17f4197d89177f22f4be41971ce3f215306323e..a0b6b39b76a1407fa7425f300bd0551b75cbac76 100644 (file)
--- a/lib/sorter/sorter.h
+++ b/lib/sorter/sorter.h
@@ -201,6 +201,10 @@ static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, u
 
 #include "lib/sorter/s-twoway.h"
 
 
 #include "lib/sorter/s-twoway.h"
 

+#ifndef SORT_UNIFY
+#include "lib/sorter/s-multiway.h"
+#endif
+

 #if defined(SORT_HASH_BITS) || defined(SORT_INT)
 #include "lib/sorter/s-radix.h"
 #endif
 #if defined(SORT_HASH_BITS) || defined(SORT_INT)
 #include "lib/sorter/s-radix.h"
 #endif


@@ -269,13 +273,14 @@ static struct fastbuf *P(sort)(
   ctx.internal_estimate = P(internal_estimate);
   ctx.twoway_merge = P(twoway_merge);
 
   ctx.internal_estimate = P(internal_estimate);
   ctx.twoway_merge = P(twoway_merge);
 

+#ifndef SORT_UNIFY
+  ctx.multiway_merge = P(multiway_merge);
+#endif
+

   sorter_run(&ctx);
 
 #ifdef SORT_OUTPUT_FILE
   sorter_run(&ctx);
 
 #ifdef SORT_OUTPUT_FILE

-  if (rename(ctx.out_fb->name, out) < 0)
-    die("Cannot rename %s to %s: %m", ctx.out_fb->name, out);
-  bconfig(ctx.out_fb, BCONFIG_IS_TEMP_FILE, 0);
-  bclose(ctx.out_fb);
+  bfix_tmp_file(ctx.out_fb, out);

   ctx.out_fb = NULL;
 #endif
   return ctx.out_fb;
   ctx.out_fb = NULL;
 #endif
   return ctx.out_fb;