posix-xprintf-functions.patch from patch #6230.

[pspp-builds.git] / src / data / scratch-writer.c

diff --git a/src/data/scratch-writer.c b/src/data/scratch-writer.c
index a2ce305e727b392e944a9609d816eb9483dffe84..4e2929a24164590e0440ddb42e460c46fa95c53f 100644 (file)
--- a/src/data/scratch-writer.c
+++ b/src/data/scratch-writer.c
@@ -21,12 +21,14 @@
 #include <stdlib.h>
 
 #include <data/case.h>
+#include <data/case-map.h>
 #include <data/casereader.h>
 #include <data/casewriter-provider.h>
 #include <data/casewriter.h>
 #include <data/dictionary.h>
 #include <data/file-handle-def.h>
 #include <data/scratch-handle.h>
+#include <data/variable.h>
 #include <libpspp/compiler.h>
 #include <libpspp/taint.h>
 
@@ -37,7 +39,7 @@ struct scratch_writer
   {
     struct scratch_handle *handle;      /* Underlying scratch handle. */
     struct file_handle *fh;             /* Underlying file handle. */
-    struct dict_compactor *compactor;   /* Compacts into handle->dictionary. */
+    struct case_map *compactor;         /* Compacts into handle->dictionary. */
     struct casewriter *subwriter;       /* Data output. */
   };
 
@@ -54,8 +56,9 @@ scratch_writer_open (struct file_handle *fh,
   struct scratch_handle *sh;
   struct scratch_writer *writer;
   struct dictionary *scratch_dict;
-  struct dict_compactor *compactor;
+  struct case_map *compactor;
   struct casewriter *casewriter;
+  size_t dict_value_cnt;
 
   if (!fh_open (fh, FH_REF_SCRATCH, "scratch file", "we"))
     return NULL;
@@ -67,13 +70,16 @@ scratch_writer_open (struct file_handle *fh,
 
   /* Copy the dictionary and compact if needed. */
   scratch_dict = dict_clone (dictionary);
-  if (dict_compacting_would_shrink (scratch_dict))
+  dict_delete_scratch_vars (scratch_dict);
+  if (dict_count_values (scratch_dict, 0)
+      < dict_get_next_value_idx (scratch_dict))
     {
-      compactor = dict_make_compactor (scratch_dict);
+      compactor = case_map_to_compact_dict (scratch_dict, 0);
       dict_compact_values (scratch_dict);
     }
   else
     compactor = NULL;
+  dict_value_cnt = dict_get_next_value_idx (scratch_dict);
 
   /* Create new contents. */
   sh = xmalloc (sizeof *sh);
@@ -85,11 +91,11 @@ scratch_writer_open (struct file_handle *fh,
   writer->handle = sh;
   writer->fh = fh;
   writer->compactor = compactor;
-  writer->subwriter = autopaging_writer_create (dict_get_next_value_idx (
-                                               scratch_dict));
+  writer->subwriter = autopaging_writer_create (dict_value_cnt);
 
   fh_set_scratch_handle (fh, sh);
-  casewriter = casewriter_create (&scratch_writer_casewriter_class, writer);
+  casewriter = casewriter_create (dict_value_cnt,
+                                  &scratch_writer_casewriter_class, writer);
   taint_propagate (casewriter_get_taint (writer->subwriter),
                    casewriter_get_taint (casewriter));
   return casewriter;
@@ -101,12 +107,10 @@ scratch_writer_casewriter_write (struct casewriter *w UNUSED, void *writer_,
                                  struct ccase *c)
 {
   struct scratch_writer *writer = writer_;
-  struct scratch_handle *handle = writer->handle;
   struct ccase tmp;
   if (writer->compactor)
     {
-      case_create (&tmp, dict_get_next_value_idx (handle->dictionary));
-      dict_compactor_compact (writer->compactor, &tmp, c);
+      case_map_execute (writer->compactor, c, &tmp);
       case_destroy (c);
     }
   else