Make casewriters keep track of the number of `union value's in each

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

diff --git a/src/data/scratch-writer.c b/src/data/scratch-writer.c
index 67e371a499d5e4b6a4116ad22089cbe8a31a5c56..e085ca1c28e59b7984251037067019add18984e4 100644 (file)
--- a/src/data/scratch-writer.c
+++ b/src/data/scratch-writer.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -35,7 +33,7 @@
 #include "xalloc.h"
 
 /* A scratch file writer. */
-struct scratch_writer 
+struct scratch_writer
   {
     struct scratch_handle *handle;      /* Underlying scratch handle. */
     struct file_handle *fh;             /* Underlying file handle. */
@@ -51,31 +49,33 @@ static struct casewriter_class scratch_writer_casewriter_class;
    to be drawn from DICTIONARY. */
 struct casewriter *
 scratch_writer_open (struct file_handle *fh,
-                     const struct dictionary *dictionary) 
+                     const struct dictionary *dictionary)
 {
   struct scratch_handle *sh;
   struct scratch_writer *writer;
   struct dictionary *scratch_dict;
   struct dict_compactor *compactor;
   struct casewriter *casewriter;
+  size_t dict_value_cnt;
 
   if (!fh_open (fh, FH_REF_SCRATCH, "scratch file", "we"))
     return NULL;
 
   /* Destroy previous contents of handle. */
   sh = fh_get_scratch_handle (fh);
-  if (sh != NULL) 
+  if (sh != NULL)
     scratch_handle_destroy (sh);
 
   /* Copy the dictionary and compact if needed. */
   scratch_dict = dict_clone (dictionary);
-  if (dict_compacting_would_shrink (scratch_dict)) 
+  if (dict_compacting_would_shrink (scratch_dict))
     {
       compactor = dict_make_compactor (scratch_dict);
       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);
@@ -87,11 +87,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;
@@ -100,12 +100,12 @@ scratch_writer_open (struct file_handle *fh,
 /* Writes case C to WRITER. */
 static void
 scratch_writer_casewriter_write (struct casewriter *w UNUSED, void *writer_,
-                                 struct ccase *c) 
+                                 struct ccase *c)
 {
   struct scratch_writer *writer = writer_;
   struct scratch_handle *handle = writer->handle;
   struct ccase tmp;
-  if (writer->compactor) 
+  if (writer->compactor)
     {
       case_create (&tmp, dict_get_next_value_idx (handle->dictionary));
       dict_compactor_compact (writer->compactor, &tmp, c);
@@ -118,7 +118,7 @@ scratch_writer_casewriter_write (struct casewriter *w UNUSED, void *writer_,
 
 /* Closes WRITER. */
 static void
-scratch_writer_casewriter_destroy (struct casewriter *w UNUSED, void *writer_) 
+scratch_writer_casewriter_destroy (struct casewriter *w UNUSED, void *writer_)
 {
   struct scratch_writer *writer = writer_;
   struct casereader *reader = casewriter_make_reader (writer->subwriter);
@@ -128,7 +128,7 @@ scratch_writer_casewriter_destroy (struct casewriter *w UNUSED, void *writer_)
   free (writer);
 }
 
-static struct casewriter_class scratch_writer_casewriter_class = 
+static struct casewriter_class scratch_writer_casewriter_class =
   {
     scratch_writer_casewriter_write,
     scratch_writer_casewriter_destroy,